Commit 6fe83685 authored by Eric Covener's avatar Eric Covener
Browse files

*) mod_dir: Support "DirectoryIndex None" 

     Suggested By André Warnier <aw ice-sa.com> [Eric Covener]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@706001 13f79535-47bb-0310-9956-ffa450edef68
parent baaf860d

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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]

docs/manual/mod/mod_dir.html.en

+5 −1
Changes for docs/manual/mod/mod_dir.html.en: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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 @@ a directory</td></tr> 
    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>

docs/manual/mod/mod_dir.xml

+5 −1
Changes for docs/manual/mod/mod_dir.xml: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -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 @@ a directory</description> 
    <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>

modules/mappers/mod_dir.c

+2 −0
Changes for modules/mappers/mod_dir.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -51,7 +51,9 @@ static const char *add_index(cmd_parms *cmd, void *dummy, const char *arg) 
    if (!d->index_names) {

        d->index_names = apr_array_make(cmd->pool, 2, sizeof(char *));

    }

    if (strcasecmp(arg, "none")) { 

        *(const char **)apr_array_push(d->index_names) = arg;

    }

    return NULL;

}