www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-15 11:36:47 +03:00
Code Activity
26,699 Commits 62 Branches 306 Tags
aa4947bf64ef0b29c8d93557460c19086a60cf42
Commit Graph

9082 Commits

Author SHA1 Message Date
Rainer Jung
9f3e0671fd mod_proxy_ajp: Fix get_content_length(). 
clength in request_rec is for response sizes,
not request body size. It is initialized to 0,
so the "if" branch was never taken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1649043 13f79535-47bb-0310-9956-ffa450edef68
 2015-01-02 14:28:39 +00:00
Mike Rumph
98efe0ccb1 Fix some spelling errors in mod_proxy_fcgi comments. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1648557 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-30 17:43:59 +00:00
Eric Covener
c54599cf61 PR 56603: Inappropiate ProxyPassReverse match when interpolated URL 
is empty string 

Submitted By: <ajprout hotmail.com>
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1648433 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-29 21:05:56 +00:00
Daniel Ruggeri
cded18be8c Add class attributes for empty descriptions 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1648201 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-28 13:43:25 +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
d77e7a6885 provide alternative PATH_INFO calculation options for proxy_fcgi. 
PR 55329



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1647035 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-20 18:45:23 +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
Eric Covener
2af6b8f57f Allow (a hokey) opt-in to connection reuse for mod_proxy_fcgi + TCP. 
Connection reuse has been disabled since r1032345 at the end of
2011. 

Attempt to reverse the polarity of the connection reuse doc which
has been wrong for a long time.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1647005 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-20 15:38:27 +00:00
Eric Covener
727a07d553 tweak SCRIPT_FILENAME passed to fastcgi backends when a balancer is used. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1646724 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-19 14:03:52 +00:00
Ruediger Pluem
bcf652f6fc * Fix If-Match handling: 
- We need to fail if we do NOT match.
  - ETag comparison only makes sense if we have an ETag

PR: 57358
Submitted by: Kunihiko Sakamoto <ksakamoto google.com>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1646282 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-17 15:39:15 +00:00
Ruediger Pluem
ab1523a721 * Return NULL instead of an empty string as ssl_var_lookup_ssl does by default. Thanks for the pointer Christophe 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1645670 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-15 14:57:52 +00:00
Jeff Trawick
c5062591f9 Fix extraction of an SCT list from a stapled OCSP response. 
The hard-coded 2 byte offset to get to the list (in lieu of
the proper logic) didn't survive the addition of the SCT
from an additional log.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1645546 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-15 01:37:40 +00:00
Jeff Trawick
8e416f19be ssl_io_filter_handshake(): When a post-handshake check fails, 
return an error code understood by ssl_io_filter_error().

That function needs to perform error handling, and a valid
apr_status_t needs to be returned up.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1645529 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-14 21:48:25 +00:00
Yann Ylavic
0c5d74a177 mod_proxy: don't add the default port to the name of proxy workers. PR 57259. 
ap_proxy_port_of_scheme() knows more default ports than apr_unparse_uri().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1644503 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-10 18:45:24 +00:00
Yann Ylavic
d35b8319c0 * mod_ssl: Fix renegotiation failures redirected to an ErrorDocument. PR 57334. 
When this occurs, the redirect (internal) request reaches ssl_hook_Access()
and make SSL_do_handshake crash probably because we force the renegotiation
based on an incomplete SSL state.

To avoid this, ssl_hook_Access() now returns FORBIDDEN immediatly if the given
SSL connection is not in a valid (handshaken) state.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1644498 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-10 18:06:55 +00:00
Gregg Lewis Smith
7ffd981a56 Added include path for Windows build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1644245 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-09 23:55:22 +00:00
Jan Kaluža
ae9b5862f6 * mod_proxy_fcgi: Follow up to r1640495. Ignore body data from backend 
for 304 responses also when read with the header.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1644031 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-09 11:39:57 +00:00
Eric Covener
3ec0da5912 dump fcgi headers with trace8 instead of debug+compile-time flag. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643672 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-07 12:54:52 +00:00
Yann Ylavic
04e5d83e7b mod_proxy_ajp: follow up to r1643537. 
Log aborted client connections with level DEBUG only (no more noise than other proxy modules).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643543 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-06 15:36:19 +00:00
Yann Ylavic
c4bea1a2b6 * mod_proxy_ajp: Fix client connection errors handling and logged status 
when it occurs.  PR 56823.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643537 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-06 14:33:52 +00:00
Christophe Jaillet
a3f6c09230 Synch trunk with 2.4.x. 
In r1588495, additionnal logging has been added to 2.4.x as part of the merge.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643434 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 21:06:31 +00:00
Daniel Gruno
918199724a now it's actually fixed (The URL) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643272 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:33:10 +00:00
Daniel Gruno
08a314456f fixed it! 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643271 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:32:00 +00:00
Daniel Gruno
3d61019b90 another blank commit... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643269 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:29:37 +00:00
Daniel Gruno
4d26c4006b another blank change, ignore. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643265 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:08:16 +00:00
Daniel Gruno
320ddfecdb more blank changes to set up viewvc, ignore. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643263 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 13:02:10 +00:00
Daniel Gruno
8916eba91a blank change to test commit mail URL is properly working. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643258 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 12:49:23 +00:00
Daniel Gruno
e27d5d9480 testing eu <-> us sync 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643147 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 01:28:25 +00:00
Daniel Gruno
d28e6f8a30 more noise again 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643146 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 01:06:05 +00:00
Daniel Gruno
3d429ab1e3 more tests 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643142 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 00:40:04 +00:00
Daniel Gruno
c66f9774c9 bit more noise... (still testing) 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643141 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-05 00:22:44 +00:00
Daniel Gruno
2c70fbc07c more tests 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643137 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-04 23:58:51 +00:00
Daniel Gruno
f4dfabcd1b trying eu svn... 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643130 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-04 23:51:16 +00:00
Daniel Gruno
ff8c2ca60b More dead birds in the sky...is it summer already? 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643129 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-04 23:48:28 +00:00
Daniel Gruno
a0f2ddbea4 Is it a bird? Is it a plane? Is it a giant flying pony??! 
No, it's simply mod_lua >_>
(also, ignore this, we're just testing whether commits work)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1643127 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-04 20:29:16 +00:00
Christophe Jaillet
6b6f5649ab Fix curly braces style 
Remove useless empty lines

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1642803 13f79535-47bb-0310-9956-ffa450edef68
 2014-12-02 07:17:12 +00:00
Eric Covener
38535f55b1 *) SECURITY: CVE-2014-8109 (cve.mitre.org) 
mod_lua: Fix handling of the Require line when a LuaAuthzProvider is
     used in multiple Require directives with different arguments.
     PR57204 [Edward Lu <Chaosed0 gmail.com>]

Submitted By: Edward Lu
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1642499 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-30 01:41:26 +00:00
Eric Covener
838b88e3d0 Remove some instances where a RewriteBase must be specified 
Previously, any time you used a relative substitution in 
per-directory/htaccess context, you needed to specify
a RewriteBase. But in case where the context document root 
and context prefix are known via e.g. mod_userdir
or mod_alias, and the substitution is under the context 
document root, we can determine the replacement automatically.

This makes htaccess files or config snippets a bit more
portable.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1642484 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-29 23:16:56 +00:00
Guenter Knauf
27f17af2a7 Added include path for NetWare build. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1642099 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-27 11:30:54 +00:00
Daniel Gruno
8216b3d0b4 mod_lua: Initial attempt at passing on the configuration tree to Lua. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1641661 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-25 18:04:00 +00:00
Eric Covener
e2fafef499 elaborate on a TRACE2 message about using the default reverse 
proxy worker. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1641636 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-25 15:38:10 +00:00
Eric Covener
668c7200db Return a match whenever we get to the end of the worker name, regardless 
of whether there is URL left.

ProxyPassMatch had been using the default worker in trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1641381 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-24 12:36:32 +00:00
Yann Ylavic
eae7562ac1 mod_reqtimeout: don't extend the timeout in speculative mode, wait for the 
real (relevant) bytes to be asked later, within the currently alloted time.
This applies to blocking reads only since r1621453 already bypassed the
filter for nonblocking ones.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1641376 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-24 11:42:16 +00:00
Jeff Trawick
2c334bcba5 follow up to r1641077: 
one bug was traded for another in r1641077; track the response
length and the cached object length separately to avoid such
confusion


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1641095 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-22 17:54:08 +00:00
Jeff Trawick
70b441b9df mod_ssl: Fix recognition of OCSP stapling responses that are encoded 
improperly or too large.

The one byte "ok" flag stored with the response was accounted for in
the wrong condition.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1641077 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-22 14:51:01 +00:00
Yann Ylavic
b40c9d5167 mod_reqtimeout: revert r1640758. 
Unexpected functional change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640823 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-20 21:38:53 +00:00
Yann Ylavic
a952fd276f mod_reqtimeout: avoid unnecessary calls to apr_socket_timeout_set(). 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640758 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-20 15:39:32 +00:00
Jan Kaluža
a9831ff12f * mod_proxy_fcgi: Ignore body data from backend for 304 responses. PR 57198. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640495 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-19 07:19:13 +00:00
Yann Ylavic
7e2dd53161 mod_authnz_fcgi: we don't need to add the trailing '\0' to parse response headers since r1640036. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640345 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-18 13:53:24 +00:00
Yann Ylavic
f9520fec08 mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error 
when parsing or forwarding the response fails.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640040 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-16 22:25:32 +00:00