[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-392-ge72bdbd

[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  e72bdbd21437c07db04f862f61c147d2a03fcf8f (commit)
       via  2b9e16d4a14998588122512481d054caf847c1f4 (commit)
      from  37dacc479b8e07a31589010168906b0128793f1c (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 e72bdbd21437c07db04f862f61c147d2a03fcf8f
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Sep 16 19:13:54 2010 +0200

    Fix HTTP digest authentication when some values are not used.

diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index c2f6838..27d4229 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -566,7 +566,7 @@ u_long Http::checkDigest ()
     return 0;
 
   digestCount = hexToInt (td->request.digestNc);
-  if (digestCount != hud->nc + 1)
+  if (digestCount && digestCount != hud->nc + 1)
     return 0;
   else
     hud->nc++;
@@ -610,11 +610,16 @@ u_long Http::checkDigest ()
 
   md5.init ();
   td->auxiliaryBuffer->setLength (0);
+
   *td->auxiliaryBuffer << A1 << ":"
                        << hud->nonce << ":"
-                       << td->request.digestNc << ":"
-                       << td->request.digestCnonce << ":"
-                       << td->request.digestQop << ":" << A2;
+                       << td->request.digestNc
+                       << (td->request.digestNc[0] ? ":" : "")
+                       << td->request.digestCnonce
+                       << (td->request.digestCnonce[0] ? ":" : "")
+                       << td->request.digestQop
+                       << (td->request.digestQop[0] ? ":" : "")
+                       << A2;
   md5.update (*td->auxiliaryBuffer);
   md5.end (response);
 



commit 2b9e16d4a14998588122512481d054caf847c1f4
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Sep 16 17:39:31 2010 +0200

    Fix segfault when creating listener sockets

diff --git a/myserver/src/connections_scheduler/listen_threads.cpp 
b/myserver/src/connections_scheduler/listen_threads.cpp
index b8a8d9b..9f3b9ed 100644
--- a/myserver/src/connections_scheduler/listen_threads.cpp
+++ b/myserver/src/connections_scheduler/listen_threads.cpp
@@ -102,7 +102,7 @@ int ListenThreads::createServerAndListener (u_short port)
   catch (exception & e)
     {
       server->log (MYSERVER_LOG_MSG_ERROR,
-                   _E ("Error while creating the server socket : %e"), &e);
+                   _E ("Error while creating the server socket"), &e);
       delete serverSocketIPv4;
       serverSocketIPv4 = NULL;
     }
@@ -133,7 +133,7 @@ int ListenThreads::createServerAndListener (u_short port)
   catch (exception & e)
     {
       server->log (MYSERVER_LOG_MSG_ERROR,
-                   _("Error while creating the IPv6 server socket : %e"), &e);
+                   _("Error while creating the IPv6 server socket"), &e);
       delete serverSocketIPv6;
       serverSocketIPv6 = NULL;
     }

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

Summary of changes:
 .../src/connections_scheduler/listen_threads.cpp   |    4 ++--
 myserver/src/protocol/http/http.cpp                |   13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
GNU MyServer