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
5,094 Commits 62 Branches 306 Tags
c9148bcd492decd092eeee697b60f437b727d76a
Commit Graph

204 Commits

Author SHA1 Message Date
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
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
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
410db6c7ce Fixed a problem with directory listing corruption in the 
PROXY_DIR filter.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88971 13f79535-47bb-0310-9956-ffa450edef68
 2001-05-01 21:30:07 +00:00
Graham Leggett
4fc50ed0a1 mod_proxy and the proxy submodules now build properly as DSOs. 
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88929 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-24 11:29:40 +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
704054f6d9 Just for the sake of cleanliness ... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88926 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-24 02:50:19 +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
Victor J. Orlikowski
9d5a1e47a9 *Sigh.* The janitor cleans up after himself. 
This makes shared proxy builds work.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88921 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-23 19:50:28 +00:00
Victor J. Orlikowski
e79be1220f Fix proxy to NOT be built by default. 
Obtained from: Jeff Trawick
Submitted by: Victor Orlikowski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88920 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-23 18:28:25 +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
Victor J. Orlikowski
1e331c37ff *Sigh*. Slight janatorial work. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88870 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-16 17:37:24 +00:00
Graham Leggett
73d8d4ab4d Add the Retry-After support that was commented out in proxy_ftp.c 
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88868 13f79535-47bb-0310-9956-ffa450edef68
 2001-04-15 20:26:10 +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