]> git.ipfire.org Git - thirdparty/apache/httpd.git/log
thirdparty/apache/httpd.git
4 years agoPropose.
Yann Ylavic [Thu, 10 Dec 2020 16:54:32 +0000 (16:54 +0000)] 
Propose.

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

4 years agoVote, propose [skip ci]
Yann Ylavic [Tue, 8 Dec 2020 23:16:56 +0000 (23:16 +0000)] 
Vote, propose [skip ci]

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

4 years agoNominate. [skip ci]
Joe Orton [Mon, 30 Nov 2020 09:37:28 +0000 (09:37 +0000)] 
Nominate. [skip ci]

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 21 Nov 2020 13:38:00 +0000 (13:38 +0000)] 
fr doc rebuild.

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

4 years agofr doc XML files updates.
Lucien Gentis [Sat, 21 Nov 2020 13:36:43 +0000 (13:36 +0000)] 
fr doc XML files updates.

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

4 years agoinappropriate </dl> tag.
Lucien Gentis [Sat, 21 Nov 2020 13:32:03 +0000 (13:32 +0000)] 
inappropriate </dl> tag.

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

4 years agoDisable UBSan testing on 2.4.x since the various fixes are not
Joe Orton [Thu, 19 Nov 2020 11:28:08 +0000 (11:28 +0000)] 
Disable UBSan testing on 2.4.x since the various fixes are not
merged from trunk.

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

4 years agoMerge r1882776, r1882999, r1883072 from trunk:
Ruediger Pluem [Tue, 17 Nov 2020 20:21:20 +0000 (20:21 +0000)] 
Merge r1882776, r1882999, r1883072 from trunk:

* Two first tests using Ubuntu Focal

* Condition is not needed on Focal as the system APR (1.6) is recent enough for trunk [skip ci]

* Do UBSan testing on Focal now

Changes to .travis.yml are CTR on 2.4.x.

Submitted by: rpluem

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

4 years agoMerge r1883097 from trunk:
Jim Jagielski [Tue, 17 Nov 2020 15:04:40 +0000 (15:04 +0000)] 
Merge r1883097 from trunk:

mpm_event: don't reset connections after lingering close timeout

While httpd is supposed to do lingering close for incoming data, it has no
control anyway over outgoing/pending data once they are handled by the
system.

So don't reset the connection after lingering close times out, otherwise the
system won't do its own lingering close to flush un-acked data.

The connection reset was introduced by r1802875 and backported to 2.4.28.

Submitted by: ylavic
Reviewed by: ylavic, jorton, jim

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

4 years agoMerge r1883096 from trunk:
Jim Jagielski [Tue, 17 Nov 2020 15:04:12 +0000 (15:04 +0000)] 
Merge r1883096 from trunk:

mpm_event: don't kill keepalive connections on connections_above_limit().

Before r1819855 (backported to 2.4.30), mpm_event killed keepalive connections
only when workers were exhausted, while this commit set workers_were_busy for
connections_above_limit().

Restore prior to r1819855 behaviour, and since ap_queue_info_num_idlers() is
now part of connections_above_limit(), let's update workers_were_busy there
only when necessary.

Submitted by: ylavic
Reviewed by: ylavic, jorton, jim

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

4 years agoMerge r1873762, r1881263 from trunk:
Jim Jagielski [Tue, 17 Nov 2020 15:03:40 +0000 (15:03 +0000)] 
Merge r1873762, r1881263 from trunk:

add SameSite to RewriteRule ... ... [CO]

samesite: fix check for 0, add "false" alternative.

Submitted by: covener
Reviewed by: rpluem, gbechis, jim

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

4 years agoMerge r1877552 from trunk:
Jim Jagielski [Tue, 17 Nov 2020 15:01:09 +0000 (15:01 +0000)] 
Merge r1877552 from trunk:

mpm_event: reset listener_is_wakeable on reload.
Submitted by: ylavic
Reviewed by: ylavic, jorton, jim

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

4 years agoMerge r1776290, r1869399 from trunk:
Jim Jagielski [Tue, 17 Nov 2020 14:59:04 +0000 (14:59 +0000)] 
Merge r1776290, r1869399 from trunk:

let wstunnel run first

Since wstunnel can step aside based on the Upgrade: header.

mod_proxy: Add proxy check_trans hook.

This allows proxy modules to decline request handling at early stage.
Then mod_proxy_wstunnel can implement that hook to verify that an Upgrade
is requested, and otherwise hand over to mod_proxy_http.

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

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

4 years agomod_http2: Remove .gitignore. It is not present in trunk and
Jim Jagielski [Tue, 17 Nov 2020 14:55:29 +0000 (14:55 +0000)] 
mod_http2: Remove .gitignore. It is not present in trunk and
     contains problematic entries for our tree (especially Makefile.in).

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

4 years agopromote
Jim Jagielski [Tue, 17 Nov 2020 14:54:50 +0000 (14:54 +0000)] 
promote

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

4 years agoVote on some proposals
Jim Jagielski [Tue, 17 Nov 2020 14:54:04 +0000 (14:54 +0000)] 
Vote on some proposals

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

4 years agoVotes, [skip ci]
Joe Orton [Tue, 17 Nov 2020 10:02:18 +0000 (10:02 +0000)] 
Votes, [skip ci]

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

4 years agoMerge r1881620, r1881635 from trunk:
Ruediger Pluem [Mon, 16 Nov 2020 12:24:12 +0000 (12:24 +0000)] 
Merge r1881620, r1881635 from trunk:

Process early errors via a dummy HTTP/1.1 request as well

Process early errors via a dummy HTTP/1.1 request as well to ensure
that the request gets logged correctly and possible custom error
pages are considered. The previous way of directly sending a HTTP/2
answer with the HTTP status code appropriate for the error is more
efficient, but does not log the request nor sents a possible custom
error page.

* modules/http2/h2.h: Add http_status to h2_request struct and define
  H2_HTTP_STATUS_UNSET.

* modules/http2/h2_request.c(h2_request_create_rec): Check if
  http_status is set for the request and die with the
  status code it contains if set.

* modules/http2/h2_session.c(on_header_cb): Adjust the error condition
  now that we mark early errors via http_status: Only return an error
  if the status is not success and http_status is not H2_HTTP_STATUS_UNSET.

* modules/http2/h2_stream.c(set_error_response): Set http_status
  on the request instead of creating headers for a response and a
  respective brigade.

Github: closes #137

* Changelog for r1881620

Submitted by: rpluem
Reviewed by: rpluem, giovanni, ylavic

Github: closes #142

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

4 years agoPropose, vote, promote. [skip ci]
Yann Ylavic [Mon, 16 Nov 2020 12:01:43 +0000 (12:01 +0000)] 
Propose, vote, promote. [skip ci]

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

4 years agoBackport:
Christophe Jaillet [Sat, 14 Nov 2020 09:01:13 +0000 (09:01 +0000)] 
Backport:
   - r1859106: Axe some outdated compatibility notes
   - r1878824: Add some html syntax highlight to a piece of code. + some missing links
   - r1878825: Fix typo in r1878824

Remove some trainling space to synch with trunk

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

4 years agoExplain limitation of UnDefine syntax as already noted in Define.
Christophe Jaillet [Sat, 14 Nov 2020 08:41:27 +0000 (08:41 +0000)] 
Explain limitation of UnDefine syntax as already noted in Define.
Increase visibility of a warning, to be consistent with Define

PR 64909

(r1883417 in trunk) [skip ci]

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

4 years agoRemove a useless and erroneous precision about the upper limit of LimitRequestFields.
Christophe Jaillet [Sat, 14 Nov 2020 07:35:48 +0000 (07:35 +0000)] 
Remove a useless and erroneous precision about the upper limit of LimitRequestFields.

While at it, improve an unrelated syntax highlight somewhere else.

 [skip ci]
(r1883412 in trunk)

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

4 years agoFix 2 typo [skip ci]
Christophe Jaillet [Sat, 14 Nov 2020 07:04:18 +0000 (07:04 +0000)] 
Fix 2 typo [skip ci]

(r1883410 in trunk)

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

4 years agoFix a misleading typo
Christophe Jaillet [Mon, 9 Nov 2020 07:04:46 +0000 (07:04 +0000)] 
Fix a misleading typo

(r1882219 in trunk)

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

4 years agofr doc rebuild.
Lucien Gentis [Sun, 8 Nov 2020 17:34:17 +0000 (17:34 +0000)] 
fr doc rebuild.

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

4 years agofr doc translation update.
Lucien Gentis [Sun, 8 Nov 2020 17:33:26 +0000 (17:33 +0000)] 
fr doc translation update.

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

4 years agofr doc rebuild.
Lucien Gentis [Sat, 7 Nov 2020 15:36:54 +0000 (15:36 +0000)] 
fr doc rebuild.

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

4 years agofr doc XML files updates.
Lucien Gentis [Sat, 7 Nov 2020 15:35:59 +0000 (15:35 +0000)] 
fr doc XML files updates.

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

4 years agovote and propose [skip ci]
Giovanni Bechis [Mon, 2 Nov 2020 18:24:15 +0000 (18:24 +0000)] 
vote and propose [skip ci]

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

4 years agoRebuild
Christophe Jaillet [Sun, 1 Nov 2020 12:42:53 +0000 (12:42 +0000)] 
Rebuild

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

4 years agoAdd some mod_proxy_uwsgi related tweaks
Christophe Jaillet [Sun, 1 Nov 2020 12:39:39 +0000 (12:39 +0000)] 
Add some mod_proxy_uwsgi related tweaks

(r1883045 in trunk)

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

4 years agorebuild
Christophe Jaillet [Sun, 1 Nov 2020 12:15:19 +0000 (12:15 +0000)] 
rebuild

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

4 years agoFix a typo
Christophe Jaillet [Sun, 1 Nov 2020 12:13:33 +0000 (12:13 +0000)] 
Fix a typo

(r1883040 on trunk)

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

4 years agoAdd my vote.
Jean-Frederic Clere [Tue, 27 Oct 2020 07:51:43 +0000 (07:51 +0000)] 
Add my vote.

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

5 years agoMerged /httpd/httpd/trunk:r1882542
Stefan Eissing [Thu, 15 Oct 2020 13:48:39 +0000 (13:48 +0000)] 
Merged /httpd/httpd/trunk:r1882542

  *) mod_md: lowered the required minimal libcurl version from 7.50 to 7.29
     as proposed by <alexander.gerasimov@codeit.pro>.

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

5 years agoRussian doc - deleting obsolete file.
Lucien Gentis [Tue, 13 Oct 2020 11:36:08 +0000 (11:36 +0000)] 
Russian doc - deleting obsolete file.

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

5 years agoRebuild all doc for russian integration.
Lucien Gentis [Tue, 13 Oct 2020 11:30:03 +0000 (11:30 +0000)] 
Rebuild all doc for russian integration.

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

5 years agoRussian doc - deleting obsolete file.
Lucien Gentis [Tue, 13 Oct 2020 11:26:42 +0000 (11:26 +0000)] 
Russian doc - deleting obsolete file.

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

5 years agoRussian doc rebuild.
Lucien Gentis [Tue, 13 Oct 2020 11:25:34 +0000 (11:25 +0000)] 
Russian doc rebuild.

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

5 years agoRussian doc - first files added.
Lucien Gentis [Tue, 13 Oct 2020 11:20:30 +0000 (11:20 +0000)] 
Russian doc - first files added.

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

5 years agoRussian doc - from KOI8-R to UTF-8
Lucien Gentis [Tue, 13 Oct 2020 11:08:37 +0000 (11:08 +0000)] 
Russian doc - from KOI8-R to UTF-8

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 3 Oct 2020 13:47:25 +0000 (13:47 +0000)] 
fr doc rebuild.

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

5 years agofr doc XML file update.
Lucien Gentis [Sat, 3 Oct 2020 13:46:23 +0000 (13:46 +0000)] 
fr doc XML file update.

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

5 years agofr doc XML file update.
Lucien Gentis [Sat, 3 Oct 2020 13:43:47 +0000 (13:43 +0000)] 
fr doc XML file update.

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

5 years agoxforms
Christophe Jaillet [Fri, 2 Oct 2020 16:25:55 +0000 (16:25 +0000)] 
xforms

[skip ci]

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

5 years agoFix a typo.
Christophe Jaillet [Fri, 2 Oct 2020 16:25:02 +0000 (16:25 +0000)] 
Fix a typo.
One should always ./build.sh before commiting changes :-(

[skip ci]

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

5 years agoDocument that HTTPS and SSL_TLS_SNI environment variables are always defined, regardl...
Christophe Jaillet [Fri, 2 Oct 2020 16:04:28 +0000 (16:04 +0000)] 
Document that HTTPS and SSL_TLS_SNI environment variables are always defined, regardless of 'SSLOptions StdEnvVars' .

Fix some small style issues to improve syntax hightlight.

PR 64783.
r1882199 on trunk [skip ci]

While at it synch with trunk:
   - fix two typos
   - remove some trailing space
   - do not use <em> tags for 'on|off' parameters

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

5 years agoRemove backported entries [skip ci]
Christophe Jaillet [Fri, 25 Sep 2020 21:16:09 +0000 (21:16 +0000)] 
Remove backported entries [skip ci]

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

5 years agoMerge r1874011, r1874055, r1874062 from trunk
Christophe Jaillet [Fri, 25 Sep 2020 21:14:33 +0000 (21:14 +0000)] 
Merge r1874011, r1874055, r1874062 from trunk

   * event, worker: avoid UBSan exception calling memcpy(,NULL,0) at startup.

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

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

5 years agoMerge r1880500, r1880501, r1880509 from trunk
Christophe Jaillet [Fri, 25 Sep 2020 21:06:48 +0000 (21:06 +0000)] 
Merge r1880500, r1880501, r1880509 from trunk

   * Slightly speed-up the execution of the test framework.

Submitted by: jailletc36
Reviewed by: jailletc36, rpluem, jorton
Backported by: jailletc36

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

5 years agoPropose [skip ci]
Christophe Jaillet [Fri, 25 Sep 2020 20:53:20 +0000 (20:53 +0000)] 
Propose [skip ci]

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

5 years ago* Propose
Ruediger Pluem [Tue, 15 Sep 2020 12:44:06 +0000 (12:44 +0000)] 
* Propose

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

5 years agoMerge r1880602, r1881396 from trunk: [under CTR for Travis changes]
Joe Orton [Tue, 15 Sep 2020 08:50:59 +0000 (08:50 +0000)] 
Merge r1880602, r1881396 from trunk: [under CTR for Travis changes]

Fail for more abort() errors in error_log.
Fail if a core dump is produced, and dump the backtrace if so.
(e.g. during parent or child process shutdown, core dumps will
not show up as test case failures so would not otherwise be caught)

Catch assert() failures.

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

5 years agoMerge r1879822, r1879831, r1879840 from trunk:
Ruediger Pluem [Tue, 15 Sep 2020 07:19:13 +0000 (07:19 +0000)] 
Merge r1879822, r1879831, r1879840 from trunk:

Add a new way to document changes

* Makefile.in: Define the update-changes target to merge the change files
  from the changes directory to the top of the CHANGES file and remove
  them afterwards. If a Subversion binary was found during configure try
  to svn rm them otherwise just delete them.

* configure.in: Search for the Subversion binary.

* acinclude.m4: Set the corresponding Makefile variable for the Subversion
  binary.

* README.CHANGES: New file to document the new approach.

Can we have mercy with people working on case-preserving file systems?

Consider case insensitive filessystems

Consider case insensitive filessystems and thus choose a new non conflicting
name for the directory to store CHANGES entries.

Reviewed by: rpluem, jim, jorton

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

5 years ago* Promote [skip ci]
Ruediger Pluem [Tue, 15 Sep 2020 07:15:38 +0000 (07:15 +0000)] 
* Promote [skip ci]

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

5 years ago1xDone, 2xVote, +[skip ci]
Joe Orton [Mon, 14 Sep 2020 13:20:06 +0000 (13:20 +0000)] 
1xDone, 2xVote, +[skip ci]

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

5 years agoMerge r1870095, r1870097, r1880927 from trunk:
Joe Orton [Mon, 14 Sep 2020 13:16:54 +0000 (13:16 +0000)] 
Merge r1870095, r1870097, r1880927 from trunk:

Buffer HTTP request bodies for TLSv1.3 PHA in the same way as for
TLSv<1.3 renegotiation.

* modules/ssl/ssl_engine_kernel.c (fill_reneg_buffer): Factor
  out...
  (ssl_hook_Access_classic): ... from here.
  (ssl_hook_Access_modern): Use it here too.

Add logno.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access_modern): Move
  fill_reneg_buffer() call down after r->connection->master
  check.

Submitted by: jorton
Reviewed by: jorton, rpluem, gbechis

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

5 years agoVote. [skip ci]
Joe Orton [Mon, 14 Sep 2020 11:00:02 +0000 (11:00 +0000)] 
Vote. [skip ci]

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

5 years agovote [skip ci]
Giovanni Bechis [Wed, 9 Sep 2020 15:02:25 +0000 (15:02 +0000)] 
vote [skip ci]

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

5 years ago* Vote
Ruediger Pluem [Mon, 31 Aug 2020 06:47:12 +0000 (06:47 +0000)] 
* Vote

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

5 years agoPropose
Christophe Jaillet [Sun, 30 Aug 2020 20:48:58 +0000 (20:48 +0000)] 
Propose

[skip ci]

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 29 Aug 2020 14:42:31 +0000 (14:42 +0000)] 
fr doc rebuild.

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

5 years agofr doc XML file update.
Lucien Gentis [Sat, 29 Aug 2020 14:41:22 +0000 (14:41 +0000)] 
fr doc XML file update.

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

5 years ago* Add proposal
Ruediger Pluem [Fri, 28 Aug 2020 06:40:15 +0000 (06:40 +0000)] 
* Add proposal

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

5 years agoMerge r1859213 from trunk:
Ruediger Pluem [Mon, 24 Aug 2020 15:39:56 +0000 (15:39 +0000)] 
Merge r1859213 from trunk:

* Only do one retry to be more in line with the other modules.

Note: mod_proxy_http2 is still experimental and thus CTR even for backports.

Reviewed by: rpluem

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

5 years agoxforms. [skip ci]
Rainer Jung [Tue, 18 Aug 2020 10:14:04 +0000 (10:14 +0000)] 
xforms. [skip ci]

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

5 years agoDocument limitations for private key format in
Rainer Jung [Tue, 18 Aug 2020 10:13:35 +0000 (10:13 +0000)] 
Document limitations for private key format in
SSLProxyMachineCertificateFile and
SSLProxyMachineCertificatePath. PR 63935.

Backport of r1880958 from trunk.

[skip ci]

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

5 years ago* Vote [skip ci]
Ruediger Pluem [Mon, 17 Aug 2020 15:31:16 +0000 (15:31 +0000)] 
* Vote [skip ci]

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

5 years ago* Vote and promote [skip ci]
Ruediger Pluem [Mon, 17 Aug 2020 13:37:54 +0000 (13:37 +0000)] 
* Vote and promote [skip ci]

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

5 years agoAdd another rev for mod_ssl TLSv1.3 buffering fix, and reset vote.
Joe Orton [Mon, 17 Aug 2020 12:53:28 +0000 (12:53 +0000)] 
Add another rev for mod_ssl TLSv1.3 buffering fix, and reset vote.

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

5 years ago* Vote and promote [skip ci]
Ruediger Pluem [Mon, 17 Aug 2020 11:57:14 +0000 (11:57 +0000)] 
* Vote and promote [skip ci]

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

5 years agoPropose.
Christophe Jaillet [Sun, 16 Aug 2020 14:17:11 +0000 (14:17 +0000)] 
Propose.
(no vote from me, I don't know how to test)

[skip ci]

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

5 years agofr doc rebuild.
Lucien Gentis [Sat, 15 Aug 2020 13:52:18 +0000 (13:52 +0000)] 
fr doc rebuild.

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

5 years agofr doc XML files updates.
Lucien Gentis [Sat, 15 Aug 2020 13:51:15 +0000 (13:51 +0000)] 
fr doc XML files updates.

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

5 years agoMerge r1879878 from trunk:
Jim Jagielski [Tue, 11 Aug 2020 12:09:44 +0000 (12:09 +0000)] 
Merge r1879878 from trunk:

Avoid NULL pointer dereferences for empty environment variable values
Submitted by: rpluem
Reviewed by: jailletc36, covener, gbechis, jim

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

5 years agoMerge r1609680, r1609688, r1641381, r1826289, r1826313, r1878467, r1878994, r1879000...
Jim Jagielski [Tue, 11 Aug 2020 12:05:11 +0000 (12:05 +0000)] 
Merge r1609680, r1609688, r1641381, r1826289, r1826313, r1878467, r1878994, r1879000, r1879001, r1879002, r1879361 from trunk:

mod_proxy: add ap_proxy_define_match_worker() and use it for ProxyPassMatch
and ProxyMatch section to distinguish between normal workers and workers
with regex substitutions in the name. Implement handling of such workers
in ap_proxy_get_worker(). PR 43513

mod_proxy: better check for worker->s->is_name_matchable

Return a match whenever we get to the end of the worker name, regardless
of whether there is URL left.

ProxyPassMatch had been using the default worker in trunk.

Follow up to r1609680: simpler/faster ap_proxy_strcmp_ematch().

No functional change.

Follow up to r1609680: further simplify/optimize ap_proxy_strcmp_ematch().

While at it, same treatment for its mother ap_strcmp_match().

make sure the $n of the regular expressions is not included the name of the worker.
for example,  the example:
ProxyPassMatch "^(/.*\.gif)$" "http://backend.example.com:8000$1"
was giving:
AH00526: Syntax error on line nnn of bla/conf/httpd.conf:
ProxyPass Unable to parse URL: http://backend.example.com:8000$1

ap_proxy_define_match_worker: don't copy the url unnecessarily.

And save a few cycles, when the duplication is needed, by not copying
the ignored part.

ap_proxy_define_match_worker: disable connection reuse by default.

To avoid compat issues with dns/connection reuse now that a worker with
dollar substitution can be elected.

CHANGES entry for ap_proxy_define_match_worker().

Oups, axe spurious copypasta.

mod_proxy: unfail mixed ProxyPass/<Proxy> and ProxyPassMatch/<ProxyMatch>.

It is not a failure in current 2.4.x, so to ease backport and to avoid compat
breakage simply warn about the second directive being ignored.

This commit can be reverted in trunk if we want next versions to fail in this
case.

[Reverted by r1879363]

Submitted by: jkaluza, covener, ylavic, ylavic, jfclere, ylavic, ylavic, ylavic, ylavic, ylavic
Reviewed by: ylavic, minfrin (with an MMN bump), jim (agree w/ minfrin)

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

5 years agopromote
Jim Jagielski [Tue, 11 Aug 2020 11:59:46 +0000 (11:59 +0000)] 
promote

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

5 years agovotes
Jim Jagielski [Tue, 11 Aug 2020 11:58:55 +0000 (11:58 +0000)] 
votes

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

5 years agoAdd proposal.
Rainer Jung [Mon, 10 Aug 2020 20:06:31 +0000 (20:06 +0000)] 
Add proposal.

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

5 years agovote [skip ci]
Giovanni Bechis [Mon, 10 Aug 2020 15:11:15 +0000 (15:11 +0000)] 
vote [skip ci]

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

5 years agomore similar to trunk
Eric Covener [Sun, 9 Aug 2020 19:12:44 +0000 (19:12 +0000)] 
more similar to trunk

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

5 years agoxform
Eric Covener [Sun, 9 Aug 2020 19:11:17 +0000 (19:11 +0000)] 
xform

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

5 years agoadd 2.4 examples of mixed http/ws
Eric Covener [Sun, 9 Aug 2020 19:11:11 +0000 (19:11 +0000)] 
add 2.4 examples of mixed http/ws

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

5 years agowstunnel flexibility
Eric Covener [Sun, 9 Aug 2020 16:49:45 +0000 (16:49 +0000)] 
wstunnel flexibility

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

5 years agoold vote
Eric Covener [Sun, 9 Aug 2020 16:44:11 +0000 (16:44 +0000)] 
old vote

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

5 years agor1880670 put these in the wrong section
Eric Covener [Sun, 9 Aug 2020 16:43:40 +0000 (16:43 +0000)] 
r1880670  put these in the wrong section

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

5 years agoadd CVE
Eric Covener [Fri, 7 Aug 2020 11:50:14 +0000 (11:50 +0000)] 
add CVE

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

5 years agoUpdates for announcement of 2.4.46
Daniel Ruggeri [Fri, 7 Aug 2020 11:44:09 +0000 (11:44 +0000)] 
Updates for announcement of 2.4.46

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

5 years agoupdate transformations.
Nilgun Belma Buguner [Wed, 5 Aug 2020 01:17:12 +0000 (01:17 +0000)] 
update transformations.

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

5 years agoupdate for sync with English doc.
Nilgun Belma Buguner [Wed, 5 Aug 2020 01:11:03 +0000 (01:11 +0000)] 
update for sync with English doc.

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

5 years agoNominate. [skip ci]
Joe Orton [Mon, 3 Aug 2020 10:11:35 +0000 (10:11 +0000)] 
Nominate. [skip ci]

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

5 years agoAdjust wording to match the fix better
Daniel Ruggeri [Sat, 1 Aug 2020 14:19:54 +0000 (14:19 +0000)] 
Adjust wording to match the fix better

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

5 years agoPost 2.4.46 tag updates
Daniel Ruggeri [Sat, 1 Aug 2020 14:09:34 +0000 (14:09 +0000)] 
Post 2.4.46 tag updates

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

5 years agoGet ready to tag httpd 2.4.46
Daniel Ruggeri [Sat, 1 Aug 2020 14:09:25 +0000 (14:09 +0000)] 
Get ready to tag httpd 2.4.46

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

5 years agoNote the one change with 2.4.46 before reroll
Daniel Ruggeri [Sat, 1 Aug 2020 14:06:07 +0000 (14:06 +0000)] 
Note the one change with 2.4.46 before reroll

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

5 years agoNot released
Daniel Ruggeri [Thu, 30 Jul 2020 20:29:35 +0000 (20:29 +0000)] 
Not released

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

5 years agoMerge r1880453 from trunk:
Joe Orton [Thu, 30 Jul 2020 15:26:15 +0000 (15:26 +0000)] 
Merge r1880453 from trunk:

For non-trunk run a simpler APLOGNO() test using grep which
only catches missing arguments, but this is better than nothing.

[under CTR for Travis changes]

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

5 years agoBackport r1877830 which is missing in r1879525
Christophe Jaillet [Thu, 30 Jul 2020 10:04:47 +0000 (10:04 +0000)] 
Backport r1877830  which is missing in r1879525

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

5 years agoPropose
Christophe Jaillet [Wed, 29 Jul 2020 16:00:07 +0000 (16:00 +0000)] 
Propose

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

5 years agoPost 2.4.45 tag updates
Daniel Ruggeri [Wed, 29 Jul 2020 15:22:31 +0000 (15:22 +0000)] 
Post 2.4.45 tag updates

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