d7759bdad133e1e92fe41aab75dd8c1584eda38cjim******************************************
d7759bdad133e1e92fe41aab75dd8c1584eda38cjim* PLEASE NOTE: Now that development for *
d7759bdad133e1e92fe41aab75dd8c1584eda38cjim* mod_proxy has been folded back into *
4e191199a0aeab09d78df8f5579e745572e8b7bcwsanchez* the httpd-2.1 tree, this file has *
f3a5934ca0fb0f0f813bd9d9d06af8937e3f401fjim* been deprecated. Proxy changes should *
f3a5934ca0fb0f0f813bd9d9d06af8937e3f401fjim* be noted in httpd-2.x's CHANGES file. *
d7759bdad133e1e92fe41aab75dd8c1584eda38cjim* This file exists for historical *
d7759bdad133e1e92fe41aab75dd8c1584eda38cjim* purposes. *
d7759bdad133e1e92fe41aab75dd8c1584eda38cjim******************************************
d7759bdad133e1e92fe41aab75dd8c1584eda38cjim
b3155b9e3b06b20030ec6c16d98f8dabf12ead9cianhmod_proxy changes for httpd 2.0.29-dev
b3155b9e3b06b20030ec6c16d98f8dabf12ead9cianh *) don't do keepalives for sub-requests. [Ian Holsman]
b3155b9e3b06b20030ec6c16d98f8dabf12ead9cianh
b3155b9e3b06b20030ec6c16d98f8dabf12ead9cianh *) fix up proxypass handling [Ian Holsman]
b3155b9e3b06b20030ec6c16d98f8dabf12ead9cianh
b3155b9e3b06b20030ec6c16d98f8dabf12ead9cianh *) don't send If-Modified-Since, Cache-Control, or If-None-Match on
b3155b9e3b06b20030ec6c16d98f8dabf12ead9cianh a subrequest [Ian Holsman]
b3155b9e3b06b20030ec6c16d98f8dabf12ead9cianh
ff1234e45aca1b8171d711ecb87f58b9d9100a99ianhmod_proxy changes for httpd 2.0.26-dev
ff1234e45aca1b8171d711ecb87f58b9d9100a99ianh *) Add New option 'HTTPProxyOverrideReturnedErrors'. By Turning the
ff1234e45aca1b8171d711ecb87f58b9d9100a99ianh Flag on, you will mask the error pages returned by the proxied
ff1234e45aca1b8171d711ecb87f58b9d9100a99ianh server, and will it will be handled as if your server generated
ff1234e45aca1b8171d711ecb87f58b9d9100a99ianh the error. This change was put in so that a 404 on a included
ff1234e45aca1b8171d711ecb87f58b9d9100a99ianh r-proxied component will act in the same manner as a 404 on a
ff1234e45aca1b8171d711ecb87f58b9d9100a99ianh included file. [Ian Holsman <ianh@cnet.com>]
ff1234e45aca1b8171d711ecb87f58b9d9100a99ianh
b999f6ba2a266bf9a92687f31bb7e76021ac5891ianhmod_proxy changes for httpd 2.0.25-dev
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe *) Split proxy: space using <Proxy[Match] > directive blocks from
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe the <Directory[Match] > and <Files[Match] > blocks. Mod_proxy
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe now bypasses the directory and files testing phase (and skips
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe the http TRACE default handler on it's own, as well). Note that
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe <Location > blocks continue to be processed for proxy: requests.
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe [William Rowe <wrowe@covalent.net>]
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe
b999f6ba2a266bf9a92687f31bb7e76021ac5891ianh *) apr_uri type/function namespace changes in apr_uri functions
2ceedfca3a2fdfdb5ff60ca17f030ce91f6331cbwrowe [Doug MacEachern <dougm@covalent.net>]
b999f6ba2a266bf9a92687f31bb7e76021ac5891ianh
7d7931c1f4d46b041ad2ad6fdb9499289063611eianhmod_proxy changes for httpd 2.0.23-dev
1f3a44f2fd7f9fee00b80c7ddcf1028ea145f91drbb
b9b69856aec9ea58ea1b1e5aff669e8eaf2ebce4rbb *) break the proxy_http_handler into multiple smaller functions.
b9b69856aec9ea58ea1b1e5aff669e8eaf2ebce4rbb [John Barbee <barbee@veribox.net>]
b9b69856aec9ea58ea1b1e5aff669e8eaf2ebce4rbb
1f3a44f2fd7f9fee00b80c7ddcf1028ea145f91drbb *) Fix the proxy when the origin server sends back a 100
1f3a44f2fd7f9fee00b80c7ddcf1028ea145f91drbb Continue response. [John Barbee <barbee@veribox.net>]
1f3a44f2fd7f9fee00b80c7ddcf1028ea145f91drbb
7d7931c1f4d46b041ad2ad6fdb9499289063611eianh *) Change 'readbytes' from apr_size_t to apr_off_t due to change
1f3a44f2fd7f9fee00b80c7ddcf1028ea145f91drbb in ap_get_brigade's parameters [John Barbee <barbee@veribox.net>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuckmod_proxy changes for httpd 2.0.20-dev
43ea154f46345c9722c2b25b2b9f5086ec79eaeeorlikowski *) Timeout added for backend connections.
43ea154f46345c9722c2b25b2b9f5086ec79eaeeorlikowski [Victor Orlikowski <v.j.orlikowski@gte.net>]
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck *) Fix abort code path in proxy_http.c, similar to FTP fix.
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck [Chuck Murcko <chuck@topsail.org>]
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck *) Fix FTP ABOR command execution path.
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck [Victor Orlikowski <v.j.orlikowski@gte.net>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
53c2eb831bfe47860e3f5ec9190b15cb92f15181chuck *) FTP return code variable cleanup; fixed problem in login
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck [Chuck Murcko <chuck@topsail.org>]
53c2eb831bfe47860e3f5ec9190b15cb92f15181chuck
c1635d9f723f28fed4b95e5d9693e554a79e8d77orlikowski *) Get PORT working again in the ftp proxy.
c1635d9f723f28fed4b95e5d9693e554a79e8d77orlikowski [Victor Orlikowski <v.j.orlikowski@gte.net>]
c1635d9f723f28fed4b95e5d9693e554a79e8d77orlikowski
c1635d9f723f28fed4b95e5d9693e554a79e8d77orlikowski *) Return result code check for FTP QUIT, after fixing
c1635d9f723f28fed4b95e5d9693e554a79e8d77orlikowski problems with passive connection handling.
c1635d9f723f28fed4b95e5d9693e554a79e8d77orlikowski [Victor Orlikowski <v.j.orlikowski@gte.net>]
c1635d9f723f28fed4b95e5d9693e554a79e8d77orlikowski
4f7dd0949d92462a8adc31eee8aff266eea55204chuck *) Reorganize ap_proxy_string_read() internally to not process eos
4f7dd0949d92462a8adc31eee8aff266eea55204chuck buckets.
4f7dd0949d92462a8adc31eee8aff266eea55204chuck [Chuck Murcko <chuck@topsail.org>]
4f7dd0949d92462a8adc31eee8aff266eea55204chuck [Victor Orlikowski <v.j.orlikowski@gte.net>]
4f7dd0949d92462a8adc31eee8aff266eea55204chuck
75b3ed55173b29dbdf9e2fb6ec5462bfceee21aechuck *) Remove result code check for FTP QUIT command. Some servers send
75b3ed55173b29dbdf9e2fb6ec5462bfceee21aechuck nothing at all back in response to QUIT.
75b3ed55173b29dbdf9e2fb6ec5462bfceee21aechuck [Chuck Murcko <chuck@topsail.org>]
4f7dd0949d92462a8adc31eee8aff266eea55204chuck [Victor Orlikowski <v.j.orlikowski@gte.net>]
75b3ed55173b29dbdf9e2fb6ec5462bfceee21aechuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuckmod_proxy changes for httpd 2.0.19
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Reverse previous patch since the core reverted.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Chuck Murcko <chuck@topsail.org>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Remove indirection on number of bytes to read for input filters.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Chuck Murcko <chuck@topsail.org>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fixed a problem with directory listing corruption in the
68bcde9c52e9e749482df2800dbdff09559115e0chuck PROXY_DIR filter.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) mod_proxy and the proxy submodules now build properly as DSOs.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Stopped the HTTP proxy from trying to read entity bodies when there
68bcde9c52e9e749482df2800dbdff09559115e0chuck wasn't one (response was 1xx, 204, 205 or 304).
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Made sure dates were canonicalised correctly when passed to the client
68bcde9c52e9e749482df2800dbdff09559115e0chuck browser through the HTTP proxy.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Split each individual proxy protocol into separate modules.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Added Max-Forwards support for all request types so as to prevent
68bcde9c52e9e749482df2800dbdff09559115e0chuck loops.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fix warnings about byte count type on Darwin (connect handler).
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Chuck Murcko <chuck@topsail.org>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuckmod_proxy changes for httpd 2.0.18
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) IPV6 EPSV support for IPV6 in FTP proxy.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) FTP directory filter works now.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fixed some thread-safety issues with the HTTP proxy in mod_proxy.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) PASV FTP works now.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Reworked the line-at-a-time read from the control connection to
68bcde9c52e9e749482df2800dbdff09559115e0chuck workaround a stray empty bucket returned by the HTTP_IN filter.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Stopped the CORE filter from sending off an HTTP response when a
68bcde9c52e9e749482df2800dbdff09559115e0chuck CONNECT tunnel was closed.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fixed the poll() loop in proxy_connect.c -> it works now!!!
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Converted send_dir() to ap_proxy_send_dir_filter() in proxy_ftp.c.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuckmod_proxy changes for httpd 2.0.17
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Major rework of ap_proxy_ftp_handler() to use filters (begone foul
68bcde9c52e9e749482df2800dbdff09559115e0chuck BUFF!!!). It compiles, but is untested, and the build environment needs
68bcde9c52e9e749482df2800dbdff09559115e0chuck to be fixed to include proxy_ftp.c.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Cleanup of dead functions within proxy_util.c.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Reworked the storage of the client socket between keepalive connections
68bcde9c52e9e749482df2800dbdff09559115e0chuck to fix some nasty problems with the socket lasting longer than the
68bcde9c52e9e749482df2800dbdff09559115e0chuck memory pool it was allocated from.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fixed bug where a hostname without a "." in it (such as "localhost")
68bcde9c52e9e749482df2800dbdff09559115e0chuck would not trigger an IP address check with ProxyBlock.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuckmod_proxy changes for httpd 2.0.16
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fixed ProxyBlock bugs with ap_proxy_http_handler() and
68bcde9c52e9e749482df2800dbdff09559115e0chuck ap_proxy_connect_handler().
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Updated ap_proxy_connect_handler() to support APR, while
68bcde9c52e9e749482df2800dbdff09559115e0chuck moving some common code between http_handler and connect_handler
68bcde9c52e9e749482df2800dbdff09559115e0chuck to proxy_util.c.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Updated mod_proxy.html docs to include v2.0 configuration.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fixed problem where responses without entity bodies would cause
68bcde9c52e9e749482df2800dbdff09559115e0chuck the directly following proxy keepalive request to fail.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuckmod_proxy changes for httpd 2.0.15
0c233c76f21b358f4a0d81e0f956339ca727c14cchuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Added support for downstream keepalives in mod_proxy.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Changed mod_proxy ap_proxy_http_handler() to support APR properly.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fix problem where incoming response headers were not being returned
68bcde9c52e9e749482df2800dbdff09559115e0chuck to the client in mod_proxy.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Added X-Forwarded-For, X-Forwarded-Host and X-Forwarded-Server to
68bcde9c52e9e749482df2800dbdff09559115e0chuck reverse proxied request headers in mod_proxy.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) replace INADDR_NONE with APR_INADDR_NONE [Ian Holsman <IanH@cnet.com>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fix problem with proxy configuration where globally set
68bcde9c52e9e749482df2800dbdff09559115e0chuck configuration options were overridden inside virtual hosts.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Fix ProxyReceiveBufferSize where default value was left
68bcde9c52e9e749482df2800dbdff09559115e0chuck uninitialised.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) Some small changes:
68bcde9c52e9e749482df2800dbdff09559115e0chuck - Ensured hop-by-hop headers were stripped as per
68bcde9c52e9e749482df2800dbdff09559115e0chuck RFC2616 13.5.1.
68bcde9c52e9e749482df2800dbdff09559115e0chuck - Upgraded version code to HTTP/1.1.
68bcde9c52e9e749482df2800dbdff09559115e0chuck - Added Connection: close until Keepalives come.
68bcde9c52e9e749482df2800dbdff09559115e0chuck - Some cosmetic fixes and commenting.
68bcde9c52e9e749482df2800dbdff09559115e0chuck [Graham Leggett <minfrin@sharp.fm>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
0c233c76f21b358f4a0d81e0f956339ca727c14cchuckmod_proxy changes for httpd 2.0.14
68bcde9c52e9e749482df2800dbdff09559115e0chuck
68bcde9c52e9e749482df2800dbdff09559115e0chuck *) removed ProxyNoCache and ProxyCacheForceCompletion config directives,
4f7dd0949d92462a8adc31eee8aff266eea55204chuck since we no longer directly cache from this module
4f7dd0949d92462a8adc31eee8aff266eea55204chuck [Chuck Murcko <chuck@topsail.org>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
4f7dd0949d92462a8adc31eee8aff266eea55204chuck *) removed cache
4f7dd0949d92462a8adc31eee8aff266eea55204chuck [Chuck Murcko <chuck@topsail.org>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck
4f7dd0949d92462a8adc31eee8aff266eea55204chuck *) initial rerebuild for 2.0
4f7dd0949d92462a8adc31eee8aff266eea55204chuck [Chuck Murcko <chuck@topsail.org>]
68bcde9c52e9e749482df2800dbdff09559115e0chuck