From: Jim Jagielski <jim@apache.org>
Date: Fri, 8 Mar 2013 14:55:56 +0000 (+0000)
Subject: streamline
X-Git-Tag: 2.5.0-alpha~5682
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=236519bf3d245ca2ae4ef29228e9fd7153949858;p=apache

streamline

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454415 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 528530d372..4f6310865f 100644
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -157,7 +157,6 @@ static int ap_proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
     conn_rec *backconn = conn->connection;
     int client_error = 0;
     char *buf;
-    apr_size_t blen;
     apr_bucket_brigade *header_brigade;
     apr_bucket *e;
     char *old_cl_val = NULL;
@@ -175,18 +174,8 @@ static int ap_proxy_wstunnel_request(apr_pool_t *p, request_rec *r,
     if (rv != OK) {
         return rv;
     }
-    buf = apr_pstrcat(p, "Upgrade: ", "WebSocket", CRLF, NULL);
-    ap_xlate_proto_to_ascii(buf, strlen(buf));
-    e = apr_bucket_pool_create(buf, strlen(buf), p, c->bucket_alloc);
-    APR_BRIGADE_INSERT_TAIL(header_brigade, e);
-
-    buf = apr_pstrcat(p, "Connection: ", "Upgrade", CRLF, NULL);
-    ap_xlate_proto_to_ascii(buf, strlen(buf));
-    e = apr_bucket_pool_create(buf, strlen(buf), p, c->bucket_alloc);
-    APR_BRIGADE_INSERT_TAIL(header_brigade, e);
 
-    buf = CRLF;
-    blen = strlen(buf);
+    buf = apr_pstrcat(p, "Upgrade: WebSocket", CRLF, "Connection: Upgrade", CRLF, CRLF, NULL);
     ap_xlate_proto_to_ascii(buf, strlen(buf));
     e = apr_bucket_pool_create(buf, strlen(buf), p, c->bucket_alloc);
     APR_BRIGADE_INSERT_TAIL(header_brigade, e);