diff options
| author | Yann Ylavic <ylavic@apache.org> | 2020-07-02 01:16:04 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2020-07-02 01:16:04 +0200 |
| commit | ea4d778cd6a938a68181dde024a2ee7889695bc3 (patch) | |
| tree | afb8a091af13a827419a804234f04a1037c54a41 /modules/proxy/proxy_util.c | |
| parent | mod_proxy: reindent ap_proxy_transfer_between_connections() after r1879401. (diff) | |
| download | apache2-ea4d778cd6a938a68181dde024a2ee7889695bc3.tar.xz apache2-ea4d778cd6a938a68181dde024a2ee7889695bc3.zip | |
mod_ssl: release coalesced data when called from ap_filter_output_pending().
The purpose of ap_filter_output_pending() is to flush pending data, so
ssl_io_filter_coalesce() should honor that.
This allows mod_proxy to not care about mod_ssl coalescing filters when
tunneling between connections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1879416 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/proxy/proxy_util.c')
| -rw-r--r-- | modules/proxy/proxy_util.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 8b99c5f8d2..7695817dcb 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -4327,12 +4327,6 @@ PROXY_DECLARE(apr_status_t) ap_proxy_tunnel_create(proxy_tunnel_rec **ptunnel, apr_socket_opt_set(tunnel->client->pfd->desc.s, APR_SO_NONBLOCK, 1); apr_socket_opt_set(tunnel->origin->pfd->desc.s, APR_SO_NONBLOCK, 1); - /* No coalescing filters */ - ap_remove_output_filter_byhandle(c_i->output_filters, - "SSL/TLS Coalescing Filter"); - ap_remove_output_filter_byhandle(c_o->output_filters, - "SSL/TLS Coalescing Filter"); - /* Bidirectional non-HTTP stream will confuse mod_reqtimeoout */ ap_remove_input_filter_byhandle(c_i->input_filters, "reqtimeout"); |