You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2019/01/11 19:31:44 UTC
svn commit: r1851093 - in /httpd/httpd/trunk: CHANGES
modules/proxy/mod_proxy_wstunnel.c
Author: jailletc36
Date: Fri Jan 11 19:31:43 2019
New Revision: 1851093
URL: http://svn.apache.org/viewvc?rev=1851093&view=rev
Log:
LanguagePriority should be case-insensitive in order to match AddLanguage behavior. PR 39730
Test case added in r1850983
Modified:
httpd/httpd/trunk/CHANGES
httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c
Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1851093&r1=1851092&r2=1851093&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jan 11 19:31:43 2019
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.1
+ *) mod_proxy_wstunnel: Fix websocket proxy over UDS.
+ PR 62932 <pavel dcmsys.com>
+
*) mod_negociation: LanguagePriority should be case-insensitive in order to
match AddLanguage behavior. PR 39730 [Christophe Jaillet]
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=1851093&r1=1851092&r2=1851093&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_wstunnel.c Fri Jan 11 19:31:43 2019
@@ -279,7 +279,10 @@ static int proxy_wstunnel_canon(request_
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 */