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

Diff Legend

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