34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From b34ce8ef855714a8a90e4e97cd7f2b8f8027c7fe Mon Sep 17 00:00:00 2001
|
||
|
|
From: Christophe Jaillet <jailletc36@apache.org>
|
||
|
|
Date: Fri, 15 Feb 2019 15:57:51 +0000
|
||
|
|
Subject: [PATCH 390/504] Merge r1851093 from trunk
|
||
|
|
|
||
|
|
* mod_proxy_wstunnel: Fix websocket proxy over UDS.
|
||
|
|
|
||
|
|
PR: 62932
|
||
|
|
Submitted by: <pavel dcmsys.com>
|
||
|
|
Reviewed by: jailletc36 (by inspection), jim, ylavic
|
||
|
|
Backported by: jailletc36
|
||
|
|
|
||
|
|
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1853653 13f79535-47bb-0310-9956-ffa450edef68
|
||
|
|
---
|
||
|
|
diff --git a/modules/proxy/mod_proxy_wstunnel.c b/modules/proxy/mod_proxy_wstunnel.c
|
||
|
|
index 9dda010dbc..1056d5cb72 100644
|
||
|
|
--- a/modules/proxy/mod_proxy_wstunnel.c
|
||
|
|
+++ b/modules/proxy/mod_proxy_wstunnel.c
|
||
|
|
@@ -77,7 +77,10 @@ static int proxy_wstunnel_canon(request_rec *r, char *url)
|
||
|
|
if (path == NULL)
|
||
|
|
return HTTP_BAD_REQUEST;
|
||
|
|
|
||
|
|
- apr_snprintf(sport, sizeof(sport), ":%d", port);
|
||
|
|
+ if (port != def_port)
|
||
|
|
+ apr_snprintf(sport, sizeof(sport), ":%d", port);
|
||
|
|
+ else
|
||
|
|
+ sport[0] = '\0';
|
||
|
|
|
||
|
|
if (ap_strchr_c(host, ':')) {
|
||
|
|
/* if literal IPv6 address */
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|