[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-402-ga3bccbb

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  a3bccbb22ef3f94797c8a82b85742d79cccf9815 (commit)
      from  0fb04309aed1d0e24d7d987ed27f6baa3f1dac8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------


commit a3bccbb22ef3f94797c8a82b85742d79cccf9815
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Nov 6 16:03:16 2010 +0100

    Fix problem with url mapping.

diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index 27d4229..0395aef 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -290,6 +290,8 @@ int Http::getFilePermissions (string& resource, string& 
directory, string& file,
         }
       catch (FileNotFoundException & e)
         {}
+      catch (DirectoryException & e)
+        {}
 
       if (isDirectory)
         directory.assign (filenamePath);
@@ -487,7 +489,9 @@ int Http::preprocessHttpRequest (string &resource, bool 
yetmapped,
 
           /* Don't exit immediately if we find a non directory element, a
              location handler can be registered after it.  */
-          if (splitPoint && FilesUtility::notDirectory (curr.c_str ()))
+          /* FIXME: do only a stat.  */
+          if (splitPoint && FilesUtility::nodeExists (curr.c_str ())
+              && FilesUtility::notDirectory (curr.c_str ()))
             splitPoint = next;
 
           i = next;
@@ -692,6 +696,8 @@ Http::sendHTTPResource (string& uri, bool systemrequest, 
bool onlyHeader,
         {
           isDirectory = FilesUtility::isDirectory (td->filenamePath.c_str ());
         }
+      catch (DirectoryException & e)
+        {}
       catch (FileNotFoundException & e)
         {}
 

-----------------------------------------------------------------------

Summary of changes:
 myserver/src/protocol/http/http.cpp |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer