httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1454415 - /httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
Date Fri, 08 Mar 2013 14:55:56 GMT
Author: jim
Date: Fri Mar  8 14:55:56 2013
New Revision: 1454415

URL: http://svn.apache.org/r1454415
Log:
streamline

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c?rev=1454415&r1=1454414&r2=1454415&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Fri Mar  8 14:55:56 2013
@@ -157,7 +157,6 @@ static int ap_proxy_wstunnel_request(apr
     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
     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);



Mime
View raw message