Skip to content

[pull] trunk from apache:trunk#372

Merged
pull[bot] merged 69 commits intogifhuppp:trunkfrom
apache:trunk
Apr 30, 2026
Merged

[pull] trunk from apache:trunk#372
pull[bot] merged 69 commits intogifhuppp:trunkfrom
apache:trunk

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented Apr 30, 2026 •
edited
Loading

See Commits and Changes for more details.

Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

rbowen and others added 30 commits April 28, 2026 13:05
@rbowen
Replace some very dated content with more general advice.
459014f 
This doc is due for a pretty serious overhaul.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933417 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Replace an example using an attack from ancient history with something
8be6f4e 
more timely.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933420 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Remove reference to a conference presentation from 2007
2dbcaef 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933421 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Fix link to book recommendation.
e91a621 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933423 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Fix doxygen link
3328bba 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933427 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_remoteip: Update PROXY Protocol links
eab7ecc 
Replace the old HAProxy blog post URL (which now redirects to
marketing content) and the outdated 1.8 spec link with the
current PROXY Protocol specification (3.1). Both the summary
and seealso now point to the canonical spec document.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933429 13f79535-47bb-0310-9956-ffa450edef68
fr doc XML files updates.
6260784 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933431 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
rebuild
e5ea091 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933433 13f79535-47bb-0310-9956-ffa450edef68
@bigio
fix support for rfc4291 (ipv6 mapped ipv4 addresses)
035316f 
bz #69672


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933436 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Bulk replacement of old wiki.apache.org URLs with the new
4bc8de1 
cwiki.apache.org URLs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933438 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Rebuild all that stuff
0e424f3 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933439 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Translations for all languages, all files in the rewrite/ docs tree.
716ddee 
This translation was facilitated by AI tools.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933442 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Adds all new translations
fbd975d 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933443 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
weird utf8 character
1f31ad0 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933448 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Fixes several broken/ancient links
5d7e07f 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933449 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Standardize all RFC links to datatracker.ietf.org; fix broken externa…
9e46c5a 
…l links; update AGENTS.md

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933451 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
ssl_compat: Add deprecation banner, remove dead Stronghold link
aed3313 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933453 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Clarify <Location> behavior with forward vs reverse proxy (closes #54…
6294b51 
…309)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933455 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
CacheSocacheMaxSize: document minimum value of 1024 bytes (closes #64…
f5fa3e9 
…882)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933457 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
ForceLanguagePriority: document None option (closes #64888)
5e05a50 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933459 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
howto/auth: fix authn/authz mixup — s/authentication/authorization/ i…
0ff822d 
…n backwards compat section (closes #65132)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933461 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_proxy: document that force-proxy-request-1.0 implies proxy-sendcl…
ca79d35 
… (closes #55401)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933463 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Rebuild HTML, meta files, translation pointers
e285f8f 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933486 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_dir: Document FallbackResource interaction with SetHandler/AddHan…
2e322d7 
…dler (Bug 69640)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933488 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Rebuild HTML (bz69640)
4eab75b 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933490 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
logs: Fix vhost common log format string — add missing %h and %p, fix…
ee23476 
… typo in nickname (Bug 66332)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933492 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Add i18n error document for 504 Gateway Timeout (en/de/fr) (Bug 69651)
76d7d1c 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933494 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_macro: Fix Tips example to use $() instead of ${} to avoid confli…
e2dcd66 
…ct with Define syntax (Bug 66153)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933496 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_ssl: Restore missing compatibility tag for SSLHonorCipherOrder (B…
b9d8796 
…ug 68327)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933498 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
docs: Add <rfc> tag for RFC links — renders to www.rfc-editor.org URL…
59e8f79 
…s on build

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933500 13f79535-47bb-0310-9956-ffa450edef68
rbowen and others added 27 commits April 29, 2026 18:58
@rbowen
docs: Replace HTML entities with UTF-8 characters in French translati…
1d6d0c4 
…ons and error docs (Bug 57878)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933527 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
I'm assuming that &nbsp; in the source was a conscious choice, so rev…
896c5b3 
…erting that conversion.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933529 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_headers: Note that Set-Cookie is an exception to comma-separated …
2834611 
…append per RFC 6265 (Bug 62213)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933534 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_remoteip: Mention CONN_REMOTE_ADDR expression variable (Bug 62300)
4191eec 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933536 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_ssl: Fix SSLUserName FakeBasicAuth docs — directive does affect R…
361bb39 
…EMOTE_USER (Bug 63342)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933538 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_heartmonitor: Clarify HeartbeatMaxServers value range — 0 for fla…
e6cc75b 
…t-file, 10+ for shared memory (Bug 64889)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933540 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Define range for BalancerGrowth
cb745b2 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933542 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
core: Document that TRACE cannot be controlled by <Limit>, use TraceE…
cf49eb9 
…nable instead (Bug 64906)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933543 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
core: Fix ServerName docs — used with UseCanonicalName On, not DNS (B…
9780dc8 
…ug 65092)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933547 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
env: Document REDIRECT_URL, REDIRECT_STATUS and REDIRECT_ variable me…
6dc3e33 
…chanism (Bug 59944, Bug 58739)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933549 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_autoindex: Document NameWidth minimum value (>5) and +/- incompat…
59ab5f5 
…ibility with value-taking IndexOptions (Bug 64907)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933551 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_ssl: Document SSLOCSPEnable no_ocsp_for_cert_ok flag (Bug 65014)
5b71008 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933553 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_ssl: Update StrictRequire docs — replace legacy Satisfy reference…
1a15f61 
…s with RequireAny (Bug 65252)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933555 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_cache: Clarify CacheDisable per-directory context — only Location…
7e64c8c 
… and Proxy, not Directory/Files/If (Bug 64361)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933557 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_proxy: Warn about ProxyPassMatch backreference worker matching an…
3093fe6 
…d connection pooling (Bug 62167, related to Bug 43513)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933559 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_rewrite: Fix remaining .htaccess-specific language in per-directo…
13eea6e 
…ry context docs (Bug 60377 followup)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933562 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Reverts the manpage xsl change from yesterday, which had unfortunate
1eca929 
side effects. I'm not sure what the right solution is here, but it's not
this. Perhaps someone else who understands manpage formatting better can
have a look at this.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933583 13f79535-47bb-0310-9956-ffa450edef68
@notroj
Fix OpenSSL 4.0 compatibility and test that in CI.
e340b81 
CI: Update to test OpenSSL 4.0.0 explicitly.
CI: No longer disable deprecated-declaration warnings for OpenSSL 3.4 -Werror build.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_UserCheck): Change name to
  const X509_NAME *.
  (ssl_callback_proxy_cert): Change ca_name, issuer, and ca_issuer to
  const X509_NAME *.

* modules/ssl/ssl_engine_log.c (ssl_log_cert_error): Change cert
  parameter to const X509 *. Use X509_get0_serialNumber,
  X509_get0_notBefore, and X509_get0_notAfter instead of non-const
  variants.
  (ssl_log_xerror, ssl_log_cxerror, ssl_log_rxerror): Change cert
  parameter to const X509 *.

* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn): Change
  xsname parameter to const X509_NAME *.
  (ssl_var_lookup_ssl_cert_dn_oneline): Change xsname parameter to
  const X509_NAME *.
  (ssl_var_lookup_ssl_cert): Change xsname to const X509_NAME *.
  (ssl_var_lookup_ssl_cert_rfc4523_cea): Change issuer to const
  X509_NAME *.

* modules/ssl/ssl_private.h (ssl_log_xerror, ssl_log_cxerror,
  ssl_log_rxerror): Update declarations to use const X509 *.

* modules/ssl/ssl_util_ssl.c (modssl_X509_NAME_to_string): Change dn
  parameter to const X509_NAME *.
  (getIDs): Change subj to const X509_NAME *.

* modules/ssl/ssl_util_ssl.h (modssl_X509_NAME_to_string): Update
  declaration to use const X509_NAME *.

* support/ab.c (ssl_print_cert_info): Change dn to const X509_NAME *.

mod_ssl: use ASN1_STRING accessor API in dump_extn_value:

* modules/ssl/ssl_engine_vars.c (dump_extn_value): Use
  ASN1_STRING_get0_data() and ASN1_STRING_length() rather than
  directly dereferencing the ASN1_OCTET_STRING structure, which is
  opaque in OpenSSL 4.0.
* modules/ssl/ssl_private.h: Add compat macros for
  ASN1_STRING_get0_data and ASN1_STRING_length for pre-1.1 API.

mod_ssl: constify ASN1_TIME pointers, use X509_get0_not{Before,After}:

* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_valid,
  ssl_var_lookup_ssl_cert_remain): Constify ASN1_TIME * parameter.
  (ssl_var_lookup_ssl_cert): Use X509_get0_notBefore() and
  X509_get0_notAfter() which return const pointers.
  (ssl_var_lookup_ssl_cert_remain): Use ASN1_TIME_check() directly
  rather than INVALID_ASN1_TIME macro which dereferences the
  ASN1_TIME structure.
  (dump_extn_value): Constify ASN1_OCTET_STRING * parameter.
* modules/ssl/ssl_private.h: Add compat macros for
  X509_get0_before and X509_get0_after for pre-1.1 API.

mod_ssl: constify X509_NAME_ENTRY and X509_EXTENSION pointers:

* modules/ssl/ssl_engine_vars.c (ssl_var_lookup_ssl_cert_dn,
  extract_dn): Constify X509_NAME_ENTRY * variables, constify
  X509_NAME * parameter of extract_dn, drop unnecessary casts
  on X509_NAME_ENTRY_get_object() calls.
  (ssl_ext_list): Use MODSSL_X509_EXT_CONST for X509_EXTENSION *
  since X509_EXTENSION accessors are only constified in OpenSSL 4.
* modules/ssl/ssl_util_ssl.c, modules/ssl/ssl_util_ssl.h
  (modssl_X509_NAME_ENTRY_to_string): Constify X509_NAME_ENTRY *
  parameter.
* modules/ssl/ssl_private.h: Add MODSSL_X509_EXT_CONST, defined
  as const for OpenSSL 4+ and empty otherwise.

* modules/ssl/ssl_util_ssl.c (asn1_string_convert): Constify
  ASN1_STRING * argument.
* modules/ssl/ssl_engine_ocsp.c (extract_responder_uri): Use
  modssl_ASN1_STRING_convert instead of directly accessing ASN1_STRING
  data pointer.

* modules/ssl/ssl_util_ssl.c (modssl_ASN1_STRING_convert): Rename from
  asn1_string_convert and export function.
  (asn1_string_to_utf8): Update to use modssl_ASN1_STRING_convert.
  (modssl_X509_NAME_ENTRY_to_string): Update to use
  modssl_ASN1_STRING_convert.

* modules/ssl/ssl_util_ssl.h (modssl_ASN1_STRING_convert): Declare new
  function.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Github: closes #609


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933586 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
This note needs to be inside the usage block, or it breaks the build
f87bd55 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933587 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Rebuild man pages after reverting nroff.xml change
5e1256e 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933589 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Bug 70013: AllowOverride Options - clarify that = is optional; fix Fr…
abe9a43 
…ench translation

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933590 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Bug 65242: Clarify DirectoryCheckHandler On vs Off behavior
b0bdb2e 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933594 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
This adds a "report a bug" link to the main docs nav menu, as per bz#…
0a9f439 
…61218

I'm not entirely convinced that this is a good idea, but it'll be easy
to revert if we decide it's not.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933595 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Change to nav bar causes rebuild of *all* pages.
72065dd 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933598 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
Bug 65038: MaxRequestWorkers default applies to threaded and hybrid MPMs
e2eb21b 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933599 13f79535-47bb-0310-9956-ffa450edef68
@notroj
CI: update actions versions, sync windows.yml with 2.4.x.
029f51f 
Github: closes #641


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933601 13f79535-47bb-0310-9956-ffa450edef68
@rbowen
mod_proxy: clarify ProxyPass ordering in Location blocks (bz#60479)
87d8961 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1933602 13f79535-47bb-0310-9956-ffa450edef68
@pull pull Bot locked and limited conversation to collaborators Apr 30, 2026
@pull pull Bot added the ⤵️ pull label Apr 30, 2026
@pull pull Bot merged commit 87d8961 into gifhuppp:trunk Apr 30, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

⤵️ pull

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rbowen @bigio @notroj
⚡