]> granicus.if.org Git - apache/commit
Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, r1453963...
authorJim Jagielski <jim@apache.org>
Thu, 13 Jun 2013 15:09:31 +0000 (15:09 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 13 Jun 2013 15:09:31 +0000 (15:09 +0000)
commit2d1f1bf01e86587a1c15d2dda31a84e41b0ada17
treed7f8a9db8b977a4bed8818cb9ca047b667667a7b
parent8777452331f0dd2afa67b91daa21bd959a9fbd4c
Merge r1452911, r1452949, r1452954, r1453022, r1453574, r1453875, r1453876, r1453963, r1454386, r1454414, r1454415, r1458285, r1458447 from trunk:

Rough start for simple, tunneling websocket proxy support.
Compiles at this stage and that's all I know :)

force correct scheme info

We need to ensure a conn_rec

Work around blocking issues...

And now pass the initial request to the backend...

I dislike this duplication of code from mod_proxy_http()
but maybe it's inevitable. I may create ap_proxy_create_headerb()
to create a header brigade that both modules can use.

Pull out duplicated code to proxy_util...

rename extension module... tunnel is more accurate

log nums

"final" rename :)

don't strip these, ensure that they exist.

streamline

bypass reqtimeout for websockets

Keep mod_req clear. Simply scan thru input filters and
remove it within the ws submodule. Nasty, but it keeps
mod_req untouched (for now ;) )
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1492699 13f79535-47bb-0310-9956-ffa450edef68
16 files changed:
Apache-apr2.dsw
Apache.dsw
CHANGES
Makefile.win
STATUS
build/installwinconf.awk
include/ap_mmn.h
modules/proxy/NWGNUmakefile
modules/proxy/NWGNUproxywstunnel [new file with mode: 0644]
modules/proxy/config.m4
modules/proxy/mod_proxy.h
modules/proxy/mod_proxy_http.c
modules/proxy/mod_proxy_wstunnel.c [new file with mode: 0644]
modules/proxy/mod_proxy_wstunnel.dsp [new file with mode: 0644]
modules/proxy/proxy_util.c
os/win32/BaseAddr.ref