cvs: php4 /main network.c streams.c

sas Fri Oct 4 15:08:43 2002 EDT Modified files: /php4/main network.c streams.c Log: Add a few notes Index: php4/main/network.c diff -u php4/main/network.c:1.72 php4/main/network.c:1.73 --- php4/main/network.c:1.72 Fri Oct 4 14:59:34 2002 +++ php4/main/network.c Fri Oct 4 15:08:43 2002 @@ -16,7 +16,7 @@ | Streams work by Wez Furlong <wez@thebrainroom.com> | +----------------------------------------------------------------------+ */ -/* $Id: network.c,v 1.72 2002/10/04 18:59:34 wez Exp $ */ +/* $Id: network.c,v 1.73 2002/10/04 19:08:43 sas Exp $ */ /*#define DEBUG_MAIN_NETWORK 1*/ @@ -800,6 +800,7 @@ } #if HAVE_OPENSSL_EXT + /* XXX: Where is the complex OpenSSL error handling? */ if (sock->ssl_active) nr_bytes = SSL_read(sock->ssl_handle, buf, count); else Index: php4/main/streams.c diff -u php4/main/streams.c:1.92 php4/main/streams.c:1.93 --- php4/main/streams.c:1.92 Fri Oct 4 14:59:34 2002 +++ php4/main/streams.c Fri Oct 4 15:08:43 2002 @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.92 2002/10/04 18:59:34 wez Exp $ */ +/* $Id: streams.c,v 1.93 2002/10/04 19:08:43 sas Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -708,11 +708,10 @@ break; } } else { + /* XXX: Should be fine to always read chunk_size */ size_t toread = maxlen - 1; if (toread > stream->chunk_size) toread = stream->chunk_size; - else if (toread < stream->chunk_size) - stream->chunk_size = toread; /* XXX: Should not the loop end, if the stream op fails? */ php_stream_fill_read_buffer(stream, toread TSRMLS_CC);