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

Diff Legend

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