1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Commit Graph

27189 Commits

Author SHA1 Message Date
Lucien Gentis
2a7d2f0ce3 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685412 13f79535-47bb-0310-9956-ffa450edef68
2015-06-14 15:35:20 +00:00
Lucien Gentis
cd862b116b XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685411 13f79535-47bb-0310-9956-ffa450edef68
2015-06-14 15:32:05 +00:00
Yann Ylavic
12612bb015 Follow up to r1685349: remove a tab.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685350 13f79535-47bb-0310-9956-ffa450edef68
2015-06-14 00:55:10 +00:00
Yann Ylavic
dd369dd7fc Follow up to r1685345: CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685349 13f79535-47bb-0310-9956-ffa450edef68
2015-06-14 00:53:13 +00:00
Yann Ylavic
292da9775a Follow up to r1685345: don't accept spaces *before* the chunk-size.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685347 13f79535-47bb-0310-9956-ffa450edef68
2015-06-14 00:24:30 +00:00
Yann Ylavic
8b96b3b3ce Follow up to r1684513: allow spaces before and after chunk-size.
Slightly modified version of trawick's proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685345 13f79535-47bb-0310-9956-ffa450edef68
2015-06-13 23:35:04 +00:00
Yann Ylavic
3515c0c8d1 Follow up to r1684513: apply missing changes voted on security@.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685339 13f79535-47bb-0310-9956-ffa450edef68
2015-06-13 22:24:22 +00:00
Lucien Gentis
c5c99b9d41 Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685269 13f79535-47bb-0310-9956-ffa450edef68
2015-06-13 15:11:05 +00:00
Lucien Gentis
73ded938f1 XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685268 13f79535-47bb-0310-9956-ffa450edef68
2015-06-13 15:09:58 +00:00
Yann Ylavic
bf339b65d6 Follow up to r1685052: reduce log level to INFO.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685097 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 14:58:58 +00:00
Yann Ylavic
24f248a77a Follow up to r1685052: use retained data pattern instead,
as suggested by trawick.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685078 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 12:31:13 +00:00
Yann Ylavic
33d6aaf455 http, mod_ssl: Introduce and return the 421 (Misdirected Request) status code
for clients requesting a hostname on a reused connection whose SNI (from the
TLS handshake) does not match.
PR 5802.

This allows HTTP/2 clients to fall back to a new connection as per:
https://tools.ietf.org/html/rfc7540#section-9.1.2

Proposed by: Stefan Eissing <stefan eissing.org>
Reviewed by: ylavic


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685069 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 11:33:22 +00:00
Yann Ylavic
488f6e0459 mod_ssl: Warn about deprecated SSLCertificateChainFile once at startup,
on first usage only.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1685052 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 09:07:34 +00:00
Nick Kew
a691e368a3 mod_substitute: Fix configuraton merge order.
PR 57641 [Marc.Stern]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684900 13f79535-47bb-0310-9956-ffa450edef68
2015-06-11 14:22:21 +00:00
Jan Kaluža
8153365579 * mod_auth_digest: Use anonymous shm by default, fall back on name-based.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684636 13f79535-47bb-0310-9956-ffa450edef68
2015-06-10 10:43:54 +00:00
William A. Rowe Jr
db81019ab8 SECURITY: CVE-2015-3185 (cve.mitre.org)
Replacement of ap_some_auth_required (unusable in Apache httpd 2.4)
with new ap_some_authn_required and ap_force_authn hook.

Submitted by: breser


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684524 13f79535-47bb-0310-9956-ffa450edef68
2015-06-09 20:41:28 +00:00
William A. Rowe Jr
a6027e5692 Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
authorized characters.

Submitted by: Yann Ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684513 13f79535-47bb-0310-9956-ffa450edef68
2015-06-09 20:12:31 +00:00
Christophe Jaillet
3f385894c2 Add compatibility note.
Turn some tabs into space.
Remove some useless <br /> in <highlight> blocks. (this was causing some additionnal blank lines at the end of some examples)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684313 13f79535-47bb-0310-9956-ffa450edef68
2015-06-09 05:08:20 +00:00
Christophe Jaillet
5d348e7855 Add compatibility note
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684311 13f79535-47bb-0310-9956-ffa450edef68
2015-06-09 04:33:24 +00:00
Yann Ylavic
10806f5db1 mod_ssl: when SSLVerify is disabled (NONE), don't force a renegotiation if
the SSLVerifyDepth applied with the default/handshaken vhost differs from
the one applicable with the finally selected vhost.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684171 13f79535-47bb-0310-9956-ffa450edef68
2015-06-08 12:25:22 +00:00
Yann Ylavic
2e15d780b5 mpm_event: Follow up to r1664071: quiet compiler (spurious) warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1684057 13f79535-47bb-0310-9956-ffa450edef68
2015-06-07 18:31:11 +00:00
Lucien Gentis
a5ab62e4be Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683924 13f79535-47bb-0310-9956-ffa450edef68
2015-06-06 15:53:35 +00:00
Lucien Gentis
84fc983089 XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683923 13f79535-47bb-0310-9956-ffa450edef68
2015-06-06 15:51:34 +00:00
Christophe Jaillet
38f1949593 Save a few bytes in conf pool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683884 13f79535-47bb-0310-9956-ffa450edef68
2015-06-06 05:59:49 +00:00
Christophe Jaillet
1333dc54c5 Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683883 13f79535-47bb-0310-9956-ffa450edef68
2015-06-06 05:45:04 +00:00
Christophe Jaillet
d3dd3183e1 Save a few bytes in conf pool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683881 13f79535-47bb-0310-9956-ffa450edef68
2015-06-06 05:35:22 +00:00
Jeff Trawick
784bd3a524 mod_proxy_scgi upgraders likely need to set proxy-scgi-pathinfo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683198 13f79535-47bb-0310-9956-ffa450edef68
2015-06-02 23:35:23 +00:00
Yann Ylavic
e4aaa17ae3 CHANGES: Remove backported entries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683127 13f79535-47bb-0310-9956-ffa450edef68
2015-06-02 15:20:34 +00:00
Yann Ylavic
30c166fcb2 core: Avoid a possible truncation of the faulty header included in the
HTML response when LimitRequestFieldSize is reached.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683123 13f79535-47bb-0310-9956-ffa450edef68
2015-06-02 14:49:32 +00:00
André Malo
029aa8e8d8 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683084 13f79535-47bb-0310-9956-ffa450edef68
2015-06-02 12:16:04 +00:00
André Malo
54066e47fb fix eol-style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683083 13f79535-47bb-0310-9956-ffa450edef68
2015-06-02 12:11:11 +00:00
Christophe Jaillet
bc14023e26 Constify + save a few bytes in conf pool
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683047 13f79535-47bb-0310-9956-ffa450edef68
2015-06-02 05:54:58 +00:00
Christophe Jaillet
a9e5a7bd80 Small speed optimization when parsing <Limit>, <LimitExcept> and environment variables
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1683044 13f79535-47bb-0310-9956-ffa450edef68
2015-06-02 05:40:57 +00:00
Christophe Jaillet
dc2bb62c4b Initialize args to not print garbage mem during a RewriteCond parse error (same as r1681795 for RewriteRule)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682988 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 20:10:01 +00:00
Christophe Jaillet
ee0a221cfe Improve style in examples.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682979 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 19:35:25 +00:00
Rainer Jung
3d2e654d36 Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682938 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 15:52:57 +00:00
Rainer Jung
e1530ec89b Fix copy and paste docs error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682937 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 15:50:46 +00:00
Rainer Jung
2a8e50d827 Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682930 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 15:19:39 +00:00
Rainer Jung
f9125046b6 Try to clarify extended uses of SSLCertificateFile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682923 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 15:00:13 +00:00
Yann Ylavic
0b5aeb0f65 mod_proxy: follow up to r1681694.
Handle the proxy-error-override note also in mod_proxy_ajp.

The note is not needed in mod_proxy_fcgi (which also handles
ProxyErrorOverride) since it calls ap_die() by itself, and always
returns OK to proxy_handler().

Add a comment about the note where used.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682907 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 14:06:39 +00:00
Christophe Jaillet
d83f45cee1 Improve error message (related to PR57311 diagnostic)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682819 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 05:45:13 +00:00
Christophe Jaillet
86c204dac3 Concat string at compile time in order to save a few cycles.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682816 13f79535-47bb-0310-9956-ffa450edef68
2015-06-01 05:12:54 +00:00
Eric Covener
af395fada2 PR 57968: Don't lowercase the argument to SetHandler if the handler is
proxy:unix.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682482 13f79535-47bb-0310-9956-ffa450edef68
2015-05-29 14:22:10 +00:00
Jim Jagielski
c08a5eb690 Allow for array of multiple simul requests per connection and
keep track of them (mostly need to worry about when there are
no more requests, but having the list could be useful later on)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682280 13f79535-47bb-0310-9956-ffa450edef68
2015-05-28 17:01:26 +00:00
William A. Rowe Jr
aab0eba576 Clarify the change to the default cipher suite lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1682099 13f79535-47bb-0310-9956-ffa450edef68
2015-05-27 18:59:59 +00:00
Eric Covener
2e4745c7a6 initialize args to not print garbage mem during a RewriteRule parse error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1681795 13f79535-47bb-0310-9956-ffa450edef68
2015-05-26 17:24:13 +00:00
Yann Ylavic
84e8dc5f96 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1681760 13f79535-47bb-0310-9956-ffa450edef68
2015-05-26 13:51:29 +00:00
Yann Ylavic
bd37b0bb11 Follow up to r1676004: revert changes to html files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1681746 13f79535-47bb-0310-9956-ffa450edef68
2015-05-26 12:12:22 +00:00
Yann Ylavic
5cbd1ba7c8 CHANGES: add ALPN entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1681741 13f79535-47bb-0310-9956-ffa450edef68
2015-05-26 11:21:00 +00:00
Yann Ylavic
608a751ad6 mod_proxy: Don't put the worker in error state for 500 or 503 errors
returned by the backend unless failonstatus is configured to.  PR 56925.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1681694 13f79535-47bb-0310-9956-ffa450edef68
2015-05-26 07:25:08 +00:00