]> granicus.if.org Git - apache/log
apache
9 years agoxforms
Jim Jagielski [Fri, 19 Jun 2015 12:03:04 +0000 (12:03 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686393 13f79535-47bb-0310-9956-ffa450edef68

9 years agoVote
Christophe Jaillet [Fri, 19 Jun 2015 03:43:13 +0000 (03:43 +0000)]
Vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686359 13f79535-47bb-0310-9956-ffa450edef68

9 years agoQuiet dumb compiler(s).
Yann Ylavic [Thu, 18 Jun 2015 19:24:48 +0000 (19:24 +0000)]
Quiet dumb compiler(s).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686298 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1685650 from trunk:
Jim Jagielski [Thu, 18 Jun 2015 17:06:48 +0000 (17:06 +0000)]
Merge r1685650 from trunk:

LDAP connection pool did not release/close connections with
"LDAPConnectionPoolTTL 0".  PR58037.

Submitted by: Ted Phelps <phelps gnusto.com>
committed by: covener

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686275 13f79535-47bb-0310-9956-ffa450edef68

9 years agopromote
Jim Jagielski [Thu, 18 Jun 2015 17:06:03 +0000 (17:06 +0000)]
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686274 13f79535-47bb-0310-9956-ffa450edef68

9 years agovote
Jim Jagielski [Thu, 18 Jun 2015 17:05:45 +0000 (17:05 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686273 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1686085 from trunk:
Jim Jagielski [Thu, 18 Jun 2015 17:05:28 +0000 (17:05 +0000)]
Merge r1686085 from trunk:

*) mod_ext_filter, mod_charset_lite: Avoid inadvertent filtering of protocol
   data during read of chunked request bodies. PR 58049.
   [Edward Lu <Chaosed0 gmail.com>]

Submitted By: Edward Lu <Chaosed0 gmail.com>

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686272 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1685345, r1685347, r1685349, r1685350 from trunk:
Jim Jagielski [Thu, 18 Jun 2015 17:04:26 +0000 (17:04 +0000)]
Merge r1685345, r1685347, r1685349, r1685350 from trunk:

Follow up to r1684513: allow spaces before and after chunk-size.
Slightly modified version of trawick's proposal.

Follow up to r1685345: don't accept spaces *before* the chunk-size.

Follow up to r1685345: CHANGES entry.

Follow up to r1685349: remove a tab.
Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686271 13f79535-47bb-0310-9956-ffa450edef68

9 years agoThat one is accepted now.
Yann Ylavic [Thu, 18 Jun 2015 17:01:05 +0000 (17:01 +0000)]
That one is accepted now.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686270 13f79535-47bb-0310-9956-ffa450edef68

9 years agoClarify mystery voter :)
William A. Rowe Jr [Thu, 18 Jun 2015 15:51:13 +0000 (15:51 +0000)]
Clarify mystery voter :)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686256 13f79535-47bb-0310-9956-ffa450edef68

9 years agoThis works for me, simple and clean fix
William A. Rowe Jr [Thu, 18 Jun 2015 15:40:23 +0000 (15:40 +0000)]
This works for me, simple and clean fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686249 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAfter addressing a defect, don't discuss, this isn't a forum :)
William A. Rowe Jr [Thu, 18 Jun 2015 15:39:53 +0000 (15:39 +0000)]
After addressing a defect, don't discuss, this isn't a forum :)

Note the patch is updated, and delete now-irrelevant comments/votes.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686248 13f79535-47bb-0310-9956-ffa450edef68

9 years agoYes you may hide your legacy servers under 2.4's skirt for a while longer
Jeff Trawick [Thu, 18 Jun 2015 12:48:13 +0000 (12:48 +0000)]
Yes you may hide your legacy servers under 2.4's skirt for a while longer

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686208 13f79535-47bb-0310-9956-ffa450edef68

9 years agoVote and promote.
Yann Ylavic [Wed, 17 Jun 2015 20:52:40 +0000 (20:52 +0000)]
Vote and promote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686108 13f79535-47bb-0310-9956-ffa450edef68

9 years ago:+1:
Jeff Trawick [Wed, 17 Jun 2015 18:39:33 +0000 (18:39 +0000)]
:+1:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686088 13f79535-47bb-0310-9956-ffa450edef68

9 years agopropose tweak for uncommon input filters
Eric Covener [Wed, 17 Jun 2015 18:32:17 +0000 (18:32 +0000)]
propose tweak for uncommon input filters

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1686086 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd PR to CHANGES entry.
Yann Ylavic [Wed, 17 Jun 2015 10:09:15 +0000 (10:09 +0000)]
Add PR to CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685986 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFollow up to r1685904: apply the missing 'parsing' bits.
Yann Ylavic [Wed, 17 Jun 2015 08:52:10 +0000 (08:52 +0000)]
Follow up to r1685904: apply the missing 'parsing' bits.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685950 13f79535-47bb-0310-9956-ffa450edef68

9 years agoUpdate ap_http_filter_chunked patch to v3 for CHANGES entry.
Yann Ylavic [Tue, 16 Jun 2015 22:10:50 +0000 (22:10 +0000)]
Update ap_http_filter_chunked patch to v3 for CHANGES entry.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685916 13f79535-47bb-0310-9956-ffa450edef68

9 years agoUpdate ap_http_filter_chunked patch and 'parsing' rationale.
Yann Ylavic [Tue, 16 Jun 2015 21:24:38 +0000 (21:24 +0000)]
Update ap_http_filter_chunked patch and 'parsing' rationale.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685910 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1685339 from trunk.
Yann Ylavic [Tue, 16 Jun 2015 21:07:46 +0000 (21:07 +0000)]
Merge r1685339 from trunk.
Follow up to 2.4.x's r1684515.

Follow up to r1684513: apply missing changes voted on security@.

Submitted by: minfrin, ylavic
Reviewed by: ylavic, wrowe, jim
Reported by: regilero <regis.leroy makina-corpus.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685904 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPatch feedback to Yann, we need to keep these simple, few deltas, track history
William A. Rowe Jr [Tue, 16 Jun 2015 18:04:55 +0000 (18:04 +0000)]
Patch feedback to Yann, we need to keep these simple, few deltas, track history

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685883 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1685779 from trunk:
Jim Jagielski [Tue, 16 Jun 2015 17:21:09 +0000 (17:21 +0000)]
Merge r1685779 from trunk:

mod_ssl: Remove deprecated SSLCertificateChainFile warning.
Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685870 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1685659 from trunk:
Jim Jagielski [Tue, 16 Jun 2015 17:20:26 +0000 (17:20 +0000)]
Merge r1685659 from trunk:

Fix directive name in error message + fix some style issue
Submitted by: jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685869 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAgreed, good to backport
William A. Rowe Jr [Tue, 16 Jun 2015 15:25:40 +0000 (15:25 +0000)]
Agreed, good to backport

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685858 13f79535-47bb-0310-9956-ffa450edef68

9 years agoTwo votes, one promotion.
Yann Ylavic [Tue, 16 Jun 2015 14:01:08 +0000 (14:01 +0000)]
Two votes, one promotion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685838 13f79535-47bb-0310-9956-ffa450edef68

9 years agoeasy votes
Eric Covener [Tue, 16 Jun 2015 12:31:03 +0000 (12:31 +0000)]
easy votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685796 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPropose SSLCertificateChainFile deprecation warning proposal.
Yann Ylavic [Tue, 16 Jun 2015 12:03:14 +0000 (12:03 +0000)]
Propose SSLCertificateChainFile deprecation warning proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685781 13f79535-47bb-0310-9956-ffa450edef68

9 years agonote
Jim Jagielski [Tue, 16 Jun 2015 11:50:45 +0000 (11:50 +0000)]
note

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685773 13f79535-47bb-0310-9956-ffa450edef68

9 years agoWithdrawing SSLCertificateChainFile info message at the light of latest
Yann Ylavic [Tue, 16 Jun 2015 11:46:30 +0000 (11:46 +0000)]
Withdrawing SSLCertificateChainFile info message at the light of latest
consensus to remove the deprecation message completely.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685769 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPropose
Christophe Jaillet [Mon, 15 Jun 2015 20:24:24 +0000 (20:24 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685661 13f79535-47bb-0310-9956-ffa450edef68

9 years agoformat
Eric Covener [Mon, 15 Jun 2015 18:24:20 +0000 (18:24 +0000)]
format

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685652 13f79535-47bb-0310-9956-ffa450edef68

9 years agopropose LDAP fix
Eric Covener [Mon, 15 Jun 2015 18:23:16 +0000 (18:23 +0000)]
propose LDAP fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685651 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMove chunk-size fix to SHOWSTOPPERS and try to improve SSLCertificateChainFile
Yann Ylavic [Mon, 15 Jun 2015 11:22:18 +0000 (11:22 +0000)]
Move chunk-size fix to SHOWSTOPPERS and try to improve SSLCertificateChainFile
info (=> warning) proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685548 13f79535-47bb-0310-9956-ffa450edef68

9 years agovote/promote SSLCertificateChainFile depreciation noise restraint
Gregg Lewis Smith [Mon, 15 Jun 2015 01:18:43 +0000 (01:18 +0000)]
vote/promote SSLCertificateChainFile depreciation noise restraint

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685493 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 14 Jun 2015 15:50:34 +0000 (15:50 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685418 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sun, 14 Jun 2015 15:49:33 +0000 (15:49 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685417 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sun, 14 Jun 2015 15:40:27 +0000 (15:40 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685414 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML update.
Lucien Gentis [Sun, 14 Jun 2015 15:39:03 +0000 (15:39 +0000)]
XML update.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685413 13f79535-47bb-0310-9956-ffa450edef68

9 years agorevert my -1
Gregg Lewis Smith [Sun, 14 Jun 2015 11:06:03 +0000 (11:06 +0000)]
revert my -1

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685383 13f79535-47bb-0310-9956-ffa450edef68

9 years ago-1 vote w/ comment
Gregg Lewis Smith [Sun, 14 Jun 2015 09:29:50 +0000 (09:29 +0000)]
-1 vote w/ comment

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685371 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPropose fix for 2.4.14's regression.
Yann Ylavic [Sun, 14 Jun 2015 01:09:38 +0000 (01:09 +0000)]
Propose fix for 2.4.14's regression.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685353 13f79535-47bb-0310-9956-ffa450edef68

9 years agomovte
Jeff Trawick [Sat, 13 Jun 2015 19:03:50 +0000 (19:03 +0000)]
movte

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685305 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 13 Jun 2015 15:13:51 +0000 (15:13 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685271 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 13 Jun 2015 15:12:39 +0000 (15:12 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685270 13f79535-47bb-0310-9956-ffa450edef68

9 years agoUpdate SSLCertificateChainFile proposal.
Yann Ylavic [Fri, 12 Jun 2015 15:07:20 +0000 (15:07 +0000)]
Update SSLCertificateChainFile proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685099 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd 421 to ALPN (being worked) proposal.
Yann Ylavic [Fri, 12 Jun 2015 11:42:34 +0000 (11:42 +0000)]
Add 421 to ALPN (being worked) proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685070 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPropose and move ALPN proposal to being worked.
Yann Ylavic [Fri, 12 Jun 2015 10:44:27 +0000 (10:44 +0000)]
Propose and move ALPN proposal to being worked.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1685059 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate transformations.
Nilgun Belma Buguner [Thu, 11 Jun 2015 17:16:30 +0000 (17:16 +0000)]
update transformations.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684950 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Thu, 11 Jun 2015 17:15:37 +0000 (17:15 +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.4.x@1684949 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAnd we are 2.4.15-dev
Jim Jagielski [Thu, 11 Jun 2015 13:59:08 +0000 (13:59 +0000)]
And we are 2.4.15-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684895 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGet ready to tag 2.4.14
Jim Jagielski [Thu, 11 Jun 2015 13:57:26 +0000 (13:57 +0000)]
Get ready to tag 2.4.14

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684892 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1667386 from trunk:
Jim Jagielski [Thu, 11 Jun 2015 13:18:30 +0000 (13:18 +0000)]
Merge r1667386 from trunk:

Followup to r1667385, my sandbox was out of date.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684883 13f79535-47bb-0310-9956-ffa450edef68

9 years agoVote.
Yann Ylavic [Thu, 11 Jun 2015 13:13:37 +0000 (13:13 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684879 13f79535-47bb-0310-9956-ffa450edef68

9 years agovote
Jim Jagielski [Thu, 11 Jun 2015 12:55:27 +0000 (12:55 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684872 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Jim Jagielski [Thu, 11 Jun 2015 12:54:20 +0000 (12:54 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684871 13f79535-47bb-0310-9956-ffa450edef68

9 years agonote
Jim Jagielski [Thu, 11 Jun 2015 12:30:35 +0000 (12:30 +0000)]
note

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684865 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix CVE-2015-3185 reference in CHANGES
Stefan Fritsch [Tue, 9 Jun 2015 21:12:57 +0000 (21:12 +0000)]
Fix CVE-2015-3185 reference in CHANGES

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684533 13f79535-47bb-0310-9956-ffa450edef68

9 years agoSECURITY: CVE-2015-3185 (cve.mitre.org)
William A. Rowe Jr [Tue, 9 Jun 2015 20:42:44 +0000 (20:42 +0000)]
SECURITY: CVE-2015-3185 (cve.mitre.org)

Replacement of ap_some_auth_required (unusable in Apache httpd 2.4)
with new ap_some_authn_required and ap_force_authn hook.

Submitted by: breser
Backports: r1684524
Reviewed by: wrowe, ylavic, jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684525 13f79535-47bb-0310-9956-ffa450edef68

9 years agoCVE-2015-3183 Fix chunk header parsing defect.
William A. Rowe Jr [Tue, 9 Jun 2015 20:16:39 +0000 (20:16 +0000)]
CVE-2015-3183 Fix chunk header parsing defect.

Remove apr_brigade_flatten(), buffering and duplicated code from
the HTTP_IN filter, parse chunks in a single pass with zero copy.

Limit accepted chunk-size to 2^63-1 and be strict about chunk-ext
authorized characters.

Submitted by: minfrin, ylavic
Reviewed by: ylavic, wrowe, jim
Backports: 14848521684513
Reported by: regilero <regis.leroy makina-corpus.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684515 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1619453 from trunk
Christophe Jaillet [Tue, 9 Jun 2015 18:03:20 +0000 (18:03 +0000)]
Merge r1619453 from trunk

   * mod_deflate: Add missing APLOGNO.

Submitted by: ylavic
Reviewed by: jailletc36, gsmith, druggeri
Backported by: jailletc36

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684490 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd compatibility note.
Christophe Jaillet [Tue, 9 Jun 2015 05:13:03 +0000 (05:13 +0000)]
Add compatibility note.
Turn some tabs into space.
Remove some useless <br /> in <highlight> blocks. (this was causing some additionnal blank lines at the end of some examples)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684314 13f79535-47bb-0310-9956-ffa450edef68

9 years agoAdd compatibility note
Christophe Jaillet [Tue, 9 Jun 2015 04:33:52 +0000 (04:33 +0000)]
Add compatibility note

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684312 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPropose
Christophe Jaillet [Mon, 8 Jun 2015 20:14:17 +0000 (20:14 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684267 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPromote
Christophe Jaillet [Mon, 8 Jun 2015 19:30:50 +0000 (19:30 +0000)]
Promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1684251 13f79535-47bb-0310-9956-ffa450edef68

9 years agoEasy vote
Daniel Ruggeri [Sat, 6 Jun 2015 17:35:35 +0000 (17:35 +0000)]
Easy vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683937 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 6 Jun 2015 15:55:46 +0000 (15:55 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683926 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 6 Jun 2015 15:54:46 +0000 (15:54 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683925 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix typo
Christophe Jaillet [Sat, 6 Jun 2015 05:44:16 +0000 (05:44 +0000)]
Fix typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683882 13f79535-47bb-0310-9956-ffa450edef68

9 years agoeasy vote
Gregg Lewis Smith [Fri, 5 Jun 2015 16:00:02 +0000 (16:00 +0000)]
easy vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683787 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPropose
Christophe Jaillet [Fri, 5 Jun 2015 05:47:37 +0000 (05:47 +0000)]
Propose

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683661 13f79535-47bb-0310-9956-ffa450edef68

9 years agoand we are 2.4.14-dev
Jim Jagielski [Thu, 4 Jun 2015 16:15:38 +0000 (16:15 +0000)]
and we are 2.4.14-dev

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683585 13f79535-47bb-0310-9956-ffa450edef68

9 years agoGet ready to tag 2.4.13
Jim Jagielski [Thu, 4 Jun 2015 16:13:29 +0000 (16:13 +0000)]
Get ready to tag 2.4.13

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683583 13f79535-47bb-0310-9956-ffa450edef68

9 years agoxforms
Jim Jagielski [Thu, 4 Jun 2015 14:35:39 +0000 (14:35 +0000)]
xforms

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683561 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1683198 from trunk:
Jeff Trawick [Tue, 2 Jun 2015 23:44:19 +0000 (23:44 +0000)]
Merge r1683198 from trunk:

mod_proxy_scgi upgraders likely need to set proxy-scgi-pathinfo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683199 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1681795, r1682988, r1682979, r1682819, r1682816 from trunk:
Jim Jagielski [Tue, 2 Jun 2015 13:40:41 +0000 (13:40 +0000)]
Merge r1681795, r1682988, r1682979, r1682819, r1682816 from trunk:

initialize args to not print garbage mem during a RewriteRule parse error

Initialize args to not print garbage mem during a RewriteCond parse error (same as r1681795 for RewriteRule)

Improve style in examples.

Improve error message (related to PR57311 diagnostic)

Concat string at compile time in order to save a few cycles.

Submitted by: covener, jailletc36, jailletc36, jailletc36, jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683113 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1681694, r1682907 from trunk:
Jim Jagielski [Tue, 2 Jun 2015 13:39:26 +0000 (13:39 +0000)]
Merge r1681694, r1682907 from trunk:

mod_proxy: Don't put the worker in error state for 500 or 503 errors
returned by the backend unless failonstatus is configured to.  PR 56925.

mod_proxy: follow up to r1681694.

Handle the proxy-error-override note also in mod_proxy_ajp.

The note is not needed in mod_proxy_fcgi (which also handles
ProxyErrorOverride) since it calls ap_die() by itself, and always
returns OK to proxy_handler().

Add a comment about the note where used.

Submitted by: ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683112 13f79535-47bb-0310-9956-ffa450edef68

9 years agopromote
Jim Jagielski [Tue, 2 Jun 2015 13:38:25 +0000 (13:38 +0000)]
promote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683111 13f79535-47bb-0310-9956-ffa450edef68

9 years agovote
Jim Jagielski [Tue, 2 Jun 2015 13:38:03 +0000 (13:38 +0000)]
vote

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683110 13f79535-47bb-0310-9956-ffa450edef68

9 years agoVote.
Yann Ylavic [Tue, 2 Jun 2015 13:05:42 +0000 (13:05 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683098 13f79535-47bb-0310-9956-ffa450edef68

9 years agoupdate transformation
André Malo [Tue, 2 Jun 2015 12:03:05 +0000 (12:03 +0000)]
update transformation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1683082 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPropose easy votes
Christophe Jaillet [Mon, 1 Jun 2015 20:47:47 +0000 (20:47 +0000)]
Propose easy votes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682998 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXform.
Rainer Jung [Mon, 1 Jun 2015 15:54:37 +0000 (15:54 +0000)]
Xform.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682940 13f79535-47bb-0310-9956-ffa450edef68

9 years agoFix copy and paste docs error.
Rainer Jung [Mon, 1 Jun 2015 15:53:59 +0000 (15:53 +0000)]
Fix copy and paste docs error.

Backport of r1682937 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682939 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXforms.
Rainer Jung [Mon, 1 Jun 2015 15:34:11 +0000 (15:34 +0000)]
Xforms.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682934 13f79535-47bb-0310-9956-ffa450edef68

9 years agoTry to clarify extended uses of SSLCertificateFile.
Rainer Jung [Mon, 1 Jun 2015 15:15:06 +0000 (15:15 +0000)]
Try to clarify extended uses of SSLCertificateFile.

Backport of r1682923 from trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682929 13f79535-47bb-0310-9956-ffa450edef68

9 years agoPrune resolved discussion, vote.
Rainer Jung [Mon, 1 Jun 2015 15:04:41 +0000 (15:04 +0000)]
Prune resolved discussion, vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682924 13f79535-47bb-0310-9956-ffa450edef68

9 years agoEnlarge proposal.
Yann Ylavic [Mon, 1 Jun 2015 14:31:03 +0000 (14:31 +0000)]
Enlarge proposal.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682914 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1629440, r1629441, r1681424, r1681440, r1681685 from trunk:
Jim Jagielski [Mon, 1 Jun 2015 12:40:51 +0000 (12:40 +0000)]
Merge r1629440, r1629441, r1681424, r1681440, r1681685 from trunk:

Style (mostly indent)
remove a useless local variable initialization

More style

Constify + save a few bytes in conf pool (+ some minor space adjustments)

Save a few bytes in conf pool and axe a function that duplicates 'ap_set_string_slot'

Save a few bytes in conf pool
Submitted by: jailletc36
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682889 13f79535-47bb-0310-9956-ffa450edef68

9 years agoMerge r1682482 from trunk:
Jim Jagielski [Mon, 1 Jun 2015 12:39:56 +0000 (12:39 +0000)]
Merge r1682482 from trunk:

PR 57968: Don't lowercase the argument to SetHandler if the handler is
proxy:unix.

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682888 13f79535-47bb-0310-9956-ffa450edef68

9 years agoVote, promote, comment.
Rainer Jung [Mon, 1 Jun 2015 11:06:39 +0000 (11:06 +0000)]
Vote, promote, comment.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682872 13f79535-47bb-0310-9956-ffa450edef68

9 years agoVote (easier to review with svn diff -x-w).
Yann Ylavic [Sun, 31 May 2015 20:20:20 +0000 (20:20 +0000)]
Vote (easier to review with svn diff -x-w).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682790 13f79535-47bb-0310-9956-ffa450edef68

9 years agoVote.
Yann Ylavic [Sun, 31 May 2015 20:15:26 +0000 (20:15 +0000)]
Vote.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682787 13f79535-47bb-0310-9956-ffa450edef68

9 years agoRebuild.
Lucien Gentis [Sat, 30 May 2015 16:26:41 +0000 (16:26 +0000)]
Rebuild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682620 13f79535-47bb-0310-9956-ffa450edef68

9 years agoXML updates.
Lucien Gentis [Sat, 30 May 2015 16:25:29 +0000 (16:25 +0000)]
XML updates.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682619 13f79535-47bb-0310-9956-ffa450edef68

9 years agocore, modules: Avoid error response/document handling by the core if some
William A. Rowe Jr [Fri, 29 May 2015 20:07:15 +0000 (20:07 +0000)]
core, modules: Avoid error response/document handling by the core if some
handler or input filter already did it while reading the request (causing
a double response body).

Submitted by: ylavic
Backports: r1482522 (partial, ap_map_http_request_error() things only!),
           r1529988, r1529991, r1643537, r1643543, r1657897, r1665625,
           r1665721, r1674056
Reviewed by: ylavic, minfrin, wrowe

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682544 13f79535-47bb-0310-9956-ffa450edef68

9 years agopropose proxy:unix fix
Eric Covener [Fri, 29 May 2015 14:25:02 +0000 (14:25 +0000)]
propose proxy:unix fix

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682486 13f79535-47bb-0310-9956-ffa450edef68

9 years agoThis appears to be promoted
William A. Rowe Jr [Fri, 29 May 2015 04:18:26 +0000 (04:18 +0000)]
This appears to be promoted

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682362 13f79535-47bb-0310-9956-ffa450edef68

9 years agoTypo
Gregg Lewis Smith [Fri, 29 May 2015 03:04:24 +0000 (03:04 +0000)]
Typo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682360 13f79535-47bb-0310-9956-ffa450edef68

9 years agoClarify the change to the default cipher suite lists
William A. Rowe Jr [Wed, 27 May 2015 18:59:59 +0000 (18:59 +0000)]
Clarify the change to the default cipher suite lists

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1682099 13f79535-47bb-0310-9956-ffa450edef68