[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-188-gbee7894

[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  bee7894ad4585bca94d75cd71570d123dafad41e (commit)
       via  0e1c4a5cb74c549092cb7be82c723f7596d084ad (commit)
      from  37f99ceb3c2e10533d58aa60afcbde9ba78bfc5f (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 bee7894ad4585bca94d75cd71570d123dafad41e
Merge: 0e1c4a5 37f99ce
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Apr 25 17:23:04 2010 +0200

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/myserver




commit 0e1c4a5cb74c549092cb7be82c723f7596d084ad
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Apr 25 17:22:12 2010 +0200

    Fix some invalid file descriptors tests
    
    A file descriptor is invalid when its value is negative.

diff --git a/myserver/src/base/process/process_server_manager.cpp 
b/myserver/src/base/process/process_server_manager.cpp
index b7d49b2..fe3395d 100644
--- a/myserver/src/base/process/process_server_manager.cpp
+++ b/myserver/src/base/process/process_server_manager.cpp
@@ -567,7 +567,7 @@ int ProcessServerManager::connect (Socket* sock,
   MYSERVER_SOCKADDRIN serverSock = { 0 };
   socklen_t nLength = sizeof (MYSERVER_SOCKADDRIN);
 
-  if (server->socket.getHandle ())
+  if (server->socket.getHandle () >= 0)
     server->socket.getsockname ((MYSERVER_SOCKADDR*) &serverSock, (int*) 
&nLength);
 
   if (!serverSock.ss_family || serverSock.ss_family == AF_INET || 
!server->isLocal)
diff --git a/myserver/src/http_handler/cgi/cgi.cpp 
b/myserver/src/http_handler/cgi/cgi.cpp
index 5ace184..843751b 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -281,7 +281,7 @@ int Cgi::send (HttpThreadContext* td, const char* 
scriptpath,
       cgiProc.terminateProcess ();
 
       /* Delete the file only if it was created by the CGI module.  */
-      if (!td->inputData.getHandle ())
+      if (td->inputData.getHandle () >= 0)
         FilesUtility::deleteFile (td->inputDataPath.c_str ());
     }
   catch (exception & e)
diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index f76b06a..6ce88b0 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -1140,14 +1140,14 @@ int Http::controlConnection (ConnectionPtr a, char*, 
char*, u_long, u_long,
       try
         {
           /* If the inputData file was not closed close it.  */
-          if (td->inputData.getHandle ())
+          if (td->inputData.getHandle () >= 0)
             {
               td->inputData.close ();
               FilesUtility::deleteFile (td->inputDataPath);
             }
 
           /* If the outputData file was not closed close it.  */
-          if (td->outputData.getHandle ())
+          if (td->outputData.getHandle () >= 0)
             {
               td->outputData.close ();
               FilesUtility::deleteFile (td->outputDataPath);

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

Summary of changes:
 .../src/base/process/process_server_manager.cpp    |    2 +-
 myserver/src/http_handler/cgi/cgi.cpp              |    2 +-
 myserver/src/protocol/http/http.cpp                |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU MyServer