You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2016/12/28 14:54:37 UTC
svn commit: r1776290 - in /httpd/httpd/trunk: CHANGES
modules/proxy/mod_proxy_wstunnel.c
Author: covener
Date: Wed Dec 28 14:54:37 2016
New Revision: 1776290
URL: http://svn.apache.org/viewvc?rev=1776290&view=rev
Log:
let wstunnel run first
Since wstunnel can step aside based on the Upgrade: header.
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1776290&r1=1776289&r2=1776290&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Wed Dec 28 14:54:37 2016
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) mod_proxy_wstunnel: Reliably run before mod_proxy_http.
+ [Eric Covener]
+
*) mod_proxy_protocol: Add server-side, front-end support for PROXY PROTOCOL
(http://blog.haproxy.com/haproxy/proxy-protocol/). [roadrunner2]
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=1776290&r1=1776289&r2=1776290&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Wed Dec 28 14:54:37 2016
@@ -562,8 +562,9 @@ static const command_rec ws_proxy_cmds[]
static void ap_proxy_http_register_hook(apr_pool_t *p)
{
- proxy_hook_scheme_handler(proxy_wstunnel_handler, NULL, NULL, APR_HOOK_FIRST);
- proxy_hook_canon_handler(proxy_wstunnel_canon, NULL, NULL, APR_HOOK_FIRST);
+ static const char * const aszSucc[] = { "mod_proxy_http.c", NULL};
+ proxy_hook_scheme_handler(proxy_wstunnel_handler, NULL, aszSucc, APR_HOOK_FIRST);
+ proxy_hook_canon_handler(proxy_wstunnel_canon, NULL, aszSucc, APR_HOOK_FIRST);
}
AP_DECLARE_MODULE(proxy_wstunnel) = {