[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-447-g572d85a

[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  572d85a6ce2effbad40e81483b23028a8aeeae7f (commit)
       via  48105b1c35517030c91dc4f893c9ecaa6b405681 (commit)
       via  8fd040c4a934bc53c2e841231fe9b555bf59047e (commit)
      from  c1ca053610c4758298e126d3db3b04e802f0c0c2 (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 572d85a6ce2effbad40e81483b23028a8aeeae7f
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Apr 16 16:06:10 2011 +0200

    Http: don't write directly to the socket when appendOutputs on fatal errors.

diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index d37ca13..0e24a2f 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -1329,9 +1329,7 @@ int Http::raiseHTTPError (int ID)
         }
 
       if (td->lastError)
-        {
-          return sendHTTPhardError500 ();
-        }
+        return sendHTTPhardError500 ();
 
       td->lastError = ID;
 
@@ -1477,12 +1475,15 @@ Internal Server Error\n\
   *td->auxiliaryBuffer << time;
   *td->auxiliaryBuffer << "\r\n\r\n";
 
-  td->connection->socket->send (td->auxiliaryBuffer->getBuffer (),
-                                (u_long) td->auxiliaryBuffer->getLength (),
-                                0);
+  if (! td->appendOutputs)
+    {
+      td->connection->socket->send (td->auxiliaryBuffer->getBuffer (),
+                                    td->auxiliaryBuffer->getLength (),
+                                    0);
 
-  if (!td->onlyHeader)
-    td->connection->socket->send (hardHTML, (u_long) strlen (hardHTML), 0);
+      if (! td->onlyHeader)
+        td->connection->socket->send (hardHTML, strlen (hardHTML), 0);
+    }
 
   return HttpDataHandler::RET_FAILURE;
 }



commit 48105b1c35517030c91dc4f893c9ecaa6b405681
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Apr 16 16:02:18 2011 +0200

    Remove unused variable.

diff --git a/myserver/src/base/home_dir/home_dir.cpp 
b/myserver/src/base/home_dir/home_dir.cpp
index 62c3743..e1d3670 100644
--- a/myserver/src/base/home_dir/home_dir.cpp
+++ b/myserver/src/base/home_dir/home_dir.cpp
@@ -246,14 +246,11 @@ int HomeDir::getHomeDir (string& userName, string& out)
   return FilesUtility::nodeExists (out.c_str ()) ? 0 : 1;
 #elif HAVE_GETPWNAM
   struct passwd *p;
-  int ret = 0;
 
   loadMutex.lock ();
   errno = 0;
   p = ::getpwnam (userName.c_str ());
-  if (p == NULL)
-    ret = 1;
-  else
+  if (p != NULL)
     out.assign (p->pw_dir);
 
   loadMutex.unlock ();



commit 8fd040c4a934bc53c2e841231fe9b555bf59047e
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Apr 16 16:02:03 2011 +0200

    Drop the `recursive error' message.

diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index c99e8b2..d37ca13 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -1330,7 +1330,6 @@ int Http::raiseHTTPError (int ID)
 
       if (td->lastError)
         {
-          td->connection->host->warningsLogWrite (_("HTTP: recursive error"));
           return sendHTTPhardError500 ();
         }
 

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

Summary of changes:
 myserver/src/base/home_dir/home_dir.cpp |    5 +----
 myserver/src/protocol/http/http.cpp     |   18 +++++++++---------
 2 files changed, 10 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
GNU MyServer