]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Ruediger Pluem [Tue, 1 Sep 2015 07:34:06 +0000 (07:34 +0000)]
* Backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1700410 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 1 Sep 2015 07:33:34 +0000 (07:33 +0000)]
* mod_ssl: Fix spurious errors when loading certificate chain
2.2.x uses a home grown version of SSL_CTX_use_certificate_chain_file
called SSL_CTX_use_certificate_chain() which also needs the
ERR_clear_error() call.
trunk patch: N/A, but similar to https://svn.apache.org/r1588427
PR: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=794383
Submitted by: sf
Reviewed by: sf, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1700409 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 1 Sep 2015 07:31:11 +0000 (07:31 +0000)]
* Fix a regression with 2.2.31 that caused inherited workers to
use a different scoreboard slot then the original one.
This has no trunk revision since this a 2.2.x issue only and trunk
code is different.
PR: 58267
Reviewed by: rpluem, jkaluza, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1700408 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 31 Aug 2015 20:15:34 +0000 (20:15 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1700327 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Thu, 27 Aug 2015 06:57:08 +0000 (06:57 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1698084 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 25 Aug 2015 17:52:23 +0000 (17:52 +0000)]
* Update patch with r1697323 and reset vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697748 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 25 Aug 2015 17:44:31 +0000 (17:44 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697747 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 24 Aug 2015 20:41:35 +0000 (20:41 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697499 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 24 Aug 2015 20:39:34 +0000 (20:39 +0000)]
Fix doc as spotted by Nicholas Miller in online doc.
This was already fixed in 2.4 in r1659838
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697498 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Aug 2015 16:48:59 +0000 (16:48 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697102 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 22 Aug 2015 16:48:24 +0000 (16:48 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697101 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 21 Aug 2015 18:24:56 +0000 (18:24 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697039 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 21 Aug 2015 16:43:53 +0000 (16:43 +0000)]
Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697027 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 21 Aug 2015 16:40:44 +0000 (16:40 +0000)]
Also update SubstituteInheritBefore proposal to v5 in 2.2.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1697026 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 21 Aug 2015 13:59:33 +0000 (13:59 +0000)]
* Add a comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696997 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 21 Aug 2015 13:51:22 +0000 (13:51 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696992 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 21 Aug 2015 13:47:41 +0000 (13:47 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696989 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 21 Aug 2015 13:42:30 +0000 (13:42 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696984 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 21 Aug 2015 13:21:18 +0000 (13:21 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696968 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 21 Aug 2015 00:59:30 +0000 (00:59 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696887 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Fri, 21 Aug 2015 00:56:23 +0000 (00:56 +0000)]
Restructure ProxyPass directive documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696886 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Wed, 19 Aug 2015 19:29:21 +0000 (19:29 +0000)]
forgot to add my vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696653 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 18 Aug 2015 18:04:52 +0000 (18:04 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696473 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 18 Aug 2015 18:02:43 +0000 (18:02 +0000)]
Remove a couple of tab characters
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696472 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 18 Aug 2015 17:38:19 +0000 (17:38 +0000)]
Generated doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696465 13f79535 -47bb-0310-9956-
ffa450edef68
Mike Rumph [Tue, 18 Aug 2015 17:34:30 +0000 (17:34 +0000)]
Grammar corrections
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696464 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Tue, 18 Aug 2015 09:40:44 +0000 (09:40 +0000)]
propose mod_ssl fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1696380 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 28 Jul 2015 23:24:25 +0000 (23:24 +0000)]
Note release date (successful)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1693167 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 23 Jul 2015 13:13:48 +0000 (13:13 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1692387 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jul 2015 15:05:45 +0000 (15:05 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1691743 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Jul 2015 15:05:07 +0000 (15:05 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1691742 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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:
1484852 ,
1684513
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1687338 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Yann Ylavic [Wed, 27 May 2015 23:39:55 +0000 (23:39 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1682139 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 27 May 2015 18:59:59 +0000 (18:59 +0000)]
Clarify the change to the default cipher suite lists
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1682099 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 25 May 2015 16:00:14 +0000 (16:00 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681603 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 25 May 2015 15:59:26 +0000 (15:59 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681602 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 25 May 2015 08:43:57 +0000 (08:43 +0000)]
Merge r1551685, r1652929 from trunk.
r1551685 | trawick | 2013-12-17 21:25:54 +0100 (Tue, 17 Dec 2013) | 5 lines
FreeBSD: Disable IPv4-mapped listening sockets by default for versions
5+ instead of just for FreeBSD 5.
PR: 53824
r1652929 | ylavic | 2015-01-19 09:06:56 +0100 (Mon, 19 Jan 2015) | 4 lines
Fix --enable-v4-mapped configuration on *BSD. PR 53824.
Submitted by: olli hauer <ohauer gmx.de>
Committed by: ylavic
Reviewed by: ylavic, trawick, rjung
Backported by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681565 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 25 May 2015 02:47:21 +0000 (02:47 +0000)]
Vote for simple patch. Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681546 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 25 May 2015 00:31:07 +0000 (00:31 +0000)]
+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681540 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 24 May 2015 21:58:20 +0000 (21:58 +0000)]
... and vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681532 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 24 May 2015 21:56:50 +0000 (21:56 +0000)]
Propose IPv4-mapped (configure) fix for freebsd 5+.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1681531 13f79535 -47bb-0310-9956-
ffa450edef68
projects / thirdparty / apache / httpd.git / log
