com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/x p_ssl.c

From: Date: Mon, 09 Mar 2015 21:55:33 +0000
Subject: com php-src: Merge branch 'PHP-5.5' into PHP-5.6: ext/openssl/x p_ssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85412@lists.php.net to get a copy of this message
Commit: 69691cc8cae4ac23aeeac7170458de63c5cf9267 Author: Daniel Lowrey <rdlowrey@php.net> Mon, 9 Mar 2015 15:55:33 -0600 Parents: 4ca14f681e2eebbbb232b7a3f662ed05038d779f bbfd4a5e62cf058cb18d53a0817860edc01c371c Branches: PHP-5.6 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=69691cc8cae4ac23aeeac7170458de63c5cf9267 Log: Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fix crypto stream timeout regressions Changed paths: MM ext/openssl/xp_ssl.c Diff: diff --cc ext/openssl/xp_ssl.c index ccc5af7,e8bc6ae..19a9b17 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@@ -1918,14 -288,15 +1920,14 @@@ static size_t php_openssl_sockop_io(in } } else { /* Else, if we got bytes back, check for possible errors. */ - int err = SSL_get_error(sslsock->ssl_handle, nr_bytes ); + int err = SSL_get_error(sslsock->ssl_handle, nr_bytes); /* If we didn't get any error, then let's return it to PHP. */ - if (err == SSL_ERROR_NONE) { - break; - } + if (err == SSL_ERROR_NONE) + break; /* Otherwise, we need to wait again (up to time_left or we get an error) */ - if (blocked) { + if (began_blocked) { if (read) { php_pollfd_for(sslsock->s.socket, (err == SSL_ERROR_WANT_WRITE) ? (POLLOUT|POLLPRI) : (POLLIN|POLLPRI), has_timeout ? &left_time : NULL);

« previous php.cvs (#85412) next »