From: Vincent Deffontaines Date: Sun, 14 Oct 2012 12:32:20 +0000 (+0000) Subject: Documenting the 'disabled' argument to FallbackResource X-Git-Tag: 2.5.0-alpha~6197 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a23f2ef2af78b9872ac264ccd458c871306856ed;p=thirdparty%2Fapache%2Fhttpd.git Documenting the 'disabled' argument to FallbackResource git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1398068 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en index 70e7956d507..afb931af8c1 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,8 +236,8 @@ a directory
 
FallbackResource Directive

 
-
-
+
+
@@ -267,11 +267,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 caf5197e330..8adf266e98e 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,15 +215,15 @@ 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
@@ -250,11 +250,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>
     

 
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