34170 Commits

Author SHA1 Message Date
c846964343 xform for mod_ssl
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927322 13f79535-47bb-0310-9956-ffa450edef68
2025-07-18 19:50:33 +00:00
68b912859c mentioned dropped 'sslengine optional'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927320 13f79535-47bb-0310-9956-ffa450edef68
2025-07-18 19:47:15 +00:00
1045f538cf Improve compatibility with older python.
According to python 3.11.0 changelog, "datetime.UTC"
was added as an alias for "datetime.timezone.utc".


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927317 13f79535-47bb-0310-9956-ffa450edef68
2025-07-18 17:07:05 +00:00
beb75b5cb5 future-proof by flattening expr rc to 0/1
Submitted By: ylavic



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927314 13f79535-47bb-0310-9956-ffa450edef68
2025-07-18 15:25:33 +00:00
6e59b12422 rc already is set by result of expression eval
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927270 13f79535-47bb-0310-9956-ffa450edef68
2025-07-16 17:33:21 +00:00
8e529cecca * mod_http2/mod_proxy_http2: fix a bug in calculating the log2 value of
integers, used in push diaries and proxy window size calculations.
    PR69741 [Benjamin P. Kallus]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927235 13f79535-47bb-0310-9956-ffa450edef68
2025-07-15 06:35:04 +00:00
dd60cec5ae fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927149 13f79535-47bb-0310-9956-ffa450edef68
2025-07-12 13:21:13 +00:00
74d1fe85db fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927148 13f79535-47bb-0310-9956-ffa450edef68
2025-07-12 13:19:30 +00:00
423c67c0c1 avoid compile error with curl < 7.44.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927054 13f79535-47bb-0310-9956-ffa450edef68
2025-07-07 15:29:13 +00:00
a6b8db04ec improve h2 header error handling
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927038 13f79535-47bb-0310-9956-ffa450edef68
2025-07-07 11:56:48 +00:00
63f48bb6f3 remove antiquated 'SSLEngine optional' TLS upgrade
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927037 13f79535-47bb-0310-9956-ffa450edef68
2025-07-07 11:55:00 +00:00
349248060f tolerate missing host header in h2 proxy
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927036 13f79535-47bb-0310-9956-ffa450edef68
2025-07-07 11:53:43 +00:00
d76573e760 update SNI validation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927035 13f79535-47bb-0310-9956-ffa450edef68
2025-07-07 11:51:57 +00:00
5c8e7ca468 escape ssl vars
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927034 13f79535-47bb-0310-9956-ffa450edef68
2025-07-07 11:50:41 +00:00
dd98030cb3 expand UNC checking
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927033 13f79535-47bb-0310-9956-ffa450edef68
2025-07-07 11:49:48 +00:00
32cf503799 header only
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1927032 13f79535-47bb-0310-9956-ffa450edef68
2025-07-07 11:48:06 +00:00
9c4557ea2b fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926975 13f79535-47bb-0310-9956-ffa450edef68
2025-07-05 14:01:34 +00:00
5170482e86 fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926974 13f79535-47bb-0310-9956-ffa450edef68
2025-07-05 14:00:36 +00:00
36f619966b mod_so: Add -D DUMP_MODULE_DATA to print module data in structured
format (TOML) including MMN information.

* modules/core/mod_so.c (print_mod_data): New function.
  (dump_loaded_modules): Use it if DUMP_MODULE_DATA is defined.

* docs/manual/programs/httpd.xml: Move -DDUMP_* docs to a new
  section, cover the above new option.

Github: closes #537


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926737 13f79535-47bb-0310-9956-ffa450edef68
2025-06-26 09:21:25 +00:00
9b06444951 * modules/ssl/ssl_private.h: Fix logic in r1926720 HAVE_OPENSSL_KEYLOG macro,
thanks to rpluem.

Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926722 13f79535-47bb-0310-9956-ffa450edef68
2025-06-25 15:16:22 +00:00
c2ffd2a551 * modules/ssl/ssl_private.h: For OpenSSL >= 3.5.0 drop $SSLKEYLOGFILE
handling inside mod_ssl where OpenSSL is built to handle that
  internally in libssl.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926720 13f79535-47bb-0310-9956-ffa450edef68
2025-06-25 12:53:18 +00:00
e5a19d43e0 mod_ssl: Accept expired client certs with optional_no_ca mode.
* modules/ssl/ssl_private.h (ssl_verify_error_is_optional): Add
  X509_V_ERR_CERT_HAS_EXPIRED to the list of error exceptions
  permitted for "optional_no_ca" mode.

Submitted by: Naveen Albert <apache2 phreaknet.org>
PR: 60028
Github: closes #509


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926714 13f79535-47bb-0310-9956-ffa450edef68
2025-06-25 07:55:26 +00:00
a54b3778a9 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926625 13f79535-47bb-0310-9956-ffa450edef68
2025-06-21 13:55:48 +00:00
2141c9548a fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926624 13f79535-47bb-0310-9956-ffa450edef68
2025-06-21 13:54:54 +00:00
7943c0ba66 Steal 2 lognos.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926368 13f79535-47bb-0310-9956-ffa450edef68
2025-06-12 10:06:46 +00:00
9771a826fd Add the escapehtml function to the expression API
Add the escapehtml function to the expression API, allowing to escape HTML
strings to guard against HTML injections.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926342 13f79535-47bb-0310-9956-ffa450edef68
2025-06-10 15:31:19 +00:00
af61c91eb9 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926213 13f79535-47bb-0310-9956-ffa450edef68
2025-06-07 12:39:55 +00:00
d1d5b485ac fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926212 13f79535-47bb-0310-9956-ffa450edef68
2025-06-07 12:38:51 +00:00
4e2976c49a Add a change entry to give credits to the author.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926191 13f79535-47bb-0310-9956-ffa450edef68
2025-06-06 20:26:38 +00:00
052328156d Add a change entry to give credits to the author.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926189 13f79535-47bb-0310-9956-ffa450edef68
2025-06-06 20:21:30 +00:00
9a2eca1ca1 Follow-up to r1922931.
In set_cookie_name() and set_cookie_name2(), now that the empty 'name' argument is explicitly handled, the error message in check_string() can be simplified because the cookie name can't be empty anymore when this function is called.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926188 13f79535-47bb-0310-9956-ffa450edef68
2025-06-06 20:12:16 +00:00
bc44c682d3 Improve syntax highlight which is already nicer in 2.4.x
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926185 13f79535-47bb-0310-9956-ffa450edef68
2025-06-06 18:47:11 +00:00
90536be744 CI: Reintroduce timeout/retry handling for "svn export" specific to
Apache::Test handling.

Github: closes #536


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926174 13f79535-47bb-0310-9956-ffa450edef68
2025-06-06 11:50:43 +00:00
39265983d1 * modules/dav/fs/repos.c (dav_fs_remove_resource):
Return a 404 if apr_file_remove() fails with an ENOENT error,
  likely due to a race with another DELETE.

PR: 60746
Github: closes #535


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926172 13f79535-47bb-0310-9956-ffa450edef68
2025-06-06 10:36:00 +00:00
5c7eac0cf6 Docs: update openssl command for listing pubkey algorithms for 3.0.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926171 13f79535-47bb-0310-9956-ffa450edef68
2025-06-06 10:34:15 +00:00
a2b00bbed6 * Correctly handle filenames that contain spaces
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926111 13f79535-47bb-0310-9956-ffa450edef68
2025-06-04 09:31:05 +00:00
b5fe0f863f Correctly check return value of getline
In case of an error (e.g. file not found or readable) getline returns -1 which
causes an endless loop. Leave the loop in such cases.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926110 13f79535-47bb-0310-9956-ffa450edef68
2025-06-04 09:16:24 +00:00
32ebb6bee9 Ensure that ALL fields of the ap_listen_rec structure are initialized
alloc_listener initializes more fields in the created ap_listen_rec structure
than alloc_systemd_listener as it has more data to add to this structure.
Ensure that all fields of the ap_listen_rec structure are initialized at
least with 0 as later code using this structure depends on this.

Submitted by: jailletc36


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926091 13f79535-47bb-0310-9956-ffa450edef68
2025-06-03 15:12:14 +00:00
6280123692 restore MDActivationDelay in the mod_md documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1926075 13f79535-47bb-0310-9956-ffa450edef68
2025-06-03 07:34:32 +00:00
2de0d11e9b *) mod_md: update to version 2.5.2
- Fixed TLS-ALPN-01 challenges when multiple `MDPrivateKeys` are specified
       with EC keys before RSA ones. Fixes #377. [Stefan Eissing]
     - Fixed missing newlines in the status page output. [Andreas Groth]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1925979 13f79535-47bb-0310-9956-ffa450edef68
2025-05-30 12:45:59 +00:00
b84e2e2068 *) mod_http2: update to version 2.0.32
The code setting the connection window size was set wrong,
     preventing `H2WindowSize` to work.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1925975 13f79535-47bb-0310-9956-ffa450edef68
2025-05-30 12:20:22 +00:00
c15471ee3b mod_proxy: restore reuse of ProxyRemote connections when possible.
Fixes a regression from 2.4.59 (r1913907).

For a reverse proxy setup with a worker (enablereuse=on) and a
forward/CONNECT ProxyRemote to reach it, an open connection/tunnel
to/through the remote proxy for the same origin server (and using the
same proxy auth) should be reusable. Avoid closing them like r1913534
did.

* modules/proxy/proxy_util.c:
  Rename the struct to remote_connect_info since it's only used for
  connecting through remote CONNECT proxies. Axe the use_http_connect
  field, always true.

* modules/proxy/proxy_util.c(ap_proxy_connection_reusable):
  Remote CONNECT (forward) proxy connections can be reused if the auth
  and origin server infos are the same, so conn->forward != NULL is not
  a condition to prevent reusability.

* modules/proxy/proxy_util.c(ap_proxy_determine_connection):
  Fix the checks around conn->forward reuse and connection cleanup if
  that's not possible.

Submitted by: jfclere, ylavic
GH: closes #531


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1925743 13f79535-47bb-0310-9956-ffa450edef68
2025-05-22 14:38:41 +00:00
b8de59ac7c CI: Bump versions tested to APR 1.7.6, OpenSSL 3.5.0.
Github: closes #530


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1925588 13f79535-47bb-0310-9956-ffa450edef68
2025-05-16 15:28:31 +00:00
bf19cfe634 * modules/dav/fs/repos.c (dav_fs_method_precondition):
Fix crashes when mod_dav_fs is not configured.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1925371 13f79535-47bb-0310-9956-ffa450edef68
2025-05-02 15:47:09 +00:00
e36237899d * Temporarily add back the query string to the URL as it might contain the
routing information for sticky sessions.

PR: 69443


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1925109 13f79535-47bb-0310-9956-ffa450edef68
2025-04-16 11:29:25 +00:00
65d5f9ee6c CI: Use the git commit hash to determine the revision of APR/APR-util
from the github repos, and build exactly that, rather than relying on SVN:
 - works if apr/apr-util moves to a r/w git in the future
 - removes a race for branches where the git revision tested
 could be different to the SVN revision retrieved before

Github: closes #528


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1924958 13f79535-47bb-0310-9956-ffa450edef68
2025-04-09 10:17:24 +00:00
e6cfbfa30d mod_ssl: Check the SSLProtocol directive when loading the configuration
Previously, the SSLProtocol directive was checked at runtime. Apache quit if
the directive contained an invalid combination of protocols, and logged the
message "AH02231: No SSL protocols available [hint: SSLProtocol]".

With this change, most invalid SSLProtocol directives are detected when
checking the configuration, e.g. with \"httpd -t -f httpd.conf\".

Examples of invalid protocol combinations that are caught:
* SSLProtocol "-TLSv1"
* SSLProtocol "-all"
* SSLProtocol "TLSv1.2 -TLSv1.2"

Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
Github: closes #523


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1924955 13f79535-47bb-0310-9956-ffa450edef68
2025-04-09 08:01:24 +00:00
b3a52bec98 mod_asis: Fix the log level of the message AH01236
Change the log level from ERROR to DEBUG.

The message \"mod_asis: ap_pass_brigade failed for file ...\" was logged with
the level ERROR. This log level is inappropriate here, because a client can
trigger this log message by aborting the request.

Most other modules don't log at all or use the log level DEBUG when
ap_pass_brigade() fails.

Submitted by: Michael Kaufmann <mail michael-kaufmann.ch>
Github: closes #527


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1924954 13f79535-47bb-0310-9956-ffa450edef68
2025-04-09 07:43:49 +00:00
e9231ff8cc CI: Update to test against OpenSSL 3.4 and 3.5.0-beta1
Github: closes #525


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1924911 13f79535-47bb-0310-9956-ffa450edef68
2025-04-07 14:25:59 +00:00
d7cec16f60 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1924811 13f79535-47bb-0310-9956-ffa450edef68
2025-04-05 13:39:02 +00:00