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.30 by root, Thu Oct 23 02:46:20 2008 UTC vs.
Revision 1.69 by root, Fri Dec 31 19:32:47 2010 UTC

39package AnyEvent::HTTP; 39package AnyEvent::HTTP;
40 40
41use strict; 41use strict;
42no warnings; 42no warnings;
43 43
44use Carp; 44use Errno ();
45 45
46use AnyEvent (); 46use AnyEvent 5.0 ();
47use AnyEvent::Util (); 47use AnyEvent::Util ();
48use AnyEvent::Socket ();
49use AnyEvent::Handle (); 48use AnyEvent::Handle ();
50 49
51use base Exporter::; 50use base Exporter::;
52 51
53our $VERSION = '1.05'; 52our $VERSION = '1.5';
54 53
55our @EXPORT = qw(http_get http_post http_head http_request); 54our @EXPORT = qw(http_get http_post http_head http_request);
56 55
57our $USERAGENT = "Mozilla/5.0 (compatible; AnyEvent::HTTP/$VERSION; +http://software.schmorp.de/pkg/AnyEvent)"; 56our $USERAGENT = "Mozilla/5.0 (compatible; U; AnyEvent-HTTP/$VERSION; +http://software.schmorp.de/pkg/AnyEvent)";
58our $MAX_RECURSE = 10; 57our $MAX_RECURSE = 10;
59our $MAX_PERSISTENT = 8; 58our $MAX_PERSISTENT = 8;
60our $PERSISTENT_TIMEOUT = 2; 59our $PERSISTENT_TIMEOUT = 2;
61our $TIMEOUT = 300; 60our $TIMEOUT = 300;
62 61
63# changing these is evil 62# changing these is evil
64our $MAX_PERSISTENT_PER_HOST = 2; 63our $MAX_PERSISTENT_PER_HOST = 0;
65our $MAX_PER_HOST = 4; 64our $MAX_PER_HOST = 4;
66 65
67our $PROXY; 66our $PROXY;
68our $ACTIVE = 0; 67our $ACTIVE = 0;
69 68
92must be an absolute http or https URL. 91must be an absolute http or https URL.
93 92
94When called in void context, nothing is returned. In other contexts, 93When called in void context, nothing is returned. In other contexts,
95C<http_request> returns a "cancellation guard" - you have to keep the 94C<http_request> returns a "cancellation guard" - you have to keep the
96object at least alive until the callback get called. If the object gets 95object at least alive until the callback get called. If the object gets
97destroyed before the callbakc is called, the request will be cancelled. 96destroyed before the callback is called, the request will be cancelled.
98 97
99The callback will be called with the response data as first argument 98The callback will be called with the response body data as first argument
100(or C<undef> if it wasn't available due to errors), and a hash-ref with 99(or C<undef> if an error occured), and a hash-ref with response headers
101response headers as second argument. 100(and trailers) as second argument.
102 101
103All the headers in that hash are lowercased. In addition to the response 102All the headers in that hash are lowercased. In addition to the response
104headers, the "pseudo-headers" C<HTTPVersion>, C<Status> and C<Reason> 103headers, the "pseudo-headers" (uppercase to avoid clashing with possible
104response headers) C<HTTPVersion>, C<Status> and C<Reason> contain the
105contain the three parts of the HTTP Status-Line of the same name. The 105three parts of the HTTP Status-Line of the same name. If an error occurs
106during the body phase of a request, then the original C<Status> and
107C<Reason> values from the header are available as C<OrigStatus> and
108C<OrigReason>.
109
106pseudo-header C<URL> contains the original URL (which can differ from the 110The pseudo-header C<URL> contains the actual URL (which can differ from
107requested URL when following redirects). 111the requested URL when following redirects - for example, you might get
112an error that your URL scheme is not supported even though your URL is a
113valid http URL because it redirected to an ftp URL, in which case you can
114look at the URL pseudo header).
108 115
116The pseudo-header C<Redirect> only exists when the request was a result
117of an internal redirect. In that case it is an array reference with
118the C<($data, $headers)> from the redirect response. Note that this
119response could in turn be the result of a redirect itself, and C<<
120$headers->{Redirect}[1]{Redirect} >> will then contain the original
121response, and so on.
122
109If the server sends a header multiple lines, then their contents will be 123If the server sends a header multiple times, then their contents will be
110joined together with C<\x00>. 124joined together with a comma (C<,>), as per the HTTP spec.
111 125
112If an internal error occurs, such as not being able to resolve a hostname, 126If an internal error occurs, such as not being able to resolve a hostname,
113then C<$data> will be C<undef>, C<< $headers->{Status} >> will be C<599> 127then C<$data> will be C<undef>, C<< $headers->{Status} >> will be C<59x>
114and the C<Reason> pseudo-header will contain an error message. 128(usually C<599>) and the C<Reason> pseudo-header will contain an error
129message.
115 130
116A typical callback might look like this: 131A typical callback might look like this:
117 132
118 sub { 133 sub {
119 my ($body, $hdr) = @_; 134 my ($body, $hdr) = @_;
135Whether to recurse requests or not, e.g. on redirects, authentication 150Whether to recurse requests or not, e.g. on redirects, authentication
136retries and so on, and how often to do so. 151retries and so on, and how often to do so.
137 152
138=item headers => hashref 153=item headers => hashref
139 154
140The request headers to use. Currently, C<http_request> may provide its 155The request headers to use. Currently, C<http_request> may provide its own
141own C<Host:>, C<Content-Length:>, C<Connection:> and C<Cookie:> headers 156C<Host:>, C<Content-Length:>, C<Connection:> and C<Cookie:> headers and
142and will provide defaults for C<User-Agent:> and C<Referer:>. 157will provide defaults at least for C<TE:>, C<Referer:> and C<User-Agent:>
158(this can be suppressed by using C<undef> for these headers in which case
159they won't be sent at all).
143 160
144=item timeout => $seconds 161=item timeout => $seconds
145 162
146The time-out to use for various stages - each connect attempt will reset 163The time-out to use for various stages - each connect attempt will reset
147the timeout, as will read or write activity. Default timeout is 5 minutes. 164the timeout, as will read or write activity, i.e. this is not an overall
165timeout.
166
167Default timeout is 5 minutes.
148 168
149=item proxy => [$host, $port[, $scheme]] or undef 169=item proxy => [$host, $port[, $scheme]] or undef
150 170
151Use the given http proxy for all requests. If not specified, then the 171Use the given http proxy for all requests. If not specified, then the
152default proxy (as specified by C<$ENV{http_proxy}>) is used. 172default proxy (as specified by C<$ENV{http_proxy}>) is used.
153 173
154C<$scheme> must be either missing or C<http> for HTTP, or C<https> for 174C<$scheme> must be either missing, C<http> for HTTP or C<https> for
155HTTPS. 175HTTPS.
156 176
157=item body => $string 177=item body => $string
158 178
159The request body, usually empty. Will be-sent as-is (future versions of 179The request body, usually empty. Will be sent as-is (future versions of
160this module might offer more options). 180this module might offer more options).
161 181
162=item cookie_jar => $hash_ref 182=item cookie_jar => $hash_ref
163 183
164Passing this parameter enables (simplified) cookie-processing, loosely 184Passing this parameter enables (simplified) cookie-processing, loosely
165based on the original netscape specification. 185based on the original netscape specification.
166 186
167The C<$hash_ref> must be an (initially empty) hash reference which will 187The C<$hash_ref> must be an (initially empty) hash reference which will
168get updated automatically. It is possible to save the cookie_jar to 188get updated automatically. It is possible to save the cookie_jar to
169persistent storage with something like JSON or Storable, but this is not 189persistent storage with something like JSON or Storable, but this is not
170recommended, as expire times are currently being ignored. 190recommended, as expiry times are currently being ignored.
171 191
172Note that this cookie implementation is not of very high quality, nor 192Note that this cookie implementation is not of very high quality, nor
173meant to be complete. If you want complete cookie management you have to 193meant to be complete. If you want complete cookie management you have to
174do that on your own. C<cookie_jar> is meant as a quick fix to get some 194do that on your own. C<cookie_jar> is meant as a quick fix to get some
175cookie-using sites working. Cookies are a privacy disaster, do not use 195cookie-using sites working. Cookies are a privacy disaster, do not use
176them unless required to. 196them unless required to.
177 197
198When cookie processing is enabled, the C<Cookie:> and C<Set-Cookie:>
199headers will be ste and handled by this module, otherwise they will be
200left untouched.
201
202=item tls_ctx => $scheme | $tls_ctx
203
204Specifies the AnyEvent::TLS context to be used for https connections. This
205parameter follows the same rules as the C<tls_ctx> parameter to
206L<AnyEvent::Handle>, but additionally, the two strings C<low> or
207C<high> can be specified, which give you a predefined low-security (no
208verification, highest compatibility) and high-security (CA and common-name
209verification) TLS context.
210
211The default for this option is C<low>, which could be interpreted as "give
212me the page, no matter what".
213
214=item on_prepare => $callback->($fh)
215
216In rare cases you need to "tune" the socket before it is used to
217connect (for exmaple, to bind it on a given IP address). This parameter
218overrides the prepare callback passed to C<AnyEvent::Socket::tcp_connect>
219and behaves exactly the same way (e.g. it has to provide a
220timeout). See the description for the C<$prepare_cb> argument of
221C<AnyEvent::Socket::tcp_connect> for details.
222
223=item tcp_connect => $callback->($host, $service, $connect_cb, $prepare_cb)
224
225In even rarer cases you want total control over how AnyEvent::HTTP
226establishes connections. Normally it uses L<AnyEvent::Socket::tcp_connect>
227to do this, but you can provide your own C<tcp_connect> function -
228obviously, it has to follow the same calling conventions, except that it
229may always return a connection guard object.
230
231There are probably lots of weird uses for this function, starting from
232tracing the hosts C<http_request> actually tries to connect, to (inexact
233but fast) host => IP address caching or even socks protocol support.
234
235=item on_header => $callback->($headers)
236
237When specified, this callback will be called with the header hash as soon
238as headers have been successfully received from the remote server (not on
239locally-generated errors).
240
241It has to return either true (in which case AnyEvent::HTTP will continue),
242or false, in which case AnyEvent::HTTP will cancel the download (and call
243the finish callback with an error code of C<598>).
244
245This callback is useful, among other things, to quickly reject unwanted
246content, which, if it is supposed to be rare, can be faster than first
247doing a C<HEAD> request.
248
249The downside is that cancelling the request makes it impossible to re-use
250the connection. Also, the C<on_header> callback will not receive any
251trailer (headers sent after the response body).
252
253Example: cancel the request unless the content-type is "text/html".
254
255 on_header => sub {
256 $_[0]{"content-type"} =~ /^text\/html\s*(?:;|$)/
257 },
258
259=item on_body => $callback->($partial_body, $headers)
260
261When specified, all body data will be passed to this callback instead of
262to the completion callback. The completion callback will get the empty
263string instead of the body data.
264
265It has to return either true (in which case AnyEvent::HTTP will continue),
266or false, in which case AnyEvent::HTTP will cancel the download (and call
267the completion callback with an error code of C<598>).
268
269The downside to cancelling the request is that it makes it impossible to
270re-use the connection.
271
272This callback is useful when the data is too large to be held in memory
273(so the callback writes it to a file) or when only some information should
274be extracted, or when the body should be processed incrementally.
275
276It is usually preferred over doing your own body handling via
277C<want_body_handle>, but in case of streaming APIs, where HTTP is
278only used to create a connection, C<want_body_handle> is the better
279alternative, as it allows you to install your own event handler, reducing
280resource usage.
281
282=item want_body_handle => $enable
283
284When enabled (default is disabled), the behaviour of AnyEvent::HTTP
285changes considerably: after parsing the headers, and instead of
286downloading the body (if any), the completion callback will be
287called. Instead of the C<$body> argument containing the body data, the
288callback will receive the L<AnyEvent::Handle> object associated with the
289connection. In error cases, C<undef> will be passed. When there is no body
290(e.g. status C<304>), the empty string will be passed.
291
292The handle object might or might not be in TLS mode, might be connected to
293a proxy, be a persistent connection etc., and configured in unspecified
294ways. The user is responsible for this handle (it will not be used by this
295module anymore).
296
297This is useful with some push-type services, where, after the initial
298headers, an interactive protocol is used (typical example would be the
299push-style twitter API which starts a JSON/XML stream).
300
301If you think you need this, first have a look at C<on_body>, to see if
302that doesn't solve your problem in a better way.
303
178=back 304=back
179 305
180Example: make a simple HTTP GET request for http://www.nethype.de/ 306Example: do a simple HTTP GET request for http://www.nethype.de/ and print
307the response body.
181 308
182 http_request GET => "http://www.nethype.de/", sub { 309 http_request GET => "http://www.nethype.de/", sub {
183 my ($body, $hdr) = @_; 310 my ($body, $hdr) = @_;
184 print "$body\n"; 311 print "$body\n";
185 }; 312 };
186 313
187Example: make a HTTP HEAD request on https://www.google.com/, use a 314Example: do a HTTP HEAD request on https://www.google.com/, use a
188timeout of 30 seconds. 315timeout of 30 seconds.
189 316
190 http_request 317 http_request
191 GET => "https://www.google.com", 318 GET => "https://www.google.com",
192 timeout => 30, 319 timeout => 30,
195 use Data::Dumper; 322 use Data::Dumper;
196 print Dumper $hdr; 323 print Dumper $hdr;
197 } 324 }
198 ; 325 ;
199 326
200Example: make another simple HTTP GET request, but immediately try to 327Example: do another simple HTTP GET request, but immediately try to
201cancel it. 328cancel it.
202 329
203 my $request = http_request GET => "http://www.nethype.de/", sub { 330 my $request = http_request GET => "http://www.nethype.de/", sub {
204 my ($body, $hdr) = @_; 331 my ($body, $hdr) = @_;
205 print "$body\n"; 332 print "$body\n";
237 push @{ $CO_SLOT{$_[0]}[1] }, $_[1]; 364 push @{ $CO_SLOT{$_[0]}[1] }, $_[1];
238 365
239 _slot_schedule $_[0]; 366 _slot_schedule $_[0];
240} 367}
241 368
369# continue to parse $_ for headers and place them into the arg
370sub parse_hdr() {
371 my %hdr;
372
373 # things seen, not parsed:
374 # p3pP="NON CUR OTPi OUR NOR UNI"
375
376 $hdr{lc $1} .= ",$2"
377 while /\G
378 ([^:\000-\037]*):
379 [\011\040]*
380 ((?: [^\012]+ | \012[\011\040] )*)
381 \012
382 /gxc;
383
384 /\G$/
385 or return;
386
387 # remove the "," prefix we added to all headers above
388 substr $_, 0, 1, ""
389 for values %hdr;
390
391 \%hdr
392}
393
394our $qr_nlnl = qr{(?<![^\012])\015?\012};
395
396our $TLS_CTX_LOW = { cache => 1, sslv2 => 1 };
397our $TLS_CTX_HIGH = { cache => 1, verify => 1, verify_peername => "https" };
398
242sub http_request($$@) { 399sub http_request($$@) {
243 my $cb = pop; 400 my $cb = pop;
244 my ($method, $url, %arg) = @_; 401 my ($method, $url, %arg) = @_;
245 402
246 my %hdr; 403 my %hdr;
404
405 $arg{tls_ctx} = $TLS_CTX_LOW if $arg{tls_ctx} eq "low" || !exists $arg{tls_ctx};
406 $arg{tls_ctx} = $TLS_CTX_HIGH if $arg{tls_ctx} eq "high";
247 407
248 $method = uc $method; 408 $method = uc $method;
249 409
250 if (my $hdr = $arg{headers}) { 410 if (my $hdr = $arg{headers}) {
251 while (my ($k, $v) = each %$hdr) { 411 while (my ($k, $v) = each %$hdr) {
252 $hdr{lc $k} = $v; 412 $hdr{lc $k} = $v;
253 } 413 }
254 } 414 }
255 415
416 # pseudo headers for all subsequent responses
417 my @pseudo = (URL => $url);
418 push @pseudo, Redirect => delete $arg{Redirect} if exists $arg{Redirect};
419
256 my $recurse = exists $arg{recurse} ? delete $arg{recurse} : $MAX_RECURSE; 420 my $recurse = exists $arg{recurse} ? delete $arg{recurse} : $MAX_RECURSE;
257 421
258 return $cb->(undef, { Status => 599, Reason => "recursion limit reached", URL => $url }) 422 return $cb->(undef, { @pseudo, Status => 599, Reason => "Too many redirections" })
259 if $recurse < 0; 423 if $recurse < 0;
260 424
261 my $proxy = $arg{proxy} || $PROXY; 425 my $proxy = $arg{proxy} || $PROXY;
262 my $timeout = $arg{timeout} || $TIMEOUT; 426 my $timeout = $arg{timeout} || $TIMEOUT;
263 427
264 $hdr{"user-agent"} ||= $USERAGENT;
265
266 my ($scheme, $authority, $upath, $query, $fragment) = 428 my ($uscheme, $uauthority, $upath, $query, $fragment) =
267 $url =~ m|(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?|; 429 $url =~ m|(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:(\?[^#]*))?(?:#(.*))?|;
268 430
269 $scheme = lc $scheme; 431 $uscheme = lc $uscheme;
270 432
271 my $uport = $scheme eq "http" ? 80 433 my $uport = $uscheme eq "http" ? 80
272 : $scheme eq "https" ? 443 434 : $uscheme eq "https" ? 443
273 : return $cb->(undef, { Status => 599, Reason => "only http and https URL schemes supported", URL => $url }); 435 : return $cb->(undef, { @pseudo, Status => 599, Reason => "Only http and https URL schemes supported" });
274 436
275 $hdr{referer} ||= "$scheme://$authority$upath"; # leave out fragment and query string, just a heuristic
276
277 $authority =~ /^(?: .*\@ )? ([^\@:]+) (?: : (\d+) )?$/x 437 $uauthority =~ /^(?: .*\@ )? ([^\@:]+) (?: : (\d+) )?$/x
278 or return $cb->(undef, { Status => 599, Reason => "unparsable URL", URL => $url }); 438 or return $cb->(undef, { @pseudo, Status => 599, Reason => "Unparsable URL" });
279 439
280 my $uhost = $1; 440 my $uhost = $1;
281 $uport = $2 if defined $2; 441 $uport = $2 if defined $2;
282 442
443 $hdr{host} = defined $2 ? "$uhost:$2" : "$uhost"
444 unless exists $hdr{host};
445
283 $uhost =~ s/^\[(.*)\]$/$1/; 446 $uhost =~ s/^\[(.*)\]$/$1/;
284 $upath .= "?$query" if length $query; 447 $upath .= $query if length $query;
285 448
286 $upath =~ s%^/?%/%; 449 $upath =~ s%^/?%/%;
287 450
288 # cookie processing 451 # cookie processing
289 if (my $jar = $arg{cookie_jar}) { 452 if (my $jar = $arg{cookie_jar}) {
290 %$jar = () if $jar->{version} < 1; 453 %$jar = () if $jar->{version} != 1;
291 454
292 my @cookie; 455 my @cookie;
293 456
294 while (my ($chost, $v) = each %$jar) { 457 while (my ($chost, $v) = each %$jar) {
295 if ($chost =~ /^\./) { 458 if ($chost =~ /^\./) {
302 465
303 while (my ($cpath, $v) = each %$v) { 466 while (my ($cpath, $v) = each %$v) {
304 next unless $cpath eq substr $upath, 0, length $cpath; 467 next unless $cpath eq substr $upath, 0, length $cpath;
305 468
306 while (my ($k, $v) = each %$v) { 469 while (my ($k, $v) = each %$v) {
307 next if $scheme ne "https" && exists $v->{secure}; 470 next if $uscheme ne "https" && exists $v->{secure};
471 my $value = $v->{value};
472 $value =~ s/([\\"])/\\$1/g;
308 push @cookie, "$k=$v->{value}"; 473 push @cookie, "$k=\"$value\"";
309 } 474 }
310 } 475 }
311 } 476 }
312 477
313 $hdr{cookie} = join "; ", @cookie 478 $hdr{cookie} = join "; ", @cookie
314 if @cookie; 479 if @cookie;
315 } 480 }
316 481
317 my ($rhost, $rport, $rpath); # request host, port, path 482 my ($rhost, $rport, $rscheme, $rpath); # request host, port, path
318 483
319 if ($proxy) { 484 if ($proxy) {
320 ($rhost, $rport, $scheme) = @$proxy; 485 ($rpath, $rhost, $rport, $rscheme) = ($url, @$proxy);
321 $rpath = $url; 486
487 $rscheme = "http" unless defined $rscheme;
488
489 # don't support https requests over https-proxy transport,
490 # can't be done with tls as spec'ed, unless you double-encrypt.
491 $rscheme = "http" if $uscheme eq "https" && $rscheme eq "https";
322 } else { 492 } else {
323 ($rhost, $rport, $rpath) = ($uhost, $uport, $upath); 493 ($rhost, $rport, $rscheme, $rpath) = ($uhost, $uport, $uscheme, $upath);
324 $hdr{host} = $uhost;
325 } 494 }
326 495
496 # leave out fragment and query string, just a heuristic
497 $hdr{referer} = "$uscheme://$uauthority$upath" unless exists $hdr{referer};
498 $hdr{"user-agent"} = $USERAGENT unless exists $hdr{"user-agent"};
499
327 $hdr{"content-length"} = length $arg{body}; 500 $hdr{"content-length"} = length $arg{body}
501 if length $arg{body} || $method ne "GET";
502
503 $hdr{connection} = "close TE"; #1.1
504 $hdr{te} = "trailers" unless exists $hdr{te}; #1.1
328 505
329 my %state = (connect_guard => 1); 506 my %state = (connect_guard => 1);
330 507
331 _get_slot $uhost, sub { 508 _get_slot $uhost, sub {
332 $state{slot_guard} = shift; 509 $state{slot_guard} = shift;
333 510
334 return unless $state{connect_guard}; 511 return unless $state{connect_guard};
335 512
336 $state{connect_guard} = AnyEvent::Socket::tcp_connect $rhost, $rport, sub { 513 my $connect_cb = sub {
337 $state{fh} = shift 514 $state{fh} = shift
515 or do {
516 my $err = "$!";
517 %state = ();
338 or return $cb->(undef, { Status => 599, Reason => "$!", URL => $url }); 518 return $cb->(undef, { @pseudo, Status => 599, Reason => $err });
519 };
339 520
340 delete $state{connect_guard}; # reduce memory usage, save a tree 521 pop; # free memory, save a tree
522
523 return unless delete $state{connect_guard};
341 524
342 # get handle 525 # get handle
343 $state{handle} = new AnyEvent::Handle 526 $state{handle} = new AnyEvent::Handle
344 fh => $state{fh}, 527 fh => $state{fh},
345 ($scheme eq "https" ? (tls => "connect") : ()); 528 peername => $rhost,
529 tls_ctx => $arg{tls_ctx},
530 # these need to be reconfigured on keepalive handles
531 timeout => $timeout,
532 on_error => sub {
533 %state = ();
534 $cb->(undef, { @pseudo, Status => 599, Reason => $_[2] });
535 },
536 on_eof => sub {
537 %state = ();
538 $cb->(undef, { @pseudo, Status => 599, Reason => "Unexpected end-of-file" });
539 },
540 ;
346 541
347 # limit the number of persistent connections 542 # limit the number of persistent connections
543 # keepalive not yet supported
348 if ($KA_COUNT{$_[1]} < $MAX_PERSISTENT_PER_HOST) { 544# if ($KA_COUNT{$_[1]} < $MAX_PERSISTENT_PER_HOST) {
349 ++$KA_COUNT{$_[1]}; 545# ++$KA_COUNT{$_[1]};
350 $state{handle}{ka_count_guard} = AnyEvent::Util::guard { --$KA_COUNT{$_[1]} }; 546# $state{handle}{ka_count_guard} = AnyEvent::Util::guard {
547# --$KA_COUNT{$_[1]}
548# };
351 $hdr{connection} = "keep-alive"; 549# $hdr{connection} = "keep-alive";
352 delete $hdr{connection}; # keep-alive not yet supported
353 } else {
354 delete $hdr{connection};
355 } 550# }
356 551
357 # (re-)configure handle 552 $state{handle}->starttls ("connect") if $rscheme eq "https";
358 $state{handle}->timeout ($timeout);
359 $state{handle}->on_error (sub {
360 my $errno = "$!";
361 %state = ();
362 $cb->(undef, { Status => 599, Reason => $errno, URL => $url });
363 });
364 $state{handle}->on_eof (sub {
365 %state = ();
366 $cb->(undef, { Status => 599, Reason => "unexpected end-of-file", URL => $url });
367 });
368 553
554 # handle actual, non-tunneled, request
555 my $handle_actual_request = sub {
556 $state{handle}->starttls ("connect") if $uscheme eq "https" && !exists $state{handle}{tls};
557
369 # send request 558 # send request
370 $state{handle}->push_write ( 559 $state{handle}->push_write (
371 "$method $rpath HTTP/1.0\015\012" 560 "$method $rpath HTTP/1.1\015\012"
372 . (join "", map "$_: $hdr{$_}\015\012", keys %hdr) 561 . (join "", map "\u$_: $hdr{$_}\015\012", grep defined $hdr{$_}, keys %hdr)
373 . "\015\012" 562 . "\015\012"
374 . (delete $arg{body}) 563 . (delete $arg{body})
375 );
376
377 %hdr = (); # reduce memory usage, save a kitten
378
379 # status line
380 $state{handle}->push_read (line => qr/\015?\012/, sub {
381 $_[1] =~ /^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\015\012]*) )?/ix
382 or return (%state = (), $cb->(undef, { Status => 599, Reason => "invalid server response ($_[1])", URL => $url }));
383
384 my %hdr = ( # response headers
385 HTTPVersion => "\x00$1",
386 Status => "\x00$2",
387 Reason => "\x00$3",
388 URL => "\x00$url"
389 ); 564 );
390 565
391 # headers, could be optimized a bit 566 # return if error occured during push_write()
392 $state{handle}->unshift_read (line => qr/\015?\012\015?\012/, sub { 567 return unless %state;
568
569 %hdr = (); # reduce memory usage, save a kitten, also make it possible to re-use
570
571 # status line and headers
572 $state{read_response} = sub {
393 for ("$_[1]\012") { 573 for ("$_[1]") {
394 # we support spaces in field names, as lotus domino 574 y/\015//d; # weed out any \015, as they show up in the weirdest of places.
395 # creates them (actually spaces around seperators
396 # are strictly allowed in http, they are a security issue).
397 $hdr{lc $1} .= "\x00$2"
398 while /\G
399 ([^:\000-\037]+):
400 [\011\040]*
401 ((?: [^\015\012]+ | \015?\012[\011\040] )*)
402 \015?\012
403 /gxc;
404 575
576 /^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\012]*) )? \012/igxc
577 or return (%state = (), $cb->(undef, { @pseudo, Status => 599, Reason => "Invalid server response" }));
578
579 # 100 Continue handling
580 # should not happen as we don't send expect: 100-continue,
581 # but we handle it just in case.
582 # since we send the request body regardless, if we get an error
583 # we are out of-sync, which we currently do NOT handle correctly.
584 return $state{handle}->push_read (line => $qr_nlnl, $state{read_response})
585 if $2 eq 100;
586
587 push @pseudo,
588 HTTPVersion => $1,
589 Status => $2,
590 Reason => $3,
405 /\G$/ 591 ;
592
593 my $hdr = parse_hdr
406 or return (%state = (), $cb->(undef, { Status => 599, Reason => "garbled response headers", URL => $url })); 594 or return (%state = (), $cb->(undef, { @pseudo, Status => 599, Reason => "Garbled response headers" }));
595
596 %hdr = (%$hdr, @pseudo);
407 } 597 }
408 598
409 substr $_, 0, 1, "" 599 # redirect handling
410 for values %hdr; 600 # microsoft and other shitheads don't give a shit for following standards,
601 # try to support some common forms of broken Location headers.
602 if ($hdr{location} !~ /^(?: $ | [^:\/?\#]+ : )/x) {
603 $hdr{location} =~ s/^\.\/+//;
411 604
412 my $finish = sub { 605 my $url = "$rscheme://$uhost:$uport";
413 # TODO: use destroy method, when/if available 606
607 unless ($hdr{location} =~ s/^\///) {
608 $url .= $upath;
609 $url =~ s/\/[^\/]*$//;
610 }
611
612 $hdr{location} = "$url/$hdr{location}";
613 }
614
615 my $redirect;
616
617 if ($recurse) {
618 my $status = $hdr{Status};
619
620 # industry standard is to redirect POST as GET for
621 # 301, 302 and 303, in contrast to http/1.0 and 1.1.
622 # also, the UA should ask the user for 301 and 307 and POST,
623 # industry standard seems to be to simply follow.
624 # we go with the industry standard.
625 if ($status == 301 or $status == 302 or $status == 303) {
626 # HTTP/1.1 is unclear on how to mutate the method
627 $method = "GET" unless $method eq "HEAD";
628 $redirect = 1;
629 } elsif ($status == 307) {
630 $redirect = 1;
631 }
632 }
633
634 my $finish = sub { # ($data, $err_status, $err_reason[, $keepalive])
635 my $keepalive = pop;
636
414 #$state{handle}->destroy; 637 $state{handle}->destroy if $state{handle};
415 $state{handle}->on_eof (undef);
416 $state{handle}->on_error (undef);
417 %state = (); 638 %state = ();
418 639
640 if (defined $_[1]) {
641 $hdr{OrigStatus} = $hdr{Status}; $hdr{Status} = $_[1];
642 $hdr{OrigReason} = $hdr{Reason}; $hdr{Reason} = $_[2];
643 }
644
419 # set-cookie processing 645 # set-cookie processing
420 if ($arg{cookie_jar} && exists $hdr{"set-cookie"}) { 646 if ($arg{cookie_jar}) {
421 for (split /\x00/, $hdr{"set-cookie"}) { 647 for ($hdr{"set-cookie"}) {
422 my ($cookie, @arg) = split /;\s*/; 648 # parse NAME=VALUE
423 my ($name, $value) = split /=/, $cookie, 2; 649 my @kv;
424 my %kv = (value => $value, map { split /=/, $_, 2 } @arg); 650
425 651 while (/\G\s* ([^=;,[:space:]]+) \s*=\s* (?: "((?:[^\\"]+|\\.)*)" | ([^=;,[:space:]]*) )/gcxs) {
652 my $name = $1;
653 my $value = $3;
654
655 unless ($value) {
656 $value = $2;
657 $value =~ s/\\(.)/$1/gs;
658 }
659
660 push @kv, $name => $value;
661
662 last unless /\G\s*;/gc;
663 }
664
665 last unless @kv;
666
667 my $name = shift @kv;
668 my %kv = (value => shift @kv, @kv);
669
426 my $cdom; 670 my $cdom;
427 my $cpath = (delete $kv{path}) || "/"; 671 my $cpath = (delete $kv{path}) || "/";
428 672
429 if (exists $kv{domain}) { 673 if (exists $kv{domain}) {
430 $cdom = delete $kv{domain}; 674 $cdom = delete $kv{domain};
431 675
432 $cdom =~ s/^\.?/./; # make sure it starts with a "." 676 $cdom =~ s/^\.?/./; # make sure it starts with a "."
441 } 685 }
442 686
443 # store it 687 # store it
444 $arg{cookie_jar}{version} = 1; 688 $arg{cookie_jar}{version} = 1;
445 $arg{cookie_jar}{$cdom}{$cpath}{$name} = \%kv; 689 $arg{cookie_jar}{$cdom}{$cpath}{$name} = \%kv;
690
691 redo if /\G\s*,/gc;
446 } 692 }
447 } 693 }
448 694
449 # microsoft and other shitheads don't give a shit for following standards, 695 if ($redirect && exists $hdr{location}) {
450 # try to support some common forms of broken Location headers. 696 # we ignore any errors, as it is very common to receive
451 if ($_[1]{location} !~ /^(?: $ | [^:\/?\#]+ : )/x) { 697 # Content-Length != 0 but no actual body
452 $_[1]{location} =~ s/^\.\/+//; 698 # we also access %hdr, as $_[1] might be an erro
453 699 http_request (
454 my $url = "$scheme://$uhost:$uport"; 700 $method => $hdr{location},
455
456 unless ($_[1]{location} =~ s/^\///) {
457 $url .= $upath;
458 $url =~ s/\/[^\/]*$//;
459 } 701 %arg,
460 702 recurse => $recurse - 1,
461 $_[1]{location} = "$url/$_[1]{location}"; 703 Redirect => [$_[0], \%hdr],
462 } 704 $cb);
463
464 if ($_[1]{Status} =~ /^30[12]$/ && $recurse && $method ne "POST") {
465 # apparently, mozilla et al. just change POST to GET here
466 # more research is needed before we do the same
467 http_request ($method, $_[1]{location}, %arg, recurse => $recurse - 1, $cb);
468 } elsif ($_[1]{Status} == 303 && $recurse) {
469 # even http/1.1 is unclear on how to mutate the method
470 $method = "GET" unless $method eq "HEAD";
471 http_request ($method => $_[1]{location}, %arg, recurse => $recurse - 1, $cb);
472 } elsif ($_[1]{Status} == 307 && $recurse && $method =~ /^(?:GET|HEAD)$/) {
473 http_request ($method => $_[1]{location}, %arg, recurse => $recurse - 1, $cb);
474 } else { 705 } else {
475 $cb->($_[0], $_[1]); 706 $cb->($_[0], \%hdr);
476 } 707 }
477 }; 708 };
478 709
479 if ($hdr{Status} =~ /^(?:1..|204|304)$/ or $method eq "HEAD") { 710 my $len = $hdr{"content-length"};
711
712 if (!$redirect && $arg{on_header} && !$arg{on_header}(\%hdr)) {
713 $finish->(undef, 598 => "Request cancelled by on_header");
714 } elsif (
715 $hdr{Status} =~ /^(?:1..|204|205|304)$/
716 or $method eq "HEAD"
717 or (defined $len && !$len)
718 ) {
719 # no body
480 $finish->(undef, \%hdr); 720 $finish->("", undef, undef, 1);
481 } else { 721 } else {
482 if (exists $hdr{"content-length"}) { 722 # body handling, many different code paths
723 # - no body expected
724 # - want_body_handle
725 # - te chunked
726 # - 2x length known (with or without on_body)
727 # - 2x length not known (with or without on_body)
728 if (!$redirect && $arg{want_body_handle}) {
729 $_[0]->on_eof (undef);
730 $_[0]->on_error (undef);
731 $_[0]->on_read (undef);
732
733 $finish->(delete $state{handle});
734
735 } elsif ($hdr{"transfer-encoding"} =~ /\bchunked\b/i) {
736 my $cl = 0;
737 my $body = undef;
738 my $on_body = $arg{on_body} || sub { $body .= shift; 1 };
739
740 $_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
741
742 my $read_chunk; $read_chunk = sub {
743 $_[1] =~ /^([0-9a-fA-F]+)/
744 or $finish->(undef, 599 => "Garbled chunked transfer encoding");
745
746 my $len = hex $1;
747
748 if ($len) {
749 $cl += $len;
750
483 $_[0]->unshift_read (chunk => $hdr{"content-length"}, sub { 751 $_[0]->push_read (chunk => $len, sub {
484 # could cache persistent connection now 752 $on_body->($_[1], \%hdr)
485 if ($hdr{connection} =~ /\bkeep-alive\b/i) { 753 or return $finish->(undef, 598 => "Request cancelled by on_body");
486 # but we don't, due to misdesigns, this is annoyingly complex 754
755 $_[0]->push_read (line => sub {
756 length $_[1]
757 and return $finish->(undef, 599 => "Garbled chunked transfer encoding");
758 $_[0]->push_read (line => $read_chunk);
759 });
760 });
761 } else {
762 $hdr{"content-length"} ||= $cl;
763
764 $_[0]->push_read (line => $qr_nlnl, sub {
765 if (length $_[1]) {
766 for ("$_[1]") {
767 y/\015//d; # weed out any \015, as they show up in the weirdest of places.
768
769 my $hdr = parse_hdr
770 or return $finish->(undef, 599 => "Garbled response trailers");
771
772 %hdr = (%hdr, %$hdr);
773 }
774 }
775
776 $finish->($body, undef, undef, 1);
777 });
778 }
779 };
780
781 $_[0]->push_read (line => $read_chunk);
782
783 } elsif ($arg{on_body}) {
784 $_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
785
786 if ($len) {
787 $_[0]->on_read (sub {
788 $len -= length $_[0]{rbuf};
789
790 $arg{on_body}(delete $_[0]{rbuf}, \%hdr)
791 or return $finish->(undef, 598 => "Request cancelled by on_body");
792
793 $len > 0
794 or $finish->("", undef, undef, 1);
487 }; 795 });
488 796 } else {
797 $_[0]->on_eof (sub {
489 $finish->($_[1], \%hdr); 798 $finish->("");
799 });
800 $_[0]->on_read (sub {
801 $arg{on_body}(delete $_[0]{rbuf}, \%hdr)
802 or $finish->(undef, 598 => "Request cancelled by on_body");
803 });
490 }); 804 }
491 } else { 805 } else {
492 # too bad, need to read until we get an error or EOF,
493 # no way to detect winged data.
494 $_[0]->on_error (sub {
495 $finish->($_[0]{rbuf}, \%hdr);
496 });
497 $_[0]->on_eof (undef); 806 $_[0]->on_eof (undef);
807
808 if ($len) {
809 $_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
810 $_[0]->on_read (sub {
811 $finish->((substr delete $_[0]{rbuf}, 0, $len, ""), undef, undef, 1)
812 if $len <= length $_[0]{rbuf};
813 });
814 } else {
815 $_[0]->on_error (sub {
816 ($! == Errno::EPIPE || !$!)
817 ? $finish->(delete $_[0]{rbuf})
818 : $finish->(undef, 599 => $_[2]);
819 });
498 $_[0]->on_read (sub { }); 820 $_[0]->on_read (sub { });
821 }
499 } 822 }
500 } 823 }
824 };
825
826 $state{handle}->push_read (line => $qr_nlnl, $state{read_response});
827 };
828
829 # now handle proxy-CONNECT method
830 if ($proxy && $uscheme eq "https") {
831 # oh dear, we have to wrap it into a connect request
832
833 # maybe re-use $uauthority with patched port?
834 $state{handle}->push_write ("CONNECT $uhost:$uport HTTP/1.0\015\012Host: $uhost\015\012\015\012");
835 $state{handle}->push_read (line => $qr_nlnl, sub {
836 $_[1] =~ /^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\015\012]*) )?/ix
837 or return (%state = (), $cb->(undef, { @pseudo, Status => 599, Reason => "Invalid proxy connect response ($_[1])" }));
838
839 if ($2 == 200) {
840 $rpath = $upath;
841 &$handle_actual_request;
842 } else {
843 %state = ();
844 $cb->(undef, { @pseudo, Status => $2, Reason => $3 });
845 }
501 }); 846 });
847 } else {
848 &$handle_actual_request;
502 }); 849 }
503 }, sub {
504 $timeout
505 }; 850 };
851
852 my $tcp_connect = $arg{tcp_connect}
853 || do { require AnyEvent::Socket; \&AnyEvent::Socket::tcp_connect };
854
855 $state{connect_guard} = $tcp_connect->($rhost, $rport, $connect_cb, $arg{on_prepare} || sub { $timeout });
856
506 }; 857 };
507 858
508 defined wantarray && AnyEvent::Util::guard { %state = () } 859 defined wantarray && AnyEvent::Util::guard { %state = () }
509} 860}
510 861
524 &http_request 875 &http_request
525} 876}
526 877
527=back 878=back
528 879
880=head2 DNS CACHING
881
882AnyEvent::HTTP uses the AnyEvent::Socket::tcp_connect function for
883the actual connection, which in turn uses AnyEvent::DNS to resolve
884hostnames. The latter is a simple stub resolver and does no caching
885on its own. If you want DNS caching, you currently have to provide
886your own default resolver (by storing a suitable resolver object in
887C<$AnyEvent::DNS::RESOLVER>).
888
529=head2 GLOBAL FUNCTIONS AND VARIABLES 889=head2 GLOBAL FUNCTIONS AND VARIABLES
530 890
531=over 4 891=over 4
532 892
533=item AnyEvent::HTTP::set_proxy "proxy-url" 893=item AnyEvent::HTTP::set_proxy "proxy-url"
534 894
535Sets the default proxy server to use. The proxy-url must begin with a 895Sets the default proxy server to use. The proxy-url must begin with a
536string of the form C<http://host:port> (optionally C<https:...>). 896string of the form C<http://host:port> (optionally C<https:...>), croaks
897otherwise.
898
899To clear an already-set proxy, use C<undef>.
900
901=item $date = AnyEvent::HTTP::format_date $timestamp
902
903Takes a POSIX timestamp (seconds since the epoch) and formats it as a HTTP
904Date (RFC 2616).
905
906=item $timestamp = AnyEvent::HTTP::parse_date $date
907
908Takes a HTTP Date (RFC 2616) and returns the corresponding POSIX
909timestamp, or C<undef> if the date cannot be parsed.
537 910
538=item $AnyEvent::HTTP::MAX_RECURSE 911=item $AnyEvent::HTTP::MAX_RECURSE
539 912
540The default value for the C<recurse> request parameter (default: C<10>). 913The default value for the C<recurse> request parameter (default: C<10>).
541 914
542=item $AnyEvent::HTTP::USERAGENT 915=item $AnyEvent::HTTP::USERAGENT
543 916
544The default value for the C<User-Agent> header (the default is 917The default value for the C<User-Agent> header (the default is
545C<Mozilla/5.0 (compatible; AnyEvent::HTTP/$VERSION; +http://software.schmorp.de/pkg/AnyEvent)>). 918C<Mozilla/5.0 (compatible; U; AnyEvent-HTTP/$VERSION; +http://software.schmorp.de/pkg/AnyEvent)>).
546 919
547=item $AnyEvent::HTTP::MAX_PERSISTENT 920=item $AnyEvent::HTTP::MAX_PER_HOST
548 921
549The maximum number of persistent connections to keep open (default: 8). 922The maximum number of concurrent connections to the same host (identified
923by the hostname). If the limit is exceeded, then the additional requests
924are queued until previous connections are closed.
550 925
551Not implemented currently. 926The default value for this is C<4>, and it is highly advisable to not
552 927increase it.
553=item $AnyEvent::HTTP::PERSISTENT_TIMEOUT
554
555The maximum time to cache a persistent connection, in seconds (default: 2).
556
557Not implemented currently.
558 928
559=item $AnyEvent::HTTP::ACTIVE 929=item $AnyEvent::HTTP::ACTIVE
560 930
561The number of active connections. This is not the number of currently 931The number of active connections. This is not the number of currently
562running requests, but the number of currently open and non-idle TCP 932running requests, but the number of currently open and non-idle TCP
564 934
565=back 935=back
566 936
567=cut 937=cut
568 938
939our @month = qw(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec);
940our @weekday = qw(Sun Mon Tue Wed Thu Fri Sat);
941
942sub format_date($) {
943 my ($time) = @_;
944
945 # RFC 822/1123 format
946 my ($S, $M, $H, $mday, $mon, $year, $wday, $yday, undef) = gmtime $time;
947
948 sprintf "%s, %02d %s %04d %02d:%02d:%02d GMT",
949 $weekday[$wday], $mday, $month[$mon], $year + 1900,
950 $H, $M, $S;
951}
952
953sub parse_date($) {
954 my ($date) = @_;
955
956 my ($d, $m, $y, $H, $M, $S);
957
958 if ($date =~ /^[A-Z][a-z][a-z], ([0-9][0-9]) ([A-Z][a-z][a-z]) ([0-9][0-9][0-9][0-9]) ([0-9][0-9]):([0-9][0-9]):([0-9][0-9]) GMT$/) {
959 # RFC 822/1123, required by RFC 2616
960 ($d, $m, $y, $H, $M, $S) = ($1, $2, $3, $4, $5, $6);
961
962 } elsif ($date =~ /^[A-Z][a-z]+, ([0-9][0-9])-([A-Z][a-z][a-z])-([0-9][0-9]) ([0-9][0-9]):([0-9][0-9]):([0-9][0-9]) GMT$/) {
963 # RFC 850
964 ($d, $m, $y, $H, $M, $S) = ($1, $2, $3 < 69 ? $3 + 2000 : $3 + 1900, $4, $5, $6);
965
966 } elsif ($date =~ /^[A-Z][a-z][a-z] ([A-Z][a-z][a-z]) ([0-9 ][0-9]) ([0-9][0-9]):([0-9][0-9]):([0-9][0-9]) ([0-9][0-9][0-9][0-9])$/) {
967 # ISO C's asctime
968 ($d, $m, $y, $H, $M, $S) = ($2, $1, $6, $3, $4, $5);
969 }
970 # other formats fail in the loop below
971
972 for (0..11) {
973 if ($m eq $month[$_]) {
974 require Time::Local;
975 return Time::Local::timegm ($S, $M, $H, $d, $_, $y);
976 }
977 }
978
979 undef
980}
981
569sub set_proxy($) { 982sub set_proxy($) {
983 if (length $_[0]) {
570 $PROXY = [$2, $3 || 3128, $1] if $_[0] =~ m%^(https?):// ([^:/]+) (?: : (\d*) )?%ix; 984 $_[0] =~ m%^(https?):// ([^:/]+) (?: : (\d*) )?%ix
985 or Carp::croak "$_[0]: invalid proxy URL";
986 $PROXY = [$2, $3 || 3128, $1]
987 } else {
988 undef $PROXY;
989 }
571} 990}
572 991
573# initialise proxy from environment 992# initialise proxy from environment
993eval {
574set_proxy $ENV{http_proxy}; 994 set_proxy $ENV{http_proxy};
995};
996
997=head2 SOCKS PROXIES
998
999Socks proxies are not directly supported by AnyEvent::HTTP. You can
1000compile your perl to support socks, or use an external program such as
1001F<socksify> (dante) or F<tsocks> to make your program use a socks proxy
1002transparently.
1003
1004Alternatively, for AnyEvent::HTTP only, you can use your own
1005C<tcp_connect> function that does the proxy handshake - here is an example
1006that works with socks4a proxies:
1007
1008 use Errno;
1009 use AnyEvent::Util;
1010 use AnyEvent::Socket;
1011 use AnyEvent::Handle;
1012
1013 # host, port and username of/for your socks4a proxy
1014 my $socks_host = "10.0.0.23";
1015 my $socks_port = 9050;
1016 my $socks_user = "";
1017
1018 sub socks4a_connect {
1019 my ($host, $port, $connect_cb, $prepare_cb) = @_;
1020
1021 my $hdl = new AnyEvent::Handle
1022 connect => [$socks_host, $socks_port],
1023 on_prepare => sub { $prepare_cb->($_[0]{fh}) },
1024 on_error => sub { $connect_cb->() },
1025 ;
1026
1027 $hdl->push_write (pack "CCnNZ*Z*", 4, 1, $port, 1, $socks_user, $host);
1028
1029 $hdl->push_read (chunk => 8, sub {
1030 my ($hdl, $chunk) = @_;
1031 my ($status, $port, $ipn) = unpack "xCna4", $chunk;
1032
1033 if ($status == 0x5a) {
1034 $connect_cb->($hdl->{fh}, (format_address $ipn) . ":$port");
1035 } else {
1036 $! = Errno::ENXIO; $connect_cb->();
1037 }
1038 });
1039
1040 $hdl
1041 }
1042
1043Use C<socks4a_connect> instead of C<tcp_connect> when doing C<http_request>s,
1044possibly after switching off other proxy types:
1045
1046 AnyEvent::HTTP::set_proxy undef; # usually you do not want other proxies
1047
1048 http_get 'http://www.google.com', tcp_connect => \&socks4a_connect, sub {
1049 my ($data, $headers) = @_;
1050 ...
1051 };
575 1052
576=head1 SEE ALSO 1053=head1 SEE ALSO
577 1054
578L<AnyEvent>. 1055L<AnyEvent>.
579 1056
580=head1 AUTHOR 1057=head1 AUTHOR
581 1058
582 Marc Lehmann <schmorp@schmorp.de> 1059 Marc Lehmann <schmorp@schmorp.de>
583 http://home.schmorp.de/ 1060 http://home.schmorp.de/
584 1061
1062With many thanks to Дмитрий Шалашов, who provided countless
1063testcases and bugreports.
1064
585=cut 1065=cut
586 1066
5871 10671
588 1068

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines