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
24,337 Commits 62 Branches 306 Tags
c6984dfd5e2f09bf2b4c28bf9d6d3efe158970fa
Commit Graph

1518 Commits

Author SHA1 Message Date
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
Jim Jagielski
26036be3a5 restrict inherit control to those fields that "require" it... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422943 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-17 14:25:46 +00:00
Guenter Knauf
6005430c9a Added missing exports for NetWare. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1422874 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-17 11:48:28 +00:00
Jim Jagielski
74708ea8f3 Allow for searching w/i shm slots for a specific worker and balancer 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421953 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-14 16:14:06 +00:00
Rainer Jung
b63656829c Use inherit_set to let the global server set 
the default for all vhosts.

Otherwise inherit would need to be disabled
redundantly in each vhost.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421912 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-14 15:02:30 +00:00
Jim Jagielski
755fc20b6e be consistent 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421882 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-14 14:20:26 +00:00
Jim Jagielski
bdafd4e926 Anticipate ordering for 2.4 backport 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421852 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-14 13:30:45 +00:00
Jim Jagielski
e196d0d0db inherit inherit 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1421288 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-13 13:36:08 +00:00
Joe Orton
c945772cba * modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Simplify EPSV 
address handling to avoid overhead of unnecessary
  binary->text->binary conversion, and ensuring the socket family
  really matches the address used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420223 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-11 15:28:05 +00:00
Jim Jagielski
ce9b646c73 rjung's suggestions... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1420124 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-11 12:35:50 +00:00
Christophe Jaillet
1fc22893b4 mod_proxy_balancer: It's totally unclear what Drn, Dis, Ign, Stby means. 
PR 52478

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1419796 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-10 21:35:16 +00:00
Christophe Jaillet
e5e91f8315 Use ap_rputs instead of ap_rvputs where applicable. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418524 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-07 22:31:40 +00:00
Jim Jagielski
59bc7bcaff API sync... not crucial for trunk 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1418049 13f79535-47bb-0310-9956-ffa450edef68
 2012-12-06 19:58:04 +00:00
Jim Jagielski
18cc8e835b CVE-2012-3499 and CVE-2012-4558 
Be sure to escape potential troubled strings


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1413732 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-26 17:18:54 +00:00
Jim Jagielski
4916496398 better logging for re-use/use of shm 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1407085 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-08 14:01:37 +00:00
Jim Jagielski
6ec40f4835 Allow for setting of sticky session split char... 
Bugz 53893


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1404653 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-01 16:06:43 +00:00
Jim Jagielski
4e312c72da *) mod_proxy_ftp: Fix segfaults on IPv4 requests to hosts with DNS AAAA records. 
PR  40841. [Andrew Rucker Jones <arjones simultan dyndns org>,
     <ast domdv de>, Jim Jagielski]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1404625 13f79535-47bb-0310-9956-ffa450edef68
 2012-11-01 15:02:46 +00:00
Ruediger Pluem
6dd8e07528 * If we face a timeout during receiving the response from the backend and if 
we pinged it successfully before don't assume the whole backend has failed.
  Assume that only the request has failed and return a gateway timeout then.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1398307 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-15 14:38:04 +00:00
Jim Jagielski
1c493b3ca5 and allow the xml param 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1392346 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-01 14:14:56 +00:00
Jim Jagielski
aaaca4d1db Bring XML output up to snuff for balancer-manager 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1392345 13f79535-47bb-0310-9956-ffa450edef68
 2012-10-01 14:14:53 +00:00
Jim Jagielski
04954afd04 force these 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388603 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-21 18:27:50 +00:00
Jeff Trawick
14833e4aa5 fix BalancerInherit command processing from r1388029 
(still not tested)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388444 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-21 11:53:01 +00:00
Jim Jagielski
b360fcb2d2 OK, enable/allow previous broken, bad behavior iff the user 
really, really wants it. And warn that b-m isn't recommended
in those cases.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1388029 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-20 13:41:45 +00:00
Jim Jagielski
63fd4b04f8 fix clang warning (dead initialization) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387979 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-20 11:26:34 +00:00
Jim Jagielski
fdf7c1de11 and this one as well... persist isn't inherited 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387693 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-19 17:46:32 +00:00
Jim Jagielski
f5f36c3f88 Oops... didn't mean to commit that. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387691 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-19 17:42:38 +00:00
Jim Jagielski
38f3c64c2f Re-instate balancer merge (for the time being) but force 
persistence if the top-level server has it defined....


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387684 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-19 17:21:55 +00:00
Jim Jagielski
252eb962b5 Log whether or not the restore from shm actually 
resulted in a match of shm data, or whether it
was stale.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387607 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-19 14:18:19 +00:00
Jim Jagielski
2619a5308f wtf are we doing merging in these from the parent?? 
These are server specific!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387603 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-19 14:17:03 +00:00
Jim Jagielski
1c55455c36 Use identifying server_rec info when we know we have 
unique and useful data :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387444 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-19 03:51:25 +00:00
Jim Jagielski
53bf5b2c19 By using a consistent naming structure, we can persist 
across stop/starts (assuming people don't change
such basics as scheme, hostname, etc...)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387287 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-18 18:02:31 +00:00
Jim Jagielski
664dd95af2 Persist local balancer-manager changes across restart/graceful. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1387110 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-18 12:15:50 +00:00
Jim Jagielski
6e35236028 Don't just willy nilly slurp double slashes... just handle 
the end-case where a '//' is not intended (due to how
PPR is stored)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1386578 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-17 12:22:33 +00:00
Jim Jagielski
df145fa817 When concatting for PPR, avoid cases where we 
concat ".../" and "/..." to create "...//..."

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1386576 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-17 12:11:45 +00:00
Jim Jagielski
beba00de80 Avoid the overhead of creating and grabbing a uuid for 
the balancer nonce if we're never going to use it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1383490 13f79535-47bb-0310-9956-ffa450edef68
 2012-09-11 17:39:32 +00:00
Joe Orton
cc786585b6 * modules/proxy/mod_proxy_connect.c (proxy_connect_handler): Fix 
use of APLOGNO().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1375407 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-21 07:31:36 +00:00
Guenter Knauf
6f79dac483 Move *_DECLARE_* macros to beginning of line in headers. 
Patch submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1374963 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-20 10:09:42 +00:00
Rainer Jung
ba90b1969f No rv here. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1374157 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-17 06:30:21 +00:00
Rainer Jung
4cf751dbb9 Fix closing the back end connection in case of error. 
The field "closed" was changed from an int to a bit
field of size one in 2.4.x.
For historical reasons a close instruction was coded
as an increment on the field, which in 2.4.x flips
the field each time. There were mutliple code paths
that would flip it several times for a single error,
so effectively the connection was no longer closed
in these cases.

Especially in the case of an aborted client connection
this lead to a non consumed back end buffer and thus to
response mixup between users.

PR 53727

CVE-2012-3052


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1373955 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-16 17:54:50 +00:00
Rainer Jung
212cf7938c Fix crash in packet dump code of mod_proxy_ajp when 
logging with LogLevel trace7 or trace8.

PR 53730


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1373898 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-16 16:05:21 +00:00
Guenter Knauf
7814748ab3 NetWare build tweaks. 
Make more use of internal makefile macros;
axed now obsolete include paths.
Submitted by: normw gknw net.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1371177 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-09 12:11:09 +00:00
Guenter Knauf
1b61b2601f Follow-up fix needed since r1370592. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1370615 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-08 00:38:10 +00:00
Jeff Trawick
ca3076197c spelling 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1369779 13f79535-47bb-0310-9956-ffa450edef68
 2012-08-06 11:10:51 +00:00
Jeff Trawick
94b3a2b552 mod_proxy_balancer: Restore balancing after a failed worker has 
recovered when using lbmethod_bybusyness.

PR: 48735

Markus Stoll and Adam C both submitted patches against 2.2.x
to bug 48735.  Compared with those two, this solution

1. resets the busy field in the error-ed worker at the end of
   the request instead of at recovery time
2. leaves the lbstatus field alone
3. covers all possible scenarios where the busy field in the
   error-ed worker needs to be adjusted, since a cleanup to
   perform the decrement is registered at the point of the
   increment


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1366344 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-27 11:50:25 +00:00
Joe Orton
769ea2b074 * modules/proxy/proxy_util.c (ap_proxy_location_reverse_map): Fix 
to skip balancer:// prefix where applicable.

Reviewed by: rjung, rpluem
PR: 45434 (regressed since 2.2)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1365479 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-25 07:28:26 +00:00
Joe Orton
38f42637d9 * modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Add error 
handling for apr_sockaddr_ip_getbuf(), minor code style tweaks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1365029 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-24 13:01:13 +00:00
Joe Orton
1e73116ec5 * modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Fix memory 
leak/thread-unsafe use of pconf.

Submitted by: rpluem, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1365020 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-24 12:54:38 +00:00
Joe Orton
6c41025260 Fix handling of ProxyBlock if a forward proxy is configured, and fix 
mod_proxy_connect to avoid an inappropriate DNS lookup:

* modules/proxy/proxy_util.c (ap_proxy_checkproxyblock): Take hostname
  argument, make address argument optional.  Check names against
  hostname arg, omit if addr not given.
  (ap_proxy_determine_connection): Adjust for the above; pass hostname
  from URI not the next hop.

* modules/proxy/mod_proxy_ftp.c (proxy_ftp_handler): Adjust for
  ap_proxy_checkproxyblock change.

* modules/proxy/mod_proxy_connect.c (proxy_connect_handler): Adjust
  similarly, and avoid the DNS lookup on the request-URI hostname if a
  proxy is used.

* include/ap_mmn.h: Bump MMN.

PR: 43697


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1365001 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-24 12:17:00 +00:00
Jeff Trawick
58c1a25a96 mod_lbmethod_heartbeat, mod_heartmonitor: Respect DefaultRuntimeDir/ 
DEFAULT_REL_RUNTIMEDIR for the heartbeat storage file.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1364695 13f79535-47bb-0310-9956-ffa450edef68
 2012-07-23 16:01:43 +00:00