On 5/12/21 12:10 PM, yla...@apache.org wrote:
> Author: ylavic
> Date: Wed May 12 10:10:36 2021
> New Revision: 1889792
>
> URL: http://svn.apache.org/viewvc?rev=1889792&view=rev
> Log:
> mod_proxy_wstunnel: Add ProxyWebsocketFallbackToProxyHttp.
>
> Allows to opt-out the fallback to mod_proxy_http to handle WebSocket upgrade,
> and let mod_proxy_wstunnel handle the requests as in 2.4.46 and earlier.
>
> Update docs.
>
> Modified:
> httpd/httpd/trunk/docs/manual/mod/mod_proxy_wstunnel.xml
> 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=1889792&r1=1889791&r2=1889792&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
> +++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Wed May 12 10:10:36
> 2021
> @@ -449,10 +476,18 @@ static const char * proxyws_set_asynch_d
> return NULL;
> }
>
> +static const char * proxyws_fallback_to_proxy_http(cmd_parms *cmd, void
> *conf, int arg)
> +{
> + proxyws_dir_conf *dconf = conf;
> + dconf->fallback_to_proxy_http = !!arg;
Why !!? Shouldn't just arg be enough?
> + dconf->fallback_to_proxy_http_set = 1;
> + return NULL;
> +}
> +
> static int proxy_wstunnel_post_config(apr_pool_t *pconf, apr_pool_t *plog,
> apr_pool_t *ptemp, server_rec *s)
> {
> - fallback_to_mod_proxy_http =
> + can_fallback_to_proxy_http =
> (ap_find_linked_module("mod_proxy_http.c") != NULL);
>
> return OK;
> @@ -467,6 +507,7 @@ static const command_rec ws_proxy_cmds[]
> AP_INIT_TAKE1("ProxyWebsocketAsyncDelay", proxyws_set_asynch_delay, NULL,
> RSRC_CONF|ACCESS_CONF,
> "amount of time to poll before going asynchronous"),
> +
Stray empty line?
> {NULL}
> };
>
Regards
Rüdiger
