summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Follow up to r1919620: CHANGES entry indent.Yann Ylavic2024-08-011-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919621 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy_fcgi: Don't re-encode SCRIPT_FILENAME. PR 69203Yann Ylavic2024-08-012-24/+15
| | | | | | | | | | | | | | | | | | | 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
* Follow up to r1919617: Better CHANGES entry per Eric.Yann Ylavic2024-08-011-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919619 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy: Fix selection of ProxyPassMatch workers with host/port ↵Yann Ylavic2024-08-014-14/+22
| | | | | | | | | | | | | | | 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
* Follow-up to r1919587: CMake: Fix type in variable name (MODULES_SYNMBOLS -> ↵Ivan Zhakov2024-07-312-2/+2
| | | | | | MODULES_SYMBOLS) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919602 13f79535-47bb-0310-9956-ffa450edef68
* Follow-up to r1919413: CMake: Use configure_file() instead of file(write)Ivan Zhakov2024-07-302-61/+46
| | | | | | | 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
* * modules/dav/fs/repos.c (dav_fs_get_resource): Return a 404 ratherJoe Orton2024-07-291-2/+2
| | | | | | | | | | | 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
* Add some compatibility notes for some mod_rewrite flags added in lte last ↵Christophe Jaillet2024-07-282-3/+9
| | | | | | | | 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
* Add a new <since> tag to ease writing compatibility notes.Christophe Jaillet2024-07-2812-0/+32
| | | | | | | | | | 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
* mod_proxy_fcgi: Use r->uri rather than r->filename for directory walk.Yann Ylavic2024-07-271-5/+5
| | | | | | | | | | | 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
* Trigger ciYann Ylavic2024-07-271-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919543 13f79535-47bb-0310-9956-ffa450edef68
* mod_proxy: Allow for empty UDS URL hostname in ProxyPass workers too.Yann Ylavic2024-07-262-5/+8
| | | | | | | | | 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
* *) mod_proxy: Avoid AH01059 parsing error for SetHandler "unix:" URLsYann Ylavic2024-07-262-9/+29
| | | | | | | | | | | | | 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
* fr doc rebuild.Lucien Gentis2024-07-262-4/+11
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919527 13f79535-47bb-0310-9956-ffa450edef68
* fr doc XML file update.Lucien Gentis2024-07-261-1/+9
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919526 13f79535-47bb-0310-9956-ffa450edef68
* CI: Fix OpenSSL tarball download URLs after openssl.org site refreshJoe Orton2024-07-263-10/+32
| | | | | | | | | | | | | | | | | | | | | | 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
* * modules/core/mod_so.c (load_module): Log the file/lineno for aJoe Orton2024-07-241-2/+4
| | | | | | | | 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
* Reenable test class, upstream bug fixed in pebble.Rainer Jung2024-07-241-5/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919491 13f79535-47bb-0310-9956-ffa450edef68
* xformsEric Covener2024-07-234-7/+14
| | | | | | | [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919469 13f79535-47bb-0310-9956-ffa450edef68
* use UNCList in UNC examplesEric Covener2024-07-231-0/+8
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919468 13f79535-47bb-0310-9956-ffa450edef68
* CMake: Use TARGET_COMPILE_DEFINITIONS to set preprocessor definitions.Ivan Zhakov2024-07-211-22/+35
| | | | | | | 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
* * .github/workflows/windows.yml: Install openssl.Ivan Zhakov2024-07-201-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919417 13f79535-47bb-0310-9956-ffa450edef68
* * .github/workflows/windows.yml: Fix syntax error.Ivan Zhakov2024-07-201-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919416 13f79535-47bb-0310-9956-ffa450edef68
* * .github/workflows/windows.yml: Fix syntax error.Ivan Zhakov2024-07-201-2/+0
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919415 13f79535-47bb-0310-9956-ffa450edef68
* * .github/workflows/windows.yml: Try to use Ninja for Windows CI build.Ivan Zhakov2024-07-201-6/+15
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919414 13f79535-47bb-0310-9956-ffa450edef68
* Remove awk dependency when building using CMake. Before this awk was requiredIvan Zhakov2024-07-203-21/+96
| | | | | | | | | | | | | | | | | 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
* * .github/workflows/windows.yml: Enable VCPKG artifacts caching.Ivan Zhakov2024-07-201-0/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919411 13f79535-47bb-0310-9956-ffa450edef68
* fr doc rebuild.Lucien Gentis2024-07-202-1/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919405 13f79535-47bb-0310-9956-ffa450edef68
* fr doc XML files updates.Lucien Gentis2024-07-202-2/+17
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919404 13f79535-47bb-0310-9956-ffa450edef68
* * build/build-modules-c.awk: Add AP_DECLARE_DATA to ap_prelinked_modules,Ivan Zhakov2024-07-201-3/+3
| | | | | | | | | 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
* * .github/workflows/windows.yml: Add quotes for -DAPR_LIBRARIES argument.Ivan Zhakov2024-07-201-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919399 13f79535-47bb-0310-9956-ffa450edef68
* * .github/workflows/windows.yml: Enable HTTPD private headers when installingIvan Zhakov2024-07-201-1/+1
| | | | | | | APR. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919398 13f79535-47bb-0310-9956-ffa450edef68
* CI: Add Windows GitHub Action job. Not really tested.Ivan Zhakov2024-07-201-0/+54
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919397 13f79535-47bb-0310-9956-ffa450edef68
* * CMakeLists.txt: By default use PCRE2 CMake package if supported.Ivan Zhakov2024-07-201-1/+5
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919395 13f79535-47bb-0310-9956-ffa450edef68
* * os/win32/modules.c: Include "ap_config.h" to match the file generated byIvan Zhakov2024-07-201-0/+1
| | | | | | | | 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
* * os/win32/modules.c: Add AP_DECLARE_DATA to ap_prelinked_module_symbolsIvan Zhakov2024-07-201-1/+1
| | | | | | | 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
* Skip more h2 tests in preforkRainer Jung2024-07-182-2/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919334 13f79535-47bb-0310-9956-ffa450edef68
* Skip h2 tests on preforkRainer Jung2024-07-184-0/+13
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919332 13f79535-47bb-0310-9956-ffa450edef68
* Fix typo in test nameRainer Jung2024-07-171-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919330 13f79535-47bb-0310-9956-ffa450edef68
* mod_rewrite: Better question mark tracking to avoid UnsafeAllow3F. PR 69197.Yann Ylavic2024-07-172-18/+92
| | | | | | | | | | | | | 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
* core: Improve AP_REQUEST_ #defines.Yann Ylavic2024-07-161-2/+2
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919290 13f79535-47bb-0310-9956-ffa450edef68
* Make sure pytest shuts down the web server after each packageRainer Jung2024-07-165-0/+24
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919265 13f79535-47bb-0310-9956-ffa450edef68
* copy the trusted flag from the subrequestEric Covener2024-07-151-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919247 13f79535-47bb-0310-9956-ffa450edef68
* merge leading slashes by defaultEric Covener2024-07-153-1/+26
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919246 13f79535-47bb-0310-9956-ffa450edef68
* core: ap_location_walk() does not deal with the filesystemYann Ylavic2024-07-121-1/+1
| | | | | | | | | | | | 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
* mod_status: "Threads" span three colomns (busy, graceful, idle), not two.Yann Ylavic2024-07-111-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919148 13f79535-47bb-0310-9956-ffa450edef68
* mod_status: Follow up to r1918482: Bump colspan for the new wait-io colomnYann Ylavic2024-07-111-1/+1
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919141 13f79535-47bb-0310-9956-ffa450edef68
* test http1, add version check for trailer testsStefan Eissing2024-07-111-0/+4
| | | | git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1919125 13f79535-47bb-0310-9956-ffa450edef68
* sync test code with mod-h2Stefan Eissing2024-07-107-4/+61
| | | | | | | | | | | | - 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
* mod_md: Keep compat with openssl < 1.1Yann Ylavic2024-07-081-13/+38
| | | | | | | | | 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