]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Stefan Eissing [Tue, 28 May 2019 09:40:56 +0000 (09:40 +0000)]
redrawing proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860223 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 28 May 2019 08:47:11 +0000 (08:47 +0000)]
Follow up to r1860166: mergeinfo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860201 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 May 2019 23:19:12 +0000 (23:19 +0000)]
mod_proxy_http: forward 100-continue, and minimize race conditions when
reusing backend connections. PR 60330.
+1: ylavic, icing, jim
ylavic: plus http://svn.apache.org/r1856036 (opt-out)
2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-forward_100_continue-v6.patch
+1: ylavic, jim, minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860166 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 May 2019 23:14:39 +0000 (23:14 +0000)]
Vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860165 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 27 May 2019 20:17:24 +0000 (20:17 +0000)]
Update 100-continue patch after r1859845.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860162 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 May 2019 12:43:31 +0000 (12:43 +0000)]
Add comment on failing patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860130 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 May 2019 12:37:34 +0000 (12:37 +0000)]
Easy patches: synch 2.4.x and trunk
- core: 80 chars
- http_core: Clean-uo and style. No functional change overall
- http_core: One more style fix in ap_process_http_async_connection()
- mod_mime: Fix a cppcheck warning
- mod_proxy_ajp: Fix a harmless clang warning
- suexec: avoid a potential sprintf overflow
- mod_headers: This is harmless, but this really should be an 'echo_do *'
- core: Fix typo
- core: Update a comment about the 'PATCH' HTTP command
- mod_proxy_balancer: Fix some HTML syntax issues
trunk patch:
- http://svn.apache.org/r1780282
- http://svn.apache.org/r1814659
- http://svn.apache.org/r1814660
- http://svn.apache.org/r1838285
- http://svn.apache.org/r1842881
- http://svn.apache.org/r1846253
- http://svn.apache.org/r1853757
- http://svn.apache.org/r1851702
- http://svn.apache.org/r1853980
- http://svn.apache.org/r1855614
2.4.x patch: svn merge -c
1780282 ,
1814659 ,
1814660 ,
1838285 ,
1842881 ,
1846253 ,
1853757 ,
1851702 ,
1853980 ,
1855614 ^/httpd/httpd/trunk .
+1: jailletc36, jim, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860129 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 May 2019 12:31:24 +0000 (12:31 +0000)]
mod_status: PR60647: ACC per connection not available w/ event MPM
trunk patch: http://svn.apache.org/r1780280
2.4.x patch: svn merge -c
1780280 ^/httpd/httpd/trunk .
(minus CHANGES and ap_mmn.h)
+1: jailletc36, jim, rjung
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860128 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 May 2019 12:27:19 +0000 (12:27 +0000)]
mod_http2: remove the no longer existing h2_ngn_shed.c from Cmake.
trunk patch: http://svn.apache.org/r1856910
2.4.x patch: svn merge -c
1856910 ^/httpd/httpd/trunk .
+1: icing, covener, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860127 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 27 May 2019 12:14:13 +0000 (12:14 +0000)]
Update a comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860126 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 27 May 2019 10:23:29 +0000 (10:23 +0000)]
Comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1860119 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 May 2019 08:01:49 +0000 (08:01 +0000)]
Backported (r1859845).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859848 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 May 2019 08:01:16 +0000 (08:01 +0000)]
Backported (r1859844).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859846 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 May 2019 07:59:42 +0000 (07:59 +0000)]
Merge r1859371, r1859422 from trunk:
mod_proxy/ssl: Proxy SSL client certificate
configuration and other proxy SSL configurations
broken inside <Proxy> context.
PR 63430
Triggered by r1855646+r1855748.
Patch from rpluem (proxy) and ylavic (ssl).
Follow up to r1859371: extend to other ap_proxy_connection_create[_ex]() users.
This function now now handles SSL reuse as well as the "proxy-request-hostname"
note (SNI), so let's also call it unconditionnaly in all proxy modules.
On the mod_ssl side, since this note has the lifetime of the connection, don't
reset/unset it during handshake (ssl_io_filter_handshake).
Submitted by: rjung, ylavic
Reviewed by: rjung, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859845 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 May 2019 07:54:42 +0000 (07:54 +0000)]
Merge r1818726 from trunk:
mod_proxy: allow SSLProxyCheckPeer* usage for all proxy modules.
PR 61857.
Proposed by: Markus Gausling <markusgausling googlemail.com>
Reviewed by: ylavic, rjung, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859844 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 24 May 2019 07:45:12 +0000 (07:45 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859842 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 22 May 2019 13:47:02 +0000 (13:47 +0000)]
propose h2 backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859726 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 20 May 2019 12:28:54 +0000 (12:28 +0000)]
Remove obsolete comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859556 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 20 May 2019 11:09:34 +0000 (11:09 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859549 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 20 May 2019 09:22:14 +0000 (09:22 +0000)]
React on comment. Add another patch to proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859541 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 20 May 2019 06:41:03 +0000 (06:41 +0000)]
* Comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859529 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 19 May 2019 12:00:44 +0000 (12:00 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859497 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 16 May 2019 19:34:41 +0000 (19:34 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859406 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 May 2019 13:38:28 +0000 (13:38 +0000)]
Promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859380 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 May 2019 13:37:51 +0000 (13:37 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859379 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 May 2019 13:17:37 +0000 (13:17 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859378 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 May 2019 13:09:35 +0000 (13:09 +0000)]
mod_reqtimeout: Fix default rates missing (not applied) in 2.4.39.
PR 63325.
Backport of r1857129 + r1857130 from trunk.
Proposed by: ylavic
Backported by: rjung
Reviewed by: ylavic, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859376 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 May 2019 13:04:23 +0000 (13:04 +0000)]
mod_info: Fix output of server settings for
PIPE_BUF in mod_info in the rare case that
PIPE_BUF is defined.
Backport of
1857515 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@
1859375 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 May 2019 12:58:19 +0000 (12:58 +0000)]
Vote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859372 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 16 May 2019 12:29:55 +0000 (12:29 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859370 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 9 May 2019 21:19:36 +0000 (21:19 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859044 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 9 May 2019 20:12:09 +0000 (20:12 +0000)]
Fix a typo spotted by Ioannis Cherouvim (PR 63414)
(r1859038 in trunk )
+ some trailing spaces removed to synch with trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859039 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 9 May 2019 13:13:28 +0000 (13:13 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1859003 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Apr 2019 13:16:23 +0000 (13:16 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1858274 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 27 Apr 2019 13:15:41 +0000 (13:15 +0000)]
XML fr doc update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1858273 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 20 Apr 2019 07:02:42 +0000 (07:02 +0000)]
Easy vote and easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1857858 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 16 Apr 2019 12:59:43 +0000 (12:59 +0000)]
Transforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1857649 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 16 Apr 2019 12:58:37 +0000 (12:58 +0000)]
Merge r1857626 from trunk:
Add security note on CoreDumpDirectory for Linux.
Reviewed by: icing, elukey
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1857648 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Sun, 14 Apr 2019 13:26:49 +0000 (13:26 +0000)]
Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1857516 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 10 Apr 2019 07:54:57 +0000 (07:54 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1857236 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Apr 2019 18:58:43 +0000 (18:58 +0000)]
Vote, promote and propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1857132 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 7 Apr 2019 07:01:30 +0000 (07:01 +0000)]
Add an extra empty line
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1857065 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Apr 2019 13:43:16 +0000 (13:43 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856936 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Apr 2019 13:42:52 +0000 (13:42 +0000)]
Merged /httpd/httpd/trunk:r1856297
*) mod_md: Store permissions are enforced on file creation, enforcing restrictions in
spite of umask. Fixes <https://github.com/icing/mod_md/issues/117>. [Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856935 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Apr 2019 13:31:37 +0000 (13:31 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856932 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Apr 2019 13:31:09 +0000 (13:31 +0000)]
Merge of r1850745,r1855446 from trunk:
modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
a non-fatal warning/error under maintainer-mode.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856931 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Apr 2019 13:30:07 +0000 (13:30 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856929 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 4 Apr 2019 10:55:54 +0000 (10:55 +0000)]
quick one from users@
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856912 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 4 Apr 2019 10:08:09 +0000 (10:08 +0000)]
propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856911 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 3 Apr 2019 10:01:47 +0000 (10:01 +0000)]
Merge r1825375 from trunk:
rpm: Add mod_socache_redis to the build.
Submitted by: minfrin
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856868 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 2 Apr 2019 01:10:00 +0000 (01:10 +0000)]
Correct changelog for vulnerabilities
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856789 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Tue, 2 Apr 2019 00:54:27 +0000 (00:54 +0000)]
Updates for announcement of 2.4.39
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856787 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Mar 2019 15:38:07 +0000 (15:38 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856635 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 30 Mar 2019 15:36:11 +0000 (15:36 +0000)]
XML files fr doc updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856634 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 28 Mar 2019 16:59:48 +0000 (16:59 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856496 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 28 Mar 2019 12:43:56 +0000 (12:43 +0000)]
backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856471 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 28 Mar 2019 10:35:59 +0000 (10:35 +0000)]
Add in generated docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856468 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 28 Mar 2019 06:26:19 +0000 (06:26 +0000)]
Add missing mod_socache_redis.xml file
It was part of http://home.apache.org/~jim/patches/socache_redisv2.patch but is not in r1855817.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856454 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 27 Mar 2019 23:32:24 +0000 (23:32 +0000)]
update transformations.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856451 13f79535 -47bb-0310-9956-
ffa450edef68
Nilgun Belma Buguner [Wed, 27 Mar 2019 23:31:06 +0000 (23:31 +0000)]
update for sync with English docs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856450 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 27 Mar 2019 15:05:20 +0000 (15:05 +0000)]
Post 2.4.39 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856418 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 27 Mar 2019 15:05:09 +0000 (15:05 +0000)]
Get ready to tag httpd 2.4.39
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856416 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 26 Mar 2019 15:54:31 +0000 (15:54 +0000)]
merge r1856322 from trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856323 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 26 Mar 2019 11:03:27 +0000 (11:03 +0000)]
Backport proposal for latest mod_md fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856299 13f79535 -47bb-0310-9956-
ffa450edef68
Gregg Lewis Smith [Tue, 26 Mar 2019 02:25:50 +0000 (02:25 +0000)]
merge r1774657 from trunk
add .mak/dep for command line build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856233 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 22 Mar 2019 10:16:22 +0000 (10:16 +0000)]
Propose opt-out for proxy 100-continue.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1856037 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 21 Mar 2019 13:26:54 +0000 (13:26 +0000)]
Backport vote 100
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855987 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 20 Mar 2019 15:51:02 +0000 (15:51 +0000)]
Merged x2.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855919 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 20 Mar 2019 15:50:44 +0000 (15:50 +0000)]
Merge r1855646, r1855748 from trunk:
mod_proxy/ssl: cleanup per-request SSL configuration for recycled proxy conns.
The SSL dir config of proxy/backend connections is stored in r->per_dir_config
but those connections have a lifetime independent of the requests they handle.
So we need to allow the external ssl_engine_set() function to reset mod_ssl's
dir config in between proxy requests, or the first sslconn->dc could be used
after free for the next requests.
mod_proxy can then reset/reinit the request config when recycling its backend
connections.
* Solve a chicken and egg problem here:
We need to have sslconn->dc set correctly when we want to
init sslconn, but we need to allocate memory for it first.
PR 63256.
Submitted by: ylavic, rpluem
Reviewed by: ylavic, jorton, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855918 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 20 Mar 2019 15:45:16 +0000 (15:45 +0000)]
Merge r1855849 from trunk:
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Correctly
restore SSL verify state after PHA failure in TLSv1.3.
Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
Reviewed by: jorton, covener, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855917 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Mar 2019 18:11:08 +0000 (18:11 +0000)]
and promote backports with >= 3 votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855856 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Mar 2019 18:10:33 +0000 (18:10 +0000)]
Backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855854 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 19 Mar 2019 18:01:21 +0000 (18:01 +0000)]
*) maintainer mode fix for util.c no2slash_ex
trunk patch: http://svn.apache.org/r1855755
2.4.x patch svn merge -c
1855755 ^/httpd/httpd/trunk .
+1: covener, rpluem, jim, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855853 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 19 Mar 2019 18:00:39 +0000 (18:00 +0000)]
vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855852 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 19 Mar 2019 17:50:23 +0000 (17:50 +0000)]
Vote, propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855850 13f79535 -47bb-0310-9956-
ffa450edef68
Luca Toscano [Tue, 19 Mar 2019 13:04:06 +0000 (13:04 +0000)]
Add note to my old backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855829 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 19 Mar 2019 13:00:22 +0000 (13:00 +0000)]
Vote, promote & propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855824 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Mar 2019 12:55:37 +0000 (12:55 +0000)]
Backport votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855823 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Mar 2019 12:39:36 +0000 (12:39 +0000)]
docs and manual xforms rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855820 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Mar 2019 12:37:42 +0000 (12:37 +0000)]
adjust backport version
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855819 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Mar 2019 12:31:23 +0000 (12:31 +0000)]
Merge r1730129 from trunk:
Support %{c}h for conn-hostname, %h for useragent_host
Submitted by: wrowe
Reviewed by: jim, ylavic, covener
Merge r1818321 from trunk:
"{c}h" exists and logs the value returned by 'ap_get_useragent_host()'.
I'm not sure of the description to write there, so I just mention it in the doc and hope s.o. will find the words :)
This has been introduced in r1730129.
Submitted by: jailletc36
Reviewed by: jim, ylavic, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855818 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 19 Mar 2019 12:23:15 +0000 (12:23 +0000)]
Merge r1768070, r1768120, r1768225, r1769712, r1769737, r1774610, r1828624, r1828626, r1855701 from trunk:
And the socache provider interface for Redis
And provide some nice usage stats. Could be prettier, for sure.
Needs LOGNO #s
reorganize mod_socache_redis so it compiles w/o apr-redis
It looks like this was the original intent. The provider
is not registered if apr-redis is missing.
It was previously failing to compile due to the dirconf being
hidden behind the #ifdef guard but not the routine module
code that used it.
Fix some HTML tags
</br> --> <br />
Couls also be <br> or <br/> but some (very) old clients don't like it.
httpd is not really consistent on it. (personnlaly <br> would be just fine for me but <br /> is the most commonly used form)
related to http://svn.apache.org/viewvc?view=revision&revision=
1774602
Use apr_pcalloc in the 'create' function. All the fields are initialized in the 'init' function, but it is It is cleaner and more future proof.
Small style correction (remove extra spaces)
Initial doc for the sosache_redis module.
Corrections and improvements welcome.
Update compatibility notes for mod_socache_redis
Submitted by: jim, covener, jailletc36, jim, jailletc36, jailletc36, jailletc36
Reviewed by: jim, minfrin, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855817 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 18 Mar 2019 12:44:54 +0000 (12:44 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855759 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 18 Mar 2019 12:27:26 +0000 (12:27 +0000)]
maintainer fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855756 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 18 Mar 2019 12:10:15 +0000 (12:10 +0000)]
merge
1855743 ,
1855744 ^/httpd/httpd/trunk .
r->parsed_uri.path safety in recent backport
*) core: fix SEGFAULT in CONNECT with recent change
2.4.x: svn merge -c
1855743 ,
1855744 ^/httpd/httpd/trunk .
+1: rpluem, icing, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855751 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 18 Mar 2019 12:04:26 +0000 (12:04 +0000)]
svn merge -c
1855743 ,
1855744 ^/httpd/httpd/trunk .
r->parsed_uri.path safety in recent backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855750 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 18 Mar 2019 12:03:10 +0000 (12:03 +0000)]
vote/promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855749 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 18 Mar 2019 09:53:17 +0000 (09:53 +0000)]
adding quick vote for recent addendum
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855747 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 18 Mar 2019 08:52:02 +0000 (08:52 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855739 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 18 Mar 2019 08:51:41 +0000 (08:51 +0000)]
updating merge info
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855738 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 18 Mar 2019 08:49:59 +0000 (08:49 +0000)]
Merge of r1855705 from trunk:
core: merge consecutive slashes in the path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855737 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 18 Mar 2019 08:49:19 +0000 (08:49 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855736 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 18 Mar 2019 08:26:17 +0000 (08:26 +0000)]
* Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855735 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 17 Mar 2019 14:45:05 +0000 (14:45 +0000)]
propose mergeslashes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855707 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 17 Mar 2019 14:15:39 +0000 (14:15 +0000)]
Small note to update the doc once mod_socache_redis is backported
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855703 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 16 Mar 2019 20:23:52 +0000 (20:23 +0000)]
vote/promote on some safe ones
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855670 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Mar 2019 15:09:12 +0000 (15:09 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855660 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 Mar 2019 15:08:18 +0000 (15:08 +0000)]
xml fr doc updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855659 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Fri, 15 Mar 2019 07:46:35 +0000 (07:46 +0000)]
synch 2.4.x with trunk.
When r1729208 has been backported in 2.4.x (see r1743576), a coment has been missed in the backport proposal and has never reached 2.4.x.
Add it now, in order to synch a bit the 2 branches.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855572 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 14 Mar 2019 20:05:10 +0000 (20:05 +0000)]
Record changes from r1855519.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1855550 13f79535 -47bb-0310-9956-
ffa450edef68
projects / thirdparty / apache / httpd.git / log
