From: Eric Covener <covener@apache.org>
Date: Wed, 28 Dec 2016 14:54:37 +0000 (+0000)
Subject: let wstunnel run first
X-Git-Tag: 2.5.0-alpha~856
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c5f5760b7e0698c665019e8abbbbddb6e15239c5;p=thirdparty%2Fapache%2Fhttpd.git

let wstunnel run first

Since wstunnel can step aside based on the Upgrade: header.



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

diff --git a/CHANGES b/CHANGES
index 5b00fb8d395..52f02efe33a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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]
      
diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
index 9990fb780f2..fbdb48060c9 100644
--- a/modules/proxy/mod_proxy_wstunnel.c
+++ b/modules/proxy/mod_proxy_wstunnel.c
@@ -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) = {