www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Code Activity
4,461 Commits 62 Branches 306 Tags
31bebc7b111bb709a35fbc6702095dce84523834
Commit Graph

149 Commits

Author SHA1 Message Date
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
Graham Leggett
97dfaefd92 CONNECT now works!!! Woohoo!!! 
the poll() loop was overhauled - many of the reads, writes and selects
were happening on the wrong sockets.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88767 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-08 12:54:34 +00:00
Graham Leggett
a0a3e8f845 Various cleanups and comments 
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88766 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-08 11:35:54 +00:00
Graham Leggett
7f6c1eb35c Add #defines for protocol version checks... 
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88765 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-08 09:49:49 +00:00
Graham Leggett
5cbf2b9828 Make the CONNECT proxy talk HTTP/1.1. Still need to check if this is 
compliant with HTTP/1.1 though...
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88757 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-07 21:12:39 +00:00
Graham Leggett
62b643a64b *) Made log entries consistent with proxy: CONNECT: 
*) checked that sockets were being closed on error
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88756 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-07 21:09:37 +00:00
Graham Leggett
20b09156c9 proxy_connect.c needs ap_parse_hostinfo_components() to decode the URI, 
not ap_parse_uri_components()
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88755 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-07 20:57:05 +00:00
Graham Leggett
3d6586f985 Downstream keepalives in mod_proxy should not kick in if the upstream 
client is < HTTP/1.1
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88754 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-07 19:41:03 +00:00
Graham Leggett
e9a12935d1 Sockets weren't being closed if the proxy could not connect to 
a remote machine...
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88751 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-07 14:06:13 +00:00
Graham Leggett
3d6dd232b3 Turns out continuation lines in ftp can start with a space... fix detection 
of these things in proxy_ftp.c
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88747 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-07 12:59:36 +00:00
Graham Leggett
a3bab88b26 Fixed problem where the port was left at zero on requests instead of 
being set to the default scheme port 80
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88746 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-07 12:24:38 +00:00
Graham Leggett
267a7f804e Some bugfixes to proxy_ftp.c 
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88745 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-07 12:05:21 +00:00
Graham Leggett
7a742e7fd1 Bugfixes to proxy_ftp.c -> in some places uri_addr was used instead 
of connect_addr - all hail cut and paste!
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88740 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-06 14:25:54 +00:00
Graham Leggett
5dd4149bc0 Converted send_dir() to ap_proxy_send_dir_filter() in proxy_ftp.c. 
Fixed up the header files
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88739 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-06 10:44:08 +00:00
Victor J. Orlikowski
3d4e9fbed5 More pool allocation errors. The apr_sockaddr_t structures connect_addr and 
uri_addr were getting allocated out of the wrong pool (one of the request pools)
when they were expected to stick around for the life of the socket.
Further, the default pool to be used should have been the connection pool in the
request_rec.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88737 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-06 01:59:26 +00:00
Chuck Murcko
c89723b196 update status; add FTP back in to the build 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88736 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-05 23:48:43 +00:00
Graham Leggett
854b0d2524 Major rework of ap_proxy_ftp_handler() to use filters (begone foul 
BUFF!!!). It compiles, but is untested, and the build environment needs
to be fixed to include proxy_ftp.c.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88734 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-05 21:27:50 +00:00
Graham Leggett
a43bb9db2e Cleanup of dead functions within proxy_util.c. 
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88732 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-05 18:53:04 +00:00
Graham Leggett
afce43baa9 Reworked the storage of the client socket between keepalive connections 
to fix some nasty problems with the socket lasting longer than the
memory pool it was allocated from.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88730 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-05 18:25:04 +00:00
Graham Leggett
5f3bc1ebc9 Some code rewriting in ap_proxy_connect_handler(): 
*) Fixed bug where a hostname without a "." in it (such as "localhost")
would not trigger an IP address check with ProxyBlock.
*) Fixed ProxyBlock bugs with ap_proxy_http_handler() and
ap_proxy_connect_handler().
*) Updated ap_proxy_connect_handler() to support APR, while
moving some common code between http_handler and connect_handler
to proxy_util.c.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88721 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-04 18:47:42 +00:00
Graham Leggett
b924ea846d Fixing a few compiler warnings with mod_proxy 
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88659 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-02 21:19:22 +00:00
Graham Leggett
0628baf027 Fixed problem where responses without entity bodies would cause 
the directly following proxy keepalive request to fail.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88657 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-02 20:55:23 +00:00
Graham Leggett
d72c7d938e *) Added support for downstream keepalives in mod_proxy. 
*) Changed mod_proxy ap_proxy_http_handler() to support APR properly.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88648 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-02 17:04:19 +00:00
Graham Leggett
8f6431df56 Header Bugfix / General Cleanups in ap_proxy_http_handler / X-Forwarded-* headers 
PR:
Obtained from:
Reviewed by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88579 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-25 20:23:25 +00:00
Chuck Murcko
4fe4de4e33 reorganize STATUS; update copyright 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88534 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-19 08:54:41 +00:00
Chuck Murcko
8ec81e1524 The mod_proxy side of Graham's Auth patch 
Obtained from: Graham Leggett
Reviewed by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88533 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-18 04:56:26 +00:00
Chuck Murcko
448a3a6d3b change INADDR_NONE to APR_INADDR_NONE 
Submitted by:	Ian Holsman <IanH@cnet.com>
Reviewed by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88525 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-16 05:49:51 +00:00
Graham Leggett
7c80013588 Pull in the Connection handling part of the v1.3 patch for HTTP/1.1. 
Some preliminary HTTP/1.1 work
Some comments and fixes
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88518 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-14 21:16:41 +00:00
Chuck Murcko
49de9670bf actually dump the cache code 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88489 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-11 11:55:33 +00:00
Chuck Murcko
27a5d83bf3 remove ProxyNoCache and ProxyCacheForceCompletion config directives, 
since we no longer directly cache from this module
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88488 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-11 11:08:22 +00:00
Chuck Murcko
1dcf2f7754 Cache removed, with other spooge 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88487 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-11 10:42:14 +00:00