]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
8 years agoMerge r1777460, r1777672 from trunk:
Yann Ylavic [Tue, 10 Jan 2017 08:07:44 +0000 (08:07 +0000)] 
Merge r1777460, r1777672 from trunk:

http: allow folding in check_headers(), still compliant with RFC 7230 (3.2.4).

http: follow up to r1777460.
We MUST unfold outgoing HTTP headers in any case, "message/http" is for
inner content.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1778094 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge r1775827 from 2.4.x:
Eric Covener [Tue, 3 Jan 2017 23:58:30 +0000 (23:58 +0000)] 
Merge r1775827 from 2.4.x:

Merge r1775199, r1775664 from trunk:

Fix strict Host: header checking on EBCDIC

on zOS, isascii() really means 7 bit ascii, but our strings
are in ebcdic for 99.95% of the lifetime of the server.

remove initial isascii check entirely

We are already checking an even narrower set of characters
just below.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1777247 13f79535-47bb-0310-9956-ffa450edef68

8 years agomatch comment to actual major
Eric Covener [Tue, 3 Jan 2017 17:48:53 +0000 (17:48 +0000)] 
match comment to actual major

#define MODULE_MAGIC_NUMBER_MAJOR 20051115

Props to whoever wrote the test that checks the comment vs
the define!

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1777182 13f79535-47bb-0310-9956-ffa450edef68

8 years agorestore r = NULL; dropped by hand-merge.
Eric Covener [Tue, 3 Jan 2017 17:47:49 +0000 (17:47 +0000)] 
restore r = NULL; dropped by hand-merge.

Confirmed with Bill over email.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1777178 13f79535-47bb-0310-9956-ffa450edef68

8 years agoMerge httpd-2.4.x-merge-http-strict branch r1767941 - r1775671
William A. Rowe Jr [Fri, 23 Dec 2016 00:55:48 +0000 (00:55 +0000)] 
Merge httpd-2.4.x-merge-http-strict branch r1767941 - r1775671

For complete patch evolution, see;

http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x-merge-http-strict/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775780 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1635762
William A. Rowe Jr [Thu, 22 Dec 2016 23:30:57 +0000 (23:30 +0000)] 
Backports: r1635762
Submitted By: Edward Lu <Chaosed0 gmail.com>
Support custom ErrorDocuments for HTTP 501 and 414 status codes.
PR 57167 [Edward Lu <Chaosed0 gmail.com>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775776 13f79535-47bb-0310-9956-ffa450edef68

8 years agoClean up assorted merge-duplications and whitespace to sync at 2.4.24-dev.0
William A. Rowe Jr [Thu, 22 Dec 2016 23:24:40 +0000 (23:24 +0000)] 
Clean up assorted merge-duplications and whitespace to sync at 2.4.24-dev.0

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775774 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1683123
William A. Rowe Jr [Thu, 22 Dec 2016 22:59:59 +0000 (22:59 +0000)] 
Backports: r1683123
Submitted by: ylavic
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/branches/2.2.x-merge-http-strict@1775769 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1483005
William A. Rowe Jr [Thu, 22 Dec 2016 22:57:41 +0000 (22:57 +0000)] 
Backports: r1483005
Submitted by: jailletc36
core: Do not over allocate memory within 'ap_rgetline_core' for the common case.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775767 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNote backport revno 1710095 which actually occurs at r1775758
William A. Rowe Jr [Thu, 22 Dec 2016 22:33:03 +0000 (22:33 +0000)] 
Note backport revno 1710095 which actually occurs at r1775758

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775759 13f79535-47bb-0310-9956-ffa450edef68

8 years agoCrossport: r1758672
William A. Rowe Jr [Thu, 22 Dec 2016 22:25:14 +0000 (22:25 +0000)] 
Crossport: r1758672
Backports: r1710095, r1727544
Submitted by: ylavic, rpluem

core: Limit to ten the number of tolerated empty lines between request,
and consume them before the pipelining check to avoid possible response
delay when reading the next request without flushing.

Before this commit, the maximum number of empty lines was the same as
configured LimitRequestFields, defaulting to 100, which was way too much.
We now use a fixed/hard limit of 10 (DEFAULT_LIMIT_BLANK_LINES).

check_pipeline() is changed to check for (up to the limit) and comsume the
trailing [CR]LFs so that they won't be interpreted as pipelined requests,
otherwise we would block on the next read without flushing data, and hence
possibly delay pending response(s) until the next/real request comes in or
the keepalive timeout expires.

Finally, when the maximum number of empty line is reached in
read_request_line(), or that request line does not contains at least a method
and an (valid) URI, we can fail early and avoid some failure detected in
further processing.

Ensure that proto_num and protocol is set in another "error out early" edge
case. This can happen with invalid CONNECT requests as described in the PR.
PR: 58929

Borrow Yann's effort at cross-porting this to 2.2.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775758 13f79535-47bb-0310-9956-ffa450edef68

8 years agoRemove spurious {}'s never present on trunk/2.4.x
William A. Rowe Jr [Thu, 22 Dec 2016 22:16:00 +0000 (22:16 +0000)] 
Remove spurious {}'s never present on trunk/2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775756 13f79535-47bb-0310-9956-ffa450edef68

8 years agoNoted backport revno 1727544 which actually occurs at r1775758
William A. Rowe Jr [Thu, 22 Dec 2016 22:08:05 +0000 (22:08 +0000)] 
Noted backport revno 1727544 which actually occurs at r1775758

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775752 13f79535-47bb-0310-9956-ffa450edef68

8 years agoResume building the appropriate patches for relevant 2.2.x -> 2.4.x changes
William A. Rowe Jr [Thu, 22 Dec 2016 21:52:57 +0000 (21:52 +0000)] 
Resume building the appropriate patches for relevant 2.2.x -> 2.4.x changes
to allow us to apply the 2.4.x already-reviewed HttpProtocolOptions and
parser changes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775749 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1057372
William A. Rowe Jr [Thu, 22 Dec 2016 20:56:34 +0000 (20:56 +0000)] 
Backports: r1057372
Submitted by: trawick
Another comment-only backport syncing to 2.4.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775735 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1237407
William A. Rowe Jr [Thu, 22 Dec 2016 20:54:37 +0000 (20:54 +0000)] 
Backports: r1237407
Submitted by: trawick
s/ensure/insure/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775733 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1213391
William A. Rowe Jr [Thu, 22 Dec 2016 20:52:08 +0000 (20:52 +0000)] 
Backports: r1213391
Submitted by: trawick
zap an unhelpful, out of date comment from httpd 1.2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775732 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r892678
William A. Rowe Jr [Thu, 22 Dec 2016 20:50:05 +0000 (20:50 +0000)] 
Backports: r892678
Submitted by: niq
Reject requests containing (invalid) NULL characters in request line
or request headers.
PR 43039

Backports: r892808
Submitted by: rpluem
Fix up r892678

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775731 13f79535-47bb-0310-9956-ffa450edef68

8 years agocore: Do not over allocate memory within 'ap_rgetline_core' for the common case.
William A. Rowe Jr [Thu, 22 Dec 2016 20:45:31 +0000 (20:45 +0000)] 
core: Do not over allocate memory within 'ap_rgetline_core' for the common case.

trunk patch: http://svn.apache.org/r1483005
Submitted by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775730 13f79535-47bb-0310-9956-ffa450edef68

8 years agoDelete gratuitous delta between 2.3-dev and 2.2.x branch.
William A. Rowe Jr [Thu, 22 Dec 2016 20:36:08 +0000 (20:36 +0000)] 
Delete gratuitous delta between 2.3-dev and 2.2.x branch.

No effective code change

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775728 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBranching at 2.2.x to arrive at 2.4.23 to *then* apply all of the already
William A. Rowe Jr [Thu, 22 Dec 2016 20:34:37 +0000 (20:34 +0000)] 
Branching at 2.2.x to arrive at 2.4.23 to *then* apply all of the already
navigated 2.4.x-merge-http-strict backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775727 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1635762
William A. Rowe Jr [Thu, 22 Dec 2016 19:44:37 +0000 (19:44 +0000)] 
Backports: r1635762
Submitted By: Edward Lu <Chaosed0 gmail.com>
Support custom ErrorDocuments for HTTP 501 and 414 status codes.
PR 57167 [Edward Lu <Chaosed0 gmail.com>]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775718 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1621419 (protocol.c only)
William A. Rowe Jr [Thu, 22 Dec 2016 19:41:53 +0000 (19:41 +0000)] 
Backports: r1621419 (protocol.c only)
Submitted by: jailletc36
Fix sscanf format spotted by cppcheck
(changes version major/minor types from signed to unsigned)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775717 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1433613
William A. Rowe Jr [Thu, 22 Dec 2016 19:35:49 +0000 (19:35 +0000)] 
Backports: r1433613
Submitted by: jailletc36
Improve error message
PR 54384

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775715 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1407528
William A. Rowe Jr [Thu, 22 Dec 2016 19:35:15 +0000 (19:35 +0000)] 
Backports: r1407528
Submitted by: sf
remove obsolete comment from 1.3 days

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775714 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1407088
William A. Rowe Jr [Thu, 22 Dec 2016 19:34:48 +0000 (19:34 +0000)] 
Backports: r1407088
Submitted by: sf
remove some more old unused code

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775713 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1407004
William A. Rowe Jr [Thu, 22 Dec 2016 19:34:17 +0000 (19:34 +0000)] 
Backports: r1407004
Submitted by: sf
Remove unused code. "Next week" hasn't happened in the last 10 years or so.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775712 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1392347
William A. Rowe Jr [Thu, 22 Dec 2016 19:31:05 +0000 (19:31 +0000)] 
Backports: r1392347
Submitted by: trawick
core: ErrorDocument now works for requests without a Host header.
PR: 48357

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775711 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1352911
William A. Rowe Jr [Thu, 22 Dec 2016 19:27:41 +0000 (19:27 +0000)] 
Backports: r1352911
Submitted by: sf
Make sure that a triggering LimitRequestFieldSize is always logged, even if the
first read already exeeds the limit and ap_rgetline does not return a header
name.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775710 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1237407
William A. Rowe Jr [Thu, 22 Dec 2016 19:25:47 +0000 (19:25 +0000)] 
Backports: r1237407
Submitted by: trawick
s/ensure/insure/

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775708 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1213391
William A. Rowe Jr [Thu, 22 Dec 2016 19:24:11 +0000 (19:24 +0000)] 
Backports: r1213391
Submitted by: trawick
zap an unhelpful, out of date comment from httpd 1.2

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775707 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1188745
William A. Rowe Jr [Thu, 22 Dec 2016 19:23:10 +0000 (19:23 +0000)] 
Backports: r1188745
Submitted by: rpluem
Correctly return a 400 (Bad request) in case of a HTTP/0.9 request like
GET @example.org/foo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775706 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1185385
William A. Rowe Jr [Thu, 22 Dec 2016 19:20:25 +0000 (19:20 +0000)] 
Backports: r1185385
Submitted by: sf
Downgrade some more log messages indicating client errors from level error to
info. Add log messages for various reasons to return HTTP_BAD_REQUEST.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775705 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1178566
William A. Rowe Jr [Thu, 22 Dec 2016 18:57:26 +0000 (18:57 +0000)] 
Backports: r1178566
Submitted by: sf
Enforce LimitRequestFieldSize after multiple headers with the same
name have been merged.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775699 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1102124 (in part, protocol.c only)
William A. Rowe Jr [Thu, 22 Dec 2016 18:48:47 +0000 (18:48 +0000)] 
Backports: r1102124 (in part, protocol.c only)
Submitted by: sf
Use APR_STATUS_IS_... in some more cases.
While this is not strictly necessary everywhere, it makes it much easier
to find the problematic cases.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775697 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1100511
William A. Rowe Jr [Thu, 22 Dec 2016 18:45:59 +0000 (18:45 +0000)] 
Backports: r1100511
Submitted by: covener
use APR_STATUS_IS_TIMEUP() instead of direct comparison with APR_TIMEUP.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775696 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r1057372
William A. Rowe Jr [Thu, 22 Dec 2016 18:45:07 +0000 (18:45 +0000)] 
Backports: r1057372
Submitted by: trawick
comment on where multiple headers with same name get merged

(some strict Cookie parsers can't handle what happens later,
but that is not our fault)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775695 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r892808
William A. Rowe Jr [Thu, 22 Dec 2016 18:40:56 +0000 (18:40 +0000)] 
Backports: r892808
Submitted by: rpluem
Fix up r892678

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775692 13f79535-47bb-0310-9956-ffa450edef68

8 years agoBackports: r892678
William A. Rowe Jr [Thu, 22 Dec 2016 18:39:40 +0000 (18:39 +0000)] 
Backports: r892678
Submitted by: niq
Reject requests containing (invalid) NULL characters in request line
or request headers.
PR 43039

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775691 13f79535-47bb-0310-9956-ffa450edef68

8 years agoFor purposes of constructing a patch against 2.2.31, show all work since 2.2.32 bump
William A. Rowe Jr [Thu, 22 Dec 2016 17:40:29 +0000 (17:40 +0000)] 
For purposes of constructing a patch against 2.2.31, show all work since 2.2.32 bump

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x-merge-http-strict@1775685 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAnd we are at .32-dev
William A. Rowe Jr [Wed, 15 Jul 2015 16:22:51 +0000 (16:22 +0000)] 
And we are at .32-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691247 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPrepare to tag 2.2.31
William A. Rowe Jr [Wed, 15 Jul 2015 16:20:31 +0000 (16:20 +0000)] 
Prepare to tag 2.2.31

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691243 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix Copyright of any latex conversions of the docs
William A. Rowe Jr [Wed, 15 Jul 2015 16:18:19 +0000 (16:18 +0000)] 
Fix Copyright of any latex conversions of the docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691242 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix MOD_OPTIONAL_HOOK_EXPORT_H #include guard spelling (silliest compile
William A. Rowe Jr [Wed, 15 Jul 2015 16:15:17 +0000 (16:15 +0000)] 
Fix MOD_OPTIONAL_HOOK_EXPORT_H #include guard spelling (silliest compile
warning in 2.2 codebase?)
Backports: r1514215
Submitted by: trawick

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691240 13f79535-47bb-0310-9956-ffa450edef68

10 years agoApprove and commit symbols export, with simplified CHANGES
William A. Rowe Jr [Wed, 15 Jul 2015 16:10:27 +0000 (16:10 +0000)] 
Approve and commit symbols export, with simplified CHANGES

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691239 13f79535-47bb-0310-9956-ffa450edef68

10 years ago+1
Jeff Trawick [Wed, 15 Jul 2015 11:22:07 +0000 (11:22 +0000)] 
+1

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691169 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAddress mod_proxy_balancer's linking issue on Windows.
Yann Ylavic [Wed, 15 Jul 2015 10:15:47 +0000 (10:15 +0000)] 
Address mod_proxy_balancer's linking issue on Windows.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691162 13f79535-47bb-0310-9956-ffa450edef68

10 years agoremove dependency to store.h removed from OpenSSL 1.0.x
Gregg Lewis Smith [Tue, 14 Jul 2015 20:35:02 +0000 (20:35 +0000)] 
remove dependency to store.h removed from OpenSSL 1.0.x

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1691074 13f79535-47bb-0310-9956-ffa450edef68

10 years agoEasy vote.
Yann Ylavic [Mon, 13 Jul 2015 23:32:59 +0000 (23:32 +0000)] 
Easy vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1690841 13f79535-47bb-0310-9956-ffa450edef68

10 years agofix silly warning?
Jeff Trawick [Mon, 13 Jul 2015 23:27:02 +0000 (23:27 +0000)] 
fix silly warning?

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1690840 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRebuild.
Lucien Gentis [Sun, 12 Jul 2015 13:24:13 +0000 (13:24 +0000)] 
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1690460 13f79535-47bb-0310-9956-ffa450edef68

10 years agoXML updates.
Lucien Gentis [Sun, 12 Jul 2015 13:23:28 +0000 (13:23 +0000)] 
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1690459 13f79535-47bb-0310-9956-ffa450edef68

10 years agoOn to 2.2.31-dev
William A. Rowe Jr [Sat, 11 Jul 2015 04:18:12 +0000 (04:18 +0000)] 
On to 2.2.31-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1690342 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPrepare to tag 2.2.30
William A. Rowe Jr [Sat, 11 Jul 2015 04:16:40 +0000 (04:16 +0000)] 
Prepare to tag 2.2.30

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1690339 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRebuild all of httpd-2.2 docs
William A. Rowe Jr [Wed, 8 Jul 2015 14:40:37 +0000 (14:40 +0000)] 
Rebuild all of httpd-2.2 docs

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1689891 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdd CHANGES entry for r1678698.
Yann Ylavic [Wed, 8 Jul 2015 12:26:05 +0000 (12:26 +0000)] 
Add CHANGES entry for r1678698.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1689858 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1688536 and r1688538 from trunk.
Yann Ylavic [Mon, 6 Jul 2015 23:37:16 +0000 (23:37 +0000)] 
Merge r1688536 and r1688538 from trunk.

http: follow up to r1685345, also needed in 2.4.x/2.2.x by r1686271/r1687339.
Handle reentrance of state BODY_CHUNK_CR to avoid AH02901 when we eat BWS
from multiple reads.

http: follow up to r1685345.
Be lenient up to 10 (room for 32bit decimals) Bad White Spaces (BWS)
between chunk-size and chunk-ext/CRLF.

Submitted by: ylavic
Reviewed by: ylavic, wrowe, mrumph

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1689522 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote for http_filters fix
Mike Rumph [Mon, 6 Jul 2015 23:24:52 +0000 (23:24 +0000)] 
Vote for http_filters fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1689519 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote up one patch across two branches
William A. Rowe Jr [Mon, 6 Jul 2015 13:45:26 +0000 (13:45 +0000)] 
Vote up one patch across two branches

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1689397 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRebuild.
Lucien Gentis [Sat, 4 Jul 2015 14:24:54 +0000 (14:24 +0000)] 
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1689169 13f79535-47bb-0310-9956-ffa450edef68

10 years agoXML update.
Lucien Gentis [Sat, 4 Jul 2015 14:24:18 +0000 (14:24 +0000)] 
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1689167 13f79535-47bb-0310-9956-ffa450edef68

10 years agoI guess this is also a showstopper in 2.2.x, some (new/dedicated) framework
Yann Ylavic [Fri, 3 Jul 2015 00:37:20 +0000 (00:37 +0000)] 
I guess this is also a showstopper in 2.2.x, some (new/dedicated) framework
tests fail without it.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688938 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1688274 from trunk.
Yann Ylavic [Fri, 3 Jul 2015 00:32:25 +0000 (00:32 +0000)] 
Merge r1688274 from trunk.

http: Fix LimitRequestBody checks when there is no more bytes to read.

Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
Committed by: ylavic
Reviewed  by: ylavic, mrumph, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688936 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAccept patches against showstopper
William A. Rowe Jr [Thu, 2 Jul 2015 20:32:27 +0000 (20:32 +0000)] 
Accept patches against showstopper

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688902 13f79535-47bb-0310-9956-ffa450edef68

10 years agoGenerated doc changes
Mike Rumph [Thu, 2 Jul 2015 06:15:22 +0000 (06:15 +0000)] 
Generated doc changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688767 13f79535-47bb-0310-9956-ffa450edef68

10 years agoGrammar, spelling, and other minor corrections
Mike Rumph [Thu, 2 Jul 2015 06:11:21 +0000 (06:11 +0000)] 
Grammar, spelling, and other minor corrections

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688765 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose follow up to r1686271 (chunk-size parsing) for 2.2.x.
Yann Ylavic [Wed, 1 Jul 2015 00:28:01 +0000 (00:28 +0000)] 
Propose follow up to r1686271 (chunk-size parsing) for 2.2.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688540 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdd Bill's fixes to SubstituteInheritBefore proposal.
Yann Ylavic [Tue, 30 Jun 2015 11:13:37 +0000 (11:13 +0000)] 
Add Bill's fixes to SubstituteInheritBefore proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688427 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAddress wrowe's -1.
Yann Ylavic [Tue, 30 Jun 2015 00:12:52 +0000 (00:12 +0000)] 
Address wrowe's -1.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688333 13f79535-47bb-0310-9956-ffa450edef68

10 years agoThis patch is a no-go, will defer to post-2.2.30
William A. Rowe Jr [Mon, 29 Jun 2015 22:54:31 +0000 (22:54 +0000)] 
This patch is a no-go, will defer to post-2.2.30

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688325 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote for fix to LimitRequestBody
Mike Rumph [Mon, 29 Jun 2015 18:56:53 +0000 (18:56 +0000)] 
Vote for fix to LimitRequestBody

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688287 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose fix for LimitRequestBody check.
Yann Ylavic [Mon, 29 Jun 2015 18:20:05 +0000 (18:20 +0000)] 
Propose fix for LimitRequestBody check.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1688280 13f79535-47bb-0310-9956-ffa450edef68

10 years agoNote discarded vote and refer to 2.2.x instead of 2.4.x for the backport.
Yann Ylavic [Fri, 26 Jun 2015 07:43:46 +0000 (07:43 +0000)] 
Note discarded vote and refer to 2.2.x instead of 2.4.x for the backport.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687698 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpdate mod_substitute proposal with r1687539 and r1687680, plus the backport patch.
Yann Ylavic [Fri, 26 Jun 2015 07:38:39 +0000 (07:38 +0000)] 
Update mod_substitute proposal with r1687539 and r1687680, plus the backport patch.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687697 13f79535-47bb-0310-9956-ffa450edef68

10 years agoNote objection
William A. Rowe Jr [Thu, 25 Jun 2015 23:38:18 +0000 (23:38 +0000)] 
Note objection

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687664 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1685345, r1685347, r1685349 and r1685350 from trunk.
Yann Ylavic [Wed, 24 Jun 2015 18:04:49 +0000 (18:04 +0000)] 
Merge r1685345, r1685347, r1685349 and r1685350 from trunk.

core: Allow spaces after chunk-size for compatibility with implementations
using a pre-filled buffer.

Submitted by: ylavic, trawick
Reviewed by: ylavic, wrowe, minfrin

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687339 13f79535-47bb-0310-9956-ffa450edef68

10 years agoSECURITY: CVE-2015-3183 (cve.mitre.org)
Yann Ylavic [Wed, 24 Jun 2015 17:58:13 +0000 (17:58 +0000)] 
SECURITY: CVE-2015-3183 (cve.mitre.org)
core: Fix chunk header parsing defect.
Remove apr_brigade_flatten(), buffering and duplicated code from
the HTTP_IN filter, parse chunks in a single pass with zero copy.
Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
authorized characters.

Submitted by: minfrin, ylavic
Reviewed by: ylavic, wrowe, minfrin
Reported by: regilero <regis.leroy makina-corpus.com>
Backports: 14848521684513

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687338 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVotes.
Graham Leggett [Wed, 24 Jun 2015 16:33:34 +0000 (16:33 +0000)] 
Votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687325 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote and promote.
Graham Leggett [Wed, 24 Jun 2015 16:15:33 +0000 (16:15 +0000)] 
Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1687323 13f79535-47bb-0310-9956-ffa450edef68

10 years agoUpvote, clarify that -v6 is applied before -v3 (confusing, yes)
William A. Rowe Jr [Thu, 18 Jun 2015 15:50:14 +0000 (15:50 +0000)] 
Upvote, clarify that -v6 is applied before -v3 (confusing, yes)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1686254 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose same v3 patch as 2.4.x which adjusts CHANGES entry.
Yann Ylavic [Wed, 17 Jun 2015 10:34:15 +0000 (10:34 +0000)] 
Propose same v3 patch as 2.4.x which adjusts CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685990 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdd PR to CHANGES entry.
Yann Ylavic [Wed, 17 Jun 2015 10:07:09 +0000 (10:07 +0000)] 
Add PR to CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685982 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose mod_substitute merge order fix.
Yann Ylavic [Wed, 17 Jun 2015 09:53:16 +0000 (09:53 +0000)] 
Propose mod_substitute merge order fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685978 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose same fix as of 2.4.14's regression.
Yann Ylavic [Sun, 14 Jun 2015 01:24:09 +0000 (01:24 +0000)] 
Propose same fix as of 2.4.14's regression.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685355 13f79535-47bb-0310-9956-ffa450edef68

10 years agoFix missing lib (.mak was previously updated)
William A. Rowe Jr [Fri, 12 Jun 2015 16:41:11 +0000 (16:41 +0000)] 
Fix missing lib (.mak was previously updated)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1685125 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdjust IDs.
Yann Ylavic [Thu, 11 Jun 2015 07:19:16 +0000 (07:19 +0000)] 
Adjust IDs.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684821 13f79535-47bb-0310-9956-ffa450edef68

10 years agoAdjust URL for public consumption
William A. Rowe Jr [Tue, 9 Jun 2015 20:26:47 +0000 (20:26 +0000)] 
Adjust URL for public consumption

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684520 13f79535-47bb-0310-9956-ffa450edef68

10 years agoOffer a showstopper for 2.2.30 requiring one more reviewer/vote
William A. Rowe Jr [Tue, 9 Jun 2015 20:25:53 +0000 (20:25 +0000)] 
Offer a showstopper for 2.2.30 requiring one more reviewer/vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684519 13f79535-47bb-0310-9956-ffa450edef68

10 years agoMerge r1585090 from trunk:
Yann Ylavic [Tue, 9 Jun 2015 16:09:28 +0000 (16:09 +0000)] 
Merge r1585090 from trunk:

Bring SNI behavior into better conformance with RFC 6066:

- no longer send a warning-level unrecognized_name(112) alert
  when no matching vhost is found (PR 56241)

<not backported to 2.2.x>
- at startup, only issue warnings about IP/port conflicts and name-based
  SSL vhosts when running with an OpenSSL without TLS extension support
  (almost 5 years after SNI was added to 2.2.x, the
  "[...] only work for clients with TLS server name indication support"
  warning feels obsolete)
</not backported to 2.2.x>

Proposed by: kbrand
Reviewed by: ylavic, jorton, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684462 13f79535-47bb-0310-9956-ffa450edef68

10 years agoYes, this. Vote & promote w/thanks.
William A. Rowe Jr [Tue, 9 Jun 2015 15:41:01 +0000 (15:41 +0000)] 
Yes, this. Vote & promote w/thanks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684457 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRevert mis-commit, re-fixing STATUS in a moment
William A. Rowe Jr [Tue, 9 Jun 2015 15:39:25 +0000 (15:39 +0000)] 
Revert mis-commit, re-fixing STATUS in a moment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684455 13f79535-47bb-0310-9956-ffa450edef68

10 years agoYes, this. Vote & promote w/thanks.
William A. Rowe Jr [Tue, 9 Jun 2015 15:37:40 +0000 (15:37 +0000)] 
Yes, this. Vote & promote w/thanks.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684454 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote.
Joe Orton [Tue, 9 Jun 2015 08:56:25 +0000 (08:56 +0000)] 
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684356 13f79535-47bb-0310-9956-ffa450edef68

10 years agoRemove entry backported in r1683808 (along with dependent proposal).
Yann Ylavic [Tue, 9 Jun 2015 07:38:06 +0000 (07:38 +0000)] 
Remove entry backported in r1683808 (along with dependent proposal).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684341 13f79535-47bb-0310-9956-ffa450edef68

10 years agoPropose RFC 6066 (SNI) conformance fix.
Yann Ylavic [Tue, 9 Jun 2015 07:30:04 +0000 (07:30 +0000)] 
Propose RFC 6066 (SNI) conformance fix.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1684336 13f79535-47bb-0310-9956-ffa450edef68

10 years agocore, modules: Avoid error response/document handling by the core if some
William A. Rowe Jr [Fri, 5 Jun 2015 16:50:47 +0000 (16:50 +0000)] 
core, modules: Avoid error response/document handling by the core if some
handler or input filter already did it while reading the request (causing
a double response body).

Submitted by: ylavic
Backports: r1482522 (partial, ap_map_http_request_error() things only!),
           r1529988, r1529991, r1643537, r1643543, r1657897, r1665625,
           r1665721, r1674056
Reviewed by: ylavic, wrowe, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1683808 13f79535-47bb-0310-9956-ffa450edef68

10 years agovote/promote two remaining backports
Eric Covener [Fri, 5 Jun 2015 14:44:33 +0000 (14:44 +0000)] 
vote/promote two remaining backports

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1683772 13f79535-47bb-0310-9956-ffa450edef68

10 years agoXforms.
Rainer Jung [Mon, 1 Jun 2015 16:13:53 +0000 (16:13 +0000)] 
Xforms.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1682944 13f79535-47bb-0310-9956-ffa450edef68

10 years agoTry to clarify extended uses of SSLCertificateFile.
Rainer Jung [Mon, 1 Jun 2015 16:01:49 +0000 (16:01 +0000)] 
Try to clarify extended uses of SSLCertificateFile.

Backport of r1682923 and r1682937 from trunk,
resp. r1682929 and r1682939 from 2.4.x.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1682942 13f79535-47bb-0310-9956-ffa450edef68

10 years agoVote up
William A. Rowe Jr [Fri, 29 May 2015 04:19:16 +0000 (04:19 +0000)] 
Vote up

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1682363 13f79535-47bb-0310-9956-ffa450edef68