mod_ssl: dump SSL IO/state for the write side of the connection(s), like reads.
mod_ssl: follow up to r1601919.
Likewise when set from SNI callback.
Submitted by: ylavic
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1651078 13f79535-47bb-0310-9956-
ffa450edef68
request headers earlier. Adds "MergeTrailers" directive to restore
legacy behavior. [Edward Lu, Yann Ylavic, Joe Orton, Eric Covener]
+ *) mod_ssl: dump SSL IO/state for the write side of the connection(s),
+ like reads (level TRACE4). [Yann Ylavic]
+
*) mod_proxy_fcgi: Ignore body data from backend for 304 responses. PR 57198.
[Jan Kaluza]
(modulo CHANGES/MMN)
+1: ylavic, jim, covener
- * mod_ssl, event: Ensure that the SSL close notify alert is flushed to the client.
- PR54998.
- trunk patch: http://svn.apache.org/r1601184
- http://svn.apache.org/r1601274
- http://svn.apache.org/r1601185
- 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-SSL-shutdown.patch
- (modulo CHANGES/MMN)
- +1: ylavic, rjung, covener
-
* mod_proxy: Shutdown (eg. SSL close notify) the backend connection before closing.
trunk patch: http://svn.apache.org/r1601291
http://svn.apache.org/r1601630
note: depends on ap_shutdown_conn() from r1601185 above.
+1: ylavic, rjung, covener
- * mod_ssl: mod_ssl: dump SSL IO/state for the write side of the connection(s),
- like reads.
- trunk patch: http://svn.apache.org/r1601919
- http://svn.apache.org/r1650061
- 2.4.x patch: trunk works (module CHANGES)
- +1: ylavic, rjung, covener
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
ssl_io_filter_cleanup, apr_pool_cleanup_null);
if (APLOG_CS_IS_LEVEL(c, mySrvFromConn(c), APLOG_TRACE4)) {
- BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);
- BIO_set_callback_arg(SSL_get_rbio(ssl), (void *)ssl);
+ BIO *rbio = SSL_get_rbio(ssl),
+ *wbio = SSL_get_wbio(ssl);
+ BIO_set_callback(rbio, ssl_io_data_cb);
+ BIO_set_callback_arg(rbio, (void *)ssl);
+ if (wbio && wbio != rbio) {
+ BIO_set_callback(wbio, ssl_io_data_cb);
+ BIO_set_callback_arg(wbio, (void *)ssl);
+ }
}
return;
* we need to set that callback here.
*/
if (APLOGtrace4(s)) {
- BIO_set_callback(SSL_get_rbio(ssl), ssl_io_data_cb);
- BIO_set_callback_arg(SSL_get_rbio(ssl), (void *)ssl);
+ BIO *rbio = SSL_get_rbio(ssl),
+ *wbio = SSL_get_wbio(ssl);
+ BIO_set_callback(rbio, ssl_io_data_cb);
+ BIO_set_callback_arg(rbio, (void *)ssl);
+ if (wbio && wbio != rbio) {
+ BIO_set_callback(wbio, ssl_io_data_cb);
+ BIO_set_callback_arg(wbio, (void *)ssl);
+ }
}
return 1;