]> granicus.if.org Git - apache/commit
Merge r1834012, r1834013 from trunk:
authorJoe Orton <jorton@apache.org>
Tue, 26 Jun 2018 12:21:47 +0000 (12:21 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 26 Jun 2018 12:21:47 +0000 (12:21 +0000)
commit0cba68bace935a9034085c1789a84118b214dfcf
tree51ce5bdb93258ae34f85af4bd3ecbed466760aa4
parente1744e9b5a21cf44c4f8a7d453eb0c781b4b67f1
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
CHANGES
modules/proxy/proxy_util.c