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

Comparing cvsroot/Coro/myhttpd/httpd.pl (file contents):
Revision 1.1 by root, Thu Aug 9 02:57:54 2001 UTC vs.
Revision 1.45 by root, Sun Nov 11 03:32:19 2001 UTC

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

Diff Legend

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