]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
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

6 years agoAdd missing mod_socache_redis.xml file
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

6 years agoupdate transformations.
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

6 years agoupdate for sync with English docs.
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

6 years agoPost 2.4.39 tag updates
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

6 years agoGet ready to tag httpd 2.4.39
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

6 years agomerge r1856322 from trunk
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

6 years agoBackport proposal for latest mod_md fix.
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

6 years agomerge r1774657 from trunk
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

6 years agoPropose opt-out for proxy 100-continue.
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

6 years agoBackport vote 100
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

6 years agoMerged x2.
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

6 years agoMerge r1855646, r1855748 from trunk:
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

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

6 years agoand promote backports with >= 3 votes
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

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

6 years ago *) maintainer mode fix for util.c no2slash_ex
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

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

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

6 years agoAdd note to my old backport proposal.
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

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

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

6 years agodocs and manual xforms rebuild
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

6 years agoadjust backport version
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

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

6 years agoMerge r1768070, r1768120, r1768225, r1769712, r1769737, r1774610, r1828624, r1828626...
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

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

6 years agomaintainer fix
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

6 years agomerge 1855743,1855744 ^/httpd/httpd/trunk .
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

6 years agosvn merge -c 1855743,1855744 ^/httpd/httpd/trunk .
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

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

6 years agoadding quick vote for recent addendum
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

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

6 years agoupdating merge info
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

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

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

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

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

6 years agoSmall note to update the doc once mod_socache_redis is backported
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

6 years agovote/promote on some safe ones
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

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

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

6 years agosynch 2.4.x with trunk.
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

6 years agoRecord changes from r1855519.
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

6 years agoadjust per r1855434
Gregg Lewis Smith [Thu, 14 Mar 2019 03:46:13 +0000 (03:46 +0000)] 
adjust per r1855434

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

6 years agoupdate patch
Jim Jagielski [Wed, 13 Mar 2019 17:58:03 +0000 (17:58 +0000)] 
update patch

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

6 years agoRecord merges from r1855431.
Yann Ylavic [Wed, 13 Mar 2019 16:03:35 +0000 (16:03 +0000)] 
Record merges from r1855431.

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

6 years agoRemoving no longer used source after last mod_http2 backport.
Stefan Eissing [Wed, 13 Mar 2019 15:07:06 +0000 (15:07 +0000)] 
Removing no longer used source after last mod_http2 backport.

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

6 years agoupdate after backport
Stefan Eissing [Wed, 13 Mar 2019 15:02:13 +0000 (15:02 +0000)] 
update after backport

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

6 years agoMerge of 1849296,1852038,1852101,1852339,1853171,1853967,1854365,1854963,1854964...
Stefan Eissing [Wed, 13 Mar 2019 15:00:57 +0000 (15:00 +0000)] 
Merge of 1849296,1852038,1852101,1852339,1853171,1853967,1854365,1854963,1854964,1855295,1855411 from trunk:

  *) mod_http2: when SSL renegotiation is inhibited and a 403 ErrorDocument is
     in play, the proper HTTP/2 stream reset did not trigger with H2_ERR_HTTP_1_1_REQUIRED.
     Fixed. [Michael Kaufmann]

  *) mod_http2: new configuration directive: `H2Padding numbits` to control
     padding of HTTP/2 payload frames. 'numbits' is a number from 0-8,
     controlling the range of padding bytes added to a frame. The actual number
     added is chosen randomly per frame. This applies to HEADERS, DATA and PUSH_PROMISE
     frames equally. The default continues to be 0, e.g. no padding. [Stefan Eissing]

  *) mod_http2: ripping out all the h2_req_engine internal features now that mod_proxy_http2
     has no more need for it. Optional functions are still declared but no longer implemented.
     While previous mod_proxy_http2 will work with this, it is recommeneded to run the matching
     versions of both modules. [Stefan Eissing]

  *) mod_proxy_http2: changed mod_proxy_http2 implementation and fixed several bugs which
     resolve PR63170. The proxy module does now a single h2 request on the (reused)
     connection and returns. [Stefan Eissing]

  *) mod_http2/mod_proxy_http2: proxy_http2 checks correct master connection aborted status
     to trigger immediate shutdown of backend connections. This is now always signalled
     by mod_http2 when the the session is being released.
     proxy_http2 now only sends a PING frame to the backend when there is not already one
     in flight. [Stefan Eissing]

  *) mod_proxy_http2: fixed an issue where a proxy_http2 handler entered an infinite
     loop when encountering certain errors on the backend connection.
     See <https://bz.apache.org/bugzilla/show_bug.cgi?id=63170>. [Stefan Eissing]

  *) mod_http2: Configuration directives H2Push and H2Upgrade can now be specified per
     Location/Directory, e.g. disabling PUSH for a specific set of resources. [Stefan Eissing]

  *) mod_http2: HEAD requests to some module such as mod_cgid caused the stream to
     terminate improperly and cause a HTTP/2 PROTOCOL_ERROR.
     Fixes <https://github.com/icing/mod_h2/issues/167>. [Michael Kaufmann]

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

6 years agoVote, promote.
Yann Ylavic [Wed, 13 Mar 2019 14:35:04 +0000 (14:35 +0000)] 
Vote, promote.

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

6 years agoadded r1855411 which reverts the unwanted revert of r1852989 to backport proposal...
Stefan Eissing [Wed, 13 Mar 2019 13:05:09 +0000 (13:05 +0000)] 
added r1855411 which reverts the unwanted revert of r1852989 to backport proposal of mod_http2

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

6 years agoFix version docs compat note in backport.
Rainer Jung [Wed, 13 Mar 2019 12:52:25 +0000 (12:52 +0000)] 
Fix version docs compat note in backport.
Followup to 1855409.
CTR docs.

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

6 years agoMerge r1853901, r1853906, r1853908, r1853929, r1853935, r1853967 from trunk:
Jim Jagielski [Wed, 13 Mar 2019 12:35:53 +0000 (12:35 +0000)] 
Merge r1853901, r1853906, r1853908, r1853929, r1853935, r1853967 from trunk:

mod_reqtimeout: factorize structs and code.

With a bit of macro magic, this is to avoid more code duplication when adding
new stages (next commit will add TLS/handshake timeouts handling in addition to
existing header and body ones).

No functional change here.

mod_reqtimeout: Allow to configure (TLS-)handshake timeouts.

The timeouts apply between the process_connection and pre_read_request hooks.
They are disabled by default for compatibily reasons.

mod_reqtimeout: follow up to r1853906: adjust hooks priorities comments.

mod_reqtimeout: follow up to r1853901: fix macro args.

mod_reqtimeout: follow up to r1853901: init stage name outside INIT_STAGE().

It helps both code readability where stages are initilized and potential
logging in the input filter (even if the stage is disabled).

mod_http2: fix for latest mod_reqtimeout change re handshake timeouts

Submitted by: ylavic, icing
Reviewed by: ylavic, icing, jim

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

6 years agoMerge r1853874, r1853938 from trunk:
Jim Jagielski [Wed, 13 Mar 2019 12:32:42 +0000 (12:32 +0000)] 
Merge r1853874, r1853938 from trunk:

mod_cache_socache: avoid pool to heap reallocation.

Below some threshold, the previous code tried free (sub-)pooled memory ASAP by
moving small buffers (< capacity / 2) to a heap bucket. But this is not really
an optimization because first it requires at some point to allocate more than
the configured capacity, and second since this happens during response handling
the pool is about to be destroyed soon anymay.

This commit simply keeps the data in the subpool and uses a pool bucket for the
output brigade to take care of the lifetime until it's consumed (or not).

Follow up to r1853874: CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, icing, jim

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

6 years agoMerge r1852038, r1852101 from trunk:
Jim Jagielski [Wed, 13 Mar 2019 12:30:20 +0000 (12:30 +0000)] 
Merge r1852038, r1852101 from trunk:

mod_http2: enable re-use of slave connections again.

mod_http2: fixed slave connection keepalives counter.

Submitted by: icing
Reviewed by: icing, ylavic, jim

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

6 years agopromote
Jim Jagielski [Wed, 13 Mar 2019 12:28:55 +0000 (12:28 +0000)] 
promote

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

6 years agoBackport votes
Jim Jagielski [Wed, 13 Mar 2019 12:28:06 +0000 (12:28 +0000)] 
Backport votes

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

6 years agoNot yet :)
Yann Ylavic [Wed, 13 Mar 2019 10:17:46 +0000 (10:17 +0000)] 
Not yet :)

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

6 years agoMerge of r1854004 from trunk:
Stefan Eissing [Wed, 13 Mar 2019 10:09:08 +0000 (10:09 +0000)] 
Merge of r1854004 from trunk:

  *) http: Fix possible empty response with mod_ratelimit for HEAD requests.

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

6 years agovote, promote
Stefan Eissing [Wed, 13 Mar 2019 10:06:15 +0000 (10:06 +0000)] 
vote, promote

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

6 years agoVote.
Yann Ylavic [Wed, 13 Mar 2019 09:37:46 +0000 (09:37 +0000)] 
Vote.

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

6 years agoBackported in r1855382.
Yann Ylavic [Wed, 13 Mar 2019 09:05:04 +0000 (09:05 +0000)] 
Backported in r1855382.

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

6 years agoMerge r1842010 from trunk:
Yann Ylavic [Wed, 13 Mar 2019 09:04:10 +0000 (09:04 +0000)] 
Merge r1842010 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.

Submitted by: rpluem
Reviewed by: jailletc36, icing, ylavic

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

6 years agoBackported in r1855380.
Yann Ylavic [Wed, 13 Mar 2019 09:02:53 +0000 (09:02 +0000)] 
Backported in r1855380.

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

6 years agoMerge r1855349 from trunk:
Yann Ylavic [Wed, 13 Mar 2019 09:02:23 +0000 (09:02 +0000)] 
Merge r1855349 from trunk:

mod_ssl: AH10129 from ERR to DEBUG level.

No error here, just debug information.

Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton

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

6 years agoBackported in r1855378.
Yann Ylavic [Wed, 13 Mar 2019 09:00:28 +0000 (09:00 +0000)] 
Backported in r1855378.

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

6 years agoMerge r1855306 from trunk:
Yann Ylavic [Wed, 13 Mar 2019 08:59:54 +0000 (08:59 +0000)] 
Merge r1855306 from trunk:

MPMs unix: bind the bucket number of each child to its slot number

We need not remember each child's bucket number in SHM for restarts, for the
lifetime of the httpd main process the bucket number can be bound to the slot
number such that: bucket = slot % num_buckets.

This both simplifies the logic and helps children maintenance per bucket in
threaded MPMs, where previously perform_idle_server_maintenance() could create
or kill children processes for the buckets it was not in charge of.

Submitted by: ylavic
Reviewed by: ylavic, rpluem, jorton

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

6 years agoPropose Yann's patch to fix a regression in mod_ratelimit
Luca Toscano [Wed, 13 Mar 2019 08:27:07 +0000 (08:27 +0000)] 
Propose Yann's patch to fix a regression in mod_ratelimit

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

6 years agoVote, promote x2.
Joe Orton [Wed, 13 Mar 2019 08:01:31 +0000 (08:01 +0000)] 
Vote, promote x2.

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

6 years ago* Easy vote
Ruediger Pluem [Wed, 13 Mar 2019 07:15:09 +0000 (07:15 +0000)] 
* Easy vote

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

6 years agofixing bugreport 63258 on the typo mapfile.map.pag
Luis Gil [Wed, 13 Mar 2019 00:09:19 +0000 (00:09 +0000)] 
fixing bugreport 63258 on the typo mapfile.map.pag

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

6 years agoEasy proposal.
Yann Ylavic [Tue, 12 Mar 2019 21:51:32 +0000 (21:51 +0000)] 
Easy proposal.

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

6 years ago* Vote
Ruediger Pluem [Tue, 12 Mar 2019 21:04:53 +0000 (21:04 +0000)] 
* Vote

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

6 years agoVote, promote.
Yann Ylavic [Tue, 12 Mar 2019 14:10:24 +0000 (14:10 +0000)] 
Vote, promote.

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

6 years agoPropose.
Yann Ylavic [Tue, 12 Mar 2019 11:23:19 +0000 (11:23 +0000)] 
Propose.

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

6 years agoMerged x2.
Joe Orton [Tue, 12 Mar 2019 09:29:44 +0000 (09:29 +0000)] 
Merged x2.

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

6 years agoMerge r1486027, r1828909, r1839249, r1842888, r1844343, r1846651 from trunk:
Joe Orton [Tue, 12 Mar 2019 09:29:24 +0000 (09:29 +0000)] 
Merge r1486027, r1828909, r1839249, r1842888, r1844343, r1846651 from trunk:

Clarify the existing behavior.

* modules/generators/mod_info.c: Constify fixed tables and mark
  module-private global variables static. No functional change.

Axe an old and apparently out-dated comment.

There is a typo in the comment.
HN_UPDATE_SEC has been renamed HM_UPDATE_SEC.
The TODO seems to have been taken into account in r759862.

* modules/filters/mod_deflate.c
  (deflate_out_filter): Fix typo setting output note. (Coverity warning)
  (deflate_in_filter): Fix redundant assignment. (clang warning)

* modules/md/md_acme_authz.c (md_acme_authz_update): Fix typo in log
  message.

* modules/dav/main/mod_dav.c (dav_method_propfind): Tag the scratchpool.

Submitted by: minfrin, jorton, jailletc36
Reviewed by: jailletc36, icing, jorton

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

6 years agoadding the lastest h2 fix to the backport
Stefan Eissing [Tue, 12 Mar 2019 09:24:47 +0000 (09:24 +0000)] 
adding the lastest h2 fix to the backport

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

6 years agoMerge r1853190 from trunk:
Joe Orton [Tue, 12 Mar 2019 09:24:26 +0000 (09:24 +0000)] 
Merge r1853190 from trunk:

Fix a race condition.  Authentication with valid credentials could be
refused in case of concurrent accesses from different users.

PR: 63124
Submitted by: Simon Kappel <simon.kappel axis.com>
Reviewed by: jailletc36, icing, jorton

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

6 years agobackport prposal h2 fixes and features
Stefan Eissing [Thu, 7 Mar 2019 10:40:13 +0000 (10:40 +0000)] 
backport prposal h2 fixes and features

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

6 years agoVote, promote.
Joe Orton [Wed, 27 Feb 2019 10:04:36 +0000 (10:04 +0000)] 
Vote, promote.

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

6 years agoSimplify charset handling
William A. Rowe Jr [Tue, 26 Feb 2019 17:36:34 +0000 (17:36 +0000)] 
Simplify charset handling

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

6 years agoupdate transformation
AndrĂ© Malo [Tue, 26 Feb 2019 14:03:24 +0000 (14:03 +0000)] 
update transformation

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

6 years agobackport proposal h2 slave keeapalives
Stefan Eissing [Tue, 26 Feb 2019 10:21:04 +0000 (10:21 +0000)] 
backport proposal h2 slave keeapalives

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

6 years agoUpdate proposal.
Graham Leggett [Sun, 24 Feb 2019 13:36:12 +0000 (13:36 +0000)] 
Update proposal.

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

6 years agofr doc rebuild.
Lucien Gentis [Sat, 23 Feb 2019 15:53:09 +0000 (15:53 +0000)] 
fr doc rebuild.

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

6 years agoXML fr doc files updates.
Lucien Gentis [Sat, 23 Feb 2019 15:51:45 +0000 (15:51 +0000)] 
XML fr doc files updates.

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

6 years agovote
Stefan Eissing [Fri, 22 Feb 2019 10:06:31 +0000 (10:06 +0000)] 
vote

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

6 years agoUpdate mod_reqtimeout proposal to fit mod_http2.
Yann Ylavic [Wed, 20 Feb 2019 16:17:57 +0000 (16:17 +0000)] 
Update mod_reqtimeout proposal to fit mod_http2.

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

6 years agoproposal to include 1853967 in backport of mod_reqtimeout change, vote
Stefan Eissing [Wed, 20 Feb 2019 15:56:22 +0000 (15:56 +0000)] 
proposal to include 1853967 in backport of mod_reqtimeout change, vote

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