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.33 by root, Wed Aug 29 01:40:44 2001 UTC vs.
Revision 1.62 by root, Sun Jan 6 05:29:39 2002 UTC

1use Coro; 1use Coro;
2use Coro::Semaphore; 2use Coro::Semaphore;
3use Coro::Event; 3use Coro::Event;
4use Coro::Socket; 4use Coro::Socket;
5use Coro::Signal;
5 6
6use HTTP::Date; 7use HTTP::Date;
8use POSIX ();
7 9
8no utf8; 10no utf8;
9use bytes; 11use bytes;
10
11our @wait_time = (); # used to calculcate avg. waiting time
12our $wait_time_length = 25;
13 12
14# at least on my machine, this thingy serves files 13# at least on my machine, this thingy serves files
15# quite a bit faster than apache, ;) 14# quite a bit faster than apache, ;)
16# and quite a bit slower than thttpd :( 15# and quite a bit slower than thttpd :(
17 16
18$SIG{PIPE} = 'IGNORE'; 17$SIG{PIPE} = 'IGNORE';
19 18
20our $accesslog; 19our $accesslog;
20our $errorlog;
21
22our $NOW;
23our $HTTP_NOW;
24
25Event->timer(interval => 1, hard => 1, cb => sub {
26 $NOW = time;
27 $HTTP_NOW = time2str $NOW;
28})->now;
29
30if ($ERROR_LOG) {
31 use IO::Handle;
32 open $errorlog, ">>$ERROR_LOG"
33 or die "$ERROR_LOG: $!";
34 $errorlog->autoflush(1);
35}
21 36
22if ($ACCESS_LOG) { 37if ($ACCESS_LOG) {
23 use IO::Handle; 38 use IO::Handle;
24 open $accesslog, ">>$ACCESS_LOG" 39 open $accesslog, ">>$ACCESS_LOG"
25 or die "$ACCESS_LOG: $!"; 40 or die "$ACCESS_LOG: $!";
… …
27} 42}
28 43
29sub slog { 44sub slog {
30 my $level = shift; 45 my $level = shift;
31 my $format = shift; 46 my $format = shift;
47 my $NOW = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $::NOW);
32 printf "---: $format\n", @_; 48 printf "$NOW: $format\n", @_;
49 printf $errorlog "$NOW: $format\n", @_ if $errorlog;
33} 50}
34 51
35our $connections = new Coro::Semaphore $MAX_CONNECTS || 250; 52our $connections = new Coro::Semaphore $MAX_CONNECTS || 250;
36our $transfers = new Coro::Semaphore $MAX_TRANSFER || 50; 53our $httpevent = new Coro::Signal;
54
55our $queue_file = new transferqueue slots => $MAX_TRANSFERS, maxsize => 250_000_000;
56our $queue_index = new transferqueue slots => 10;
57
58our $requests;
37 59
38my @newcons; 60my @newcons;
39my @pool; 61my @pool;
40 62
41# one "execution thread" 63# one "execution thread"
42sub handler { 64sub handler {
43 while () { 65 while () {
44 my $new = pop @newcons;
45 if ($new) { 66 if (@newcons) {
46 eval { 67 eval {
47 conn->new(@$new)->handle; 68 conn->new(@{pop @newcons})->handle;
48 }; 69 };
49 slog 1, "$@" if $@ && !ref $@; 70 slog 1, "$@" if $@ && !ref $@;
71
72 $httpevent->broadcast; # only for testing, but doesn't matter much
73
50 $connections->up; 74 $connections->up;
51 } else { 75 } else {
52 last if @pool >= $MAX_POOL; 76 last if @pool >= $MAX_POOL;
53 push @pool, $Coro::current; 77 push @pool, $Coro::current;
54 schedule; 78 schedule;
55 } 79 }
56 } 80 }
81}
82
83sub listen_on {
84 my $listen = $_[0];
85
86 push @listen_sockets, $listen;
87
88 # the "main thread"
89 async {
90 slog 1, "accepting connections";
91 while () {
92 $connections->down;
93 push @newcons, [$listen->accept];
94 #slog 3, "accepted @$connections ".scalar(@pool);
95 if (@pool) {
96 (pop @pool)->ready;
97 } else {
98 async \&handler;
99 }
100
101 }
102 };
57} 103}
58 104
59my $http_port = new Coro::Socket 105my $http_port = new Coro::Socket
60 LocalAddr => $SERVER_HOST, 106 LocalAddr => $SERVER_HOST,
61 LocalPort => $SERVER_PORT, 107 LocalPort => $SERVER_PORT,
62 ReuseAddr => 1, 108 ReuseAddr => 1,
63 Listen => 50, 109 Listen => 50,
64 or die "unable to start server"; 110 or die "unable to start server";
65 111
66push @listen_sockets, $http_port; 112listen_on $http_port;
67 113
68our $NOW; 114if ($SERVER_PORT2) {
69our $HTTP_NOW; 115 my $http_port = new Coro::Socket
116 LocalAddr => $SERVER_HOST,
117 LocalPort => $SERVER_PORT2,
118 ReuseAddr => 1,
119 Listen => 50,
120 or die "unable to start server";
70 121
71Event->timer(interval => 1, hard => 1, cb => sub { 122 listen_on $http_port;
72 $NOW = time; 123}
73 $HTTP_NOW = time2str $NOW;
74});
75
76# the "main thread"
77async {
78 slog 1, "accepting connections";
79 while () {
80 $connections->down;
81 push @newcons, [$http_port->accept];
82 #slog 3, "accepted @$connections ".scalar(@pool);
83 if (@pool) {
84 (pop @pool)->ready;
85 } else {
86 async \&handler;
87 }
88
89 }
90};
91 124
92package conn; 125package conn;
93 126
94use Socket; 127use Socket;
95use HTTP::Date; 128use HTTP::Date;
96use Convert::Scalar 'weaken'; 129use Convert::Scalar 'weaken';
97use Linux::AIO; 130use Linux::AIO;
98 131
99Linux::AIO::min_parallel $::AIO_PARALLEL; 132Linux::AIO::min_parallel $::AIO_PARALLEL;
100
101my $aio_requests = new Coro::Semaphore $::AIO_PARALLEL * 4;
102 133
103Event->io(fd => Linux::AIO::poll_fileno, 134Event->io(fd => Linux::AIO::poll_fileno,
104 poll => 'r', async => 1, 135 poll => 'r', async => 1,
105 cb => \&Linux::AIO::poll_cb); 136 cb => \&Linux::AIO::poll_cb);
106 137
… …
124 155
125read_mimetypes; 156read_mimetypes;
126 157
127sub new { 158sub new {
128 my $class = shift; 159 my $class = shift;
160 my $fh = shift;
129 my $peername = shift; 161 my $peername = shift;
130 my $fh = shift;
131 my $self = bless { fh => $fh }, $class; 162 my $self = bless { fh => $fh }, $class;
132 my (undef, $iaddr) = unpack_sockaddr_in $peername 163 my (undef, $iaddr) = unpack_sockaddr_in $peername
133 or $self->err(500, "unable to decode peername"); 164 or $self->err(500, "unable to decode peername");
134 165
166 $self->{remote_addr} =
135 $self->{remote_addr} = inet_ntoa $iaddr; 167 $self->{remote_id} = inet_ntoa $iaddr;
168
136 $self->{time} = $::NOW; 169 $self->{time} = $::NOW;
137 170
138 # enter ourselves into various lists 171 weaken ($Coro::current->{conn} = $self);
139 weaken ($conn{$self->{remote_addr}}{$self*1} = $self);
140 172
141 $::conns++; 173 $::conns++;
174 $::maxconns = $::conns if $::conns > $::maxconns;
142 175
143 $self; 176 $self;
144} 177}
145 178
146sub DESTROY { 179sub DESTROY {
147 my $self = shift; 180 #my $self = shift;
148
149 $::conns--; 181 $::conns--;
150
151 $self->eoconn;
152 delete $conn{$self->{remote_addr}}{$self*1};
153}
154
155# end of connection
156sub eoconn {
157 my $self = shift;
158 delete $uri{$self->{remote_addr}}{$self->{uri}}{$self*1};
159} 182}
160 183
161sub slog { 184sub slog {
162 my $self = shift; 185 my $self = shift;
163 main::slog($_[0], ($self->{remote_id} || $self->{remote_addr}) ."> $_[1]"); 186 main::slog($_[0], "$self->{remote_id}> $_[1]");
164} 187}
165 188
166sub response { 189sub response {
167 my ($self, $code, $msg, $hdr, $content) = @_; 190 my ($self, $code, $msg, $hdr, $content) = @_;
168 my $res = "HTTP/1.1 $code $msg\015\012"; 191 my $res = "HTTP/1.1 $code $msg\015\012";
169 192
170 $self->{h}{connection} ||= $hdr->{Connection}; 193 if (exists $hdr->{Connection}) {
194 if ($hdr->{Connection} =~ /close/) {
195 $self->{h}{connection} = "close"
196 }
197 } else {
198 if ($self->{version} < 1.1) {
199 if ($self->{h}{connection} =~ /keep-alive/i) {
200 $hdr->{Connection} = "Keep-Alive";
201 } else {
202 $self->{h}{connection} = "close"
203 }
204 }
205 }
171 206
172 $res .= "Date: $HTTP_NOW\015\012"; 207 $res .= "Date: $HTTP_NOW\015\012";
173 208
174 while (my ($h, $v) = each %$hdr) { 209 while (my ($h, $v) = each %$hdr) {
175 $res .= "$h: $v\015\012" 210 $res .= "$h: $v\015\012"
176 } 211 }
177 $res .= "\015\012"; 212 $res .= "\015\012";
178 213
179 $res .= $content if defined $content and $self->{method} ne "HEAD"; 214 $res .= $content if defined $content and $self->{method} ne "HEAD";
180 215
181 my $log = "$self->{remote_addr} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}." \"$self->{h}{referer}\"\n"; 216 my $log = (POSIX::strftime "%Y-%m-%d %H:%M:%S", gmtime $NOW).
217 " $self->{remote_id} \"$self->{uri}\" $code ".$hdr->{"Content-Length"}.
218 " \"$self->{h}{referer}\"\n";
182 219
183 print $accesslog $log if $accesslog; 220 print $accesslog $log if $accesslog;
184 print STDERR $log; 221 print STDERR $log;
185 222
186 $self->{written} += 223 $self->{written} +=
… …
190sub err { 227sub err {
191 my $self = shift; 228 my $self = shift;
192 my ($code, $msg, $hdr, $content) = @_; 229 my ($code, $msg, $hdr, $content) = @_;
193 230
194 unless (defined $content) { 231 unless (defined $content) {
195 $content = "$code $msg"; 232 $content = "$code $msg\n";
196 $hdr->{"Content-Type"} = "text/plain"; 233 $hdr->{"Content-Type"} = "text/plain";
197 $hdr->{"Content-Length"} = length $content; 234 $hdr->{"Content-Length"} = length $content;
198 } 235 }
199 $hdr->{"Connection"} = "close"; 236 $hdr->{"Connection"} = "close";
200 237
… …
225 } 262 }
226 263
227 $self->{h} = {}; 264 $self->{h} = {};
228 265
229 $fh->timeout($::RES_TIMEOUT); 266 $fh->timeout($::RES_TIMEOUT);
230 my $ip = $self->{remote_addr};
231
232 if ($blocked{$ip}) {
233 $self->err_blocked($blocked{$ip})
234 if $blocked{$ip} > $::NOW;
235
236 delete $blocked{$ip};
237 }
238
239 if (%{$conn{$ip}} > $::MAX_CONN_IP) {
240 my $delay = 120;
241 while (%{$conn{$ip}} > $::MAX_CONN_IP) {
242 if ($delay <= 0) {
243 $self->slog(2, "blocked ip $ip");
244 $self->err_blocked;
245 } else {
246 Coro::Event::do_timer(after => 3);
247 $delay -= 3;
248 }
249 }
250 }
251 267
252 $req =~ /^(?:\015\012)? 268 $req =~ /^(?:\015\012)?
253 (GET|HEAD) \040+ 269 (GET|HEAD) \040+
254 ([^\040]+) \040+ 270 ([^\040]+) \040+
255 HTTP\/([0-9]+\.[0-9]+) 271 HTTP\/([0-9]+\.[0-9]+)
… …
280 296
281 $self->{h}{$h} = substr $v, 1 297 $self->{h}{$h} = substr $v, 1
282 while ($h, $v) = each %hdr; 298 while ($h, $v) = each %hdr;
283 } 299 }
284 300
301 $requests++;
302
303 # remote id should be unique per user
304 my $id = $self->{remote_addr};
305
306 if (exists $self->{h}{"client-ip"}) {
307 $id .= "[".$self->{h}{"client-ip"}."]";
308 } elsif (exists $self->{h}{"x-forwarded-for"}) {
309 $id .= "[".$self->{h}{"x-forwarded-for"}."]";
310 }
311
312 $self->{remote_id} = $id;
313
314 weaken (local $conn{$id}{$self*1} = $self);
315
316 if ($blocked{$id}) {
317 $self->err_blocked
318 if $blocked{$id}[0] > $::NOW;
319
320 delete $blocked{$id};
321 }
322
285 # find out server name and port 323 # find out server name and port
286 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) { 324 if ($self->{uri} =~ s/^http:\/\/([^\/?#]*)//i) {
287 $host = $1; 325 $host = $1;
288 } else { 326 } else {
289 $host = $self->{h}{host}; 327 $host = $self->{h}{host};
… …
291 329
292 if (defined $host) { 330 if (defined $host) {
293 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80; 331 $self->{server_port} = $host =~ s/:([0-9]+)$// ? $1 : 80;
294 } else { 332 } else {
295 ($self->{server_port}, $host) 333 ($self->{server_port}, $host)
296 = unpack_sockaddr_in $self->{fh}->getsockname 334 = unpack_sockaddr_in $self->{fh}->sockname
297 or $self->err(500, "unable to get socket name"); 335 or $self->err(500, "unable to get socket name");
298 $host = inet_ntoa $host; 336 $host = inet_ntoa $host;
299 } 337 }
300 338
301 $self->{server_name} = $host; 339 $self->{server_name} = $host;
302 340
303 # remote id should be unique per user
304 $self->{remote_id} = $self->{remote_addr};
305
306 if (exists $self->{h}{"client-ip"}) {
307 $self->{remote_id} .= "[".$self->{h}{"client-ip"}."]";
308 } elsif (exists $self->{h}{"x-forwarded-for"}) {
309 $self->{remote_id} .= "[".$self->{h}{"x-forwarded-for"}."]";
310 }
311
312 weaken ($uri{$self->{remote_addr}}{$self->{uri}}{$self*1} = $self); 341 weaken (local $uri{$id}{$self->{uri}}{$self*1} = $self);
313 342
314 eval { 343 eval {
315 $self->map_uri; 344 $self->map_uri;
316 $self->respond; 345 $self->respond;
317 }; 346 };
318 347
319 $self->eoconn;
320
321 die if $@ && !ref $@; 348 die if $@ && !ref $@;
322 349
323 last if $self->{h}{connection} =~ /close/ || $self->{version} < 1.1; 350 last if $self->{h}{connection} =~ /close/i;
351
352 $httpevent->broadcast;
324 353
325 $fh->timeout($::PER_TIMEOUT); 354 $fh->timeout($::PER_TIMEOUT);
326 } 355 }
356}
357
358sub block {
359 my $self = shift;
360
361 $blocked{$self->{remote_id}} = [$::NOW + $_[0], $_[1]];
362 $self->slog(2, "blocked ip $self->{remote_id}");
363 $self->err_blocked;
327} 364}
328 365
329# uri => path mapping 366# uri => path mapping
330sub map_uri { 367sub map_uri {
331 my $self = shift; 368 my $self = shift;
… …
378 415
379sub respond { 416sub respond {
380 my $self = shift; 417 my $self = shift;
381 my $path = $self->{path}; 418 my $path = $self->{path};
382 419
383 stat $path 420 if ($self->{name} =~ s%^/internal/([^/]+)%%) {
384 or $self->err(404, "not found"); 421 if ($::internal{$1}) {
385 422 $::internal{$1}->($self);
386 $self->{stat} = [stat _];
387
388 # idiotic netscape sends idiotic headers AGAIN
389 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
390 ? str2time $1 : 0;
391
392 if (-d _ && -r _) {
393 # directory
394 if ($path !~ /\/$/) {
395 # create a redirect to get the trailing "/"
396 # we don't try to avoid the :80
397 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
398 } else { 423 } else {
399 $ims < $self->{stat}[9] 424 $self->err(404, "not found");
425 }
426 } else {
427
428 stat $path
400 or $self->err(304, "not modified"); 429 or $self->err(404, "not found");
401 430
402 if (-r "$path/index.html") { 431 $self->{stat} = [stat _];
403 $self->{path} .= "/index.html"; 432
404 $self->handle_file; 433 # idiotic netscape sends idiotic headers AGAIN
434 my $ims = $self->{h}{"if-modified-since"} =~ /^([^;]+)/
435 ? str2time $1 : 0;
436
437 if (-d _ && -r _) {
438 # directory
439 if ($path !~ /\/$/) {
440 # create a redirect to get the trailing "/"
441 # we don't try to avoid the :80
442 $self->err(301, "moved permanently", { Location => "http://".$self->server_hostport."$self->{uri}/" });
405 } else { 443 } else {
444 $ims < $self->{stat}[9]
445 or $self->err(304, "not modified");
446
447 if (-r "$path/index.html") {
448 # replace directory "size" by index.html filesize
449 $self->{stat} = [stat ($self->{path} .= "/index.html")];
450 $self->handle_file($queue_index);
451 } else {
406 $self->handle_dir; 452 $self->handle_dir;
407 } 453 }
408 } 454 }
409 } elsif (-f _ && -r _) { 455 } elsif (-f _ && -r _) {
410 -x _ and $self->err(403, "forbidden"); 456 -x _ and $self->err(403, "forbidden");
457
458 if (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
459 my $timeout = $::NOW + 10;
460 while (keys %{$conn{$self->{remote_id}}} > $::MAX_TRANSFERS_IP) {
461 if ($timeout < $::NOW) {
462 $self->block($::BLOCKTIME, "too many connections");
463 } else {
464 $httpevent->wait;
465 }
466 }
467 }
468
411 $self->handle_file; 469 $self->handle_file($queue_file);
412 } else { 470 } else {
413 $self->err(404, "not found"); 471 $self->err(404, "not found");
472 }
414 } 473 }
415} 474}
416 475
417sub handle_dir { 476sub handle_dir {
418 my $self = shift; 477 my $self = shift;
… …
420 479
421 $self->response(200, "ok", 480 $self->response(200, "ok",
422 { 481 {
423 "Content-Type" => "text/html", 482 "Content-Type" => "text/html",
424 "Content-Length" => length $idx, 483 "Content-Length" => length $idx,
484 "Last-Modified" => time2str ($self->{stat}[9]),
425 }, 485 },
426 $idx); 486 $idx);
427} 487}
428 488
429sub handle_file { 489sub handle_file {
430 my $self = shift; 490 my ($self, $queue) = @_;
431 my $length = -s _; 491 my $length = $self->{stat}[7];
432 my $hdr = { 492 my $hdr = {
433 "Last-Modified" => time2str ((stat _)[9]), 493 "Last-Modified" => time2str ((stat _)[9]),
434 }; 494 };
435 495
436 my @code = (200, "ok"); 496 my @code = (200, "ok");
… …
448 } 508 }
449 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l; 509 goto satisfiable if $l >= 0 && $l < $length && $h >= 0 && $h >= $l;
450 } 510 }
451 $hdr->{"Content-Range"} = "bytes */$length"; 511 $hdr->{"Content-Range"} = "bytes */$length";
452 $hdr->{"Content-Length"} = $length; 512 $hdr->{"Content-Length"} = $length;
453 $self->slog(9, "not satisfiable($self->{h}{range}|".$self->{h}{"user-agent"}.")");
454 $self->err(416, "not satisfiable", $hdr, ""); 513 $self->err(416, "not satisfiable", $hdr, "");
455 514
456satisfiable: 515satisfiable:
457 # check for segmented downloads 516 # check for segmented downloads
458 if ($l && $::NO_SEGMENTED) { 517 if ($l && $::NO_SEGMENTED) {
459 my $delay = 180; 518 my $timeout = $::NOW + 15;
460 while (%{$uri{$self->{remote_addr}}{$self->{uri}}} > 1) { 519 while (keys %{$uri{$self->{remote_id}}{$self->{uri}}} > 1) {
461 if ($delay <= 0) { 520 if ($timeout <= $::NOW) {
521 $self->block($::BLOCKTIME, "segmented downloads are forbidden");
462 $self->err_segmented_download; 522 #$self->err_segmented_download;
463 } else { 523 } else {
464 Coro::Event::do_timer(after => 3); $delay -= 3; 524 $httpevent->wait;
465 } 525 }
466 } 526 }
467 } 527 }
468 528
469 $hdr->{"Content-Range"} = "bytes $l-$h/$length"; 529 $hdr->{"Content-Range"} = "bytes $l-$h/$length";
… …
482 $self->response(@code, $hdr, ""); 542 $self->response(@code, $hdr, "");
483 543
484 if ($self->{method} eq "GET") { 544 if ($self->{method} eq "GET") {
485 $self->{time} = $::NOW; 545 $self->{time} = $::NOW;
486 546
487 my $transfer = $::transfers->guard; 547 my $current = $Coro::current;
488 $self->{fh}->writable or return;
489
490 push @::wait_time, $::NOW - $self->{time};
491 shift @::wait_time if @wait_time > $wait_time_length;
492 $self->{time} = $::NOW;
493 548
494 my ($fh, $buf, $r); 549 my ($fh, $buf, $r);
495 my $current = $Coro::current; 550
496 open $fh, "<", $self->{path} 551 open $fh, "<", $self->{path}
497 or die "$self->{path}: late open failure ($!)"; 552 or die "$self->{path}: late open failure ($!)";
498 553
499 $h -= $l - 1; 554 $h -= $l - 1;
500 555
501 if (0) { 556 if (0) { # !AIO
502 if ($l) { 557 if ($l) {
503 sysseek $fh, $l, 0; 558 sysseek $fh, $l, 0;
504 } 559 }
505 } 560 }
561
562 my $transfer = $queue->start_transfer($h);
563 my $locked;
564 my $bufsize = $::WAIT_BUFSIZE; # initial buffer size
506 565
507 while ($h > 0) { 566 while ($h > 0) {
567 unless ($locked) {
568 if ($locked ||= $transfer->try($::WAIT_INTERVAL)) {
569 $bufsize = $::BUFSIZE;
570 $self->{time} = $::NOW;
571 }
572 }
573
574 if ($blocked{$self->{remote_id}}) {
575 $self->{h}{connection} = "close";
576 die bless {}, err::;
577 }
578
508 if (0) { 579 if (0) { # !AIO
509 sysread $fh, $buf, $h > $::BUFSIZE ? $::BUFSIZE : $h 580 sysread $fh, $buf, $h > $bufsize ? $bufsize : $h
510 or last; 581 or last;
511 } else { 582 } else {
512 undef $buf; 583 aio_read($fh, $l, ($h > $bufsize ? $bufsize : $h),
513 $aio_requests->down;
514 aio_read($fh, $l, ($h > $::BUFSIZE ? $::BUFSIZE : $h),
515 $buf, 0, sub { 584 $buf, 0, sub {
516 $r = $_[0]; 585 $r = $_[0];
517 $current->ready; 586 Coro::ready($current);
518 }); 587 });
519 &Coro::schedule; 588 &Coro::schedule;
520 $aio_requests->up;
521 last unless $r; 589 last unless $r;
522 } 590 }
523 my $w = $self->{fh}->syswrite($buf) 591 my $w = syswrite $self->{fh}, $buf
524 or last; 592 or last;
525 $::written += $w; 593 $::written += $w;
526 $self->{written} += $w; 594 $self->{written} += $w;
527 $l += $r; 595 $l += $r;
528 } 596 }

Diff Legend

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