www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity
34,177 Commits 62 Branches 304 Tags
trunk
Commit Graph

474 Commits

Author SHA1 Message Date
Jim Jagielski
95250416e7 style check 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@608189 13f79535-47bb-0310-9956-ffa450edef68
 2008-01-02 19:23:32 +00:00
William A. Rowe Jr
e5661d3734 Introduce the ProxyFtpDirCharset directive, allowing the administrator 
to identify a default, or specific servers or paths which list their
contents in other-than ISO-8859-1 charset (e.g. utf-8).

Submitted by: Ruediger Pluem



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607638 13f79535-47bb-0310-9956-ffa450edef68
 2007-12-31 01:13:43 +00:00
Nick Kew
bafefdd617 Update the patch for environment variable interpolation in 
ProxyPass/Reverse/etc directives: r421686, r422178, r421686, r421725
That patch stalled on wrowe's veto.  This update introduces a new
"interpolate" keyword to all directives affected, so should meet
his concerns by adding explicit per-directive control (disabled
by default).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@589371 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-28 15:49:03 +00:00
Nick Kew
785b0379d6 mod_proxy: add "nocanon" keyword to ProxyPass, to suppress 
URI-canonicalisation in a reverse proxy.
PR 41798


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@588791 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-26 23:07:22 +00:00
Nick Kew
d8501971c7 Default to NOT setting Max-Forwards in violation of RFC2616 
Leave old behaviour as a configuration option (ProxyMaxForwards)
PR 16137


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@581117 13f79535-47bb-0310-9956-ffa450edef68
 2007-10-02 00:39:43 +00:00
Nick Kew
7304e6f26f Failing to load a protocol handler is a server error, not a forbidden. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@575996 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-15 22:36:36 +00:00
Jean-Frederic Clere
6079ae7aef Remove useless variable. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@574877 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-12 10:11:54 +00:00
Jean-Frederic Clere
cb6949285d lb_score is bigger proxy_worker_stat. Prevent wasting space. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@574843 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-12 08:34:40 +00:00
Jim Jagielski
5437e234f7 Maintain the illusion. It's not worth my time or 
energy to care about this anymore.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@574269 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-10 14:54:01 +00:00
Jim Jagielski
095f3c8e64 Reinsert extern int PROXY_DECLARE_DATA proxy_lb_workers 
into the Proxy API. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@574052 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-09 19:31:46 +00:00
Jim Jagielski
0703f437c0 Reinstate the lb_score patch, but, protect against 
conflicting leakage as per jfc proposal.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@573569 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-07 13:13:37 +00:00
André Malo
42bb0116dd as not everyone needs sticky sessions - avoid segfault in balancer manager and 
mod_status


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@572832 13f79535-47bb-0310-9956-ffa450edef68
 2007-09-04 23:09:24 +00:00
Nick Kew
8de9bb913e mod_proxy: Add Proxypass status option to ignore errors 
PR 43167.  Patch by Francisco Gimeno


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571338 13f79535-47bb-0310-9956-ffa450edef68
 2007-08-30 23:06:00 +00:00
Jean-Frederic Clere
a0c15d9c9b Fix the warning: 
mod_proxy.c:284: warning: passing argument 1 of 'ap_strchr' discards qualifiers from pointer target type
Thanks Joe for catch it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551935 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-29 16:08:24 +00:00
Jean-Frederic Clere
3fe0224692 Don't display "PHPSESSIONID | PHPSESSIONID" but only 
"PHPSESSIONID".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551126 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-27 11:39:03 +00:00
Jean-Frederic Clere
9e567f96de Remove the balancer modification logic of balancer-manager 
because it can't work. And add the sticky_path to the
sticky display.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@551099 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-27 08:42:02 +00:00
Jean-Frederic Clere
4dee811cb9 Add sticky_path to solve PR41897. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@550519 13f79535-47bb-0310-9956-ffa450edef68
 2007-06-25 14:42:25 +00:00
Jim Jagielski
09c3cbe87b Fold in ProxyPassMatch directive with docs. Support 
full regex substitution but also allow for "simple"
cases (ala JkMount) to work as well.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@537599 13f79535-47bb-0310-9956-ffa450edef68
 2007-05-13 15:28:29 +00:00
Jim Jagielski
5fdd230cc1 Add regex pattern matching to ProxyPass, allowing, 
for example:

   ProxyPass ~ \.gif balancer://imagecluster




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@537429 13f79535-47bb-0310-9956-ffa450edef68
 2007-05-12 14:12:24 +00:00
Nick Kew
d14f70a89f Return METHOD_NOT_ALLOWED, not FORBIDDEN, to a TRACE request when 
TraceEnable is Off.  This agrees with our documentation, and with
our Allow: header in response to OPTIONS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@507526 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-14 13:34:38 +00:00
Nick Kew
45c507dd7c Patch for PR#11540 (submitted by Stuart Children) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@507516 13f79535-47bb-0310-9956-ffa450edef68
 2007-02-14 12:56:49 +00:00
Mladen Turk
6a68c112dc Enable retry=0 for the worker. 
This allows to have an option to always retry
the workers in error state instead using a
specified time.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@451575 13f79535-47bb-0310-9956-ffa450edef68
 2006-09-30 10:41:51 +00:00
Ruediger Pluem
ef038e0617 * Print the correct error message for erroneous configured ProxyPass directives. 
PR: 40439
Submitted by: serai lans-tv.com
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@441947 13f79535-47bb-0310-9956-ffa450edef68
 2006-09-10 12:37:21 +00:00
Joe Orton
b3265c64fb * modules/proxy/mod_proxy.c (proxysection): Fix another strchr() warning. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428291 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-03 09:33:35 +00:00
Mladen Turk
78f6ef0859 Allow optional name=value options within <Proxy 
section line. Additional arguments are allowed
only for 'standard' url's, meaning that the wildchar
urls will return error like before.
This allow to specify the worker/balancer parameters
on the definition line, without the need for extra
ProxySet options.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427928 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-02 07:59:47 +00:00
Mladen Turk
20a4dc5137 Enable ProxySet inside <Proxy> section to 
create balancer or worker if they were not
already created.
This allows to have ProxySet directive before
BalancerMember directives inside Proxy section.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427920 13f79535-47bb-0310-9956-ffa450edef68
 2006-08-02 06:54:01 +00:00
Jim Jagielski
61a56451a3 Add in a very simple balancer "set" concept, which allows 
for members to be assigned to a particular cluster set
such that members in lower-numbered sets are checked/used
before those in higher ones.

Also bundled in this are some HTML cleanups for the balancer
manager UI. Sorry for the mixins :)

Compiles/builds clean: passes test framework as well
as more normal usage tests ;)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427172 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-31 17:01:40 +00:00
Mladen Turk
4fd2c57da0 Added cping/cpong support for the AJP protocol. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425454 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-25 16:50:07 +00:00
Nick Kew
a3f4adfa28 Use <string.h>-compatible versions of ap_str* functions. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@422178 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-15 08:39:41 +00:00
Jim Jagielski
58c0a69c7b Don't down cast 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421959 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-14 17:34:59 +00:00
Nick Kew
346c6c3e76 Support environment variable interpolation in reverse proxy configuration 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421686 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-13 19:00:26 +00:00
Jean-Frederic Clere
2afcfcfe6d Issue a warning when the same worker name is reused. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421252 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-12 12:08:36 +00:00
Jim Jagielski
0b80babf0b Add in hot-standby balancer member. If all other members 
are disabled or not-usable, ONLY THEN will the hot
standby's be used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420986 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:39:38 +00:00
Roy T. Fielding
de659cbed0 update license header text 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
 2006-07-11 20:33:53 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
 2006-04-19 12:11:27 +00:00
Jim Jagielski
dede56b14d Document the removal of the flushing bandaid to a 
runtime param. Since other protocols might benefit
from this, remove the ajp_ prefixes, to make it
more generic looking.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@390210 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-30 18:32:53 +00:00
Jim Jagielski
391472a050 Make AJP flushing admin configurable. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@384580 13f79535-47bb-0310-9956-ffa450edef68
 2006-03-09 18:39:16 +00:00
Ruediger Pluem
06c6bde4c6 * revert r355823 and r355837 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355853 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-11 01:28:13 +00:00
Ruediger Pluem
614df45f1e * Move handling of backends that broke after the headers have been sent 
into the proxy handler of mod_proxy.

  This patch still sets r->connection->aborted to 1 which is currently
  vetoed by Roy. Moving it from the scheme handler to the proxy handler
  should ease the reimplementation of this, as the scheme handlers only
  needs to return PROXY_BACKEND_BROKEN to signal the above situation to
  the proxy handler.

  mod_proxy.h: Add define for PROXY_BACKEND_BROKEN
  mod_proxy.c: Handle PROXY_BACKEND_BROKEN in proxy handler
  mod_proxy_http.c: Sent back PROXY_BACKEND_BROKEN if backend broke
  after we sent the headers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@355823 13f79535-47bb-0310-9956-ffa450edef68
 2005-12-11 00:15:27 +00:00
Jeff Trawick
3a67f28030 Fix typo in ProxyStatus syntax error message. 
Submitted by: Christophe Jaillet <christophe.jaillet wanadoo.fr>
Reviewed by:  trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@344491 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-16 01:31:44 +00:00
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also 
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
 2005-11-10 15:11:44 +00:00
Ruediger Pluem
00933409fe * Fix PR36906 by not lower caseing the whole worker name. Only lower case the 
schema when storing the worker url. Thus preventing case sensitive URI's in
  BalancerMembers to get broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@328463 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-25 19:54:11 +00:00
Ruediger Pluem
16051d9681 * run the request_status hook in proxy_handler if HTTP_SERVICE_UNAVAILABLE 
is returned by ap_proxy_pre_request.

Suggested by: Brian Akins <brian.akins turner.com>, Mladen Turk
Reviewed by: Jim Jagielski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@293123 13f79535-47bb-0310-9956-ffa450edef68
 2005-10-02 14:32:35 +00:00
Joe Orton
8df46b6dd6 * modules/proxy/mod_proxy_balancer.c (balancer_handler): Fix gcc 
warning; no functional change.

* modules/proxy/mod_proxy.c (set_balancer_param): Likewise.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279973 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-10 09:10:27 +00:00
Jim Jagielski
22c5cb4728 Proxy balancer lbmethods are now registered as providers and not 
via hooks. Move various find() functions back to mod_proxy_balancer
where they belong :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279752 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-09 12:28:02 +00:00
Jim Jagielski
54bb998b3a Minor nit. Methods are server-wide, so simply use the base version table. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279319 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-07 13:14:16 +00:00
Jim Jagielski
da3e833d30 Restruct of lbmethod find-best algo's, bypassing hook mechanism. 
Looking into provider method, but until then... Prevent core dump
when balancer not in vhosts


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279305 13f79535-47bb-0310-9956-ffa450edef68
 2005-09-07 12:04:15 +00:00
Jim Jagielski
a7d488a6d2 simple, functional interface to add additional balancer lb selection methods 
without requiring code changes to mod_proxy/mod_proxy_balancer;
these can be implemented via sub-modules now.

Let the games begin...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@232282 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-12 12:47:04 +00:00
Nick Kew
9d7b5928db Fix build error from cut&paste 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231501 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-11 18:52:16 +00:00
Nick Kew
d153de58fe Fix ProxyPassReverse & family to work correctly in <Location> 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231355 13f79535-47bb-0310-9956-ffa450edef68
 2005-08-10 23:36:39 +00:00