]> granicus.if.org Git - apache/commit
Merge r1557641, r1559394, r1559398 from trunk:
authorJim Jagielski <jim@apache.org>
Thu, 23 Jan 2014 14:33:09 +0000 (14:33 +0000)
committerJim Jagielski <jim@apache.org>
Thu, 23 Jan 2014 14:33:09 +0000 (14:33 +0000)
commit0e4717d45f98e39c0ece121e5f0b5d1f0cecf0a8
treeafb351c3daf89f0db9e0a950a55492d13bb4e7f5
parent7cf971441966ff8e54d4fa3ace3008cea1de74b8
Merge r1557641, r1559394, r1559398 from trunk:

don't search for directory indexes/directoryslashes if a URL is in the
middle of being rewritten [in per-dir context]. PR53929

followups to r1557641 suggested by nd -- add
prefix to both the macro and the handler name
itself.

no make depend in sandbox, fix bld break from r1559394

Submitted by: covener
Reviewed/backported by: jim

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1560697 13f79535-47bb-0310-9956-ffa450edef68
STATUS
include/ap_mmn.h
modules/mappers/mod_dir.c
modules/mappers/mod_rewrite.c
modules/mappers/mod_rewrite.h