From c5f5760b7e0698c665019e8abbbbddb6e15239c5 Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Wed, 28 Dec 2016 14:54:37 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ modules/proxy/mod_proxy_wstunnel.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 5b00fb8d39..52f02efe33 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 9990fb780f..fbdb48060c 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) = { -- 2.50.1