diff options
Diffstat (limited to 'ext/openssl/xp_ssl.c')
| -rw-r--r-- | ext/openssl/xp_ssl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 9af01f5b89..0068715152 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -1795,7 +1795,7 @@ static int php_openssl_enable_crypto(php_stream *stream, do { struct timeval cur_time, elapsed_time; - + if (sslsock->is_client) { n = SSL_connect(sslsock->ssl_handle); } else { @@ -1805,7 +1805,7 @@ static int php_openssl_enable_crypto(php_stream *stream, if (has_timeout) { gettimeofday(&cur_time, NULL); elapsed_time = subtract_timeval( cur_time, start_time ); - + if (compare_timeval( elapsed_time, *timeout) > 0) { php_error_docref(NULL, E_WARNING, "SSL: Handshake timed out"); return -1; @@ -2001,7 +2001,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz if (errno == EAGAIN && err == SSL_ERROR_WANT_WRITE && read == 0) { retry = 1; } - + /* Also, on reads, we may get this condition on an EOF. We should check properly. */ if (read) { stream->eof = (retry == 0 && errno != EAGAIN && !SSL_pending(sslsock->ssl_handle)); @@ -2045,7 +2045,7 @@ static size_t php_openssl_sockop_io(int read, php_stream *stream, char *buf, siz } } - /* Finally, we keep going until we got data, and an SSL_ERROR_NONE, unless we had an error. */ + /* Finally, we keep going until we got data, and an SSL_ERROR_NONE, unless we had an error. */ } while (retry); /* Tell PHP if we read / wrote bytes. */ @@ -2196,7 +2196,7 @@ static inline int php_openssl_tcp_sockop_accept(php_stream *stream, php_openssl_ int clisock; zend_bool nodelay = 0; zval *tmpzval = NULL; - + xparam->outputs.client = NULL; if ((tmpzval = php_stream_context_get_option(PHP_STREAM_CONTEXT(stream), "socket", "tcp_nodelay")) != NULL && |