Re: cvs: php-src(PHP_5_2) / NEWS /ext/openssl xp_ssl.c

Hello Ilia, is HEAD so bad or are a few keystrokes hurting you so much? Sunday, May 27, 2007, 7:05:51 PM, you wrote: > iliaa Sun May 27 17:05:51 2007 UTC > Modified files: (Branch: PHP_5_2) > /php-src NEWS > /php-src/ext/openssl xp_ssl.c > Log: > > Fixed bug #41236 (Regression in timeout handling of non-blocking SSL > connections during reads and writes). > > > http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.738&r2=1.2027.2.547.2.739&diff_format=u²ˆ’=]>püÉÒóû¤g > > Index: php-src/NEWS > diff -u php-src/NEWS:1.2027.2.547.2.738 php-src/NEWS:1.2027.2.547.2.739 > --- php-src/NEWS:1.2027.2.547.2.738 Sun May 27 16:31:35 2007 > +++ php-src/NEWS Sun May 27 17:05:50 2007 > @@ -4,6 +4,8 @@ > - Fixed bug #41511 (Compile failure under IRIX 6.5.30 building md5.c). (Jani) > - Fixed bug #41504 (json_decode() incorrectly decodes JSON arrays with empty > string keys). (Ilia) > +- Fixed bug #41236 (Regression in timeout handling of non-blocking SSL > + connections during reads and writes). (Ilia) > > 24 May 2007, PHP 5.2.3RC1 > - Changed CGI install target to php-cgi and 'make install' to install CLI > î]ü ª[ > –7puØ=cZhttp://cvs.php.net/viewvc.cgi/php-src/ext/openssl/xp_ssl.c?r1=1.22.2.3.2.7&r2=1.22.2.3.2.8&diff_format=u > Index: php-src/ext/openssl/xp_ssl.c > diff -u php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.7 > php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.8 > --- php-src/ext/openssl/xp_ssl.c:1.22.2.3.2.7 Wed Apr 4 10:44:55 2007 > +++ php-src/ext/openssl/xp_ssl.c Sun May 27 17:05:51 2007 > @@ -16,7 +16,7 @@ > +----------------------------------------------------------------------+ > */ > > -/* $Id: xp_ssl.c,v 1.22.2.3.2.7 2007/04/04 10:44:55 tony2001 Exp $ */ > +/* $Id: xp_ssl.c,v 1.22.2.3.2.8 2007/05/27 17:05:51 iliaa Exp $ */ > > #include "php.h" > #include "ext/standard/file.h" > @@ -84,7 +84,7 @@ > return 0; > } > > -static int handle_ssl_error(php_stream *stream, int nr_bytes TSRMLS_DC) > +static int handle_ssl_error(php_stream *stream, int nr_bytes, zend_bool is_init TSRMLS_DC) > { > php_openssl_netstream_data_t *sslsock = > (php_openssl_netstream_data_t*)stream->abstract; > int err = SSL_get_error(sslsock->ssl_handle, nr_bytes); > @@ -104,7 +104,7 @@ > /* re-negotiation, or perhaps the SSL layer needs more > * packets: retry in next iteration */ > errno = EAGAIN; > - retry = 1; > + retry = is_init ? 1 : sslsock->s.is_blocked; > break; > case SSL_ERROR_SYSCALL: > if (ERR_peek_error() == 0) { > @@ -193,7 +193,7 @@ > didwrite = SSL_write(sslsock->ssl_handle, buf, count); > > if (didwrite <= 0) { > - retry = handle_ssl_error(stream, didwrite TSRMLS_CC); > + retry = handle_ssl_error(stream, didwrite, 0 TSRMLS_CC); > } else { > break; > } > @@ -226,7 +226,7 @@ > nr_bytes = SSL_read(sslsock->ssl_handle, buf, count); > > if (nr_bytes <= 0) { > - retry = handle_ssl_error(stream, nr_bytes TSRMLS_CC); > + retry = handle_ssl_error(stream, nr_bytes, 0 TSRMLS_CC); > stream->eof = (retry == 0 && errno != > EAGAIN && !SSL_pending(sslsock->ssl_handle)); > > } else { > @@ -373,7 +373,7 @@ > } > > if (!SSL_set_fd(sslsock->ssl_handle, sslsock->s.socket)) { > - handle_ssl_error(stream, 0 TSRMLS_CC); > + handle_ssl_error(stream, 0, 1 TSRMLS_CC); > } > > if (cparam->inputs.session) { > @@ -428,7 +428,7 @@ > } > > if (n <= 0) { > - retry = handle_ssl_error(stream, n TSRMLS_CC); > + retry = handle_ssl_error(stream, n, 1 TSRMLS_CC); > } else { > break; > } Best regards, Marcus