git.ipfire.org Git - thirdparty/apache/httpd.git/log

]> git.ipfire.org Git - thirdparty/apache/httpd.git/log

projects / thirdparty / apache / httpd.git / log

Rainer Jung [Tue, 1 Jan 2019 21:25:34 +0000 (21:25 +0000)]

Docs rebuild after copyright year update.

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

commit | commitdiff | tree

Rainer Jung [Tue, 1 Jan 2019 12:13:21 +0000 (12:13 +0000)]

Happy New Year 2019

Backport of r1850098 from trunk.

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

commit | commitdiff | tree

William A. Rowe Jr [Wed, 19 Dec 2018 17:31:57 +0000 (17:31 +0000)]

Unwise?

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

commit | commitdiff | tree

Jim Jagielski [Wed, 19 Dec 2018 14:27:45 +0000 (14:27 +0000)]

backport vote

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

commit | commitdiff | tree

Stefan Eissing [Tue, 18 Dec 2018 13:57:29 +0000 (13:57 +0000)]

Merge of r1849174 from trunk:

*) mod_md: incorrect behaviour when synchronizing ongoing ACME challenges
have been fixed. [Michael Kaufmann, Stefan Eissing]

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

commit | commitdiff | tree

Christophe Jaillet [Sat, 15 Dec 2018 06:28:27 +0000 (06:28 +0000)]

Give credit to the author.

I only tested, added a test case and proposed for backport.

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

commit | commitdiff | tree

Jim Jagielski [Tue, 11 Dec 2018 14:16:13 +0000 (14:16 +0000)]

Merge r1848236 from trunk:

core: Fix incorrect substitution of env vars in directives containing multiple env vars.

In ap_resolve_env(), the string returned from getenv() should be copied since
the returned string may be statically allocated.

This fixes an issue where the value for the last env var is substituted for all
env vars in a directive containing multiple env vars.

Submitted by: hwibell
Reviewed by: hwibell, covener, jim

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

commit | commitdiff | tree

Jim Jagielski [Tue, 11 Dec 2018 14:14:40 +0000 (14:14 +0000)]

Merge r1830816, r1830836, r1842882, r1842884 from trunk:

* modules/ssl: Add some missing logno tags.

* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey):
  Simplify code, no functional change.

* modules/slotmem/mod_slotmem_shm.c (restore_slotmem): Remove
  redundant assignment (clang warning), the apr_file_eof(fp)=>APR_EOF
  case assigns rv to APR_EOF and then to APR_SUCCESS after already.

* modules/mappers/mod_negotiation.c (set_language_quality): Remove
  redundant branch (warning from Coverity).

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

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

commit | commitdiff | tree

Jim Jagielski [Tue, 11 Dec 2018 14:09:11 +0000 (14:09 +0000)]

Merge r1831773 from trunk:

PR62311: only create the rewritelock when needed

Submitted By: Hank Ibell <hwibell gmail.com>
Committed By: covener

Submitted by: covener
Reviewed by: jailletc36, icing (by inspection), covener

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

commit | commitdiff | tree

Jim Jagielski [Tue, 11 Dec 2018 14:07:32 +0000 (14:07 +0000)]

promote

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

commit | commitdiff | tree

Jim Jagielski [Tue, 11 Dec 2018 14:07:01 +0000 (14:07 +0000)]

some tested backports

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

commit | commitdiff | tree

Joe Orton [Fri, 7 Dec 2018 12:40:23 +0000 (12:40 +0000)]

Nominate*1.

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

commit | commitdiff | tree

William A. Rowe Jr [Wed, 5 Dec 2018 23:14:18 +0000 (23:14 +0000)]

Propose conn/req hostname fix

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

commit | commitdiff | tree

Eric Covener [Wed, 5 Dec 2018 22:44:47 +0000 (22:44 +0000)]

quick votes, promote

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

commit | commitdiff | tree

Hank Ibell [Wed, 5 Dec 2018 20:00:26 +0000 (20:00 +0000)]

Propose

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

commit | commitdiff | tree

Stefan Eissing [Mon, 26 Nov 2018 10:17:16 +0000 (10:17 +0000)]

votes

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

commit | commitdiff | tree

Graham Leggett [Sun, 25 Nov 2018 21:21:41 +0000 (21:21 +0000)]

Propose.

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 16:10:51 +0000 (16:10 +0000)]

*) mod_setenvif: We can have expressions that become true if a regex pattern
   in the expression does NOT match. In this case val is NULL
   and we should just set the value for the environment variable
   like in the pattern case.
+1: jailletc36, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 16:08:55 +0000 (16:08 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 15:42:50 +0000 (15:42 +0000)]

*) mod_dav: Fix invalid Location header when a resource is created by passing
an absolute URI on the request line
+1: jailletc36, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 15:41:37 +0000 (15:41 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 15:34:40 +0000 (15:34 +0000)]

*) mod_session_cookie: avoid duplicate Set-Cookie headers in the response.
trunk patch: http://svn.apache.org/r1843244
+1: elukey, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 15:33:12 +0000 (15:33 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 15:25:35 +0000 (15:25 +0000)]

*) event MPM: Don't log "at MaxRequestWorkers" when there are still idle threads,
just like worker.
+1: covener, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 15:24:23 +0000 (15:24 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 15:10:24 +0000 (15:10 +0000)]

*) mod_ssl: Fixes PR 62654 where "require ssl" did not work on HTTP/2
connections, and PR 61519 where $HTTPS was incorrect for the
"SSLEngine optional" case.
+1: jorton, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 15:09:11 +0000 (15:09 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 14:57:22 +0000 (14:57 +0000)]

mod_ssl: Fixes PR 62880 where certificate loading fails bc SSL ERRs are
not cleared beforehand.
+1: icing, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 14:56:08 +0000 (14:56 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 14:49:50 +0000 (14:49 +0000)]

mod_ssl: Fix the error code returned in an error path of 'ssl_io_filter_handshake()'
This messes-up error handling performed in 'ssl_io_filter_error()'
+1: ylavic, jim, minfrin

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

commit | commitdiff | tree

Graham Leggett [Fri, 23 Nov 2018 14:48:17 +0000 (14:48 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Ruediger Pluem [Mon, 12 Nov 2018 07:23:26 +0000 (07:23 +0000)]

* Add a comment

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 11 Nov 2018 08:38:42 +0000 (08:38 +0000)]

Propose

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

commit | commitdiff | tree

Jim Jagielski [Sat, 10 Nov 2018 13:14:43 +0000 (13:14 +0000)]

backport votes

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

commit | commitdiff | tree

Joe Orton [Fri, 9 Nov 2018 16:39:44 +0000 (16:39 +0000)]

Add PR reference.

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

commit | commitdiff | tree

Joe Orton [Fri, 9 Nov 2018 08:31:39 +0000 (08:31 +0000)]

r1846112 is a bit too tomcatty, counter-proposal...

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

commit | commitdiff | tree

Stefan Eissing [Thu, 8 Nov 2018 10:57:08 +0000 (10:57 +0000)]

backport propoosal

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

commit | commitdiff | tree

Stefan Eissing [Thu, 8 Nov 2018 10:15:04 +0000 (10:15 +0000)]

backport proposal

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

commit | commitdiff | tree

Stefan Eissing [Thu, 8 Nov 2018 10:14:04 +0000 (10:14 +0000)]

removing unwanted file change

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

commit | commitdiff | tree

Stefan Eissing [Thu, 8 Nov 2018 10:11:59 +0000 (10:11 +0000)]

backport proposal

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

commit | commitdiff | tree

Jim Jagielski [Wed, 7 Nov 2018 15:18:42 +0000 (15:18 +0000)]

Merge r1837250 from trunk:

If ProxyPassReverse is used for reverse mapping of relative redirects, subsequent ProxyPassReverse statements, whether they are relative or absolute, may fail.

PR 60408 [Peter Haworth <pmh1wheel gmail.com>]
Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, jim

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

commit | commitdiff | tree

Jim Jagielski [Wed, 7 Nov 2018 15:16:01 +0000 (15:16 +0000)]

promote

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

commit | commitdiff | tree

Jim Jagielski [Wed, 7 Nov 2018 15:15:43 +0000 (15:15 +0000)]

Backport votes

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

commit | commitdiff | tree

Stefan Eissing [Mon, 5 Nov 2018 10:43:32 +0000 (10:43 +0000)]

Propose backport of fix to PR 62880.

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

commit | commitdiff | tree

Ruediger Pluem [Tue, 30 Oct 2018 19:28:40 +0000 (19:28 +0000)]

* Vote

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

commit | commitdiff | tree

Christophe Jaillet [Mon, 29 Oct 2018 13:55:03 +0000 (13:55 +0000)]

Propose

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

commit | commitdiff | tree

Lucien Gentis [Sat, 27 Oct 2018 12:54:32 +0000 (12:54 +0000)]

fr doc rebuild.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 27 Oct 2018 12:52:55 +0000 (12:52 +0000)]

XML updates.

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 26 Oct 2018 14:49:44 +0000 (14:49 +0000)]

Propose.

Tested with a highly modified dav.t which sends raw commands on a sock + wireshark to check the result.
(I've not found an easy way to force HTTP::DAV to use absolute URI)

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

commit | commitdiff | tree

Daniel Ruggeri [Tue, 23 Oct 2018 13:10:46 +0000 (13:10 +0000)]

Updates for announcement of 2.4.37

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

commit | commitdiff | tree

Luca Toscano [Mon, 22 Oct 2018 13:20:18 +0000 (13:20 +0000)]

documentation rebuild

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

commit | commitdiff | tree

Luca Toscano [Mon, 22 Oct 2018 13:16:57 +0000 (13:16 +0000)]

mod_proxy.xml: backport r1844556

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

commit | commitdiff | tree

Luca Toscano [Mon, 22 Oct 2018 08:28:34 +0000 (08:28 +0000)]

add note about PR 62025 for backport proposal of r1832092

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

commit | commitdiff | tree

Luca Toscano [Sun, 21 Oct 2018 10:55:37 +0000 (10:55 +0000)]

documentation rebuild

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

commit | commitdiff | tree

Luca Toscano [Sun, 21 Oct 2018 10:55:09 +0000 (10:55 +0000)]

mod_headers.xml: backport r1844401

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

commit | commitdiff | tree

Luca Toscano [Sun, 21 Oct 2018 08:16:42 +0000 (08:16 +0000)]

propose

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

commit | commitdiff | tree

André Malo [Fri, 19 Oct 2018 06:09:25 +0000 (06:09 +0000)]

svn:eol-style = native

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

commit | commitdiff | tree

André Malo [Fri, 19 Oct 2018 06:03:48 +0000 (06:03 +0000)]

make sure svn commit mails are correctly encoded

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

commit | commitdiff | tree

André Malo [Fri, 19 Oct 2018 05:59:20 +0000 (05:59 +0000)]

build bootstrap

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

commit | commitdiff | tree

Daniel Ruggeri [Thu, 18 Oct 2018 14:33:43 +0000 (14:33 +0000)]

Post 2.4.37 tag updates

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

commit | commitdiff | tree

Daniel Ruggeri [Thu, 18 Oct 2018 14:33:35 +0000 (14:33 +0000)]

Get ready to tag httpd 2.4.37

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

commit | commitdiff | tree

Lucien Gentis [Thu, 18 Oct 2018 11:38:42 +0000 (11:38 +0000)]

fr doc : adding UTF-8 html files.

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

commit | commitdiff | tree

Lucien Gentis [Thu, 18 Oct 2018 11:20:54 +0000 (11:20 +0000)]

fr doc : deleting ISO-8859-1 html files.

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

commit | commitdiff | tree

Rainer Jung [Thu, 18 Oct 2018 10:06:37 +0000 (10:06 +0000)]

mod_ssl: Correctly merge configurations that have client certificates set
by SSLProxyMachineCertificate{File|Path}.

The certificates and keys loaded during configuration time got lost during
runtime if e.g. SSLProxyMachineCertificate{File|Path} was set on virtual host
level and there was an SSL directive at directory level, e.g. SSLRequire.

This fixes a regression likely introduced in r1740928 (backported in r1824187).

Backport of r1844002 from trunk.

Submitted by: rjung
Reviewed by: rjung, rpluem, jorton

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

commit | commitdiff | tree

Rainer Jung [Thu, 18 Oct 2018 10:03:52 +0000 (10:03 +0000)]

mod_ssl: We need to get the SSL_CTX for further processing
down below.

This fixes a crash during SSL renegotiation with OptRenegotiate set,
when client certificates are available from the original handshake
but were originally not verified and should get verified now.
This is a regression in 2.4.36 (unreleased).

Backport of r1828793 from trunk.

Submitted by: rjung
Reviewed by: rjung, rpluem, jorton

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

commit | commitdiff | tree

Joe Orton [Thu, 18 Oct 2018 09:55:06 +0000 (09:55 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Ruediger Pluem [Thu, 18 Oct 2018 09:47:02 +0000 (09:47 +0000)]

* Vote

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

commit | commitdiff | tree

Rainer Jung [Thu, 18 Oct 2018 09:26:48 +0000 (09:26 +0000)]

Another mod_ssl backport proposal.

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

commit | commitdiff | tree

Rainer Jung [Thu, 18 Oct 2018 09:15:20 +0000 (09:15 +0000)]

Propose backport to prevent crashes during
SSL renegotiation with OptRenegotiate set,
client certificates available from original
handshake but client certs were originaly not
verified and should get verified now.

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

commit | commitdiff | tree

Rainer Jung [Wed, 17 Oct 2018 07:50:14 +0000 (07:50 +0000)]

Add a changelog entry for r1844047.

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

commit | commitdiff | tree

Daniel Ruggeri [Tue, 16 Oct 2018 20:24:23 +0000 (20:24 +0000)]

  *) mod_ssl: Handle SSL_read() return code 0 similarly to <0. It is needed
              when using OpenSSL 1.1.1 and should not harm for versions before
              1.1.1.
              Without the patch for 1.1.1 a 0 byte read no longer results in
              EAGAIN but instead in APR_EOF which leads to HTTP/2 failures.
              For the changelog: Fix HTTP/2 failures when using OpenSSL 1.1.1.
     trunk patch: http://svn.apache.org/r1843954
     2.4.x patch: svn merge -c 1843954 ^/httpd/httpd/trunk .
     +1: rjung, druggeri, rpluem

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

commit | commitdiff | tree

Ruediger Pluem [Tue, 16 Oct 2018 18:14:13 +0000 (18:14 +0000)]

* Vote and promote

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

commit | commitdiff | tree

Daniel Ruggeri [Tue, 16 Oct 2018 17:56:29 +0000 (17:56 +0000)]

Can confirm this resolves H2 test failure issues introduced w/ OpenSSL 1.1.1

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

commit | commitdiff | tree

Rainer Jung [Tue, 16 Oct 2018 16:57:22 +0000 (16:57 +0000)]

Typo in proposed revision number.
Thanks to Daniel for the heads up.

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

commit | commitdiff | tree

Daniel Ruggeri [Tue, 16 Oct 2018 13:23:34 +0000 (13:23 +0000)]

Died on the vine

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

commit | commitdiff | tree

Rainer Jung [Tue, 16 Oct 2018 09:47:34 +0000 (09:47 +0000)]

Propose.

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

commit | commitdiff | tree

Jim Jagielski [Mon, 15 Oct 2018 15:38:47 +0000 (15:38 +0000)]

backport votes

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

commit | commitdiff | tree

Lucien Gentis [Fri, 12 Oct 2018 15:36:05 +0000 (15:36 +0000)]

XML update.

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

commit | commitdiff | tree

Eric Covener [Thu, 11 Oct 2018 14:24:38 +0000 (14:24 +0000)]

propose "at maxrequestworkers" patch

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

commit | commitdiff | tree

Ruediger Pluem [Thu, 11 Oct 2018 07:01:18 +0000 (07:01 +0000)]

* This is addressed now

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

commit | commitdiff | tree

Daniel Ruggeri [Wed, 10 Oct 2018 19:11:42 +0000 (19:11 +0000)]

Post 2.4.36 tag updates

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

commit | commitdiff | tree

Daniel Ruggeri [Wed, 10 Oct 2018 19:11:30 +0000 (19:11 +0000)]

Get ready to tag httpd 2.4.36

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

commit | commitdiff | tree

William A. Rowe Jr [Wed, 10 Oct 2018 16:45:20 +0000 (16:45 +0000)]

Note release

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

commit | commitdiff | tree

Jim Jagielski [Wed, 10 Oct 2018 15:40:35 +0000 (15:40 +0000)]

Merge r1843242 from trunk:

mod_brotli, mod_deflate: Restore the separate handling of 304 Not Modified
responses allowing these modules to properly set or fix-up the response
headers such as Vary or ETag.

This change follows up on r1837056 that disabled that special handling and
thus resulted in a potential violation of RFC7232, 4.1:

   The server generating a 304 response MUST generate any of the following
   header fields that would have been sent in a 200 (OK) response to the
   same request: Cache-Control, Content-Location, Date, ETag, Expires,
   and Vary.)

References:
  https://lists.apache.org/thread.html/f5733ca6743757e8aa8b58a0cd9e27680971551c2a20f5606c66507e@%3Cdev.httpd.apache.org%3E
  https://tools.ietf.org/html/rfc7232#section-4.1
Submitted by: kotkov
Reviewed by: kotkov, ylavic, jim

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

commit | commitdiff | tree

Jim Jagielski [Wed, 10 Oct 2018 15:38:42 +0000 (15:38 +0000)]

Merge r1843426 from trunk:

mod_http2: adding defensive code for stream EOS handling, in case the request handler
     missed to signal it the normal way (eos buckets). Addresses github issues
     https://github.com/icing/mod_h2/issues/164, https://github.com/icing/mod_h2/issues/167
     and https://github.com/icing/mod_h2/issues/170.

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

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

commit | commitdiff | tree

Jim Jagielski [Wed, 10 Oct 2018 15:37:32 +0000 (15:37 +0000)]

Merge r1839303, r1843290 from trunk:

These need to be signed longs... cast as needed.

Add CHANGES entry
Submitted by: jim, jailletc36
Reviewed by: jailletc36 (by inspection), ylavic, jim

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

commit | commitdiff | tree

Jim Jagielski [Wed, 10 Oct 2018 15:35:03 +0000 (15:35 +0000)]

approved backports

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

commit | commitdiff | tree

Jim Jagielski [Wed, 10 Oct 2018 15:34:19 +0000 (15:34 +0000)]

backport votes

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

commit | commitdiff | tree

Yann Ylavic [Wed, 10 Oct 2018 13:06:44 +0000 (13:06 +0000)]

Vote.

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

commit | commitdiff | tree

Stefan Eissing [Wed, 10 Oct 2018 12:13:41 +0000 (12:13 +0000)]

adding proposal to backport h2 eos handling fix

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

commit | commitdiff | tree

Graham Leggett [Wed, 10 Oct 2018 09:13:20 +0000 (09:13 +0000)]

ab: Add client certificate support.
trunk: http://svn.apache.org/r1841784
2.4.x: svn merge -c r1841784 ^/httpd/httpd/trunk .
+1: minfrin, jim, ylavic

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

commit | commitdiff | tree

Graham Leggett [Wed, 10 Oct 2018 09:10:15 +0000 (09:10 +0000)]

ab: print Server Temp Key information.
trunk patch: http://svn.apache.org/r1738415
http://svn.apache.org/r1826930
2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-ab.patch
+1: minfrin, jim, ylavic

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

commit | commitdiff | tree

Eric Covener [Tue, 9 Oct 2018 23:26:35 +0000 (23:26 +0000)]

Merge r1842540 from trunk:

* Pickup the proxy related configuration for verify mode and verify depth and
not the configuration settings for frontend connections in case of
connections by the proxy to the backend.

PR: 62769

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

commit | commitdiff | tree

Eric Covener [Tue, 9 Oct 2018 23:22:44 +0000 (23:22 +0000)]

  *) mod_ssl: downgrade logging of requests without SNI when SSLStrictSNIVHostCheck is on
              (just a quality of life improvement for log-reading admins):
     trunk: http://svn.apache.org/r1841446
     trunk: http://svn.apache.org/r1841455
     2.4.x branch: svn merge -c 1841446,1841455 ^/httpd/httpd/trunk .
     +1: icing, minfrin, jim

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

commit | commitdiff | tree

Eric Covener [Tue, 9 Oct 2018 23:20:59 +0000 (23:20 +0000)]

vote/promote

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

commit | commitdiff | tree

Yann Ylavic [Tue, 9 Oct 2018 15:06:21 +0000 (15:06 +0000)]

Votes.

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

commit | commitdiff | tree

Christophe Jaillet [Tue, 9 Oct 2018 14:29:41 +0000 (14:29 +0000)]

Add CHANGES entry

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

commit | commitdiff | tree

Christophe Jaillet [Tue, 9 Oct 2018 13:56:23 +0000 (13:56 +0000)]

Correctly merge r1836287, backported in 2.4.x in r1836288.
(unless I missed something, the function is also called 'ap_directory_walk' in 2.4.x)

This is only a comment update.

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

commit | commitdiff | tree

Evgeny Kotkov [Tue, 9 Oct 2018 12:31:58 +0000 (12:31 +0000)]

On the 2.4.x branch: Propose the mod_brotli/mod_deflate 304 handling
fix (r1843242) for backport.

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

commit | commitdiff | tree

Stefan Eissing [Tue, 9 Oct 2018 11:59:13 +0000 (11:59 +0000)]

vote

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

Mirror of https://github.com/apache/httpd.git

RSS Atom