archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

MFB: Fixed bug #39571 (timeout ssl:// connections).

Browse source
This commit is contained in:
Ilia Alshanetsky 2006-12-05 01:39:21 +00:00
parent 09848fa0fc
commit bc07f14f7a
1 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

27
ext/openssl/xp_ssl.c
View file

@ -99,7 +99,7 @@ static int handle_ssl_error(php_stream *stream, int nr_bytes TSRMLS_DC)
/* re-negotiation, or perhaps the SSL layer needs more
* packets: retry in next iteration */
errno = EAGAIN;
retry = sslsock->s.is_blocked;
retry = 1;
break;
case SSL_ERROR_SYSCALL:
if (ERR_peek_error() == 0) {
@ -386,6 +386,9 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
int n, retry = 1;
if (cparam->inputs.activate && !sslsock->ssl_active) {
float timeout = sslsock->s.timeout.tv_sec + sslsock->s.timeout.tv_usec / 1000000;
int blocked = sslsock->s.is_blocked;
if (!sslsock->state_set) {
if (sslsock->is_client) {
SSL_set_connect_state(sslsock->ssl_handle);
@ -395,9 +398,23 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
sslsock->state_set = 1;
}
if (sslsock->is_client && SUCCESS == php_set_sock_blocking(sslsock->s.socket, 0 TSRMLS_CC)) {
sslsock->s.is_blocked = 0;
}
do {
if (sslsock->is_client) {
struct timeval tvs, tve;
struct timezone tz;
gettimeofday(&tvs, &tz);
n = SSL_connect(sslsock->ssl_handle);
gettimeofday(&tve, &tz);
timeout -= (tve.tv_sec + tve.tv_usec / 1000000) - (tvs.tv_sec + tvs.tv_usec / 1000000);
if (timeout < 0) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "SSL: connection timeout");
return -1;
}
} else {
n = SSL_accept(sslsock->ssl_handle);
}
@ -409,6 +426,10 @@ static inline int php_openssl_enable_crypto(php_stream *stream,
}
} while (retry);
if (sslsock->is_client && sslsock->s.is_blocked != blocked && SUCCESS == php_set_sock_blocking(sslsock->s.socket, blocked TSRMLS_CC)) {
sslsock->s.is_blocked = blocked;
}
if (n == 1) {
X509 *peer_cert;
@ -740,8 +761,8 @@ php_stream *php_openssl_ssl_socket_factory(const char *proto, long protolen,
memset(sslsock, 0, sizeof(*sslsock));
sslsock->s.is_blocked = 1;
sslsock->s.timeout.tv_sec = FG(default_socket_timeout);
sslsock->s.timeout.tv_usec = 0;
sslsock->s.timeout.tv_sec = timeout->tv_sec;
sslsock->s.timeout.tv_usec = timeout->tv_usec;
/* we don't know the socket until we have determined if we are binding or
* connecting */