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

Diff Legend

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