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.14 by root, Sun Aug 12 14:09:03 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;
74use Convert::Scalar 'weaken'; 113use Convert::Scalar 'weaken';
114use Linux::AIO;
75 115
116Linux::AIO::min_parallel $::AIO_PARALLEL;
117
118Event->io(fd => Linux::AIO::poll_fileno,
119 poll => 'r', async => 1,
120 cb => \&Linux::AIO::poll_cb);
121
76our %conn; # $conn{ip}{fh} => connobj 122our %conn; # $conn{ip}{self} => connobj
123our %uri; # $uri{ip}{uri}{self}
77our %blocked; 124our %blocked;
78our %mimetype; 125our %mimetype;
79 126
80sub read_mimetypes { 127sub read_mimetypes {
81 local *M; 128 local *M;
… …
101 or $self->err(500, "unable to decode peername"); 148 or $self->err(500, "unable to decode peername");
102 149
103 $self->{remote_addr} = inet_ntoa $iaddr; 150 $self->{remote_addr} = inet_ntoa $iaddr;
104 $self->{time} = $::NOW; 151 $self->{time} = $::NOW;
105 152
106 # enter ourselves into various lists
107 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
108
109 $::conns++; 153 $::conns++;
110 154
111 $self; 155 $self;
112} 156}
113 157
114sub DESTROY { 158sub DESTROY {
115 my $self = shift; 159 my $self = shift;
116
117 $::conns--; 160 $::conns--;
161 $self->eoconn;
162}
118 163
164# end of connection
165sub eoconn {
166 my $self = shift;
167
168 # clean up hints
119 delete $conn{$self->{remote_addr}}{$self*1}; 169 delete $conn{$self->{remote_id}}{$self*1};
120 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1}; 170 delete $uri{$self->{remote_id}}{$self->{uri}}{$self*1};
121} 171}
122 172
123sub slog { 173sub slog {
124 my $self = shift; 174 my $self = shift;
125 main::slog($_[0], "$self->{remote_addr}> $_[1]"); 175 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]");
126} 176}
127 177
128sub response { 178sub response {
129 my ($self, $code, $msg, $hdr, $content) = @_; 179 my ($self, $code, $msg, $hdr, $content) = @_;
130 my $res = "HTTP/1.0 $code $msg\015\012"; 180 my $res = "HTTP/1.1 $code $msg\015\012";
131 181
132 $res .= "Connection: close\015\012"; 182 $self->{h}{connection} ||= $hdr->{Connection};
133 $res .= "Date: ".(time2str $::NOW)."\015\012"; # slow? nah. :( 183
184 $res .= "Date: $HTTP_NOW\015\012";
134 185
135 while (my ($h, $v) = each %$hdr) { 186 while (my ($h, $v) = each %$hdr) {
136 $res .= "$h: $v\015\012" 187 $res .= "$h: $v\015\012"
137 } 188 }
138 $res .= "\015\012"; 189 $res .= "\015\012";
139 190
140 $res .= $content if defined $content and $self->{method} ne "HEAD"; 191 $res .= $content if defined $content and $self->{method} ne "HEAD";
141 192
142 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;
143 197
144 $self->{written} += 198 $self->{written} +=
145 print {$self->{fh}} $res; 199 print {$self->{fh}} $res;
146} 200}
147 201
148sub err { 202sub err {
149 my $self = shift; 203 my $self = shift;
150 my ($code, $msg, $hdr, $content) = @_; 204 my ($code, $msg, $hdr, $content) = @_;
151 205
152 unless (defined $content) { 206 unless (defined $content) {
153 $content = "$code $msg"; 207 $content = "$code $msg\n";
154 $hdr->{"Content-Type"} = "text/plain"; 208 $hdr->{"Content-Type"} = "text/plain";
155 $hdr->{"Content-Length"} = length $content; 209 $hdr->{"Content-Length"} = length $content;
156 } 210 }
211 $hdr->{"Connection"} = "close";
157 212
158 $self->response($code, $msg, $hdr, $content); 213 $self->response($code, $msg, $hdr, $content);
159 214
160 die bless {}, err::; 215 die bless {}, err::;
161} 216}
162 217
163sub err_blocked {
164 my $self = shift;
165 my $ip = $self->{remote_addr};
166 my $time = time2str $blocked{$ip} = $::NOW + $::BLOCKTIME;
167
168 Coro::Event::do_timer(after => 15);
169
170 $self->err(401, "too many connections",
171 {
172 "Content-Type" => "text/html",
173 "Retry-After" => $::BLOCKTIME
174 },
175 <<EOF);
176<html><p>
177You have been blocked because you opened too many connections. You
178may retry at</p>
179
180 <p><blockquote>$time.</blockquote></p>
181
182<p>Until then, each new access will renew the block. You might want to have a
183look at the <a href="http://www.goof.com/pcg/marc/animefaq.html">FAQ</a>.</p>
184</html>
185EOF
186}
187
188sub handle { 218sub handle {
189 my $self = shift; 219 my $self = shift;
190 my $fh = $self->{fh}; 220 my $fh = $self->{fh};
191 221
222 my $host;
223
224 $fh->timeout($::REQ_TIMEOUT);
192 #while() { 225 while() {
226 $self->{reqs}++;
227
228 # read request and parse first line
229 my $req = $fh->readline("\015\012\015\012");
230
231 unless (defined $req) {
232 if (exists $self->{version}) {
233 last;
234 } else {
235 $self->err(408, "request timeout");
236 }
237 }
238
193 $self->{h} = {}; 239 $self->{h} = {};
194 240
195 # read request and parse first line
196 $fh->timeout($::REQ_TIMEOUT);
197 my $req = $fh->readline("\015\012\015\012");
198 $fh->timeout($::RES_TIMEOUT); 241 $fh->timeout($::RES_TIMEOUT);
199
200 defined $req or
201 $self->err(408, "request timeout");
202
203 my $ip = $self->{remote_addr};
204
205 $self->err_blocked($blocked{$ip});
206 if ($blocked{$ip}) {
207 $self->err_blocked($blocked{$ip})
208 if $blocked{$ip} > $::NOW;
209
210 delete $blocked{$ip};
211 }
212
213 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
214 $self->slog(2, "blocked ip $ip");
215 $self->err_blocked;
216 }
217 242
218 $req =~ /^(?:\015\012)? 243 $req =~ /^(?:\015\012)?
219 (GET|HEAD) \040+ 244 (GET|HEAD) \040+
220 ([^\040]+) \040+ 245 ([^\040]+) \040+
221 HTTP\/([0-9]+\.[0-9]+) 246 HTTP\/([0-9]+\.[0-9]+)
222 \015\012/gx 247 \015\012/gx
223 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" }); 248 or $self->err(405, "method not allowed", { Allow => "GET,HEAD" });
224 249
225 $2 ne "1.0"
226 or $self->err(506, "http protocol version not supported");
227
228 $self->{method} = $1; 250 $self->{method} = $1;
229 $self->{uri} = $2; 251 $self->{uri} = $2;
252 $self->{version} = $3;
253
254 $3 =~ /^1\./
255 or $self->err(506, "http protocol version $3 not supported");
230 256
231 # parse headers 257 # parse headers
232 { 258 {
233 my (%hdr, $h, $v); 259 my (%hdr, $h, $v);
234 260
… …
245 271
246 $self->{h}{$h} = substr $v, 1 272 $self->{h}{$h} = substr $v, 1
247 while ($h, $v) = each %hdr; 273 while ($h, $v) = each %hdr;
248 } 274 }
249 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) {
250 $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 }
251 321
322 $self->{server_name} = $host;
323
324 # enter ourselves into various lists
325 weaken ($conn{$id}{$self*1} = $self);
252 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 326 weaken ($uri{$id}{$self->{uri}}{$self*1} = $self);
253 327
328 eval {
254 $self->map_uri; 329 $self->map_uri;
255 $self->respond; 330 $self->respond;
331 };
332
333 $self->eoconn;
334
335 die if $@ && !ref $@;
336
337 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1;
338
339 $fh->timeout($::PER_TIMEOUT);
256 #} 340 }
257} 341}
258 342
259# uri => path mapping 343# uri => path mapping
260sub map_uri { 344sub map_uri {
261 my $self = shift; 345 my $self = shift;
262 my $host = $self->{h}{host} || "default"; 346 my $host = $self->{server_name};
263 my $uri = $self->{uri}; 347 my $uri = $self->{uri};
264 348
265 # some massaging, also makes it more secure 349 # some massaging, also makes it more secure
266 $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;
267 $uri =~ s%//+%/%g; 351 $uri =~ s%//+%/%g;
… …
277 $self->{path} = "$::DOCROOT/$host$uri"; 361 $self->{path} = "$::DOCROOT/$host$uri";
278 362
279 $self->access_check; 363 $self->access_check;
280} 364}
281 365
282sub server_address {
283 my $self = shift;
284 my ($port, $iaddr) = unpack_sockaddr_in $self->{fh}->getsockname
285 or $self->err(500, "unable to get socket name");
286 ((inet_ntoa $iaddr), $port);
287}
288
289sub server_host {
290 my $self = shift;
291 if (exists $self->{h}{host}) {
292 return $self->{h}{host};
293 } else {
294 return (($self->server_address)[0]);
295 }
296}
297
298sub server_hostport {
299 my $self = shift;
300 my ($host, $port);
301 if (exists $self->{h}{host}) {
302 ($host, $port) = ($self->{h}{host}, $self->{server_port});
303 } else {
304 ($host, $port) = $self->server_address;
305 }
306 $port = $port == 80 ? "" : ":$port";
307 $host.$port;
308}
309
310sub _cgi { 366sub _cgi {
311 my $self = shift; 367 my $self = shift;
312 my $path = shift; 368 my $path = shift;
313 my $fh; 369 my $fh;
314 370
315 # no two-way xxx supported 371 # no two-way xxx supported
316 if (0 == fork) { 372 if (0 == fork) {
317 open STDOUT, ">&".fileno($self->{fh}); 373 open STDOUT, ">&".fileno($self->{fh});
318 if (chdir $::DOCROOT) { 374 if (chdir $::DOCROOT) {
319 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike 375 $ENV{SERVER_SOFTWARE} = "thttpd-myhttpd"; # we are thttpd-alike
320 $ENV{HTTP_HOST} = $self->server_host; 376 $ENV{HTTP_HOST} = $self->{server_name};
321 $ENV{HTTP_PORT} = $self->{server_host}; 377 $ENV{HTTP_PORT} = $self->{server_port};
322 $ENV{SCRIPT_NAME} = $self->{name}; 378 $ENV{SCRIPT_NAME} = $self->{name};
323 exec $path; 379 exec $path;
324 } 380 }
325 Coro::State::_exit(0); 381 Coro::State::_exit(0);
326 } else { 382 } else {
383 die;
327 } 384 }
385}
386
387sub server_hostport {
388 $_[0]{server_port} == 80
389 ? $_[0]{server_name}
390 : "$_[0]{server_name}:$_[0]{server_port}";
328} 391}
329 392
330sub respond { 393sub respond {
331 my $self = shift; 394 my $self = shift;
332 my $path = $self->{path}; 395 my $path = $self->{path};
… …
342 405
343 if (-d _ && -r _) { 406 if (-d _ && -r _) {
344 # directory 407 # directory
345 if ($path !~ /\/$/) { 408 if ($path !~ /\/$/) {
346 # create a redirect to get the trailing "/" 409 # create a redirect to get the trailing "/"
347 my $host = $self->server_hostport; 410 # we don't try to avoid the :80
348 $self->err(301, "moved permanently", { Location => "http://$host$self->{uri}/" }); 411 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
349 } else { 412 } else {
350 $ims < $self->{stat}[9] 413 $ims < $self->{stat}[9]
351 or $self->err(304, "not modified"); 414 or $self->err(304, "not modified");
352 415
353 if ($self->{method} eq "GET") {
354 if (-r "$path/index.html") { 416 if (-r "$path/index.html") {
355 $self->{path} .= "/index.html"; 417 $self->{path} .= "/index.html";
356 $self->handle_file; 418 $self->handle_file;
357 } else { 419 } else {
358 $self->handle_dir; 420 $self->handle_dir;
359 }
360 } 421 }
361 } 422 }
362 } elsif (-f _ && -r _) { 423 } elsif (-f _ && -r _) {
363 -x _ and $self->err(403, "forbidden"); 424 -x _ and $self->err(403, "forbidden");
364 $self->handle_file; 425 $self->handle_file;
… …
379 $idx); 440 $idx);
380} 441}
381 442
382sub handle_file { 443sub handle_file {
383 my $self = shift; 444 my $self = shift;
384 my $length = -s _; 445 my $length = $self->{stat}[7];
446 my $queue = $::transfers[$length >= $::TRANSFER_SMALL];
385 my $hdr = { 447 my $hdr = {
386 "Last-Modified" => time2str ((stat _)[9]), 448 "Last-Modified" => time2str ((stat _)[9]),
387 }; 449 };
388 450
389 my @code = (200, "ok"); 451 my @code = (200, "ok");
… …
397 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1); 459 ($l, $h) = ($1, ($2 ne "" || $2 >= $length) ? $2 : $length - 1);
398 } else { 460 } else {
399 ($l, $h) = (0, $length - 1); 461 ($l, $h) = (0, $length - 1);
400 goto ignore; 462 goto ignore;
401 } 463 }
402 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h > $l; 464 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
403 } 465 }
404 $hdr->{"Content-Range"} = "bytes */$length"; 466 $hdr->{"Content-Range"} = "bytes */$length";
467 $hdr->{"Content-Length"} = $length;
405 $self->err(416, "not satisfiable", $hdr); 468 $self->err(416, "not satisfiable", $hdr, "");
406 469
407satisfiable: 470satisfiable:
408 # check for segmented downloads 471 # check for segmented downloads
409 if ($l && $::NO_SEGMENTED) { 472 if ($l && $::NO_SEGMENTED) {
473 my $delay = $::PER_TIMEOUT + 15;
410 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 {
411 Coro::Event::do_timer(after => 15); 478 Coro::Event::do_timer(after => 4); $delay -= 4;
412 479 }
413 $self->err(400, "segmented downloads are not allowed");
414 } 480 }
415 } 481 }
416 482
417 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 483 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
418 @code = (206, "partial content"); 484 @code = (206, "partial content");
… …
428 $hdr->{"Content-Length"} = $length; 494 $hdr->{"Content-Length"} = $length;
429 495
430 $self->response(@code, $hdr, ""); 496 $self->response(@code, $hdr, "");
431 497
432 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
433 my ($fh, $buf); 516 my ($fh, $buf, $r);
517 my $current = $Coro::current;
434 open $fh, "<", $self->{path} 518 open $fh, "<", $self->{path}
435 or die "$self->{path}: late open failure ($!)"; 519 or die "$self->{path}: late open failure ($!)";
436 520
437 if ($l) {
438 sysseek $fh, $l, 0
439 or die "$self->{path}: cannot seek to $l ($!)";
440 }
441
442 $h -= $l - 1; 521 $h -= $l - 1;
443 522
523 if (0) {
524 if ($l) {
525 sysseek $fh, $l, 0;
526 }
527 }
528
444 while ($h > 0) { 529 while ($h > 0) {
530 if (0) {
445 $h -= sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h; 531 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h
446 my $w = $self->{fh}->syswrite($buf) 532 or last;
533 } else {
534 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
535 $buf, 0, sub {
536 $r = $_[0];
537 Coro::ready($current);
538 });
539 &Coro::schedule;
540 last unless $r;
541 }
542 my $w = syswrite $self->{fh}, $buf
447 or last; 543 or last;
448 $::written += $w; 544 $::written += $w;
449 $self->{written} += $w; 545 $self->{written} += $w;
546 $l += $r;
450 } 547 }
451 }
452 548
453 close $fh; 549 close $fh;
550 }
454} 551}
455 552
4561; 5531;

Diff Legend

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