johannes Tue, 23 Aug 2011 08:12:58 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=315339
Log:
Mere r315310 (Revert r313515)
Changed paths:
_U php/php-src/branches/PHP_5_3_8/
U php/php-src/branches/PHP_5_3_8/ext/openssl/xp_ssl.c
Property changes on: php/php-src/branches/PHP_5_3_8
___________________________________________________________________
Modified: svn:mergeinfo
- /php/php-src/branches/PHP_5_3:315218
/php/php-src/trunk:284726,305015,305018-305019
+ /php/php-src/branches/PHP_5_3:315218,315310
/php/php-src/trunk:284726,305015,305018-305019
Modified: php/php-src/branches/PHP_5_3_8/ext/openssl/xp_ssl.c
===================================================================
--- php/php-src/branches/PHP_5_3_8/ext/openssl/xp_ssl.c 2011-08-23 08:09:55 UTC
(rev 315338)
+++ php/php-src/branches/PHP_5_3_8/ext/openssl/xp_ssl.c 2011-08-23 08:12:58 UTC
(rev 315339)
@@ -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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
