]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Joe Orton [Fri, 7 Jul 2023 12:05:33 +0000 (12:05 +0000)]
Merge r1909241 from trunk:
* Add server directory to include path as mod_rewrite requires test_char.h.
PR: 66571
Submitted by: Valeria Petrov <valeria.petrov@spinetix.com>
Reviewed by: rpluem, icing, ylavic
Submitted by: rpluem
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910855 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 7 Jul 2023 12:04:17 +0000 (12:04 +0000)]
Merge r1908502 from trunk:
mod_http2: Fix memory leak in calc_sha256_hash().
Submitted by: ylavic
Reviewed by: icing, jorton, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910854 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 7 Jul 2023 12:03:32 +0000 (12:03 +0000)]
Merge r1878890 from trunk:
mod_ldap: Use the LDAP API directly to implement the rebind callback
for modern versions of OpenLDAP, avoiding the overhead of the apr-util
implementation.
* modules/ldap/util_ldap.c:
Define USE_APR_LDAP_REBIND if a modern version of OpenLDAP is used.
(uldap_rebind_proc): New function.
(uldap_rebind_init, uldap_rebind_add): Define, using either the
callback or the (bad) APR-util versions.
(uldap_connection_unbind): Clear the rebind pool to remove rebind
references prior to destroying the LDAP *.
Omit for !USE_APR_LDAP_REBIND.
(uldap_connection_init): Use new wrappers, only create the rebind
pool if USE_APR_LDAP_REBIND.
* include/util_ldap.h: Don't include apr_ldap_rebind.h here.
PR: 64414
Github: closes #124
Reviewed by: jorton, covener, ylavic (by inspection)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910853 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 7 Jul 2023 11:58:42 +0000 (11:58 +0000)]
Merge r1910815 from trunk:
mod_rewrite: Fix a possible NULL pointer dereference in hook_uri2file
is_absolute_uri() dereferences r->filename in the function body, but
there is no check if r->filename == NULL before.
Submitted by: Luboš Uhliarik <luhliari redhat.com>
Reviewed by: jorton, covener, ylavic
Github: closes #355
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910852 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 7 Jul 2023 11:47:15 +0000 (11:47 +0000)]
Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910851 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 7 Jul 2023 11:33:44 +0000 (11:33 +0000)]
vote/promote
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910850 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 7 Jul 2023 07:47:31 +0000 (07:47 +0000)]
Merge, vote, propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910840 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 7 Jul 2023 07:25:14 +0000 (07:25 +0000)]
Reference correct PR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910838 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 6 Jul 2023 20:46:50 +0000 (20:46 +0000)]
Fix some typo in CHANGES entry
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910831 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Thu, 6 Jul 2023 20:41:34 +0000 (20:41 +0000)]
Unless I missed somthing:
- H2StreamTimeout has been introduced in 2.4.55
- H2MaxDataFrameLen and H2MaxDataFrameLen will be available in the next 2.4.58.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910828 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 6 Jul 2023 16:11:56 +0000 (16:11 +0000)]
Merge r1875355 from trunk:
* modules/ssl/ssl_util_stapling.c (stapling_check_response) Don't stop
Certificate Revoked messages.
Certificate Revoked Responder messages don't belong to 'error' class.
When the server receives one, it MUST be passed on to the client.
And stored for the normal period of basic responses.
Also don't log an error each time it is retrieved from cache,
only once when it is retrieved from the OCSP responder.
PR: 60182
Obtained from: https://github.com/apache/httpd/commit/
7db9795f45fd4688ceb13ee36090e4e2becbc709 .diff
Submitted by: <gmoniker gmail.com>
Reviewed by: gbechis, icing, ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910820 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Thu, 6 Jul 2023 11:44:43 +0000 (11:44 +0000)]
Propose x1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910813 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Jul 2023 13:31:43 +0000 (13:31 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910727 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Jul 2023 13:30:57 +0000 (13:30 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910726 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Fri, 30 Jun 2023 13:53:57 +0000 (13:53 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910710 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 30 Jun 2023 13:06:05 +0000 (13:06 +0000)]
re-propose rewrite qsa
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910708 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 30 Jun 2023 07:52:50 +0000 (07:52 +0000)]
propose r1908502 for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910700 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 30 Jun 2023 07:22:40 +0000 (07:22 +0000)]
backport of https://github.com/apache/httpd/pull/364
Merge
1907696 ,
1907697 from trunk:
*) mod_http2: new directive 'H2MaxDataFrameLen n' to limit the maximum
amount of response body bytes put into a single HTTP/2 DATA frame.
Setting this to 0 places no limit (but the max size allowed by the
protocol is observed).
The module, by default, tries to use the maximum size possible, which is
somewhat around 16KB. This sets the maximum. When less response data is
available, smaller frames will be sent.
Merge r1909769 from trunk (plus sync mod_http2.xml)
*) mod_http2: v2.0.15 with the following fixes and improvements
- New directive 'H2EarlyHint name value' to add headers to a response,
picked up already when a "103 Early Hints" response is sent. 'name' and
'value' must comply to the HTTP field restrictions.
This directive can be repeated several times and header fields of the
same names add. Sending a 'Link' header with 'preload' relation will
also cause a HTTP/2 PUSH if enabled and supported by the client.
- Fixed an issue where requests were not logged and accounted in a timely
fashion when the connection returns to "keepalive" handling, e.g. when
the request served was the last outstanding one.
This led to late appearance in access logs with wrong duration times
reported.
- Accurately report the bytes sent for a request in the '%O' Log format.
This addresses #203, a long outstanding issue where mod_h2 has reported
numbers over-eagerly from internal buffering and not what has actually
been placed on the connection.
The numbers are now the same with and without H2CopyFiles enabled.
Merge r1910157 from trunk
* mod_proxy_http2: fixed using the wrong "bucket_alloc" from the backend
connection when sending data on the frontend one. This caused crashes
or infinite loops in rare situations.
* mod_proxy_http2: fixed a bug in retry/response handling that could lead
to wrong status codes or HTTP messages send at the end of response bodies
exceeding the announced content-length.
* mod_proxy_http2: fix retry handling to not leak temporary errors.
On detecting that that an existing connection was shutdown by the other
side, a 503 response leaked even though the request was retried on a
fresh connection.
* mod_http2: fixed a bug that did cleanup of consumed and pending buckets in
the wrong order when a bucket_beam was destroyed.
Merge of
1910331 ,
1910386 ,
1910441 from trunk
*) mod_http2: fixed a bug in flushing pending data on an already closed
connection that could lead to a busy loop, preventing the HTTP/2 session
to close down successfully. Fixed PR 66624.
Fixed a bug that could lead to a crash in main connection
output handling. This occured only when the last request on a HTTP/2
connection had been processed and the session decided to shut down.
This could lead to an attempt to send a final GOAWAY while the previous
write was still in progress. See PR 66646.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910699 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 29 Jun 2023 15:39:13 +0000 (15:39 +0000)]
Dubious comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910693 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 29 Jun 2023 13:51:36 +0000 (13:51 +0000)]
need to repropose
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910691 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 29 Jun 2023 13:48:49 +0000 (13:48 +0000)]
Vote, promote, comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910690 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 28 Jun 2023 11:10:26 +0000 (11:10 +0000)]
votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910655 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 28 Jun 2023 10:41:05 +0000 (10:41 +0000)]
maybe premature, but better than deleting
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910652 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 27 Jun 2023 14:36:47 +0000 (14:36 +0000)]
propose PR66672
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910635 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Tue, 27 Jun 2023 09:54:51 +0000 (09:54 +0000)]
propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910626 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Tue, 27 Jun 2023 09:43:43 +0000 (09:43 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910625 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 20 Jun 2023 11:42:38 +0000 (11:42 +0000)]
Cumulative mod_http2 and mod_proxy_http2 patch proposed for backport,
replacing the independant merge proposals.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910505 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 20 Jun 2023 10:49:37 +0000 (10:49 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910504 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 20 Jun 2023 10:48:57 +0000 (10:48 +0000)]
Merge of
1909215 from trunk
*) cmake build, improve libcurl detection (github PR 356)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910503 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 20 Jun 2023 10:48:06 +0000 (10:48 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910502 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 20 Jun 2023 10:47:27 +0000 (10:47 +0000)]
Merge of
1909932 ,
1909982 from trunk
*) mod_http2: avoid double chunked-encoding on internal redirects.
PR 66597 [Yann Ylavic, Stefan Eissing]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910501 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 16 Jun 2023 11:08:46 +0000 (11:08 +0000)]
* My question does not prevent my vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910450 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 16 Jun 2023 11:04:17 +0000 (11:04 +0000)]
* Add comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910449 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 16 Jun 2023 11:01:03 +0000 (11:01 +0000)]
* Add comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910448 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 16 Jun 2023 10:58:09 +0000 (10:58 +0000)]
* Promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910447 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 16 Jun 2023 08:21:14 +0000 (08:21 +0000)]
update backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910442 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 13 Jun 2023 14:39:11 +0000 (14:39 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910387 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jun 2023 15:00:18 +0000 (15:00 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910343 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 10 Jun 2023 14:59:01 +0000 (14:59 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910342 13f79535 -47bb-0310-9956-
ffa450edef68
Giovanni Bechis [Fri, 9 Jun 2023 15:17:52 +0000 (15:17 +0000)]
vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910333 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 9 Jun 2023 15:06:38 +0000 (15:06 +0000)]
backport propoosal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910332 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 9 Jun 2023 14:25:26 +0000 (14:25 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910330 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 9 Jun 2023 12:58:55 +0000 (12:58 +0000)]
* Vote and comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910327 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 9 Jun 2023 11:24:45 +0000 (11:24 +0000)]
* Add proposal [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910325 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 6 Jun 2023 10:39:35 +0000 (10:39 +0000)]
Merge r1910253 from trunk:
there is a separate `connectiontimeout`
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910254 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 4 Jun 2023 14:19:25 +0000 (14:19 +0000)]
Backport proposal.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910223 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 4 Jun 2023 13:52:00 +0000 (13:52 +0000)]
Propose some easy backports to synch with trunk.
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910221 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Jun 2023 13:46:42 +0000 (13:46 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910205 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 3 Jun 2023 13:45:51 +0000 (13:45 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910204 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Jun 2023 14:16:43 +0000 (14:16 +0000)]
tests: allow for alternate exit code by curl on HTTP/2 errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910170 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Jun 2023 14:04:59 +0000 (14:04 +0000)]
CI: same issue in HTTP2 test runner with cache APR build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910168 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Jun 2023 14:01:51 +0000 (14:01 +0000)]
tests, sync tests from trunk with skips for features/fixes awaiting backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910167 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 1 Jun 2023 10:42:13 +0000 (10:42 +0000)]
propose backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1910158 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 22 May 2023 14:18:14 +0000 (14:18 +0000)]
Merge r1909989 from trunk:
*) mod_proxy_http2: fix retry handling to not leak temporary errors.
On detecting that that an existing connection was shutdown by the other
side, a 503 response leaked even though the request was retried on a
fresh connection.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909992 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 22 May 2023 13:53:11 +0000 (13:53 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909985 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Mon, 22 May 2023 13:16:34 +0000 (13:16 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909983 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 21 May 2023 11:29:37 +0000 (11:29 +0000)]
The default value of FlushMaxThreshold is defined as AP_FLUSH_MAX_THRESHOLD, which is 65535.
(r1909959 in trunk)
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909960 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 15 May 2023 13:39:04 +0000 (13:39 +0000)]
Merge r1909833 from trunk:
a few tweaks to SetEnvIfExpr doc
From a question on IRC, show a backreference example.
Fix a bad copy/paste where a link to <if> was present.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909834 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 12 May 2023 11:57:38 +0000 (11:57 +0000)]
propose h2 backport for r1909769.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909771 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 9 May 2023 08:41:23 +0000 (08:41 +0000)]
backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909697 13f79535 -47bb-0310-9956-
ffa450edef68
Jean-Frederic Clere [Thu, 4 May 2023 09:47:27 +0000 (09:47 +0000)]
Add proposal for DeflateAlterETag fix.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909605 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 3 May 2023 08:27:20 +0000 (08:27 +0000)]
enable github workflows for testing http2 and mod_tls
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909588 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 3 May 2023 08:21:47 +0000 (08:21 +0000)]
tests, synching changes/additions from trunk in http2 tests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909587 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 2 May 2023 10:05:52 +0000 (10:05 +0000)]
*) tests: backport changes to make pytest tests work
again, fixing mainly cgi vs. multipart issues.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909564 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 2 May 2023 09:21:07 +0000 (09:21 +0000)]
Backport of r1909558 from trunk:
*) mod_tls: updating to rustls-ffi version 0.9.2 or higher.
Checking in configure for proper version installed. Code
fixes for changed clienthello member name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909561 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 23 Apr 2023 21:09:41 +0000 (21:09 +0000)]
CI tests are failing (since r1909135), set a lower timeout since
the default is a rather extreme 6hrs. Worst cases seem to be
around 10 minutes currently. [skip ci]
Merges r1909242 trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909371 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sun, 23 Apr 2023 21:04:40 +0000 (21:04 +0000)]
Repurpose test for apr-1.8.x (1.7.x being tested elsewhere already).
ci: Upgrade to latest apr-1.7.4.
Merges r1908415, r1909369 trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909370 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 20 Apr 2023 11:04:07 +0000 (11:04 +0000)]
* Vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909277 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Thu, 20 Apr 2023 11:03:28 +0000 (11:03 +0000)]
* Add proposal [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909276 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 18 Apr 2023 11:31:54 +0000 (11:31 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909220 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Tue, 18 Apr 2023 11:30:39 +0000 (11:30 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909219 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Tue, 18 Apr 2023 08:59:29 +0000 (08:59 +0000)]
Propose backport of r1909215.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909216 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Apr 2023 14:26:55 +0000 (14:26 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909159 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 15 Apr 2023 14:26:05 +0000 (14:26 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909158 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 12 Apr 2023 12:24:18 +0000 (12:24 +0000)]
Merge r1909067 from trunk:
* Clarify performance topic
Reviewed by: ruediger
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909087 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Apr 2023 11:57:05 +0000 (11:57 +0000)]
xforms
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909086 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 12 Apr 2023 11:56:39 +0000 (11:56 +0000)]
Merge r1909084 from trunk:
just request_uri
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909085 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 11 Apr 2023 21:37:47 +0000 (21:37 +0000)]
Merge r1909073 from trunk:
PR66563: escaping of url releated server vars
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909075 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 11 Apr 2023 06:25:41 +0000 (06:25 +0000)]
Followup to r1908937:
Fix the second location where ../../server needs to be added to the include path as mod_rewrite now requires test_char.h.
Submitted by: Steve Bush <Steven.BUSH@3ds.com>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909061 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Apr 2023 13:07:46 +0000 (13:07 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909026 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 8 Apr 2023 13:06:18 +0000 (13:06 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909025 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 7 Apr 2023 12:53:51 +0000 (12:53 +0000)]
xforms
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909015 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 7 Apr 2023 12:53:19 +0000 (12:53 +0000)]
use anchors
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909014 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Thu, 6 Apr 2023 17:38:20 +0000 (17:38 +0000)]
publishing release httpd-2.4.57
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1909000 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 3 Apr 2023 10:41:36 +0000 (10:41 +0000)]
* mod_rewrite now requires test_char.h. Hence add ../../server to the include path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908937 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Mon, 3 Apr 2023 08:00:21 +0000 (08:00 +0000)]
Merge r1908933 from trunk:
* Use latest released versions of APR and APR-UTIL for building
Submitted by: rpluem
Reviewed by: ruediger
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908934 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Apr 2023 14:47:38 +0000 (14:47 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908900 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 1 Apr 2023 14:46:34 +0000 (14:46 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908899 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 1 Apr 2023 08:59:04 +0000 (08:59 +0000)]
Trigger ci.
Merges r1908885 from trunk.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908886 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 1 Apr 2023 08:47:44 +0000 (08:47 +0000)]
Try running CI for 2.* tags. [skip ci]
Merges r1908835 trunk.
Submitted by: jorton
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908884 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 31 Mar 2023 15:09:04 +0000 (15:09 +0000)]
Sync CHANGES.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908866 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 31 Mar 2023 14:37:07 +0000 (14:37 +0000)]
Merge r1908827, r1908838 from trunk:
mod_proxy: Check for space/ctrls in nocanon path/urls before forwarding.
Follow up to r1908827: CHANGES entry.
Submitted by: ylavic
Reviewed by: ylavic, rpluem, covener
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908865 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 31 Mar 2023 14:33:00 +0000 (14:33 +0000)]
Merge r1908341, r1908628, r1908629 from trunk:
Do not double encode encoded slashes
In case that AllowEncodedSlashes is set to NoDecode do not double encode
encoded slashes in the URL sent by the reverse proxy to the backend.
* include/ap_mmn.h: Document the addition of ap_proxy_canonenc_ex to the API.
* modules/proxy/mod_proxy.h: Declare ap_proxy_canonenc_ex and define flag
values.
* modules/proxy/proxy_util.c: Implement ap_proxy_canonenc_ex by modifying
ap_proxy_canonenc accordingly and reimplement ap_proxy_canonenc to
use ap_proxy_canonenc_ex with the appropriate flag.
* modules/http2/mod_proxy_http2.c, modules/proxy/mod_proxy_*.c: Set the
correct flag based on the AllowEncodedSlashes configuration and use
ap_proxy_canonenc_ex instead of ap_proxy_canonenc.
* Whitespace fixes. No functional change.
* Fix typo
Reviewed by: rpluem, ylavic, covener
Github: closes #351
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908864 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Mar 2023 14:25:09 +0000 (14:25 +0000)]
make update-changes
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908863 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Mar 2023 14:23:56 +0000 (14:23 +0000)]
vote/promote/remove
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908862 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Fri, 31 Mar 2023 13:26:23 +0000 (13:26 +0000)]
Backport recent rewrite trunk features
https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/348.diff
Submitted by: covener
Reviewed by: covener, ylavic, rpluem
Github: closes #348
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908859 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 31 Mar 2023 12:04:50 +0000 (12:04 +0000)]
update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908853 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Fri, 31 Mar 2023 12:04:33 +0000 (12:04 +0000)]
Merge r1908691 from trunk:
*) mod_http2: fixed a crash during connection termination. See PR 66539.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908852 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 31 Mar 2023 11:51:44 +0000 (11:51 +0000)]
* Vote and comment [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908851 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 31 Mar 2023 11:20:20 +0000 (11:20 +0000)]
Propose r1908827.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@
1908848 13f79535 -47bb-0310-9956-
ffa450edef68