www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Code Activity
26,790 Commits 62 Branches 306 Tags
25a2e41ea7e474100375986de0a0d792ff8094de
Commit Graph

1766 Commits

Author SHA1 Message Date
Graham Leggett
1ab831fa06 mod_proxy_http: Make the proxy-interim-response environment variable 
effective by formally overriding origin server behaviour.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483027 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 19:27:10 +00:00
Graham Leggett
ad639270e7 mod_serf: Add a FIXME, we are using ap_get_client_block() incorrectly. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482883 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 15:05:28 +00:00
Graham Leggett
e81ec38c9c mod_proxy: Use a global mutex for handling workers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482859 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-15 14:13:15 +00:00
Graham Leggett
d21bdf4dea mod_proxy: Make sure we skip empty tokens when parsing the Connection 
header.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482555 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 20:16:59 +00:00
Graham Leggett
9bc9d79079 core: Stop the HTTP_IN filter from attempting to write error buckets 
to the output filters, which is bogus in the proxy case. Create a
clean mapping from APR codes to HTTP status codes, and use it where
needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482522 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 18:58:06 +00:00
Guenter Knauf
e929fb1ee5 hunk 1: C89 please; 
hunk 2: optional functions are usually declared static.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482170 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-14 01:53:53 +00:00
Graham Leggett
d2e6782ea7 mod_proxy, mod_proxy_http: Connection headers must be stripped on the way 
in and out, support an optional function to handle this.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1482075 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 20:11:36 +00:00
Graham Leggett
e4c442a46f mod_proxy: Ensure we don't attempt to amend a table we are iterating 
through, ensuring that all headers listed by Connection are removed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481891 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-13 14:45:49 +00:00
Stefan Fritsch
b67b4aea82 Adjust format string 
type was changed by r1481302


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481397 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-11 19:58:03 +00:00
Graham Leggett
9a80dab0a1 mod_proxy: Reject invalid values for Max-Forwards. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1481302 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-11 11:47:17 +00:00
Jim Jagielski
d7c8ba3992 Mod_proxy used the global pool w/o mutex. fix. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480627 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-09 13:33:02 +00:00
Graham Leggett
a7fc0f013e mod_proxy: Ensure network errors detected by the proxy are returned as 
504 Gateway Timout as opposed to 502 Bad Gateway, in order to be
compliant with RFC2616 14.9.4 Cache Revalidation and Reload Controls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1480058 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-07 20:27:37 +00:00
Graham Leggett
2628ea4fc8 mod_proxy: Clarify the usage suggestion for BalancerInherit and ProxyPassInherit. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1476680 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-27 21:46:57 +00:00
Daniel Ruggeri
d31632f33c Add failontimeout to allow server admin to mark balancer member in err if IO timeout occurs. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1465839 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-09 00:18:42 +00:00
Ruediger Pluem
f707141760 * Always try to reuse the address looked up for the worker if we are allowed to 
reuse the address. This saves DNS lookups.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463455 13f79535-47bb-0310-9956-ffa450edef68
 2013-04-02 09:18:01 +00:00
Ruediger Pluem
43fdfc96cd * Improve reusage of already resolved addresses to avoid unnecessary DNS lookups. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1462269 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-28 19:36:03 +00:00
Guenter Knauf
4396a46ad0 Fixed proxy exports list; renamed wstunnel module. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1458945 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-20 16:56:43 +00:00
Jim Jagielski
44319eb4c0 Keep mod_req clear. Simply scan thru input filters and 
remove it within the ws submodule. Nasty, but it keeps
mod_req untouched (for now ;) )

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1458447 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 18:27:17 +00:00
Jim Jagielski
8a47ad90f6 bypass reqtimeout for websockets 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1458285 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-19 13:56:32 +00:00
Jeff Trawick
d6c996a553 axe unused variable dconf (since r1453875) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1456124 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-13 20:39:34 +00:00
Gregg Lewis Smith
e5d0f97ec8 Final rename per r1454386, we hope 
Set eol style of mod_proxy_wstunnel.dsp to native
for easy editing on any OS



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454659 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-09 05:51:48 +00:00
Jim Jagielski
236519bf3d streamline 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454415 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 14:55:56 +00:00
Jim Jagielski
2cac6515e9 don't strip these, ensure that they exist. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454414 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 14:55:53 +00:00
Jim Jagielski
a54621aca4 "final" rename :) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1454386 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-08 13:47:04 +00:00
Jim Jagielski
e87a822dc1 message tag for dom sock 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453981 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 17:50:47 +00:00
Jim Jagielski
16d02bd9d9 log nums 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453963 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 17:11:29 +00:00
Jim Jagielski
99b9928ac6 rename extension module... tunnel is more accurate 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453876 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 14:06:57 +00:00
Jim Jagielski
2bea7fb2bf Pull out duplicated code to proxy_util... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453875 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-07 14:06:51 +00:00
Jim Jagielski
0d61e66ee4 And now pass the initial request to the backend... 
I dislike this duplication of code from mod_proxy_http()
but maybe it's inevitable. I may create ap_proxy_create_headerb()
to create a header brigade that both modules can use.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453574 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 21:25:48 +00:00
Gregg Lewis Smith
60efc021bb Add mod_proxy_websocket to Windows 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453552 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 20:54:48 +00:00
Guenter Knauf
1c1e0a8cea Added mod_proxy_websocket to NetWare build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453316 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-06 12:51:54 +00:00
Jim Jagielski
2f876d8c48 Work around blocking issues... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1453022 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 21:38:01 +00:00
Jim Jagielski
4ff6e8614c We need to ensure a conn_rec 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1452954 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 19:18:55 +00:00
Jim Jagielski
c0bdcfbb74 force correct scheme info 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1452949 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 19:07:07 +00:00
Jim Jagielski
7930e87462 Rough start for simple, tunneling websocket proxy support. 
Compiles at this stage and that's all I know :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1452911 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-05 17:29:28 +00:00
Jim Jagielski
b6cdb032b3 apr trunk-able 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1452259 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-04 11:26:17 +00:00
Christophe Jaillet
ebb48e5f59 Fix indent 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1452195 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-04 06:33:43 +00:00
Guenter Knauf
f9b2fedce6 Follow-up to r1451905 to fix NetWare/Windows compilation. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451921 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-02 19:17:14 +00:00
Jim Jagielski
a641aa24e7 Make AF_UNIX aware... fix Windows/Netware?? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451905 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-02 17:07:23 +00:00
Jim Jagielski
f5f921a2f2 Add in rough uds support (Bugx 54101) from Blaise Tarr <blaise.tarr@gmail.com> 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1451633 13f79535-47bb-0310-9956-ffa450edef68
 2013-03-01 16:21:49 +00:00
Guenter Knauf
1333e972fe Fixed NetWare makefile for serf 1.2. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1449441 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-24 06:13:03 +00:00
Jim Jagielski
317eca4540 realign and fix logic 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1448630 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-21 13:19:30 +00:00
Stefan Fritsch
4b36695126 Don't keepalive the connection to the client if the 
backend closes the connection.

PR: 54474
Submitted by: Pavel Mateja <pavel netsafe cz>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1442320 13f79535-47bb-0310-9956-ffa450edef68
 2013-02-04 19:56:39 +00:00
Jim Jagielski
0d13f604c1 ProxyPassInherit directive 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1439404 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-28 13:58:24 +00:00
Rainer Jung
6128f87c1b mod_proxy_ajp: Support unknown HTTP methods. 
BZ 54416

Forward unknown methods as request attributes
using method id SC_M_JK_STORED=0xFF and
request attribute id SC_A_STORED_METHOD=13.

Code ported from mod_jk (which got it from mod_jk2).

Supported by Tomcat at least since TC 4.1.
Doesn't seem to be supported by Jetty though.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1435178 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-18 15:09:58 +00:00
Ruediger Pluem
3611dfe9d5 * A limit of zero means unlimited for LimitRequestBody. 
PR: 54435
Submitted by: Pavel Mateja <pavel netsafe.cz>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1433988 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-16 15:37:16 +00:00
Jim Jagielski
d8a752e550 non-existance of byrequests is not an immediate error 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1428916 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-04 15:10:21 +00:00
Joe Orton
1e7cba9aba * modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Remove 
unnecessary APLOGNO() for trace logging per dev@ discussion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1428280 13f79535-47bb-0310-9956-ffa450edef68
 2013-01-03 11:09:50 +00:00
Joe Orton
a685d6ae6b * modules/proxy/mod_proxy_ftp.c: Fill in APLOGNO. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1423353 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-18 09:01:02 +00:00
Jim Jagielski
26ecd7b2fe Redfine - we are just worried about balancers and workers, so have the directive clear about that. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422980 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-17 15:24:40 +00:00