www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-05 16:55:50 +03:00
Code Activity
34,172 Commits 62 Branches 304 Tags
trunk
Commit Graph

474 Commits

Author SHA1 Message Date
Jeff Trawick
ec8921b5c3 slight improvement to wording 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1673977 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-15 23:07:58 +00:00
Rainer Jung
9c70146b34 More followon to r1671397 for proxy server-status 
in auto mode:
- remove remaining HTML markup


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672564 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-10 06:55:48 +00:00
Rainer Jung
bc86b132b5 Followon to r1671397 for proxy server-status 
in auto mode:
- don't show HTML legend
- Show correct worker name


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1672466 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-09 19:20:14 +00:00
Rainer Jung
0c12000aed Add output for "?auto" version of server-status 
to proxy status, mod_ssl session cache info,
mod_cache_socache and the status hook of the
individual socache implementations.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1671397 13f79535-47bb-0310-9956-ffa450edef68
 2015-04-05 13:54:22 +00:00
Jan Kaluža
fd61b03b75 * mod_proxy: Allow setting options to globally defined balancer from 
ProxyPass used in VirtualHost. Balancers are now merged using the new
  merge_balancers method which merges the balancers options.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1667707 13f79535-47bb-0310-9956-ffa450edef68
 2015-03-19 11:29:55 +00:00
Yann Ylavic
b26841b8dc mod_proxy(es): Avoid error response/document handling by the core if some 
input filter already did it while reading client's payload.

When an input filter returns AP_FILTER_ERROR, it has already called ap_die()
or at least already responded to the client.

Here we don't want to lose AP_FILTER_ERROR when returning from proxy handlers,
so we use ap_map_http_request_error() to forward any AP_FILTER_ERROR to
ap_die() which knows whether a response needs to be completed or not.

Before this commit, returning an HTTP error code in this case caused a double
response to be generated.

Depends on r1657881 to preserve r->status (for logging) when nothing is to be
done by ap_die() when handling AP_FILTER_ERROR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1657897 13f79535-47bb-0310-9956-ffa450edef68
 2015-02-06 16:54:16 +00:00
Yann Ylavic
1f6fd365c3 mod_proxy: Don't put non balancer-member workers in error state by 
default for connection or 500/503 errors, and honor status=+I for
any error.  PR 48388.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1650028 13f79535-47bb-0310-9956-ffa450edef68
 2015-01-07 10:36:12 +00:00
Eric Covener
23c292e6cd Change the return value to const, so the const non-matching input can just be 
returned.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1647334 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-22 15:39:54 +00:00
Eric Covener
85d1a0ba01 Allow SetHandler+UDS+fcgi to take advantage of dedicated workers including 
opting in to connection reuse and other proxy options (max=, etc).

adds 'enablereuse' proxyoption and a minor MMN bump to share
proxy_desocketfy outside of mod_proxy.c, which is required to
match workers to URLs.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1647009 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-20 15:56:16 +00:00
Jan Kaluža
058348d405 mod_proxy: better check for worker->s->is_name_matchable 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1609688 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 11:09:34 +00:00
Jan Kaluža
c0a52f109d mod_proxy: add ap_proxy_define_match_worker() and use it for ProxyPassMatch 
and ProxyMatch section to distinguish between normal workers and workers
with regex substitutions in the name. Implement handling of such workers
in ap_proxy_get_worker(). PR 43513


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1609680 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-11 10:36:15 +00:00
Christophe Jaillet
55c2568e4e s/apr_pstrndup/apr_pstrmemdup/ to save a few cycles 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1608999 13f79535-47bb-0310-9956-ffa450edef68
 2014-07-09 03:47:31 +00:00
Jim Jagielski
637f263141 revert 1602523, until there is understanding 
about what the actual issue and "requirement" are.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602697 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-15 13:54:55 +00:00
Jim Jagielski
74820dfc57 Allow for "magic" scheme "auto" which makes the scheme of 
the backend worker match whatever the scheme of the
incoming request was...

For example:

   ProxyPass / auto://foo.example.com/

If the incoming request is http:.../lala then
the resultant will be http://foo.example.com/lala

If it's wws:.../lolo then we'd send
wws://foo.example.com/lolo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602523 13f79535-47bb-0310-9956-ffa450edef68
 2014-06-13 21:10:51 +00:00
Ruediger Pluem
a902bda003 * Give ap_proxy_post_request as chance to act correctly on the status code 
by setting r->status temporarily to access_status. r->status might be
  different than access_status e.g. r->status could be HTTP_OK if e.g. we
  override the error page on the proxy or if the error was not generated
  by the backend itself but by the proxy e.g. a bad gateway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1597352 13f79535-47bb-0310-9956-ffa450edef68
 2014-05-24 20:55:52 +00:00
Jim Jagielski
2aa898bb2f strncmp(r->filename, "proxy:", 6) is faster than a 
note. Plus, allows for checking even if not due to
rewrite.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1588544 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-18 19:21:35 +00:00
Jeff Trawick
5512fa1b86 mod_proxy_http: Add detach_backend hook. 
The immediate use is for a SSL-related module which works
on the backend proxy connection to be able to "leak" information
into the client r for logging.

This could be useful with other proxy scheme handlers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1586719 13f79535-47bb-0310-9956-ffa450edef68
 2014-04-11 17:07:18 +00:00
Jim Jagielski
cd304f4964 Allow reverse-proxy to be set via explicit handler 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1573626 13f79535-47bb-0310-9956-ffa450edef68
 2014-03-03 17:28:17 +00:00
Ruediger Pluem
82bb21ba2e * Do not parse URL in case of regular expression as they likely do not follow 
the URL syntax.

PR: 56074


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1564437 13f79535-47bb-0310-9956-ffa450edef68
 2014-02-04 19:36:50 +00:00
Jim Jagielski
72df6b36bf make mod_rewrite and mod_proxy UDS work together... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1560367 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-22 14:54:21 +00:00
Christophe Jaillet
60c47567e5 Oops (fix r1556912) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1556937 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-09 20:19:51 +00:00
Christophe Jaillet
c98522ed33 Add missing break. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1556912 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-09 18:45:34 +00:00
Graham Leggett
4fecd089c4 Add a "MATCH_" prefix to variables set within 
LocationMatch/DirectoryMatch/FilesMatch.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1555266 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-03 22:26:55 +00:00
Eric Covener
758cf25ed9 c89 fix 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554994 13f79535-47bb-0310-9956-ffa450edef68
 2014-01-03 01:54:28 +00:00
Graham Leggett
43e022f007 core: Support named groups and backreferences within the LocationMatch, 
DirectoryMatch, FilesMatch and ProxyMatch directives.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1554300 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-30 19:50:52 +00:00
Christophe Jaillet
d7dd87bf21 Remove <Proxy ~ wildcard-url> syntax which: 
- is equivalent to <ProxyMatch wildcard-url>
   - has never been documented
   - incorrectly checks parameters (!cmd->path should be !cmd->path[0])
   - is buggy (! is missing in front of strncasecmp)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1552227 13f79535-47bb-0310-9956-ffa450edef68
 2013-12-19 04:53:15 +00:00
Jim Jagielski
7634e2e342 UDS urls need to be desockified when configuring... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1540052 13f79535-47bb-0310-9956-ffa450edef68
 2013-11-08 14:30:12 +00:00
Jim Jagielski
43fb7fa32f Eclipse code analysis warning 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1533065 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-17 12:53:53 +00:00
Jim Jagielski
a91c47c2e5 No more magic numbers. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1532746 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-16 12:21:49 +00:00
Jim Jagielski
c984a2e5f3 Ensure that userland format of UDS is the same as how it is 
configured, no matter how we store and use it internally.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531962 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-14 16:12:30 +00:00
Jim Jagielski
0605393196 syntax sugar... if the worker is associated w/ a UDS, 
then make sure the log reporting has a visual clue.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531370 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-11 17:36:24 +00:00
Jim Jagielski
e40e0a785b Reformat the UDS support inline with a new naming structure. 
Use a flag for speed for testing.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1531340 13f79535-47bb-0310-9956-ffa450edef68
 2013-10-11 16:12:41 +00:00
Jim Jagielski
357828f9d2 Allow for a simple socket check in addition to the 
higher level protocol-level checks for backends...

Not sure if it makes sense to do both or not... Comments?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1516930 13f79535-47bb-0310-9956-ffa450edef68
 2013-08-23 16:48:42 +00:00
Jim Jagielski
62ff5813e5 Add in logno's 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1484343 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-19 19:32:59 +00:00
Jim Jagielski
374bf1d928 add in child_init which is needed 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483190 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 04:28:14 +00:00
Jim Jagielski
66b3e65e76 revert... we are good 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483188 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 04:02:38 +00:00
Jim Jagielski
88a8e9ff61 force subpool 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1483176 13f79535-47bb-0310-9956-ffa450edef68
 2013-05-16 03:06:14 +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
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
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
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
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
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
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
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