1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

179 Commits

Author SHA1 Message Date
Chuck Murcko
bd71fdf9ac Use apr-util's date functions now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89280 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 21:51:58 +00:00
Victor J. Orlikowski
69ad06ffee Change strtok() calls to use apr_strtok().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89221 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 15:13:02 +00:00
Victor J. Orlikowski
0382ec68fa YAPJBUJ.
(Yet Another Proxy Janitor Botched-Up Job).
Need to be looking for APR_SUCCESS here, not HTTP_OK.
Obtained from: Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89213 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 06:43:46 +00:00
Victor J. Orlikowski
a040b3c7bf Bletch. The Proxy Janitor botches the job again.
Thanks to Ian Holsman for the catch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89210 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 03:39:44 +00:00
Victor J. Orlikowski
2a5472f674 Fixes to proxy, after util-uri move, plus fixes to the .mak file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89204 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 19:37:13 +00:00
Ian Holsman
3032fea185 Allows Mod_proxy to be dynamically loaded on win32 systems
PR:
Obtained from:
Submitted by:	ianh
Reviewed by:	Chuck Murcko, Graham


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89085 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 17:32:41 +00:00
Victor J. Orlikowski
2a62baa1bc Shut the compiler up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89052 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 20:02:39 +00:00
Chuck Murcko
109f7ebf1d Crikey.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89044 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 02:47:51 +00:00
Chuck Murcko
ea5093e17f Track Greg's change to byte count for input filters
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89037 13f79535-47bb-0310-9956-ffa450edef68
2001-05-06 10:59:22 +00:00
Graham Leggett
410db6c7ce Fixed a problem with directory listing corruption in the
PROXY_DIR filter.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88971 13f79535-47bb-0310-9956-ffa450edef68
2001-05-01 21:30:07 +00:00
Graham Leggett
4fc50ed0a1 mod_proxy and the proxy submodules now build properly as DSOs.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88929 13f79535-47bb-0310-9956-ffa450edef68
2001-04-24 11:29:40 +00:00
Graham Leggett
ba986d2e6b Stopped the HTTP proxy from trying to read entity bodies when there
wasn't one (response was 1xx, 204, 205 or 304).
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88928 13f79535-47bb-0310-9956-ffa450edef68
2001-04-24 08:38:43 +00:00
Graham Leggett
8366898180 Made the variable naming the same as everywhere else in Apache for the
ap_get_brigade() fix.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88927 13f79535-47bb-0310-9956-ffa450edef68
2001-04-24 04:38:53 +00:00
Victor J. Orlikowski
704054f6d9 Just for the sake of cleanliness ...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88926 13f79535-47bb-0310-9956-ffa450edef68
2001-04-24 02:50:19 +00:00
Victor J. Orlikowski
f51e69676f Sometimes, boys and girls, pointers and integers *aren't interchangeable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88923 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 21:49:15 +00:00
Graham Leggett
83e42d2157 Apply changes to ap_get_brigade() to the proxy code.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88922 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 21:03:39 +00:00
Victor J. Orlikowski
9d5a1e47a9 *Sigh.* The janitor cleans up after himself.
This makes shared proxy builds work.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88921 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 19:50:28 +00:00
Victor J. Orlikowski
e79be1220f Fix proxy to NOT be built by default.
Obtained from: Jeff Trawick
Submitted by: Victor Orlikowski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88920 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 18:28:25 +00:00
Graham Leggett
b0796df50f Made sure dates were canonicalised correctly when passed to the client
browser through the HTTP proxy.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88898 13f79535-47bb-0310-9956-ffa450edef68
2001-04-19 21:18:41 +00:00
Victor J. Orlikowski
1e331c37ff *Sigh*. Slight janatorial work.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88870 13f79535-47bb-0310-9956-ffa450edef68
2001-04-16 17:37:24 +00:00
Graham Leggett
73d8d4ab4d Add the Retry-After support that was commented out in proxy_ftp.c
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88868 13f79535-47bb-0310-9956-ffa450edef68
2001-04-15 20:26:10 +00:00
Graham Leggett
c83c2da6a6 Oops - the proxy host and port were left off when the proxy tries to
run the handler to connect to a proxy server.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88867 13f79535-47bb-0310-9956-ffa450edef68
2001-04-15 18:16:22 +00:00
Graham Leggett
22ebd698df Split each individual proxy protocol into separate modules.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88866 13f79535-47bb-0310-9956-ffa450edef68
2001-04-15 17:15:29 +00:00
Graham Leggett
f8425f7b81 Make hooks work for the *_canon() functions. Work continues.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88854 13f79535-47bb-0310-9956-ffa450edef68
2001-04-14 07:03:00 +00:00
Graham Leggett
0a9f4ce887 Initial support for proxy protocol handler sub-modules. Work continues.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88853 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 23:56:04 +00:00
Chuck Murcko
a5a7858f28 Be type safe, avoid possible buffer overrun
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88850 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 18:57:25 +00:00
Chuck Murcko
6317250229 Not sure what I was thinking, but this clarifies the logic for nbytes >
sizeof(buffer) towards the end of proxy_connect.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88849 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 17:46:54 +00:00
Graham Leggett
81ef5d35b2 Added Max-Forwards support for all request types so as to prevent
loops.
PR: 1085
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88848 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 15:51:33 +00:00
Graham Leggett
6106a25335 Sorted out some content-type oddness with proxy_ftp.c
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88847 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 15:41:35 +00:00
Graham Leggett
5345c51dbc Fixed all the APR error codes to make sure they end up in the logfiles
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88846 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 15:30:32 +00:00
Chuck Murcko
31bebc7b11 Fix logic in connect handler from previous patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88845 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 09:34:47 +00:00
Chuck Murcko
d8d03d8aed Fix warnings about byte count type on Darwin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88844 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 08:12:52 +00:00
Graham Leggett
4abfc87daf IPV6 EPSV support for IPV6 in FTP proxy.
Some cleanup of the million and one debug statements
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88842 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 02:30:23 +00:00
Graham Leggett
1e122070a9 Fixed a problem with FTP directories and charcters being chopped here
and there.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88841 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 02:07:05 +00:00
Graham Leggett
07e7e196f4 FTP directory filter works now.
Many FIXME notes added.
Much overhauling of proxy_ftp.c
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88817 13f79535-47bb-0310-9956-ffa450edef68
2001-04-12 01:57:48 +00:00
Graham Leggett
c439858c4c Fixed some thread-safety issues with the HTTP proxy in mod_proxy.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88814 13f79535-47bb-0310-9956-ffa450edef68
2001-04-11 23:07:21 +00:00
Victor J. Orlikowski
db1327d026 Ignore *.slo too....
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88801 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 23:16:10 +00:00
Graham Leggett
edfc2c2ae9 Small fixes.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88800 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 21:31:10 +00:00
Graham Leggett
98f1c62883 A client POST request would be read entirely into RAM before sending it
on the client - a potential DoS. Fixed.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88799 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 20:55:05 +00:00
Graham Leggett
ce168dd27f Make sure the filter stack in a reused downstream connection is reset
so we don't get lots of DECHUNK filters when we don't want them.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88797 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 20:44:16 +00:00
Graham Leggett
056f85fe07 We now keep the entire conn_rec across downstream keepalives, not
just the socket.
Made the "keepalive mismatch" message more accurate.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88793 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 19:52:40 +00:00
Graham Leggett
eb1d17ebe7 More fixes...
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88780 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 12:06:49 +00:00
Graham Leggett
78aaa15794 Memory allocation cleanups
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88779 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 09:30:12 +00:00
Graham Leggett
d861bced35 Change HTTP proxy to use ap_proxy_string_read() instead of apr_brigade_read()
to make sure all the buckets are read...
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88778 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 00:45:02 +00:00
Graham Leggett
10c533558e Compiler warnings - yuck!
Moved ap_proxy_string_read() to proxy_util.c so it can be used by
proxy_http.c
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88777 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 00:13:56 +00:00
Graham Leggett
e8626b9c49 *) PASV FTP works now.
*) Reworked the line-at-a-time read from the control connection to
workaround a stray empty bucket returned by the HTTP_IN filter.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88775 13f79535-47bb-0310-9956-ffa450edef68
2001-04-09 21:49:17 +00:00
Graham Leggett
f3269d3639 Goodbye more dead code.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88771 13f79535-47bb-0310-9956-ffa450edef68
2001-04-08 22:26:45 +00:00
Graham Leggett
e95ee6ea59 Stopped the CORE filter from sending off an HTTP response when a
CONNECT tunnel was closed. Fixed some filter definition madness that
proves that I need some sleep.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88770 13f79535-47bb-0310-9956-ffa450edef68
2001-04-08 22:18:31 +00:00
Graham Leggett
a3f6f6dd0a HTTP_VERSION() is the correct way to do this...
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88769 13f79535-47bb-0310-9956-ffa450edef68
2001-04-08 16:29:30 +00:00
Graham Leggett
c3cdf7f42f More error checks to make sure the poll() loop dies when the connection
on either side is closed...
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88768 13f79535-47bb-0310-9956-ffa450edef68
2001-04-08 14:52:19 +00:00