www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-08 04:22:21 +03:00
Code Activity
11,829 Commits 62 Branches 304 Tags
d4b1817c38a4a2d2e19498cb0ecf129e204dc8c6
Commit Graph

170 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Ryan Bloom
9d85d10c10 Fix any compile breaks after moving apr_snprintf and apr_vsnprintf to 
apr_strings.h


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88077 13f79535-47bb-0310-9956-ffa450edef68
 2001-02-11 00:12:43 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake 
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
 2001-02-08 07:45:33 +00:00
Chuck Murcko
c9dc3847d2 Changes to get running on the current codebase 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88004 13f79535-47bb-0310-9956-ffa450edef68
 2001-02-07 05:41:35 +00:00
Jeff Trawick
bd424f80f3 ap_new_connection() returns NULL if an error occurred (prefork MPM 
and ap_new_connection() were changed last week)

I have skipped putting the change into WinNT MPM and mod_proxy.  I
left a note in the mod_proxy code; for the NT MPM I think I can talk
somebody into doing the right thing for me.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87982 13f79535-47bb-0310-9956-ffa450edef68
 2001-02-05 15:04:32 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please 
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
 2001-01-19 07:04:36 +00:00
Jeff Trawick
4c8baf6170 Get rid of ap_new_apr_connection(). ap_new_connection() now has 
fewer parameters: the local and remote socket addresses were removed
from the parameter list because all required information is available
via the APR socket.

I haven't tested the most important part -- the WinNT MPM changes
-- but it compiles and it looks okay :)  If the WinNT MPM works on
Win98 these days let me know.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87181 13f79535-47bb-0310-9956-ffa450edef68
 2000-12-04 19:24:10 +00:00
Jeff Trawick
0caf561799 Call apr_create_socket() instead of apr_create_tcp_socket() (deprecated). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87025 13f79535-47bb-0310-9956-ffa450edef68
 2000-11-19 14:27:45 +00:00
Ryan Bloom
e56d9d5baf Begin to remove some of the cache-ing logic from the http proxy. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87013 13f79535-47bb-0310-9956-ffa450edef68
 2000-11-18 17:13:29 +00:00
Ryan Bloom
66078e0d34 More proxy fixes. There are still some bugs in this code, but this has 
successfully proxied www.yahoo.com and www.ntrnet.net among other test
sites that I chose at random.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87001 13f79535-47bb-0310-9956-ffa450edef68
 2000-11-18 03:17:21 +00:00
Ryan Bloom
4baadb8ef1 This removes all BUFF's from the HTTP proxy. This code is relatively 
ugly, but it does proxy pages.  This even fixes the content-type bug
that I introduced yesterday sometime.  As soon as BUFF is removed from
the FTP proxy, the buff.c and buff.h files need to go away.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86988 13f79535-47bb-0310-9956-ffa450edef68
 2000-11-17 00:19:30 +00:00
Ryan Bloom
274c566f2b Make the proxy work with filters. We are still using BUFF for the 
back-end communication, but BUFF has been removed from the communication
with the client.  The headers are not working correctly yet, but we are
making progress.  The most important part of this commit is that we are
able to actually filter data coming from the proxy.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86978 13f79535-47bb-0310-9956-ffa450edef68
 2000-11-16 01:57:46 +00:00