You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2013/03/08 15:55:53 UTC
svn commit: r1454414 - in /httpd/httpd/trunk/modules/proxy:
mod_proxy_tunnel.dsp mod_proxy_wstunnel.c mod_proxy_wstunnel.dsp
Author: jim
Date: Fri Mar 8 14:55:53 2013
New Revision: 1454414
URL: http://svn.apache.org/r1454414
Log:
don't strip these, ensure that they exist.
Added:
httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.dsp (contents, props changed)
- copied, changed from r1454386, httpd/httpd/trunk/modules/proxy/mod_proxy_tunnel.dsp
Removed:
httpd/httpd/trunk/modules/proxy/mod_proxy_tunnel.dsp
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=1454414&r1=1454413&r2=1454414&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:53 2013
@@ -175,6 +175,16 @@ 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);
ap_xlate_proto_to_ascii(buf, strlen(buf));
Copied: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.dsp (from r1454386, httpd/httpd/trunk/modules/proxy/mod_proxy_tunnel.dsp)
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.dsp?p2=httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.dsp&p1=httpd/httpd/trunk/modules/proxy/mod_proxy_tunnel.dsp&r1=1454386&r2=1454414&rev=1454414&view=diff
==============================================================================
(empty)
Propchange: httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.dsp
------------------------------------------------------------------------------
svn:eol-style = CRLF