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 /os | |
| 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 'os')
| -rw-r--r-- | os/win32/BaseAddr.ref | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 1bb7c64ba2..c426d44d4d 100644 --- a/os/win32/BaseAddr.ref +++ b/os/win32/BaseAddr.ref @@ -120,4 +120,4 @@ mod_data.so 0x6F710000 0x00010000 mod_allowmethods.so 0x6F700000 0x00010000 mod_macro.so 0x6F6F0000 0x00010000 mod_cache_socache.so 0x6F6E0000 0x00010000 - +mod_proxy_wstunnel.so 0x6F6D0000 0x00010000 |