svn: /php/php-src/branches/PHP_5_3/ext/openssl/ xp_ssl.c

johannes Mon, 22 Aug 2011 21:32:04 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=315310 Log: - Revert r313616 (When we have a blocking SSL socket, respect the timeout option, scottmac) # This caused bug #55283, we should investigate a proper solution without # breaking anything. Bug: https://bugs.php.net/55283 (Verified) SSL options set by mysqli_ssl_set ignored for MySQLi persistent connections Changed paths: U php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c Modified: php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c 2011-08-22 20:28:33 UTC (rev 315309) +++ php/php-src/branches/PHP_5_3/ext/openssl/xp_ssl.c 2011-08-22 21:32:04 UTC (rev 315310) @@ -204,36 +204,6 @@ return didwrite; } -static void php_openssl_stream_wait_for_data(php_stream *stream, php_netstream_data_t *sock TSRMLS_DC) -{ - int retval; - struct timeval *ptimeout; - - if (sock->socket == -1) { - return; - } - - sock->timeout_event = 0; - - if (sock->timeout.tv_sec == -1) - ptimeout = NULL; - else - ptimeout = &sock->timeout; - - while(1) { - retval = php_pollfd_for(sock->socket, PHP_POLLREADABLE, ptimeout); - - if (retval == 0) - sock->timeout_event = 1; - - if (retval >= 0) - break; - - if (php_socket_errno() != EINTR) - break; - } -} - static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) { php_openssl_netstream_data_t *sslsock = (php_openssl_netstream_data_t*)stream->abstract; @@ -243,13 +213,6 @@ int retry = 1; do { - if (sslsock->s.is_blocked) { - php_openssl_stream_wait_for_data(stream, &(sslsock->s) TSRMLS_CC); - if (sslsock->s.timeout_event) { - break; - } - /* there is no guarantee that there is application data available but something is there */ - } nr_bytes = SSL_read(sslsock->ssl_handle, buf, count); if (nr_bytes <= 0) {