From: Joe Orton <jorton@apache.org>
Date: Tue, 26 Jun 2018 12:21:47 +0000 (+0000)
Subject: Merge r1834012, r1834013 from trunk:
X-Git-Tag: 2.4.34~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0cba68bace935a9034085c1789a84118b214dfcf;p=apache

Merge r1834012, r1834013 from trunk:

Add default schema ports for websockets

Nore userland/PR change

PR: 62480
Submitted by: Lubos Uhliarik <luhliari redhat.com>
Reviewed by: jim, rpluem, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1834422 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 75df09b051..09b0350572 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.34
 
+  *) mod_proxy_wstunnel: Add default schema ports for 'ws' and 'wss'.
+     PR 62480. [Lubos Uhliarik <luhliari redhat.com>}
+  
   *) logging: Some early logging-related startup messages could be lost
      when using syslog for the global ErrorLog. [Eric Covener]
 
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index dba06b5678..9afa1d84d6 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -3862,6 +3862,8 @@ static proxy_schemes_t pschemes[] =
     {"scgi",     SCGI_DEF_PORT},
     {"h2c",      DEFAULT_HTTP_PORT},
     {"h2",       DEFAULT_HTTPS_PORT},
+    {"ws",       DEFAULT_HTTP_PORT},
+    {"wss",      DEFAULT_HTTPS_PORT},
     { NULL, 0xFFFF }     /* unknown port */
 };