[myserver-commit] [3076] Default file names, that are used instead of a directory listing, can be defined differently for every virtual host.

[Giuseppe Scrivano]

Revision: 3076
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3076
Author:   gscrivano
Date:     2009-05-03 19:31:20 +0000 (Sun, 03 May 2009)
Log Message:
-----------
Default file names, that are used instead of a directory listing, can be 
defined differently for every virtual host.

Modified Paths:
--------------
    trunk/myserver/documentation/directory_listing.texi
    trunk/myserver/src/protocol/http/http.cpp

Modified: trunk/myserver/documentation/directory_listing.texi
===================================================================
--- trunk/myserver/documentation/directory_listing.texi 2009-05-03 19:31:15 UTC 
(rev 3075)
+++ trunk/myserver/documentation/directory_listing.texi 2009-05-03 19:31:20 UTC 
(rev 3076)
@@ -6,14 +6,14 @@
 
 
 @subsection Default files
-In the @file{myserver.xml} file it is possible to set the default file
-to send instead of the directory content.
+In the @file{myserver.xml} main configuration or in the
address@hidden file, it is possible to set a list of default
+file names to use instead of the directory content.
 
-Default files are defined using a list called @code{http.default_file}
-element and they are checked in the specified order until one is
-found.
-If a default file can't be found in the directory then its content is
-listed.
+Default file names are defined using a list called
address@hidden and they are checked in the specified order
+until one is found.  If the file can't be found in the directory then
+the directory content is listed.
 
 @example
 <DEFINE name="http.default_file">

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp   2009-05-03 19:31:15 UTC (rev 
3075)
+++ trunk/myserver/src/protocol/http/http.cpp   2009-05-03 19:31:20 UTC (rev 
3076)
@@ -1708,8 +1708,11 @@
   int i;
   int ret;
   string key ("http.default_file");
-  NodeTree<string> *node = Server::getInstance()->getNodeTree (key);
+  NodeTree<string> *node = td->securityToken.getNodeTree (key,
+                                                          MYSERVER_VHOST_CONF |
+                                                          
MYSERVER_SERVER_CONF, NULL);
 
+
   if (node)
     {
       list<NodeTree<string>*> *children = node->getChildren ();