Christophe Jaillet [Sun, 8 Apr 2018 19:16:10 +0000 (19:16 +0000)]
Some new easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828659 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Apr 2018 16:35:44 +0000 (16:35 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828652 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sun, 8 Apr 2018 16:34:49 +0000 (16:34 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828651 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 7 Apr 2018 21:04:16 +0000 (21:04 +0000)]
Add some spaces that were skipped when r1684524 from trunk has been backported in 2.4.x in r1684525.
(in order to synch 2.4.x and trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828619 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 7 Apr 2018 05:19:06 +0000 (05:19 +0000)]
Remove an extra '>'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828585 13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 6 Apr 2018 08:23:07 +0000 (08:23 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828495 13f79535-47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 6 Apr 2018 08:06:56 +0000 (08:06 +0000)]
* Add proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828494 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 5 Apr 2018 21:15:20 +0000 (21:15 +0000)]
Small comments on doc issues
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828479 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Apr 2018 13:32:12 +0000 (13:32 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828432 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Apr 2018 13:30:41 +0000 (13:30 +0000)]
Votes, promotions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828431 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 5 Apr 2018 11:23:01 +0000 (11:23 +0000)]
Propose, vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828419 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 3 Apr 2018 13:07:16 +0000 (13:07 +0000)]
updated backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828234 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 3 Apr 2018 11:31:57 +0000 (11:31 +0000)]
On the 2.4.x branch:
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828219 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 1 Apr 2018 07:35:32 +0000 (07:35 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828129 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Sun, 1 Apr 2018 07:33:41 +0000 (07:33 +0000)]
mod_proxy.xml: docs improvements
Tried to clarify the doubts raised in PR 61225
(related also to 60458) and also split a single note
into multiple ones to improve the reader's attention span
(reading through a long block of text may cause loss
of attention to important details, as it happened to me :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828128 13f79535-47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 31 Mar 2018 21:31:18 +0000 (21:31 +0000)]
Add a note about prepared DBD queries to rewritemap docs.
PR#60440 identifies this as a gotcha
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828122 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Mar 2018 12:48:02 +0000 (12:48 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828063 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Mar 2018 12:44:57 +0000 (12:44 +0000)]
Merge r1827599, r1827604 from trunk:
Placeholder for RegexDefaultOptions.
Improvement and correction welcome.
Follow up to r1827599: don't mention EXTENDED.
It does/can *not* work as expected for now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1828061 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 29 Mar 2018 07:05:08 +0000 (07:05 +0000)]
Vote*3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827958 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 28 Mar 2018 19:49:08 +0000 (19:49 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827944 13f79535-47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 26 Mar 2018 19:43:19 +0000 (19:43 +0000)]
minor lint... PR format
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827782 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Mon, 26 Mar 2018 18:47:21 +0000 (18:47 +0000)]
Small tweaks
(r1827778 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827779 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 26 Mar 2018 14:07:12 +0000 (14:07 +0000)]
On the 2.4.x branch:
propsing SSLPolicy backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827768 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 25 Mar 2018 12:50:34 +0000 (12:50 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827717 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 25 Mar 2018 12:47:58 +0000 (12:47 +0000)]
Document built-in DOCUMENT_PATH_INFO and USER_NAME that have been available and undocumented for years (already present in the very first commit of mod_include.c in svn history in 1999!)
Tested and works like a charm.
Spotted while looking at PR 34405.
(r1827705 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827716 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 25 Mar 2018 12:06:57 +0000 (12:06 +0000)]
Fix a typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827712 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 25 Mar 2018 11:18:52 +0000 (11:18 +0000)]
add showstopper for next release for apr 14
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827706 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Mar 2018 15:44:58 +0000 (15:44 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827658 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Mar 2018 15:44:01 +0000 (15:44 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827657 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 24 Mar 2018 14:12:40 +0000 (14:12 +0000)]
Add missing CHANGES entry related to PR 61511
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827651 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 24 Mar 2018 13:25:46 +0000 (13:25 +0000)]
Add missing CHANGES entry related to PR 58688
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827650 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 24 Mar 2018 11:43:44 +0000 (11:43 +0000)]
more style fixes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827635 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 24 Mar 2018 11:41:56 +0000 (11:41 +0000)]
add security: prefix consistently
bump CVE's to top of each release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827634 13f79535-47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 24 Mar 2018 02:50:09 +0000 (02:50 +0000)]
Updates for announcement of 2.4.33
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827622 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 23 Mar 2018 22:38:17 +0000 (22:38 +0000)]
Add compatibility note for 'RegisterHttpMethod'
(backported in 2.4.x in
1772678)
(similar to r1827610 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827611 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 23 Mar 2018 22:11:15 +0000 (22:11 +0000)]
Fix revision of a compatibility note
(one should always save open documents before pushing anything...)
(r1827608 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827609 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 23 Mar 2018 22:08:13 +0000 (22:08 +0000)]
Add compatibility note for the 3rd argument of 'RewriteMap'
(backported in 2.4.x in
1811748)
Improve doc highlight
(r1827603 and r1827605) in trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827607 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 23 Mar 2018 21:34:10 +0000 (21:34 +0000)]
Document the 3rd argument of 'RewriteMap'
(r1664575 in trunk)
Compatibility note will be added in the next commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827600 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 23 Mar 2018 20:41:40 +0000 (20:41 +0000)]
note two recent tags not released
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827594 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 23 Mar 2018 17:18:50 +0000 (17:18 +0000)]
Part of my comment is already addressed in another backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827584 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 23 Mar 2018 17:08:37 +0000 (17:08 +0000)]
Comment on backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827583 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 23 Mar 2018 11:44:04 +0000 (11:44 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827557 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 23 Mar 2018 11:22:52 +0000 (11:22 +0000)]
Propose, fix links.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827556 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 23 Mar 2018 08:35:49 +0000 (08:35 +0000)]
Merge r1816110 from trunk:
Document special cases where changing Listen across a restart will
fail.
PR: 61666
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827552 13f79535-47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 23 Mar 2018 08:15:37 +0000 (08:15 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827549 13f79535-47bb-0310-9956-
ffa450edef68
André Malo [Wed, 21 Mar 2018 18:08:49 +0000 (18:08 +0000)]
svn:eol-style = native
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827426 13f79535-47bb-0310-9956-
ffa450edef68
André Malo [Wed, 21 Mar 2018 17:52:02 +0000 (17:52 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827425 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 20 Mar 2018 21:19:41 +0000 (21:19 +0000)]
Merge r1827359 from trunk:
PR62200: EBCDIC: ap_rgetline APR_ENOSPC
On EBCDIC systems, translation does not occur in ap_rgetline() if the line is
larger than the buffer size.
(note: No STATUS vote for EBCDIC fix)
Submitted By: Hank Ibell
Committed By: covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827360 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 20 Mar 2018 20:31:26 +0000 (20:31 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827356 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 20 Mar 2018 20:29:54 +0000 (20:29 +0000)]
Improve highlight and fix a few typo.
Mostly some missing <var></var> and <module></module>
(r1827353 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827355 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 19 Mar 2018 13:18:51 +0000 (13:18 +0000)]
Proposing backport for mod_remoteip fix for HTTP/2 connections.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827198 13f79535-47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 17 Mar 2018 23:41:25 +0000 (23:41 +0000)]
Post 2.4.33 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827120 13f79535-47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 17 Mar 2018 23:41:18 +0000 (23:41 +0000)]
Get ready to tag httpd 2.4.33
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827118 13f79535-47bb-0310-9956-
ffa450edef68
Nick Kew [Sat, 17 Mar 2018 23:34:06 +0000 (23:34 +0000)]
Vote in haste
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827117 13f79535-47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 17 Mar 2018 23:29:07 +0000 (23:29 +0000)]
Note the 2.4.32 thing that happened
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827116 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 17 Mar 2018 21:00:08 +0000 (21:00 +0000)]
Backported in r1827108.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827109 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 17 Mar 2018 20:59:39 +0000 (20:59 +0000)]
Merge r1826686 from trunk:
Instrument 'md_log_perror' and fix corresponding errors reported by gcc.
Submitted by: jailletc36
Reviewed by: jailletc36, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827108 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Mar 2018 16:28:40 +0000 (16:28 +0000)]
Rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827097 13f79535-47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Mar 2018 16:27:40 +0000 (16:27 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827096 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 16 Mar 2018 15:49:14 +0000 (15:49 +0000)]
adding r1827001 to backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1827004 13f79535-47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 16 Mar 2018 15:44:10 +0000 (15:44 +0000)]
backport proposal for r1826995
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826999 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 16 Mar 2018 11:29:14 +0000 (11:29 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826974 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 16 Mar 2018 09:18:45 +0000 (09:18 +0000)]
Reverting proposal again: compilation test reveals
that SSL_get_server_tmp_key is only OpenSSL 1.0.2+.
But it seems the whole feature doesn't make sense
without SSL_get_server_tmp_key.
For the sake of completeness: EVP_PKEY_id also isn't
part of 0.9.8a.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826929 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 16 Mar 2018 08:30:26 +0000 (08:30 +0000)]
Add log msg from Yann's addition to proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826925 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 16 Mar 2018 08:26:21 +0000 (08:26 +0000)]
Proposing this again, now with Yann's addition.
The OpenSSL 1.0.2 dependency is not a problem, because
it is used only conditionally if 1.0.2 is available,
but not for older versions.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826922 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:36:43 +0000 (23:36 +0000)]
Votes (applies cleanly in order).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826904 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:27:20 +0000 (23:27 +0000)]
Thanks Yann for your additional patch but on second
thought the whole feature can't be backported
due to our support of OpenSSL 0.9.8 in 2.4.x
and EC_curve_nid2nist() is only available in
1.0.2+.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826901 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:20:16 +0000 (23:20 +0000)]
Follow up to r1826899: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826900 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:19:12 +0000 (23:19 +0000)]
Merge r1826556, r1826847 from trunk:
Fix timeout logging in ap_process_request().
We can't use 'r' after ap_process_request_after_handler(), the core output
filter might have cleaned up its deferred bucket brigade on error, including
the EOR bucket.
Reported by: steffenal
Closes SpiderLabs/ModSecurity#1542
Follow up to r1826556: CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, covener, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826899 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:16:29 +0000 (23:16 +0000)]
Follow up to r1826897: backported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826898 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:15:49 +0000 (23:15 +0000)]
Merge r1826845 from trunk:
mod_slotmem_shm: SHMs need to be attached in MPM winnt children processes.
We can't (re-)create them since they exist already and are owned by the
parent process.
Submitted by: ylavic
Reviewed by: ylavic, covener, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826897 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:13:08 +0000 (23:13 +0000)]
Patches now uploaded, sorry.
Removed comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826896 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:11:39 +0000 (23:11 +0000)]
Follow up to r1826891: missing mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826895 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:09:24 +0000 (23:09 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826894 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:08:35 +0000 (23:08 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826893 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:05:58 +0000 (23:05 +0000)]
Merge
1710403 from trunk:
htpasswd/htdigest: Disable support for bcrypt on EBCDIC platforms.
apr-util's bcrypt implementation doesn't tolerate EBCDIC.
Submitted by: rjung
Reviewed by: rjung, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826892 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 23:02:58 +0000 (23:02 +0000)]
Merge
1626956 and
1628388 from trunk:
ab: try all destination socket addresses returned by apr_sockaddr_info_get
instead of failing on first one when not available.
Needed for instance if localhost resolves to both ::1 and 127.0.0.1
e.g. if both are in /etc/hosts.
ab: Use only one connection to determine working destination socket address.
Submitted by: rjung
Reviewed by: rjung, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826891 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 23:00:59 +0000 (23:00 +0000)]
Typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826890 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 22:58:21 +0000 (22:58 +0000)]
Anticipated +1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826889 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 22:56:40 +0000 (22:56 +0000)]
Merge
1781516 fro trunk:
htpasswd/htdbm: report the right limit when get_password()
overflows.
Submitted by: rjung
Reviewed by: rjung, covener, jailletc36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826888 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 22:53:42 +0000 (22:53 +0000)]
Merge
1812756 from trunk:
htpasswd: Don't fail in -v mode if password file is unwritable.
PR 61631.
Submitted by: rjung
Reviewed by: rjung, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826887 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 22:51:29 +0000 (22:51 +0000)]
Merge
1781509 from trunk:
htpasswd: don't point to (unused) stack memory on output
to make static analysers happy. PR 60634.
Submitted by: rjung
Reviewed by: rjung, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826886 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 22:46:27 +0000 (22:46 +0000)]
Merge
1821767 from trunk:
LibreSSL doesn't have or require applink.c
Submitted by: rjung
Reviewed by: rjung, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826885 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 22:30:44 +0000 (22:30 +0000)]
More votes and comments.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826883 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 22:19:46 +0000 (22:19 +0000)]
Vote/promote, comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826881 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 20:39:42 +0000 (20:39 +0000)]
Makes sense, withdrawing.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826862 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 15 Mar 2018 20:09:39 +0000 (20:09 +0000)]
Easy vote + promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826859 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 15 Mar 2018 19:24:29 +0000 (19:24 +0000)]
Slightly improve syntax highlight
(r1826856 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826858 13f79535-47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 15 Mar 2018 19:07:28 +0000 (19:07 +0000)]
vote/promote/comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826857 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 18:30:25 +0000 (18:30 +0000)]
Easy votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826850 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 18:22:41 +0000 (18:22 +0000)]
Proposing style :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826849 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 15 Mar 2018 18:20:01 +0000 (18:20 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826848 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 13:27:48 +0000 (13:27 +0000)]
Propose backports bringing rotatelogs in sync
with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826813 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 12:10:42 +0000 (12:10 +0000)]
Add small backport proposals for htpasswd, htdbm
and htdigest bringing them in sync with trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826801 13f79535-47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 15 Mar 2018 11:45:25 +0000 (11:45 +0000)]
Propose ab patch for minor problem detected
during 2.4.32 testing (thanks to Joe for pointing
out the trunk fix) and two more small changes
bringing 2.4 ab in sync with trunk ab.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826799 13f79535-47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Wed, 14 Mar 2018 22:29:37 +0000 (22:29 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826759 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 12 Mar 2018 15:19:07 +0000 (15:19 +0000)]
Revert r1826543, was meant for trunk...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826555 13f79535-47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 12 Mar 2018 12:24:27 +0000 (12:24 +0000)]
Fix timeout logging in ap_process_request().
We can't use 'r' after ap_process_request_after_handler(), the core output
filter might have cleaned up its deferred bucket brigade on error, including
the EOR bucket.
Reported by: steffenal
Fixes SpiderLabs/ModSecurity#1542
[Reverted by r1826555]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826543 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 12 Mar 2018 10:18:22 +0000 (10:18 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826531 13f79535-47bb-0310-9956-
ffa450edef68
Luca Toscano [Mon, 12 Mar 2018 10:18:00 +0000 (10:18 +0000)]
mod_md.xml: update the Let’s Encrypt Subscriber Agreement link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1826530 13f79535-47bb-0310-9956-
ffa450edef68
projects / apache / log