You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2014/06/09 01:54:58 UTC
svn commit: r1601274 - /httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
Author: ylavic
Date: Sun Jun 8 23:54:58 2014
New Revision: 1601274
URL: http://svn.apache.org/r1601274
Log:
mod_ssl: SSL_smart_shutdown(): follow up to r1601184.
Use SSL_get_wbio() to comply with OPENSSL_NO_SSL_INTERN.
Stop SSL shutdown loop when flush fails.
Modified:
httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c?rev=1601274&r1=1601273&r2=1601274&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_util_ssl.c Sun Jun 8 23:54:58 2014
@@ -142,7 +142,10 @@ int SSL_smart_shutdown(SSL *ssl)
/* Once the close notity is sent through the output filters,
* ensure it is flushed through the socket.
*/
- BIO_flush(ssl->wbio);
+ if (BIO_flush(SSL_get_wbio(ssl)) <= 0) {
+ rc = -1;
+ break;
+ }
flush = 0;
}
if (rc != 0)