From 6278b6ed8e19720131f0a9e1f8c603ac1c436fcd Mon Sep 17 00:00:00 2001 From: Vincent Deffontaines Date: Sun, 14 Oct 2012 12:18:41 +0000 Subject: [PATCH] Documenting the new 'disabled' argument accepted by FallbackResource git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1398065 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_dir.html.en | 17 ++++++++++++----- docs/manual/mod/mod_dir.xml | 17 ++++++++++++----- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en index 2167272de6..a4649036e9 100644 --- a/docs/manual/mod/mod_dir.html.en +++ b/docs/manual/mod/mod_dir.html.en @@ -118,8 +118,8 @@ a directory literally if it has any arguments before or after it, even if they are "disabled" as well.

-

Note: Multiple DirectoryIndex - directives within the same context will add +

Note: Multiple DirectoryIndex + directives within the same context will add to the list of resources to look for rather than replace: 

@@ -228,7 +228,7 @@ a directory
     index.html file. But a request without trailing slash
     would list the directory contents.

     
-	
Also note that some browsers may erroneously change POST requests into GET 
+	
Also note that some browsers may erroneously change POST requests into GET
 	(thus discarding POST data) when a redirect is issued.

 
 
@@ -236,12 +236,14 @@ a directory
 
FallbackResource Directive

 
-
-
+
+
+

 
Description:Define a default URL for requests that don't map to a file
Syntax:FallbackResource local-url
Default:None - httpd will return 404 (Not Found)
Syntax:FallbackResource disabled | local-url
Default:disabled - httpd will return 404 (Not Found)

 
Context:server config, virtual host, directory, .htaccess

 
Override:Indexes

 
Status:Base

 
Module:mod_dir
Compatibility:The disabled argument is available in version
+2.4.4 and later.

 

     
Use this to set a handler for any URL that doesn't map to anything
     in your filesystem, and would otherwise return HTTP 404 (Not Found).
@@ -267,11 +269,16 @@ a directory
 
     
Existing files, such as images, css files, and so on, will be
     served normally.

+    
Use the disabled argument to disable that feature
+    if inheritance from a parent directory is not desired.

     
In a sub-URI, such as http://example.com/blog/ this
     sub-URI has to be supplied as local-url:

     
 <Directory /web/example.com/htdocs/blog>
     FallbackResource /blog/index.php
+</Directory>
+<Directory /web/example.com/htdocs/blog/images>
+    FallbackResource disabled
 </Directory>
     

 
diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml
index caf5197e33..199489f06e 100644
--- a/docs/manual/mod/mod_dir.xml
+++ b/docs/manual/mod/mod_dir.xml
@@ -102,8 +102,8 @@ a directory
     literally if it has any arguments before or after it, even if they are "disabled"
     as well.

 
-    
Note: Multiple DirectoryIndex 
-    directives within the same context will add 
+    
Note: Multiple DirectoryIndex
+    directives within the same context will add
     to the list of resources to look for rather than replace:
     

     
@@ -215,18 +215,20 @@ a directory
     index.html file. But a request without trailing slash
     would list the directory contents.

     
-	
Also note that some browsers may erroneously change POST requests into GET 
+	
Also note that some browsers may erroneously change POST requests into GET
 	(thus discarding POST data) when a redirect is issued.

 
 
 
 FallbackResource
 Define a default URL for requests that don't map to a file
-FallbackResource local-url
-None - httpd will return 404 (Not Found)
+FallbackResource disabled | local-url
+disabled - httpd will return 404 (Not Found)
 server configvirtual host
 directory.htaccess
 Indexes
+The disabled argument is available in version
+2.4.4 and later.
 
     
Use this to set a handler for any URL that doesn't map to anything
     in your filesystem, and would otherwise return HTTP 404 (Not Found).
@@ -250,11 +252,16 @@ a directory
     
     
Existing files, such as images, css files, and so on, will be
     served normally.

+    
Use the disabled argument to disable that feature
+    if inheritance from a parent directory is not desired.

     
In a sub-URI, such as http://example.com/blog/ this
     sub-URI has to be supplied as local-url:

     
 <Directory /web/example.com/htdocs/blog>
     FallbackResource /blog/index.php
+</Directory>
+<Directory /web/example.com/htdocs/blog/images>
+    FallbackResource disabled
 </Directory>
     
 
-- 
2.40.0