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 /include | |
| 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 'include')
| -rw-r--r-- | include/ap_mmn.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 3531807807..4c08be80b8 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -414,6 +414,8 @@ * ap_condition_if_range() * 20120211.19 (2.4.5-dev) Add post_perdir_config hook. * 20120211.20 (2.4.5-dev) Add dirwalk_stat hook. + * 20120211.21 (2.4.5-dev) Add in ap_proxy_create_hdrbrgd() and + * ap_proxy_pass_brigade() */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -421,7 +423,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 20 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 21 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a |