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
26,790 Commits 62 Branches 306 Tags
25a2e41ea7e474100375986de0a0d792ff8094de
Commit Graph

9110 Commits

Author SHA1 Message Date
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
Yann Ylavic
54f0797498 mod_proxy_fcgi: SECURITY: CVE-2014-3583 (cve.mitre.org) 
Fix a potential crash with response headers' size above 8K.

The code changes to mod_authnz_fcgi keep the handle_headers()
function in sync between the two modules.  mod_authnz_fcgi
does not have this issue because it allocated a separate byte
for terminating '\0'.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640036 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-16 22:04:39 +00:00
Yann Ylavic
31e1a51f0f Revert r1638818, r1639812, r1639717 and r1639814 for new staging. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1640034 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-16 21:52:40 +00:00
Yann Ylavic
adf6a11dd1 mod_authnz_fcgi: follow up to r1639717. 
Let ap_scan_script_header*() validate the headers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639814 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-15 00:37:13 +00:00
Yann Ylavic
e472402601 mod_proxy_fcgi: follow up to r1638818. 
Let ap_scan_script_header*() validate the headers.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639812 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-15 00:35:37 +00:00
Yann Ylavic
2e5c23a872 mod_authnz_fcgi: Fix a potential crash with response headers' size above 8K. 
(similar to r1638818 for mod_proxy_fcgi).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1639717 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-14 18:18:15 +00:00
Yann Ylavic
02e736ae5a mod_proxy_fcgi: CVE-2014-3583: Fix a potential crash with response headers' 
size above 8K.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638818 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-12 15:41:07 +00:00
Jan Kaluža
4f2fb6d486 * mod_ssl: call ERR_free_strings() with OpenSSL >= 0.9.8e. Fixes memory leak 
in mod_ssl on graceful restart. PR 53435.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638772 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-12 12:27:09 +00:00
Christophe Jaillet
08c20e7f58 tab vs space 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638412 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-11 21:16:11 +00:00
Christophe Jaillet
27d1e6ea19 Fix style 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638188 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-11 15:40:06 +00:00
Christophe Jaillet
77a1c29551 Fix indent. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638159 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-11 15:20:49 +00:00
Jan Kaluža
20fd477118 mod_auth_basic: Fix comment mentioning 403 instead of 401. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1638072 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-11 12:00:17 +00:00
Eric Covener
25c47738cf Resolve rashes with LDAP authz and non-LDAP authn since r1608202. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1637990 13f79535-47bb-0310-9956-ffa450edef68
 2014-11-10 22:43:53 +00:00
Yann Ylavic
a7becdbf75 mod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read 
determine whether it is a normal close or a real error. PR 57168.

Abort the client or backend connection on polling errors, but don't forcibly
abort the client side at the end (the core filters will do that otherwise
when necessary), so that lingering close and SSL shutdown can occur on normal
close.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1635645 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-31 00:07:06 +00:00
Yann Ylavic
6d40a34636 mod_proxy_wstunnel: abort backend connection on polling error to avoid 
further processing (lingering close, SSL shutdown).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1635644 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-30 23:56:27 +00:00
Eric Covener
3eddd534ce When using EBCDIC encoding, HTTPS through ProxyPass and ProxyRemote doesn't 
work correctly. PR 57092

Submitted By: Edward Lu 
Committed By: covener



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1634425 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-27 00:55:20 +00:00
Eric Covener
94c4cc461f fix another case of 304 response sent to an unconditional request 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1634237 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-25 17:45:30 +00:00
Ruediger Pluem
26848f7a23 * Use the correct server name for SNI in case the backend SSL connection itself 
is established via a proxy server.

PR: 57139
Submitted by: Szabolcs Gyurko <szabolcs gyurko.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1634120 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-24 19:00:10 +00:00
Christophe Jaillet
10ab77117b tab vs space 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1633531 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-22 05:25:23 +00:00
Christophe Jaillet
00e4c4fbc9 tab vs space 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1633530 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-22 05:25:02 +00:00
Christophe Jaillet
5f064a8acc tab vs space 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1633529 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-22 05:24:05 +00:00
Christophe Jaillet
46b8fcedc9 Fix indent. 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1633522 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-22 04:54:52 +00:00
Jan Kaluža
d8fd328cfb mod_ssl: Fix SSL_CLIENT_VERIFY value when "SSLVerifyClient optional_no_ca" and 
SSLSessionCache are used and SSL session is resumed. SSL_CLIENT_VERIFY value
has been set to SUCCESS on resumption even when originally it was set to
GENEROUS. PR 53193.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1633085 13f79535-47bb-0310-9956-ffa450edef68
 2014-10-20 09:18:22 +00:00