www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity
5,560 Commits 62 Branches 306 Tags
bdae3efcfed75729dfa42223ff34891831494439
Commit Graph

226 Commits

Author SHA1 Message Date
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
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
Ian Holsman
4318882a79 Remove APR_NO_INHERIT as it is now private. 
sigh... the cost of being bleeding edge
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89607 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-18 20:35:13 +00:00
Ian Holsman
175af69f8e Change the APR_INHERIT flag to APR_NO_INHERIT,which is the default (as recommended by rbb) 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89569 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-17 21:43:35 +00:00
Ian Holsman
eef8a5ccff applies change in APR function apr_socket_create, which added a new parameter. 
I defaulted these to APR_INHERIT.
Also..
the connection-close was being merged, insted of 'set'
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89559 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-16 17:54:38 +00:00
Ian Holsman
9467f6ad75 Last Log entry was bogus. 
Changed to 'setting' the X-Forwarded-Server X-Forwarded-Host X-Forwarded-For
headers instead of merging them
PR:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89551 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-14 20:18:45 +00:00
Ian Holsman
f99ed71713 PR: 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89550 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-14 20:17:07 +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
Victor J. Orlikowski
3bb89937f4 Remove a couple of extraneous calls to apr_brigade_cleanup() 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89489 13f79535-47bb-0310-9956-ffa450edef68
 2001-07-02 03:37:37 +00:00
Chuck Murcko
6383dfad3b Fix abort code path for HTTP proxy. Similar to Victor's patch for FTP 
proxy. No, Julia, it really *is* a double negative.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89486 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-30 04:50:31 +00:00
Victor J. Orlikowski
99801a5d6d Fix the code, to properly handle the case of the user aborting the connection 
or the connection being broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89485 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-29 22:22:19 +00:00
Chuck Murcko
a64f4f382a FTP return code variable cleanup; fixed login bug (same var used for 
return code and loop index)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89483 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-29 00:12:08 +00:00
Victor J. Orlikowski
b4eaa1e5e3 Close the sockets, the right way this time. 
Use the ones that the connections are using, rather
than those used to initialize the connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89481 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 21:29:19 +00:00
Victor J. Orlikowski
fe91c29215 Use the variable we've been using for return codes. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89480 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 20:40:51 +00:00
Victor J. Orlikowski
ed7d24c13b Get the messages returned from the FTP Server in order. 
Otherwise we break RFC959.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89479 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 20:29:45 +00:00
Victor J. Orlikowski
c3458a0bde Just the facts, ma'am. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89478 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 19:20:03 +00:00
Victor J. Orlikowski
0337297fce PORT works again. Syntax was what had killed it. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89477 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 18:59:07 +00:00
Victor J. Orlikowski
88aa1ce4cf Maybe this will get PORT working again.... 
break inside a switch statement inside a for loop
breaks out of the switch statement, not the for loop.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89476 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 18:34:59 +00:00
Victor J. Orlikowski
f88c2190b4 Last check-in went awry. 
Here is the intended message.

Put the QUIT command back.
Basically, when a LIST occurs, origin is not available for reading until the data connection
is closed in passive mode.
This takes care of that.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89475 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 18:01:21 +00:00
Victor J. Orlikowski
8194f25a1e proxy_ftp.c 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89474 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 17:49:54 +00:00
Chuck Murcko
77e6035975 Reorganize ap_proxy_string_read() internally to not process eos buckets. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89473 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 12:48:57 +00:00
Chuck Murcko
be727972fa Some servers send no response to FTP QUIT command and just close the 
connection. Remove result code check for QUIT. We gave them fair
warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89472 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 10:00:07 +00:00
Victor J. Orlikowski
79686d250b An EOS bucket doesn't contain anything, so why shouldn't we skip it? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89471 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 07:05:18 +00:00
Victor J. Orlikowski
d59cbf8a61 ftp_getrc_msg is blocking for no good reason after the receive loop. 
Disable it till we figure out what's going on. ;(
At least it works now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89470 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-28 07:04:18 +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
Chuck Murcko
327be3721c moved CHANGES here 
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89304 13f79535-47bb-0310-9956-ffa450edef68
 2001-06-08 09:59:25 +00:00
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