svn commit: r706001 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_dir.html.en docs/manual/mod/mod_dir.xml modules/mappers/mod_dir.c

[co...@apache.org]

Author: covener
Date: Sun Oct 19 05:35:42 2008
New Revision: 706001

URL: http://svn.apache.org/viewvc?rev=706001&view=rev
Log:
  *) mod_dir: Support "DirectoryIndex None"
     Suggested By André Warnier <aw ice-sa.com> [Eric Covener]


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en
    httpd/httpd/trunk/docs/manual/mod/mod_dir.xml
    httpd/httpd/trunk/modules/mappers/mod_dir.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=706001&r1=706000&r2=706001&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Oct 19 05:35:42 2008
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+
+  *) mod_dir: Support "DirectoryIndex None" 
+     Suggested By André Warnier <aw ice-sa.com> [Eric Covener]
+
   *) mod_proxy: Add the possibility to set the worker parameters
      connectiontimeout and ping in milliseconds. [Ruediger Pluem]
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en?rev=706001&r1=706000&r2=706001&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_dir.html.en Sun Oct 19 05:35:42 2008
@@ -68,7 +68,7 @@
 <tr><th><a href="directive-dict.html#Description">Description:</a></th><td>List of resources to look for when the client requests
 a directory</td></tr>
 <tr><th><a href="directive-dict.html#Syntax">Syntax:</a></th><td><code>DirectoryIndex
-    <var>local-url</var> [<var>local-url</var>] ...</code></td></tr>
+    None | <var>local-url</var> [<var>local-url</var>] ...</code></td></tr>
 <tr><th><a href="directive-dict.html#Default">Default:</a></th><td><code>DirectoryIndex index.html</code></td></tr>
 <tr><th><a href="directive-dict.html#Context">Context:</a></th><td>server config, virtual host, directory, .htaccess</td></tr>
 <tr><th><a href="directive-dict.html#Override">Override:</a></th><td>Indexes</td></tr>
@@ -105,6 +105,10 @@
     executed if neither <code>index.html</code> or <code>index.txt</code>
     existed in a directory.</p>
 
+    <p>A value of "None" prevents <code class="module"><a href="../mod/mod_dir.html">mod_dir</a></code> from 
+    searching for an index.</p>
+
+
 </div>
 <div class="top"><a href="#page-header"><img alt="top" src="../images/up.gif" /></a></div>
 <div class="directive-section"><h2><a name="DirectorySlash" id="DirectorySlash">DirectorySlash</a> <a name="directoryslash" id="directoryslash">Directive</a></h2>

Modified: httpd/httpd/trunk/docs/manual/mod/mod_dir.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_dir.xml?rev=706001&r1=706000&r2=706001&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_dir.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_dir.xml Sun Oct 19 05:35:42 2008
@@ -58,7 +58,7 @@
 <description>List of resources to look for when the client requests
 a directory</description>
 <syntax>DirectoryIndex
-    <var>local-url</var> [<var>local-url</var>] ...</syntax>
+    None | <var>local-url</var> [<var>local-url</var>] ...</syntax>
 <default>DirectoryIndex index.html</default>
 <contextlist><context>server config</context><context>virtual host</context>
 <context>directory</context><context>.htaccess</context></contextlist>
@@ -94,6 +94,10 @@
     <p>would cause the CGI script <code>/cgi-bin/index.pl</code> to be
     executed if neither <code>index.html</code> or <code>index.txt</code>
     existed in a directory.</p>
+
+    <p>A value of "None" prevents <module>mod_dir</module> from 
+    searching for an index.</p>
+
 </usage>
 </directivesynopsis>
 

Modified: httpd/httpd/trunk/modules/mappers/mod_dir.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/mappers/mod_dir.c?rev=706001&r1=706000&r2=706001&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/mappers/mod_dir.c (original)
+++ httpd/httpd/trunk/modules/mappers/mod_dir.c Sun Oct 19 05:35:42 2008
@@ -51,7 +51,9 @@
     if (!d->index_names) {
         d->index_names = apr_array_make(cmd->pool, 2, sizeof(char *));
     }
-    *(const char **)apr_array_push(d->index_names) = arg;
+    if (strcasecmp(arg, "none")) { 
+        *(const char **)apr_array_push(d->index_names) = arg;
+    }
     return NULL;
 }