]> granicus.if.org Git - apache/log
apache
8 years agoxforms
Jim Jagielski [Tue, 3 Nov 2015 12:05:03 +0000 (12:05 +0000)]
xforms

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

8 years agoMerge r1710380, r1710391 from trunk:
Jim Jagielski [Tue, 3 Nov 2015 12:02:43 +0000 (12:02 +0000)]
Merge r1710380, r1710391 from trunk:

Make the fix for fully qualifying REDIRECT_URL from PR#57785 opt-in.

followup to r1710380 -- refactored name and didn't have 'make depend'

Submitted by: covener
Reviewed/backported by: jim

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

8 years agopromote
Jim Jagielski [Tue, 3 Nov 2015 12:00:06 +0000 (12:00 +0000)]
promote

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

8 years agovotes
Jim Jagielski [Tue, 3 Nov 2015 11:59:48 +0000 (11:59 +0000)]
votes

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

8 years agoMerge r1707831 from trunk:
Jim Jagielski [Tue, 3 Nov 2015 11:58:58 +0000 (11:58 +0000)]
Merge r1707831 from trunk:

PR 53845: Remove commented config regarding DNT because the spec now has CR status (confirming our interpretation) and MS has committed to changing their implementation: http://blogs.microsoft.com/on-the-issues/2015/04/03/an-update-on-microsofts-approach-to-do-not-track/
Submitted by: fielding
Reviewed/backported by: jim

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

8 years agoPropose.
Yann Ylavic [Mon, 2 Nov 2015 08:23:54 +0000 (08:23 +0000)]
Propose.

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

8 years agoVotes, and moves to WORKING/STALE sections.
Yann Ylavic [Sat, 31 Oct 2015 16:35:54 +0000 (16:35 +0000)]
Votes, and moves to WORKING/STALE sections.

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

8 years agoPropose scoreboard alignment fix.
Yann Ylavic [Sat, 31 Oct 2015 16:27:45 +0000 (16:27 +0000)]
Propose scoreboard alignment fix.

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

8 years agoxform
Christophe Jaillet [Fri, 30 Oct 2015 20:54:44 +0000 (20:54 +0000)]
xform

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

8 years agoFix a typo in doc as spotted by ceving in online doc
Christophe Jaillet [Fri, 30 Oct 2015 20:53:18 +0000 (20:53 +0000)]
Fix a typo in doc as spotted by ceving in online doc

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

8 years agoPropose r1711479.
Jan Kaluža [Fri, 30 Oct 2015 14:09:58 +0000 (14:09 +0000)]
Propose r1711479.

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

8 years agoGenerated doc changes
Mike Rumph [Wed, 28 Oct 2015 18:48:42 +0000 (18:48 +0000)]
Generated doc changes

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

8 years agoAdd compatibility note to mod_http2 doc
Mike Rumph [Wed, 28 Oct 2015 18:40:59 +0000 (18:40 +0000)]
Add compatibility note to mod_http2 doc

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

8 years agoGenerated doc changes
Mike Rumph [Wed, 28 Oct 2015 18:37:27 +0000 (18:37 +0000)]
Generated doc changes

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

8 years agoPropose
Christophe Jaillet [Tue, 27 Oct 2015 21:22:24 +0000 (21:22 +0000)]
Propose

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

8 years agoExtend expression parser registration to support
Rainer Jung [Sun, 25 Oct 2015 11:57:28 +0000 (11:57 +0000)]
Extend expression parser registration to support
ssl variables in any expression using
mod_rewrite syntax "%{SSL:VARNAME}" or function
syntax "ssl(VARNAME)".

Backport of r1707002 and r1709596 from trunk.

Committed By: rjung
Backported By: rjung
Reviewed by: rjung, ylavic, sf

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

8 years agovote+promote
Stefan Fritsch [Sun, 25 Oct 2015 09:21:57 +0000 (09:21 +0000)]
vote+promote

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

8 years agoFix URL
Christophe Jaillet [Sun, 25 Oct 2015 09:17:13 +0000 (09:17 +0000)]
Fix URL

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

8 years agomissing CHANGES
Eric Covener [Sat, 24 Oct 2015 23:46:41 +0000 (23:46 +0000)]
missing CHANGES

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

8 years agobroke build
Eric Covener [Sat, 24 Oct 2015 21:35:24 +0000 (21:35 +0000)]
broke build

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

8 years agopropose REDIRECT_URL change and vote for DNT
Eric Covener [Sat, 24 Oct 2015 19:15:21 +0000 (19:15 +0000)]
propose REDIRECT_URL change and vote for DNT

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

8 years agoA pox on those who capitalize comments in 2.4.x without first being anal on trunk
Roy T. Fielding [Tue, 20 Oct 2015 18:52:09 +0000 (18:52 +0000)]
A pox on those who capitalize comments in 2.4.x without first being anal on trunk

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

8 years agoAdd a note about the version number.
Graham Leggett [Tue, 20 Oct 2015 14:03:00 +0000 (14:03 +0000)]
Add a note about the version number.

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

8 years agoAdd a comment.
Graham Leggett [Tue, 20 Oct 2015 13:58:22 +0000 (13:58 +0000)]
Add a comment.

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

8 years agoComment on mod_systemd in STATUS
Jan Kaluža [Tue, 20 Oct 2015 13:42:32 +0000 (13:42 +0000)]
Comment on mod_systemd in STATUS

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

8 years agoWe no longer have .msi packages for windows
Gregg Lewis Smith [Wed, 14 Oct 2015 02:21:14 +0000 (02:21 +0000)]
We no longer have .msi packages for windows

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

8 years agoreleased today!
Jim Jagielski [Tue, 13 Oct 2015 17:34:00 +0000 (17:34 +0000)]
released today!

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

8 years agoupdate transformation
André Malo [Mon, 12 Oct 2015 18:03:22 +0000 (18:03 +0000)]
update transformation

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

8 years agoRebuild.
Lucien Gentis [Sun, 11 Oct 2015 13:55:23 +0000 (13:55 +0000)]
Rebuild.

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

8 years agoXML updates.
Lucien Gentis [Sun, 11 Oct 2015 13:51:56 +0000 (13:51 +0000)]
XML updates.

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

8 years agoXforms
Rainer Jung [Sat, 10 Oct 2015 15:58:26 +0000 (15:58 +0000)]
Xforms

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

8 years agoMerge r1707889 from trunk: docs: s/h2_module/http2_module/
Yann Ylavic [Sat, 10 Oct 2015 15:43:42 +0000 (15:43 +0000)]
Merge r1707889 from trunk: docs: s/h2_module/http2_module/

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

8 years agoFix small typo in new docs.
Rainer Jung [Sat, 10 Oct 2015 15:29:57 +0000 (15:29 +0000)]
Fix small typo in new docs.

CTR
Backport of r1707883 from trunk.

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

8 years agowake up
Roy T. Fielding [Fri, 9 Oct 2015 23:43:18 +0000 (23:43 +0000)]
wake up

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

8 years agodocs nit
Jim Jagielski [Fri, 9 Oct 2015 23:02:54 +0000 (23:02 +0000)]
docs nit

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

8 years agoAnd we are 2.4.18-dev
Jim Jagielski [Fri, 9 Oct 2015 17:26:05 +0000 (17:26 +0000)]
And we are 2.4.18-dev

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

8 years agoGet ready to tag 2.4.17
Jim Jagielski [Fri, 9 Oct 2015 17:24:40 +0000 (17:24 +0000)]
Get ready to tag 2.4.17

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

8 years agoadd nghttp2 and libxml2 stuff to NOTICE.txt & COPYRIGHT.txt
Gregg Lewis Smith [Fri, 9 Oct 2015 01:03:31 +0000 (01:03 +0000)]
add nghttp2 and libxml2 stuff to NOTICE.txt & COPYRIGHT.txt

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

8 years agoXforms
Rainer Jung [Thu, 8 Oct 2015 22:58:07 +0000 (22:58 +0000)]
Xforms

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

8 years agoAdd event in mpm docs where currently only
Rainer Jung [Thu, 8 Oct 2015 22:44:21 +0000 (22:44 +0000)]
Add event in mpm docs where currently only
worker is mentioned. Existing worker text
applies to event without changes.

Thanks to Mathijs Schmittmann.

CTR
Backport of r1707626 from trunk.

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

8 years agoSort MPMs given in modulelist uniformly, list
Rainer Jung [Thu, 8 Oct 2015 22:40:53 +0000 (22:40 +0000)]
Sort MPMs given in modulelist uniformly, list
most important or common ones first.

CTR
Backport of r1707627 from trunk.

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

8 years agoBackport r1705791
Christophe Jaillet [Thu, 8 Oct 2015 19:26:51 +0000 (19:26 +0000)]
Backport  r1705791

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

8 years agomerge r1707591
Gregg Lewis Smith [Thu, 8 Oct 2015 17:57:17 +0000 (17:57 +0000)]
merge r1707591
remove conf/extra/http-h2.conf.in from install filelist

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

8 years agoBackported.
Yann Ylavic [Thu, 8 Oct 2015 14:49:35 +0000 (14:49 +0000)]
Backported.

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

8 years agor1678763 | ylavic | 2015-05-11 16:53:34 +0200 (Mon, 11 May 2015) | 7 lines
Yann Ylavic [Thu, 8 Oct 2015 14:48:31 +0000 (14:48 +0000)]
r1678763 | ylavic | 2015-05-11 16:53:34 +0200 (Mon, 11 May 2015) | 7 lines

mod_proxy: only cleanup the socket for a connection asked to be closed but
whose address can still be reused.

This saves unnecessary socket pool destroy and creation at cleanup and reuse
time, plus the same initialization of conn->pool's associated data which can
be reused in that case.

r1703807 | ylavic | 2015-09-18 12:58:58 +0200 (Fri, 18 Sep 2015) | 5 lines

mod_proxy: don't recyle backend announced "Connection: close" connections.
Failing to do this may lead to a race condition where we send a new request
before the backend really closes the connection (or lost SSL-Alert/FIN make
us think the connection is still alive, until the retransmission).

r1703813 | ylavic | 2015-09-18 13:48:31 +0200 (Fri, 18 Sep 2015) | 1 line

mod_proxy: follow up to r1703807: CHANGES entry.

Submitted by: ylavic
Committed by: ylavic
Reviewed  by: ylavic, rjung, trawick

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

8 years agobackport of old h2 doc removal
Stefan Eissing [Thu, 8 Oct 2015 12:55:53 +0000 (12:55 +0000)]
backport of old h2 doc removal

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

8 years agobackport of trunk:r1707497, fixes nghttp 1.3.x interop, bump version to 1.0.0
Stefan Eissing [Thu, 8 Oct 2015 12:16:25 +0000 (12:16 +0000)]
backport of trunk:r1707497, fixes nghttp 1.3.x interop, bump version to 1.0.0

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

8 years agovote, promote
Jeff Trawick [Wed, 7 Oct 2015 23:19:47 +0000 (23:19 +0000)]
vote, promote

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

8 years agoVote.
Yann Ylavic [Wed, 7 Oct 2015 11:37:54 +0000 (11:37 +0000)]
Vote.

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

8 years agoFix commit revision of Rainer's proposal.
Yann Ylavic [Wed, 7 Oct 2015 11:03:22 +0000 (11:03 +0000)]
Fix commit revision of Rainer's proposal.

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

8 years agoUpdate mod_ssl (flush) proposal.
Yann Ylavic [Wed, 7 Oct 2015 10:59:42 +0000 (10:59 +0000)]
Update mod_ssl (flush) proposal.

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

8 years agoPropose.
Rainer Jung [Wed, 7 Oct 2015 07:43:06 +0000 (07:43 +0000)]
Propose.

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

8 years agoXforms
Rainer Jung [Tue, 6 Oct 2015 21:39:45 +0000 (21:39 +0000)]
Xforms

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

8 years agoRemove mod_h2 docs files forgotten after h2 to
Rainer Jung [Tue, 6 Oct 2015 19:37:14 +0000 (19:37 +0000)]
Remove mod_h2 docs files forgotten after h2 to
http2 renaming.

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

8 years agoAdd a docs remark about "SSLOptions StdEnvVars"
Rainer Jung [Tue, 6 Oct 2015 19:31:59 +0000 (19:31 +0000)]
Add a docs remark about "SSLOptions StdEnvVars"
being not necessary for mod_rewrite
"%{SSL:VARIABLE}" feature and for the mod_ssl
extensions to mod_log_config (%{VARIABLE}x).

Xforms.

CTR
Backport of r1706989 from trunk.

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

8 years agoFix new XML error in mod_subtitute docs.
Rainer Jung [Tue, 6 Oct 2015 19:17:10 +0000 (19:17 +0000)]
Fix new XML error in mod_subtitute docs.

Followup to r1707039.

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

8 years agoAgree with comment.
Rainer Jung [Tue, 6 Oct 2015 19:11:28 +0000 (19:11 +0000)]
Agree with comment.

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

8 years agoMerge r1684900, r1687539, r1687680, r1688331, r1688339, r1688340, r1688341, r1688343...
Jim Jagielski [Tue, 6 Oct 2015 12:40:06 +0000 (12:40 +0000)]
Merge r1684900, r1687539, r1687680, r1688331, r1688339, r1688340, r1688341, r1688343, r1697013, r1697015 from trunk:

mod_substitute: Fix configuraton merge order.
PR 57641 [Marc.Stern]

mod_substitute: follow up r1684900.
Introduce the SubstituteInheritBefore directive to configure the merge order.
This allows to preserve 2.4 and earlier behaviour.

mod_substitute: follow up to r1687539.
Use tristate single inherit_before variable instead of two, according to
wrowe's advices.

mod_substitute: follow up to r1687680.
Fix dir config merger 'over'-write, thanks Bill (again).

Very difficult to read, and therefore was wrong.

Assert that the SubstituteInheritBefore option was explicitly toggled,
and do not default in 2.x to this legacy behavior.

Optimize in all cases that the members are all explicitly initialized.

Useful for 2.2 and 2.4, but trunk will require the subsequent patch.

Increase legibility of the max_line_length behavior, and adjust for
the requirement that all members are initialized explicitly due to
the previous patch.

Net -8 LoC, my usual specialty.

This didn't need to be reinvented; please use established helpers.

mod_substitute: follow up r1688339.
SubstituteInheritBefore is the default in 2.5.x but wasn't for ealier versions.

mod_substitute: follow up r1697013.
Update the doc.
Submitted by: niq, ylavic, ylavic, ylavic, wrowe, wrowe, wrowe, wrowe, ylavic, ylavic
Reviewed/backported by: jim

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

8 years agoMerge r1706918 from trunk:
Jim Jagielski [Tue, 6 Oct 2015 12:37:09 +0000 (12:37 +0000)]
Merge r1706918 from trunk:

m4: please any autoconf by quoting AC_DEFUN's names. PR 58126.

Submitted by: olli hauer <ohauer gmx.de>

Submitted by: ylavic
Reviewed/backported by: jim

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

8 years agoMerge r1705983 from trunk:
Jim Jagielski [Tue, 6 Oct 2015 12:36:36 +0000 (12:36 +0000)]
Merge r1705983 from trunk:

Fix some style issues on files that can easily be synch'ed with 2.4.x
Submitted by: jailletc36
Reviewed/backported by: jim

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

8 years agoMerge r1705776 from trunk:
Jim Jagielski [Tue, 6 Oct 2015 12:36:14 +0000 (12:36 +0000)]
Merge r1705776 from trunk:

Adjust since we are now in shared mem area

Thx Werror: error: address of array 'balancer->s->sticky' will always evaluate to 'true'

Reviewed/backported by: jim

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

8 years agoMerge r1629916 from trunk:
Jim Jagielski [Tue, 6 Oct 2015 12:35:50 +0000 (12:35 +0000)]
Merge r1629916 from trunk:

core: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for prefork either.
Submitted by: ylavic
Reviewed/backported by: jim

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

8 years agoxforms
Jim Jagielski [Tue, 6 Oct 2015 12:23:41 +0000 (12:23 +0000)]
xforms

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

8 years agoPromote one more.
Rainer Jung [Tue, 6 Oct 2015 12:11:19 +0000 (12:11 +0000)]
Promote one more.

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

8 years agoVote
Rainer Jung [Tue, 6 Oct 2015 12:10:33 +0000 (12:10 +0000)]
Vote

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

8 years agoPromote.
Rainer Jung [Tue, 6 Oct 2015 11:50:36 +0000 (11:50 +0000)]
Promote.

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

8 years agoSome simple votes.
Rainer Jung [Tue, 6 Oct 2015 11:49:37 +0000 (11:49 +0000)]
Some simple votes.

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

8 years agothis is stalled
Jim Jagielski [Tue, 6 Oct 2015 11:07:42 +0000 (11:07 +0000)]
this is stalled

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

8 years agovote
Jim Jagielski [Tue, 6 Oct 2015 11:07:00 +0000 (11:07 +0000)]
vote

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

8 years agoMerge r1706942 from trunk:
Jim Jagielski [Tue, 6 Oct 2015 11:06:14 +0000 (11:06 +0000)]
Merge r1706942 from trunk:

fix parameter name in ap_log_rdata C99 macro def.
Via  PR57045

Submitted by: covener
Reviewed/backported by: jim

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

8 years agoVote, promote.
Yann Ylavic [Tue, 6 Oct 2015 06:30:53 +0000 (06:30 +0000)]
Vote, promote.

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

8 years agowhoops
Jeff Trawick [Tue, 6 Oct 2015 02:02:50 +0000 (02:02 +0000)]
whoops

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

8 years agopropose fix for ap_log_rdata macro def
Eric Covener [Tue, 6 Oct 2015 01:39:49 +0000 (01:39 +0000)]
propose fix for ap_log_rdata macro def

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

8 years agoPropose some m4 (AC_DEFUN) fixes.
Yann Ylavic [Mon, 5 Oct 2015 21:03:52 +0000 (21:03 +0000)]
Propose some m4 (AC_DEFUN) fixes.

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

8 years agoMerge r1706637 from trunk:
Jeff Trawick [Sun, 4 Oct 2015 20:31:35 +0000 (20:31 +0000)]
Merge r1706637 from trunk:

Fix logic to limit exported symbols in DSO form of mod_http2.

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

8 years agoMerge r1706627, r1706640 from trunk:
Jeff Trawick [Sat, 3 Oct 2015 22:46:55 +0000 (22:46 +0000)]
Merge r1706627, r1706640 from trunk:

Support mod_http2 in cmake-based build for Windows.
Leave LoadModule of mod_http2 commented-out by default.

Merge r1706635 from trunk:

mod_http2 larger with 64-bit VS 2012 RelWithDebInfo build

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

8 years agoRebuild.
Lucien Gentis [Sat, 3 Oct 2015 15:58:03 +0000 (15:58 +0000)]
Rebuild.

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

8 years agoXML updates.
Lucien Gentis [Sat, 3 Oct 2015 15:57:13 +0000 (15:57 +0000)]
XML updates.

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

8 years agoBackport r1706533 to 2.4: Turn 5.1/5.2 order upside down, simplify. This should also...
Daniel Gruno [Sat, 3 Oct 2015 09:47:27 +0000 (09:47 +0000)]
Backport r1706533 to 2.4: Turn 5.1/5.2 order upside down, simplify. This should also (AFAIK) work with Ubuntu/Debian, which has previously been known to fail to compile mod_lua.so

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

8 years agoLooks good
William A. Rowe Jr [Fri, 2 Oct 2015 12:16:30 +0000 (12:16 +0000)]
Looks good

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

8 years agoupdate transformations
Nilgun Belma Buguner [Fri, 2 Oct 2015 10:30:54 +0000 (10:30 +0000)]
update transformations

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

8 years agoupdate for sync with English docs.
Nilgun Belma Buguner [Fri, 2 Oct 2015 10:29:29 +0000 (10:29 +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@1706367 13f79535-47bb-0310-9956-ffa450edef68

8 years agoWe still need to flush on read during SSL/TLS (re)negotiation (removes jorton's vote).
Yann Ylavic [Fri, 2 Oct 2015 09:20:30 +0000 (09:20 +0000)]
We still need to flush on read during SSL/TLS (re)negotiation (removes jorton's vote).

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

8 years agoAdd r1688341 to mod_substitute proposal, as noticed by wrowe.
Yann Ylavic [Thu, 1 Oct 2015 15:21:08 +0000 (15:21 +0000)]
Add r1688341 to mod_substitute proposal, as noticed by wrowe.

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

8 years agor1706028
Jim Jagielski [Wed, 30 Sep 2015 13:31:44 +0000 (13:31 +0000)]
r1706028

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

8 years agoMerge r1703902 from trunk:
Jim Jagielski [Wed, 30 Sep 2015 13:31:29 +0000 (13:31 +0000)]
Merge r1703902 from trunk:

mod_proxy: Fix ProxySourceAddress binding failure with AH00938.  PR 56687.
Proposed by: Arne de Bruijn <apache arbruijn.dds.nl>
Reviewed by: ylavic

Submitted by: ylavic
Reviewed/backported by: jim

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

8 years agopromote
Jim Jagielski [Wed, 30 Sep 2015 13:30:10 +0000 (13:30 +0000)]
promote

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

8 years agovote
Jim Jagielski [Wed, 30 Sep 2015 13:29:52 +0000 (13:29 +0000)]
vote

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

8 years agomod_ssl backports merged
Kaspar Brand [Wed, 30 Sep 2015 11:59:57 +0000 (11:59 +0000)]
mod_ssl backports merged

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

8 years agoupdate transformations
Kaspar Brand [Wed, 30 Sep 2015 11:56:58 +0000 (11:56 +0000)]
update transformations

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

8 years agoremove svn:mergeinfo property from docs/manual/rewrite/advanced.xml
Kaspar Brand [Wed, 30 Sep 2015 11:54:16 +0000 (11:54 +0000)]
remove svn:mergeinfo property from docs/manual/rewrite/advanced.xml

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

8 years agomerge r1703952 from trunk
Kaspar Brand [Wed, 30 Sep 2015 11:50:30 +0000 (11:50 +0000)]
merge r1703952 from trunk

Support compilation against libssl built with OPENSSL_NO_SSL3,
and change the compiled-in default for SSL[Proxy]Protocol to "all -SSLv3",
in accordance with RFC 7568. PR 58349, PR 57120.

Proposed by: kbrand
Reviewed by: ylavic, jorton

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

8 years agomerge r1702643 from trunk
Kaspar Brand [Wed, 30 Sep 2015 11:42:54 +0000 (11:42 +0000)]
merge r1702643 from trunk

Append :!aNULL:!eNULL:!EXP to the cipher string settings,
instead of prepending !aNULL:!eNULL:!EXP: (as was the case in 2.4.7
and later). Enables support for configuring the SUITEB* cipher
strings introduced in OpenSSL 1.0.2. PR 58213.

Apply the same treatment to the "SSLOpenSSLConfCmd CipherString ..." directive.

Proposed by: kbrand
Reviewed by: ylavic, jorton

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

8 years agomerge r1693792 from trunk
Kaspar Brand [Wed, 30 Sep 2015 11:38:34 +0000 (11:38 +0000)]
merge r1693792 from trunk

Add support for extracting the msUPN and dnsSRV forms
of subjectAltName entries of type "otherName" into
SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n environment
variables. Addresses PR 58020.

* docs/manual/mod/mod_ssl.xml: add SSL_*_SAN_OTHER_*_n entries to the
  environment variables table

* modules/ssl/ssl_engine_vars.c: add support for retrieving the
  SSL_{CLIENT,SERVER}_SAN_OTHER_{msUPN,dnsSRV}_n variables

* modules/ssl/ssl_util_ssl.c: add parse_otherName_value, which
  currently recognizes the "msUPN" (1.3.6.1.4.1.311.20.2.3) and
  "id-on-dnsSRV" (1.3.6.1.5.5.7.8.7) otherName forms, and
  adapt modssl_X509_getSAN to take an optional otherName form
  argument for the GEN_OTHERNAME case

* modules/ssl/ssl_util_ssl.h: adapt modssl_X509_getSAN prototype

* modules/ssl/mod_ssl.c: register the id-on-dnsSRV otherName form
  OID (1.3.6.1.5.5.7.8.7) in OpenSSL's objects table

Proposed by: kbrand
Reviewed by: ylavic, jorton

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

8 years agomerge r1674538, r1677143, r1677144, r1677145, r1677146, r1677149, r1677151,
Kaspar Brand [Wed, 30 Sep 2015 11:31:43 +0000 (11:31 +0000)]
merge r1674538, r1677143, r1677144, r1677145, r1677146, r1677149, r1677151,
r1677153, r1677154, r1677155, r1677156, r1677159, r1677830, r1677832,
r1677834, r1677835 from trunk

mod_ssl namespacing

Proposed by: kbrand
Reviewed by: ylavic, jorton

mod_ssl namespacing: Rename ssl_util_ssl.h macros from SSL_foo to MODSSL_foo.
For related discussion, see the dev@ thread starting at:
http://mail-archives.apache.org/mod_mbox/httpd-dev/201504.mbox/%3C20150415163613.GC15209%40fintan.stsp.name%3E

mod_ssl namespacing: Rename SSL_init_app_data2_idx, SSL_get_app_data2,
and SSL_set_app_data2 from SSL_* to modssl_*. Update references in
README.dsov.* files. Rename static variable SSL_app_data2_idx to just
app_data2_idx since the symbol is internal to ssl_util_ssl.c.

mod_ssl namespacing: SSL_read_PrivateKey -> modssl_read_privatekey

mod_ssl namespacing: SSL_smart_shutdown -> modssl_smart_shutdown

mod_ssl namespacing: SSL_X509_getBC -> modssl_X509_getBC

mod_ssl namespacing: Make SSL_ASN1_STRING_to_utf8 a static function inside
ssl_util_ssl.c (no callers outside this file). The new static function name
chosen is convert_asn1_to_utf8, based on the assumption that neither SSL_
nor ASN1_ are safe prefixes to use without potential future overlap.

mod_ssl namespacing: Rename SSL_X509_NAME_ENTRY_to_string to
modssl_X509_NAME_ENTRY_to_string.

mod_ssl namespacing: SSL_X509_NAME_to_string -> modssl_X509_NAME_to_string

mod_ssl namespacing: SSL_X509_getSAN -> modssl_X509_getSAN

mod_ssl namespacing: Make SSL_X509_getIDs a static function inside the
file ssl_util_ssl.c (no outside callers). Rename to just getIDs().

mod_ssl namespacing: SSL_X509_match_name -> modssl_X509_match_name

mod_ssl namespacing: SSL_X509_INFO_load_file -> modssl_X509_INFO_load_file

mod_ssl namespacing: Merge SSL_X509_INFO_load_path() into its only caller
ssl_init_proxy_certs() in ssl_engine_init.c. No functional change.
Review by: kbrand

mod_ssl namespacing: Move modssl_X509_INFO_load_file() into ssl_engine_init.c
and make it a static function called load_x509_info().

mod_ssl namespacing: Move SSL_CTX_use_certificate_chain() into ssl_engine_init.c
and make it a static function called use_certificate_chain().

mod_ssl namespacing: Rename SSL_SESSION_id2sz() to modssl_SSL_SESSION_id2sz().

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

8 years agoVote, promote.
Joe Orton [Wed, 30 Sep 2015 10:16:19 +0000 (10:16 +0000)]
Vote, promote.

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

8 years agoPropose
Christophe Jaillet [Wed, 30 Sep 2015 08:48:00 +0000 (08:48 +0000)]
Propose

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

8 years agomod_http2: config.m4: merge r1705257 from trunk.
Yann Ylavic [Tue, 29 Sep 2015 11:15:00 +0000 (11:15 +0000)]
mod_http2: config.m4: merge r1705257 from trunk.

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

8 years agoPropose.
Yann Ylavic [Tue, 29 Sep 2015 10:48:42 +0000 (10:48 +0000)]
Propose.

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

8 years agoVote for OPENSSL_NO_SSL3 (including default), looks acceptable on dev@.
Yann Ylavic [Tue, 29 Sep 2015 10:17:39 +0000 (10:17 +0000)]
Vote for OPENSSL_NO_SSL3 (including default), looks acceptable on dev@.

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