/[Apache-SVN]
ViewVC logotype

Revision 1885239


Jump to revision: Previous Next
Author: ylavic
Date: Thu Jan 7 13:19:08 2021 UTC (3 years, 3 months ago)
Changed paths: 6
Log Message:
mod_proxy_wstunnel: leave Upgrade requests handling to mod_proxy_http.

Let mod_proxy_http's canon and scheme handlers accept "ws[s]:" schemes so that
mod_proxy_wstunnel can decline requests when mod_proxy_http is loaded.

* modules/proxy/{mod_proxy.h,proxy_util.c} (ap_proxy_worker_can_upgrade):
  Add a "dflt" argument to ap_proxy_worker_can_upgrade() which, if not NULL,
  is matched when no worker upgrade= parameter is configured. This allows to
  handle the default "Upgrade: websocket" case for "ws[s]:" schemes.

* modules/proxy/mod_proxy_http.c (proxy_http_canon, proxy_http_handler):
  Add and use the new get_url_scheme() helper to parse URL schemes handled by
  mod_proxy_http and use it in canon and scheme handlers. This helper now
  accepts ws[s] schemes.

* modules/proxy/mod_proxy_wstunnel.c (proxy_wstunnel_post_config):
  New post_config hook to detect whether mod_proxy_http is loaded and set
  global fallback_to_mod_proxy_http flag in this case.

* modules/proxy/mod_proxy_wstunnel.c (proxy_wstunnel_check_trans,
                                      proxy_wstunnel_canon,
                                      proxy_wstunnel_handler):
  These hooks now early return DECLINED if fallback_to_mod_proxy_http is set.


Changed paths

Path Details
Directoryhttpd/httpd/trunk/changes-entries/proxy_wstunnel_to_http.txt added
Directoryhttpd/httpd/trunk/docs/log-message-tags/next-number modified , text changed
Directoryhttpd/httpd/trunk/modules/proxy/mod_proxy.h modified , text changed
Directoryhttpd/httpd/trunk/modules/proxy/mod_proxy_http.c modified , text changed
Directoryhttpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c modified , text changed
Directoryhttpd/httpd/trunk/modules/proxy/proxy_util.c modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26