Commit 9e50f279 authored by Eric Covener's avatar Eric Covener
Browse files

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
parent 90d885f4

CHANGES

+3 −0
Original line number Diff line number Diff line 
                                                         -*- 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]

modules/proxy/mod_proxy_wstunnel.c

+3 −2
Original line number Diff line number Diff line
@@ -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) = {