mod_include.c

Checkout Tools
  • last updated 5 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1174751 is being indexed.

Cleanup effort in prep for GA push:

Trim trailing whitespace... no func change

  1. … 118 more files in changeset.
Simplify some overly complicated code using apr_brigade_putstrs and apr_pstrcat

Submitted by: Christophe Jaillet <christophe jaillet wanadoo fr>,

Stefan Fritsch

  1. … 1 more file in changeset.
Add string valued expressions to ap_expr, do some API cleanup

- add possibility to have expressions that evaluate to a string and not to

a boolean value

- modify ap_expr_parse_cmd() interface to support this and make it more

convenient to use in general

- rename AP_EXPR_FLAGS_* to AP_EXPR_FLAG_* for consistency

  1. … 14 more files in changeset.
Simplify code with ap_str_tolower()

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>

Fix cut'n'paste error

Use the new "ap_expr" expression parser.

The old parser can still be used by setting the new directive

SSILegacyExprParser

  1. … 6 more files in changeset.
Fix config setting after r1128430 has changed some elements from int to char

properly merge directory configs in mod_include

  1. … 2 more files in changeset.
Fix various "variable 'x' set but not used" warnings.

  1. … 6 more files in changeset.
mod_include: Add the onerror attribute to the include element, allowing

an URL to be specified to include on error.

  1. … 3 more files in changeset.
Put the expression parser back into mod_include

This reverts r642559 and r642978

mod_include: Move the request_rec within mod_include to be

exposed within include_ctx_t.

  1. … 3 more files in changeset.
mod_include: Reinstate support for UTF-8 character sets by allowing a

variable being echoed or set to be decoded and then encoded as separate

steps. PR47686

  1. … 2 more files in changeset.
Intel's compiler warns about assigning the non-enum value 0 to the

enumeration apr_finfo_t.filetype, which is done when forgetting

the previously-derived file type

use the appropriate enum value APR_NOFILE instead

Also change comparisons of the field with 0 to use APR_NOFILE instead,

as is the practice of some existing code.

  1. … 14 more files in changeset.
- Remove a load of unused variables (or variables that are set but never read).

- Move some declarations into the correct #ifdef scope.

I couldn't compile/test netware, but the changes look obvious enough.

  1. … 9 more files in changeset.
mod_include: recognise "text/html; parameters" as text/html

PR 49616

diagnosed by Andrey Chernov

  1. … 1 more file in changeset.
Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take

advantage of per-module loglevels

  1. … 169 more files in changeset.
Allow fine control over the removal of Last-Modified and ETag headers

within the INCLUDES filter, making it possible to cache responses if

desired. Fix the default value of the SSIAccessEnable directive.

  1. … 2 more files in changeset.
* modules/filters/mod_include.c (handle_printenv): Fix handling of

lazy variables, courtesy of LLVM scan-build.

Bring back OS/2 support.

Reverses r758929 with a little bit of conflict resolution.

  1. … 37 more files in changeset.
Update r795445 patch in the light of rpluem's comments on-list

Typo fix

Fix mod_include potential segfault checking backref from unmatched regexp

http://markmail.org/message/jlc7t5edsjujbe37

Patch by rpluem, lars, niq

  1. … 2 more files in changeset.
Security fix for CVE-2009-1195: fix Options handling such that

'AllowOverride Options=IncludesNoExec' does not permit Includes with

exec= enabled to be configured in an .htaccess file:

* include/http_core.h: Change semantics of Includes/IncludeNoExec

options bits to be additive; OPT_INCLUDES now means SSI is enabled

without exec=. OPT_INCLUDES|OPT_INC_WITH_EXEC means SSI is enabled

with exec=.

* server/core.c (create_core_dir_config): Remove defunct OPT_INCNOEXEC

from default override_opts; no functional change.

(merge_core_dir_configs): Update logic to ensure that exec= is

disabled in a context where IncludesNoexec is configured, even if

Includes-with-exec is permitted in the inherited options set.

(set_allow_opts, set_options): Update to reflect new semantics

of OPT_INCLUDES, OPT_INC_WITH_EXEC.

* server/config.c: Update to remove OPT_INCNOEXEC from default

override_opts; no functional change.

* modules/filters/mod_include.c (includes_filter): Update to reflect

new options semantics - disable exec= support if the

OPT_INC_WITH_EXEC bit is not set.

Submitted by: Jonathan Peatfield <j.s.peatfield damtp.cam.ac.uk>,

jorton

Thanks to: Vincent Danon <vdanon redhat.com>

  1. … 3 more files in changeset.
remove OS/2 platform support

  1. … 31 more files in changeset.
Prevent a case of SSI timefmt-smashing with filter chains including

multiple INCLUDES filters:

* modules/filters/mod_include.c (add_include_vars): Drop unused

timefmt argument.

(add_include_vars_lazy): Take timefmt argument.

(get_include_var, handle_printenv): Pass time format from context.

PR: 39369

Add support for escaping all non-ascii chars to ap_escape_html, and use

it to fix PR#25202: encoding="entity" doesn't work as advertised in

mod_include.

For backport, this'll need an ABI-preserving version that'll be

a minor MMN bump. But if we do that in /trunk/, it'll never change.

  1. … 4 more files in changeset.
Update mod_include for ap_expr update

Update mod_include to use ap_expr API

  1. … 1 more file in changeset.
* Set aside buckets that remain unprocessed in the filter context for the

next filter pass.

PR: 44447

Submitted by: Harald Niesche <harald brokenerror.de>

Reviewed by: rpluem

  1. … 1 more file in changeset.