ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/Coro/myhttpd/httpd.pl
(Generate patch)

Comparing Coro/myhttpd/httpd.pl (file contents):
Revision 1.9 by root, Sat Aug 11 12:49:21 2001 UTC vs.
Revision 1.33 by root, Wed Aug 29 01:40:44 2001 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5 5
6use HTTP::Date;
7
6no utf8; 8no utf8;
7use bytes; 9use bytes;
10
11our @wait_time = (); # used to calculcate avg. waiting time
12our $wait_time_length = 25;
8 13
9# at least on my machine, this thingy serves files 14# at least on my machine, this thingy serves files
10# quite a bit faster than apache, ;) 15# quite a bit faster than apache, ;)
11# and quite a bit slower than thttpd :( 16# and quite a bit slower than thttpd :(
12 17
13$SIG{PIPE} = 'IGNORE'; 18$SIG{PIPE} = 'IGNORE';
14 19
20our $accesslog;
21
22if ($ACCESS_LOG) {
23 use IO::Handle;
24 open $accesslog, ">>$ACCESS_LOG"
25 or die "$ACCESS_LOG: $!";
26 $accesslog->autoflush(1);
27}
28
15sub slog { 29sub slog {
16 my $level = shift; 30 my $level = shift;
17 my $format = shift; 31 my $format = shift;
18 printf "---: $format\n", @_; 32 printf "---: $format\n", @_;
19} 33}
20 34
21my $connections = new Coro::Semaphore $MAX_CONNECTS; 35our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
36our $transfers = new Coro::Semaphore $MAX_TRANSFER || 50;
22 37
23my @newcons; 38my @newcons;
24my @pool; 39my @pool;
25 40
26# one "execution thread" 41# one "execution thread"
… …
43 58
44my $http_port = new Coro::Socket 59my $http_port = new Coro::Socket
45 LocalAddr => $SERVER_HOST, 60 LocalAddr => $SERVER_HOST,
46 LocalPort => $SERVER_PORT, 61 LocalPort => $SERVER_PORT,
47 ReuseAddr => 1, 62 ReuseAddr => 1,
48 Listen => 1, 63 Listen => 50,
49 or die "unable to start server"; 64 or die "unable to start server";
50 65
51push @listen_sockets, $http_port; 66push @listen_sockets, $http_port;
67
68our $NOW;
69our $HTTP_NOW;
70
71Event->timer(interval => 1, hard => 1, cb => sub {
72 $NOW = time;
73 $HTTP_NOW = time2str $NOW;
74});
52 75
53# the "main thread" 76# the "main thread"
54async { 77async {
55 slog 1, "accepting connections"; 78 slog 1, "accepting connections";
56 while () { 79 while () {
57 $connections->down; 80 $connections->down;
58 push @newcons, [$http_port->accept]; 81 push @newcons, [$http_port->accept];
59 #slog 3, "accepted @$connections ".scalar(@pool); 82 #slog 3, "accepted @$connections ".scalar(@pool);
60 $::NOW = time;
61 if (@pool) { 83 if (@pool) {
62 (pop @pool)->ready; 84 (pop @pool)->ready;
63 } else { 85 } else {
64 async \&handler; 86 async \&handler;
65 } 87 }
… …
70package conn; 92package conn;
71 93
72use Socket; 94use Socket;
73use HTTP::Date; 95use HTTP::Date;
74use Convert::Scalar 'weaken'; 96use Convert::Scalar 'weaken';
97use Linux::AIO;
75 98
99Linux::AIO::min_parallel $::AIO_PARALLEL;
100
101my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
102
103Event->io(fd => Linux::AIO::poll_fileno,
104 poll => 'r', async => 1,
105 cb => \&Linux::AIO::poll_cb);
106
76our %conn; # $conn{ip}{fh} => connobj 107our %conn; # $conn{ip}{self} => connobj
108our %uri; # $uri{ip}{uri}{self}
77our %blocked; 109our %blocked;
78our %mimetype; 110our %mimetype;
79 111
80sub read_mimetypes { 112sub read_mimetypes {
81 local *M; 113 local *M;
82 if (open M, "<mimetypes") { 114 if (open M, "<mime_types") {
83 while (<M>) { 115 while (<M>) {
84 if (/^([^#]\S+)\t+(\S+)$/) { 116 if (/^([^#]\S+)\t+(\S+)$/) {
85 $mimetype{lc $1} = $2; 117 $mimetype{lc $1} = $2;
86 } 118 }
87 } 119 }
88 } else { 120 } else {
89 $self->slog(1, "cannot open mimetypes\n"); 121 print "cannot open mime_types\n";
90 } 122 }
91} 123}
124
125read_mimetypes;
92 126
93sub new { 127sub new {
94 my $class = shift; 128 my $class = shift;
95 my $peername = shift; 129 my $peername = shift;
96 my $fh = shift; 130 my $fh = shift;
97 my $self = bless { fh => $fh }, $class; 131 my $self = bless { fh => $fh }, $class;
98 my (undef, $iaddr) = unpack_sockaddr_in $peername 132 my (undef, $iaddr) = unpack_sockaddr_in $peername
99 or $self->err(500, "unable to decode peername"); 133 or $self->err(500, "unable to decode peername");
100 134
101 $self->{remote_addr} = inet_ntoa $iaddr; 135 $self->{remote_addr} = inet_ntoa $iaddr;
136 $self->{time} = $::NOW;
102 137
103 # enter ourselves into various lists 138 # enter ourselves into various lists
104 weaken ($conn{$self->{remote_addr}}{$self*1} = $self); 139 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
105 140
141 $::conns++;
142
106 $self; 143 $self;
107} 144}
108 145
109sub DESTROY { 146sub DESTROY {
110 my $self = shift; 147 my $self = shift;
148
149 $::conns--;
150
151 $self->eoconn;
111 delete $conn{$self->{remote_addr}}{$self*1}; 152 delete $conn{$self->{remote_addr}}{$self*1};
153}
154
155# end of connection
156sub eoconn {
157 my $self = shift;
112 delete $uri{$self->{uri}}{$self*1}; 158 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
113} 159}
114 160
115sub slog { 161sub slog {
116 my $self = shift; 162 my $self = shift;
117 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 163 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
118} 164}
119 165
120sub response { 166sub response {
121 my ($self, $code, $msg, $hdr, $content) = @_; 167 my ($self, $code, $msg, $hdr, $content) = @_;
122 my $res = "HTTP/1.0 $code $msg\015\012"; 168 my $res = "HTTP/1.1 $code $msg\015\012";
123 169
124 $res .= "Connection: close\015\012"; 170 $self->{h}{connection} ||= $hdr->{Connection};
125 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 171
172 $res .= "Date: $HTTP_NOW\015\012";
126 173
127 while (my ($h, $v) = each %$hdr) { 174 while (my ($h, $v) = each %$hdr) {
128 $res .= "$h: $v\015\012" 175 $res .= "$h: $v\015\012"
129 } 176 }
177 $res .= "\015\012";
130 178
131 $res .= "\015\012$content" if defined $content; 179 $res .= $content if defined $content and $self->{method} ne "HEAD";
132 180
133 print STDERR "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";#d# 181 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n";
134 182
183 print $accesslog $log if $accesslog;
184 print STDERR $log;
185
186 $self->{written} +=
135 print {$self->{fh}} $res; 187 print {$self->{fh}} $res;
136} 188}
137 189
138sub err { 190sub err {
139 my $self = shift; 191 my $self = shift;
140 my ($code, $msg, $hdr, $content) = @_; 192 my ($code, $msg, $hdr, $content) = @_;
… …
142 unless (defined $content) { 194 unless (defined $content) {
143 $content = "$code $msg"; 195 $content = "$code $msg";
144 $hdr->{"Content-Type"} = "text/plain"; 196 $hdr->{"Content-Type"} = "text/plain";
145 $hdr->{"Content-Length"} = length $content; 197 $hdr->{"Content-Length"} = length $content;
146 } 198 }
199 $hdr->{"Connection"} = "close";
147 200
148 $self->response($code, $msg, $hdr, $content); 201 $self->response($code, $msg, $hdr, $content);
149 202
150 die bless {}, err::; 203 die bless {}, err::;
151} 204}
152 205
153sub err_blocked {
154 my $self = shift;
155 my $ip = $self->{remote_addr};
156 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
157 $self->err(403, "too many connections",
158 {
159 "Content-Type" => "text/html",
160 "Retry-After" => $::BLOCKTIME
161 },
162 <<EOF);
163<html><p>
164You have been blocked because you opened too many connections. You
165may retry at</p>
166
167 <p><blockquote>$time.</blockquote></p>
168
169<p>Until then, each new access will renew the block. You might want to have a
170look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
171</html>
172EOF
173}
174
175sub handle { 206sub handle {
176 my $self = shift; 207 my $self = shift;
177 my $fh = $self->{fh}; 208 my $fh = $self->{fh};
178 209
210 my $host;
211
212 $fh->timeout($::REQ_TIMEOUT);
179 #while() { 213 while() {
214 $self->{reqs}++;
215
216 # read request and parse first line
217 my $req = $fh->readline("\015\012\015\012");
218
219 unless (defined $req) {
220 if (exists $self->{version}) {
221 last;
222 } else {
223 $self->err(408, "request timeout");
224 }
225 }
226
180 $self->{h} = {}; 227 $self->{h} = {};
181 228
182 # read request and parse first line
183 $fh->timeout($::REQ_TIMEOUT);
184 my $req = $fh->readline("\015\012\015\012");
185 $fh->timeout($::RES_TIMEOUT); 229 $fh->timeout($::RES_TIMEOUT);
186
187 defined $req or
188 $self->err(408, "request timeout");
189
190 my $ip = $self->{remote_addr}; 230 my $ip = $self->{remote_addr};
191 231
192 if ($blocked{$ip}) { 232 if ($blocked{$ip}) {
193 $self->err_blocked($blocked{$ip}) 233 $self->err_blocked($blocked{$ip})
194 if $blocked{$ip} > $::NOW; 234 if $blocked{$ip} > $::NOW;
195 235
196 delete $blocked{$ip}; 236 delete $blocked{$ip};
197 } 237 }
198 238
199 if (%{$conn{$ip}} > $::MAX_CONN_IP) { 239 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
240 my $delay = 120;
241 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
242 if ($delay <= 0) {
200 $self->slog("blocked ip $ip"); 243 $self->slog(2, "blocked ip $ip");
201 $self->err_blocked; 244 $self->err_blocked;
245 } else {
246 Coro::Event::do_timer(after => 3);
247 $delay -= 3;
248 }
249 }
202 } 250 }
203 251
204 $req =~ /^(?:\015\012)? 252 $req =~ /^(?:\015\012)?
205 (GET|HEAD) \040+ 253 (GET|HEAD) \040+
206 ([^\040]+) \040+ 254 ([^\040]+) \040+
207 HTTP\/([0-9]+\.[0-9]+) 255 HTTP\/([0-9]+\.[0-9]+)
208 \015\012/gx 256 \015\012/gx
209 or $self->err(403, "method not allowed", { Allow => "GET,HEAD" }); 257 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
210
211 $2 ne "1.0"
212 or $self->err(506, "http protocol version not supported");
213 258
214 $self->{method} = $1; 259 $self->{method} = $1;
215 $self->{uri} = $2; 260 $self->{uri} = $2;
261 $self->{version} = $3;
262
263 $3 =~ /^1\./
264 or $self->err(506, "http protocol version $3 not supported");
216 265
217 # parse headers 266 # parse headers
218 { 267 {
219 my (%hdr, $h, $v); 268 my (%hdr, $h, $v);
220 269
… …
231 280
232 $self->{h}{$h} = substr $v, 1 281 $self->{h}{$h} = substr $v, 1
233 while ($h, $v) = each %hdr; 282 while ($h, $v) = each %hdr;
234 } 283 }
235 284
285 # find out server name and port
286 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
287 $host = $1;
288 } else {
289 $host = $self->{h}{host};
290 }
291
292 if (defined $host) {
236 $self->{server_port} = $self->{h}{host} =~ s/:([0-9]+)$// ? $1 : 80; 293 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
294 } else {
295 ($self->{server_port}, $host)
296 = unpack_sockaddr_in $self->{fh}->getsockname
297 or $self->err(500, "unable to get socket name");
298 $host = inet_ntoa $host;
299 }
237 300
301 $self->{server_name} = $host;
302
303 # remote id should be unique per user
304 $self->{remote_id} = $self->{remote_addr};
305
306 if (exists $self->{h}{"client-ip"}) {
307 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
308 } elsif (exists $self->{h}{"x-forwarded-for"}) {
309 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
310 }
311
238 weaken ($uri{$self->{uri}}{$self*1} = $self); 312 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self);
239 313
314 eval {
240 $self->map_uri; 315 $self->map_uri;
241 $self->respond; 316 $self->respond;
317 };
318
319 $self->eoconn;
320
321 die if $@ && !ref $@;
322
323 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1;
324
325 $fh->timeout($::PER_TIMEOUT);
242 #} 326 }
243} 327}
244 328
245# uri => path mapping 329# uri => path mapping
246sub map_uri { 330sub map_uri {
247 my $self = shift; 331 my $self = shift;
248 my $host = $self->{h}{host} || "default"; 332 my $host = $self->{server_name};
249 my $uri = $self->{uri}; 333 my $uri = $self->{uri};
250 334
251 # some massaging, also makes it more secure 335 # some massaging, also makes it more secure
252 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge; 336 $uri =~ s/%([0-9a-fA-F][0-9a-fA-F])/chr hex $1/ge;
253 $uri =~ s%//+%/%g; 337 $uri =~ s%//+%/%g;
… …
263 $self->{path} = "$::DOCROOT/$host$uri"; 347 $self->{path} = "$::DOCROOT/$host$uri";
264 348
265 $self->access_check; 349 $self->access_check;
266} 350}
267 351
268sub server_address {
269 my $self = shift;
270 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
271 or $self->err(500, "unable to get socket name");
272 ((inet_ntoa $iaddr), $port);
273}
274
275sub server_host {
276 my $self = shift;
277 if (exists $self->{h}{host}) {
278 return $self->{h}{host};
279 } else {
280 return (($self->server_address)[0]);
281 }
282}
283
284sub server_hostport {
285 my $self = shift;
286 my ($host, $port);
287 if (exists $self->{h}{host}) {
288 ($host, $port) = ($self->{h}{host}, $self->{server_port});
289 } else {
290 ($host, $port) = $self->server_address;
291 }
292 $port = $port == 80 ? "" : ":$port";
293 $host.$port;
294}
295
296sub _cgi { 352sub _cgi {
297 my $self = shift; 353 my $self = shift;
298 my $path = shift; 354 my $path = shift;
299 my $fh; 355 my $fh;
300 356
301 # no two-way xxx supported 357 # no two-way xxx supported
302 if (0 == fork) { 358 if (0 == fork) {
303 open STDOUT, ">&".fileno($self->{fh}); 359 open STDOUT, ">&".fileno($self->{fh});
304 if (chdir $::DOCROOT) { 360 if (chdir $::DOCROOT) {
305 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 361 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
306 $ENV{HTTP_HOST} = $self->server_host; 362 $ENV{HTTP_HOST} = $self->{server_name};
307 $ENV{HTTP_PORT} = $self->{server_host}; 363 $ENV{HTTP_PORT} = $self->{server_port};
308 $ENV{SCRIPT_NAME} = $self->{name}; 364 $ENV{SCRIPT_NAME} = $self->{name};
309 exec $::INDEXPROG; 365 exec $path;
310 } 366 }
311 Coro::State::_exit(0); 367 Coro::State::_exit(0);
312 } else { 368 } else {
369 die;
313 } 370 }
371}
372
373sub server_hostport {
374 $_[0]{server_port} == 80
375 ? $_[0]{server_name}
376 : "$_[0]{server_name}:$_[0]{server_port}";
314} 377}
315 378
316sub respond { 379sub respond {
317 my $self = shift; 380 my $self = shift;
318 my $path = $self->{path}; 381 my $path = $self->{path};
319 382
320 stat $path 383 stat $path
321 or $self->err(404, "not found"); 384 or $self->err(404, "not found");
385
386 $self->{stat} = [stat _];
322 387
323 # idiotic netscape sends idiotic headers AGAIN 388 # idiotic netscape sends idiotic headers AGAIN
324 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/ 389 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
325 ? str2time $1 : 0; 390 ? str2time $1 : 0;
326 391
327 if (-d _ && -r _) { 392 if (-d _ && -r _) {
328 # directory 393 # directory
329 if ($path !~ /\/$/) { 394 if ($path !~ /\/$/) {
330 # create a redirect to get the trailing "/" 395 # create a redirect to get the trailing "/"
331 my $host = $self->server_hostport; 396 # we don't try to avoid the :80
332 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" }); 397 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
333 } else { 398 } else {
334 $ims < (stat _)[9] 399 $ims < $self->{stat}[9]
335 or $self->err(304, "not modified"); 400 or $self->err(304, "not modified");
336 401
337 if ($self->{method} eq "GET") {
338 if (-r "$path/index.html") { 402 if (-r "$path/index.html") {
339 $self->{path} .= "/index.html"; 403 $self->{path} .= "/index.html";
340 $self->handle_file; 404 $self->handle_file;
341 } else { 405 } else {
342 $self->handle_dir; 406 $self->handle_dir;
343 }
344 } 407 }
345 } 408 }
346 } elsif (-f _ && -r _) { 409 } elsif (-f _ && -r _) {
347 -x _ and $self->err(403, "forbidden"); 410 -x _ and $self->err(403, "forbidden");
348 $self->handle_file; 411 $self->handle_file;
… …
351 } 414 }
352} 415}
353 416
354sub handle_dir { 417sub handle_dir {
355 my $self = shift; 418 my $self = shift;
356 $self->_cgi($::INDEXPROG); 419 my $idx = $self->diridx;
420
421 $self->response(200, "ok",
422 {
423 "Content-Type" => "text/html",
424 "Content-Length" => length $idx,
425 },
426 $idx);
357} 427}
358 428
359sub handle_file { 429sub handle_file {
360 my $self = shift; 430 my $self = shift;
361 my $length = -s _; 431 my $length = -s _;
… …
374 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 444 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
375 } else { 445 } else {
376 ($l, $h) = (0, $length - 1); 446 ($l, $h) = (0, $length - 1);
377 goto ignore; 447 goto ignore;
378 } 448 }
379 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 449 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
380 } 450 }
381 $hdr->{"Content-Range"} = "bytes */$length"; 451 $hdr->{"Content-Range"} = "bytes */$length";
452 $hdr->{"Content-Length"} = $length;
453 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
382 $self->err(416, "not satisfiable", $hdr); 454 $self->err(416, "not satisfiable", $hdr, "");
383 455
384satisfiable: 456satisfiable:
385 # check for segmented downloads 457 # check for segmented downloads
386 if ($l && $NO_SEGMENTED) { 458 if ($l && $::NO_SEGMENTED) {
387 if (%{$uri{$self->{uri}}} > 1) { 459 my $delay = 180;
388 $self->slog("segmented download refused\n"); 460 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) {
389 $self->err(400, "segmented downloads are not allowed"); 461 if ($delay <= 0) {
462 $self->err_segmented_download;
463 } else {
464 Coro::Event::do_timer(after => 3); $delay -= 3;
465 }
390 } 466 }
391 } 467 }
392 468
393 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 469 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
394 @code = (206, "partial content"); 470 @code = (206, "partial content");
… …
404 $hdr->{"Content-Length"} = $length; 480 $hdr->{"Content-Length"} = $length;
405 481
406 $self->response(@code, $hdr, ""); 482 $self->response(@code, $hdr, "");
407 483
408 if ($self->{method} eq "GET") { 484 if ($self->{method} eq "GET") {
485 $self->{time} = $::NOW;
486
487 my $transfer = $::transfers->guard;
488 $self->{fh}->writable or return;
489
490 push @::wait_time, $::NOW - $self->{time};
491 shift @::wait_time if @wait_time > $wait_time_length;
492 $self->{time} = $::NOW;
493
409 my ($fh, $buf); 494 my ($fh, $buf, $r);
495 my $current = $Coro::current;
410 open $fh, "<", $self->{path} 496 open $fh, "<", $self->{path}
411 or die "$self->{path}: late open failure ($!)"; 497 or die "$self->{path}: late open failure ($!)";
412 498
413 if ($l) {
414 sysseek $fh, $l, 0
415 or die "$self->{path}: cannot seek to $l ($!)";
416 }
417
418 $h -= $l - 1; 499 $h -= $l - 1;
419 500
501 if (0) {
502 if ($l) {
503 sysseek $fh, $l, 0;
504 }
505 }
506
420 while ($h > 0) { 507 while ($h > 0) {
508 if (0) {
421 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h; 509 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
510 or last;
511 } else {
512 undef $buf;
513 $aio_requests->down;
514 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
515 $buf, 0, sub {
516 $r = $_[0];
517 $current->ready;
518 });
519 &Coro::schedule;
520 $aio_requests->up;
521 last unless $r;
522 }
422 $self->{fh}->syswrite($buf) 523 my $w = $self->{fh}->syswrite($buf)
423 or last; 524 or last;
525 $::written += $w;
526 $self->{written} += $w;
527 $l += $r;
424 } 528 }
425 }
426 529
427 close $fh; 530 close $fh;
531 }
428} 532}
429 533
4301; 5341;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines