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
6,389 Commits 62 Branches 306 Tags
eea38d7c2e697c81fb07badb48a473402f0aa65d
Commit Graph

255 Commits

Author SHA1 Message Date
Ian Holsman
eea38d7c2e This patch changes the apr_table_elts macro so that it provides 
access to the internals of an apr_table_t via a const pointer
instead of the current non-const pointer.


Submitted by:	Brian Pane <BPane@pacbell.net>
Reviewed by:	Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91860 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-11 22:31:04 +00:00
Ian Holsman
f1c45242ca Fix so that errordocument works when a error gets returned from the 
proxy.
Problem was ErrorHandler thought it was in some kind of recursion and
couldn't find the custom error document
Obtained from: Jin Hong <jinh@cnet.com>
Submitted by:
Reviewed by:   Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91757 13f79535-47bb-0310-9956-ffa450edef68
 2001-11-05 23:06:55 +00:00
Aaron Bannert
1087db6a1d Fix a truncation bug in how we print the port on the Via: header. 
The routine that prints the Via: header now takes a length for
the port string.

Submitted by:	Zvi Har'El <rl@math.technion.ac.il>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91682 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-29 15:44:03 +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
Ryan Bloom
6eb1adeb1d The proxy does not actually need this header. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91549 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-18 19:51:49 +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
1eda89f095 Hmmm... mismatched namespaces :-? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91489 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-16 14:45:56 +00:00
Ryan Bloom
e31a688ce5 Cleanup the proxy code that creates a request to the origin 
server.  This change adds an optional hook, which allows modules
to gain control while the request is created if the proxy module
is loaded.  The purpose of this hook is to allow modules to add
input and/or output filters to the request to the origin.  While
I was at it, I made the core use this hook, so that proxy request
creation uses some of the code from the core.  This can still be
greatly improved, but this is a good start.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91486 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-16 05:18:39 +00:00
Justin Erenkrantz
e1438a2d7c Fix the first bucket not getting chunked properly. The reason was that 
we left the TE header in the output headers, so ap_set_keepalive didn't
set r->chunked to 1.  So, ap_http_header_filter wouldn't insert CHUNK
filter appropriately.  I have no clue how it chunked anything at all
before this patch, but hey, it looks right now.

Tested with Yahoo, Apple, apache.org, and /.
/. is interesting in that it sends both Conn: Close and TE: chunked.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91463 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-14 20:41:00 +00:00
Justin Erenkrantz
fd1950344a Lose the magic number and use the central #define AP_IOBUFSIZE. 
Hey, I've never seen it in actual use anywhere, so I didn't know.

Thanks to Roy for pointing it out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91440 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-12 02:00:41 +00:00
Justin Erenkrantz
22c9145d8d Teach mod_proxy to live with the new filtering scheme. 
Tested with www.yahoo.com (Conn: Close), www.apache.org (CL), and
www.apple.com (TE: Chunked).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91436 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-11 20:03:26 +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
Ian Holsman
dd713bba3b dechunking filter removed. 
add HTTP_IN filter after the headers have been parsed.
so that the HTTP_IN can check them ;-)
Still not 100% if this works properly, but I don't get
the chunking numbers displayed on my browser,
so it's better than what was there.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91370 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-08 21:49:17 +00:00
Ian Holsman
4bd8279a92 initial port of new Request-mode HTTP_IN filter to proxy. 
Status: It serves a reverse-proxy page.. but SLOWLY.
VERY SLOWLY.
still looking at why, but now it serves pages instead of dumping core.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91363 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-08 19:25:35 +00:00
William A. Rowe Jr
c241623544 Should be no change to the execution - simply clean up two compiler 
warnings, signed/unsigned mismatch in != and mismatched type for port.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91214 13f79535-47bb-0310-9956-ffa450edef68
 2001-10-01 15:45:11 +00:00
William A. Rowe Jr
efc6237983 We don't mind the .mak files hanging around, don't tell us about it. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91183 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-28 17:50:22 +00:00
William A. Rowe Jr
f377305ac3 /home/cvs/httpd-2.0/ no longer tracks makefiles. But at least incorporate 
all the new proxy modules into BaseAddr.ref for win32.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91182 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-28 17:49:00 +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
Cliff Woolley
ed3a5bc69e Immortal data should go in an immortal bucket, not a pool bucket. It would 
still work in a pool bucket, but only by coincidence.  At the very least, a
pool bucket is way more overhead than this poor unsuspecting little CRLF
needs to get by.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91160 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-27 04:01:10 +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
Victor J. Orlikowski
0f20722276 Clean up a compile warning on AIX. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91094 13f79535-47bb-0310-9956-ffa450edef68
 2001-09-20 14:23:06 +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
William A. Rowe Jr
fb96a6c13a Undo another int type'ed port (and format a little structure for legibility). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90820 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-30 19:48:02 +00:00
William A. Rowe Jr
5832dc83ba Fix a broken declaration (supress type conversion warning on win32). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90819 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-30 19:43:03 +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
William A. Rowe Jr
7d67fb731a Change _only_ the debug build to recognize the /Zi flag (which is portable 
for debugging between VC 5.0/6.0/7.0) instead of the VC 6.0+ specific /ZI.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90675 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-26 03:58:52 +00:00
Ian Holsman
705282c22a ignore *.plg (from MSVC builds) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90403 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-20 16:50:07 +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
Ian Holsman
c802a1d599 MSVC can't seem to handle 
int buffer_len = 1;
        char test_buffer[buffer_len];


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90367 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-19 20:21:07 +00:00
Ryan Bloom
e0ee364ee8 initialize some values on variable creation 
Submitted by:	John Barbee <barbee@veribox.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90290 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-17 17:12:18 +00:00
Victor J. Orlikowski
923914d969 Fix behavior in the event that a socket is closed. 
Submitted by: barbee@veribox.net
Reviewed by: orlikowski@apache.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90264 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-17 01:38:16 +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
fba29f9fc7 Proxy now works as a DSO on AIX. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90172 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-15 18:56:16 +00:00
Victor J. Orlikowski
911fea9631 Fix a char * vs char ** mixup... 
Submitted by: barbee@veribox.net


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90171 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-15 18:36:05 +00:00
Ryan Bloom
981021f917 Break http_proxy_handler into multiple smaller functions. 
Submitted by:	John Barbee <barbee@veribox.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90159 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-14 18:04:58 +00:00
Chuck Murcko
b4118f1e32 Make the body read in proxy http handler nonblocking. There's no sense 
in serializing 4-8 client connections into a single origin server
connection, as is the blocking behavior.

Added instrumentation that we don't want compiled in normally to assist in
debugging chunking problems. apr_get_brigade is apparently blocking during
chunked body fetch, or proxy_http_handler is getting deadlocked with
the dechunk filter. Show PID for prefork debugging. We'll figure out
getting TIDs later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90127 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-12 21:24:35 +00:00
Ryan Bloom
2baa3fe4ff Fix the proxy when the origin server sends back a 100 
Continue response.  [John Barbee <barbee@veribox.net>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90092 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-11 05:10:23 +00:00
Ian Holsman
81be3f5ebe change readbytes from a apr_size_t to a apr_off_t to match the parameter 
required in ap_get_brigade
Submitted by:	 barbee@veribox.net
Reviewed by:	 ianh@apache.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90012 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-07 21:46:47 +00:00
Ian Holsman
8f2a259fa5 change the parameter to ap_get_brigade from apr_site_t to apr_off_t, due to 
a parameter change in the original filter.
PR:
Submitted by: barbee@veribox.net
Reviewed by: ianh@apache.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90011 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-07 21:18:03 +00:00
Victor J. Orlikowski
06c8676160 Forgot the CHANGES, as usual.... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89910 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-03 21:26:47 +00:00
Victor J. Orlikowski
82290d054d Add a timeout when making connections from within the proxy. 
Now, if someone wants to add a special scoreboard state for proxy
attempting to make connection, be my guest.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89908 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-03 18:00:38 +00:00
Victor J. Orlikowski
b64a6e878e Both the ftp and http proxies were erroneously sending a flush bucket after 
an eos bucket. This had been put in place to repair a bug, but was covering
the symptoms, rather than providing the cure. Bug repaired, and kludge
removed.

Submitted by: barbee@veribox.net


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89907 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-03 16:25:10 +00:00
Victor J. Orlikowski
3a3883d7e3 inet_addr and inet_network are not interchangable. 
Furthermore, use apr_inet_addr, rather than ap_inet_addr (though they map
to the same thing).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89855 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-01 05:50:29 +00:00
Victor J. Orlikowski
0ff7b17954 Remove a no-longer-needed header. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89854 13f79535-47bb-0310-9956-ffa450edef68
 2001-08-01 05:48:33 +00:00
Victor J. Orlikowski
7ca521dfdf After checking what this does with Bill Rowe, and discovering it to be dead 
wood, I am tossing it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89838 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-31 19:19:34 +00:00
Victor J. Orlikowski
5b38785f4b Being slightly picky: properly namespace protect make_fake_req() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89837 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-31 19:12:56 +00:00
Victor J. Orlikowski
37fa07f776 Oops. Include the right headers... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89836 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-31 17:30:12 +00:00