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.107 by root, Wed Nov 26 06:40:47 2008 UTC vs.
Revision 1.115 by root, Tue Feb 10 13:58:49 2009 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.33; 19our $VERSION = 4.331;
20 20
21=head1 SYNOPSIS 21=head1 SYNOPSIS
22 22
23 use AnyEvent; 23 use AnyEvent;
24 use AnyEvent::Handle; 24 use AnyEvent::Handle;
… …
254 254
255You can also provide your own TLS connection object, but you have 255You can also provide your own TLS connection object, but you have
256to make sure that you call either C<Net::SSLeay::set_connect_state> 256to make sure that you call either C<Net::SSLeay::set_connect_state>
257or C<Net::SSLeay::set_accept_state> on it before you pass it to 257or C<Net::SSLeay::set_accept_state> on it before you pass it to
258AnyEvent::Handle. 258AnyEvent::Handle.
259
260B<IMPORTANT:> since Net::SSLeay "objects" are really only integers,
261passing in the wrong integer will lead to certain crash. This most often
262happens when one uses a stylish C<< tls => 1 >> and is surprised about the
263segmentation fault.
259 264
260See the C<< ->starttls >> method for when need to start TLS negotiation later. 265See the C<< ->starttls >> method for when need to start TLS negotiation later.
261 266
262=item tls_ctx => $ssl_ctx 267=item tls_ctx => $ssl_ctx
263 268
… …
762 ) { 767 ) {
763 $self->_error (&Errno::ENOSPC, 1), return; 768 $self->_error (&Errno::ENOSPC, 1), return;
764 } 769 }
765 770
766 while () { 771 while () {
772 $self->{rbuf} .= delete $self->{tls_rbuf} if exists $self->{tls_rbuf};#d#
773
767 my $len = length $self->{rbuf}; 774 my $len = length $self->{rbuf};
768 775
769 if (my $cb = shift @{ $self->{_queue} }) { 776 if (my $cb = shift @{ $self->{_queue} }) {
770 unless ($cb->($self)) { 777 unless ($cb->($self)) {
771 if ($self->{_eof}) { 778 if ($self->{_eof}) {
… …
1139 } 1146 }
1140}; 1147};
1141 1148
1142=item json => $cb->($handle, $hash_or_arrayref) 1149=item json => $cb->($handle, $hash_or_arrayref)
1143 1150
1144Reads a JSON object or array, decodes it and passes it to the callback. 1151Reads a JSON object or array, decodes it and passes it to the
1152callback. When a parse error occurs, an C<EBADMSG> error will be raised.
1145 1153
1146If a C<json> object was passed to the constructor, then that will be used 1154If a C<json> object was passed to the constructor, then that will be used
1147for the final decode, otherwise it will create a JSON coder expecting UTF-8. 1155for the final decode, otherwise it will create a JSON coder expecting UTF-8.
1148 1156
1149This read type uses the incremental parser available with JSON version 1157This read type uses the incremental parser available with JSON version
… …
1166 my $rbuf = \$self->{rbuf}; 1174 my $rbuf = \$self->{rbuf};
1167 1175
1168 my $json = $self->{json} ||= JSON->new->utf8; 1176 my $json = $self->{json} ||= JSON->new->utf8;
1169 1177
1170 sub { 1178 sub {
1171 my $ref = $json->incr_parse ($self->{rbuf}); 1179 my $ref = eval { $json->incr_parse ($self->{rbuf}) };
1172 1180
1173 if ($ref) { 1181 if ($ref) {
1174 $self->{rbuf} = $json->incr_text; 1182 $self->{rbuf} = $json->incr_text;
1175 $json->incr_text = ""; 1183 $json->incr_text = "";
1176 $cb->($self, $ref); 1184 $cb->($self, $ref);
1177 1185
1178 1 1186 1
1187 } elsif ($@) {
1188 # error case
1189 $json->incr_skip;
1190
1191 $self->{rbuf} = $json->incr_text;
1192 $json->incr_text = "";
1193
1194 $self->_error (&Errno::EBADMSG);
1195
1196 ()
1179 } else { 1197 } else {
1180 $self->{rbuf} = ""; 1198 $self->{rbuf} = "";
1199
1181 () 1200 ()
1182 } 1201 }
1183 } 1202 }
1184}; 1203};
1185 1204
… …
1326 delete $self->{_rw}; 1345 delete $self->{_rw};
1327 $self->{_eof} = 1; 1346 $self->{_eof} = 1;
1328 &_freetls; 1347 &_freetls;
1329 } 1348 }
1330 1349
1331 $self->{rbuf} .= $tmp; 1350 $self->{tls_rbuf} .= $tmp;#d#
1332 $self->_drain_rbuf unless $self->{_in_drain}; 1351 $self->_drain_rbuf unless $self->{_in_drain};
1333 $self->{tls} or return; # tls session might have gone away in callback 1352 $self->{tls} or return; # tls session might have gone away in callback
1334 } 1353 }
1335 1354
1336 $tmp = Net::SSLeay::get_error ($self->{tls}, -1); 1355 $tmp = Net::SSLeay::get_error ($self->{tls}, -1);

Diff Legend

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