]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Vincent Deffontaines [Wed, 31 Oct 2012 07:19:20 +0000 (07:19 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1404006 13f79535 -47bb-0310-9956-
ffa450edef68
Mark J. Cox [Tue, 30 Oct 2012 15:16:16 +0000 (15:16 +0000)]
Retrospectively assign CVE-2012-4557 as this issue had a similar
affect to CVE-2011-3348
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1403734 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 27 Oct 2012 10:23:04 +0000 (10:23 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1402778 13f79535 -47bb-0310-9956-
ffa450edef68
Igor Galić [Sat, 27 Oct 2012 10:21:23 +0000 (10:21 +0000)]
fixing according to comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1402777 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 25 Oct 2012 14:56:59 +0000 (14:56 +0000)]
retroactive CHANGES entry for r771433 (mod_headers couldn't fix a bad Content-Type)
which is in 2.2.12.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1402183 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 22 Oct 2012 06:09:05 +0000 (06:09 +0000)]
Adding documentation patch link for 'FallbackResource disabled' backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1400770 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 21 Oct 2012 06:14:02 +0000 (06:14 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1400575 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Mon, 15 Oct 2012 17:14:09 +0000 (17:14 +0000)]
Voting for my own proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1398394 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Sun, 14 Oct 2012 15:34:19 +0000 (15:34 +0000)]
Suggest backporting FallbackResource 'disabled' patch into 2.2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1398097 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 13 Oct 2012 14:29:11 +0000 (14:29 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1397838 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 12 Oct 2012 13:49:46 +0000 (13:49 +0000)]
re: apr 1.2 compat: I guess they're using a system apr and the OS
vendor is supplying security fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1397564 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 9 Oct 2012 21:06:59 +0000 (21:06 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1396321 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 9 Oct 2012 21:04:05 +0000 (21:04 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1396318 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 9 Oct 2012 11:53:48 +0000 (11:53 +0000)]
This is 2.2 docs, so let's actually put some line breaks into the RewriteLog example ;(
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395981 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 9 Oct 2012 11:50:31 +0000 (11:50 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395979 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Tue, 9 Oct 2012 11:36:36 +0000 (11:36 +0000)]
RewriteLog also supports logging to a pipe, so let's state that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395975 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 8 Oct 2012 18:35:19 +0000 (18:35 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395710 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 8 Oct 2012 17:54:57 +0000 (17:54 +0000)]
AllowAnyURI is 2.2.23 and later, not 2.2.22
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395695 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Oct 2012 06:44:45 +0000 (06:44 +0000)]
fix indentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395233 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Oct 2012 06:40:24 +0000 (06:40 +0000)]
committed in r1395231
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395232 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Oct 2012 06:39:16 +0000 (06:39 +0000)]
mod_ssl: Add new directive SSLCompression to disable
TLS-level compression.
PR 53219.
Backport of r1345319 and r1348656 from trunk.
Submitted by: Bjoern Jacke <bjoern j3e de>, sf
Reviewed by: rjung, kbrand
Backported by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395231 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 7 Oct 2012 06:35:51 +0000 (06:35 +0000)]
propose, vote, promote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1395229 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 3 Oct 2012 19:48:21 +0000 (19:48 +0000)]
Fix spelling mistake.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1393727 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 3 Oct 2012 14:49:52 +0000 (14:49 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1393518 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 3 Oct 2012 08:41:25 +0000 (08:41 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1393351 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 3 Oct 2012 08:38:47 +0000 (08:38 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.org>
Reviewed by: Orhan Berent <berent belgeler.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1393348 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 24 Sep 2012 10:44:34 +0000 (10:44 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1389285 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 24 Sep 2012 10:35:17 +0000 (10:35 +0000)]
Fixing a Spanish typo (as per comment #308 on site)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1389280 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 19 Sep 2012 07:46:35 +0000 (07:46 +0000)]
* APR-UTIL 1.3.x is outdated. We ship 2.2.x with 1.4.x. So point to it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1387477 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 18 Sep 2012 01:16:31 +0000 (01:16 +0000)]
Removed tabs and traling spaces.
Backport of r1375035 - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1386949 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 16 Sep 2012 14:54:31 +0000 (14:54 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1385275 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 14 Sep 2012 10:56:03 +0000 (10:56 +0000)]
propose SSLCompression backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1384718 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 13 Sep 2012 15:53:36 +0000 (15:53 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1384387 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Wed, 12 Sep 2012 17:45:04 +0000 (17:45 +0000)]
backport some typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1384050 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 11 Sep 2012 20:15:30 +0000 (20:15 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1383599 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 9 Sep 2012 13:48:11 +0000 (13:48 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1382502 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Mon, 3 Sep 2012 08:04:22 +0000 (08:04 +0000)]
Typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1380163 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 2 Sep 2012 13:34:35 +0000 (13:34 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379965 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 2 Sep 2012 08:48:04 +0000 (08:48 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379932 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 2 Sep 2012 08:44:36 +0000 (08:44 +0000)]
typo fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379930 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 20:01:37 +0000 (20:01 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379833 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 20:01:09 +0000 (20:01 +0000)]
reverting a revert of a typo fix :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379832 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 19:57:08 +0000 (19:57 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379831 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Sep 2012 15:53:27 +0000 (15:53 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379778 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 07:10:23 +0000 (07:10 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379706 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 07:04:25 +0000 (07:04 +0000)]
backport r1379311: Add a notion that, for a skip flag to be used, the rewrite rule has to first match (as per comment #211 on site)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379704 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 07:01:22 +0000 (07:01 +0000)]
backport r1379321: Note that using rewrites with a file-path substitution in a .htaccess file will look for files relative to your document root, not relative to your file system root.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379702 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 06:56:31 +0000 (06:56 +0000)]
backport r1379031: Note that AuthDBDUserRealmQuery is for Digest auth requests, not Basic auth.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379700 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 06:53:27 +0000 (06:53 +0000)]
backport r1378498: Fixing a copypasto as per comment #225 on the site.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379698 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sat, 1 Sep 2012 06:51:01 +0000 (06:51 +0000)]
backport r1379335: Add Redirect* to the list of directives that are controlled by AllowOverride FileInfo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379697 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Aug 2012 19:26:39 +0000 (19:26 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379557 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Aug 2012 19:24:59 +0000 (19:24 +0000)]
propose straight-to-2.2.x removal of APR1.3-ism apr_array_clear(),
reported a handful of times by users moving up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379556 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 31 Aug 2012 09:28:02 +0000 (09:28 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1379381 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 30 Aug 2012 15:23:46 +0000 (15:23 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1378987 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 30 Aug 2012 15:22:02 +0000 (15:22 +0000)]
processsed -> processed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1378985 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 30 Aug 2012 15:10:05 +0000 (15:10 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1378979 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 30 Aug 2012 15:08:10 +0000 (15:08 +0000)]
Fix broken link as per comment #245 on site.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1378977 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 25 Aug 2012 20:52:25 +0000 (20:52 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1377355 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 21 Aug 2012 18:19:09 +0000 (18:19 +0000)]
On to 2.2.24-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375705 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 21 Aug 2012 18:16:01 +0000 (18:16 +0000)]
Prepare to tag and roll, .23 is baked
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375703 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 21 Aug 2012 17:51:32 +0000 (17:51 +0000)]
* htdbm/htpasswd: fix handling of crypt() failures.
Backports: r1346905
Submitted by: Paul Wouters <pwouters redhat.com>, jorton
Reviewed by: rjung, trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375698 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 21 Aug 2012 17:48:58 +0000 (17:48 +0000)]
* include/util_ldap.h: Treat LDAP_UNAVAILABLE as a transient error
with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory.
Backports: r1348036
Submitted by: Filip Valder <filip.valder vsb.cz> (via RH bugzilla)
Reviewed by: rjung, fuankg, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375696 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 21 Aug 2012 17:45:59 +0000 (17:45 +0000)]
* core: add filesystem paths to some common error messages.
Backports: r1301504
Submitted by: covener
Reviewed by: rjung, trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375686 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 21 Aug 2012 17:42:49 +0000 (17:42 +0000)]
* core: Fix error handling in ap_scan_script_header_err_brigade() if there
is no EOS bucket in the brigade:
Also don't loop if there is a timeout when discarding the script output.
Thanks to Edgar Frank for the analysis.
Note CHANGES entry omits mention of non-2.2 mod_proxy_fcgi
Backports: r1311174
Submitted by: sf
Reviewed by: rjung, trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375683 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 21 Aug 2012 17:37:50 +0000 (17:37 +0000)]
* server/main.c (main): Bail out *before* signalling the server
if the config is bad. (as per the claim in the docs!)
Backports: r1328345
Submitted by: jorton
Reviewed by: rjung, trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375680 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 21 Aug 2012 17:32:04 +0000 (17:32 +0000)]
Reviewed and backporting now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375676 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Tue, 21 Aug 2012 12:49:13 +0000 (12:49 +0000)]
fix an grammatical error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375510 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 20 Aug 2012 19:24:30 +0000 (19:24 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375175 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 20 Aug 2012 19:23:21 +0000 (19:23 +0000)]
s/it's/its/ and fix another minor error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375173 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 20 Aug 2012 17:28:46 +0000 (17:28 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375118 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 20 Aug 2012 17:27:27 +0000 (17:27 +0000)]
fix xml syntax error in r1375113
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375116 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 20 Aug 2012 17:22:53 +0000 (17:22 +0000)]
Merge r1356115, r1356813, r1086662 (tiny subset), and r1032431 from trunk:
mod_rewrite: Add "AllowAnyURI" option. PR 52774. [Joe Orton]
mod_rewrite: Fix the RewriteEngine directive to work within a
location. Previously, once RewriteEngine was switched on globally,
it was impossible to switch off. [Graham Leggett]
Reviewed by: rjung, wrowe, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375113 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 20 Aug 2012 15:59:20 +0000 (15:59 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375081 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 20 Aug 2012 15:53:11 +0000 (15:53 +0000)]
mod_ssl: when compiled against OpenSSL 1.0.1 or later, allow explicit
control of TLSv1.1 and TLSv1.2 through the SSLProtocol directive,
adding TLSv1.1 and TLSv1.2 support by default given 'SSLProtocol All'.
Picked up comment edit, trusting openssl compilation state and current
method which openssl uses to include opensslconf.h - if this should be
refined, it needs to be refined for other openssl operations as well.
Any #define OPENSSL_* for httpd alone would be invalid, these are all
namespace protected by openssl.org project.
Submitted by: kbrand, wrowe
Backports:
1222921 ,
1222930 ,
1225476 ,
1225792
Reviewed by: sf, kbrand, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375076 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 20 Aug 2012 15:28:57 +0000 (15:28 +0000)]
Promoted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1375059 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 19 Aug 2012 19:04:07 +0000 (19:04 +0000)]
Vote and correct comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374818 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sun, 19 Aug 2012 18:29:21 +0000 (18:29 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374813 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 19 Aug 2012 11:28:03 +0000 (11:28 +0000)]
Comment on TLSv1.1/.2 patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374734 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sun, 19 Aug 2012 08:16:22 +0000 (08:16 +0000)]
vote, comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374708 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Sat, 18 Aug 2012 19:32:38 +0000 (19:32 +0000)]
Patch and STATUS updated to reflect the fix to [+]SSLv2 noted by kbrand.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374640 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 18 Aug 2012 15:21:15 +0000 (15:21 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374597 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 18 Aug 2012 14:22:13 +0000 (14:22 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374586 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 18 Aug 2012 13:56:53 +0000 (13:56 +0000)]
add a link to Windows platform documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374581 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 18 Aug 2012 13:18:50 +0000 (13:18 +0000)]
another easily-reviewed patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374575 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 18 Aug 2012 11:46:02 +0000 (11:46 +0000)]
a few votes on simple patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374561 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 18 Aug 2012 09:32:36 +0000 (09:32 +0000)]
mod_log_config: %{abc}C truncates cookies whose values contain '='.
PR 53104
Backport of r1328133 from trunk resp. r1359690 from 2.4.
Submitted by: gregames
Reviewed by: trawick, wrowe
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374538 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 18 Aug 2012 09:25:46 +0000 (09:25 +0000)]
core: (dummy_connection): Destroy tmp pool and
return on connect() failure. Fixes small memory
leak for Unix MPMs in parent process if connect()
failed when waking up children.
Backport of r1300171 from trunk resp. r1301649 from 2.4.x.
Submitted by: jorton
Reviewed by: trawick, wrowe
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374537 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 18 Aug 2012 09:20:53 +0000 (09:20 +0000)]
mod_proxy_balancer: fix error message implying recovery
during a markdown.
Backport of r1299738 from trunk resp. r1301194 from 2.4.x.
Submitted by: covener
Reviewed by: trawick, wrowe
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374534 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 18 Aug 2012 06:46:19 +0000 (06:46 +0000)]
comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374517 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 17 Aug 2012 22:42:11 +0000 (22:42 +0000)]
vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374462 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 17 Aug 2012 20:55:46 +0000 (20:55 +0000)]
Vote, promote obvious fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374435 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 17 Aug 2012 20:17:59 +0000 (20:17 +0000)]
mod_negotiation: Escape filenames in variant list
to prevent an possible XSS for a site where untrusted
users can upload files to a location with MultiViews
enabled.
SECURITY: CVE-2012-2687 (cve.mitre.org):
Submitted by: Niels Heinen <heinenn google.com>
Reviewed by: trawick, wrowe
Backported by: rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374421 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 17 Aug 2012 20:00:59 +0000 (20:00 +0000)]
Looks sensible, allows workaround of a regression for cautious users
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374419 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 17 Aug 2012 19:57:17 +0000 (19:57 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374418 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 17 Aug 2012 19:38:12 +0000 (19:38 +0000)]
vote on some simple proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374405 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 17 Aug 2012 17:37:09 +0000 (17:37 +0000)]
mod_proxy_ajp: Add support for 'ProxyErrorOverride on'.
PR: 50945
Submitted by: Peter Pramberger <peter pramberger.at>, jim
Reviewed by: igalic, rpluem
Backports: r1087864
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374375 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 17 Aug 2012 17:30:46 +0000 (17:30 +0000)]
mod_ssl: Add SSLProxyMachineCertificateChainFile directive uses openssl
to construct a chain for each proxy cert. When a remote server requests
a client certificate that is NOT the direct issuer of any available client
certificate, the chain for that certificate will be used to trace it to a
known CA and that client certificate will be used.
Submitted by: druggeri
Reviewed by: kbrand, rpluem
Backports:
1160863 ,
1162103 ,
1170833 ,
1172010 ,
1175946 ,
1242089
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374374 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Fri, 17 Aug 2012 15:45:28 +0000 (15:45 +0000)]
mpm_event, mpm_worker: Remain active amidst prevalent child process
resource shortages.
Submitted by: trawick
Reviewed by: wrowe, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374330 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 17 Aug 2012 14:29:40 +0000 (14:29 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374287 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 17 Aug 2012 11:49:19 +0000 (11:49 +0000)]
Fixed broken *_DECLARE_DATA section.
Seems our preprocessor is some crazy and inserts a blank
after replacing a define which made the awk script fail.
Patch submitted by: normw gknw net (Backport r1305192).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1374210 13f79535 -47bb-0310-9956-
ffa450edef68