From 738f542f1305748be9c783f81a43061f49d48dba Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Thu, 15 Aug 2024 10:21:59 -0400 Subject: [PATCH 1/2] fixes #3728 with solution provided by httpd devs --- mod_ood_proxy/lib/ood/proxy.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/mod_ood_proxy/lib/ood/proxy.lua b/mod_ood_proxy/lib/ood/proxy.lua index 08a13ed54c..81ce24c442 100644 --- a/mod_ood_proxy/lib/ood/proxy.lua +++ b/mod_ood_proxy/lib/ood/proxy.lua @@ -7,17 +7,16 @@ function set_reverse_proxy(r, conn) -- find protocol used by parsing the request headers local protocol = (r.headers_in['Upgrade'] and "ws://" or "http://") - -- setup request to use mod_proxy for the reverse proxy - r.handler = "proxy-server" - r.proxyreq = apache2.PROXYREQ_REVERSE -- define reverse proxy destination using connection object if conn.socket then - r.filename = "proxy:unix:" .. conn.socket .. "|" .. protocol .. "localhost" .. conn.uri + r.handler = "proxy:unix:" .. conn.socket .. "|" .. protocol .. "localhost" else - r.filename = "proxy:" .. protocol .. conn.server .. conn.uri + r.handler = "proxy:" .. protocol .. conn.server end + r.filename = conn.uri + -- include useful information for the backend server -- provide the protocol used From 5d7e42a6b1b2cd029fae2664c0d073429225a33d Mon Sep 17 00:00:00 2001 From: Jeff Ohrstrom Date: Thu, 15 Aug 2024 14:54:14 -0400 Subject: [PATCH 2/2] use base uri and let httpd set the query parameters --- mod_ood_proxy/lib/pun_proxy.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod_ood_proxy/lib/pun_proxy.lua b/mod_ood_proxy/lib/pun_proxy.lua index c47dc64657..0062740350 100644 --- a/mod_ood_proxy/lib/pun_proxy.lua +++ b/mod_ood_proxy/lib/pun_proxy.lua @@ -38,7 +38,7 @@ function pun_proxy_handler(r) local conn = {} conn.user = user conn.socket = pun_socket_root .. "/" .. user .. "/passenger.sock" - conn.uri = r.unparsed_uri + conn.uri = r.uri -- start up PUN if socket doesn't exist local err = nil