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.29 by root, Sat Aug 25 15:14:03 2001 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines