]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
6 years agoMerge r1491700, r1862200 from trunk:
Joe Orton [Fri, 5 Jul 2019 11:26:12 +0000 (11:26 +0000)] 
Merge r1491700, r1862200 from trunk:

According to comment in 'magic_rsl_add' and to the way 'magic_rsl_printf' manages its buffer, I think that this memory should be apr_pstrdup'ed.

This has been like that forever, but seems broken to me.

Untested.

* docs/conf/magic: Allow mod_mime_magic to return "audio/x-wav" for
  WAV files, and omit returning "audio/unknown" for other RIFF
  format files.  Having a MIME type defined on a continuation line
  *and* the preceding top-level match breaks mod_mime_magic, which
  treats the second result "printed" as the MIME encoding. Neither
  audio/x-wav nor audio/unknown are IANA registered, though Firefox
  and Chrome both appear to recognize the former.  Since the RIFF
  format can contain non-audio media, returning audio/unknown as
  a fallback for all RIFF files appears to be bogus anyway.

Submitted by: Àngel Ollé Blázquez <aollebla redhat.com>
Submitted by: jailletc36
Reviewed by: jorton, jim, icing

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

6 years agoMerge r1861690 from trunk:
Joe Orton [Fri, 5 Jul 2019 11:22:46 +0000 (11:22 +0000)] 
Merge r1861690 from trunk:

* server/util.c: Make "nul" symbol private.

Reviewed by: jorton, jfclere, icing

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

6 years agovote
Stefan Eissing [Fri, 5 Jul 2019 07:27:41 +0000 (07:27 +0000)] 
vote

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

6 years agovote
Stefan Eissing [Fri, 5 Jul 2019 07:26:09 +0000 (07:26 +0000)] 
vote

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

6 years agovote
Stefan Eissing [Fri, 5 Jul 2019 07:25:19 +0000 (07:25 +0000)] 
vote

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

6 years agovote
Stefan Eissing [Fri, 5 Jul 2019 07:21:48 +0000 (07:21 +0000)] 
vote

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

6 years agovote
Stefan Eissing [Fri, 5 Jul 2019 07:20:07 +0000 (07:20 +0000)] 
vote

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

6 years agovote
Stefan Eissing [Fri, 5 Jul 2019 07:17:52 +0000 (07:17 +0000)] 
vote

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

6 years agovote
Stefan Eissing [Fri, 5 Jul 2019 07:16:23 +0000 (07:16 +0000)] 
vote

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

6 years agoProposing backport of h2 timeout/keepalive handling.
Stefan Eissing [Fri, 5 Jul 2019 07:14:34 +0000 (07:14 +0000)] 
Proposing backport of h2 timeout/keepalive handling.

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

6 years agoproposal for https://bz.apache.org/bugzilla/show_bug.cgi?id=60948
Jean-Frederic Clere [Wed, 3 Jul 2019 17:26:04 +0000 (17:26 +0000)] 
proposal for https://bz.apache.org/bugzilla/show_bug.cgi?id=60948

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

6 years ago *) mod_proxy_http2: fixing a potential NULL pointer use in logging.
Stefan Eissing [Tue, 2 Jul 2019 11:11:08 +0000 (11:11 +0000)] 
  *) mod_proxy_http2: fixing a potential NULL pointer use in logging.
     [Christophe Jaillet <christophe.jaillet wanadoo.fr>, Dr Silvio Cesare InfoSect]

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

6 years ago* Only availabe since 2.4.40
Ruediger Pluem [Tue, 2 Jul 2019 09:10:24 +0000 (09:10 +0000)] 
* Only availabe since 2.4.40

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

6 years ago* Fix flow
Ruediger Pluem [Tue, 2 Jul 2019 09:09:34 +0000 (09:09 +0000)] 
* Fix flow

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

6 years agoMerge r1842010, r1841225, r1862039, r1862040, r1862042 from trunk:
Ruediger Pluem [Tue, 2 Jul 2019 09:08:30 +0000 (09:08 +0000)] 
Merge r1842010, r1841225, r1862039, r1862040, r1862042 from trunk:

* dav_stream_response processes data that has been allocated from the propdb
  pool. Hence close the propdb *after* dav_stream_response which clears thei
  probdb pool.

* Doing a PROPFIND on a large collection e.g. 50.000 elements can easily
  consume 1 GB of memory as the subrequests and propdb pools are not
  destroyed and cleared after each element was handled.
  Do this now. There is one case in dav_get_props where elem->priv
  lives longer then the propdb pool. In this case allocate from r->pool.
  Furthermore also recycle propdb's which allows to clear the propdb's
  pools instead of destroying them and creating them again.

Simplify handling of short-lived pool for dav_propdb in mod_dav.  No
functional change.

* modules/dav/main/props.c (dav_popen_propdb): Rename from
  dav_open_propdb, take a pool argument.
  (dav_open_propdb): Reimplement in terms of above, using
  r->pool.
  (dav_propfind_walker): Switch to using dav_open_propdb
  with scratchpool.

* modules/dav/main/props.c (dav_do_prop_subreq): Allocate escaped URI
  out of propdb pool, fixing small per-resource leak during a PROPFIND
  walk.

Submitted by: jorton, rpluem

* modules/dav/main/mod_dav.c (dav_send_multistatus): Tag the pool.

Reviewed by: rpluem, jorton, jim

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

6 years agoCouple more small fixes.
Joe Orton [Mon, 1 Jul 2019 16:00:58 +0000 (16:00 +0000)] 
Couple more small fixes.

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

6 years agoAnd promote backport w/ at least 3 +1 votes
Jim Jagielski [Mon, 1 Jul 2019 15:37:49 +0000 (15:37 +0000)] 
And promote backport w/ at least 3 +1 votes

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

6 years agocast votes on tested patches
Jim Jagielski [Mon, 1 Jul 2019 15:37:12 +0000 (15:37 +0000)] 
cast votes on tested patches

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

6 years agoVote.
Joe Orton [Thu, 27 Jun 2019 15:17:35 +0000 (15:17 +0000)] 
Vote.

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

6 years agoMemory corruption fixed speculatively in r1491700 has been seen in the wild.
Joe Orton [Thu, 27 Jun 2019 14:29:56 +0000 (14:29 +0000)] 
Memory corruption fixed speculatively in r1491700 has been seen in the wild.
Also fix WAV file matching.

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

6 years ago* Update proposal to incorporate the recent memory improvement patches from Joe
Ruediger Pluem [Thu, 27 Jun 2019 08:39:50 +0000 (08:39 +0000)] 
* Update proposal to incorporate the recent memory improvement patches from Joe

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

6 years ago* Leave a breadcrumb note for another backport proposal that needs to be done.
Ruediger Pluem [Mon, 24 Jun 2019 20:01:20 +0000 (20:01 +0000)] 
* Leave a breadcrumb note for another backport proposal that needs to be done.

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

6 years agoFrench doc rebuild.
Lucien Gentis [Sat, 22 Jun 2019 16:18:41 +0000 (16:18 +0000)] 
French doc rebuild.

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

6 years agoxml fr doc update.
Lucien Gentis [Sat, 22 Jun 2019 16:17:19 +0000 (16:17 +0000)] 
xml fr doc update.

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

6 years agoNote that rotatelogs -D was added in 2.4.34.
Joe Orton [Fri, 21 Jun 2019 08:29:59 +0000 (08:29 +0000)] 
Note that rotatelogs -D was added in 2.4.34.

PR: 46669

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

6 years agoFix:
Christophe Jaillet [Sun, 16 Jun 2019 14:06:07 +0000 (14:06 +0000)] 
Fix:
   - some missing syntax highlight
   - a default value not refelcted in quickreference
   - a missing link between

(r1861455 in trunk )

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

6 years agoFix an example in doc
Christophe Jaillet [Sun, 16 Jun 2019 12:08:08 +0000 (12:08 +0000)] 
Fix an example in doc
(1861448 in trunk)

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

6 years agoFix an example in doc
Christophe Jaillet [Sun, 16 Jun 2019 12:07:13 +0000 (12:07 +0000)] 
Fix an example in doc
(1861449 in trunk)

+ synch some small things (trailing spaces...)

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

6 years ago'flags' are optional in SSLCARevocationCheck. Update the syntax accordingly.
Christophe Jaillet [Sun, 16 Jun 2019 09:08:41 +0000 (09:08 +0000)] 
'flags' are optional in SSLCARevocationCheck. Update the syntax accordingly.

(r1861442 in trunk)

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

6 years agoFix missing description of 2 directives
Christophe Jaillet [Sun, 16 Jun 2019 08:50:50 +0000 (08:50 +0000)] 
Fix missing description of 2 directives

(r1861439 on trunk)

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

6 years agoProposals
Christophe Jaillet [Sat, 15 Jun 2019 16:13:49 +0000 (16:13 +0000)] 
Proposals

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

6 years agoMerge of r1861337 from trunk:
Stefan Eissing [Fri, 14 Jun 2019 12:11:43 +0000 (12:11 +0000)] 
Merge of r1861337 from trunk:

mod_proxy_http2: adding support for handling trailers in both directions. PR 63502.

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

6 years agoAdd a missing PR
Christophe Jaillet [Fri, 14 Jun 2019 05:29:11 +0000 (05:29 +0000)] 
Add a missing PR

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

6 years agoMerge r1707084, r1707093, r1707159, r1707362 from trunk:
Jim Jagielski [Thu, 13 Jun 2019 11:09:12 +0000 (11:09 +0000)] 
Merge r1707084, r1707093, r1707159, r1707362 from trunk:

eor_bucket: don't destroy the request multiple times should any filter
do a copy (e.g. mod_bucketeer).

eor_bucket: follow up to r1707084: fix comment.

eor_bucket: follow up to r1707084: use an inner shared bucket.

eor_bucket: follow up to r1707159.
We need an apr_bucket_refcount, as spotted by Ruediger.
Submitted by: ylavic
Reviewed by: icing, covener, jim

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

6 years agoMerge r1860260 from trunk:
Jim Jagielski [Thu, 13 Jun 2019 11:08:29 +0000 (11:08 +0000)] 
Merge r1860260 from trunk:

 * modules/http2: more copying of data to disentangle worker processing from main connection

Submitted by: icing
Reviewed by: icing, covener, jim

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

6 years agopromote
Jim Jagielski [Thu, 13 Jun 2019 11:06:29 +0000 (11:06 +0000)] 
promote

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

6 years agoBackport votes
Jim Jagielski [Thu, 13 Jun 2019 11:06:09 +0000 (11:06 +0000)] 
Backport votes

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

6 years agovote
Eric Covener [Thu, 13 Jun 2019 09:24:46 +0000 (09:24 +0000)] 
vote

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

6 years agoOnly describe functional/user-visible changes in CHANGES, svn
Joe Orton [Wed, 12 Jun 2019 10:07:51 +0000 (10:07 +0000)] 
Only describe functional/user-visible changes in CHANGES, svn
logs are sufficient for describing code cleanups.

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

6 years agorebuild ES access.html.es
Luis Gil [Mon, 10 Jun 2019 23:16:24 +0000 (23:16 +0000)] 
rebuild ES access.html.es

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

6 years agofrench doc rebuild.
Lucien Gentis [Sat, 8 Jun 2019 14:42:11 +0000 (14:42 +0000)] 
french doc rebuild.

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

6 years agofrench doc xml file update.
Lucien Gentis [Sat, 8 Jun 2019 14:40:58 +0000 (14:40 +0000)] 
french doc xml file update.

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

6 years agopropose
Stefan Eissing [Thu, 6 Jun 2019 13:17:30 +0000 (13:17 +0000)] 
propose

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

6 years agoredrawing proposal
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

6 years agoFollow up to r1860166: mergeinfo.
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

6 years agomod_proxy_http: forward 100-continue, and minimize race conditions when
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

6 years agoVote and promote
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

6 years agoUpdate 100-continue patch after r1859845.
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

6 years agoAdd comment on failing patch.
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

6 years agoEasy patches: synch 2.4.x and trunk
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

6 years agomod_status: PR60647: ACC per connection not available w/ event MPM
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

6 years agomod_http2: remove the no longer existing h2_ngn_shed.c from Cmake.
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

6 years agoUpdate a comment.
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

6 years agoComment.
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

6 years agoBackported (r1859845).
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

6 years agoBackported (r1859844).
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

6 years agoMerge r1859371, r1859422 from trunk:
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

6 years agoMerge r1818726 from trunk:
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

6 years agoVote, promote.
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

6 years agopropose h2 backport
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

6 years agoRemove obsolete comment.
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

6 years ago* Vote
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

6 years agoReact on comment. Add another patch to proposal.
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

6 years ago* Comment
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

6 years agoPropose.
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

6 years ago* Vote
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

6 years agoPromote.
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

6 years agoVote.
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

6 years agoVote, promote.
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

6 years agomod_reqtimeout: Fix default rates missing (not applied) in 2.4.39.
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

6 years agomod_info: Fix output of server settings for
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

6 years agoVote.
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

6 years agoPropose
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

6 years agobackport votes
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

6 years agoFix a typo spotted by Ioannis Cherouvim (PR 63414)
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

6 years agopropose
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

6 years agofr doc rebuild.
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

6 years agoXML fr doc update.
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

6 years agoEasy vote and easy proposals
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

6 years agoTransforms.
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

6 years agoMerge r1857626 from trunk:
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

6 years agoPropose.
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

6 years ago* Vote
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

6 years agoVote, promote and propose.
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

6 years agoAdd an extra empty line
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

6 years agoupdate after backport
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

6 years agoMerged /httpd/httpd/trunk:r1856297
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

6 years agoupdate after backport
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

6 years agoMerge of r1850745,r1855446 from trunk:
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

6 years agovote
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

6 years agoquick one from users@
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

6 years agopropose
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

6 years agoMerge r1825375 from trunk:
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

6 years agoCorrect changelog for vulnerabilities
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

6 years agoUpdates for announcement of 2.4.39
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

6 years agofr doc rebuild.
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

6 years agoXML files fr doc updates.
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

6 years agoVote, promote.
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

6 years agobackport votes
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

6 years agoAdd in generated docs
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