Commit Graph

32738 Commits

Author SHA1 Message Date
4d8bf133d8 Backport to v2.4:
*) core: Optimize send_brigade_nonblocking()
     trunk patch:
        https://svn.apache.org/r1892450
        https://svn.apache.org/r1909966
     2.4.x patch: svn merge -c 1892450,1909966 ^/httpd/httpd/trunk .
     +1: jailletc36, rpluem, icing



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911074 13f79535-47bb-0310-9956-ffa450edef68
2023-07-17 20:36:38 +00:00
ff2e5a1196 Backport to v2.4:
*) Easy patches: synch 2.4.x and trunk
         - core: constify pointers in ap_expr lookup tables.  ~1/2Kb moves to r/o text section
         - core: Optimize performance in ap_normalize_path()
         - core: Optimize code flow in log_backtrace()
         - Fix a typo in README.cmake
         - Add a missing 'be' in README.CHANGES
     trunk patch:
          https://svn.apache.org/r1877350
          https://svn.apache.org/r1894021
          https://svn.apache.org/r1906379
          https://svn.apache.org/r1908657
          https://svn.apache.org/r1908150
     2.4.x patch: svn merge -c 1877350,1894021,1906379,1908657,1908150 ^/httpd/httpd/trunk .
     +1: jailletc36, rpluem, gbechis



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911073 13f79535-47bb-0310-9956-ffa450edef68
2023-07-17 20:33:05 +00:00
4064072bf1 mod_alias proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911069 13f79535-47bb-0310-9956-ffa450edef68
2023-07-17 15:55:33 +00:00
243f087cad Update proposal.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911066 13f79535-47bb-0310-9956-ffa450edef68
2023-07-17 14:46:12 +00:00
7fddf95e0e Propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911065 13f79535-47bb-0310-9956-ffa450edef68
2023-07-17 14:39:53 +00:00
3d106572c2 Merge r1884511, r1901273, r1910843, r1910849 from trunk:
Add .opus extension for audio/ogg mimetype, per RFC 7845

RFC 7845: https://tools.ietf.org/html/rfc7845#section-9

Submitted by: Richard de Boer <richard tubul.net>
Github: closes #144

Merge of PR 318:

  *) core: the conf/mime.types has been updated in conformance with RFC 9239:
     - .js moved from 'application/javascript' to 'text/javascript'
     - .mjs was added as 'text/javascript'
     [Mathias Bynens <@mathiasbynens> via PR 318]

Add application/vnd.geogebra.slides mime type

Submitted by: Zbynek Konecny <zbynek1729 gmail.com>
Github: closes #207

Add WebAssembly MIME type and file extension

Submitted by: Dave Hodder <dmh dmh.org.uk>
Github: closes #332
Reviewed by: jorton, icing, covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911060 13f79535-47bb-0310-9956-ffa450edef68
2023-07-17 09:52:06 +00:00
a8899eb09c vote/promote
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911001 13f79535-47bb-0310-9956-ffa450edef68
2023-07-14 13:21:23 +00:00
d7cdc0260f backported
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1911000 13f79535-47bb-0310-9956-ffa450edef68
2023-07-14 13:14:00 +00:00
1c8c33076a Backport rewrite changes 1910649:1910705 from trunk
PR66672 trailing ? and QSA together regression

Reviewed By: covener, gbechis, ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910999 13f79535-47bb-0310-9956-ffa450edef68
2023-07-14 13:13:38 +00:00
1a45d1e5a9 vote and propose h2 websockets for backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910909 13f79535-47bb-0310-9956-ffa450edef68
2023-07-10 08:14:47 +00:00
1ad3d7d018 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910875 13f79535-47bb-0310-9956-ffa450edef68
2023-07-08 13:57:59 +00:00
520867ccb1 fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910874 13f79535-47bb-0310-9956-ffa450edef68
2023-07-08 13:56:57 +00:00
b69b7b6d71 Merged x3, propose x1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910856 13f79535-47bb-0310-9956-ffa450edef68
2023-07-07 12:07:30 +00:00
acd2f34320 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
2023-07-07 12:05:33 +00:00
ff558f52f5 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
2023-07-07 12:04:17 +00:00
85be535398 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
2023-07-07 12:03:32 +00:00
981c2504ad 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
2023-07-07 11:58:42 +00:00
9c036111b1 Vote, promote.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910851 13f79535-47bb-0310-9956-ffa450edef68
2023-07-07 11:47:15 +00:00
d48cc6ec2e 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
2023-07-07 11:33:44 +00:00
26d1388555 Merge, vote, propose.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910840 13f79535-47bb-0310-9956-ffa450edef68
2023-07-07 07:47:31 +00:00
a780344d86 Reference correct PR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910838 13f79535-47bb-0310-9956-ffa450edef68
2023-07-07 07:25:14 +00:00
2ec75ec192 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
2023-07-06 20:46:50 +00:00
6ec85d8833 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
2023-07-06 20:41:34 +00:00
4d617dbeaf 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: 7db9795f45.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
2023-07-06 16:11:56 +00:00
f46843b8dd Propose x1.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910813 13f79535-47bb-0310-9956-ffa450edef68
2023-07-06 11:44:43 +00:00
aefc30086a fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910727 13f79535-47bb-0310-9956-ffa450edef68
2023-07-01 13:31:43 +00:00
b1d0600a45 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
2023-07-01 13:30:57 +00:00
2cb5ea923c vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910710 13f79535-47bb-0310-9956-ffa450edef68
2023-06-30 13:53:57 +00:00
c4e35f346e 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
2023-06-30 13:06:05 +00:00
130a70897c 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
2023-06-30 07:52:50 +00:00
06ceb22deb 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
2023-06-30 07:22:40 +00:00
100c3f811c 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
2023-06-29 15:39:13 +00:00
5ca22e3233 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
2023-06-29 13:51:36 +00:00
7c61ca1cdf 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
2023-06-29 13:48:49 +00:00
47d4a2ae50 votes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910655 13f79535-47bb-0310-9956-ffa450edef68
2023-06-28 11:10:26 +00:00
f0f9880163 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
2023-06-28 10:41:05 +00:00
6977307101 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
2023-06-27 14:36:47 +00:00
8f64c14ccf propose [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910626 13f79535-47bb-0310-9956-ffa450edef68
2023-06-27 09:54:51 +00:00
182aadb64c vote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910625 13f79535-47bb-0310-9956-ffa450edef68
2023-06-27 09:43:43 +00:00
3332b10564 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
2023-06-20 11:42:38 +00:00
0e0fbf6a3e update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910504 13f79535-47bb-0310-9956-ffa450edef68
2023-06-20 10:49:37 +00:00
8c0c9f7d88 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
2023-06-20 10:48:57 +00:00
38c3768f07 update after backport
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910502 13f79535-47bb-0310-9956-ffa450edef68
2023-06-20 10:48:06 +00:00
7dd0de2c6d 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
2023-06-20 10:47:27 +00:00
76c4c62a31 * 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
2023-06-16 11:08:46 +00:00
28d7a4aa34 * 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
2023-06-16 11:04:17 +00:00
618e81cffa * 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
2023-06-16 11:01:03 +00:00
21e6e3ddfe * Promote [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910447 13f79535-47bb-0310-9956-ffa450edef68
2023-06-16 10:58:09 +00:00
f4345fd882 update backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910442 13f79535-47bb-0310-9956-ffa450edef68
2023-06-16 08:21:14 +00:00
d5ce5e4f8d backport proposal
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1910387 13f79535-47bb-0310-9956-ffa450edef68
2023-06-13 14:39:11 +00:00