]>
git.ipfire.org Git - thirdparty/apache/httpd.git/log
Lucien Gentis [Sat, 31 Aug 2024 13:06:02 +0000 (13:06 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920323 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 31 Aug 2024 13:05:01 +0000 (13:05 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920322 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 30 Aug 2024 15:36:29 +0000 (15:36 +0000)]
mod_ssl: Add SSL_HANDSHAKE_RTT environment variable.
* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl): Support
SSL_HANDSHAKE_RTT. (ssl_var_lookup_ssl_handshake_rtt): New
function.
* modules/ssl/ssl_engine_kernel.c (ssl_hook_Fixup_vars): Add
SSL_HANDSHAKE_RTT.
Submitted by: csmutz
Github: closes #477
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920297 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 30 Aug 2024 09:30:08 +0000 (09:30 +0000)]
Update tr.xml (#1)
Update translation string
Submitted by: Serhat <
49079271 +onwp users.noreply.github.com>
Github: closes #456
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920287 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Thu, 29 Aug 2024 14:10:10 +0000 (14:10 +0000)]
ap_log_error: Include apu_version header to pick up apr-util
version number.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920273 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Aug 2024 16:22:54 +0000 (16:22 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920161 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 24 Aug 2024 16:21:49 +0000 (16:21 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920160 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 21 Aug 2024 12:36:45 +0000 (12:36 +0000)]
* Fix typo in anchor [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920109 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 20 Aug 2024 08:28:48 +0000 (08:28 +0000)]
CI: Install libsasl2-dev to fix build errors with APR trunk/apr-util 1.7.x
https://lists.apache.org/thread/8hhs2otod7fo44964yd1csck3ddm1fq2
CI: Add job to test LDAP with the (apr 1.7.x, apr-util 1.7.x) combination.
Github: closes #474
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920050 13f79535 -47bb-0310-9956-
ffa450edef68
Graham Leggett [Mon, 19 Aug 2024 06:52:35 +0000 (06:52 +0000)]
ap_log_error: Include text strings from apr-util in addition
to apr.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1920013 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 13 Aug 2024 14:12:35 +0000 (14:12 +0000)]
don't merge slashes on perdir prefix
Submitted by: Eric Covener
Github: closes #472
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919860 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 5 Aug 2024 11:51:38 +0000 (11:51 +0000)]
fr doc rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919678 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Mon, 5 Aug 2024 11:50:02 +0000 (11:50 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919677 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sun, 4 Aug 2024 11:13:17 +0000 (11:13 +0000)]
CI: Enable Windows job for 2.4.x branch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919665 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sat, 3 Aug 2024 19:53:13 +0000 (19:53 +0000)]
The new <since> should be declared in common.dtd.
Otherwise, ir breaks ./build.sh validate-xml
I forgot to push that in r1919560.
Thanks lucien Gentis for reporting it to me.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919653 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 2 Aug 2024 00:53:53 +0000 (00:53 +0000)]
Follow up to r1919620: Restore r->filename re-encoding for ProxyPass URLs.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919628 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 1 Aug 2024 16:09:14 +0000 (16:09 +0000)]
Follow up to r1919620: init path after "proxy:" is skipped.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919623 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 1 Aug 2024 15:20:16 +0000 (15:20 +0000)]
Follow up to r1919620: CHANGES entry indent.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919621 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 1 Aug 2024 14:43:58 +0000 (14:43 +0000)]
mod_proxy_fcgi: Don't re-encode SCRIPT_FILENAME. PR 69203
Before r1918550 (r1918559 in 2.4.60), "SetHandler proxy:..." configurations
did not pass through proxy_fixup() hence the proxy_canon_handler hooks, leaving
fcgi's SCRIPT_FILENAME environment variable (from r->filename) decoded, or more
exactly not re-encoded.
We still want to call ap_proxy_canon_url() for "fcgi:" to handle/strip the UDS
"unix:" case and check that r->filename is valid and contains no controls, but
proxy_fcgi_canon() will not ap_proxy_canonenc_ex() thus re-encode anymore.
Note that this will do the same for "ProxyPass fcgi:...", there is no reason
that using SetHandler or ProxyPass don't result in the same thing. If an opt
in/out makes sense we should probably look at ProxyFCGIBackendType.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919620 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 1 Aug 2024 13:00:35 +0000 (13:00 +0000)]
Follow up to r1919617: Better CHANGES entry per Eric.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919619 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 1 Aug 2024 11:35:26 +0000 (11:35 +0000)]
mod_proxy: Fix selection of ProxyPassMatch workers with host/port substitution. PR 69233.
With "ProxyPassMatch ^/([^/]+)/(.*)$ https://$1/$2", ap_proxy_get_worker_ex()
should not consider the length of scheme://host part of the given URL because
of the globbing match on the host part.
Fix it by setting worker->s>is_host_matchable when creating a worker with host
substitution and avoiding the min_match check in worker_matches() in this case.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919617 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Wed, 31 Jul 2024 12:25:40 +0000 (12:25 +0000)]
Follow-up to r1919587: CMake: Fix type in variable name (MODULES_SYNMBOLS -> MODULES_SYMBOLS)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919602 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Tue, 30 Jul 2024 00:15:32 +0000 (00:15 +0000)]
Follow-up to r1919413: CMake: Use configure_file() instead of file(write)
to generate modules.c file because configure_file() doesn't change
timestamp of file if contents is the the same.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919587 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Mon, 29 Jul 2024 08:40:42 +0000 (08:40 +0000)]
* modules/dav/fs/repos.c (dav_fs_get_resource): Return a 404 rather
than a 400 where r->path_info is not empty for a file; a valid but
unsatisfiable request to a path which cannot exist,
e.g. /dav/foo.txt/blah where /dav/foo.txt is not a directory.
Github: closes #465
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919580 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 28 Jul 2024 13:33:25 +0000 (13:33 +0000)]
Add some compatibility notes for some mod_rewrite flags added in lte last releases.
Make use of the new <since>.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919564 13f79535 -47bb-0310-9956-
ffa450edef68
Christophe Jaillet [Sun, 28 Jul 2024 06:21:28 +0000 (06:21 +0000)]
Add a new <since> tag to ease writing compatibility notes.
This is much less verbose and will make wording more consistent in the generated html files.
It is declared in synopsis.xsl because its main use should be here, but it is usable anywhere.
Only the French translation is provided.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919560 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 27 Jul 2024 13:54:08 +0000 (13:54 +0000)]
mod_proxy_fcgi: Use r->uri rather than r->filename for directory walk.
r->filename is a "proxy:" one for mod_proxy modules, and ap_directory_walk()
can't cope with that, so force r->uri.
Github: closes #468
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919547 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Sat, 27 Jul 2024 13:26:40 +0000 (13:26 +0000)]
Trigger ci
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919543 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 26 Jul 2024 14:40:44 +0000 (14:40 +0000)]
mod_proxy: Allow for empty UDS URL hostname in ProxyPass workers too.
Using "unix:/udspath|scheme:" or "unix:/udspath|scheme://" for a ProxyPass URL
does not work currently, while it works for SetHandler "proxy:unix:...".
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919533 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 26 Jul 2024 14:36:25 +0000 (14:36 +0000)]
*) mod_proxy: Avoid AH01059 parsing error for SetHandler "unix:" URLs
in <Location> (incomplete fix in 2.4.62). PR 69160.
When SetHandler "unix:..." is used in a <Location "/path"> block, the path
gets appended (including $DOCUMENT_ROOT somehow) to r->filename hence the
current checks in fixup_uds_filename() to add "localhost" when missing don't
work. Fix them.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919532 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 26 Jul 2024 12:34:19 +0000 (12:34 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919527 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Fri, 26 Jul 2024 12:33:18 +0000 (12:33 +0000)]
fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919526 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Fri, 26 Jul 2024 09:14:40 +0000 (09:14 +0000)]
CI: Fix OpenSSL tarball download URLs after openssl.org site refresh
CI: Update to latest OpenSSL releases.
CI: Build OpenSSL with RPATH set so that the installed ./bin/openssl works
without LD_LIBRARY_PATH set.
Use LD_RUN_PATH during the httpd build to achieve the same with binaries
from the httpd build, but unset it after so that it doesn't affect running
e.g. php-fpm or perl later. Should fix warning from logs when php-fpm
is executed --
[26-Jul-2024 07:43:34] NOTICE: PHP message: PHP Warning: PHP Startup: Unable to load dynamic library 'curl.so' (tried: /usr/lib/php/
20210902 /curl.so (/lib/x86_64-linux-gnu/libcurl.so.4: undefined symbol: ENGINE_init, version OPENSSL_3.0.0), /usr/lib/php/
20210902 /curl.so.so (/usr/lib/php/
20210902 /curl.so.so: cannot open shared object file: No such file or directory)) in Unknown on line 0
CI: Test that php-fpm works if available before testing.
CI: For paranoia/future debugging, log the OpenSSL version from compile-time
and run-time as reported by mod_ssl.
Github: closes #466
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919524 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Wed, 24 Jul 2024 12:48:10 +0000 (12:48 +0000)]
* modules/core/mod_so.c (load_module): Log the file/lineno for a
duplicated LoadModule since it's often a symptom of some deeper
mis-configuration.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919496 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 24 Jul 2024 10:42:18 +0000 (10:42 +0000)]
Reenable test class, upstream bug fixed in pebble.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919491 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 23 Jul 2024 12:56:13 +0000 (12:56 +0000)]
xforms
[skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919469 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 23 Jul 2024 12:55:46 +0000 (12:55 +0000)]
use UNCList in UNC examples
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919468 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sun, 21 Jul 2024 07:40:54 +0000 (07:40 +0000)]
CMake: Use TARGET_COMPILE_DEFINITIONS to set preprocessor definitions.
TARGET_COMPILE_DEFINITIONS correctly handle values with spaces, so
DEFINE_WITH_BLANKS() macro can be removed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919428 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 17:31:20 +0000 (17:31 +0000)]
* .github/workflows/windows.yml: Install openssl.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919417 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 16:49:15 +0000 (16:49 +0000)]
* .github/workflows/windows.yml: Fix syntax error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919416 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 16:45:14 +0000 (16:45 +0000)]
* .github/workflows/windows.yml: Fix syntax error.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919415 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 16:44:26 +0000 (16:44 +0000)]
* .github/workflows/windows.yml: Try to use Ninja for Windows CI build.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919414 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 16:18:18 +0000 (16:18 +0000)]
Remove awk dependency when building using CMake. Before this awk was required
for -DWITH_MODULES option.
* build/build-modules-c.cmake:
(generate_builtin_modules_c): Function to generate modules.c.
* CMakeLists.txt
(): Use generate_builtin_modules_c() instead of `awk -f build/build-modules-c.awk`
to generate modules.c file.
* README.cmake:
(Prerequisites, How to build): Do not mention awk as prerequisite.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919413 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 16:09:24 +0000 (16:09 +0000)]
* .github/workflows/windows.yml: Enable VCPKG artifacts caching.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919411 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Jul 2024 13:42:50 +0000 (13:42 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919405 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 20 Jul 2024 13:41:51 +0000 (13:41 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919404 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 13:36:20 +0000 (13:36 +0000)]
* build/build-modules-c.awk: Add AP_DECLARE_DATA to ap_prelinked_modules,
ap_prelinked_modules_symbols and ap_preloaded_modules to match declaration
in ap_config.h. It doesn't change behavior because AP_DECLARE_DATA is
empty on non-Windows platform.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919403 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 13:10:14 +0000 (13:10 +0000)]
* .github/workflows/windows.yml: Add quotes for -DAPR_LIBRARIES argument.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919399 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 13:09:23 +0000 (13:09 +0000)]
* .github/workflows/windows.yml: Enable HTTPD private headers when installing
APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919398 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 13:04:40 +0000 (13:04 +0000)]
CI: Add Windows GitHub Action job. Not really tested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919397 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 12:51:16 +0000 (12:51 +0000)]
* CMakeLists.txt: By default use PCRE2 CMake package if supported.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919395 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 12:15:48 +0000 (12:15 +0000)]
* os/win32/modules.c: Include "ap_config.h" to match the file generated by
build/build-modules-c.awk. It doesn't change the behaviour because ap_config.h
is included by httpd.h.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919392 13f79535 -47bb-0310-9956-
ffa450edef68
Ivan Zhakov [Sat, 20 Jul 2024 12:13:26 +0000 (12:13 +0000)]
* os/win32/modules.c: Add AP_DECLARE_DATA to ap_prelinked_module_symbols
to match definition in ap_config.h.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919391 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 17 Jul 2024 22:11:28 +0000 (22:11 +0000)]
Skip more h2 tests in prefork
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919334 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 17 Jul 2024 22:02:27 +0000 (22:02 +0000)]
Skip h2 tests on prefork
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919332 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Wed, 17 Jul 2024 21:57:23 +0000 (21:57 +0000)]
Fix typo in test name
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919330 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 17 Jul 2024 20:50:12 +0000 (20:50 +0000)]
mod_rewrite: Better question mark tracking to avoid UnsafeAllow3F. PR 69197.
Track in do_expand() whether a '?' in the uri-path comes from a literal in
the substitution string or from an expansion (variable, lookup, ...).
In the former case it's safe to assume that it's the query-string separator
but for the other case it's not (could be a decoded %3f from r->uri).
This allows to avoid [UnsafeAllow3F] for most cases.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919325 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 16 Jul 2024 15:56:54 +0000 (15:56 +0000)]
core: Improve AP_REQUEST_ #defines.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919290 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Mon, 15 Jul 2024 22:34:32 +0000 (22:34 +0000)]
Make sure pytest shuts down the web server after each package
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919265 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 15 Jul 2024 12:06:46 +0000 (12:06 +0000)]
copy the trusted flag from the subrequest
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919247 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 15 Jul 2024 12:05:57 +0000 (12:05 +0000)]
merge leading slashes by default
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919246 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Fri, 12 Jul 2024 15:41:42 +0000 (15:41 +0000)]
core: ap_location_walk() does not deal with the filesystem
So it shouldn't merge slashes according to filesystem rules.
* server/request.c(ap_location_walk):
Use ap_no2slash_ex(,0) instead of ap_no2slash() to ignore
filesystem specifics.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919165 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Jul 2024 14:57:46 +0000 (14:57 +0000)]
mod_status: "Threads" span three colomns (busy, graceful, idle), not two.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919148 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Thu, 11 Jul 2024 14:12:31 +0000 (14:12 +0000)]
mod_status: Follow up to r1918482: Bump colspan for the new wait-io colomn
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919141 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Thu, 11 Jul 2024 08:10:54 +0000 (08:10 +0000)]
test http1, add version check for trailer tests
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919125 13f79535 -47bb-0310-9956-
ffa450edef68
Stefan Eissing [Wed, 10 Jul 2024 10:55:23 +0000 (10:55 +0000)]
sync test code with mod-h2
- shutdown server at end of h2 tests
- adapt minimum httpd versions for some tests
- add test_700_20 for load on blocked connections,
disabled for now until mpm_event improves
- build websocket client automatically
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919087 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Jul 2024 15:06:14 +0000 (15:06 +0000)]
mod_md: Keep compat with openssl < 1.1
EVP_PKEY_get0_RSA() does not exist in openssl < 1.1, use EVP_PKEY_get1_RSA()
instead, hence RSA_free() the returned ref to avoid a leak.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919026 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Jul 2024 14:34:37 +0000 (14:34 +0000)]
Follow up to r1919023: fix compilation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919024 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Jul 2024 14:25:58 +0000 (14:25 +0000)]
mod_proxy: Don't mangle r->filename when ap_proxy_canon_netloc() fails.
ap_proxy_canon_netloc() called from canon_handler hooks modifies its given
url in pace, hence &r->filename[6] passed from ap_proxy_canon_url().
This is not an issue if every canon_handler hook succeeds (or declines)
since r->filename is usually completely rewritten finally, but on failure
it gets truncated.
Avoid this by passing a copy of r->filename from the start, the proxy *url
and r->filename don't need to point to the same data.
* proxy/proxy_util.c(ap_proxy_canon_url):
Pass a copy of r->filename to the canon_handler hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919023 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Jul 2024 13:59:50 +0000 (13:59 +0000)]
mod_proxy: Fix canonicalisation and FCGI env (PATH_INFO, SCRIPT_NAME) for
"balancer:" URLs set via SetHandler, also allowing for "unix:"
sockets with BalancerMember(s). PR 69168.
* modules/proxy/proxy_util.h, modules/proxy/proxy_util.c:
Move proxy_interpolate() from mod_proxy.c to ap_proxy_interpolate(),
exported locally only (non public).
Move proxy_fixup() from mod_proxy.c to ap_proxy_canon_url(), exported
locally only too (non public).
Rollback ap_proxy_fixup_uds_filename() to a local fixup_uds_filename()
usable from proxy_util.c only. The public function will be removed in
a following commit.
* modules/proxy/mod_proxy.h:
Note that ap_proxy_fixup_uds_filename() is deprecated.
* modules/proxy/mod_proxy.c:
Just use ap_proxy_canon_url() from proxy_fixup() and proxy_handler()
for SetHandler URLs.
* modules/proxy/mod_proxy_balancer.c:
Do not canonicalize the path from proxy_balancer_canon() anymore but
rather from balancer_fixup() where the balancer URL is rewritten to
the BalancerMember URL.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919022 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Jul 2024 13:07:23 +0000 (13:07 +0000)]
Follow up to r1919015: fix compilation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919019 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Mon, 8 Jul 2024 12:35:35 +0000 (12:35 +0000)]
mod_proxy: Avoid AH01059 parsing error for SetHandler "unix:" URLs. PR 69160
The hostname part of the URL is not mandated for UDS though the canon_handler
hooks will require it, so add "localhost" if it's missing (won't be used anyway
for an AF_UNIX socket).
This can trigger with SetHandler "unix:" URLs which are now also fixed up.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1919015 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Jul 2024 15:23:52 +0000 (15:23 +0000)]
fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918971 13f79535 -47bb-0310-9956-
ffa450edef68
Lucien Gentis [Sat, 6 Jul 2024 15:22:42 +0000 (15:22 +0000)]
fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918970 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Fri, 5 Jul 2024 14:50:24 +0000 (14:50 +0000)]
* Check for correct OpenSSL version for mod_ssl_ct
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918935 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 3 Jul 2024 22:29:46 +0000 (22:29 +0000)]
mention quirks, add example, clarify
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918892 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 3 Jul 2024 15:06:32 +0000 (15:06 +0000)]
mod_ssl: Let modssl_set_io_callbacks() whether which callback is needed.
* modules/ssl/ssl_private.h:
Add conn_rec and server_rec args to modssl_set_io_callbacks().
* modules/ssl/ssl_engine_io.c(modssl_set_io_callbacks):
Don't set modssl_io_cb for log levels below TRACE4.
* modules/ssl/ssl_engine_io.c(ssl_io_filter_init),
modules/ssl/ssl_engine_kernel.c(ssl_find_vhost):
Call modssl_set_io_callbacks() unconditionally.
* modules/ssl/ssl_engine_io.c(modssl_io_cb):
While at it, (cmd & BIO_CB_WRITE) is enough to differentiate a
write from read.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918883 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 3 Jul 2024 14:42:13 +0000 (14:42 +0000)]
* Changelog for r1918880
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918881 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Wed, 3 Jul 2024 14:37:10 +0000 (14:37 +0000)]
* Restore SSL dumping for OpenSSL >= 3.0.
Since r1908537 BIO_set_callback_ex is used with OpenSSL >= 3.0 instead of
BIO_set_callback to set the BIO callback. The meaning of parameters and
their range of values in the callback function set by BIO_set_callback_ex
has changed compared to the callback function set by BIO_set_callback
although parameters kept their names. Accommodate for this and adjust the
code accordingly.
Furthermore limit the size of dumps to APR_UINT16_MAX bytes. Given the length
of SSL records of 16k this should not have practical implications.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918880 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 2 Jul 2024 11:19:45 +0000 (11:19 +0000)]
* Follow up to r1918814: Strings are from configuration and thus trusted
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918823 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 2 Jul 2024 06:57:23 +0000 (06:57 +0000)]
* Follow up to r1918814: Always trust content types that we set literally
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918815 13f79535 -47bb-0310-9956-
ffa450edef68
Ruediger Pluem [Tue, 2 Jul 2024 06:35:53 +0000 (06:35 +0000)]
* Always trust content types that we set literally
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918814 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 1 Jul 2024 19:23:40 +0000 (19:23 +0000)]
maintain trusted flag
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918795 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 1 Jul 2024 18:38:31 +0000 (18:38 +0000)]
remove openssl vs. event comment
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918789 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Jun 2024 13:39:59 +0000 (13:39 +0000)]
match AP_IS_SLASH macro
followup to
1918651
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918663 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Jun 2024 10:27:30 +0000 (10:27 +0000)]
don't add / to / in the non-perdir
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918652 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Wed, 26 Jun 2024 10:09:29 +0000 (10:09 +0000)]
factor out IS_SLASH, perdir fix
in per-dir, the filename will be internally redirected, so / is OK too.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918651 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 26 Jun 2024 09:19:16 +0000 (09:19 +0000)]
mod_proxy: follow up to r1918626: Simplify ap_proxy_fixup_uds_filename() and callers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918647 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Wed, 26 Jun 2024 00:15:39 +0000 (00:15 +0000)]
mod_proxy_http2: ap_proxy_determine_connection()'s given &url is in/out.
* modules/http2/mod_proxy_http2.c(proxy_http2_handler):
Restart from the original URL on reconnect.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918627 13f79535 -47bb-0310-9956-
ffa450edef68
Yann Ylavic [Tue, 25 Jun 2024 23:49:09 +0000 (23:49 +0000)]
mod_proxy: Fixup UDS filename for mod_proxy called through r->handler.
* modules/proxy/proxy_util.c:
Export ap_proxy_fixup_uds_filename() from fix_uds_filename.
Call it from ap_proxy_pre_request() even for rewritten balancer workers.
* modules/proxy/mod_proxy.h:
Declare ap_proxy_fixup_uds_filename()
* modules/proxy/mod_proxy.c:
Fixup UDS filename from r->handler in proxy_handler().
* include/ap_mmn.h:
Bump MMN minor for ap_proxy_fixup_uds_filename()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918626 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 25 Jun 2024 19:43:15 +0000 (19:43 +0000)]
fix comparison of local path on Windows
Submitted By: Yann Ylavic
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918623 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Tue, 25 Jun 2024 17:29:06 +0000 (17:29 +0000)]
validate hostname
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918606 13f79535 -47bb-0310-9956-
ffa450edef68
Joe Orton [Tue, 25 Jun 2024 15:53:33 +0000 (15:53 +0000)]
* modules/mappers/mod_rewrite.c: Fill in logno.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918604 13f79535 -47bb-0310-9956-
ffa450edef68
Rainer Jung [Tue, 25 Jun 2024 09:21:49 +0000 (09:21 +0000)]
pytest: fix asset list extraction from nghttp output
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918576 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Jun 2024 18:21:04 +0000 (18:21 +0000)]
docs bld break
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918565 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Jun 2024 17:32:26 +0000 (17:32 +0000)]
MMN bump for recent additions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918554 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Jun 2024 17:28:12 +0000 (17:28 +0000)]
block inadvertent subst of special filenames
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918553 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Jun 2024 17:24:52 +0000 (17:24 +0000)]
tighten up prefix_stat and %3f handling
Require opt-ins for unsafe substitutions
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918552 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Jun 2024 17:22:51 +0000 (17:22 +0000)]
add ap_set_content_type_ex to differentiate
trusted sources
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918551 13f79535 -47bb-0310-9956-
ffa450edef68
Eric Covener [Mon, 24 Jun 2024 17:21:00 +0000 (17:21 +0000)]
mod_proxy: escape for non-proxypass configuration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@
1918550 13f79535 -47bb-0310-9956-
ffa450edef68