[myserver-commit] [2930] Fixed problem with internal redirect to error pages.

[Giuseppe Scrivano]

Revision: 2930
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2930
Author:   gscrivano
Date:     2008-11-02 12:58:40 +0000 (Sun, 02 Nov 2008)

Log Message:
-----------
Fixed problem with internal redirect to error pages.

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

Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp   2008-11-02 12:28:58 UTC (rev 
2929)
+++ trunk/myserver/src/protocol/http/http.cpp   2008-11-02 12:58:40 UTC (rev 
2930)
@@ -810,22 +810,14 @@
     filename.assign(uri);
     td->buffer->setLength(0);
 
+    ret = Http::preprocessHttpRequest(filename, yetmapped, &td->permissions);
+
     if(systemrequest)
-    {
       td->filenamePath.assign(uri);
 
-      getFilePermissions(filename, directory, file, 
-                         td->filenamePath, 1, &td->permissions);
+    if(ret != 200)
+      return raiseHTTPError(ret);
 
-    }
-    else
-    {
-      ret = Http::preprocessHttpRequest(filename, yetmapped, &td->permissions);
-
-      if(ret != 200)
-        return raiseHTTPError(ret);
-    }
-
     if(!td->mime && FilesUtility::isDirectory(td->filenamePath.c_str()))
     {
       return processDefaultFile (uri, td->permissions, onlyHeader);