]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Joe Orton [Wed, 28 Aug 2019 12:15:01 +0000 (12:15 +0000)]
Proposed mod_ssl PKCS#11 cert/key support.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1866035 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 28 Aug 2019 10:55:24 +0000 (10:55 +0000)]
* Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1866032 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 27 Aug 2019 05:50:29 +0000 (05:50 +0000)]
Merged.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865967 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 27 Aug 2019 05:50:19 +0000 (05:50 +0000)]
Merge r1865749 from trunk:
PR63688 balancer csrf problems
fix case-sensitive referer check
Submitted By: Armin Abfalterer
Reviewed by: covener, jim, jorton
PR: 63688
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865966 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 27 Aug 2019 05:45:09 +0000 (05:45 +0000)]
Regressions -
Predicted: 1
Delivered: 1
10/10 would buy again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865965 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 26 Aug 2019 15:10:40 +0000 (15:10 +0000)]
patch updated in place for LOGNOS
leaving jims vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865946 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 26 Aug 2019 14:48:24 +0000 (14:48 +0000)]
good catch!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865942 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 26 Aug 2019 14:29:50 +0000 (14:29 +0000)]
propose proxy fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865940 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Aug 2019 13:35:41 +0000 (13:35 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865850 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Aug 2019 13:34:32 +0000 (13:34 +0000)]
fr doc XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865849 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 23 Aug 2019 13:08:50 +0000 (13:08 +0000)]
no surprise to Joe :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865750 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 19 Aug 2019 16:17:13 +0000 (16:17 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865475 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 18 Aug 2019 18:36:17 +0000 (18:36 +0000)]
s/cacheing/caching/
Improve layout.
Add some missing <module> tags.
Add some missing <directive> tags.
Add some missing <directive module=...> links
Add the name of the directive in <default>, so that 'quickreference.html' is generated correctly.
In the AuthnCacheContext directive, fix the way 'directory' and 'server' are displayed. They are key-words and should not be in italic.
(r1865402 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865403 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 17 Aug 2019 16:57:34 +0000 (16:57 +0000)]
Fix a broken link.
Add a missing <module></module>
Synch with trunk
(mostly r1865363 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865364 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Sat, 17 Aug 2019 15:54:54 +0000 (15:54 +0000)]
Log change in the correct version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865361 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Aug 2019 14:01:54 +0000 (14:01 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865358 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 17 Aug 2019 14:00:44 +0000 (14:00 +0000)]
XML updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865357 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 14 Aug 2019 20:52:45 +0000 (20:52 +0000)]
Updates for announcement of 2.4.41
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865189 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 13 Aug 2019 12:18:03 +0000 (12:18 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865033 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 13 Aug 2019 12:07:30 +0000 (12:07 +0000)]
fr doc - new translated file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1865032 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Sun, 11 Aug 2019 11:18:38 +0000 (11:18 +0000)]
Include for mod_status.h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864925 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 9 Aug 2019 13:38:26 +0000 (13:38 +0000)]
Add note about 2.4.40 not being released
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864803 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 9 Aug 2019 13:36:23 +0000 (13:36 +0000)]
Post 2.4.41 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864802 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 9 Aug 2019 13:36:14 +0000 (13:36 +0000)]
Get ready to tag httpd 2.4.41
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864800 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Aug 2019 13:30:17 +0000 (13:30 +0000)]
Update mergeinfo, r1296428 was merged to 2.4.x in r1298453
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864799 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Aug 2019 13:25:20 +0000 (13:25 +0000)]
Merge r1846254 from trunk (under "documentation" RTC exception):
* support/htpasswd.c (usage): Fix bcrypt round maximum.
* docs/manual/programs/htpasswd.xml: Document that bcrypt rounds are
capped at 17.
PR: 62078
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864798 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Aug 2019 12:28:06 +0000 (12:28 +0000)]
Update mergeinfo for mod_proxy backports in r1864787.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864794 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Aug 2019 12:24:48 +0000 (12:24 +0000)]
Tweak text, credit Niels.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864793 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Aug 2019 12:06:55 +0000 (12:06 +0000)]
-l and -L are not exclusive.
Document the 'G' suffix.
See PR 63638
(r1864786 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864789 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 9 Aug 2019 11:59:15 +0000 (11:59 +0000)]
Merge of r1864693,
1864695 ,
1864703 from trunk;
*) mod_proxy: Improve XSRF/XSS protection. [Joe Orton]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864787 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 9 Aug 2019 11:56:36 +0000 (11:56 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864785 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 9 Aug 2019 11:29:57 +0000 (11:29 +0000)]
Synch a bit with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864783 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 9 Aug 2019 10:42:24 +0000 (10:42 +0000)]
Merge r1709121 from trunk:
mod_session: Introduce SessionExpiryUpdateInterval which allows to
configure the session/cookie expiry's update interval. PR 57300.
Submitted by: Paul Spangler <paul.spangler ni.com>
Reviewed/Committed by: ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864781 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 9 Aug 2019 08:48:33 +0000 (08:48 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864778 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Aug 2019 08:47:46 +0000 (08:47 +0000)]
When did 80 char max line lengths go out of fashion?
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864777 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 9 Aug 2019 08:30:21 +0000 (08:30 +0000)]
ENOCOFFEE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864774 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Fri, 9 Aug 2019 08:27:42 +0000 (08:27 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864773 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 9 Aug 2019 07:23:13 +0000 (07:23 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864772 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Aug 2019 21:25:29 +0000 (21:25 +0000)]
propose SessionExpiryUpdateInterval
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864737 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Aug 2019 21:23:29 +0000 (21:23 +0000)]
followup to r1864734
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864735 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 8 Aug 2019 20:45:59 +0000 (20:45 +0000)]
Add missing APLOGNO
(r1864733 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864734 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Aug 2019 14:08:59 +0000 (14:08 +0000)]
quick vote on balancer
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864707 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 8 Aug 2019 14:06:40 +0000 (14:06 +0000)]
proxy-balancer XSRF/XSS fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864706 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Aug 2019 14:06:22 +0000 (14:06 +0000)]
lognos from trunk
some mergeinfo blocked `svn merge` from taking any action so I did diff/patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864705 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Aug 2019 14:01:19 +0000 (14:01 +0000)]
stapling logno
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864704 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Aug 2019 13:09:10 +0000 (13:09 +0000)]
Merge r1864699 from trunk:
lognos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864702 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 8 Aug 2019 13:08:33 +0000 (13:08 +0000)]
no votes for APLOGNO commits.
99% sure but please reply
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864701 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 7 Aug 2019 11:15:48 +0000 (11:15 +0000)]
Merge r1856560, r1856561, r1856846 from trunk:
Update apr_common.m4 to latest (trunk).
Note: why is that file in the httpd repo??
Revert r1856560: was not the latest apr_common.m4 version anyway...
How does that change came in my local workspace in the first place??
Well, our build with latest APR trunk seems to insist on updating apr_common.m4
So be it.
Submitted by: ylavic
Reviewed by: rjung, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864614 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 7 Aug 2019 11:14:58 +0000 (11:14 +0000)]
Merge r1864526 from trunk:
* modules/metadata/mod_remoteip.c (remoteip_process_v2_header,
remoteip_input_filter): Add sanity checks.
Submitted by: jorton, Daniel McCarney <cpu letsencrypt.org>
Submitted by: jorton
Reviewed by: jorton, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864613 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 7 Aug 2019 11:14:12 +0000 (11:14 +0000)]
promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864612 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 7 Aug 2019 11:13:45 +0000 (11:13 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864611 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 7 Aug 2019 08:55:48 +0000 (08:55 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864604 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Aug 2019 20:03:16 +0000 (20:03 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864563 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 6 Aug 2019 16:36:33 +0000 (16:36 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864537 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 6 Aug 2019 15:44:21 +0000 (15:44 +0000)]
1*stalled, 1*proposed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864528 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Aug 2019 12:16:38 +0000 (12:16 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864514 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Aug 2019 12:16:14 +0000 (12:16 +0000)]
Merged /httpd/httpd/trunk:r1864428 from trunk
*) mod_ssl: reverting a 2.4.40 change where a superfluous SSLCertificateChainFile configuration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864513 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Aug 2019 11:19:11 +0000 (11:19 +0000)]
and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864508 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 6 Aug 2019 11:18:51 +0000 (11:18 +0000)]
backport vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864507 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Aug 2019 08:22:28 +0000 (08:22 +0000)]
Merged /httpd/httpd/trunk:r1864435,
1864438 ,
1864450 -
1864451 ,
1864464 from trunk:
*) modules/filters: PR 63633: Fix broken compilation when using old GCC (<4.2.x).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864469 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 6 Aug 2019 08:20:30 +0000 (08:20 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864468 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 6 Aug 2019 07:59:01 +0000 (07:59 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864467 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 6 Aug 2019 07:56:19 +0000 (07:56 +0000)]
Add r1864464 and reset vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864465 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 5 Aug 2019 19:44:51 +0000 (19:44 +0000)]
Rearrange long mod_md CHANGES entry in an attempt
to give it a better structure. I hope I got it right.
Also dropped misleading reference to missing mod_ssl
backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864454 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 5 Aug 2019 18:52:42 +0000 (18:52 +0000)]
Propose with essay.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864452 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 5 Aug 2019 14:33:12 +0000 (14:33 +0000)]
Add another patch to fix the new use of pragma.
Still under test.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864439 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 5 Aug 2019 14:28:20 +0000 (14:28 +0000)]
desk-check mod_md related revert
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864437 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 5 Aug 2019 14:24:11 +0000 (14:24 +0000)]
Note some progress, not yet rady vor vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864436 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 5 Aug 2019 11:32:02 +0000 (11:32 +0000)]
proposing backport of r1864428
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864429 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 5 Aug 2019 10:58:44 +0000 (10:58 +0000)]
Merged /httpd/httpd/trunk:r1864425
* mod_md: assigning APLOGNO(), silencing compiler warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864427 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 2 Aug 2019 20:16:56 +0000 (20:16 +0000)]
Post 2.4.40 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864289 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Fri, 2 Aug 2019 20:16:41 +0000 (20:16 +0000)]
Get ready to tag httpd 2.4.40
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864287 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:24:58 +0000 (09:24 +0000)]
Merge of r1864192 from trunk:
*) core, rewrite: Set PCRE_DOTALL by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864213 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:24:14 +0000 (09:24 +0000)]
votenpromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864212 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:13:37 +0000 (09:13 +0000)]
Merge of r1863635 from trunk:
*) md_crypt: Wrap get_ct_scts_nid(void) definition to avoid unused function error
when building in maintainer mode. [jim]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864209 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:12:18 +0000 (09:12 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864208 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:10:06 +0000 (09:10 +0000)]
Merge of r1864191 from trunk:
*) core, proxy: remove request URL and headers from error docs (CVE-2019-10092)
[Eric Covener]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864207 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 2 Aug 2019 09:08:43 +0000 (09:08 +0000)]
votenpromote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864206 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 2 Aug 2019 07:51:29 +0000 (07:51 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864203 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 2 Aug 2019 01:47:02 +0000 (01:47 +0000)]
propose recent trunk revs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864194 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Aug 2019 14:13:31 +0000 (14:13 +0000)]
Merged /httpd/httpd/trunk:r1864153
Fix unnecessary redefinition of AP_ENABLE_EXCEPTION_HOOK. [Eric Covener]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864155 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 1 Aug 2019 08:42:58 +0000 (08:42 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864136 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Thu, 1 Aug 2019 08:40:30 +0000 (08:40 +0000)]
Fix properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864135 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Aug 2019 08:24:02 +0000 (08:24 +0000)]
merge information from h2 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864128 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Aug 2019 08:18:03 +0000 (08:18 +0000)]
Merge of r1861338,
1862475 ,
1862583 ,
1862865 ,
1863221 ,
1863276 from trunk:
*) mod_http2: core setting "LimitRequestFieldSize" is not additionally checked on
merged header fields, just as HTTP/1.1 does. [Stefan Eissing, Michael Kaufmann]
*) mod_http2: fixed a bug that prevented proper stream cleanup when connection
throttling was in place. Stream resets by clients on streams initiated by them
are counted as possible trigger for throttling. [Stefan Eissing]
*) mod_http2/mpm_event: Fixes the behaviour when a HTTP/2 connection has nothing
more to write with streams ongoing (flow control block). The timeout waiting
for the client to send WINODW_UPDATE was incorrectly KeepAliveTimeout and not
Timeout as it should be. Fixes PR 63534. [Yann Ylavic, Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864126 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 1 Aug 2019 07:27:04 +0000 (07:27 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864119 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 31 Jul 2019 12:53:04 +0000 (12:53 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864055 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 30 Jul 2019 13:44:32 +0000 (13:44 +0000)]
Add CHANGES for r1864005
(backport of r1856829 from trunk).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864007 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:11:39 +0000 (13:11 +0000)]
Merge r1856829 from trunk:
*) mod_proxy: Load balancer byrequests required when bytraffic chosen
PR 62372
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864005 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:10:35 +0000 (13:10 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864004 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 30 Jul 2019 13:06:20 +0000 (13:06 +0000)]
Add CHANGES for r1864000
(backport of r1853560 from trunk).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864002 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:01:54 +0000 (13:01 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864001 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:01:21 +0000 (13:01 +0000)]
Merging r1853560 from trunk:
*) mod_proxy_hcheck: Create the configure for mod_proxy_hcheck when used in BalancerMember.
PR 60757
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1864000 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 13:00:29 +0000 (13:00 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863997 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 12:47:39 +0000 (12:47 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863995 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 30 Jul 2019 11:23:52 +0000 (11:23 +0000)]
Merged /httpd/httpd/trunk:r1851621,
1852128 ,
1862075
*) mod_ssl/mod_md: reversing dependency by letting mod_ssl offer hooks for
adding certificates and keys to a virtual host. An additional hook allows
answering special TLS connections as used in ACME challenges.
Adding 2 new hooks for init/get of OCSP stapling status information when
other modules want to provide those. Falls back to own implementation with
same behaviour as before.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863988 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 23 Jul 2019 12:52:51 +0000 (12:52 +0000)]
Backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863636 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 22 Jul 2019 19:31:12 +0000 (19:31 +0000)]
mod_proxy_hcheck: mod_proxy_hcheck: mute "run from watchdog" message.
This is way too verbose (every 100ms) to be logged at any LogLevel.
Backport of r1853992 from trunk.
Proposed by: rjung
Backported by: rjung
Reviewed by: rjung, jailletc36, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863597 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 22 Jul 2019 19:28:14 +0000 (19:28 +0000)]
core: fix crash when running with apr lib build with APR_POOL_DEBUG.
Observed with huge config and mod_security using long config lines.
Backport of r1863179 from trunk.
Proposed by: rjung
Backported by: rjung
Reviewed by: rjung, icing, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863596 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 22 Jul 2019 12:47:51 +0000 (12:47 +0000)]
and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1863546 13f79535 -47bb-0310-9956-
ffa450edef68