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

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

projects / thirdparty / apache / httpd.git / log

summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next

commit | commitdiff | tree

Joe Orton [Fri, 20 Mar 2020 11:24:16 +0000 (11:24 +0000)]

Merge r1875467 from trunk:

Match Travis jobs for 2.4.x by tag as well as branch.
Ignore failures for s390x which is flaky in apt-get again.

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

commit | commitdiff | tree

Joe Orton [Fri, 20 Mar 2020 10:58:53 +0000 (10:58 +0000)]

Merge r1872732, r1872777, r1874128, r1874190, r1874256, r1874542, r1874716, r1874720, r1874775, r1875465 from trunk:

Non-x86 testing seems reasonably reliable; note some known failures
currently.

Add Travis job with --enable-mods-static=reallyall.

Back off a little when svn export is timing out.

Add Travis job which runs under UBSan ("Undefined Behaviour Sanitizer").
mod_http2 disabled for now until https://github.com/icing/mod_h2/pull/194
is merged.

Add gcc 9 job, enable enhanced malloc debugging for pool-debug job.

Add an i386 build using a multilib packages and "gcc -m32".
(All other Travis builds are 64-bit arches currently)

Switch to using httpd-tests git repo.

Fix travis config validation warnings.

Update docs. The expr_string.t failure has not been seen since
the workaround was added AFAICT. The async filter bug
is still breaking the tests regularly. [skip ci].

Add simple test for apxs to catch regression in r1872042.

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

commit | commitdiff | tree

Ruediger Pluem [Fri, 20 Mar 2020 08:08:00 +0000 (08:08 +0000)]

* Vote and promote

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

commit | commitdiff | tree

Giovanni Bechis [Fri, 20 Mar 2020 07:14:10 +0000 (07:14 +0000)]

vote [skip ci]

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

commit | commitdiff | tree

Eric Covener [Thu, 19 Mar 2020 15:51:24 +0000 (15:51 +0000)]

propose apxs fix

[skip ci]

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

commit | commitdiff | tree

Daniel Ruggeri [Thu, 19 Mar 2020 14:42:05 +0000 (14:42 +0000)]

Post 2.4.42 tag updates

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

commit | commitdiff | tree

Daniel Ruggeri [Thu, 19 Mar 2020 14:41:59 +0000 (14:41 +0000)]

Get ready to tag httpd 2.4.42

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

commit | commitdiff | tree

Eric Covener [Thu, 12 Mar 2020 02:04:53 +0000 (02:04 +0000)]

remove backported [skip ci]

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

commit | commitdiff | tree

Eric Covener [Thu, 12 Mar 2020 02:04:38 +0000 (02:04 +0000)]

Merge r1874323 from trunk:

mod_ssl: follow up to r1861950: allow for OPENSSL_init_ssl() without autoconf.

For systems with no autoconf (eg. Windows), still check for and use
OPENSSL_init_ssl() based on OpenSSL version >= 1.1.0.

Usual LibreSSL gotcha, exclude LIBRESSL_VERSION_NUMBER from this new heuristic
since autoconf is likely available in this case.

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

commit | commitdiff | tree

Eric Covener [Thu, 12 Mar 2020 02:03:33 +0000 (02:03 +0000)]

remove [skip ci]

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

commit | commitdiff | tree

Eric Covener [Thu, 12 Mar 2020 02:03:17 +0000 (02:03 +0000)]

Merge r1869216, r1869224 from trunk:

mod_proxy_http: fix load-balancer fallback for requests with a body.

Since r1656259 (or r1656259 in 2.4.41) and the move of prefetch before connect,
the balancer fallback case where proxy_http_handler() is re-entered with the
next balancer member broke.

We need to save the body (partially) prefetched the first time and reuse it on
successive calls, otherwise we might forward partial or empty body.

mod_proxy_http: follow up to r1869216.

Let's call stream_reqbody() for all rb_methods, no RB_SPOOL_CL special case.

This both simplifies code and allows to keep EOS into the input_brigade until
it's sent, and thus detect whether we already fetched the whole body if/when
proxy_http_handler() re-enters for different balancer members.

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

commit | commitdiff | tree

Eric Covener [Thu, 12 Mar 2020 02:01:24 +0000 (02:01 +0000)]

passes new test

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

commit | commitdiff | tree

Giovanni Bechis [Tue, 10 Mar 2020 21:49:06 +0000 (21:49 +0000)]

typo

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

commit | commitdiff | tree

Eric Covener [Tue, 10 Mar 2020 21:22:09 +0000 (21:22 +0000)]

spotted by freenode user a-ja

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

commit | commitdiff | tree

Christophe Jaillet [Sun, 8 Mar 2020 10:29:54 +0000 (10:29 +0000)]

Merge r1872394 from trunk

* In winnt_accept() (server/mpm/winnt/child.c), there's a call to PostQueuedCompletionStatus() with a buffer (BytesRead) for the number of bytes read.

When compiling the code with Visual Studio 2019 (v 16.3.10), we get a warning than BytesRead is not initialized. When using /RTCu (run-time checks for uninitialzed variables), the program crashes on this line with an exception.

If we initialize the variable to 0, the problem is solved.

PR: 63965
Submitted by: gbechis
Reviewed by: gbechis,jailletc36 (+ CTR rule for non-Unix, single-platform code)
Backported by: jailletc36

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

commit | commitdiff | tree

Lucien Gentis [Sat, 7 Mar 2020 14:01:25 +0000 (14:01 +0000)]

fr dic rebuild.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 7 Mar 2020 14:00:15 +0000 (14:00 +0000)]

fr doc XML file update.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 7 Mar 2020 13:57:00 +0000 (13:57 +0000)]

misplaced <compatibility> tag.

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

commit | commitdiff | tree

Giovanni Bechis [Sat, 7 Mar 2020 09:45:28 +0000 (09:45 +0000)]

typo [skip ci]

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

commit | commitdiff | tree

Christophe Jaillet [Sat, 7 Mar 2020 07:17:13 +0000 (07:17 +0000)]

Add compatibility notes and fix some small style issues.

A link with a RFC would be welcomed, but apparenly this is only a draft (See [1])
r1874927 in trunk

[skip ci]

[1]: https://tools.ietf.org/id/draft-ietf-httpbis-rfc6265bis-03.html

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

commit | commitdiff | tree

Jim Jagielski [Fri, 6 Mar 2020 16:15:17 +0000 (16:15 +0000)]

Merge r1874689 from trunk:

  *) mod_http2: Fixes issue where mod_unique_id would generate non-unique request
     identifier under load, see <https://github.com/icing/mod_h2/issues/195>.
     [Michael Kaufmann, Stefan Eissing]

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

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

commit | commitdiff | tree

Jim Jagielski [Fri, 6 Mar 2020 16:14:06 +0000 (16:14 +0000)]

Merge r1874616 from trunk:

PR64140: Allow %{Content-Type} in health check expressions

Submitted By: Renier Velazco <renier.velazco upr.edu>
Commited By: covener

Github: closes #97

Submitted by: covener
Reviewed by: covener, ylavic, jim

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

commit | commitdiff | tree

Jim Jagielski [Fri, 6 Mar 2020 16:13:09 +0000 (16:13 +0000)]

Merge r1874424 from trunk:

PR64172: drop severity of AH01666

Submitted by: covener
Reviewed by: covener, ylavic, jim

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

commit | commitdiff | tree

Jim Jagielski [Fri, 6 Mar 2020 16:12:06 +0000 (16:12 +0000)]

promote

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

commit | commitdiff | tree

Jim Jagielski [Fri, 6 Mar 2020 16:11:46 +0000 (16:11 +0000)]

provide votes

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

commit | commitdiff | tree

Eric Covener [Fri, 6 Mar 2020 01:14:32 +0000 (01:14 +0000)]

done [skip ci]

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

commit | commitdiff | tree

Eric Covener [Fri, 6 Mar 2020 01:14:16 +0000 (01:14 +0000)]

Merge r1874346, r1874545, r1874558 from trunk:

Avoid printing NULL strings in logs

Avoid printing NULL strings in logs

"?:" is a GNU extension, use standard syntax
spotted by Christophe Jaillet

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

commit | commitdiff | tree

Eric Covener [Fri, 6 Mar 2020 01:13:13 +0000 (01:13 +0000)]

done [skip ci]

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

commit | commitdiff | tree

Eric Covener [Fri, 6 Mar 2020 01:12:50 +0000 (01:12 +0000)]

restore CHANGES entry [skip ci]

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

commit | commitdiff | tree

Eric Covener [Fri, 6 Mar 2020 01:12:07 +0000 (01:12 +0000)]

Merge r1874389, r1874480, r1874601 from trunk:

PR64077: samesite/httponly/secure flags for usertrack

Submitted By: Prashant Keshvani <prashant2400 gmail.com>, Eric Covener
Committed By: covener

* Whitespace fix

Remove duplicated "CookieTracking" directive in 'command_rec'.

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

commit | commitdiff | tree

Eric Covener [Fri, 6 Mar 2020 01:08:44 +0000 (01:08 +0000)]

promote [skip ci]

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

commit | commitdiff | tree

Ruediger Pluem [Wed, 4 Mar 2020 07:43:52 +0000 (07:43 +0000)]

* Vote and promote [skip ci]

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

commit | commitdiff | tree

Ruediger Pluem [Wed, 4 Mar 2020 07:11:51 +0000 (07:11 +0000)]

* As this is a regression it looks like ablocker to me [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Tue, 3 Mar 2020 23:08:17 +0000 (23:08 +0000)]

tabs [skip ci].

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

commit | commitdiff | tree

Yann Ylavic [Tue, 3 Mar 2020 23:06:13 +0000 (23:06 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Yann Ylavic [Tue, 3 Mar 2020 21:50:53 +0000 (21:50 +0000)]

Propose.

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

commit | commitdiff | tree

Stefan Eissing [Mon, 2 Mar 2020 11:05:21 +0000 (11:05 +0000)]

backport porposal

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

commit | commitdiff | tree

Lucien Gentis [Sat, 29 Feb 2020 14:22:22 +0000 (14:22 +0000)]

fr doc rebuild.

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

commit | commitdiff | tree

Lucien Gentis [Sat, 29 Feb 2020 14:21:35 +0000 (14:21 +0000)]

fr doc XML file update.

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

commit | commitdiff | tree

Christophe Jaillet [Sat, 29 Feb 2020 08:20:44 +0000 (08:20 +0000)]

Fix a commit number in a backport proposal [skip ci]

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

commit | commitdiff | tree

Eric Covener [Fri, 28 Feb 2020 13:04:11 +0000 (13:04 +0000)]

propose healthcheck fix [skip ci]

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

commit | commitdiff | tree

Christophe Jaillet [Fri, 28 Feb 2020 06:17:15 +0000 (06:17 +0000)]

Add a note [skip ci]

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

commit | commitdiff | tree

Gregg Lewis Smith [Fri, 28 Feb 2020 01:03:26 +0000 (01:03 +0000)]

vote

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2020 11:20:24 +0000 (11:20 +0000)]

Propose fix for compilation failure on Windows after r1874281. [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Thu, 27 Feb 2020 11:09:02 +0000 (11:09 +0000)]

Backported.

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

commit | commitdiff | tree

Jean-Frederic Clere [Thu, 27 Feb 2020 10:31:45 +0000 (10:31 +0000)]

Doc for secret in AJP.

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

commit | commitdiff | tree

Giovanni Bechis [Thu, 27 Feb 2020 07:16:47 +0000 (07:16 +0000)]

update patch info and vote

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

commit | commitdiff | tree

Jean-Frederic Clere [Wed, 26 Feb 2020 18:43:41 +0000 (18:43 +0000)]

Propose r1874346,1874545 for back port.

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

commit | commitdiff | tree

Lucien Gentis [Tue, 25 Feb 2020 16:48:41 +0000 (16:48 +0000)]

fr doc rebuild.

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

commit | commitdiff | tree

Lucien Gentis [Tue, 25 Feb 2020 16:47:17 +0000 (16:47 +0000)]

fr doc XML files updates.

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

commit | commitdiff | tree

Ruediger Pluem [Tue, 25 Feb 2020 08:28:01 +0000 (08:28 +0000)]

* Fix typo and adjust formating

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

commit | commitdiff | tree

Rainer Jung [Mon, 24 Feb 2020 15:18:33 +0000 (15:18 +0000)]

mod_proxy_ajp: Add "secret" parameter to proxy workers
to implement legacy AJP13 authentication. PR 53098.
The attribute is now suggested/required by tomcat.

Backport of r1738878 from trunk.

Backported by: covener
Reviewed by: covener, jorton, rjung

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

commit | commitdiff | tree

Rainer Jung [Mon, 24 Feb 2020 15:14:06 +0000 (15:14 +0000)]

Fix broken docs xml, misplaced </usage> tag [skip ci].

Backport of r1869606 from trunk (CTR).

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

commit | commitdiff | tree

Rainer Jung [Mon, 24 Feb 2020 14:56:48 +0000 (14:56 +0000)]

Promote and [skip ci].

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

commit | commitdiff | tree

Rainer Jung [Mon, 24 Feb 2020 14:55:42 +0000 (14:55 +0000)]

Vote and [skip ci].

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

commit | commitdiff | tree

Joe Orton [Mon, 24 Feb 2020 14:15:02 +0000 (14:15 +0000)]

Vote and [skip ci].

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

commit | commitdiff | tree

Eric Covener [Mon, 24 Feb 2020 13:16:23 +0000 (13:16 +0000)]

propose AJP secret fix [skip ci]

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

commit | commitdiff | tree

Eric Covener [Sun, 23 Feb 2020 13:31:11 +0000 (13:31 +0000)]

propose logging change [skip ci]

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

commit | commitdiff | tree

Eric Covener [Sat, 22 Feb 2020 17:12:44 +0000 (17:12 +0000)]

propose contributed usertrack patch [skip ci]

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

commit | commitdiff | tree

Graham Leggett [Sat, 22 Feb 2020 00:21:52 +0000 (00:21 +0000)]

mpm_event: avoid possible KeepAlveTimeout off by -100 ms.

trunk patch: http://svn.apache.org/r1874277
2.4.x patch: svn merge -c 1874277 ^/httpd/httpd/trunk .

+1: ylavic, covener, minfrin

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

commit | commitdiff | tree

Graham Leggett [Sat, 22 Feb 2020 00:19:49 +0000 (00:19 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Graham Leggett [Sat, 22 Feb 2020 00:15:36 +0000 (00:15 +0000)]

Backported.

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

commit | commitdiff | tree

Graham Leggett [Sat, 22 Feb 2020 00:15:09 +0000 (00:15 +0000)]

mod_http2: Fix an empty APLOGNO()

trunk patch: http://svn.apache.org/r1873927
2.4.x patch: svn merge -c 1873927 ^/httpd/httpd/trunk .

+1: jailletc36, ylavic, minfrin

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

commit | commitdiff | tree

Graham Leggett [Sat, 22 Feb 2020 00:12:50 +0000 (00:12 +0000)]

Vote and promote.

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 09:45:11 +0000 (09:45 +0000)]

Backported in r1874134.

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:39:53 +0000 (00:39 +0000)]

Backported. [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:39:22 +0000 (00:39 +0000)]

Merge r1872036, r1872093, r1872102 from trunk:

Add a config layout for OpenWRT.

Align the OpenWRT config layout with the new kayout as defined by the project.

Correct the case on OpenWrt, the project prefers this capitalisation.

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:36:52 +0000 (00:36 +0000)]

Backported. [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:36:36 +0000 (00:36 +0000)]

Merge r1872042, r1872062 from trunk:

Add support for cross compiling to apxs. If apxs is being executed from somewhere
other than its target location, add that prefix to includes and library directories.
Without this, apxs would fail to find config_vars.mk and exit.

Allow instdso.sh to be found while cross compiling.

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:34:13 +0000 (00:34 +0000)]

Backported. [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:33:40 +0000 (00:33 +0000)]

Merge r1873985 from trunk:

Fix spelling errors found by codespell. [skip ci]

Submitted by: mrumph
Reviewed by: mrumph, jim, ylavic

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:10:24 +0000 (00:10 +0000)]

Backported. [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:10:01 +0000 (00:10 +0000)]

Merge r1873888 from trunk:

  *) mod_ssl: Disable client verification on ACME ALPN challenges. Fixes github
     issue mod_md#172 (https://github.com/icing/mod_md/issues/172).
     [Michael Kaufmann <mail michael-kaufmann.ch>, Stefan Eissing]

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

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:07:16 +0000 (00:07 +0000)]

Backported. [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Fri, 21 Feb 2020 00:06:05 +0000 (00:06 +0000)]

Merge r1861950 from trunk:

mod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+.

Reference: http://openssl.6102.n7.nabble.com/Shutting-down-openssl-is-the-correct-thing-to-do-nothing-td76857.html#a76862

Submitted by: minfrin
Reviewed by: minfrin, jim, ylavic

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

commit | commitdiff | tree

Eric Covener [Fri, 21 Feb 2020 00:05:08 +0000 (00:05 +0000)]

vote [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Thu, 20 Feb 2020 23:56:04 +0000 (23:56 +0000)]

Vote+promote. [skip ci]

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

commit | commitdiff | tree

Yann Ylavic [Thu, 20 Feb 2020 23:53:36 +0000 (23:53 +0000)]

Propose, vote+promote.

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

commit | commitdiff | tree

Joe Orton [Thu, 20 Feb 2020 08:50:16 +0000 (08:50 +0000)]

Transforms. [skip ci]

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

commit | commitdiff | tree

Joe Orton [Thu, 20 Feb 2020 08:47:24 +0000 (08:47 +0000)]

Merge r1874243 from trunk:

PKCS#11 URIs usable from 2.4.42 and later now. [skip ci]

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

commit | commitdiff | tree

Ruediger Pluem [Thu, 20 Feb 2020 07:07:37 +0000 (07:07 +0000)]

* Backported in r1874196, r1874201, r1874202 [skip ci]

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

commit | commitdiff | tree

Joe Orton [Wed, 19 Feb 2020 17:05:02 +0000 (17:05 +0000)]

Update mergeinfo. [skip ci]

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

commit | commitdiff | tree

Joe Orton [Wed, 19 Feb 2020 17:04:21 +0000 (17:04 +0000)]

Sync PKCS#11 docs from trunk. [skip ci]

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

commit | commitdiff | tree

Joe Orton [Wed, 19 Feb 2020 13:32:50 +0000 (13:32 +0000)]

Merge r1830819, r1830912, r1830913, r1830927, r1831168, r1831173, r1835240, r1835242, r1835615, r1836547 from trunk:

mod_ssl: Add support for loading private keys from ENGINEs.  Support
for PKCS#11 URIs only, and PIN entry is not threaded through
SSLPassPhraseDialog config yet.

* modules/ssl/ssl_util.c (modssl_is_engine_key): New function.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
  Use it, skip check for file existence for engine keys.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_pkey):
  New function.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs):
  For engine keys, load via modssl_load_engine_pkey.

* modules/ssl/ssl_util_ssl.c, modules/ssl/ssl_util_ssl.h:
  Remove modssl_read_encrypted_pkey() and helpers, added in r1804087
  but never used.

* modules/ssl/ssl_util_ssl.c (modssl_read_privatekey): Remove unused
  second argument.

* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey): Adjust
  accordingly.

Simplify the ssl_asn1_table API, remove abstraction (it is used only
to cache serialized EVP_PKEYs not any char * blobs), and document.

* modules/ssl/ssl_util.c (ssl_asn1_table_set): Take the EVP_PKEY and
  serialize internally.  Use ap_realloc.  Return the ssl_asn1_t *
  pointer.  Don't call apr_hash_set() for unchanged pointer case.

* modules/ssl/ssl_engine_pphrase.c (ssl_load_encrypted_pkey):
  Adjust for the above.

* modules/ssl/ssl_private.h: Adjust as above, add docs.

mod_ssl: Add support for loading TLS certificates through the PKCS#11
engine.

* modules/ssl/ssl_util.c (modssl_is_engine_id): Renamed
  from modssl_is_engine_key.

* modules/ssl/ssl_engine_config.c (ssl_cmd_SSLCertificateKeyFile):
  Adjust accordingly.
  (ssl_cmd_SSLCertificateFile): Also allow ENGINE cert ids.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair):
  Rename from modssl_load_engine_key; load certificate if
  cert id is passed.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Optionally
  load the certificate from the engine as well.

* docs/manual/: Update manual.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Add error
  logno. Free EVP_PKEY in engine case.  Never try reading ECDH/DH
  parameters from engine ids.

Hook up PKCS#11 PIN entry through configured passphrase entry method.

* modules/ssl/ssl_engine_pphrase.c: Add wrappers for OpenSSL UI * API
  around passphrase entry.
  (modssl_load_engine_keypair): Take vhost ID and use above rather than
  default OpenSSL UI.

* modules/ssl/ssl_engine_init.c (ssl_init_server_certs): Pass vhost ID.

Submitted by: Anderson Sasaki<ansaski redhat.com>, jorton

* modules/ssl/ssl_engine_pphrase.c: Add logno tags.

* modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair): Load
  the engine associated with the private key (&cert) explicitly
  rather than requiring the engine to be set as the default method
  for all operations (with "SSLCryptoDevice <engine>").

(Thanks to Anderson Sasaki <ansasaki redhat.com> for suggested
improvement and guidance)

* modules/ssl/ssl_engine_pphrase.c: Fix linking against OpenSSL without
  ENGINE support.

Submitted by: Anderson Sasaki <ansasaki redhat.com>, jorton
Reviewed by: jorton, jim, ylavic
Github: closes #92

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

commit | commitdiff | tree

Eric Covener [Wed, 19 Feb 2020 12:26:46 +0000 (12:26 +0000)]

the show goes on

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

commit | commitdiff | tree

Eric Covener [Wed, 19 Feb 2020 12:26:31 +0000 (12:26 +0000)]

add AP_REG_NO_DEFAULT to allow opt-out of pcre defaults

... and use it in mod_substitute to avoid DOTALL

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

commit | commitdiff | tree

Stefan Eissing [Wed, 19 Feb 2020 10:55:22 +0000 (10:55 +0000)]

Merge of r1874188 from trunk:

* mod_md: fix of version string

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

commit | commitdiff | tree

Mike Rumph [Tue, 18 Feb 2020 17:44:34 +0000 (17:44 +0000)]

Fix spelling errors in docs found by codespell. [skip ci]

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

commit | commitdiff | tree

Stefan Eissing [Mon, 17 Feb 2020 14:42:09 +0000 (14:42 +0000)]

Merged /httpd/httpd/trunk:r1870020,1874133

  *) mod_md:
     - Prefer MDContactEmail directive to ServerAdmin for registration. New directive
       thanks to Timothe Litt (@tlhackque).
     - protocol check for pre-configured "tls-alpn-01" challenge has been improved. It will now
       check all matching virtual hosts for protocol support. Thanks to @mkauf.
     - Corrected a check when OCSP stapling was configured for hosts
       where the responsible MDomain is not clear, by Michal Karm Babacek (@Karm).
     - Softening the restrictions where mod_md configuration directives may appear. This should
       allow for use in <If> and <Macro> sections. If all possible variations lead to the configuration
       you wanted in the first place, is another matter.
     [Michael Kaufmann <mail michael-kaufmann.ch>, Timothe Litt (@tlhackque),
      Michal Karm Babacek (@Karm), Stefan Eissing (@icing)]

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

commit | commitdiff | tree

Ruediger Pluem [Mon, 17 Feb 2020 08:31:22 +0000 (08:31 +0000)]

* Vote

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

commit | commitdiff | tree

Yann Ylavic [Sun, 16 Feb 2020 23:40:34 +0000 (23:40 +0000)]

Update proposal.

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

commit | commitdiff | tree

Yann Ylavic [Sat, 15 Feb 2020 19:33:23 +0000 (19:33 +0000)]

Propose to hold on accepted backport.

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

commit | commitdiff | tree

Christophe Jaillet [Sat, 15 Feb 2020 18:16:31 +0000 (18:16 +0000)]

Add a note

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

commit | commitdiff | tree

Yann Ylavic [Sat, 15 Feb 2020 17:38:11 +0000 (17:38 +0000)]

Vote, promote.

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

commit | commitdiff | tree

Jim Jagielski [Sat, 15 Feb 2020 16:38:27 +0000 (16:38 +0000)]

some votes

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

commit | commitdiff | tree

Ruediger Pluem [Fri, 14 Feb 2020 08:08:16 +0000 (08:08 +0000)]

* This actually a blocker as r1873747 introduced a regression

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

commit | commitdiff | tree

Mike Rumph [Thu, 13 Feb 2020 22:24:35 +0000 (22:24 +0000)]

Propose fix for spelling errors found by codespell. [skip ci]

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

commit | commitdiff | tree

Mike Rumph [Thu, 13 Feb 2020 18:53:00 +0000 (18:53 +0000)]

Add CHANGES entry for Travis CI testing. [skip ci]

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

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Feb 2020 14:44:09 +0000 (14:44 +0000)]

* Already addressed. Otherwise I was fine. [skip ci]

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

commit | commitdiff | tree

Ruediger Pluem [Wed, 12 Feb 2020 14:06:36 +0000 (14:06 +0000)]

* Add a comment [skip ci]

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

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