]> granicus.if.org Git - apache/commit
Merge from trunk:
authorEric Covener <covener@apache.org>
Mon, 5 Jun 2017 12:07:43 +0000 (12:07 +0000)
committerEric Covener <covener@apache.org>
Mon, 5 Jun 2017 12:07:43 +0000 (12:07 +0000)
commit506ab6ce8d804a33a4db2fa7c4c1358e4d172918
tree0c88165a8c9c6d2bba23b95bfb89ac0aa207c3f4
parent5c6f0975394495adcc823d99bf9823658d4a1c71
Merge from trunk:

Add upgrade parameter to mod_proxy_wstunnel.
That allows to upgrade to jboss-remoting for example
or to run an HTTP/1.1 backend that needs to upgrade to
WebSocket.
See also:
 https://issues.jboss.org/browse/JBCS-254
 https://issues.jboss.org/browse/JBCS-291

whitespace only

Submitted By: jfclere
Reviewed By: covener, jim, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1797650 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
docs/manual/mod/mod_proxy.xml
docs/manual/mod/mod_proxy_wstunnel.xml
modules/proxy/mod_proxy.c
modules/proxy/mod_proxy.h
modules/proxy/mod_proxy_wstunnel.c