]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
André Malo [Fri, 19 Oct 2018 05:59:20 +0000 (05:59 +0000)]
build bootstrap
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844300 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 18 Oct 2018 14:33:43 +0000 (14:33 +0000)]
Post 2.4.37 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844248 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 18 Oct 2018 14:33:35 +0000 (14:33 +0000)]
Get ready to tag httpd 2.4.37
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844246 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 18 Oct 2018 11:38:42 +0000 (11:38 +0000)]
fr doc : adding UTF-8 html files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844231 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Thu, 18 Oct 2018 11:20:54 +0000 (11:20 +0000)]
fr doc : deleting ISO-8859-1 html files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844229 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 18 Oct 2018 10:06:37 +0000 (10:06 +0000)]
mod_ssl: Correctly merge configurations that have client certificates set
by SSLProxyMachineCertificate{File|Path}.
The certificates and keys loaded during configuration time got lost during
runtime if e.g. SSLProxyMachineCertificate{File|Path} was set on virtual host
level and there was an SSL directive at directory level, e.g. SSLRequire.
This fixes a regression likely introduced in r1740928 (backported in r1824187).
Backport of r1844002 from trunk.
Submitted by: rjung
Reviewed by: rjung, rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844226 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 18 Oct 2018 10:03:52 +0000 (10:03 +0000)]
mod_ssl: We need to get the SSL_CTX for further processing
down below.
This fixes a crash during SSL renegotiation with OptRenegotiate set,
when client certificates are available from the original handshake
but were originally not verified and should get verified now.
This is a regression in 2.4.36 (unreleased).
Backport of r1828793 from trunk.
Submitted by: rjung
Reviewed by: rjung, rpluem, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844223 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 18 Oct 2018 09:55:06 +0000 (09:55 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844222 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 18 Oct 2018 09:47:02 +0000 (09:47 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844221 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 18 Oct 2018 09:26:48 +0000 (09:26 +0000)]
Another mod_ssl backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844219 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 18 Oct 2018 09:15:20 +0000 (09:15 +0000)]
Propose backport to prevent crashes during
SSL renegotiation with OptRenegotiate set,
client certificates available from original
handshake but client certs were originaly not
verified and should get verified now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844217 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 17 Oct 2018 07:50:14 +0000 (07:50 +0000)]
Add a changelog entry for r1844047.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844069 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 16 Oct 2018 20:24:23 +0000 (20:24 +0000)]
*) mod_ssl: Handle SSL_read() return code 0 similarly to <0. It is needed
when using OpenSSL 1.1.1 and should not harm for versions before
1.1.1.
Without the patch for 1.1.1 a 0 byte read no longer results in
EAGAIN but instead in APR_EOF which leads to HTTP/2 failures.
For the changelog: Fix HTTP/2 failures when using OpenSSL 1.1.1.
trunk patch: http://svn.apache.org/r1843954
2.4.x patch: svn merge -c
1843954 ^/httpd/httpd/trunk .
+1: rjung, druggeri, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844047 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 16 Oct 2018 18:14:13 +0000 (18:14 +0000)]
* Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844037 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 16 Oct 2018 17:56:29 +0000 (17:56 +0000)]
Can confirm this resolves H2 test failure issues introduced w/ OpenSSL 1.1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844034 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 16 Oct 2018 16:57:22 +0000 (16:57 +0000)]
Typo in proposed revision number.
Thanks to Daniel for the heads up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844029 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 16 Oct 2018 13:23:34 +0000 (13:23 +0000)]
Died on the vine
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1844007 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 16 Oct 2018 09:47:34 +0000 (09:47 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843989 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Mon, 15 Oct 2018 15:38:47 +0000 (15:38 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843918 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 12 Oct 2018 15:36:05 +0000 (15:36 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843682 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 11 Oct 2018 14:24:38 +0000 (14:24 +0000)]
propose "at maxrequestworkers" patch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843555 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 11 Oct 2018 07:01:18 +0000 (07:01 +0000)]
* This is addressed now
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843533 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 10 Oct 2018 19:11:42 +0000 (19:11 +0000)]
Post 2.4.36 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843493 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 10 Oct 2018 19:11:30 +0000 (19:11 +0000)]
Get ready to tag httpd 2.4.36
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843491 13f79535 -47bb-0310-9956-
ffa450edef68
William A. Rowe Jr [Wed, 10 Oct 2018 16:45:20 +0000 (16:45 +0000)]
Note release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843472 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 10 Oct 2018 15:40:35 +0000 (15:40 +0000)]
Merge r1843242 from trunk:
mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
responses allowing these modules to properly set or fix-up the response
headers such as Vary or ETag.
This change follows up on r1837056 that disabled that special handling and
thus resulted in a potential violation of RFC7232, 4.1:
The server generating a 304 response MUST generate any of the following
header fields that would have been sent in a 200 (OK) response to the
same request: Cache-Control, Content-Location, Date, ETag, Expires,
and Vary.)
References:
https://lists.apache.org/thread.html/
f5733ca6743757e8aa8b58a0cd9e27680971551c2a20f5606c66507e @%3Cdev.httpd.apache.org%3E
https://tools.ietf.org/html/rfc7232#section-4.1
Submitted by: kotkov
Reviewed by: kotkov, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843469 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 10 Oct 2018 15:38:42 +0000 (15:38 +0000)]
Merge r1843426 from trunk:
mod_http2: adding defensive code for stream EOS handling, in case the request handler
missed to signal it the normal way (eos buckets). Addresses github issues
https://github.com/icing/mod_h2/issues/164, https://github.com/icing/mod_h2/issues/167
and https://github.com/icing/mod_h2/issues/170.
Submitted by: icing
Reviewed by: icing, ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843468 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 10 Oct 2018 15:37:32 +0000 (15:37 +0000)]
Merge r1839303, r1843290 from trunk:
These need to be signed longs... cast as needed.
Add CHANGES entry
Submitted by: jim, jailletc36
Reviewed by: jailletc36 (by inspection), ylavic, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843467 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 10 Oct 2018 15:35:03 +0000 (15:35 +0000)]
approved backports
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843466 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 10 Oct 2018 15:34:19 +0000 (15:34 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843464 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 10 Oct 2018 13:06:44 +0000 (13:06 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843444 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Oct 2018 12:13:41 +0000 (12:13 +0000)]
adding proposal to backport h2 eos handling fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843434 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 10 Oct 2018 09:13:20 +0000 (09:13 +0000)]
ab: Add client certificate support.
trunk: http://svn.apache.org/r1841784
2.4.x: svn merge -c r1841784 ^/httpd/httpd/trunk .
+1: minfrin, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843412 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Wed, 10 Oct 2018 09:10:15 +0000 (09:10 +0000)]
ab: print Server Temp Key information.
trunk patch: http://svn.apache.org/r1738415
http://svn.apache.org/r1826930
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ab.patch
+1: minfrin, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843411 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 9 Oct 2018 23:26:35 +0000 (23:26 +0000)]
Merge r1842540 from trunk:
* Pickup the proxy related configuration for verify mode and verify depth and
not the configuration settings for frontend connections in case of
connections by the proxy to the backend.
PR: 62769
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843370 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 9 Oct 2018 23:22:44 +0000 (23:22 +0000)]
*) mod_ssl: downgrade logging of requests without SNI when SSLStrictSNIVHostCheck is on
(just a quality of life improvement for log-reading admins):
trunk: http://svn.apache.org/r1841446
trunk: http://svn.apache.org/r1841455
2.4.x branch: svn merge -c
1841446 ,
1841455 ^/httpd/httpd/trunk .
+1: icing, minfrin, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843369 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 9 Oct 2018 23:20:59 +0000 (23:20 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843367 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 9 Oct 2018 15:06:21 +0000 (15:06 +0000)]
Votes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843298 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 9 Oct 2018 14:29:41 +0000 (14:29 +0000)]
Add CHANGES entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843291 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Tue, 9 Oct 2018 13:56:23 +0000 (13:56 +0000)]
Correctly merge r1836287, backported in 2.4.x in r1836288.
(unless I missed something, the function is also called 'ap_directory_walk' in 2.4.x)
This is only a comment update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843284 13f79535 -47bb-0310-9956-
ffa450edef68
Evgeny Kotkov [Tue, 9 Oct 2018 12:31:58 +0000 (12:31 +0000)]
On the 2.4.x branch: Propose the mod_brotli/mod_deflate 304 handling
fix (r1843242) for backport.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843245 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 9 Oct 2018 11:59:13 +0000 (11:59 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843241 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Oct 2018 21:44:09 +0000 (21:44 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843209 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Oct 2018 21:40:55 +0000 (21:40 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843208 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Mon, 8 Oct 2018 21:18:06 +0000 (21:18 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1843206 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 Oct 2018 11:52:15 +0000 (11:52 +0000)]
promote w/ 3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1842896 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Fri, 5 Oct 2018 11:51:45 +0000 (11:51 +0000)]
Backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1842895 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 2 Oct 2018 16:22:33 +0000 (16:22 +0000)]
XForms.
Backport of r1842640 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1842642 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 2 Oct 2018 16:21:26 +0000 (16:21 +0000)]
Remove garbage.
Backport of r1842639 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1842641 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Sep 2018 12:51:19 +0000 (12:51 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1842330 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 29 Sep 2018 12:38:55 +0000 (12:38 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1842327 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 25 Sep 2018 11:58:31 +0000 (11:58 +0000)]
Try to be a bit more concise in OpenSSL 1.1.1/TLSv1.3 changes,
apportion blame/credit widely.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841920 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Sun, 23 Sep 2018 21:47:02 +0000 (21:47 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841785 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 22 Sep 2018 14:54:00 +0000 (14:54 +0000)]
documentation rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841686 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Sat, 22 Sep 2018 14:51:30 +0000 (14:51 +0000)]
mod_ssl.xml: bring balance to the force
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841685 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2018 13:30:15 +0000 (13:30 +0000)]
MPMs: Initialize all runtime/asynchronous objects on a dedicated pool and
before signals handling to avoid lifetime issues on restart or shutdown.
PR 62658.
trunk patch: http://svn.apache.org/r1835845
http://svn.apache.org/r1835846
http://svn.apache.org/r1837354
http://svn.apache.org/r1837356
http://svn.apache.org/r1839571
http://svn.apache.org/r1839583
2.4.x patch: http://home.apache.org/~ylavic/patches/2.4.x-mpms_async_objects_lifetime.patch
+1: ylavic, jim (but not for 2.4.35), minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841586 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2018 13:29:14 +0000 (13:29 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841584 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2018 13:14:11 +0000 (13:14 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841583 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2018 13:07:17 +0000 (13:07 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841582 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2018 12:14:05 +0000 (12:14 +0000)]
Add TLSv1.3 support to mod_ssl:
trunk: http://svn.apache.org/r1839946
http://svn.apache.org/r1839920
http://svn.apache.org/r1833589
http://svn.apache.org/r1833588
http://svn.apache.org/r1828723
http://svn.apache.org/r1828720
http://svn.apache.org/r1828222
http://svn.apache.org/r1827992
http://svn.apache.org/r1827924
http://svn.apache.org/r1827912
http://svn.apache.org/r1828790
http://svn.apache.org/r1828791
http://svn.apache.org/r1828792
http://svn.apache.org/r1840585
http://svn.apache.org/r1840710
http://svn.apache.org/r1841218
2.4.x branch: svn merge ^/httpd/httpd/branches/tlsv1.3-for-2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841573 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Fri, 21 Sep 2018 12:11:00 +0000 (12:11 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841572 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 20 Sep 2018 09:58:11 +0000 (09:58 +0000)]
Adding change to INFO to mod_ssl logging backport porposal re strictsni checks
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841456 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 20 Sep 2018 09:07:46 +0000 (09:07 +0000)]
backport proposal of log level adjust in mod_ssl re SSLStrictSNIVHostCheck
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841447 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2018 12:55:26 +0000 (12:55 +0000)]
Merge r1835118 from trunk:
On the trunk:
* silencing gcc uninitialized warning
* refrainning from apr_table_addn() use since pool debug assumptions are in conflict
* adding more assertions
* copy-porting changes to base64 encoding code from mod_md
Submitted by: icing
Reviewed by: icing, minfrin, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841330 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2018 12:54:51 +0000 (12:54 +0000)]
Merge r1749402, r1656549, r1840776, r1800126, r1817131, r1834226 from trunk:
Style only
Be more consistent:
- add space between (if|while) and \(
- place of 'break ' statement
Fix cut and paste typo in error message + remove empty lines to be consistent
follow-up to r1656549.
Instead of logging a password (which is not a good practice), clarify the associated message
* Silence compiler warning
Be less tolerant when parsing the credencial for Basic authorization. Only spaces should be accepted after the authorization scheme. \t are also tolerated.
The current code accepts \v and \f as well.
The same behavior is already used in 'ap_get_basic_auth_pw()' which is mostly the same function as 'get_basic_auth()'.
Function used as 'apr_reslist_destructor' when calling 'apr_reslist_create()' should have the following prototype:
apr_status_t (*apr_reslist_destructor)(void *resource, void *params, apr_pool_t *pool);
Submitted by: jailletc36, rpluem, jailletc36, jailletc36
Reviewed by: jailletc36, minfrin, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841329 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2018 12:51:28 +0000 (12:51 +0000)]
Merge r1546860 from trunk:
Fix missing spaces in messages
Submitted by: jailletc36
Reviewed by: jailletc36, minfrin, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841327 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2018 12:49:53 +0000 (12:49 +0000)]
And promote those with 3 or more +1s
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841326 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2018 12:49:17 +0000 (12:49 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841325 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 19 Sep 2018 12:02:27 +0000 (12:02 +0000)]
Patch now includes doccos. Thx! :)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841319 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 22:13:24 +0000 (22:13 +0000)]
Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841271 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 22:03:38 +0000 (22:03 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841269 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:58:00 +0000 (21:58 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841268 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:51:56 +0000 (21:51 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841267 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:45:59 +0000 (21:45 +0000)]
mod_proxy_hcheck: Fix issues with interval determination. PR 62318
trunk patch: http://svn.apache.org/r1838937
2.4.x patch: svn merge -c
1838937 ^/httpd/httpd/trunk .
+1: jim, ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841266 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:44:23 +0000 (21:44 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841265 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:42:41 +0000 (21:42 +0000)]
Fix the CHANGES file so that backports went into the correct place.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841264 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:24:06 +0000 (21:24 +0000)]
mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499
trunk patch: http://svn.apache.org/r1840582
2.4.x patch: svn merge -c
1840582 ^/httpd/httpd/trunk .
+1: jim, ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841263 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:22:34 +0000 (21:22 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841262 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:17:53 +0000 (21:17 +0000)]
mod_proxy_hcheck: take balancer's SSLProxy* directives into account.
trunk patch: http://svn.apache.org/r1836276
2.4.x patch: svn merge -c
1836276 ^/httpd/httpd/trunk .
+1: jim, ylavic, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841261 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:14:07 +0000 (21:14 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841260 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:08:10 +0000 (21:08 +0000)]
Support IPv6-sized client strings in mod_status and mod_echo
trunk: http://svn.apache.org/r1837225
http://svn.apache.org/r1837366
2.4.x patch: http://home.apache.org/~jim/patches/client64v2.patch
+1: jim, icing (by inspection), minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841259 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 21:07:00 +0000 (21:07 +0000)]
Vote and promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841258 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Tue, 18 Sep 2018 20:30:39 +0000 (20:30 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841255 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 18 Sep 2018 14:05:39 +0000 (14:05 +0000)]
And... vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841231 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 18 Sep 2018 14:04:31 +0000 (14:04 +0000)]
Three more TLSv1.3 changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841230 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 18 Sep 2018 11:09:15 +0000 (11:09 +0000)]
Merge r1841218 from trunk:
* modules/ssl/ssl_engine_kernel.c (ssl_check_post_client_verify):
Retrieve and set sslconn->client_cert here for both "modern" and
classic access control.
(ssl_hook_Access_classic, ssl_hook_Access_modern, ssl_hook_Access):
Restore SSLRequire and FakeBasicAuth checks to ssl_hook_Access so tests
are still applied for TLSv1.3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/tlsv1.3-for-2.4.x@
1841219 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 18 Sep 2018 09:23:45 +0000 (09:23 +0000)]
fix properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841206 13f79535 -47bb-0310-9956-
ffa450edef68
André Malo [Tue, 18 Sep 2018 09:05:25 +0000 (09:05 +0000)]
update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841201 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 18 Sep 2018 00:53:59 +0000 (00:53 +0000)]
Post 2.4.35 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841178 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 18 Sep 2018 00:53:10 +0000 (00:53 +0000)]
Get ready to tag httpd 2.4.35
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841176 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 17 Sep 2018 03:56:55 +0000 (03:56 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841043 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 17 Sep 2018 03:56:06 +0000 (03:56 +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@
1841042 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Mon, 17 Sep 2018 02:30:21 +0000 (02:30 +0000)]
fix parameter name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1841039 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Sep 2018 14:08:29 +0000 (14:08 +0000)]
Rebuild fr doc.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1840974 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Sep 2018 14:07:32 +0000 (14:07 +0000)]
XML update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1840973 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 15 Sep 2018 05:11:57 +0000 (05:11 +0000)]
Add some compatibility information
(r1840964 in trunk)
+ remove an extra empty line to synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1840965 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 14 Sep 2018 08:04:59 +0000 (08:04 +0000)]
Backport proposal for some h2 minor code improvements.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1840897 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 13 Sep 2018 11:16:58 +0000 (11:16 +0000)]
forget it...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1840800 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 13 Sep 2018 05:52:19 +0000 (05:52 +0000)]
Clean-up + new easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1840779 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Wed, 12 Sep 2018 20:49:27 +0000 (20:49 +0000)]
want more testing but so far, so good. Would not recommend it for this release yet, though
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1840758 13f79535 -47bb-0310-9956-
ffa450edef68
projects / thirdparty / apache / httpd.git / log
