www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-14 01:22:37 +03:00
Code Activity
26,419 Commits 62 Branches 304 Tags
1755dc97033f4c7129f1f8c9380510517c7005a4
Commit Graph

365 Commits

Author SHA1 Message Date
Jeff Trawick
cf5f58a851 Fix a problem in the parsing of the <Proxy foo> directive. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92882 13f79535-47bb-0310-9956-ffa450edef68
 2002-01-17 02:22:22 +00:00
Ian Holsman
6084f225f4 r->headers_in is shared by original requests and components (make no sense 
copy them for components), but each component has its own r->pool.
So once the first component set "Max-Forwards", it is in headers_in
but the value could get lost with the first component's r->pool.
Hence I sometimes see "Max-Forwards" has value like letter "l".
Change it to use apr_table_set() fixed the problem.

Submitted by:	Jin Hong <jinh@cnet.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92253 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-29 21:09:31 +00:00
Ian Holsman
a052762e84 ProxyPass wasn't sending the right URL through to the backend server 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92021 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-17 22:01:32 +00:00
William A. Rowe Jr
e289e87c82 And where, praytell, should mod_proxy.c find ap_send_http_options 
and ap_send_http_trace?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91561 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-19 05:01:13 +00:00
William A. Rowe Jr
4608aab1d6 As GStein points out... comment here would be helpful 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91544 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-18 13:12:32 +00:00
William A. Rowe Jr
af7425b447 Aye, it's bogus. Something very odd about short terniary results on 
this C[++] compiler here, wants to promote to the conditition's type :-/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91424 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-11 14:04:11 +00:00
Graham Leggett
3ce4f34fd4 Fix the "merge" behaviour of the ProxyErrorOverride directive. 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91172 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-28 10:33:39 +00:00
Graham Leggett
0617f1c78f Some style cleanups related to the ProxyErrorOverride function. 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91171 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-28 10:23:32 +00:00
Victor J. Orlikowski
12d05cb79e Change ProxyHTTPOverrideReturnedErrors command to ProxyErrorOverride 
Docs update to follow.
Submitted by: Ian Holsman <ianh@cnet.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91165 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-27 16:44:43 +00:00
Ian Holsman
ae877f9e70 change command name so that it starts with 'Proxy' 
fix the command so that it returns 'OK' instead of 'HTTP_OK'

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91155 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-26 19:58:10 +00:00
Ian Holsman
65d5d7b65c Added New Option 'HTTPProxyOverrideReturnedErrors' which lets the server override 
the error pages returned from the proxied server and replace them with the standard
server error handling on the main server.

Reviewed by:	Graham, Chuck


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91092 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-20 05:34:50 +00:00
Graham Leggett
e8ea6d64da Fix some warnings... 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90777 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-28 23:45:30 +00:00
William A. Rowe Jr
e544eec75b Split proxy: space using <Proxy[Match] > directive blocks from 
the <Directory[Match] > and <Files[Match] > blocks.  Mod_proxy
  now bypasses the directory and files testing phase (and skips
  the http TRACE default handler on it's own, as well).  Note that
  <Location > blocks continue to be processed for proxy: requests.

  Remaining questions include canonicalization and case folding
  of proxied uri space, prior to the proxy_walk testing and the
  second <Location > walk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90678 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-26 04:39:35 +00:00
Ian Holsman
af3b2ee457 adjust to apr_uri_ rename 
Submitted by:	dougm@apache.org
Reviewed by:	ianh@apache.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90402 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-20 16:49:29 +00:00
Victor J. Orlikowski
ac17ff1737 Fix an off-by-one error in an argument to apr_pstrcat. 
Submitted by: barbee@veribox.net


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90176 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-15 21:45:51 +00:00
Victor J. Orlikowski
de5ebc3740 Nobody screamed. ;) 
This gets rid of ap_proxy_host2addr, and a few other useless functions,
and allows us to be threadsafe when doing DNS resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89829 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-31 16:25:18 +00:00
Chuck Murcko
f93d782272 fix params for logging call 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89520 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-09 06:35:51 +00:00
Ian Holsman
f2f4dff204 Fixed up formatting (removed tabs) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89425 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-26 22:46:04 +00:00
Ian Holsman
acf7098338 ProxyPass & ProxyPass Reverse now can be specified in <Location> directives 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89424 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-26 22:32:49 +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
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
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
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
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
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
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
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
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
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
Graham Leggett
4ee1bd19ff Virtual host config file fix backported from v1.3 
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88485 13f79535-47bb-0310-9956-ffa450edef68
 2001-03-10 21:19:21 +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
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
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that 
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
 2001-01-17 15:52:12 +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
b91450f752 Get the proxy to look at requests that are being proxied again. In the 
big commit of the other day, a few !r->proxyreq's were changed to
r->proxyreq, which made the proxy decline requests when it shouldn't
have.
Submitted by:	Cliff Woolley <cliffwoolley@yahoo.com>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86966 13f79535-47bb-0310-9956-ffa450edef68
 2000-11-14 22:28:56 +00:00
Ryan Bloom
6ec843d62c Get the proxy working again. With this change in, I have successfully 
proxied a page from perl.apache.org.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86962 13f79535-47bb-0310-9956-ffa450edef68
 2000-11-14 18:27:58 +00:00