ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/AnyEvent-HTTP/HTTP.pm
(Generate patch)

Comparing AnyEvent-HTTP/HTTP.pm (file contents):
Revision 1.10 by root, Thu Jun 5 13:06:43 2008 UTC vs.
Revision 1.29 by root, Wed Oct 22 23:28:11 2008 UTC

3AnyEvent::HTTP - simple but non-blocking HTTP/HTTPS client 3AnyEvent::HTTP - simple but non-blocking HTTP/HTTPS client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use AnyEvent::HTTP; 7 use AnyEvent::HTTP;
8
9 http_get "http://www.nethype.de/", sub { print $_[1] };
10
11 # ... do something else here
8 12
9=head1 DESCRIPTION 13=head1 DESCRIPTION
10 14
11This module is an L<AnyEvent> user, you need to make sure that you use and 15This module is an L<AnyEvent> user, you need to make sure that you use and
12run a supported event loop. 16run a supported event loop.
17
18This module implements a simple, stateless and non-blocking HTTP
19client. It supports GET, POST and other request methods, cookies and more,
20all on a very low level. It can follow redirects supports proxies and
21automatically limits the number of connections to the values specified in
22the RFC.
23
24It should generally be a "good client" that is enough for most HTTP
25tasks. Simple tasks should be simple, but complex tasks should still be
26possible as the user retains control over request and response headers.
27
28The caller is responsible for authentication management, cookies (if
29the simplistic implementation in this module doesn't suffice), referer
30and other high-level protocol details for which this module offers only
31limited support.
13 32
14=head2 METHODS 33=head2 METHODS
15 34
16=over 4 35=over 4
17 36
29use AnyEvent::Socket (); 48use AnyEvent::Socket ();
30use AnyEvent::Handle (); 49use AnyEvent::Handle ();
31 50
32use base Exporter::; 51use base Exporter::;
33 52
34our $VERSION = '1.0'; 53our $VERSION = '1.05';
35 54
36our @EXPORT = qw(http_get http_request); 55our @EXPORT = qw(http_get http_post http_head http_request);
37 56
38our $USERAGENT = "Mozilla/5.0 (compatible; AnyEvent::HTTP/$VERSION; +http://software.schmorp.de/pkg/AnyEvent)"; 57our $USERAGENT = "Mozilla/5.0 (compatible; AnyEvent::HTTP/$VERSION; +http://software.schmorp.de/pkg/AnyEvent)";
39our $MAX_RECURSE = 10; 58our $MAX_RECURSE = 10;
40our $MAX_PERSISTENT = 8; 59our $MAX_PERSISTENT = 8;
41our $PERSISTENT_TIMEOUT = 2; 60our $PERSISTENT_TIMEOUT = 2;
42our $TIMEOUT = 300; 61our $TIMEOUT = 300;
43 62
44# changing these is evil 63# changing these is evil
45our $MAX_PERSISTENT_PER_HOST = 2; 64our $MAX_PERSISTENT_PER_HOST = 2;
46our $MAX_PER_HOST = 4; # not respected yet :( 65our $MAX_PER_HOST = 4;
47 66
48our $PROXY; 67our $PROXY;
68our $ACTIVE = 0;
49 69
50my %KA_COUNT; # number of open keep-alive connections per host 70my %KA_COUNT; # number of open keep-alive connections per host
71my %CO_SLOT; # number of open connections, and wait queue, per host
51 72
52=item http_get $url, key => value..., $cb->($data, $headers) 73=item http_get $url, key => value..., $cb->($data, $headers)
53 74
54Executes an HTTP-GET request. See the http_request function for details on 75Executes an HTTP-GET request. See the http_request function for details on
55additional parameters. 76additional parameters and the return value.
56 77
57=item http_head $url, key => value..., $cb->($data, $headers) 78=item http_head $url, key => value..., $cb->($data, $headers)
58 79
59Executes an HTTP-HEAD request. See the http_request function for details on 80Executes an HTTP-HEAD request. See the http_request function for details
60additional parameters. 81on additional parameters and the return value.
61 82
62=item http_post $url, $body, key => value..., $cb->($data, $headers) 83=item http_post $url, $body, key => value..., $cb->($data, $headers)
63 84
64Executes an HTTP-POST request with a request body of C<$bod>. See the 85Executes an HTTP-POST request with a request body of C<$body>. See the
65http_request function for details on additional parameters. 86http_request function for details on additional parameters and the return
87value.
66 88
67=item http_request $method => $url, key => value..., $cb->($data, $headers) 89=item http_request $method => $url, key => value..., $cb->($data, $headers)
68 90
69Executes a HTTP request of type C<$method> (e.g. C<GET>, C<POST>). The URL 91Executes a HTTP request of type C<$method> (e.g. C<GET>, C<POST>). The URL
70must be an absolute http or https URL. 92must be an absolute http or https URL.
93
94When called in void context, nothing is returned. In other contexts,
95C<http_request> returns a "cancellation guard" - you have to keep the
96object at least alive until the callback get called. If the object gets
97destroyed before the callbakc is called, the request will be cancelled.
71 98
72The callback will be called with the response data as first argument 99The callback will be called with the response data as first argument
73(or C<undef> if it wasn't available due to errors), and a hash-ref with 100(or C<undef> if it wasn't available due to errors), and a hash-ref with
74response headers as second argument. 101response headers as second argument.
75 102
76All the headers in that hash are lowercased. In addition to the response 103All the headers in that hash are lowercased. In addition to the response
77headers, the three "pseudo-headers" C<HTTPVersion>, C<Status> and 104headers, the "pseudo-headers" C<HTTPVersion>, C<Status> and C<Reason>
78C<Reason> contain the three parts of the HTTP Status-Line of the same 105contain the three parts of the HTTP Status-Line of the same name. The
106pseudo-header C<URL> contains the original URL (which can differ from the
107requested URL when following redirects).
108
79name. If the server sends a header multiple lines, then their contents 109If the server sends a header multiple lines, then their contents will be
80will be joined together with C<\x00>. 110joined together with C<\x00>.
81 111
82If an internal error occurs, such as not being able to resolve a hostname, 112If an internal error occurs, such as not being able to resolve a hostname,
83then C<$data> will be C<undef>, C<< $headers->{Status} >> will be C<599> 113then C<$data> will be C<undef>, C<< $headers->{Status} >> will be C<599>
84and the C<Reason> pseudo-header will contain an error message. 114and the C<Reason> pseudo-header will contain an error message.
85 115
105Whether to recurse requests or not, e.g. on redirects, authentication 135Whether to recurse requests or not, e.g. on redirects, authentication
106retries and so on, and how often to do so. 136retries and so on, and how often to do so.
107 137
108=item headers => hashref 138=item headers => hashref
109 139
110The request headers to use. 140The request headers to use. Currently, C<http_request> may provide its
141own C<Host:>, C<Content-Length:>, C<Connection:> and C<Cookie:> headers
142and will provide defaults for C<User-Agent:> and C<Referer:>.
111 143
112=item timeout => $seconds 144=item timeout => $seconds
113 145
114The time-out to use for various stages - each connect attempt will reset 146The time-out to use for various stages - each connect attempt will reset
115the timeout, as will read or write activity. Default timeout is 5 minutes. 147the timeout, as will read or write activity. Default timeout is 5 minutes.
163 use Data::Dumper; 195 use Data::Dumper;
164 print Dumper $hdr; 196 print Dumper $hdr;
165 } 197 }
166 ; 198 ;
167 199
200Example: make another simple HTTP GET request, but immediately try to
201cancel it.
202
203 my $request = http_request GET => "http://www.nethype.de/", sub {
204 my ($body, $hdr) = @_;
205 print "$body\n";
206 };
207
208 undef $request;
209
168=cut 210=cut
169 211
212sub _slot_schedule;
213sub _slot_schedule($) {
214 my $host = shift;
215
216 while ($CO_SLOT{$host}[0] < $MAX_PER_HOST) {
217 if (my $cb = shift @{ $CO_SLOT{$host}[1] }) {
218 # somebody wants that slot
219 ++$CO_SLOT{$host}[0];
220 ++$ACTIVE;
221
222 $cb->(AnyEvent::Util::guard {
223 --$ACTIVE;
224 --$CO_SLOT{$host}[0];
225 _slot_schedule $host;
226 });
227 } else {
228 # nobody wants the slot, maybe we can forget about it
229 delete $CO_SLOT{$host} unless $CO_SLOT{$host}[0];
230 last;
231 }
232 }
233}
234
235# wait for a free slot on host, call callback
236sub _get_slot($$) {
237 push @{ $CO_SLOT{$_[0]}[1] }, $_[1];
238
239 _slot_schedule $_[0];
240}
241
170sub http_request($$$;@) { 242sub http_request($$@) {
171 my $cb = pop; 243 my $cb = pop;
172 my ($method, $url, %arg) = @_; 244 my ($method, $url, %arg) = @_;
173 245
174 my %hdr; 246 my %hdr;
175 247
179 while (my ($k, $v) = each %$hdr) { 251 while (my ($k, $v) = each %$hdr) {
180 $hdr{lc $k} = $v; 252 $hdr{lc $k} = $v;
181 } 253 }
182 } 254 }
183 255
184 my $recurse = exists $arg{recurse} ? $arg{recurse} : $MAX_RECURSE; 256 my $recurse = exists $arg{recurse} ? delete $arg{recurse} : $MAX_RECURSE;
185 257
186 return $cb->(undef, { Status => 599, Reason => "recursion limit reached" }) 258 return $cb->(undef, { Status => 599, Reason => "recursion limit reached", URL => $url })
187 if $recurse < 0; 259 if $recurse < 0;
188 260
189 my $proxy = $arg{proxy} || $PROXY; 261 my $proxy = $arg{proxy} || $PROXY;
190 my $timeout = $arg{timeout} || $TIMEOUT; 262 my $timeout = $arg{timeout} || $TIMEOUT;
191 263
196 268
197 $scheme = lc $scheme; 269 $scheme = lc $scheme;
198 270
199 my $uport = $scheme eq "http" ? 80 271 my $uport = $scheme eq "http" ? 80
200 : $scheme eq "https" ? 443 272 : $scheme eq "https" ? 443
201 : return $cb->(undef, { Status => 599, Reason => "only http and https URL schemes supported" }); 273 : return $cb->(undef, { Status => 599, Reason => "only http and https URL schemes supported", URL => $url });
274
275 $hdr{referer} ||= "$scheme://$authority$upath"; # leave out fragment and query string, just a heuristic
202 276
203 $authority =~ /^(?: .*\@ )? ([^\@:]+) (?: : (\d+) )?$/x 277 $authority =~ /^(?: .*\@ )? ([^\@:]+) (?: : (\d+) )?$/x
204 or return $cb->(undef, { Status => 599, Reason => "unparsable URL" }); 278 or return $cb->(undef, { Status => 599, Reason => "unparsable URL", URL => $url });
205 279
206 my $uhost = $1; 280 my $uhost = $1;
207 $uport = $2 if defined $2; 281 $uport = $2 if defined $2;
208 282
209 $uhost =~ s/^\[(.*)\]$/$1/; 283 $uhost =~ s/^\[(.*)\]$/$1/;
245 $hdr{host} = $uhost; 319 $hdr{host} = $uhost;
246 } 320 }
247 321
248 $hdr{"content-length"} = length $arg{body}; 322 $hdr{"content-length"} = length $arg{body};
249 323
250 my %state; 324 my %state = (connect_guard => 1);
251 325
326 _get_slot $uhost, sub {
327 $state{slot_guard} = shift;
328
329 return unless $state{connect_guard};
330
252 $state{connect_guard} = AnyEvent::Socket::tcp_connect $rhost, $rport, sub { 331 $state{connect_guard} = AnyEvent::Socket::tcp_connect $rhost, $rport, sub {
253 $state{fh} = shift 332 $state{fh} = shift
254 or return $cb->(undef, { Status => 599, Reason => "$!" }); 333 or return $cb->(undef, { Status => 599, Reason => "$!", URL => $url });
255 334
256 delete $state{connect_guard}; # reduce memory usage, save a tree 335 delete $state{connect_guard}; # reduce memory usage, save a tree
257 336
258 # get handle 337 # get handle
259 $state{handle} = new AnyEvent::Handle 338 $state{handle} = new AnyEvent::Handle
260 fh => $state{fh}, 339 fh => $state{fh},
261 ($scheme eq "https" ? (tls => "connect") : ()); 340 ($scheme eq "https" ? (tls => "connect") : ());
262 341
263 # limit the number of persistent connections 342 # limit the number of persistent connections
264 if ($KA_COUNT{$_[1]} < $MAX_PERSISTENT_PER_HOST) { 343 if ($KA_COUNT{$_[1]} < $MAX_PERSISTENT_PER_HOST) {
265 ++$KA_COUNT{$_[1]}; 344 ++$KA_COUNT{$_[1]};
266 $state{handle}{ka_count_guard} = AnyEvent::Util::guard { --$KA_COUNT{$_[1]} }; 345 $state{handle}{ka_count_guard} = AnyEvent::Util::guard { --$KA_COUNT{$_[1]} };
267 $hdr{connection} = "keep-alive"; 346 $hdr{connection} = "keep-alive";
268 delete $hdr{connection}; # keep-alive not yet supported 347 delete $hdr{connection}; # keep-alive not yet supported
269 } else { 348 } else {
270 delete $hdr{connection}; 349 delete $hdr{connection};
271 } 350 }
272 351
273 # (re-)configure handle 352 # (re-)configure handle
274 $state{handle}->timeout ($timeout); 353 $state{handle}->timeout ($timeout);
275 $state{handle}->on_error (sub { 354 $state{handle}->on_error (sub {
355 my $errno = "$!";
276 %state = (); 356 %state = ();
277 $cb->(undef, { Status => 599, Reason => "$!" }); 357 $cb->(undef, { Status => 599, Reason => $errno, URL => $url });
278 }); 358 });
279 $state{handle}->on_eof (sub { 359 $state{handle}->on_eof (sub {
280 %state = (); 360 %state = ();
281 $cb->(undef, { Status => 599, Reason => "unexpected end-of-file" }); 361 $cb->(undef, { Status => 599, Reason => "unexpected end-of-file", URL => $url });
282 }); 362 });
283 363
284 # send request 364 # send request
285 $state{handle}->push_write ( 365 $state{handle}->push_write (
286 "$method $rpath HTTP/1.0\015\012" 366 "$method $rpath HTTP/1.0\015\012"
287 . (join "", map "$_: $hdr{$_}\015\012", keys %hdr) 367 . (join "", map "$_: $hdr{$_}\015\012", keys %hdr)
288 . "\015\012" 368 . "\015\012"
289 . (delete $arg{body}) 369 . (delete $arg{body})
290 );
291
292 %hdr = (); # reduce memory usage, save a kitten
293
294 # status line
295 $state{handle}->push_read (line => qr/\015?\012/, sub {
296 $_[1] =~ /^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) \s+ ([^\015\012]+)/ix
297 or return (%state = (), $cb->(undef, { Status => 599, Reason => "invalid server response ($_[1])" }));
298
299 my %hdr = ( # response headers
300 HTTPVersion => "\x00$1",
301 Status => "\x00$2",
302 Reason => "\x00$3",
303 ); 370 );
304 371
372 %hdr = (); # reduce memory usage, save a kitten
373
374 # status line
375 $state{handle}->push_read (line => qr/\015?\012/, sub {
376 $_[1] =~ /^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\015\012]*) )?/ix
377 or return (%state = (), $cb->(undef, { Status => 599, Reason => "invalid server response ($_[1])", URL => $url }));
378
379 my %hdr = ( # response headers
380 HTTPVersion => "\x00$1",
381 Status => "\x00$2",
382 Reason => "\x00$3",
383 URL => "\x00$url"
384 );
385
305 # headers, could be optimized a bit 386 # headers, could be optimized a bit
306 $state{handle}->unshift_read (line => qr/\015?\012\015?\012/, sub { 387 $state{handle}->unshift_read (line => qr/\015?\012\015?\012/, sub {
307 for ("$_[1]\012") { 388 for ("$_[1]\012") {
308 # we support spaces in field names, as lotus domino 389 # we support spaces in field names, as lotus domino
309 # creates them. 390 # creates them.
310 $hdr{lc $1} .= "\x00$2" 391 $hdr{lc $1} .= "\x00$2"
311 while /\G 392 while /\G
312 ([^:\000-\037]+): 393 ([^:\000-\037]+):
313 [\011\040]* 394 [\011\040]*
314 ((?: [^\015\012]+ | \015?\012[\011\040] )*) 395 ((?: [^\015\012]+ | \015?\012[\011\040] )*)
315 \015?\012 396 \015?\012
316 /gxc; 397 /gxc;
317 398
318 /\G$/ 399 /\G$/
319 or return (%state = (), $cb->(undef, { Status => 599, Reason => "garbled response headers" })); 400 or return (%state = (), $cb->(undef, { Status => 599, Reason => "garbled response headers", URL => $url }));
320 } 401 }
321 402
322 substr $_, 0, 1, "" 403 substr $_, 0, 1, ""
323 for values %hdr; 404 for values %hdr;
324 405
325 my $finish = sub { 406 my $finish = sub {
326 %state = (); 407 %state = ();
327 408
328 # set-cookie processing 409 # set-cookie processing
329 if ($arg{cookie_jar} && exists $hdr{"set-cookie"}) { 410 if ($arg{cookie_jar} && exists $hdr{"set-cookie"}) {
330 for (split /\x00/, $hdr{"set-cookie"}) { 411 for (split /\x00/, $hdr{"set-cookie"}) {
331 my ($cookie, @arg) = split /;\s*/; 412 my ($cookie, @arg) = split /;\s*/;
332 my ($name, $value) = split /=/, $cookie, 2; 413 my ($name, $value) = split /=/, $cookie, 2;
333 my %kv = (value => $value, map { split /=/, $_, 2 } @arg); 414 my %kv = (value => $value, map { split /=/, $_, 2 } @arg);
334 415
335 my $cdom = (delete $kv{domain}) || $uhost; 416 my $cdom = (delete $kv{domain}) || $uhost;
336 my $cpath = (delete $kv{path}) || "/"; 417 my $cpath = (delete $kv{path}) || "/";
337 418
338 $cdom =~ s/^.?/./; # make sure it starts with a "." 419 $cdom =~ s/^\.?/./; # make sure it starts with a "."
339 420
421 next if $cdom =~ /\.$/;
422
423 # this is not rfc-like and not netscape-like. go figure.
340 my $ndots = $cdom =~ y/.//; 424 my $ndots = $cdom =~ y/.//;
341 next if $ndots < ($cdom =~ /[^.]{3}$/ ? 2 : 3); 425 next if $ndots < ($cdom =~ /\.[^.][^.]\.[^.][^.]$/ ? 3 : 2);
342 426
343 # store it 427 # store it
344 $arg{cookie_jar}{version} = 1; 428 $arg{cookie_jar}{version} = 1;
345 $arg{cookie_jar}{$cdom}{$cpath}{$name} = \%kv; 429 $arg{cookie_jar}{$cdom}{$cpath}{$name} = \%kv;
430 }
431 }
432
433 # microsoft and other shitheads don't give a shit for following standards,
434 # try to support some common forms of broken Location headers.
435 if ($_[1]{location} !~ /^(?: $ | [^:\/?\#]+ : )/x) {
436 $_[1]{location} =~ s/^\.\/+//;
437
438 my $url = "$scheme://$uhost:$uport";
439
440 unless ($_[1]{location} =~ s/^\///) {
441 $url .= $upath;
442 $url =~ s/\/[^\/]*$//;
443 }
444
445 $_[1]{location} = "$url/$_[1]{location}";
446 }
447
448 if ($_[1]{Status} =~ /^30[12]$/ && $recurse && $method ne "POST") {
449 # apparently, mozilla et al. just change POST to GET here
450 # more research is needed before we do the same
451 http_request ($method, $_[1]{location}, %arg, recurse => $recurse - 1, $cb);
452 } elsif ($_[1]{Status} == 303 && $recurse) {
453 # even http/1.1 is unlear on how to mutate the method
454 $method = "GET" unless $method eq "HEAD";
455 http_request ($method => $_[1]{location}, %arg, recurse => $recurse - 1, $cb);
456 } elsif ($_[1]{Status} == 307 && $recurse && $method =~ /^(?:GET|HEAD)$/) {
457 http_request ($method => $_[1]{location}, %arg, recurse => $recurse - 1, $cb);
458 } else {
459 $cb->($_[0], $_[1]);
460 }
461 };
462
463 if ($hdr{Status} =~ /^(?:1..|204|304)$/ or $method eq "HEAD") {
464 $finish->(undef, \%hdr);
465 } else {
466 if (exists $hdr{"content-length"}) {
467 $_[0]->unshift_read (chunk => $hdr{"content-length"}, sub {
468 # could cache persistent connection now
469 if ($hdr{connection} =~ /\bkeep-alive\b/i) {
470 # but we don't, due to misdesigns, this is annoyingly complex
471 };
472
473 $finish->($_[1], \%hdr);
474 });
475 } else {
476 # too bad, need to read until we get an error or EOF,
477 # no way to detect winged data.
478 $_[0]->on_error (sub {
479 $finish->($_[0]{rbuf}, \%hdr);
480 });
481 $_[0]->on_eof (undef);
482 $_[0]->on_read (sub { });
346 } 483 }
347 } 484 }
348
349 if ($_[1]{Status} =~ /^x30[12]$/ && $recurse) {
350 # microsoft and other assholes don't give a shit for following standards,
351 # try to support a common form of broken Location header.
352 $_[1]{location} =~ s%^/%$scheme://$uhost:$uport/%;
353
354 http_request ($method, $_[1]{location}, %arg, recurse => $recurse - 1, $cb);
355 } else {
356 $cb->($_[0], $_[1]);
357 }
358 }; 485 });
359
360 if ($hdr{Status} =~ /^(?:1..|204|304)$/ or $method eq "HEAD") {
361 $finish->(undef, \%hdr);
362 } else {
363 if (exists $hdr{"content-length"}) {
364 $_[0]->unshift_read (chunk => $hdr{"content-length"}, sub {
365 # could cache persistent connection now
366 if ($hdr{connection} =~ /\bkeep-alive\b/i) {
367 # but we don't, due to misdesigns, this is annoyingly complex
368 };
369
370 $finish->($_[1], \%hdr);
371 });
372 } else {
373 # too bad, need to read until we get an error or EOF,
374 # no way to detect winged data.
375 $_[0]->on_error (sub {
376 $finish->($_[0]{rbuf}, \%hdr);
377 });
378 $_[0]->on_eof (undef);
379 $_[0]->on_read (sub { });
380 }
381 }
382 }); 486 });
487 }, sub {
488 $timeout
383 }); 489 };
384 }, sub {
385 $timeout
386 }; 490 };
387 491
388 defined wantarray && AnyEvent::Util::guard { %state = () } 492 defined wantarray && AnyEvent::Util::guard { %state = () }
389} 493}
390 494
391sub http_get($$;@) { 495sub http_get($@) {
392 unshift @_, "GET"; 496 unshift @_, "GET";
393 &http_request 497 &http_request
394} 498}
395 499
396sub http_head($$;@) { 500sub http_head($@) {
397 unshift @_, "HEAD"; 501 unshift @_, "HEAD";
398 &http_request 502 &http_request
399} 503}
400 504
401sub http_post($$$;@) { 505sub http_post($$@) {
506 my $url = shift;
402 unshift @_, "POST", "body"; 507 unshift @_, "POST", $url, "body";
403 &http_request 508 &http_request
404} 509}
405 510
406=back 511=back
407 512
433 538
434The maximum time to cache a persistent connection, in seconds (default: 2). 539The maximum time to cache a persistent connection, in seconds (default: 2).
435 540
436Not implemented currently. 541Not implemented currently.
437 542
543=item $AnyEvent::HTTP::ACTIVE
544
545The number of active connections. This is not the number of currently
546running requests, but the number of currently open and non-idle TCP
547connections. This number of can be useful for load-leveling.
548
438=back 549=back
439 550
440=cut 551=cut
441 552
442sub set_proxy($) { 553sub set_proxy($) {
450 561
451L<AnyEvent>. 562L<AnyEvent>.
452 563
453=head1 AUTHOR 564=head1 AUTHOR
454 565
455 Marc Lehmann <schmorp@schmorp.de> 566 Marc Lehmann <schmorp@schmorp.de>
456 http://home.schmorp.de/ 567 http://home.schmorp.de/
457 568
458=cut 569=cut
459 570
4601 5711
461 572

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines