Skip to content

Fix APR-util version tests under APR 2.x - #1047

Merged
notroj merged 3 commits into
apache:trunkfrom
notroj:apu-version-tests
Nov 17, 2026
Merged

notroj merged 3 commits into
apache:trunkfrom
notroj:apu-version-tests

Conversation

@notroj

@notroj notroj commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

Several modules include apu_version.h only under #if !APR_VERSION_AT_LEAST(2,0,0) and then test APU_MAJOR_VERSION > 1. With APR 2.x the macro is then undefined, the test is false, and the pre-1.7 apr_dbm_open() code is compiled instead of the apr_dbm_get_driver() path. APR trunk ships an apu_version.h which maps the APU_*_VERSION macros to the APR ones, so the include is now unconditional in mod_authn_dbm, mod_authz_dbm, mod_socache_dbm, mod_rewrite and mod_proxy_express.

configure.in now requires APR 1.6 in the compile-time check as well, matching the apr-config check. AGENTS.md gains a section on testing APR-util versions and the minimum versions on trunk and 2.4.x.

mod_autht_jwt is deliberately left alone. It tests APU_MAJOR_VERSION before including any header, so it is always built as a stub, and the code behind the test no longer compiles.

🤖 Generated with Claude Code

notroj and others added 3 commits November 16, 2026 21:37
  APR and APR-util versions on trunk and 2.4.x.

[skip ci]

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
* modules/aaa/mod_authn_dbm.c, modules/aaa/mod_authz_dbm.c,
  modules/cache/mod_socache_dbm.c, modules/mappers/mod_rewrite.c,
  modules/proxy/mod_proxy_express.c: Include apu_version.h
  unconditionally.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
  matching the apr-config check. Update the APR-util comment to match
  the version tested.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
@notroj
notroj merged commit fc23b40 into apache:trunk Nov 17, 2026
46 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant