]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Joe Orton [Thu, 7 Jul 2016 15:51:59 +0000 (15:51 +0000)]
Backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1751815 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 7 Jul 2016 15:51:40 +0000 (15:51 +0000)]
mod_ssl: Free dhparams and ecparams reading certificates at startup.
This fixes issue when SSLCryptoDevice does not get unregistered because
of non-zero refcount during the mod_ssl unload happening on httpd startup.
Submitted by: jkaluza, ylavic
Reviewed by: wrowe, ylavic, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1751814 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 7 Jul 2016 15:49:53 +0000 (15:49 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1751812 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 Jun 2016 17:47:48 +0000 (17:47 +0000)]
mod_mem_cache: Fix concurrent removal of stale entries which could lead
to a crash.
PR: 43724
Submitted by: ylavic
Reviewed by: covener, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750846 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 Jun 2016 17:46:21 +0000 (17:46 +0000)]
vote... promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750845 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 Jun 2016 17:44:28 +0000 (17:44 +0000)]
mod_proxy: Fix a race condition that caused a failed worker to be retried
before the retry period is over
Backports: r1664709, r1697323
Submitted by: rpluem
Reviewed by: wrowe, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750844 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 Jun 2016 17:29:41 +0000 (17:29 +0000)]
mod_proxy: save DNS lookups
Backports: r1462269, r1463455
Submitted by: rpluem
Reviewed by: wrowe, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750843 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 Jun 2016 17:14:18 +0000 (17:14 +0000)]
mod_proxy: Give ap_proxy_post_request as chance to act correctly on the status
code by setting r->status temporarily to access_status. r->status might be
different than access_status e.g. r->status could be HTTP_OK if e.g. we
override the error page on the proxy or if the error was not generated by the
backend itself but by the proxy e.g. a bad gateway.
Backports: r1597352
Submitted by: rpluem
Reviewed by: wrowe, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750838 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 Jun 2016 17:10:32 +0000 (17:10 +0000)]
mime.types: Add common extension "m4a" for MPEG 4 Audio.
As a reference see Wikipedia:
https://en.wikipedia.org/wiki/MPEG-4_Part_14#.MP4_versus_.M4A
Submitted by: Dylan Millikin <dylan.millikin gmail.com>
PR: 57895
Backports: r1723567
Reviewed by: rjung, wrowe, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750837 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 Jun 2016 17:07:29 +0000 (17:07 +0000)]
mod_proxy: don't recyle backend announced "Connection: close" connections
to avoid reusing it should the close be effective after some new request
is ready to be sent.
Backports: r1678763, r1703807, r1703813, r1678763
Submitted by: ylavic
Reviewed by: rpluem, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750836 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 30 Jun 2016 16:59:58 +0000 (16:59 +0000)]
mod_substitute: Allow to configure the patterns merge order with the new
SubstituteInheritBefore on|off directive (with default in 2.2 of 'off)
Backports: r1684900, r1687539, r1687680, r1688331, r1688339, r1688340, r1688343,
r1697013, r1697015
PR: 57641
Submitted by:
[Marc.Stern <Marc.Stern approach.be>, Yann Ylavic, William Rowe]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750835 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 29 Jun 2016 22:59:46 +0000 (22:59 +0000)]
More bugfixes required.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750733 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 29 Jun 2016 22:52:17 +0000 (22:52 +0000)]
vote for memcache crash fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750732 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 29 Jun 2016 21:38:02 +0000 (21:38 +0000)]
Add CHANGES entry in mod_mem_cache patch relating to PR 45049.
While at it, propose another fix for mod_mem_cache relating to PR 43724.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750730 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 29 Jun 2016 18:50:39 +0000 (18:50 +0000)]
Votes + promotes, and clarify suggested patch improvements
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750689 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 28 Jun 2016 19:37:05 +0000 (19:37 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750565 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 25 Jun 2016 22:45:23 +0000 (22:45 +0000)]
Clarify note from r1750226.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750229 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 25 Jun 2016 21:43:43 +0000 (21:43 +0000)]
Note that more backports are needed after r1723567.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750226 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 25 Jun 2016 21:27:43 +0000 (21:27 +0000)]
Fix people->home links, propose new mem_cache_client_abort fix, vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1750225 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 16 Jun 2016 22:02:55 +0000 (22:02 +0000)]
Upvotes, note missing patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1748775 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 14 Jun 2016 20:37:52 +0000 (20:37 +0000)]
abs: Include OPENSSL_Applink when compiling on Windows, to resolve
failures under Visual Studio 2015 and other mismatched MSVCRT flavors.
PR: 59630
Submitted by: Jan Ehrhardt <phpdev ehrhardt.nl>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1748461 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 14 Jun 2016 20:33:58 +0000 (20:33 +0000)]
Looks like a docs/ change to me
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1748460 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 9 Jun 2016 13:17:09 +0000 (13:17 +0000)]
Expand on fix - jkaluza will likely concur
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1747546 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 9 Jun 2016 13:02:48 +0000 (13:02 +0000)]
Note, and upvote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1747544 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 12 May 2016 20:54:28 +0000 (20:54 +0000)]
Upvote, but as a docs issue, not really requiring a vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1743559 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 12 May 2016 16:02:24 +0000 (16:02 +0000)]
Propose a long-ignored backport with a long list of contributors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1743520 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 14 Apr 2016 12:32:25 +0000 (12:32 +0000)]
RE: bz 59316 - remove reference to mod_jserv
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1739072 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 9 Mar 2016 22:47:18 +0000 (22:47 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1734334 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Mar 2016 16:19:27 +0000 (16:19 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1733742 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Mar 2016 16:18:37 +0000 (16:18 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1733741 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Mar 2016 16:08:35 +0000 (16:08 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1733740 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 5 Mar 2016 16:07:31 +0000 (16:07 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1733739 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Feb 2016 14:58:21 +0000 (14:58 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1732751 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Feb 2016 14:57:10 +0000 (14:57 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1732750 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 24 Feb 2016 07:29:42 +0000 (07:29 +0000)]
Documentation rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1732030 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Wed, 24 Feb 2016 07:28:24 +0000 (07:28 +0000)]
Added retirement banner to all the documentation pages to suggest the migration to 2.4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1732029 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 19 Feb 2016 13:26:48 +0000 (13:26 +0000)]
Documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1731241 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 19 Feb 2016 13:26:22 +0000 (13:26 +0000)]
Backported Doc change for sections.html, moved example sections to highligh.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1731240 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Feb 2016 14:43:40 +0000 (14:43 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1730221 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Feb 2016 14:43:05 +0000 (14:43 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1730220 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 8 Feb 2016 22:09:58 +0000 (22:09 +0000)]
Documentation rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1729282 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 8 Feb 2016 22:08:47 +0000 (22:08 +0000)]
Added a specific reference of evaluation order between ProxyPass and RewriteRule directives. Bug: 54158
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1729281 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 5 Feb 2016 07:59:37 +0000 (07:59 +0000)]
Documentation rebuilt for previous commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1728614 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Fri, 5 Feb 2016 07:57:59 +0000 (07:57 +0000)]
Change backported from trunk: Adding more details about environment variables passed to cgi scripts.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1728613 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 21 Jan 2016 20:18:57 +0000 (20:18 +0000)]
Fix typo in comment (s/patterm/pattern/).
Backport of r1726086 from trunk
resp. r1726087 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1726089 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 17 Jan 2016 07:40:08 +0000 (07:40 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1725073 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 17 Jan 2016 07:38:38 +0000 (07:38 +0000)]
Fix spurious char
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1725072 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 17 Jan 2016 07:29:55 +0000 (07:29 +0000)]
XML update, see PR58868
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1725071 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 17 Jan 2016 07:25:42 +0000 (07:25 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1725070 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 17 Jan 2016 07:24:00 +0000 (07:24 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1725069 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Jan 2016 01:17:57 +0000 (01:17 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1724719 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Jan 2016 01:17:07 +0000 (01:17 +0000)]
Remove references to the END flag, which is not in this release.
PR58868
Submitted By: Daniel Frederick Crisman asf-bugzilla sutoa.org
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1724718 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 11 Jan 2016 16:52:38 +0000 (16:52 +0000)]
XML header update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1724082 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 11 Jan 2016 14:32:49 +0000 (14:32 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1724039 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 7 Jan 2016 15:13:21 +0000 (15:13 +0000)]
Propose.
Although mime.types as part of conf is underneath
"docs", it is probably safer to vote on it and not
rely on CTR for documentation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1723571 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 1 Jan 2016 21:27:15 +0000 (21:27 +0000)]
Update XForms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1722587 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 1 Jan 2016 21:05:26 +0000 (21:05 +0000)]
Happy New Year 2016
Backport of r1722572 from trunk
resp. r1722573 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1722575 13f79535 -47bb-0310-9956-
ffa450edef68
Jan Kaluža [Tue, 15 Dec 2015 13:07:40 +0000 (13:07 +0000)]
Propose r1720129
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1720152 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 10 Nov 2015 05:28:35 +0000 (05:28 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1713579 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 10 Nov 2015 05:27:23 +0000 (05:27 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1713578 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 4 Nov 2015 10:10:49 +0000 (10:10 +0000)]
Note that 2.2.1, 2.2.28 were not released.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1712522 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 11 Oct 2015 13:57:48 +0000 (13:57 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1707984 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 11 Oct 2015 13:57:05 +0000 (13:57 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1707983 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 22:22:53 +0000 (22:22 +0000)]
Xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1707158 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Oct 2015 21:49:03 +0000 (21:49 +0000)]
Add a docs remark about "SSLOptions StdEnvVars"
being not necessary for mod_rewrite
"%{SSL:VARIABLE}" feature and for the mod_ssl
extensions to mod_log_config (%{VARIABLE}x).
CTR
Backport of r1706989 from trunk resp. r1707123
from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1707153 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 24 Sep 2015 11:37:09 +0000 (11:37 +0000)]
Is it the right fix?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1705036 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 18 Sep 2015 18:52:32 +0000 (18:52 +0000)]
* Vote and comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1703909 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Sep 2015 17:20:24 +0000 (17:20 +0000)]
Propose mod_proxy fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1703907 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 18 Sep 2015 17:01:21 +0000 (17:01 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1703904 13f79535 -47bb-0310-9956-
ffa450edef68
Edward Lu [Tue, 1 Sep 2015 14:50:00 +0000 (14:50 +0000)]
Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1700585 13f79535 -47bb-0310-9956-
ffa450edef68
Edward Lu [Tue, 1 Sep 2015 14:37:38 +0000 (14:37 +0000)]
Revert accidental commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1700582 13f79535 -47bb-0310-9956-
ffa450edef68
Edward Lu [Tue, 1 Sep 2015 14:32:38 +0000 (14:32 +0000)]
Fix mod_mem_cache caching incomplete responses on connection abort
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1700578 13f79535 -47bb-0310-9956-
ffa450edef68
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
projects / thirdparty / apache / httpd.git / log
