[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-420-g8530b3e

[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  8530b3e4b9dbed974d50a62d413bae48fed98ae7 (commit)
      from  0e278b4cada64759b8afa2ae64d7756f49435d3c (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 8530b3e4b9dbed974d50a62d413bae48fed98ae7
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Jan 27 21:48:50 2011 +0100

    Http: Move the else branch of the if to make it clearer.

diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index e7f8bf9..24f0637 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -343,13 +343,18 @@ int Http::getFilePermissions (string& resource, string& 
directory, string& file,
            MYSERVER_SECURITY_CONF | MYSERVER_VHOST_CONF | 
MYSERVER_SERVER_CONF);
       *permissions = td->securityToken.getMask ();
 
+      /* By default use the Basic authentication scheme.  */
+      td->authScheme = HTTP_AUTH_SCHEME_BASIC;
+
       /* Check if we have to use digest for the current directory.  */
       if (authType && ! strcasecmp (authType, "Digest"))
         {
           HttpUserData* hud = static_cast<HttpUserData*>
                                                
(td->connection->protocolBuffer);
 
-          if (!td->request.auth.compare ("Digest"))
+          if (td->request.auth.compare ("Digest"))
+            *permissions = 0;
+          else
             {
               if (!hud->digestChecked)
                 {
@@ -372,14 +377,9 @@ int Http::getFilePermissions (string& resource, string& 
directory, string& file,
                   *permissions = td->securityToken.getProvidedMask ();
                 }
             }
-          else
-            *permissions = 0;
 
           td->authScheme = HTTP_AUTH_SCHEME_DIGEST;
         }
-      /* By default use the Basic authentication scheme. */
-      else
-        td->authScheme = HTTP_AUTH_SCHEME_BASIC;
     }
   catch (FileNotFoundException & e)
     {

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

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


hooks/post-receive
-- 
GNU MyServer