From: Eric Covener Date: Tue, 15 Apr 2014 17:56:32 +0000 (+0000) Subject: whitespace changes only X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ec4b2474d99507e6cd419a11853b00ad1a550db;p=thirdparty%2Fapache%2Fhttpd.git whitespace changes only git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1587657 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c index 3d105e84f92..bc17d7b54cb 100644 --- a/modules/proxy/mod_proxy_wstunnel.c +++ b/modules/proxy/mod_proxy_wstunnel.c @@ -378,13 +378,13 @@ static int ap_proxy_wstunnel_request(apr_pool_t *p, request_rec *r, pollfd.desc.s = client_socket; apr_pollset_add(pollset, &pollfd); - remove_reqtimeout(c->input_filters); r->output_filters = c->output_filters; r->proto_output_filters = c->output_filters; r->input_filters = c->input_filters; r->proto_input_filters = c->input_filters; + /* This handler should take care of the entire connection; make it so that * nothing else is attempted on the connection after returning. */ c->keepalive = AP_CONN_CLOSE; @@ -501,7 +501,7 @@ static int proxy_wstunnel_handler(request_rec *r, proxy_worker *worker, if ((status = ap_proxy_connection_create(scheme, backend, c, r->server)) != OK) break; - } + } backend->close = 1; /* must be after ap_proxy_determine_connection */