diff options
author | Jim Jagielski <jim@apache.org> | 2013-06-13 15:09:31 +0000 |
---|---|---|
committer | Jim Jagielski <jim@apache.org> | 2013-06-13 15:09:31 +0000 |
commit | 2d1f1bf01e86587a1c15d2dda31a84e41b0ada17 (patch) | |
tree | d7f8a9db8b977a4bed8818cb9ca047b667667a7b /build | |
parent | 8777452331f0dd2afa67b91daa21bd959a9fbd4c (diff) | |
download | httpd-2d1f1bf01e86587a1c15d2dda31a84e41b0ada17.tar.gz |
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
Diffstat (limited to 'build')
-rw-r--r-- | build/installwinconf.awk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/installwinconf.awk b/build/installwinconf.awk index 1a537462cb..d8db0fc603 100644 --- a/build/installwinconf.awk +++ b/build/installwinconf.awk @@ -167,6 +167,7 @@ BEGIN { print "#LoadModule proxy_html_module modules/mod_proxy_html.so" > dstfl; print "#LoadModule proxy_http_module modules/mod_proxy_http.so" > dstfl; print "#LoadModule proxy_scgi_module modules/mod_proxy_scgi.so" > dstfl; + print "#LoadModule proxy_wstunnel_module modules/mod_proxy_wstunnel.so" > dstfl; print "#LoadModule ratelimit_module modules/mod_ratelimit.so" > dstfl; print "#LoadModule reflector_module modules/mod_reflector.so" > dstfl; print "#LoadModule remoteip_module modules/mod_remoteip.so" > dstfl; |