]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1653941, r1653978, r1656225, r1686853, r1686856 from trunk:
authorJim Jagielski <jim@apache.org>
Thu, 18 Feb 2016 15:04:17 +0000 (15:04 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 18 Feb 2016 15:04:17 +0000 (15:04 +0000)
commit3564b9061c73a443ef3e93d25c5c1c4fedca4af1
tree568fc56bd48fd15afc5eac9f461e5094fc642285
parent38c245ce90b52c1c159029c3c18d415cb17997bd
Merge r1653941, r1653978, r1656225, r1686853, r1686856 from trunk:

mod_alias: Introduce expression parser support for Alias, ScriptAlias
and Redirect.

Use unsigned bit fields.

mod_alias: follow up to r1653941.
Fill empty APLOGNO().

mod_alias: follow up to r1653941.
Limit Redirect expressions to directory (Location) context
and redirect statuses (implicit or explicit).

mod_alias: follow up to r1686853.
Factorize code (no functional change).
Submitted by: minfrin, ylavic, ylavic, ylavic
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1731081 13f79535-47bb-0310-9956-ffa450edef68
CHANGES
STATUS
docs/manual/expr.xml
docs/manual/mod/mod_alias.xml
modules/mappers/mod_alias.c