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

Diff Legend

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