[myserver-commit] [3034] wrong merge with old sources(e.g.

[Alexandru IANCU]

Revision: 3034
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3034
Author:   andu
Date:     2009-03-28 12:54:34 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
wrong merge with old sources(e.g. files_utility.cpp, mime_manager.cpp, 
vhost_manager.cpp, http.cpp) - reverting to previous version

Modified Paths:
--------------
    trunk/myserver/src/base/file/files_utility.cpp
    trunk/myserver/src/conf/mime/mime_manager.cpp
    trunk/myserver/src/conf/vhost/vhost_manager.cpp
    trunk/myserver/src/protocol/http/http.cpp

Modified: trunk/myserver/src/base/file/files_utility.cpp
===================================================================
--- trunk/myserver/src/base/file/files_utility.cpp      2009-03-28 12:40:28 UTC 
(rev 3033)
+++ trunk/myserver/src/base/file/files_utility.cpp      2009-03-28 12:54:34 UTC 
(rev 3034)
@@ -269,7 +269,6 @@
 #ifdef NOT_WIN
   struct stat F_Stats;
   int ret = stat(filename, &F_Stats);
-  int nErr = errno;
   if(ret < 0)
     return 0;
 

Modified: trunk/myserver/src/conf/mime/mime_manager.cpp
===================================================================
--- trunk/myserver/src/conf/mime/mime_manager.cpp       2009-03-28 12:40:28 UTC 
(rev 3033)
+++ trunk/myserver/src/conf/mime/mime_manager.cpp       2009-03-28 12:54:34 UTC 
(rev 3034)
@@ -170,12 +170,6 @@
     if (!xmlStrcmp (attrs->name, (const xmlChar *)"param") && 
         attrs->children && attrs->children->content)
       rc->cgiManager.assign ((const char*)attrs->children->content);
-    /*
-    if (!xmlStrcmp (attrs->name, (const xmlChar *)"host") && 
-        attrs->children && attrs->children->content)
-      rc-> = xmlStrcmp (attrs->children->content, 
-                                    (const xmlChar *)"YES");
-*/
   }
 
 

Modified: trunk/myserver/src/conf/vhost/vhost_manager.cpp
===================================================================
--- trunk/myserver/src/conf/vhost/vhost_manager.cpp     2009-03-28 12:40:28 UTC 
(rev 3033)
+++ trunk/myserver/src/conf/vhost/vhost_manager.cpp     2009-03-28 12:54:34 UTC 
(rev 3034)
@@ -378,7 +378,7 @@
           else if(!xmlStrcmp(lcur->name, (const xmlChar *)"LOCATION"))
             {
               string loc (vh->getDocumentRoot());
-              //loc.append ("/");
+              loc.append ("/");
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = 
attrs->next)
                 {
                   if(!xmlStrcmp (attrs->name, (const xmlChar *)"path"))

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp   2009-03-28 12:40:28 UTC (rev 
3033)
+++ trunk/myserver/src/protocol/http/http.cpp   2009-03-28 12:54:34 UTC (rev 
3034)
@@ -820,7 +820,7 @@
     if(ret != 200)
       return raiseHTTPError(ret);
 
-    if(!td->mime && FilesUtility::isDirectory(td->filenamePath.c_str()) /*&& 
filename.empty()*/)
+    if(!td->mime && FilesUtility::isDirectory(td->filenamePath.c_str()))
     {
       return processDefaultFile (uri, td->permissions, onlyHeader);
     }
@@ -844,7 +844,7 @@
       {
         return manager->send (td,
                               td->connection,
-                              filename.c_str(), //td->filenamePath.c_str(),
+                              filename.c_str(),
                               cgiManager,
                               td->mime->selfExecuted,
                               onlyHeader);