]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Jim Jagielski [Mon, 11 Nov 2013 14:00:57 +0000 (14:00 +0000)]
Merge r834378, r835046, r1040304, r1040373, r1090645, r1294306, r1509872, r1308862, r1509875 from trunk:
enable support for ECC keys and ECDH ciphers. Tested against
OpenSSL 1.0.0b3. [Vipul Gupta vipul.gupta sun.com, Sander Temme]
* Use correct #ifndef's to compile again on openssl 0.9.8 and fix compiler
warnings.
Noted by: sf
Removed unused var.
Stop warning, init should be an int.
Remove unused variable
Initialize EC temporary key on server startup, as for DH and
RSA. This fixes a race condition that could lead to a crash with threaded
MPMs.
Mention ECC support
Submitted by: sctemme, rpluem, fuankg, drh, sf, sf, sf, jim, sf
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1540727 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 11 Nov 2013 13:58:18 +0000 (13:58 +0000)]
Note T&R (possible) this week
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1540725 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 30 Oct 2013 19:05:25 +0000 (19:05 +0000)]
All proposed patch sets look smart, all but one cure regressions,
and ECC support seems overdue and looks minimalistic/clean.
Voted and all promoted.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1537245 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 21 Oct 2013 15:26:23 +0000 (15:26 +0000)]
It works better when one test's the correct patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1534217 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Sun, 20 Oct 2013 18:44:33 +0000 (18:44 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1533948 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 19 Oct 2013 14:12:58 +0000 (14:12 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1533770 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 19 Oct 2013 12:49:14 +0000 (12:49 +0000)]
Remove erroneous space reported in pr55676
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1533748 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Oct 2013 17:44:34 +0000 (17:44 +0000)]
generated from "make docs"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1532828 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 16 Oct 2013 17:39:21 +0000 (17:39 +0000)]
Merge r1532816 from trunk:
Interpolation worked within the scheme portion of URLs for
ProxyPass and ProxyPassReverse until a fix to apr_uri_parse()
in APR-Util 1.5.2 closed the hole that had previously allowed
the necessary {} characters within the scheme.
Lack of support for interpolation within the scheme will be a
permanent limitation.
The mod_proxy documentation is updated to provide an alternate
configuration solution.
PR: 55315
Submitted by: Mike Rumph <mike.rumph oracle.com>
Tweaked by: trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1532825 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 13 Oct 2013 11:51:03 +0000 (11:51 +0000)]
Vote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1531670 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Sun, 13 Oct 2013 00:28:27 +0000 (00:28 +0000)]
* STATUS: Nominate PR 55397 for 2.2.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1531607 13f79535 -47bb-0310-9956-
ffa450edef68
Ben Reser [Thu, 3 Oct 2013 06:45:32 +0000 (06:45 +0000)]
Propose fix for PR 55306.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1528731 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 3 Sep 2013 06:28:59 +0000 (06:28 +0000)]
Add missing space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1519580 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Wed, 21 Aug 2013 20:00:38 +0000 (20:00 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1516282 13f79535 -47bb-0310-9956-
ffa450edef68
Vincent Deffontaines [Wed, 21 Aug 2013 18:55:47 +0000 (18:55 +0000)]
#55441 fix - document that SetEnv cannot set PATH in 2.2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1516258 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 19 Aug 2013 19:25:31 +0000 (19:25 +0000)]
2*done, 1*vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1515572 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 19 Aug 2013 19:24:16 +0000 (19:24 +0000)]
Merge
1506714 from trunk:
Fix bug #55304 with the provided patch, slightly reformatted.
In short: do not validate conditions of a COPY source's parent since
it is not modified during the operation.
* modules/dav/main/mod_dav.c:
(dav_method_copymove): adjust params to dav_validate_request()
PR: 55304
Submitted by: breser
Reviewed by: gstein, wrowe, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1515569 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 19 Aug 2013 19:17:14 +0000 (19:17 +0000)]
Merge
1082189 from trunk:
* modules/ssl/ssl_engine_kernel.c (ssl_hook_ReadReq): Compare SNI
hostname against Host header case-insensitively.
PR: 49491
Submitted by: Mayank Agrawal <magrawal.08 gmail.com>
Reviewed by: rpluem, trawick, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1515565 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 19 Aug 2013 18:09:12 +0000 (18:09 +0000)]
merge covener and rpluem proposals for r1082190, vote for improved ECC patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1515540 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 19 Aug 2013 18:07:32 +0000 (18:07 +0000)]
revert unintentional commit r1515537
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1515539 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Mon, 19 Aug 2013 18:04:16 +0000 (18:04 +0000)]
2 votes in one proposal for
1082189 and 1 vote in another = approval
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1515537 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 19 Aug 2013 17:32:32 +0000 (17:32 +0000)]
propose SNI fix for 2.2.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1515522 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 16 Aug 2013 06:20:04 +0000 (06:20 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1514592 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Fri, 16 Aug 2013 06:16:41 +0000 (06:16 +0000)]
update for sync with English docs.
Translated by: Nilgün Belma Bugüner <nilgun belgeler.gen.tr>
Reviewed by: Orhan Berent <berent belgeler.gen.tr>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1514591 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Mon, 12 Aug 2013 19:06:27 +0000 (19:06 +0000)]
update patch, reply
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1513223 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 10 Aug 2013 11:40:26 +0000 (11:40 +0000)]
complain^H^H^H^H^H^H^Hask humbly about a missing feature in the ECC proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1512644 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Fri, 9 Aug 2013 19:21:42 +0000 (19:21 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1512459 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 8 Aug 2013 14:24:54 +0000 (14:24 +0000)]
fix mod_ssl config buglet
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1511801 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 8 Aug 2013 14:18:36 +0000 (14:18 +0000)]
fix a few indentation oddities which are already resolved in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1511798 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 3 Aug 2013 17:35:21 +0000 (17:35 +0000)]
Merge r1485409:
Be more clever when allocating memory for log item to be escaped.
This should be faster and save about 70-100 bytes in the request pool with the default config.
Reviewed by: minfrin, rjung, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1510044 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 3 Aug 2013 17:32:12 +0000 (17:32 +0000)]
Merge r1400700:
Change default for SSLCompression to off, as compression
causes security issues in most setups
Reviewed by sf, fuankg, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1510043 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Sat, 3 Aug 2013 17:19:11 +0000 (17:19 +0000)]
The first release with SSLProxyMachineCertificateChainFile was 2.2.23, not 2.2.22.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1510041 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 2 Aug 2013 22:27:40 +0000 (22:27 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1509895 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Jul 2013 13:58:00 +0000 (13:58 +0000)]
Update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1507642 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 Jul 2013 14:34:06 +0000 (14:34 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1507336 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 Jul 2013 14:27:27 +0000 (14:27 +0000)]
Merge r1507326 from trunk:
add a note that proxy environment variables are either set or unset,
unless specific values are listed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1507329 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 26 Jul 2013 14:21:54 +0000 (14:21 +0000)]
Merge r1507320 from trunk:
1-arg SetEnv is valid
http://httpd.apache.org/docs/2.2/mod/mod_proxy_http.html#comment_1528
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1507323 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 25 Jul 2013 12:05:24 +0000 (12:05 +0000)]
vote (hostnames are case-insignificant)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1506920 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 Jul 2013 11:23:47 +0000 (11:23 +0000)]
* Promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1506900 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 Jul 2013 11:22:34 +0000 (11:22 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1506899 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 25 Jul 2013 11:08:49 +0000 (11:08 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1506886 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 25 Jul 2013 00:26:33 +0000 (00:26 +0000)]
Concur
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1506788 13f79535 -47bb-0310-9956-
ffa450edef68
Greg Stein [Wed, 24 Jul 2013 21:19:48 +0000 (21:19 +0000)]
propose r1506714 for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1506722 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Jul 2013 16:39:15 +0000 (16:39 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1505166 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 10 Jul 2013 18:39:34 +0000 (18:39 +0000)]
Done
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1501906 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 10 Jul 2013 17:50:10 +0000 (17:50 +0000)]
correct year
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1501879 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 10 Jul 2013 10:32:28 +0000 (10:32 +0000)]
Updated fix for issue which was initially addressed in r1500108:
mod_ssl: Fix "SNI for backend" when compiled against
OpenSSL without support for SSLv2.
PR 55194.
Followup to r1497466. Does not apply to trunk or 2.4.x.
Proposed by: kbrand
Reviewed by: wrowe, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1501712 13f79535 -47bb-0310-9956-
ffa450edef68
Kaspar Brand [Wed, 10 Jul 2013 10:31:24 +0000 (10:31 +0000)]
Revert r1500108 (as discussed on dev@, to be updated
with the next commit):
mod_ssl: Fix "SNI for backend" when compiled against
OpenSSL without support for SSLv2.
PR 55194.
Followup to r1497466. Does not apply to trunk or 2.4.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1501710 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Tue, 9 Jul 2013 18:08:01 +0000 (18:08 +0000)]
Note security implication
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1501414 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 8 Jul 2013 06:47:34 +0000 (06:47 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500589 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 7 Jul 2013 09:03:06 +0000 (09:03 +0000)]
Typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500387 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 6 Jul 2013 21:58:04 +0000 (21:58 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500330 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Sat, 6 Jul 2013 21:54:19 +0000 (21:54 +0000)]
Merge r1500323 (add note when default algorithm has been changed) and add
warning about crypt alogrithm from 2.4 man page
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500329 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Jul 2013 14:31:40 +0000 (14:31 +0000)]
Updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500278 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 6 Jul 2013 00:54:44 +0000 (00:54 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500185 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 6 Jul 2013 00:49:39 +0000 (00:49 +0000)]
Applied.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500184 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Sat, 6 Jul 2013 00:48:47 +0000 (00:48 +0000)]
Avoid including apr_general.h.
The MSVC Resource Compiler truncates macro names at char 31.
Since apr_general.h includes apr.h which in turn includes
system headers we get warnings or errors with the Resource
Compiler with newer system headers (VC10 and later) which
have macro names defined with more than 31 chars.
(backport from trunk r1499742 / httpd-2.4.x r1499855)
Reviewed by: gsmith, sf
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500183 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Fritsch [Fri, 5 Jul 2013 22:15:10 +0000 (22:15 +0000)]
vote, promote, propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500151 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 5 Jul 2013 19:25:28 +0000 (19:25 +0000)]
mod_ssl: Fix "SNI for backend" when compiled against
OpenSSL without support for SSLv2.
PR 55194.
Followup to r1497466. Does not apply to trunk or 2.4.x.
Proposed by: rjung
Reviewed by: covener, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1500108 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Thu, 4 Jul 2013 20:43:53 +0000 (20:43 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1499864 13f79535 -47bb-0310-9956-
ffa450edef68
Guenter Knauf [Thu, 4 Jul 2013 20:25:31 +0000 (20:25 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1499859 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Wed, 3 Jul 2013 20:53:48 +0000 (20:53 +0000)]
v+p
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1499554 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 3 Jul 2013 20:35:49 +0000 (20:35 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1499547 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 3 Jul 2013 20:34:46 +0000 (20:34 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1499546 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 28 Jun 2013 20:33:30 +0000 (20:33 +0000)]
And on to .26
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497916 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Fri, 28 Jun 2013 20:31:53 +0000 (20:31 +0000)]
Preparing to tag 2.2.25
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497913 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 27 Jun 2013 23:10:28 +0000 (23:10 +0000)]
Slight clarification of CHANGES entry.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497607 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 27 Jun 2013 22:39:21 +0000 (22:39 +0000)]
Fix indentation.
No functional change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497597 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 27 Jun 2013 22:35:39 +0000 (22:35 +0000)]
Fix indentation (plus now needed line-wrap).
No functional change.
Followup to r1497435.
Backport of r1497588 (trunk) resp.
r1486454 (2.4.x).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497594 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 27 Jun 2013 22:20:22 +0000 (22:20 +0000)]
Answer question.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497587 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 17:31:21 +0000 (17:31 +0000)]
Re-sort into the right release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497472 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 17:29:17 +0000 (17:29 +0000)]
mod_proxy_http: Use the same hostname for SNI as for the HTTP request when
forwarding to SSL backends.
PR: 53134
Backports: r1333969
Submitted by: Michael Weiser <michael weiser.dinsnail.net>, rpluem
Reviewed by: covener, wrowe, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497470 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 17:24:58 +0000 (17:24 +0000)]
mod_ssl/proxy: enable the SNI extension for backend TLS connections
Backports: r1175416
Submitted by: kbrand
Reviewed by: wrowe, rjung, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497466 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 17:21:42 +0000 (17:21 +0000)]
mod_dav: Do not segfault on PROPFIND with a zero length DBM.
PR: 52559
Backports: r1476645
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: rjung, wrowe, trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497463 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 17:16:56 +0000 (17:16 +0000)]
mod_dav: Do not fail PROPPATCH when prop namespace is not known.
PR: 52559
Backports: r1476644
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, wrowe, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497457 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 17:13:45 +0000 (17:13 +0000)]
mod_dav: When a PROPPATCH attempts to remove a non-existent dead
property on a resource for which there is no dead property in the same
namespace httpd segfaults.
PR: 52559
Backports: r1476642
Submitted by: Diego Santa Cruz <diego.santaCruz spinetix.com>
Reviewed by: minfrin, wrowe, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497455 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 17:02:29 +0000 (17:02 +0000)]
Reorder and regroup a bit for clarity
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497445 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 16:59:04 +0000 (16:59 +0000)]
core: Support the SINGLE_LISTEN_UNSERIALIZED_ACCEPT optimization
on Linux kernel versions 3.x and above.
PR: 55121
Backports: r1496429
Submitted by: Bradley Heilbrun <apache heilbrun.org>
Reviewed by: trawick, wrowe, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497443 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 27 Jun 2013 16:54:47 +0000 (16:54 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497442 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 16:54:14 +0000 (16:54 +0000)]
mod_dav: Sending an If or If-Match header with an invalid ETag doesn't
result in a 412 Precondition Failed for a COPY operation.
PR: 54610
Submitted by: Timothy Wood <tjw omnigroup com>
Backports: r1476604 (2.4: r1486456)
Reviewed by: minfrin, wrowe, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497441 13f79535 -47bb-0310-9956-
ffa450edef68
Jeff Trawick [Thu, 27 Jun 2013 16:48:13 +0000 (16:48 +0000)]
add CHANGES entries for r1497429
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497437 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 16:44:56 +0000 (16:44 +0000)]
mod_dav: Make sure that when we prepare an If URL for Etag comparison,
we compare unencoded paths.
PR: 53910
Submitted by: Timothy Wood <tjw omnigroup com>
Backports: r1470940, r1477530
Reviewed by: minfrin, wrowe, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497435 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 27 Jun 2013 16:29:37 +0000 (16:29 +0000)]
* core: Limit ap_pregsub() to 64MB, add ap_pregsub_ex() for longer strings.
The default limit can be adjusted at compile time using AP_PREGSUB_MAXLEN.
mod_setenvif: Log error on substitution overflow.
Submitted by: trawick
Reviewed by: trawic, wrowe, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497429 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 27 Jun 2013 16:27:07 +0000 (16:27 +0000)]
promote regex limit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497427 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 16:22:31 +0000 (16:22 +0000)]
mod_proxy_balancer: Add failontimeout parameter. Timeout will put worker
in error state if an IO timeout is detected.
Backports: r1465839
Submitted by: druggeri
Reviewed by: druggeri, wrowe, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497423 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 16:18:25 +0000 (16:18 +0000)]
Votes, promotions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497421 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 27 Jun 2013 06:24:46 +0000 (06:24 +0000)]
Vote, comment, propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497220 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 27 Jun 2013 05:12:02 +0000 (05:12 +0000)]
Fix build breakage introduced by the backport
in r1497101.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497212 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Thu, 27 Jun 2013 03:36:29 +0000 (03:36 +0000)]
Missed a source Copyright
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497202 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:47:49 +0000 (21:47 +0000)]
Clean up cruft
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497122 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:44:43 +0000 (21:44 +0000)]
mod_dav: Ensure URI is correctly uriencoded on return.
PR: 54611
Backports: r1476621
Submitted by: Timothy Wood <tjw omnigroup com>
Reviewed by: minfrin, trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497121 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:39:09 +0000 (21:39 +0000)]
votes, promote one
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497118 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:33:43 +0000 (21:33 +0000)]
Additional info for reviewers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497115 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:27:39 +0000 (21:27 +0000)]
Mop up cruft from r1497095 merge
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497110 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:16:53 +0000 (21:16 +0000)]
mod_dav: Sending a MERGE request against a URI handled by mod_dav_svn with
the source href (sent as part of the request body as XML) pointing to a
URI that is not configured for DAV will trigger a segfault.
Backports: r1485668
Reviewed by: minfrin, trawick, wrowe
Submitted by: Ben Reser <ben reser.org>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497101 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:10:54 +0000 (21:10 +0000)]
mod_cache: Fix uninitialized tmppath variable.
PR: 54949
Submitted by: <jkaluza redhat.com>
Reviewed by: minfrin, trawick, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497099 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:07:06 +0000 (21:07 +0000)]
mod_ssl: Catch missing, mismatched or encrypted client cert/key pairs
with SSLProxyMachineCertificateFile/Path directives.
(check at startup, to prevent segfaults at proxy request time)
PR: 52212, 54698
Backports: r1374214, r1374216, r1375445, r1467593
Submitted by: Keith Burdis <keith burdis.org>, Joe Orton, Kaspar Brand
Reviewed by: kbrand, minfrin, wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497096 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 21:03:33 +0000 (21:03 +0000)]
mod_authnz_ldap: Allow using exec: callouts like SSLPassphraseDialog
for AuthLDAPBindPassword.
Backports: r1433478, r1467523, r1467792
Submitted by: druggeri
Reviewed by: minfrin. wrowe
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497095 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 26 Jun 2013 20:11:17 +0000 (20:11 +0000)]
Those who did the real work backporting this headache should
take most of the blame^Wcredit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497069 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 26 Jun 2013 17:11:39 +0000 (17:11 +0000)]
Promote pcre fix to SHOWSTOPPER for one more review
Vote and promote two patches
Propose backporting enable SNI for proxy to address concerns with another
patch (sorry for breaking protocol and inserting it above the related patch
which suggested it is necessary).
Bury three proposals that simply aren't going anywhere as-is.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@
1497011 13f79535 -47bb-0310-9956-
ffa450edef68