www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Code Activity
22,624 Commits 62 Branches 304 Tags
a03bcce31d66aac6556a5160b51f9c9643f61b29
Commit Graph

304 Commits

Author SHA1 Message Date
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take 
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
 2010-06-06 16:59:50 +00:00
William A. Rowe Jr
380a1e9d08 Correct bogus code; stack alloc of variable length is not portable from C++. 
And look, there's an apr for that.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@931432 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-07 04:39:43 +00:00
Jeff Trawick
6f4c170986 small style tweaks to r930125 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930254 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-02 12:19:22 +00:00
Nick Kew
9c1c3f56d4 Proxy balancer: support setting error status according to 
HTTP response code from a backend.
PR 48939 [Daniel Ruggeri <DRuggeri primary.net>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@930125 13f79535-47bb-0310-9956-ffa450edef68
 2010-04-01 22:48:38 +00:00
Graham Leggett
481e0cadf6 mod_proxy: Tone down a warning message that appears when the same backend 
website is reverse proxied two or more times into the frontend URL space.
PR: 48947


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@925850 13f79535-47bb-0310-9956-ffa450edef68
 2010-03-21 18:18:38 +00:00
Takashi Sato
92cf9b940e Move ProxyFtpDirCharset from mod_proxy to mod_proxy_ftp. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894526 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-30 00:51:46 +00:00
Takashi Sato
255f44600c Move AllowCONNECT from mod_proxy to mod_proxy_connect. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@894425 13f79535-47bb-0310-9956-ffa450edef68
 2009-12-29 15:39:54 +00:00
Stefan Fritsch
3fa2c0e208 Allow ProxyPreserveHost to work in <Proxy> sections 
PR: 34901


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@824072 13f79535-47bb-0310-9956-ffa450edef68
 2009-10-11 13:38:51 +00:00
Jean-Frederic Clere
48ae3d9efa Allow the load balancing method to "create" workers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@774400 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-13 15:27:05 +00:00
Jim Jagielski
9399483e16 optimize.... rp! :) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771976 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-05 19:29:04 +00:00
Jean-Frederic Clere
a29e9ec1d5 Change the order of mod_proxy and mod_proxy_balancer child_init(). 
Change the balancer workers area to the address of workers instead copying the workers.
Arrange lbmethod accordingly.
Move the creation of conf->forward worker to mod_proxy child_init().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771940 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-05 17:15:48 +00:00
William A. Rowe Jr
b73558950e Simple style fix, this message still is nonsensical 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@771390 13f79535-47bb-0310-9956-ffa450edef68
 2009-05-04 18:35:40 +00:00
Jean-Frederic Clere
fb49467b16 Prevent key=value being accepted as url. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@770293 13f79535-47bb-0310-9956-ffa450edef68
 2009-04-30 15:43:34 +00:00
Ruediger Pluem
01d3b428ea * Set the error time if we set a worker in error mode. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@734703 13f79535-47bb-0310-9956-ffa450edef68
 2009-01-15 13:44:23 +00:00
Paul Querna
1e06b62d69 Add configuration of the Flush provider for mod_proxy_fdpass. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@725946 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-12 08:46:47 +00:00
Paul Querna
f47b6f394e Import the core parts of the DTrace patch. This is a modified and updated 
version of what was submited by Theo before:
 <http://mail-archives.apache.org/mod_mbox/httpd-dev/200805.mbox/%3C6AFBCFE8-4CCA-4A02-8A43-F9170689695D@omniti.com%3E>

Note, this does not hook it up into the build system at this time, because
the original patch was a little too creative there.

Submitted By: Theo Schlossnagle <jesus omniti.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@723565 13f79535-47bb-0310-9956-ffa450edef68
 2008-12-05 03:34:52 +00:00
Jim Jagielski
6a9e00043c Ummm why bother setting vars if we are bailing? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@710218 13f79535-47bb-0310-9956-ffa450edef68
 2008-11-03 23:19:54 +00:00
Jim Jagielski
e1ed6484fd Fix the io buffersize code. Have the docs match the code 
and allow more flexibility in settings. Also, document
the ProxyPass/worker options of io and rec buffersize.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707357 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-23 12:01:53 +00:00
Ruediger Pluem
81c73ca116 * Move ap_timeout_parameter_parse from mod_proxy.c to server/util.c and thus 
make it part of the public API.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@707022 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-22 10:23:52 +00:00
Ruediger Pluem
1c99da5d39 * Add the possibility to set the worker parameters connectiontimeout and ping 
in milliseconds and the parameter acquire in seconds.
  Add the new currently static function ap_timeout_parameter_parse that
  should become a general utility function once its API is hammered out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@705005 13f79535-47bb-0310-9956-ffa450edef68
 2008-10-15 19:43:51 +00:00
Jim Jagielski
4a268cc90a Allow for the smax param to be 0, so that all connections 
are available to be dropped, should they be idle long
enough.
PR 43371


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@697093 13f79535-47bb-0310-9956-ffa450edef68
 2008-09-19 13:43:48 +00:00
Jim Jagielski
45c5291a7f Allow determination of whether to use ';' as 
a sticky session path delim/sep (ala mod_jk) to
be runtime (and balancer-wise) configurable.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@687754 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-21 13:33:32 +00:00
Jim Jagielski
624be7ab95 typo 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@686779 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-18 15:04:33 +00:00
Ruediger Pluem
b4e20c8e55 * Add the possibility to set a separate connection timeout for backend 
workers.

PR: 45445
Submitted by: rahul <rahul sun.com>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@684341 13f79535-47bb-0310-9956-ffa450edef68
 2008-08-09 20:52:46 +00:00
Jim Jagielski
3cb64b009a Use what we have. This logic belongs here anyway... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645807 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-08 09:25:57 +00:00
Paul Querna
a324a1d72f Remove all references to CORE_PRIVATE. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645455 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-07 10:45:43 +00:00
William A. Rowe Jr
a8d0009e5c If you study all of the directive implementations, you'll note 
that we get less than 20% of the NOT_IN_LIMIT rules correct.

<Limit > works in about 4 directive contexts and yet, we ignore
this fact for 100's of directives.  Simply eliminate this
nonsense in anticipation of a 100% solution.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645189 13f79535-47bb-0310-9956-ffa450edef68
 2008-04-06 00:42:21 +00:00
Martin Kraemer
e9ffd3136c When sending a proxy request of the form 
GET http://[3ffe:1:1001:3000:230:5ff:fe05:3c3c]/server-status HTTP/1.0
through the httpd-2.x mod_proxy.c code, while a directive
  ProxyDomain .my.dom.ain
is in effect, the request is redirected to
  Location: http://[3ffe:1:1001:3000:230:5ff:fe05:3c3c.my.dom.ain]/server-status

The patch fixes this bug, by testing whether the hostname part of the
unparsed_uri contains colon characters (which is the case only for
IPv6 literals).

This patch is also a candidate for httpd-2.0 and httpd-2.2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@632304 13f79535-47bb-0310-9956-ffa450edef68
 2008-02-29 12:15:56 +00:00
Ruediger Pluem
fa35773888 * Do not retry a direct connection if the request has a request body 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@631735 13f79535-47bb-0310-9956-ffa450edef68
 2008-02-27 21:35:39 +00:00
Jim Jagielski
d1858ec213 Add in mod_jk's disablereuse analog for mod_proxy. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@627728 13f79535-47bb-0310-9956-ffa450edef68
 2008-02-14 12:55:57 +00:00
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