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.66 by root, Fri Dec 31 06:18:30 2010 UTC vs.
Revision 1.78 by root, Sat Jan 1 19:32:41 2011 UTC

… …
94C<http_request> returns a "cancellation guard" - you have to keep the 94C<http_request> returns a "cancellation guard" - you have to keep the
95object 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
96destroyed before the callback is called, the request will be cancelled. 96destroyed before the callback is called, the request will be cancelled.
97 97
98The callback will be called with the response body data as first argument 98The callback will be called with the response body data as first argument
99(or C<undef> if an error occured), and a hash-ref with response headers as 99(or C<undef> if an error occured), and a hash-ref with response headers
100second argument. 100(and trailers) as second argument.
101 101
102All 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
103headers, the "pseudo-headers" (uppercase to avoid clashing with possible 103headers, the "pseudo-headers" (uppercase to avoid clashing with possible
104response headers) C<HTTPVersion>, C<Status> and C<Reason> contain the 104response headers) C<HTTPVersion>, C<Status> and C<Reason> contain the
105three parts of the HTTP Status-Line of the same name. If an error occurs 105three parts of the HTTP Status-Line of the same name. If an error occurs
… …
122 122
123If the server sends a header multiple times, then their contents will be 123If the server sends a header multiple times, then their contents will be
124joined together with a comma (C<,>), as per the HTTP spec. 124joined together with a comma (C<,>), as per the HTTP spec.
125 125
126If 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,
127then C<$data> will be C<undef>, C<< $headers->{Status} >> will be C<59x> 127then C<$data> will be C<undef>, C<< $headers->{Status} >> will be
128(usually C<599>) and the C<Reason> pseudo-header will contain an error 128C<590>-C<599> and the C<Reason> pseudo-header will contain an error
129message. 129message. Currently the following status codes are used:
130
131=over 4
132
133=item 595 - errors during connection etsbalishment, proxy handshake.
134
135=item 596 - errors during TLS negotiation, request sending and header processing.
136
137=item 597 - errors during body receiving or processing.
138
139=item 598 - user aborted request via C<on_header> or C<on_body>.
140
141=item 599 - other, usually nonretryable, errors (garbled URL etc.).
142
143=back
130 144
131A typical callback might look like this: 145A typical callback might look like this:
132 146
133 sub { 147 sub {
134 my ($body, $hdr) = @_; 148 my ($body, $hdr) = @_;
… …
150Whether to recurse requests or not, e.g. on redirects, authentication 164Whether to recurse requests or not, e.g. on redirects, authentication
151retries and so on, and how often to do so. 165retries and so on, and how often to do so.
152 166
153=item headers => hashref 167=item headers => hashref
154 168
155The request headers to use. Currently, C<http_request> may provide its 169The request headers to use. Currently, C<http_request> may provide its own
156own C<Host:>, C<Content-Length:>, C<Connection:> and C<Cookie:> headers 170C<Host:>, C<Content-Length:>, C<Connection:> and C<Cookie:> headers and
157and will provide defaults for C<User-Agent:> and C<Referer:> (this can be 171will provide defaults at least for C<TE:>, C<Referer:> and C<User-Agent:>
158suppressed by using C<undef> for these headers in which case they won't be 172(this can be suppressed by using C<undef> for these headers in which case
159sent at all). 173they won't be sent at all).
160 174
161=item timeout => $seconds 175=item timeout => $seconds
162 176
163The time-out to use for various stages - each connect attempt will reset 177The time-out to use for various stages - each connect attempt will reset
164the timeout, as will read or write activity, i.e. this is not an overall 178the timeout, as will read or write activity, i.e. this is not an overall
… …
174C<$scheme> must be either missing, C<http> for HTTP or C<https> for 188C<$scheme> must be either missing, C<http> for HTTP or C<https> for
175HTTPS. 189HTTPS.
176 190
177=item body => $string 191=item body => $string
178 192
179The request body, usually empty. Will be-sent as-is (future versions of 193The request body, usually empty. Will be sent as-is (future versions of
180this module might offer more options). 194this module might offer more options).
181 195
182=item cookie_jar => $hash_ref 196=item cookie_jar => $hash_ref
183 197
184Passing this parameter enables (simplified) cookie-processing, loosely 198Passing this parameter enables (simplified) cookie-processing, loosely
185based on the original netscape specification. 199based on the original netscape specification.
186 200
187The C<$hash_ref> must be an (initially empty) hash reference which will 201The C<$hash_ref> must be an (initially empty) hash reference which will
188get updated automatically. It is possible to save the cookie_jar to 202get updated automatically. It is possible to save the cookie jar to
189persistent storage with something like JSON or Storable, but this is not 203persistent storage with something like JSON or Storable, but this is not
190recommended, as expiry times are currently being ignored. 204recommended, as session-only cookies might survive longer than expected.
191 205
192Note that this cookie implementation is not of very high quality, nor 206Note that this cookie implementation is not meant to be complete. If
193meant to be complete. If you want complete cookie management you have to 207you want complete cookie management you have to do that on your
194do that on your own. C<cookie_jar> is meant as a quick fix to get some 208own. C<cookie_jar> is meant as a quick fix to get some cookie-using sites
195cookie-using sites working. Cookies are a privacy disaster, do not use 209working. Cookies are a privacy disaster, do not use them unless required
196them unless required to. 210to.
211
212When cookie processing is enabled, the C<Cookie:> and C<Set-Cookie:>
213headers will be set and handled by this module, otherwise they will be
214left untouched.
197 215
198=item tls_ctx => $scheme | $tls_ctx 216=item tls_ctx => $scheme | $tls_ctx
199 217
200Specifies the AnyEvent::TLS context to be used for https connections. This 218Specifies the AnyEvent::TLS context to be used for https connections. This
201parameter follows the same rules as the C<tls_ctx> parameter to 219parameter follows the same rules as the C<tls_ctx> parameter to
… …
240 258
241This callback is useful, among other things, to quickly reject unwanted 259This callback is useful, among other things, to quickly reject unwanted
242content, which, if it is supposed to be rare, can be faster than first 260content, which, if it is supposed to be rare, can be faster than first
243doing a C<HEAD> request. 261doing a C<HEAD> request.
244 262
263The downside is that cancelling the request makes it impossible to re-use
264the connection. Also, the C<on_header> callback will not receive any
265trailer (headers sent after the response body).
266
245Example: cancel the request unless the content-type is "text/html". 267Example: cancel the request unless the content-type is "text/html".
246 268
247 on_header => sub { 269 on_header => sub {
248 $_[0]{"content-type"} =~ /^text\/html\s*(?:;|$)/ 270 $_[0]{"content-type"} =~ /^text\/html\s*(?:;|$)/
249 }, 271 },
… …
255string instead of the body data. 277string instead of the body data.
256 278
257It has to return either true (in which case AnyEvent::HTTP will continue), 279It has to return either true (in which case AnyEvent::HTTP will continue),
258or false, in which case AnyEvent::HTTP will cancel the download (and call 280or false, in which case AnyEvent::HTTP will cancel the download (and call
259the completion callback with an error code of C<598>). 281the completion callback with an error code of C<598>).
282
283The downside to cancelling the request is that it makes it impossible to
284re-use the connection.
260 285
261This callback is useful when the data is too large to be held in memory 286This callback is useful when the data is too large to be held in memory
262(so the callback writes it to a file) or when only some information should 287(so the callback writes it to a file) or when only some information should
263be extracted, or when the body should be processed incrementally. 288be extracted, or when the body should be processed incrementally.
264 289
… …
290If you think you need this, first have a look at C<on_body>, to see if 315If you think you need this, first have a look at C<on_body>, to see if
291that doesn't solve your problem in a better way. 316that doesn't solve your problem in a better way.
292 317
293=back 318=back
294 319
295Example: make a simple HTTP GET request for http://www.nethype.de/ 320Example: do a simple HTTP GET request for http://www.nethype.de/ and print
321the response body.
296 322
297 http_request GET => "http://www.nethype.de/", sub { 323 http_request GET => "http://www.nethype.de/", sub {
298 my ($body, $hdr) = @_; 324 my ($body, $hdr) = @_;
299 print "$body\n"; 325 print "$body\n";
300 }; 326 };
301 327
302Example: make a HTTP HEAD request on https://www.google.com/, use a 328Example: do a HTTP HEAD request on https://www.google.com/, use a
303timeout of 30 seconds. 329timeout of 30 seconds.
304 330
305 http_request 331 http_request
306 GET => "https://www.google.com", 332 GET => "https://www.google.com",
307 timeout => 30, 333 timeout => 30,
… …
310 use Data::Dumper; 336 use Data::Dumper;
311 print Dumper $hdr; 337 print Dumper $hdr;
312 } 338 }
313 ; 339 ;
314 340
315Example: make another simple HTTP GET request, but immediately try to 341Example: do another simple HTTP GET request, but immediately try to
316cancel it. 342cancel it.
317 343
318 my $request = http_request GET => "http://www.nethype.de/", sub { 344 my $request = http_request GET => "http://www.nethype.de/", sub {
319 my ($body, $hdr) = @_; 345 my ($body, $hdr) = @_;
320 print "$body\n"; 346 print "$body\n";
… …
352 push @{ $CO_SLOT{$_[0]}[1] }, $_[1]; 378 push @{ $CO_SLOT{$_[0]}[1] }, $_[1];
353 379
354 _slot_schedule $_[0]; 380 _slot_schedule $_[0];
355} 381}
356 382
383# extract cookies from jar
384sub cookie_jar_extract($$$$) {
385 my ($jar, $uscheme, $uhost, $upath) = @_;
386
387 %$jar = () if $jar->{version} != 1;
388
389 my @cookies;
390
391 while (my ($chost, $paths) = each %$jar) {
392 next unless ref $paths;
393
394 if ($chost =~ /^\./) {
395 next unless $chost eq substr $uhost, -length $chost;
396 } elsif ($chost =~ /\./) {
397 next unless $chost eq $uhost;
398 } else {
399 next;
400 }
401
402 while (my ($cpath, $cookies) = each %$paths) {
403 next unless $cpath eq substr $upath, 0, length $cpath;
404
405 while (my ($cookie, $kv) = each %$cookies) {
406 next if $uscheme ne "https" && exists $kv->{secure};
407
408 if (exists $kv->{expires}) {
409 if (AE::now > parse_date ($kv->{expires})) {
410 delete $cookies->{$cookie};
411 next;
412 }
413 }
414
415 my $value = $kv->{value};
416
417 if ($value =~ /[=;,[:space:]]/) {
418 $value =~ s/([\\"])/\\$1/g;
419 $value = "\"$value\"";
420 }
421
422 push @cookies, "$cookie=$value";
423 }
424 }
425 }
426
427 \@cookies
428}
429
430# parse set_cookie header into jar
431sub cookie_jar_set_cookie($$$) {
432 my ($jar, $set_cookie, $uhost) = @_;
433
434 for ($set_cookie) {
435 # parse NAME=VALUE
436 my @kv;
437
438 while (
439 m{
440 \G\s*
441 (?:
442 expires \s*=\s* ([A-Z][a-z][a-z],\ [^,;]+)
443 | ([^=;,[:space:]]+) \s*=\s* (?: "((?:[^\\"]+|\\.)*)" | ([^=;,[:space:]]*) )
444 )
445 }gcxsi
446 ) {
447 my $name = $2;
448 my $value = $4;
449
450 unless (defined $name) {
451 # expires
452 $name = "expires";
453 $value = $1;
454 } elsif (!defined $value) {
455 # quoted
456 $value = $3;
457 $value =~ s/\\(.)/$1/gs;
458 }
459
460 push @kv, lc $name, $value;
461
462 last unless /\G\s*;/gc;
463 }
464
465 last unless @kv;
466
467 my $name = shift @kv;
468 my %kv = (value => shift @kv, @kv);
469
470 $kv{expires} ||= format_date (AE::now + $kv{"max-age"})
471 if exists $kv{"max-age"};
472
473 my $cdom;
474 my $cpath = (delete $kv{path}) || "/";
475
476 if (exists $kv{domain}) {
477 $cdom = delete $kv{domain};
478
479 $cdom =~ s/^\.?/./; # make sure it starts with a "."
480
481 next if $cdom =~ /\.$/;
482
483 # this is not rfc-like and not netscape-like. go figure.
484 my $ndots = $cdom =~ y/.//;
485 next if $ndots < ($cdom =~ /\.[^.][^.]\.[^.][^.]$/ ? 3 : 2);
486 } else {
487 $cdom = $uhost;
488 }
489
490 # store it
491 $jar->{version} = 1;
492 $jar->{$cdom}{$cpath}{$name} = \%kv;
493
494 redo if /\G\s*,/gc;
495 }
496}
497
357# continue to parse $_ for headers and place them into the arg 498# continue to parse $_ for headers and place them into the arg
358sub parse_hdr() { 499sub parse_hdr() {
359 my %hdr; 500 my %hdr;
360 501
361 # things seen, not parsed: 502 # things seen, not parsed:
… …
436 577
437 $upath =~ s%^/?%/%; 578 $upath =~ s%^/?%/%;
438 579
439 # cookie processing 580 # cookie processing
440 if (my $jar = $arg{cookie_jar}) { 581 if (my $jar = $arg{cookie_jar}) {
441 %$jar = () if $jar->{version} != 1; 582 my $cookies = cookie_jar_extract $jar, $uscheme, $uhost, $upath;
442 583
443 my @cookie;
444
445 while (my ($chost, $v) = each %$jar) {
446 if ($chost =~ /^\./) {
447 next unless $chost eq substr $uhost, -length $chost;
448 } elsif ($chost =~ /\./) {
449 next unless $chost eq $uhost;
450 } else {
451 next;
452 }
453
454 while (my ($cpath, $v) = each %$v) {
455 next unless $cpath eq substr $upath, 0, length $cpath;
456
457 while (my ($k, $v) = each %$v) {
458 next if $uscheme ne "https" && exists $v->{secure};
459 my $value = $v->{value};
460 $value =~ s/([\\"])/\\$1/g;
461 push @cookie, "$k=\"$value\"";
462 }
463 }
464 }
465
466 $hdr{cookie} = join "; ", @cookie 584 $hdr{cookie} = join "; ", @$cookies
467 if @cookie; 585 if @$cookies;
468 } 586 }
469 587
470 my ($rhost, $rport, $rscheme, $rpath); # request host, port, path 588 my ($rhost, $rport, $rscheme, $rpath); # request host, port, path
471 589
472 if ($proxy) { 590 if ($proxy) {
… …
486 $hdr{"user-agent"} = $USERAGENT unless exists $hdr{"user-agent"}; 604 $hdr{"user-agent"} = $USERAGENT unless exists $hdr{"user-agent"};
487 605
488 $hdr{"content-length"} = length $arg{body} 606 $hdr{"content-length"} = length $arg{body}
489 if length $arg{body} || $method ne "GET"; 607 if length $arg{body} || $method ne "GET";
490 608
491 $hdr{connection} = "close TE"; 609 $hdr{connection} = "close TE"; #1.1
492 $hdr{te} = "trailers" unless exists $hdr{te}; 610 $hdr{te} = "trailers" unless exists $hdr{te}; #1.1
493 611
494 my %state = (connect_guard => 1); 612 my %state = (connect_guard => 1);
495 613
496 _get_slot $uhost, sub { 614 _get_slot $uhost, sub {
497 $state{slot_guard} = shift; 615 $state{slot_guard} = shift;
498 616
499 return unless $state{connect_guard}; 617 return unless $state{connect_guard};
618
619 my $ae_error = 595; # connecting
500 620
501 my $connect_cb = sub { 621 my $connect_cb = sub {
502 $state{fh} = shift 622 $state{fh} = shift
503 or do { 623 or do {
504 my $err = "$!"; 624 my $err = "$!";
505 %state = (); 625 %state = ();
506 return $cb->(undef, { @pseudo, Status => 599, Reason => $err }); 626 return $cb->(undef, { @pseudo, Status => $ae_error, Reason => $err });
507 }; 627 };
508
509 pop; # free memory, save a tree
510 628
511 return unless delete $state{connect_guard}; 629 return unless delete $state{connect_guard};
512 630
513 # get handle 631 # get handle
514 $state{handle} = new AnyEvent::Handle 632 $state{handle} = new AnyEvent::Handle
… …
517 tls_ctx => $arg{tls_ctx}, 635 tls_ctx => $arg{tls_ctx},
518 # these need to be reconfigured on keepalive handles 636 # these need to be reconfigured on keepalive handles
519 timeout => $timeout, 637 timeout => $timeout,
520 on_error => sub { 638 on_error => sub {
521 %state = (); 639 %state = ();
522 $cb->(undef, { @pseudo, Status => 599, Reason => $_[2] }); 640 $cb->(undef, { @pseudo, Status => $ae_error, Reason => $_[2] });
523 }, 641 },
524 on_eof => sub { 642 on_eof => sub {
525 %state = (); 643 %state = ();
526 $cb->(undef, { @pseudo, Status => 599, Reason => "Unexpected end-of-file" }); 644 $cb->(undef, { @pseudo, Status => $ae_error, Reason => "Unexpected end-of-file" });
527 }, 645 },
528 ; 646 ;
529 647
530 # limit the number of persistent connections 648 # limit the number of persistent connections
531 # keepalive not yet supported 649 # keepalive not yet supported
… …
533# ++$KA_COUNT{$_[1]}; 651# ++$KA_COUNT{$_[1]};
534# $state{handle}{ka_count_guard} = AnyEvent::Util::guard { 652# $state{handle}{ka_count_guard} = AnyEvent::Util::guard {
535# --$KA_COUNT{$_[1]} 653# --$KA_COUNT{$_[1]}
536# }; 654# };
537# $hdr{connection} = "keep-alive"; 655# $hdr{connection} = "keep-alive";
538# } else {
539# delete $hdr{connection};
540# } 656# }
541 657
542 $state{handle}->starttls ("connect") if $rscheme eq "https"; 658 $state{handle}->starttls ("connect") if $rscheme eq "https";
543 659
544 # handle actual, non-tunneled, request 660 # handle actual, non-tunneled, request
545 my $handle_actual_request = sub { 661 my $handle_actual_request = sub {
662 $ae_error = 596; # request phase
663
546 $state{handle}->starttls ("connect") if $uscheme eq "https" && !exists $state{handle}{tls}; 664 $state{handle}->starttls ("connect") if $uscheme eq "https" && !exists $state{handle}{tls};
547 665
548 # send request 666 # send request
549 $state{handle}->push_write ( 667 $state{handle}->push_write (
550 "$method $rpath HTTP/1.1\015\012" 668 "$method $rpath HTTP/1.1\015\012"
… …
557 return unless %state; 675 return unless %state;
558 676
559 %hdr = (); # reduce memory usage, save a kitten, also make it possible to re-use 677 %hdr = (); # reduce memory usage, save a kitten, also make it possible to re-use
560 678
561 # status line and headers 679 # status line and headers
562 $state{handle}->push_read (line => $qr_nlnl, sub { 680 $state{read_response} = sub {
563 my $keepalive = pop;
564
565 for ("$_[1]") { 681 for ("$_[1]") {
566 y/\015//d; # weed out any \015, as they show up in the weirdest of places. 682 y/\015//d; # weed out any \015, as they show up in the weirdest of places.
567 683
568 /^HTTP\/([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\012]*) )? \012/igxc 684 /^HTTP\/0*([0-9\.]+) \s+ ([0-9]{3}) (?: \s+ ([^\012]*) )? \012/gxci
569 or return (%state = (), $cb->(undef, { @pseudo, Status => 599, Reason => "Invalid server response" })); 685 or return (%state = (), $cb->(undef, { @pseudo, Status => 599, Reason => "Invalid server response" }));
686
687 # 100 Continue handling
688 # should not happen as we don't send expect: 100-continue,
689 # but we handle it just in case.
690 # since we send the request body regardless, if we get an error
691 # we are out of-sync, which we currently do NOT handle correctly.
692 return $state{handle}->push_read (line => $qr_nlnl, $state{read_response})
693 if $2 eq 100;
570 694
571 push @pseudo, 695 push @pseudo,
572 HTTPVersion => $1, 696 HTTPVersion => $1,
573 Status => $2, 697 Status => $2,
574 Reason => $3, 698 Reason => $3,
… …
600 724
601 if ($recurse) { 725 if ($recurse) {
602 my $status = $hdr{Status}; 726 my $status = $hdr{Status};
603 727
604 # industry standard is to redirect POST as GET for 728 # industry standard is to redirect POST as GET for
605 # 301, 302 and 303, in contrast to http/1.0 and 1.1. 729 # 301, 302 and 303, in contrast to HTTP/1.0 and 1.1.
606 # also, the UA should ask the user for 301 and 307 and POST, 730 # also, the UA should ask the user for 301 and 307 and POST,
607 # industry standard seems to be to simply follow. 731 # industry standard seems to be to simply follow.
608 # we go with the industry standard. 732 # we go with the industry standard.
609 if ($status == 301 or $status == 302 or $status == 303) { 733 if ($status == 301 or $status == 302 or $status == 303) {
610 # HTTP/1.1 is unclear on how to mutate the method 734 # HTTP/1.1 is unclear on how to mutate the method
… …
614 $redirect = 1; 738 $redirect = 1;
615 } 739 }
616 } 740 }
617 741
618 my $finish = sub { # ($data, $err_status, $err_reason[, $keepalive]) 742 my $finish = sub { # ($data, $err_status, $err_reason[, $keepalive])
743 my $may_keep_alive = $_[3];
744
619 $state{handle}->destroy if $state{handle}; 745 $state{handle}->destroy if $state{handle};
620 %state = (); 746 %state = ();
621 747
622 if (defined $_[1]) { 748 if (defined $_[1]) {
623 $hdr{OrigStatus} = $hdr{Status}; $hdr{Status} = $_[1]; 749 $hdr{OrigStatus} = $hdr{Status}; $hdr{Status} = $_[1];
624 $hdr{OrigReason} = $hdr{Reason}; $hdr{Reason} = $_[2]; 750 $hdr{OrigReason} = $hdr{Reason}; $hdr{Reason} = $_[2];
625 } 751 }
626 752
627 # set-cookie processing 753 # set-cookie processing
628 if ($arg{cookie_jar}) { 754 if ($arg{cookie_jar}) {
629 for ($hdr{"set-cookie"}) { 755 cookie_jar_set_cookie $arg{cookie_jar}, $hdr{"set-cookie"}, $uhost;
630 # parse NAME=VALUE
631 my @kv;
632
633 while (/\G\s* ([^=;,[:space:]]+) \s*=\s* (?: "((?:[^\\"]+|\\.)*)" | ([^=;,[:space:]]*) )/gcxs) {
634 my $name = $1;
635 my $value = $3;
636
637 unless ($value) {
638 $value = $2;
639 $value =~ s/\\(.)/$1/gs;
640 }
641
642 push @kv, $name => $value;
643
644 last unless /\G\s*;/gc;
645 }
646
647 last unless @kv;
648
649 my $name = shift @kv;
650 my %kv = (value => shift @kv, @kv);
651
652 my $cdom;
653 my $cpath = (delete $kv{path}) || "/";
654
655 if (exists $kv{domain}) {
656 $cdom = delete $kv{domain};
657
658 $cdom =~ s/^\.?/./; # make sure it starts with a "."
659
660 next if $cdom =~ /\.$/;
661
662 # this is not rfc-like and not netscape-like. go figure.
663 my $ndots = $cdom =~ y/.//;
664 next if $ndots < ($cdom =~ /\.[^.][^.]\.[^.][^.]$/ ? 3 : 2);
665 } else {
666 $cdom = $uhost;
667 }
668
669 # store it
670 $arg{cookie_jar}{version} = 1;
671 $arg{cookie_jar}{$cdom}{$cpath}{$name} = \%kv;
672
673 redo if /\G\s*,/gc;
674 }
675 } 756 }
676 757
677 if ($redirect && exists $hdr{location}) { 758 if ($redirect && exists $hdr{location}) {
678 # we ignore any errors, as it is very common to receive 759 # we ignore any errors, as it is very common to receive
679 # Content-Length != 0 but no actual body 760 # Content-Length != 0 but no actual body
… …
686 $cb); 767 $cb);
687 } else { 768 } else {
688 $cb->($_[0], \%hdr); 769 $cb->($_[0], \%hdr);
689 } 770 }
690 }; 771 };
772
773 $ae_error = 597; # body phase
691 774
692 my $len = $hdr{"content-length"}; 775 my $len = $hdr{"content-length"};
693 776
694 if (!$redirect && $arg{on_header} && !$arg{on_header}(\%hdr)) { 777 if (!$redirect && $arg{on_header} && !$arg{on_header}(\%hdr)) {
695 $finish->(undef, 598 => "Request cancelled by on_header"); 778 $finish->(undef, 598 => "Request cancelled by on_header");
… …
712 $_[0]->on_error (undef); 795 $_[0]->on_error (undef);
713 $_[0]->on_read (undef); 796 $_[0]->on_read (undef);
714 797
715 $finish->(delete $state{handle}); 798 $finish->(delete $state{handle});
716 799
717 } elsif ($hdr{"transfer-encoding"} =~ /chunked/) { 800 } elsif ($hdr{"transfer-encoding"} =~ /\bchunked\b/i) {
801 my $cl = 0;
718 my $body = undef; 802 my $body = undef;
719 my $on_body = $arg{on_body} || sub { $body .= shift; 1 }; 803 my $on_body = $arg{on_body} || sub { $body .= shift; 1 };
720 804
721 $_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
722
723 my $read_chunk; $read_chunk = sub { 805 my $read_chunk; $read_chunk = sub {
724 warn $_[1];#d#
725 $_[1] =~ /^([0-9a-fA-F]+)/ 806 $_[1] =~ /^([0-9a-fA-F]+)/
726 or $finish->(undef, 599 => "Garbled chunked transfer encoding"); 807 or $finish->(undef, $ae_error => "Garbled chunked transfer encoding");
727 808
728 my $len = hex $1; 809 my $len = hex $1;
729 810
730 if ($len) { 811 if ($len) {
812 $cl += $len;
813
731 $_[0]->push_read (chunk => hex $1, sub { 814 $_[0]->push_read (chunk => $len, sub {
732 $on_body->($_[1], \%hdr) 815 $on_body->($_[1], \%hdr)
733 or return $finish->(undef, 598 => "Request cancelled by on_body"); 816 or return $finish->(undef, 598 => "Request cancelled by on_body");
734 817
735 $_[0]->push_read (line => sub { 818 $_[0]->push_read (line => sub {
736 length $_[1] 819 length $_[1]
737 and return $finish->(undef, 599 => "Garbled chunked transfer encoding"); 820 and return $finish->(undef, $ae_error => "Garbled chunked transfer encoding");
738 $_[0]->push_read (line => $read_chunk); 821 $_[0]->push_read (line => $read_chunk);
739 }); 822 });
740 }); 823 });
741 } else { 824 } else {
825 $hdr{"content-length"} ||= $cl;
826
742 $_[0]->push_read (line => $qr_nlnl, sub { 827 $_[0]->push_read (line => $qr_nlnl, sub {
743 if (length $_[1]) { 828 if (length $_[1]) {
744 for ("$_[1]") { 829 for ("$_[1]") {
745 y/\015//d; # weed out any \015, as they show up in the weirdest of places. 830 y/\015//d; # weed out any \015, as they show up in the weirdest of places.
746 831
747 my $hdr = parse_hdr 832 my $hdr = parse_hdr
748 or return $finish->(undef, 599 => "Garbled response trailers"); 833 or return $finish->(undef, $ae_error => "Garbled response trailers");
749 834
750 %hdr = (%hdr, %$hdr); 835 %hdr = (%hdr, %$hdr);
751 } 836 }
752 } 837 }
753 838
… …
757 }; 842 };
758 843
759 $_[0]->push_read (line => $read_chunk); 844 $_[0]->push_read (line => $read_chunk);
760 845
761 } elsif ($arg{on_body}) { 846 } elsif ($arg{on_body}) {
762 $_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
763
764 if ($len) { 847 if ($len) {
765 $_[0]->on_read (sub { 848 $_[0]->on_read (sub {
766 $len -= length $_[0]{rbuf}; 849 $len -= length $_[0]{rbuf};
767 850
768 $arg{on_body}(delete $_[0]{rbuf}, \%hdr) 851 $arg{on_body}(delete $_[0]{rbuf}, \%hdr)
… …
782 } 865 }
783 } else { 866 } else {
784 $_[0]->on_eof (undef); 867 $_[0]->on_eof (undef);
785 868
786 if ($len) { 869 if ($len) {
787 $_[0]->on_error (sub { $finish->(undef, 599 => $_[2]) });
788 $_[0]->on_read (sub { 870 $_[0]->on_read (sub {
789 $finish->((substr delete $_[0]{rbuf}, 0, $len, ""), undef, undef, 1) 871 $finish->((substr delete $_[0]{rbuf}, 0, $len, ""), undef, undef, 1)
790 if $len <= length $_[0]{rbuf}; 872 if $len <= length $_[0]{rbuf};
791 }); 873 });
792 } else { 874 } else {
793 $_[0]->on_error (sub { 875 $_[0]->on_error (sub {
794 ($! == Errno::EPIPE || !$!) 876 ($! == Errno::EPIPE || !$!)
795 ? $finish->(delete $_[0]{rbuf}) 877 ? $finish->(delete $_[0]{rbuf})
796 : $finish->(undef, 599 => $_[2]); 878 : $finish->(undef, $ae_error => $_[2]);
797 }); 879 });
798 $_[0]->on_read (sub { }); 880 $_[0]->on_read (sub { });
799 } 881 }
800 } 882 }
801 } 883 }
802 }); 884 };
885
886 $state{handle}->push_read (line => $qr_nlnl, $state{read_response});
803 }; 887 };
804 888
805 # now handle proxy-CONNECT method 889 # now handle proxy-CONNECT method
806 if ($proxy && $uscheme eq "https") { 890 if ($proxy && $uscheme eq "https") {
807 # oh dear, we have to wrap it into a connect request 891 # oh dear, we have to wrap it into a connect request
… …
879Takes a POSIX timestamp (seconds since the epoch) and formats it as a HTTP 963Takes a POSIX timestamp (seconds since the epoch) and formats it as a HTTP
880Date (RFC 2616). 964Date (RFC 2616).
881 965
882=item $timestamp = AnyEvent::HTTP::parse_date $date 966=item $timestamp = AnyEvent::HTTP::parse_date $date
883 967
884Takes a HTTP Date (RFC 2616) and returns the corresponding POSIX 968Takes a HTTP Date (RFC 2616) or a Cookie date (netscape cookie spec) and
885timestamp, or C<undef> if the date cannot be parsed. 969returns the corresponding POSIX timestamp, or C<undef> if the date cannot
970be parsed.
886 971
887=item $AnyEvent::HTTP::MAX_RECURSE 972=item $AnyEvent::HTTP::MAX_RECURSE
888 973
889The default value for the C<recurse> request parameter (default: C<10>). 974The default value for the C<recurse> request parameter (default: C<10>).
890 975
… …
929sub parse_date($) { 1014sub parse_date($) {
930 my ($date) = @_; 1015 my ($date) = @_;
931 1016
932 my ($d, $m, $y, $H, $M, $S); 1017 my ($d, $m, $y, $H, $M, $S);
933 1018
934 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$/) { 1019 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$/) {
935 # RFC 822/1123, required by RFC 2616 1020 # RFC 822/1123, required by RFC 2616 (with " ")
1021 # cookie dates (with "-")
1022
936 ($d, $m, $y, $H, $M, $S) = ($1, $2, $3, $4, $5, $6); 1023 ($d, $m, $y, $H, $M, $S) = ($1, $2, $3, $4, $5, $6);
937 1024
938 } 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$/) { 1025 } 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$/) {
939 # RFC 850 1026 # RFC 850
940 ($d, $m, $y, $H, $M, $S) = ($1, $2, $3 < 69 ? $3 + 2000 : $3 + 1900, $4, $5, $6); 1027 ($d, $m, $y, $H, $M, $S) = ($1, $2, $3 < 69 ? $3 + 2000 : $3 + 1900, $4, $5, $6);

Diff Legend

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