From: Vincent Deffontaines Date: Sun, 14 Oct 2012 12:45:41 +0000 (+0000) Subject: Reverting commits r1398064 (src) and r1398065 (doc) as the approval process was not... X-Git-Tag: 2.4.4~490 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1055cbf5b1a846d2e9b23c0ca990eae5a4e679c;p=apache Reverting commits r1398064 (src) and r1398065 (doc) as the approval process was not applied. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1398071 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_dir.html.en b/docs/manual/mod/mod_dir.html.en index a4649036e9..5beee51480 100644 --- a/docs/manual/mod/mod_dir.html.en +++ b/docs/manual/mod/mod_dir.html.en @@ -66,7 +66,7 @@
  • DirectorySlash
  • FallbackResource
    • - +
    top

    DirectoryIndex Directive

    @@ -118,32 +118,6 @@ 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 - to the list of resources to look for rather than replace: -

    - 
    -# Example A: Set index.html as an index page, then add index.php to that list as well.
-<Directory /foo>
-    DirectoryIndex index.html
-    DirectoryIndex index.php
-</Directory>
-
-# Example B: This is identical to example A, except it's done with a single directive.
-<Directory /foo>
-    DirectoryIndex index.html index.php
-</Directory>
-
-# Example C: To replace the list, you must explicitly reset it first:
-# In this example, only index.php will remain as an index resource.
-<Directory /foo>
-    DirectoryIndex index.html
-    DirectoryIndex disabled
-    DirectoryIndex index.php
-</Directory>
-
    - -
    top
    @@ -228,7 +202,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,14 +210,12 @@ a directory

    FallbackResource Directive

    - - + + -
    Description:Define a default URL for requests that don't map to a file
    Syntax:FallbackResource disabled | local-url
    Default:disabled - httpd will return 404 (Not Found)
    Syntax:FallbackResource local-url
    Default:None - 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). @@ -269,16 +241,11 @@ 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>
    @@ -291,27 +258,10 @@ a directory  ja  |  ko  |  tr 

    -
    top

    Comments

    Notice:
    This is not a Q&A section. Comments placed here should be pointed towards suggestions on improving the documentation or server, and may be removed again by our moderators if they are either implemented or considered invalid/off-topic. Questions on how to manage the Apache HTTP Server should be directed at either our IRC channel, #httpd, on Freenode, or sent to our mailing lists.
    -
    diff --git a/docs/manual/mod/mod_dir.xml b/docs/manual/mod/mod_dir.xml index 199489f06e..caf5197e33 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,20 +215,18 @@ 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 disabled | local-url -disabled - httpd will return 404 (Not Found) +FallbackResource local-url +None - 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). @@ -252,16 +250,11 @@ 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/modules/mappers/mod_dir.c b/modules/mappers/mod_dir.c index 4364ff9551..52d0273e5d 100644 --- a/modules/mappers/mod_dir.c +++ b/modules/mappers/mod_dir.c @@ -162,7 +162,7 @@ static int fixup_dflt(request_rec *r) int error_notfound = 0; name_ptr = d->dflt; - if ((name_ptr == NULL) || !(strcasecmp(name_ptr,"disabled"))){ + if (name_ptr == NULL) { return DECLINED; } /* XXX: if FallbackResource points to something that doesn't exist,