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

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents):
Revision 1.51 by root, Sat May 31 13:38:01 2008 UTC vs.
Revision 1.61 by root, Fri Jun 6 10:23:50 2008 UTC

… …
14 14
15AnyEvent::Handle - non-blocking I/O on file handles via AnyEvent 15AnyEvent::Handle - non-blocking I/O on file handles via AnyEvent
16 16
17=cut 17=cut
18 18
19our $VERSION = 4.1; 19our $VERSION = 4.14;
20 20
21=head1 SYNOPSIS 21=head1 SYNOPSIS
22 22
23 use AnyEvent; 23 use AnyEvent;
24 use AnyEvent::Handle; 24 use AnyEvent::Handle;
… …
75NOTE: The filehandle will be set to non-blocking (using 75NOTE: The filehandle will be set to non-blocking (using
76AnyEvent::Util::fh_nonblocking). 76AnyEvent::Util::fh_nonblocking).
77 77
78=item on_eof => $cb->($handle) 78=item on_eof => $cb->($handle)
79 79
80Set the callback to be called on EOF. 80Set the callback to be called when an end-of-file condition is detcted,
81i.e. in the case of a socket, when the other side has closed the
82connection cleanly.
81 83
82While not mandatory, it is highly recommended to set an eof callback, 84While not mandatory, it is highly recommended to set an eof callback,
83otherwise you might end up with a closed socket while you are still 85otherwise you might end up with a closed socket while you are still
84waiting for data. 86waiting for data.
85 87
86=item on_error => $cb->($handle) 88=item on_error => $cb->($handle, $fatal)
87 89
88This is the fatal error callback, that is called when, well, a fatal error 90This is the error callback, which is called when, well, some error
89occurs, such as not being able to resolve the hostname, failure to connect 91occured, such as not being able to resolve the hostname, failure to
90or a read error. 92connect or a read error.
91 93
92The object will not be in a usable state when this callback has been 94Some errors are fatal (which is indicated by C<$fatal> being true). On
93called. 95fatal errors the handle object will be shut down and will not be
96usable. Non-fatal errors can be retried by simply returning, but it is
97recommended to simply ignore this parameter and instead abondon the handle
98object when this callback is invoked.
94 99
95On callback entrance, the value of C<$!> contains the operating system 100On callback entrance, the value of C<$!> contains the operating system
96error (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT> or C<EBADMSG>). 101error (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT> or C<EBADMSG>).
97 102
98The callback should throw an exception. If it returns, then
99AnyEvent::Handle will C<croak> for you.
100
101While not mandatory, it is I<highly> recommended to set this callback, as 103While not mandatory, it is I<highly> recommended to set this callback, as
102you will not be notified of errors otherwise. The default simply calls 104you will not be notified of errors otherwise. The default simply calls
103die. 105C<croak>.
104 106
105=item on_read => $cb->($handle) 107=item on_read => $cb->($handle)
106 108
107This sets the default read callback, which is called when data arrives 109This sets the default read callback, which is called when data arrives
108and no read request is in the queue. 110and no read request is in the queue (unlike read queue callbacks, this
111callback will only be called when at least one octet of data is in the
112read buffer).
109 113
110To access (and remove data from) the read buffer, use the C<< ->rbuf >> 114To access (and remove data from) the read buffer, use the C<< ->rbuf >>
111method or access the C<$handle->{rbuf}> member directly. 115method or access the C<$handle->{rbuf}> member directly.
112 116
113When an EOF condition is detected then AnyEvent::Handle will first try to 117When an EOF condition is detected then AnyEvent::Handle will first try to
… …
222 if ($self->{tls}) { 226 if ($self->{tls}) {
223 require Net::SSLeay; 227 require Net::SSLeay;
224 $self->starttls (delete $self->{tls}, delete $self->{tls_ctx}); 228 $self->starttls (delete $self->{tls}, delete $self->{tls_ctx});
225 } 229 }
226 230
227# $self->on_eof (delete $self->{on_eof} ) if $self->{on_eof}; # nop
228# $self->on_error (delete $self->{on_error}) if $self->{on_error}; # nop
229# $self->on_read (delete $self->{on_read} ) if $self->{on_read}; # nop
230 $self->on_drain (delete $self->{on_drain}) if $self->{on_drain};
231
232 $self->{_activity} = AnyEvent->now; 231 $self->{_activity} = AnyEvent->now;
233 $self->_timeout; 232 $self->_timeout;
234 233
235 $self->start_read; 234 $self->on_drain (delete $self->{on_drain}) if $self->{on_drain};
236 235
237 $self 236 $self
238} 237}
239 238
240sub _shutdown { 239sub _shutdown {
… …
242 241
243 delete $self->{_tw}; 242 delete $self->{_tw};
244 delete $self->{_rw}; 243 delete $self->{_rw};
245 delete $self->{_ww}; 244 delete $self->{_ww};
246 delete $self->{fh}; 245 delete $self->{fh};
247}
248 246
247 $self->stoptls;
248}
249
249sub error { 250sub _error {
250 my ($self) = @_; 251 my ($self, $errno, $fatal) = @_;
251 252
252 {
253 local $!;
254 $self->_shutdown; 253 $self->_shutdown
255 } 254 if $fatal;
256 255
257 $self->{on_error}($self) 256 $! = $errno;
257
258 if $self->{on_error}; 258 if ($self->{on_error}) {
259 259 $self->{on_error}($self, $fatal);
260 } else {
260 Carp::croak "AnyEvent::Handle uncaught fatal error: $!"; 261 Carp::croak "AnyEvent::Handle uncaught error: $!";
262 }
261} 263}
262 264
263=item $fh = $handle->fh 265=item $fh = $handle->fh
264 266
265This method returns the file handle of the L<AnyEvent::Handle> object. 267This method returns the file handle of the L<AnyEvent::Handle> object.
… …
331 $self->{_activity} = $NOW; 333 $self->{_activity} = $NOW;
332 334
333 if ($self->{on_timeout}) { 335 if ($self->{on_timeout}) {
334 $self->{on_timeout}($self); 336 $self->{on_timeout}($self);
335 } else { 337 } else {
336 $! = Errno::ETIMEDOUT; 338 $self->_error (&Errno::ETIMEDOUT);
337 $self->error;
338 } 339 }
339 340
340 # callbakx could have changed timeout value, optimise 341 # callback could have changed timeout value, optimise
341 return unless $self->{timeout}; 342 return unless $self->{timeout};
342 343
343 # calculate new after 344 # calculate new after
344 $after = $self->{timeout}; 345 $after = $self->{timeout};
345 } 346 }
346 347
347 Scalar::Util::weaken $self; 348 Scalar::Util::weaken $self;
349 return unless $self; # ->error could have destroyed $self
348 350
349 $self->{_tw} ||= AnyEvent->timer (after => $after, cb => sub { 351 $self->{_tw} ||= AnyEvent->timer (after => $after, cb => sub {
350 delete $self->{_tw}; 352 delete $self->{_tw};
351 $self->_timeout; 353 $self->_timeout;
352 }); 354 });
… …
415 if $self->{low_water_mark} >= length $self->{wbuf} 417 if $self->{low_water_mark} >= length $self->{wbuf}
416 && $self->{on_drain}; 418 && $self->{on_drain};
417 419
418 delete $self->{_ww} unless length $self->{wbuf}; 420 delete $self->{_ww} unless length $self->{wbuf};
419 } elsif ($! != EAGAIN && $! != EINTR && $! != WSAEWOULDBLOCK) { 421 } elsif ($! != EAGAIN && $! != EINTR && $! != WSAEWOULDBLOCK) {
420 $self->error; 422 $self->_error ($!, 1);
421 } 423 }
422 }; 424 };
423 425
424 # try to write data immediately 426 # try to write data immediately
425 $cb->(); 427 $cb->();
… …
454 } 456 }
455} 457}
456 458
457=item $handle->push_write (type => @args) 459=item $handle->push_write (type => @args)
458 460
459=item $handle->unshift_write (type => @args)
460
461Instead of formatting your data yourself, you can also let this module do 461Instead of formatting your data yourself, you can also let this module do
462the job by specifying a type and type-specific arguments. 462the job by specifying a type and type-specific arguments.
463 463
464Predefined types are (if you have ideas for additional types, feel free to 464Predefined types are (if you have ideas for additional types, feel free to
465drop by and tell us): 465drop by and tell us):
… …
469=item netstring => $string 469=item netstring => $string
470 470
471Formats the given value as netstring 471Formats the given value as netstring
472(http://cr.yp.to/proto/netstrings.txt, this is not a recommendation to use them). 472(http://cr.yp.to/proto/netstrings.txt, this is not a recommendation to use them).
473 473
474=back
475
476=cut 474=cut
477 475
478register_write_type netstring => sub { 476register_write_type netstring => sub {
479 my ($self, $string) = @_; 477 my ($self, $string) = @_;
480 478
481 sprintf "%d:%s,", (length $string), $string 479 sprintf "%d:%s,", (length $string), $string
480};
481
482=item packstring => $format, $data
483
484An octet string prefixed with an encoded length. The encoding C<$format>
485uses the same format as a Perl C<pack> format, but must specify a single
486integer only (only one of C<cCsSlLqQiInNvVjJw> is allowed, plus an
487optional C<!>, C<< < >> or C<< > >> modifier).
488
489=cut
490
491register_write_type packstring => sub {
492 my ($self, $format, $string) = @_;
493
494 pack "$format/a", $string
482}; 495};
483 496
484=item json => $array_or_hashref 497=item json => $array_or_hashref
485 498
486Encodes the given hash or array reference into a JSON object. Unless you 499Encodes the given hash or array reference into a JSON object. Unless you
… …
520 533
521 $self->{json} ? $self->{json}->encode ($ref) 534 $self->{json} ? $self->{json}->encode ($ref)
522 : JSON::encode_json ($ref) 535 : JSON::encode_json ($ref)
523}; 536};
524 537
538=back
539
525=item AnyEvent::Handle::register_write_type type => $coderef->($handle, @args) 540=item AnyEvent::Handle::register_write_type type => $coderef->($handle, @args)
526 541
527This function (not method) lets you add your own types to C<push_write>. 542This function (not method) lets you add your own types to C<push_write>.
528Whenever the given C<type> is used, C<push_write> will invoke the code 543Whenever the given C<type> is used, C<push_write> will invoke the code
529reference with the handle object and the remaining arguments. 544reference with the handle object and the remaining arguments.
… …
554enough is there) from the read buffer (C<< $handle->rbuf >>) if you want 569enough is there) from the read buffer (C<< $handle->rbuf >>) if you want
555or not. 570or not.
556 571
557In the more complex case, you want to queue multiple callbacks. In this 572In the more complex case, you want to queue multiple callbacks. In this
558case, AnyEvent::Handle will call the first queued callback each time new 573case, AnyEvent::Handle will call the first queued callback each time new
559data arrives and removes it when it has done its job (see C<push_read>, 574data arrives (also the first time it is queued) and removes it when it has
560below). 575done its job (see C<push_read>, below).
561 576
562This way you can, for example, push three line-reads, followed by reading 577This way you can, for example, push three line-reads, followed by reading
563a chunk of data, and AnyEvent::Handle will execute them in order. 578a chunk of data, and AnyEvent::Handle will execute them in order.
564 579
565Example 1: EPP protocol parser. EPP sends 4 byte length info, followed by 580Example 1: EPP protocol parser. EPP sends 4 byte length info, followed by
566the specified number of bytes which give an XML datagram. 581the specified number of bytes which give an XML datagram.
567 582
568 # in the default state, expect some header bytes 583 # in the default state, expect some header bytes
569 $handle->on_read (sub { 584 $handle->on_read (sub {
570 # some data is here, now queue the length-header-read (4 octets) 585 # some data is here, now queue the length-header-read (4 octets)
571 shift->unshift_read_chunk (4, sub { 586 shift->unshift_read (chunk => 4, sub {
572 # header arrived, decode 587 # header arrived, decode
573 my $len = unpack "N", $_[1]; 588 my $len = unpack "N", $_[1];
574 589
575 # now read the payload 590 # now read the payload
576 shift->unshift_read_chunk ($len, sub { 591 shift->unshift_read (chunk => $len, sub {
577 my $xml = $_[1]; 592 my $xml = $_[1];
578 # handle xml 593 # handle xml
579 }); 594 });
580 }); 595 });
581 }); 596 });
… …
588 603
589 # request one 604 # request one
590 $handle->push_write ("request 1\015\012"); 605 $handle->push_write ("request 1\015\012");
591 606
592 # we expect "ERROR" or "OK" as response, so push a line read 607 # we expect "ERROR" or "OK" as response, so push a line read
593 $handle->push_read_line (sub { 608 $handle->push_read (line => sub {
594 # if we got an "OK", we have to _prepend_ another line, 609 # if we got an "OK", we have to _prepend_ another line,
595 # so it will be read before the second request reads its 64 bytes 610 # so it will be read before the second request reads its 64 bytes
596 # which are already in the queue when this callback is called 611 # which are already in the queue when this callback is called
597 # we don't do this in case we got an error 612 # we don't do this in case we got an error
598 if ($_[1] eq "OK") { 613 if ($_[1] eq "OK") {
599 $_[0]->unshift_read_line (sub { 614 $_[0]->unshift_read (line => sub {
600 my $response = $_[1]; 615 my $response = $_[1];
601 ... 616 ...
602 }); 617 });
603 } 618 }
604 }); 619 });
605 620
606 # request two 621 # request two
607 $handle->push_write ("request 2\015\012"); 622 $handle->push_write ("request 2\015\012");
608 623
609 # simply read 64 bytes, always 624 # simply read 64 bytes, always
610 $handle->push_read_chunk (64, sub { 625 $handle->push_read (chunk => 64, sub {
611 my $response = $_[1]; 626 my $response = $_[1];
612 ... 627 ...
613 }); 628 });
614 629
615=over 4 630=over 4
616 631
617=cut 632=cut
618 633
619sub _drain_rbuf { 634sub _drain_rbuf {
620 my ($self) = @_; 635 my ($self) = @_;
636
637 local $self->{_in_drain} = 1;
621 638
622 if ( 639 if (
623 defined $self->{rbuf_max} 640 defined $self->{rbuf_max}
624 && $self->{rbuf_max} < length $self->{rbuf} 641 && $self->{rbuf_max} < length $self->{rbuf}
625 ) { 642 ) {
626 $! = &Errno::ENOSPC; 643 return $self->_error (&Errno::ENOSPC, 1);
627 $self->error;
628 } 644 }
629 645
630 return if $self->{in_drain}; 646 while () {
631 local $self->{in_drain} = 1;
632
633 while (my $len = length $self->{rbuf}) {
634 no strict 'refs'; 647 no strict 'refs';
648
649 my $len = length $self->{rbuf};
650
635 if (my $cb = shift @{ $self->{_queue} }) { 651 if (my $cb = shift @{ $self->{_queue} }) {
636 unless ($cb->($self)) { 652 unless ($cb->($self)) {
637 if ($self->{_eof}) { 653 if ($self->{_eof}) {
638 # no progress can be made (not enough data and no data forthcoming) 654 # no progress can be made (not enough data and no data forthcoming)
639 $! = &Errno::EPIPE; 655 $self->_error (&Errno::EPIPE, 1), last;
640 $self->error;
641 } 656 }
642 657
643 unshift @{ $self->{_queue} }, $cb; 658 unshift @{ $self->{_queue} }, $cb;
644 return; 659 last;
645 } 660 }
646 } elsif ($self->{on_read}) { 661 } elsif ($self->{on_read}) {
662 last unless $len;
663
647 $self->{on_read}($self); 664 $self->{on_read}($self);
648 665
649 if ( 666 if (
650 $self->{_eof} # if no further data will arrive
651 && $len == length $self->{rbuf} # and no data has been consumed 667 $len == length $self->{rbuf} # if no data has been consumed
652 && !@{ $self->{_queue} } # and the queue is still empty 668 && !@{ $self->{_queue} } # and the queue is still empty
653 && $self->{on_read} # and we still want to read data 669 && $self->{on_read} # but we still have on_read
654 ) { 670 ) {
671 # no further data will arrive
655 # then no progress can be made 672 # so no progress can be made
656 $! = &Errno::EPIPE; 673 $self->_error (&Errno::EPIPE, 1), last
657 $self->error; 674 if $self->{_eof};
675
676 last; # more data might arrive
658 } 677 }
659 } else { 678 } else {
660 # read side becomes idle 679 # read side becomes idle
661 delete $self->{_rw}; 680 delete $self->{_rw};
662 return; 681 last;
663 } 682 }
664 } 683 }
665 684
666 $self->{on_eof}($self) 685 $self->{on_eof}($self)
667 if $self->{_eof} && $self->{on_eof}; 686 if $self->{_eof} && $self->{on_eof};
687
688 # may need to restart read watcher
689 unless ($self->{_rw}) {
690 $self->start_read
691 if $self->{on_read} || @{ $self->{_queue} };
692 }
668} 693}
669 694
670=item $handle->on_read ($cb) 695=item $handle->on_read ($cb)
671 696
672This replaces the currently set C<on_read> callback, or clears it (when 697This replaces the currently set C<on_read> callback, or clears it (when
… …
677 702
678sub on_read { 703sub on_read {
679 my ($self, $cb) = @_; 704 my ($self, $cb) = @_;
680 705
681 $self->{on_read} = $cb; 706 $self->{on_read} = $cb;
707 $self->_drain_rbuf if $cb && !$self->{_in_drain};
682} 708}
683 709
684=item $handle->rbuf 710=item $handle->rbuf
685 711
686Returns the read buffer (as a modifiable lvalue). 712Returns the read buffer (as a modifiable lvalue).
… …
735 $cb = ($RH{$type} or Carp::croak "unsupported type passed to AnyEvent::Handle::push_read") 761 $cb = ($RH{$type} or Carp::croak "unsupported type passed to AnyEvent::Handle::push_read")
736 ->($self, $cb, @_); 762 ->($self, $cb, @_);
737 } 763 }
738 764
739 push @{ $self->{_queue} }, $cb; 765 push @{ $self->{_queue} }, $cb;
740 $self->_drain_rbuf; 766 $self->_drain_rbuf unless $self->{_in_drain};
741} 767}
742 768
743sub unshift_read { 769sub unshift_read {
744 my $self = shift; 770 my $self = shift;
745 my $cb = pop; 771 my $cb = pop;
… …
751 ->($self, $cb, @_); 777 ->($self, $cb, @_);
752 } 778 }
753 779
754 780
755 unshift @{ $self->{_queue} }, $cb; 781 unshift @{ $self->{_queue} }, $cb;
756 $self->_drain_rbuf; 782 $self->_drain_rbuf unless $self->{_in_drain};
757} 783}
758 784
759=item $handle->push_read (type => @args, $cb) 785=item $handle->push_read (type => @args, $cb)
760 786
761=item $handle->unshift_read (type => @args, $cb) 787=item $handle->unshift_read (type => @args, $cb)
… …
846 872
847sub unshift_read_line { 873sub unshift_read_line {
848 my $self = shift; 874 my $self = shift;
849 $self->unshift_read (line => @_); 875 $self->unshift_read (line => @_);
850} 876}
851
852=item netstring => $cb->($handle, $string)
853
854A netstring (http://cr.yp.to/proto/netstrings.txt, this is not an endorsement).
855
856Throws an error with C<$!> set to EBADMSG on format violations.
857
858=cut
859
860register_read_type netstring => sub {
861 my ($self, $cb) = @_;
862
863 sub {
864 unless ($_[0]{rbuf} =~ s/^(0|[1-9][0-9]*)://) {
865 if ($_[0]{rbuf} =~ /[^0-9]/) {
866 $! = &Errno::EBADMSG;
867 $self->error;
868 }
869 return;
870 }
871
872 my $len = $1;
873
874 $self->unshift_read (chunk => $len, sub {
875 my $string = $_[1];
876 $_[0]->unshift_read (chunk => 1, sub {
877 if ($_[1] eq ",") {
878 $cb->($_[0], $string);
879 } else {
880 $! = &Errno::EBADMSG;
881 $self->error;
882 }
883 });
884 });
885
886 1
887 }
888};
889 877
890=item regex => $accept[, $reject[, $skip], $cb->($handle, $data) 878=item regex => $accept[, $reject[, $skip], $cb->($handle, $data)
891 879
892Makes a regex match against the regex object C<$accept> and returns 880Makes a regex match against the regex object C<$accept> and returns
893everything up to and including the match. 881everything up to and including the match.
… …
943 return 1; 931 return 1;
944 } 932 }
945 933
946 # reject 934 # reject
947 if ($reject && $$rbuf =~ $reject) { 935 if ($reject && $$rbuf =~ $reject) {
948 $! = &Errno::EBADMSG; 936 $self->_error (&Errno::EBADMSG);
949 $self->error;
950 } 937 }
951 938
952 # skip 939 # skip
953 if ($skip && $$rbuf =~ $skip) { 940 if ($skip && $$rbuf =~ $skip) {
954 $data .= substr $$rbuf, 0, $+[0], ""; 941 $data .= substr $$rbuf, 0, $+[0], "";
955 } 942 }
956 943
957 () 944 ()
945 }
946};
947
948=item netstring => $cb->($handle, $string)
949
950A netstring (http://cr.yp.to/proto/netstrings.txt, this is not an endorsement).
951
952Throws an error with C<$!> set to EBADMSG on format violations.
953
954=cut
955
956register_read_type netstring => sub {
957 my ($self, $cb) = @_;
958
959 sub {
960 unless ($_[0]{rbuf} =~ s/^(0|[1-9][0-9]*)://) {
961 if ($_[0]{rbuf} =~ /[^0-9]/) {
962 $self->_error (&Errno::EBADMSG);
963 }
964 return;
965 }
966
967 my $len = $1;
968
969 $self->unshift_read (chunk => $len, sub {
970 my $string = $_[1];
971 $_[0]->unshift_read (chunk => 1, sub {
972 if ($_[1] eq ",") {
973 $cb->($_[0], $string);
974 } else {
975 $self->_error (&Errno::EBADMSG);
976 }
977 });
978 });
979
980 1
981 }
982};
983
984=item packstring => $format, $cb->($handle, $string)
985
986An octet string prefixed with an encoded length. The encoding C<$format>
987uses the same format as a Perl C<pack> format, but must specify a single
988integer only (only one of C<cCsSlLqQiInNvVjJw> is allowed, plus an
989optional C<!>, C<< < >> or C<< > >> modifier).
990
991DNS over TCP uses a prefix of C<n>, EPP uses a prefix of C<N>.
992
993Example: read a block of data prefixed by its length in BER-encoded
994format (very efficient).
995
996 $handle->push_read (packstring => "w", sub {
997 my ($handle, $data) = @_;
998 });
999
1000=cut
1001
1002register_read_type packstring => sub {
1003 my ($self, $cb, $format) = @_;
1004
1005 sub {
1006 # when we can use 5.10 we can use ".", but for 5.8 we use the re-pack method
1007 defined (my $len = eval { unpack $format, $_[0]->{rbuf} })
1008 or return;
1009
1010 # remove prefix
1011 substr $_[0]->{rbuf}, 0, (length pack $format, $len), "";
1012
1013 # read rest
1014 $_[0]->unshift_read (chunk => $len, $cb);
1015
1016 1
958 } 1017 }
959}; 1018};
960 1019
961=item json => $cb->($handle, $hash_or_arrayref) 1020=item json => $cb->($handle, $hash_or_arrayref)
962 1021
… …
1027=item $handle->stop_read 1086=item $handle->stop_read
1028 1087
1029=item $handle->start_read 1088=item $handle->start_read
1030 1089
1031In rare cases you actually do not want to read anything from the 1090In rare cases you actually do not want to read anything from the
1032socket. In this case you can call C<stop_read>. Neither C<on_read> no 1091socket. In this case you can call C<stop_read>. Neither C<on_read> nor
1033any queued callbacks will be executed then. To start reading again, call 1092any queued callbacks will be executed then. To start reading again, call
1034C<start_read>. 1093C<start_read>.
1094
1095Note that AnyEvent::Handle will automatically C<start_read> for you when
1096you change the C<on_read> callback or push/unshift a read callback, and it
1097will automatically C<stop_read> for you when neither C<on_read> is set nor
1098there are any read requests in the queue.
1035 1099
1036=cut 1100=cut
1037 1101
1038sub stop_read { 1102sub stop_read {
1039 my ($self) = @_; 1103 my ($self) = @_;
… …
1054 if ($len > 0) { 1118 if ($len > 0) {
1055 $self->{_activity} = AnyEvent->now; 1119 $self->{_activity} = AnyEvent->now;
1056 1120
1057 $self->{filter_r} 1121 $self->{filter_r}
1058 ? $self->{filter_r}($self, $rbuf) 1122 ? $self->{filter_r}($self, $rbuf)
1059 : $self->_drain_rbuf; 1123 : $self->{_in_drain} || $self->_drain_rbuf;
1060 1124
1061 } elsif (defined $len) { 1125 } elsif (defined $len) {
1062 delete $self->{_rw}; 1126 delete $self->{_rw};
1063 $self->{_eof} = 1; 1127 $self->{_eof} = 1;
1064 $self->_drain_rbuf; 1128 $self->_drain_rbuf unless $self->{_in_drain};
1065 1129
1066 } elsif ($! != EAGAIN && $! != EINTR && $! != WSAEWOULDBLOCK) { 1130 } elsif ($! != EAGAIN && $! != EINTR && $! != WSAEWOULDBLOCK) {
1067 return $self->error; 1131 return $self->_error ($!, 1);
1068 } 1132 }
1069 }); 1133 });
1070 } 1134 }
1071} 1135}
1072 1136
1073sub _dotls { 1137sub _dotls {
1074 my ($self) = @_; 1138 my ($self) = @_;
1139
1140 my $buf;
1075 1141
1076 if (length $self->{_tls_wbuf}) { 1142 if (length $self->{_tls_wbuf}) {
1077 while ((my $len = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) { 1143 while ((my $len = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) {
1078 substr $self->{_tls_wbuf}, 0, $len, ""; 1144 substr $self->{_tls_wbuf}, 0, $len, "";
1079 } 1145 }
1080 } 1146 }
1081 1147
1082 if (defined (my $buf = Net::SSLeay::BIO_read ($self->{_wbio}))) { 1148 if (length ($buf = Net::SSLeay::BIO_read ($self->{_wbio}))) {
1083 $self->{wbuf} .= $buf; 1149 $self->{wbuf} .= $buf;
1084 $self->_drain_wbuf; 1150 $self->_drain_wbuf;
1085 } 1151 }
1086 1152
1087 while (defined (my $buf = Net::SSLeay::read ($self->{tls}))) { 1153 while (defined ($buf = Net::SSLeay::read ($self->{tls}))) {
1154 if (length $buf) {
1088 $self->{rbuf} .= $buf; 1155 $self->{rbuf} .= $buf;
1089 $self->_drain_rbuf; 1156 $self->_drain_rbuf unless $self->{_in_drain};
1157 } else {
1158 # let's treat SSL-eof as we treat normal EOF
1159 $self->{_eof} = 1;
1160 $self->_shutdown;
1161 return;
1162 }
1090 } 1163 }
1091 1164
1092 my $err = Net::SSLeay::get_error ($self->{tls}, -1); 1165 my $err = Net::SSLeay::get_error ($self->{tls}, -1);
1093 1166
1094 if ($err!= Net::SSLeay::ERROR_WANT_READ ()) { 1167 if ($err!= Net::SSLeay::ERROR_WANT_READ ()) {
1095 if ($err == Net::SSLeay::ERROR_SYSCALL ()) { 1168 if ($err == Net::SSLeay::ERROR_SYSCALL ()) {
1096 $self->error; 1169 return $self->_error ($!, 1);
1097 } elsif ($err == Net::SSLeay::ERROR_SSL ()) { 1170 } elsif ($err == Net::SSLeay::ERROR_SSL ()) {
1098 $! = &Errno::EIO; 1171 return $self->_error (&Errno::EIO, 1);
1099 $self->error;
1100 } 1172 }
1101 1173
1102 # all others are fine for our purposes 1174 # all others are fine for our purposes
1103 } 1175 }
1104} 1176}

Diff Legend

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