summaryrefslogtreecommitdiffstats
path: root/include (unfollow)
Commit message (Collapse)AuthorFilesLines
2023-03-20pytests: test_tls_05_proto_1_3: Don't rely on ↵Yann Ylavic1-4/+1
TlsTestEnv.curl_supports_tls_1_3() (always False). git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908575 13f79535-47bb-0310-9956-ffa450edef68
2023-03-20pytests: Use python3-multipart lib.Yann Ylavic9-54/+126
Use the API of https://github.com/andrew-d/python-multipart, available as package python3-multipart on Debian/Ubuntu. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908574 13f79535-47bb-0310-9956-ffa450edef68
2023-03-20ci: Disable MOD_TLS test suite for now (never passing).Yann Ylavic1-11/+12
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908561 13f79535-47bb-0310-9956-ffa450edef68
2023-03-20Follow up to r1908380: MMN minor bump for AP_CTIME_OPTION_GMTOFF.Yann Ylavic1-1/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908557 13f79535-47bb-0310-9956-ffa450edef68
2023-03-20util_time: Follow up to r1908380 and r1908389: apr_strings.h not needed anymore.Yann Ylavic1-1/+0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908556 13f79535-47bb-0310-9956-ffa450edef68
2023-03-19ci: -Werror does not need -Wno-deprecated-declarations anymore for openssl >= 3Yann Ylavic1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908542 13f79535-47bb-0310-9956-ffa450edef68
2023-03-19mod_md: Fix compat warnings with OpenSSL 3.0.Yann Ylavic1-12/+31
* md/md_crypt.c(md_pkey_get_rsa_e64, md_pkey_get_rsa_n64): Replace deprecated RSA api with EVP_PKEY_get_bn_param on openssl >= 3.0. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908539 13f79535-47bb-0310-9956-ffa450edef68
2023-03-19mod_ssl: Fix deprecation warnings with openssl-3.Yann Ylavic13-140/+288
* mod_ssl_openssl.h: Make it the first openssl to be included openssl header, selecting the OpenSSL api based on OPENSSL_API_COMPAT eventually. * ssl_private.h; Define OPENSSL_API_COMPAT to version 1.1.1 (last one supporting EGINE_ API) before including mod_ssl_openssl.h to enable the ENGINE_ api (TODO: switch to new "providers" api before the ENGINE_ api is abandonned..). mod_ssl.h is now implicitely included from there. Fix preprocessor "#define FOO (COND)" to "#if COND #define FOO 1 #else #define FOO 0". Define MODSSL_HAVE_ENGINE_API iff OPENSSL_API_COMPAT < 3.0 (otherwise all the engine features are disabled, only "builtin" is accepted). Define HAVE_SRP iff OPENSSL_API_COMPAT < 3.0 (no replacement for this api above, so it might not be implemenentedain httpd anymore at some point..). Define X509_get_not{Before,After} if missing to the non deprecated version. New modssl_set_io_callbacks() to factorize compat code for io callbacks. ssl_dh_GetParamFromFile() becomes modssl_dh_from_file() for openssl < 3.0 and modssl_dh_pkey_from_file() for openssl >= 3.0. * mod_ssl.c, mod_ssl_ct.c, ssl_util_stapling: Including "ssl_private.h" only is suited/enough now. * mod_ssl_ct.c, ssl_ct_log_config: Use EVP api with openssl >= 3 instead of the deprecated SHA256 one. * ssl_engine_config.c(ssl_cmd_SSLCryptoDevice): Disabled engines (besides NULL/"builtin"/NULL) unless MODSSL_HAVE_ENGINE_API. * ssl_engine_init: New compat modssl_runtime_lib_version() to address deprecated SSLeay(). ssl_init_Engine() does nothing unless MODSSL_HAVE_ENGINE_API. Simplify ssl_init_server_certs() (less #ifdef-ery) with scoped local vars. Compat loading DH parameters and EC curve from cert. * ssl_engine_io.c, ssl_engine_kernel.c: Implement common modssl_set_io_callbacks() and use it. * ssl_engine_pphrase(modssl_load_engine_keypair): Depend on MODSSL_HAVE_ENGINE_API, or return ENOTIMPL. * ssl_util.c(modssl_is_engine_id): No engine supported unless MODSSL_HAVE_ENGINE_API. * ssl_util_ssl.c(modssl_dh_pkey_from_file, modssl_ec_group_from_file): Compat with openssl >= 3.0. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908537 13f79535-47bb-0310-9956-ffa450edef68
2023-03-19rerun failing tests with -vEric Covener1-4/+34
Submitted by: covener Github: closes #349 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908531 13f79535-47bb-0310-9956-ffa450edef68
2023-03-18mod_http2: Fix memory leak in calc_sha256_hash().Yann Ylavic1-0/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908502 13f79535-47bb-0310-9956-ffa450edef68
2023-03-18fr doc rebuild.Lucien Gentis2-7/+64
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908497 13f79535-47bb-0310-9956-ffa450edef68
2023-03-18fr doc XML files updates.Lucien Gentis2-9/+70
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908496 13f79535-47bb-0310-9956-ffa450edef68
2023-03-18Typo.Lucien Gentis1-2/+0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908495 13f79535-47bb-0310-9956-ffa450edef68
2023-03-16ab: Use new openssl-3 API when available.Yann Ylavic1-6/+39
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908440 13f79535-47bb-0310-9956-ffa450edef68
2023-03-15no longer correctEric Covener1-2/+0
[skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908425 13f79535-47bb-0310-9956-ffa450edef68
2023-03-15Repurpose test for apr-1.8.x (1.7.x being tested elsewhere already).Yann Ylavic1-2/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908415 13f79535-47bb-0310-9956-ffa450edef68
2023-03-15Update ErrorLogFormat CHANGES entry for the full story.Yann Ylavic1-2/+3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908407 13f79535-47bb-0310-9956-ffa450edef68
2023-03-15core: Follow up to r1908393: comment about where ap_server_conf is set.Yann Ylavic1-2/+2
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908406 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14core: Follow up to r1908393: ap_server_conf to NULL before ap_read_config().Yann Ylavic1-0/+2
Just to be sure.. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908394 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14core: Set ap_server_conf ASAP.Yann Ylavic2-4/+7
* server/config.c(ap_read_config): Set ap_server_conf as soon as it exists (with defaults). * server/main.c(main): Now that ap_server_conf is set by ap_read_config(), just make sure it's not NULL afterward with an ap_assert()ion. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908393 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14log: Follow up to r1908388: ap_server_conf might be NULL.Yann Ylavic1-3/+5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908390 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14util_time: Follow up to r1908380: Avoid apr_snprintf() like others.Yann Ylavic1-6/+10
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908389 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14core: Use the main ErrorLogFormat for ap_log_perror() and while loading vhosts.Yann Ylavic2-1/+13
* server/core.c(create_core_server_config): Init sconf->error_log_format early so that it applies while the vhost is loading. * server/log.c(log_error_core): Get the core_server_config from the main server if no server/config is provided. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908388 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14util_time: Follow up to r1908383: ap_recent_ctime_ex() docx about trailing NUL.Yann Ylavic1-1/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908384 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14util_time: Note/comments about ap_recent_ctime_ex() correctness wrt trailing \0Yann Ylavic1-2/+4
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908383 13f79535-47bb-0310-9956-ffa450edef68
2023-03-14core: Add formats %{z} and %{strftime-format} to ErrorLogFormat. PR 62161.Yann Ylavic4-10/+53
%{z} prints the timezone offset (i.e. "[+-]nnnn") and %{strftime-format} allows any %-format handled by [apr_]strftime(). * include/util_time.h(): Define new AP_CTIME_OPTION_GMTOFF option for ap_recent_ctime_ex(). * server/util_time.c(ap_recent_ctime_ex): Handle AP_CTIME_OPTION_GMTOFF to print "[+-]nnnn" timezone. * server/log.c(log_ctime): If the format contains a '%' it's for strftime(), otherwise it's builtin with new 'z' as AP_CTIME_OPTION_GMTOFF. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908380 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13mod_rewrite's BNEG now replaced by BNE=Yann Ylavic2-6/+10
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908360 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13mod_rewrite: Follow up to r1908347: Use [B, BNE=...] rather than [B=...,BNEG].Yann Ylavic1-11/+23
Replaces BNEG with BNE= for a more flexible syntax. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908359 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13clarify relationshipEric Covener1-10/+14
[skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908353 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13doc BNEG, improve relatedEric Covener2-1/+37
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908352 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13unclosed Eric Covener1-1/+1
[skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908351 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13mod_rewrite: New BNEG flag to negate B=, BCTLS and B= not mutually exclusive.Yann Ylavic1-33/+16
* modules/mappers/mod_rewrite.c(escape_backref): Handle [B=...,BNEG] to encode anthing not in B=, and [B=...,BCTLS] to encode both controls/space characters and anything set in B=. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908347 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13Do not double encode encoded slashesRuediger Pluem13-23/+89
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. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908341 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13Stop dumping error_log on failure, since is is now capturedJoe Orton1-4/+0
(at least in theory) as an artefact. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908340 13f79535-47bb-0310-9956-ffa450edef68
2023-03-13* Favour HUGE_STRING_LEN * 2 over 1024 * 16Ruediger Pluem1-3/+3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908339 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11move B=xx example to the bottomEric Covener1-4/+13
show example with quoted flags and a space git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908302 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11add [BCTLS] alternative to [B] for 2.4.56 problemsEric Covener3-7/+34
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908301 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11followup to r1908296: only for redirectsEric Covener1-2/+1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908299 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11allow decoded chars when they will be escapedEric Covener2-18/+30
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908296 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11fr doc rebuild.Lucien Gentis3-44/+54
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908284 13f79535-47bb-0310-9956-ffa450edef68
2023-03-11fr doc XML files updates.Lucien Gentis2-3/+13
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908283 13f79535-47bb-0310-9956-ffa450edef68
2023-03-10mod_proxy: Check the query-string for proxy-noencode too.Yann Ylavic5-50/+50
Follow up to r1907972 and r1908095. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908257 13f79535-47bb-0310-9956-ffa450edef68
2023-03-10iFix proxy backend connection reuse tests.Rainer Jung1-18/+21
Use one curl exec with multiple URLs instead of separate curl calls, so that we make sure we use the same connection to the web server ending up in the same httpd child process. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908230 13f79535-47bb-0310-9956-ffa450edef68
2023-03-10Support splitting mutiple outputs when using curl withRainer Jung3-9/+35
multiple URLs. E.g. provide a JSON array with the individual JSON responses as items. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908229 13f79535-47bb-0310-9956-ffa450edef68
2023-03-09Make test more robust, log might have a short delay.Rainer Jung1-0/+3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908228 13f79535-47bb-0310-9956-ffa450edef68
2023-03-09Fix tests test_202_trailer.py::TestTrailers::test_h2_202_03bRainer Jung1-1/+3
and test_202_trailer.py::TestTrailers::test_h2_202_04 by adding an explicit Content-Type header to the nghttp call. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1908220 13f79535-47bb-0310-9956-ffa450edef68