Checkout Tools
  • last updated 2 hours ago
Constraints: committers
Constraints: files
Constraints: dates
Merge of r1847430,r1853302 from trunk:

*) core: Split out the ability to parse wildcard files and directories

from the Include/IncludeOptional directives into a generic set of

functions ap_dir_nofnmatch() and ap_dir_fnmatch().

  1. … 6 more files in changeset.
Merge r1769718, r1785943, r1786110, r1786119 from trunk:

add an <IfFile> config section like <IfDefine>

It allows a non httpd config file to be used as a marker directly in

httpd.conf without hiding logic in a script in front of apachectl

to do test -f and pass extra -D's.

This is something we've had in IBM's httpd distro for a little bit and

hadn't remembered to share. I've seen some questions/config files come

up in a few places lately that would benefit from this as an option.

Remove duplicate implementations of conditional section function. No

functional change.

* server/core.c (start_cond_section): Factor out from start_if*.

Adjust to use apr_strmemdup.

(test_ifmod_section, test_iffile_section, test_ifdefine_section):

Move container-specific tests into callbacks from start_if*.

(core_cmds): Adjust <IfFile, <IfDefine, <IfModule to use

start_cond_section with callbacks.

Add <IfDirective> and <IfSection>:

* server/core.c

(test_ifdirective_section, test_ifsection_section): New callbacks.

(core_cmds): Define new directives.

* include/http_config.h, server/config.c (ap_exists_directive):

New function.

* include/ap_mmn.h: Bump MMN minor for above.

* docs/manual/mod/core.xml: Add docs.

* server/core.c (start_cond_section): Comment & variable name fixes,

no functional change.

Submitted by: covener, jorton

Reviewed by: jorton, ylavic, covener

  1. … 7 more files in changeset.
  1. … 30 more files in changeset.
Merge r1809302, r1809303, r1809305, r1809311, r1809314, r1809713 from trunk:

config: allow to specify flags when registering modules.


mod_ssl: follow up to r1809302.


config: follow up to r1809302.

We need to check that the module itself is at the right version.

config: follow up to r1809302.

Provide a convenient function to get module flags, and remove useless

AP_MODULE_HAS_FLAGS checks in the core, core's version is at current MMN.

config: follow up to r1809302.

Associate ap_get_module_flags() to MMN bump.

On the trunk:

mod_ssl: make the new module flag used.

Submitted by: ylavic, icing

Reviewed by: icing, ylavic, covener

  1. … 5 more files in changeset.
Merge r1702948, r1759415 from trunk:

httpd compiles warning free on gcc and every new warning will be treated as an error, standard c-89 is enforced

http_config: follow up to r1702948: maybe unused, yet maybe usefull too.

Submitted by: icing, ylavic

Reviewed/backported by: jim

  1. … 6 more files in changeset.
Merge r1756038 from trunk:

Fix spelling in comments and text files.

No functional change.

PR 59990

Submitted by: rjung

Reviewed/backported by: jim

  1. … 72 more files in changeset.
fix a couple of grammar problems (r1509341 in trunk)
Merge r1389339, r1498880 from trunk:

add pre_htaccess hook; in conjunction with earlier dirwalk_stat

and post_perdir_config hooks, this should allow mpm-itk to be

used without patches to httpd core

Replace pre_htaccess hook with more flexible open_htaccess hook

Submitted by: trawick, sf

Reviewed/backported by: jim

  1. … 10 more files in changeset.
Merge r1406493, r1406495 from trunk:

Make <If> sections in virtual host context fill in cmd->path so that

other directive notice that they are in a config section.

This fixes LogLevel not working in <If> sections that are not in

Location/Directory/File sections.

Make ap_check_cmd_context() treat <If> sections like <File> sections.

This is necessary to properly disallow directives that don't work in


A separate NOT_IN_IF flag may be nicer, but would create much more

hassle when being backported to 2.4.

Submitted by: sf

Reviewed/backported by: jim

  1. … 4 more files in changeset.

core: Add ap_runtime_dir_relative() and DefaultRuntimeDir.

Submitted by: trawick

Reviewed by: jim, minfrin

  1. … 7 more files in changeset.
Merge r1229021 from trunk:

Core configuration: add AllowOverride option to treat syntax

errors in .htaccess as non-fatal.

PR 52439

Submitted by: niq

Reviewed/backported by: jim

  1. … 6 more files in changeset.
Clean up size_t abuse, part 2. ap_malloc/calloc/realloc are explicitly

excluded from this cleanup as they must be signature identical to the

clib functions, and although the definition of size_t has been flakey,

the definition of those functions appears to be generally clean since


Backports: r1228323

  1. … 10 more files in changeset.
Merge r1213338:

Limit length of lines in .htaccess to 8K again, to reduce DoS potential.

Make ap_varbuf_cfg_getline() strictly enforce the max_len parameter.

  1. … 6 more files in changeset.