]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Stefan Eissing [Fri, 29 May 2020 10:24:13 +0000 (10:24 +0000)]
Merged /httpd/httpd/trunk:r1878233,
1878264
*) mod_proxy_http2: respect ProxyTimeout settings on backend connections
while waiting on incoming data. [Ruediger Pluem, Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1878266 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 May 2020 15:43:48 +0000 (15:43 +0000)]
vote and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1878236 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 28 May 2020 15:41:55 +0000 (15:41 +0000)]
proposing backport of r1878233.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1878235 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 25 May 2020 08:12:22 +0000 (08:12 +0000)]
* Vote and promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1878094 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 23 May 2020 13:20:09 +0000 (13:20 +0000)]
Remove some extra spaces in order to align on 4 spaces and synch with trunk.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1878058 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 21 May 2020 19:16:35 +0000 (19:16 +0000)]
Easy proposals
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1878010 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sat, 16 May 2020 18:34:08 +0000 (18:34 +0000)]
propose PR64365
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877831 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 May 2020 15:42:57 +0000 (15:42 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877822 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 16 May 2020 15:42:15 +0000 (15:42 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877821 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Sat, 16 May 2020 10:14:17 +0000 (10:14 +0000)]
Vote mod_http2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877804 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 15 May 2020 12:06:03 +0000 (12:06 +0000)]
proposing backport of
1877783
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877784 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 13 May 2020 20:45:09 +0000 (20:45 +0000)]
Merge r1877708 from trunk:
mention relative path behavior, offline question
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877709 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 May 2020 14:17:48 +0000 (14:17 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877535 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 9 May 2020 14:17:06 +0000 (14:17 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877534 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 5 May 2020 11:45:20 +0000 (11:45 +0000)]
Merge r1877394 from trunk:
clarify, context is still CGI only.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877395 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 May 2020 13:24:38 +0000 (13:24 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877298 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 2 May 2020 13:23:49 +0000 (13:23 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877297 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 28 Apr 2020 06:09:22 +0000 (06:09 +0000)]
Merge r1877119 from trunk:
* We have five providers [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1877120 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 23 Apr 2020 13:40:44 +0000 (13:40 +0000)]
Merged with apologies for making you go round twice rjung ;) [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876893 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 23 Apr 2020 13:39:49 +0000 (13:39 +0000)]
Merge r1876869 from trunk:
systemd dependencies are only needed by mod_systemd.
They should currently not be needed by httpd directly
or any other binary. So no need to add them to
HTTPD_LIBS.
Submitted by: rjung
Reviewed by: rjung, jim, jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876892 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 23 Apr 2020 13:35:25 +0000 (13:35 +0000)]
Votes. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876891 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 23 Apr 2020 12:33:29 +0000 (12:33 +0000)]
Merge r1876540 from trunk:
PR64295 cannot override default Virtualhost's mod_reqtimeout
of course only body=n can work the headers have to parsed to get the virtualhost.
Submitted by: jfclere
Reviewed by: jailletc36, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876888 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 23 Apr 2020 12:33:04 +0000 (12:33 +0000)]
Merge r1876484, r1876493 from trunk:
PR64313 htcacheclean: Empty directories in CacheRoot are still present even after using "-t"
* Whitespace style fixes. No functional change.
Submitted by: jfclere, rpluem
Reviewed by: jailletc36, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876887 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 23 Apr 2020 12:32:32 +0000 (12:32 +0000)]
Merge r1783041 from trunk:
default_handler: cleanup outputed brigade before leaving.
Submitted by: ylavic
Reviewed by: jailletc36, rpluem, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876886 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 23 Apr 2020 12:32:02 +0000 (12:32 +0000)]
Merge r1534995, r1560482, r1728779, r1805491, r1861528, r1868016, r1874470, r1874602, r1875769, r1875811 from trunk:
don't ignore some apr_procattr failures (clang scan-build)
doxygen improvements
Standardize order of "extern" and XXX_DECLARE_YYY.
Fix some compilation warning when MIME_MAGIC_DEBUG is defined.
warning: format ‘%x’ expects argument of type ‘unsigned int’, but argument <n> has type ‘<something> *’ [-Wformat=]
style: cmd_rec at the bottom
no functional change
Fix a typo in a message.
Reported and fixed by Christian Bartolomäus (bartolin gmx.de)
PR 63806
malloc -> ap_malloc
bz #63967
Slighly simplify code.
No need to set to NULL or 0 fields that are apr_pcalloc'ed.
Axe 'set_cookie_enable' and use 'ap_set_flag_slot' instead.
(based on ideas taken from r1874389)
Parentheses around AP_BUCKET_IS_EOR argument.
Fix a typo
Submitted by: trawick, rjung, jailletc36, covener, jailletc36, gbechis, jailletc36, ylavic, jailletc36
Reviewed by: jailletc36, gbechis, jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876885 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 23 Apr 2020 12:31:15 +0000 (12:31 +0000)]
and promote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876884 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Thu, 23 Apr 2020 12:30:41 +0000 (12:30 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876883 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 23 Apr 2020 10:29:46 +0000 (10:29 +0000)]
Porpose. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876875 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 23 Apr 2020 10:22:38 +0000 (10:22 +0000)]
r1876870 isn't under CTR.
So undo for now.
Will add to STATUS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876874 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Thu, 23 Apr 2020 08:56:23 +0000 (08:56 +0000)]
systemd dependencies are only needed by mod_systemd.
They should currently not be needed by httpd directly
or any other binary. So no need to add them to
HTTPD_LIBS.
Should be CTR (build system).
Backport of r1876869 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876870 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 20 Apr 2020 19:05:49 +0000 (19:05 +0000)]
Put post-release security entries underneath
2.4.43 instead of 2.4.44.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876764 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Fri, 17 Apr 2020 15:03:50 +0000 (15:03 +0000)]
vote and propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876668 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 17 Apr 2020 09:14:56 +0000 (09:14 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876660 13f79535 -47bb-0310-9956-
ffa450edef68
Steffen Land [Fri, 17 Apr 2020 08:08:21 +0000 (08:08 +0000)]
vote mod_http2 PR64330
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876654 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 16 Apr 2020 18:26:34 +0000 (18:26 +0000)]
Merge r1876623 from trunk:
Allow failures for the gcc9 build since the repo seems to have broken deps.
[under CTR for Travis stuff]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876627 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 16 Apr 2020 17:20:18 +0000 (17:20 +0000)]
backport proposal for PR64330
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876617 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 16 Apr 2020 09:35:09 +0000 (09:35 +0000)]
Add 2 proposals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876592 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 14 Apr 2020 07:44:15 +0000 (07:44 +0000)]
Merge r1875923, r1876479 from trunk:
For future debugging ease, output the Travis tag & branch.
Don't fail the Travis build for ppc64le jobs, which are also unreliable.
e.g. https://travis-ci.org/github/apache/httpd/jobs/
670727360
[under CTR for Travis-specific changes]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876481 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Fri, 10 Apr 2020 16:02:42 +0000 (16:02 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876376 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 5 Apr 2020 07:24:07 +0000 (07:24 +0000)]
easy proposals [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876144 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Apr 2020 14:03:02 +0000 (14:03 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876121 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 4 Apr 2020 14:02:00 +0000 (14:02 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876120 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 3 Apr 2020 19:43:19 +0000 (19:43 +0000)]
Merge r1874723 from trunk:
* Use a loop instead of recursion to iterate over pool siblings
Submitted by: rpluem
Reviewed by: rpluem (Backports of .gdbinit changes are CTR)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876102 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Wed, 1 Apr 2020 12:58:58 +0000 (12:58 +0000)]
Updates for announcement of 2.4.43
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1876001 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 31 Mar 2020 15:01:59 +0000 (15:01 +0000)]
rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875944 13f79535 -47bb-0310-9956-
ffa450edef68
Rich Bowen [Tue, 31 Mar 2020 14:42:21 +0000 (14:42 +0000)]
Apply fix for bz64167 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875942 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 29 Mar 2020 14:16:39 +0000 (14:16 +0000)]
Backport 3 small issues on mod_md.xml fixed on trunk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875858 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Sun, 29 Mar 2020 13:32:40 +0000 (13:32 +0000)]
xforms w/ manual tweak.
java6, add CRLF for doctype
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875855 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 28 Mar 2020 20:17:30 +0000 (20:17 +0000)]
Add some compatibility notes for new directives in 2.4.42.
Add some missing <module> and <directive> to improve navigation and style.
Fix the format of some <default>
Add some placeholders for the MDCertificateCheck and MDActivationDelay directives. (new in 2.4.42)
(r1875818 in trunk)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875819 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Mar 2020 14:31:55 +0000 (14:31 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875810 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 28 Mar 2020 14:30:52 +0000 (14:30 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875809 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 27 Mar 2020 16:49:14 +0000 (16:49 +0000)]
Merge r1875785 from trunk:
add userdir same-origin warnings to mod_userdir
Submitted By: Hanno Böck <hanno hboeck.de>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875786 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 26 Mar 2020 14:42:01 +0000 (14:42 +0000)]
Post 2.4.43 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875715 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 26 Mar 2020 14:41:57 +0000 (14:41 +0000)]
Get ready to tag httpd 2.4.43
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875713 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 26 Mar 2020 14:37:03 +0000 (14:37 +0000)]
*) mod_proxy_hcheck: Use is_ssl for wss and https.
trunk patch: http://svn.apache.org/r1875579
2.4.x patch: svn merge -c
1875579 ^/httpd/httpd/trunk .
+1: jfclere, gbechis, druggeri
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875712 13f79535 -47bb-0310-9956-
ffa450edef68
Daniel Ruggeri [Thu, 26 Mar 2020 14:35:40 +0000 (14:35 +0000)]
Vote
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875711 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 25 Mar 2020 15:36:27 +0000 (15:36 +0000)]
Merge r1875648 from trunk:
Drop -v from arm64 test runs and add to allowed failures, it is still
not as reliable as x86 builds.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875649 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 25 Mar 2020 15:06:20 +0000 (15:06 +0000)]
Trivial change to trigger Travis build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875646 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Tue, 24 Mar 2020 18:08:36 +0000 (18:08 +0000)]
Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875582 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Tue, 24 Mar 2020 16:41:31 +0000 (16:41 +0000)]
Add a backport proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875580 13f79535 -47bb-0310-9956-
ffa450edef68
Jim Jagielski [Tue, 24 Mar 2020 13:09:45 +0000 (13:09 +0000)]
2.4.42 was DOA
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875576 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2020 17:56:50 +0000 (17:56 +0000)]
Backported. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875554 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2020 17:56:10 +0000 (17:56 +0000)]
Merge r1875544 from trunk:
Fix compilation breakage with OpenSSL 1.1.0 up to 1.1.0f.
SSL_CTX_get_min_proto_version() and
SSL_CTX_get_max_proto_version() were only introduced in
1.1.0g.
Submitted by: rjung
Reviewedby: rjung, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875553 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2020 17:54:33 +0000 (17:54 +0000)]
Merge r1874577 from trunk:
mod_ssl: Fix memory leak of OCSP stapling response.
The OCSP_RESPONSE is either ignored or serialized (i2d_OCSP_RESPONSE) in the
TLS response/handshake extension, so it must be freed.
Submitted by: ylavic
Reviewed by: gbechis, rpluem, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875552 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 23 Mar 2020 17:51:27 +0000 (17:51 +0000)]
Vote, promote. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875551 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 23 Mar 2020 16:42:10 +0000 (16:42 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875547 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 23 Mar 2020 15:20:24 +0000 (15:20 +0000)]
Propose
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875545 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 23 Mar 2020 12:55:02 +0000 (12:55 +0000)]
Merge r1875540 from trunk:
Better define conditions for skipping tests on 2.4.x or non-2.4.x.
Use YAML anchors and references to avoid copy&pasting, hopefully
the syntax remains reasonably readable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875543 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Sun, 22 Mar 2020 12:12:21 +0000 (12:12 +0000)]
propose mod_ssl fix [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875516 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Mar 2020 14:04:49 +0000 (14:04 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875497 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 21 Mar 2020 14:03:41 +0000 (14:03 +0000)]
fr doc xml file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875496 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 20 Mar 2020 13:01:00 +0000 (13:01 +0000)]
committed
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875476 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 20 Mar 2020 13:00:44 +0000 (13:00 +0000)]
Merge r1875429 from trunk:
fix apxs for non-destdir builds
subtr(...,0, -1) chops off a character and leaves relative path.
(you will need to re-run configure)
Reviewed By: +1: covener, gbechis, rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875475 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 20 Mar 2020 12:15:59 +0000 (12:15 +0000)]
Merge r1875471, r1875472 from trunk:
Fix Travis trunk/master confusion, and make the i386 build
trunk-only, it has not been adjusted to find PCRE "v1" i386 packages.
Fix the travis syntax (should have done it in a PR...).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875474 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 20 Mar 2020 11:37:50 +0000 (11:37 +0000)]
Merge r1875469 from trunk:
Test exclsion doesn't work since "tag !~" matches when tag is undefined.
Exclude tests from 2.4.x by explicitly matching against master. Will
have to revisit this for 2.5.x.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1875470 13f79535 -47bb-0310-9956-
ffa450edef68
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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