]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Jeff Trawick [Wed, 29 May 2013 12:35:00 +0000 (12:35 +0000)]
mergeinfo for r1487458
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1487459 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 29 May 2013 12:33:59 +0000 (12:33 +0000)]
grab r1487451 from trunk:
s/proxy image/proxy/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1487458 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 24 May 2013 12:17:05 +0000 (12:17 +0000)]
Withdraw proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1486032 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 23 May 2013 16:25:25 +0000 (16:25 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1485769 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 23 May 2013 16:20:26 +0000 (16:20 +0000)]
Let v2.2 users enjoy the goodness. Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1485766 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 23 May 2013 13:12:44 +0000 (13:12 +0000)]
mod_ssl: Quiet FIPS mode weak keys disabled and FIPS not selected emits
in the error log to debug level.
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=
1447993
2.2.x patch: http://people.apache.org/~wrowe/httpd-2.2-quiet-fips.patch
Submitted by: wrowe
Reviewed by: druggeri, kbrand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1485689 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 23 May 2013 13:09:24 +0000 (13:09 +0000)]
Promote, noting wrowe's -1 becoming +1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1485688 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 23 May 2013 13:06:55 +0000 (13:06 +0000)]
Propose DAV fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1485685 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 20 May 2013 20:13:31 +0000 (20:13 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1484578 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 20 May 2013 13:01:17 +0000 (13:01 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1484464 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 19 May 2013 15:16:36 +0000 (15:16 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1484293 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 17 May 2013 18:20:07 +0000 (18:20 +0000)]
NetWare build: dont make the svn revision file a dependency.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1483943 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 14 May 2013 14:41:30 +0000 (14:41 +0000)]
* mod_rewrite: Ensure that client data written to the RewriteLog is
escaped to prevent terminal escape sequences from entering the
log file. (CVE-2013-1862 (cve.mitre.org))
Submitted by: jorton
Reviewed by: jorton, covener, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1482349 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 14 May 2013 14:40:49 +0000 (14:40 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1482348 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 14 May 2013 01:24:07 +0000 (01:24 +0000)]
NetWare build: make use of SVN revision optional.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1482168 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Tue, 14 May 2013 00:51:01 +0000 (00:51 +0000)]
Use SVN revision for NetWare dev builds version info.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1482160 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Fri, 10 May 2013 15:33:21 +0000 (15:33 +0000)]
Kill some NetWare build warnings (backport r1481040).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1481055 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 10 May 2013 08:13:21 +0000 (08:13 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1480920 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 10 May 2013 08:10:51 +0000 (08:10 +0000)]
some more typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1480918 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:32:03 +0000 (08:32 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1479260 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Sun, 5 May 2013 08:23:23 +0000 (08:23 +0000)]
typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1479257 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 29 Apr 2013 11:26:06 +0000 (11:26 +0000)]
Remove duplication.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476971 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 29 Apr 2013 11:15:10 +0000 (11:15 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476967 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 28 Apr 2013 15:53:42 +0000 (15:53 +0000)]
Add note about patch update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476789 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 28 Apr 2013 13:30:13 +0000 (13:30 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476763 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 22:23:14 +0000 (22:23 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476687 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sat, 27 Apr 2013 18:31:19 +0000 (18:31 +0000)]
Correct the ProxyIOBufferSize docs to match the code. Add a note about the AJP
behaviour as per http://www.mail-archive.com/dev@httpd.apache.org/msg41843.html.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476655 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 26 Apr 2013 14:58:20 +0000 (14:58 +0000)]
htdigest: Fix buffer overflow when reading digest
password file with very long lines.
PR 54893.
Backport of r1475878 from trunk resp.
r1476089 from 2.4.x.
Proposed/Backported by: rjung
Reviewed by: humbedooh, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476242 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 26 Apr 2013 08:31:48 +0000 (08:31 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476099 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 26 Apr 2013 07:43:39 +0000 (07:43 +0000)]
Update proposal with 2.4 reference.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1476090 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 25 Apr 2013 18:20:23 +0000 (18:20 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1475887 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 25 Apr 2013 18:14:05 +0000 (18:14 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1475882 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 22 Apr 2013 15:55:10 +0000 (15:55 +0000)]
mod_proxy_balancer: Correct doubled-slash ProxyPassReverse
PR: 51489 51982
Backports: r1386576, r1386578
Submitted by: jimjag
Reviewed by: wrowe, druggeri, humbedooh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1470592 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Fri, 19 Apr 2013 05:50:29 +0000 (05:50 +0000)]
vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1469707 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 18 Apr 2013 14:49:59 +0000 (14:49 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1469355 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 18 Apr 2013 13:27:12 +0000 (13:27 +0000)]
Propose minor security fix for mod_rewrite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1469311 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Mon, 15 Apr 2013 15:59:05 +0000 (15:59 +0000)]
update comment, and move proposal to stalled section for 2.2.x, too
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1468132 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sun, 14 Apr 2013 15:49:18 +0000 (15:49 +0000)]
Include all trunk patches
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1467794 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Sat, 13 Apr 2013 11:25:02 +0000 (11:25 +0000)]
propose, vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1467594 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 13 Apr 2013 00:33:32 +0000 (00:33 +0000)]
Vote on easy one to review/test
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1467528 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 13 Apr 2013 00:17:33 +0000 (00:17 +0000)]
not 2014 yet... I should get away from the keyboard now...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1467526 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 13 Apr 2013 00:13:21 +0000 (00:13 +0000)]
Updated patch - thanks, Bill
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1467524 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 12 Apr 2013 19:35:41 +0000 (19:35 +0000)]
Something to ponder this weekend
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1467435 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 12 Apr 2013 19:32:55 +0000 (19:32 +0000)]
Belated explantion for druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1467433 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 11 Apr 2013 00:08:54 +0000 (00:08 +0000)]
Applied.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1466741 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 11 Apr 2013 00:08:20 +0000 (00:08 +0000)]
install.log output tweaks; reduced path convertion.
Backport r1390511.
Submitted/backported by: fuankg
Reviewed by: druggeri, gsmith
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1466739 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Wed, 10 Apr 2013 19:02:44 +0000 (19:02 +0000)]
vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1466624 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 9 Apr 2013 21:24:32 +0000 (21:24 +0000)]
A few votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1466246 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 9 Apr 2013 21:10:15 +0000 (21:10 +0000)]
Propose an easy one
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1466241 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Wed, 27 Mar 2013 19:55:06 +0000 (19:55 +0000)]
Missing newline
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1461825 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 Mar 2013 14:43:45 +0000 (14:43 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1451893 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 2 Mar 2013 04:56:40 +0000 (04:56 +0000)]
Add backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1451834 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 27 Feb 2013 00:37:12 +0000 (00:37 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1450551 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 27 Feb 2013 00:36:28 +0000 (00:36 +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@
1450549 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 24 Feb 2013 20:09:54 +0000 (20:09 +0000)]
Rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1449542 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 24 Feb 2013 20:08:58 +0000 (20:08 +0000)]
Those are separate docs now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1449541 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 24 Feb 2013 19:32:21 +0000 (19:32 +0000)]
Update xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1449536 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 24 Feb 2013 17:55:41 +0000 (17:55 +0000)]
These are separate docs now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1449513 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Sun, 24 Feb 2013 17:41:37 +0000 (17:41 +0000)]
These are two separate docs now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1449511 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 23 Feb 2013 14:00:36 +0000 (14:00 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1449319 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 21 Feb 2013 11:49:46 +0000 (11:49 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1448611 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Gruno [Thu, 21 Feb 2013 11:42:27 +0000 (11:42 +0000)]
add SSL_TLS_SNI to the list of variables
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1448601 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 20 Feb 2013 04:18:43 +0000 (04:18 +0000)]
Propose to quiet FIPS mode
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447995 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Feb 2013 23:16:05 +0000 (23:16 +0000)]
To 2.2.25, and beyond
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447547 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Feb 2013 23:04:30 +0000 (23:04 +0000)]
Tagging 2.2.24
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447537 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 22:10:06 +0000 (22:10 +0000)]
Fix typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447520 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 22:08:23 +0000 (22:08 +0000)]
Xforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447518 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 21:31:42 +0000 (21:31 +0000)]
mod_rewrite: Add an opt-in RewriteOption to control
merging of RewriteBase. Merging was off until 2.2.22
and turned on unconditionally in 2.2.23.
PR 53963.
Submitted by: covener
Backport by: rjung
Reviewed by: wrowe, covener
Merge of r1410681 and r1447426 from trunk resp.
r1418954 and r1447448 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447508 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 21:09:59 +0000 (21:09 +0000)]
Promote.
I'm going to commit this soon.
We can revert if anyone wants to -1 it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447500 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Feb 2013 20:57:32 +0000 (20:57 +0000)]
That makes more sense, thanks for pointers on list
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447489 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Feb 2013 20:21:11 +0000 (20:21 +0000)]
Clarify changes to show the assignment of CVE-2012-3499 and
CVE-2012-4558.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447462 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 20:18:00 +0000 (20:18 +0000)]
Add backport revision.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447457 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 18 Feb 2013 19:30:58 +0000 (19:30 +0000)]
vote and leave reminder for doc tweak
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447447 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 19:11:43 +0000 (19:11 +0000)]
Fix URL in STATUS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447441 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 19:09:51 +0000 (19:09 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447438 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 16:52:21 +0000 (16:52 +0000)]
- various mods: host and URI escaping:
Be sure to escape potential troubled strings,
add missing html escaping
- const fixes for mod_imagemap
Submitted by: jim, sf, covener
Backported by: rjung
Reviewed by: rpluem, wrowe
Backport of r1413732, r1418752, r1416889, r1422234 and r1422253
from trunk resp. r1418941 and r1425750 from 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447390 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 18 Feb 2013 16:45:24 +0000 (16:45 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447387 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Mon, 18 Feb 2013 16:19:15 +0000 (16:19 +0000)]
One patch needs to be rethought, another is ready to go
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1447372 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sat, 16 Feb 2013 22:51:16 +0000 (22:51 +0000)]
Fix compile breakage introduced by backport
error in r1445100.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446972 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 16 Feb 2013 18:27:36 +0000 (18:27 +0000)]
* Withdraw comment and vote as test was fixed in r1446920 to expect URI encode referer instead of HTML escape one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446921 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Sat, 16 Feb 2013 18:18:31 +0000 (18:18 +0000)]
* Answer to Rainer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446919 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Feb 2013 15:37:11 +0000 (15:37 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446908 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 15 Feb 2013 19:28:26 +0000 (19:28 +0000)]
Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446736 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 15 Feb 2013 18:43:26 +0000 (18:43 +0000)]
* Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446722 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 15 Feb 2013 16:39:45 +0000 (16:39 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446677 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 15 Feb 2013 15:50:37 +0000 (15:50 +0000)]
When receiving http on https, send the error response with http 1.0
It is important that we send a proper error status, or search engines
may index the error message.
Remove the link in the speaking-http-on-https error message.
With SNI, the link will usually be wrong. So better send no link at all.
PR: 50823
Backport of r1328325 and r1328326 from trunk resp.
r1334346 from 2.4.x.
Submitted by: sf
Backported by: rjung
Reviewed by: wrowe, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446642 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 15 Feb 2013 15:42:12 +0000 (15:42 +0000)]
mod_ssl: log revoked certificates at level INFO
instead of DEBUG.
PR 52162
Partial backport of r1165056 from trunk/2.4.x.
Submitted by: sf
Backported by: rjung
Reviewed by: wrowe, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446637 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 15 Feb 2013 15:09:44 +0000 (15:09 +0000)]
mod_proxy_ajp: Support unknown HTTP methods.
BZ 54416
Forward unknown methods as request attributes
using method id SC_M_JK_STORED=0xFF and
request attribute id SC_A_STORED_METHOD=13.
Code ported from mod_jk (which got it from mod_jk2).
Supported by Tomcat at least since TC 4.1.
Doesn't seem to be supported by Jetty though.
Backport of r1435178 from trunk resp. r1436400
from 2.4.x.
Submitted/backported by: rjung
Reviewed by: wrowe, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446624 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 15 Feb 2013 14:59:23 +0000 (14:59 +0000)]
withdraw vote, missed a change in the attachment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446619 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 15 Feb 2013 13:51:28 +0000 (13:51 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446582 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 14 Feb 2013 01:06:38 +0000 (01:06 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446010 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Thu, 14 Feb 2013 01:03:24 +0000 (01:03 +0000)]
Reconcile contradictory statements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1446007 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 Feb 2013 12:27:06 +0000 (12:27 +0000)]
FallbackResource: Support for the 'disabled' argument
Backport of r1398066 from trunk resp. r1416585 form 2.4.x.
Submitted by: gryzor
Reviewed by: wrowe, rjung
Backported by: gryzor
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1445133 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 Feb 2013 12:08:45 +0000 (12:08 +0000)]
Remove stray leftover from incomplete merge in r1445100.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1445120 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 Feb 2013 12:07:32 +0000 (12:07 +0000)]
mod_ldap: Fix regression in handling "server unavailable" errors on
Windows. Followup to r1375696.
PR 54140.
Backport of r1408402 from trunk resp. r1409773 from 2.4.x.
Submitted by: covener
Reviewed by: wrowe, rjung
Backported by: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1445119 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 Feb 2013 12:01:29 +0000 (12:01 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1445118 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 Feb 2013 11:54:23 +0000 (11:54 +0000)]
Demote, a backport condition is not met yet.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1445115 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 Feb 2013 11:51:17 +0000 (11:51 +0000)]
* mod_ssl: fix UID env var regression introduced in 2.2.15.
PR54510.
Submitted by: kbrand
Reviewed by: druggeri, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1445112 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 Feb 2013 11:42:47 +0000 (11:42 +0000)]
Vote -1 and comment on one proposal, demote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1445109 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 12 Feb 2013 11:21:15 +0000 (11:21 +0000)]
Allow forced setting of TLS1.1 and TLS1.2 protocols with
the -f command-line switch, and adapt the output to more accurately
report what SSL/TLS protocol was negotiated (use SSL_get_version()
instead of SSL_CIPHER_get_version()).
PR: 53916
Backport of r1395225 from trunk resp. r1400946 from 2.4.x
Submitted by: Nicolás Pernas Maradei <nico emutex com>
Reviewed/amended by: kbrand, covener, wrowe
Backported by: kbrand
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1445104 13f79535 -47bb-0310-9956-
ffa450edef68