Commit Graph

33815 Commits

Author SHA1 Message Date
2361315143 CI: add OpenSSL 3.2, test OpenSSL 3.x using Apache::Test
trunk to pick up r1916067.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916068 13f79535-47bb-0310-9956-ffa450edef68
2024-03-01 10:15:13 +00:00
fed3652d82 CI: docs update only. [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916059 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 17:07:55 +00:00
f65a498b3b CI: Add OpenSSL 3.1 builds, including a no-engine build.
(attempt to use 3.2 failed, unsure why)
- add OpenSSL build binaries to $PATH 

Github: closes #415


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916058 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 15:33:38 +00:00
fcaf73d28c * modules/ssl/ssl_engine_pphrase.c (modssl_load_engine_keypair):
Update to avoid GCC warning for no-engine builds where the
  SSLModConfigRec is not used. Also log an error for the ENOTIMPL
  path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916057 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 15:28:36 +00:00
0e7a32bcd4 Fix regression in r1916055 - don't duplicate logic in _run_linux.sh
from _before_linux.sh in whether the perl-framework is used/needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916056 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 14:11:49 +00:00
a1f6da9855 CI tweaks:
- don't install CPAN modules if NO_TEST_FRAMEWORK is set
- remove the workaround for mod_h2 APR build caching which
  should no longer be necessary now caching is fixed
- fix capturing specific perl-framework failures with "TEST -v" mode


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916055 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 14:00:55 +00:00
3736c7a450 mod_ssl: Check SSL_CTX_new() return value
SSL_CTX_new() will return NULL if there was an error creating a new SSL context.

Submitted by: StephenWall
Github: closes #402


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916054 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 13:35:04 +00:00
3b6f3ae781 CI: Re-enable caching for *fixed* versions of apr/apr-util which
should now work correctly (since the version is in the cache key).
For 1.x branches, CLEAR_CACHE must still be used. [skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916053 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 13:30:50 +00:00
39e25a4a18 CI: Enable caching for the rustls install used for mod_tls testing.
Github: closes #416


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916052 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 13:19:26 +00:00
7950b447ab CI: Hopefully fix caching and artifact uploads by creating $JOBID
as a unique key for each job in the matrix, using that as the 
cache key and in each artefact upload (otherwise multiple failures
uploading "error_log" overwrite each other).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916051 13f79535-47bb-0310-9956-ffa450edef68
2024-02-29 12:11:39 +00:00
d57a750cc3 Don't reset the balancer when we create a new child
and don't change shared memory the load balancer is not using.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916004 13f79535-47bb-0310-9956-ffa450edef68
2024-02-26 08:41:28 +00:00
4b8cdfb1fe Ran ./build.sh all to get every previously not-updated file up to speed
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915995 13f79535-47bb-0310-9956-ffa450edef68
2024-02-25 13:38:21 +00:00
c428edfab1 Fix in title, expression, erratas for getting-started.xml.es
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915994 13f79535-47bb-0310-9956-ffa450edef68
2024-02-25 13:30:34 +00:00
fd58fb6c8c Added getting-started.xml.es Spanish Translation + files modified by ./build.sh
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915991 13f79535-47bb-0310-9956-ffa450edef68
2024-02-25 11:47:27 +00:00
339cb1b504 mod_ssl: Follow up to r1913815: szCryptoDevice to NULL when !MODSSL_HAVE_ENGINE_API
Latest OpenSSL versions removed the ENGINE API completely, still provide NULL
SSLModConfigRec::szCryptoDevice since it's used outside MODSSL_HAVE_ENGINE_API.

SSLModConfigRec is a private struct, so no MMN change.

* modules/ssl/ssl_private(SSLModConfigRec):
  Provide szCryptoDevice (NULL) even if !MODSSL_HAVE_ENGINE_API.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915889 13f79535-47bb-0310-9956-ffa450edef68
2024-02-20 10:37:30 +00:00
3703f02db7 * modules/proxy/mod_proxy_scgi.c: Mark global variables as static and
pointers as const. (no functional change)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915874 13f79535-47bb-0310-9956-ffa450edef68
2024-02-19 10:45:36 +00:00
36d9063e61 added dsl.xml.es and dso.html.es.utf8
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915843 13f79535-47bb-0310-9956-ffa450edef68
2024-02-17 18:46:11 +00:00
0d4b6fc3bb Added inicial dso.xml.es translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915841 13f79535-47bb-0310-9956-ffa450edef68
2024-02-17 18:44:27 +00:00
ae90e17a92 Add missing changes-entries.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915785 13f79535-47bb-0310-9956-ffa450edef68
2024-02-14 13:36:58 +00:00
e48a0ef7e2 fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915714 13f79535-47bb-0310-9956-ffa450edef68
2024-02-10 14:32:03 +00:00
1bd6d25c93 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915713 13f79535-47bb-0310-9956-ffa450edef68
2024-02-10 14:30:57 +00:00
834583e16f docs: mod_dav: Remove references to DavLockDB being required
since it's not true for trunk mod_dav_fs; refresh seealso.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915685 13f79535-47bb-0310-9956-ffa450edef68
2024-02-09 10:06:38 +00:00
620b424930 Update SSLProxyMachineCertificateFile compat note after r1915679.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915680 13f79535-47bb-0310-9956-ffa450edef68
2024-02-09 09:13:50 +00:00
669a1e656b mod_dav: Update redirect-carefully example BrowserMatch config to
match more recent client versions.

PR: 66148, 67039
Submitted by: Michal Maloszewski <michal.maloszewski canonical.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915651 13f79535-47bb-0310-9956-ffa450edef68
2024-02-08 14:37:13 +00:00
a046be0dac * modules/filters/mod_xml2enc.c (xml2enc_ffunc): Accept any XML media
type per RFC 7303, plus any text/ type.

PR: 64339
Github: closes #409


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915625 13f79535-47bb-0310-9956-ffa450edef68
2024-02-07 15:26:27 +00:00
bca805ed9f fr doc rebuild.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915567 13f79535-47bb-0310-9956-ffa450edef68
2024-02-03 15:40:32 +00:00
c5f3e16b34 fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915566 13f79535-47bb-0310-9956-ffa450edef68
2024-02-03 15:38:18 +00:00
2547b8c587 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915565 13f79535-47bb-0310-9956-ffa450edef68
2024-02-03 15:35:20 +00:00
75847cd705 Misplaced example title.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915564 13f79535-47bb-0310-9956-ffa450edef68
2024-02-03 15:32:20 +00:00
e8da666beb * server/util_expr_parse.c (yyparse): Fix typo in comment.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915543 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 14:49:06 +00:00
502eca5b0f mod_dav: Add a title to the example config snippet for DavBasePath.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915532 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 11:16:28 +00:00
c97f3faf52 mod_http2 docs: Typo fix
Submitted by: Justin Vreeland <j_vreeland apple.com>
Github: closes #407


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915531 13f79535-47bb-0310-9956-ffa450edef68
2024-02-02 11:12:11 +00:00
93298767a1 Add MPEG-TS file extensions
Submitted by: Mohamed Akram <mohd.akram outlook.com>
Github: closes #372


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915514 13f79535-47bb-0310-9956-ffa450edef68
2024-02-01 15:36:20 +00:00
c76ebdba43 Minor CI changes:
- Add --enable-reduced-exports test.
- test running apachectl -V in the TEST_INSTALL case
- test running httpd -V in the SKIP_TESTING case
- rejig to exit if SKIP_TESTING, un-nest the if block around testing
  (no functional change from this part)

Github: closes #405


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915513 13f79535-47bb-0310-9956-ffa450edef68
2024-02-01 15:34:22 +00:00
aa1476072e * support/htcacheclean.c (list_urls): Continue rather than stopping
after listing a file for each subdirectory.

PR: 65091
Submitted by: Artem Egorenkov <aegorenkov.91 gmail.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915508 13f79535-47bb-0310-9956-ffa450edef68
2024-02-01 08:39:48 +00:00
874b8354d7 Rebuilds a number of pending doc changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915460 13f79535-47bb-0310-9956-ffa450edef68
2024-01-29 18:06:15 +00:00
f854ae2c70 Remove redundant slash from example - mod_proxy doc
Submitted by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>

Github: closes #378


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915459 13f79535-47bb-0310-9956-ffa450edef68
2024-01-29 17:44:31 +00:00
6f96e9e720 Clarifies advice around quoting regular expressions.
Submitted by: nisbet-hubbard <87453615+nisbet-hubbard@users.noreply.github.com>

Github: closes #379


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915443 13f79535-47bb-0310-9956-ffa450edef68
2024-01-29 14:24:31 +00:00
24a4833d49 fill in empty descriptions from command_rec
[skip ci]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915423 13f79535-47bb-0310-9956-ffa450edef68
2024-01-27 14:24:48 +00:00
d7ac4bdcfb Add missing mod_proxy_hchech
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915414 13f79535-47bb-0310-9956-ffa450edef68
2024-01-26 16:26:53 +00:00
309770904d ab needs an additional Ws2_32.lib (like abs)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915413 13f79535-47bb-0310-9956-ffa450edef68
2024-01-26 16:15:18 +00:00
5d32253f11 undo previous commit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915412 13f79535-47bb-0310-9956-ffa450edef68
2024-01-26 16:11:49 +00:00
640df67989 ab needs an additional Ws2_32.lib (like abs)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915411 13f79535-47bb-0310-9956-ffa450edef68
2024-01-26 14:25:15 +00:00
88afb529ab Use ap_os_is_path_absolute() to make it portable.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915400 13f79535-47bb-0310-9956-ffa450edef68
2024-01-25 14:36:45 +00:00
e5b800e1be * Create README.md as symlink to README for better Github rendering [skip ci]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915391 13f79535-47bb-0310-9956-ffa450edef68
2024-01-25 07:09:28 +00:00
1c2e67676d Converts README to markdown (no textual changes) for better display on
Github.

Submitted by: Mayank Patil (Mayank-2545@users.noreply.github.com)

Patch modified to preserve original linebreaks.

Github: closes #363


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915387 13f79535-47bb-0310-9956-ffa450edef68
2024-01-24 21:33:30 +00:00
8268915c90 Updated typo NWGNUmakefile
dependencies was spelled dependancies.

Submitted by: StevenSedwick <133059415+StevenSedwick@users.noreply.github.com>

Github: closes #382


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915380 13f79535-47bb-0310-9956-ffa450edef68
2024-01-24 14:44:49 +00:00
bc0e56cdd3 *) mod_http2: v2.0.26 with the following fixes:
- Fixed `Date` header on requests upgraded from HTTP/1.1 (h2c). Fixes
       <https://github.com/icing/mod_h2/issues/272>.
     - Fixed small memory leak in h2 header bucket free. Thanks to
       Michael Kaufmann for finding this and providing the fix.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915281 13f79535-47bb-0310-9956-ffa450edef68
2024-01-17 08:38:02 +00:00
64ecf00d7c mod_headers: Avoid infinite recursion with the edit* action and empty matches.
Change the recursion used for edit* to a loop using the new ap_regexec_ex()
function taking the current position (offset) in the subject string.

After an empty match do the same thing as pcre2_substitute() (or Perl's /g),
that is: don't allow for another empty match at the same positition by setting
the AP_REG_NOTEMPTY_ATSTART option. If there is a non-empty match use it,
otherwise skip/consume the first character and continue from there.

* modules/metadata/mod_headers.c:
  Rename the hdr_edit_r enum for edit* to hdr_edit_all to better express what
  is does (and since the action is not recursive anymore).

* modules/metadata/mod_headers.c(push_string, push_match):
  New helpers to consume the subject and substitutions in an array of iovec.

* modules/metadata/mod_headers.c(process_regexp):
  Implement the new logic, using push_match() and push_string() to fill the
  iovec array finally passed to apr_strcatv() for the resulting string.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915271 13f79535-47bb-0310-9956-ffa450edef68
2024-01-16 17:40:36 +00:00
33edc793fe Trigger ci.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1915270 13f79535-47bb-0310-9956-ffa450edef68
2024-01-16 17:10:31 +00:00