mirror of
https://github.com/apache/httpd.git
synced 2025-08-07 04:02:58 +03:00
input filter should not return failure when ssl runtime wants to read more
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94328 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -495,6 +495,7 @@ static int ssl_io_hook_read(SSL *ssl, char *buf, int len)
|
|||||||
* renegotation which is handled implicitly by OpenSSL.)
|
* renegotation which is handled implicitly by OpenSSL.)
|
||||||
*/
|
*/
|
||||||
errno = EINTR;
|
errno = EINTR;
|
||||||
|
rc = 0; /* non fatal error */
|
||||||
}
|
}
|
||||||
else if (ssl_err == SSL_ERROR_SSL) {
|
else if (ssl_err == SSL_ERROR_SSL) {
|
||||||
/*
|
/*
|
||||||
@@ -504,12 +505,8 @@ static int ssl_io_hook_read(SSL *ssl, char *buf, int len)
|
|||||||
ssl_log(c->base_server, SSL_LOG_ERROR|SSL_ADD_SSLERR,
|
ssl_log(c->base_server, SSL_LOG_ERROR|SSL_ADD_SSLERR,
|
||||||
"SSL error on reading data");
|
"SSL error on reading data");
|
||||||
}
|
}
|
||||||
/*
|
|
||||||
* XXX - Just trying to reflect the behaviour in
|
|
||||||
* openssl_state_machine.c [mod_tls]. TBD
|
|
||||||
*/
|
|
||||||
rc = -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user