[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-352-g7b9b773

[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  7b9b7738613c23430876f180bd75efca342dc14a (commit)
       via  b59df2c2079163bf57d4ab8da52dc465a6609a9a (commit)
       via  09939b956cc70d3f02987212f42752b550b7d5ea (commit)
       via  7563eeeb309898e4169ac4dc4180638290762486 (commit)
       via  4e6323e25bd8c058bb8ebe35bcc539dda2cf564d (commit)
       via  739df1d72f263c52c3c5c4bdf398fc046ad53816 (commit)
       via  548df9c666c2a77a1c22fb121f94acebd6880b16 (commit)
      from  edd637be98e01545ef469f0e55499414b71fb9b9 (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 7b9b7738613c23430876f180bd75efca342dc14a
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Aug 22 02:53:43 2010 +0200

    Do not use the stat cache for log files.

diff --git a/myserver/src/log/stream/file_stream.cpp 
b/myserver/src/log/stream/file_stream.cpp
index 701b9f5..3db6202 100644
--- a/myserver/src/log/stream/file_stream.cpp
+++ b/myserver/src/log/stream/file_stream.cpp
@@ -19,11 +19,12 @@
 #include <include/log/stream/file_stream.h>
 
 int const FileStream::defaultFileMask =
-  File::APPEND |
-  File::FILE_OPEN_ALWAYS |
-  File::WRITE |
-  File::READ |
-  File::NO_INHERIT;
+  File::APPEND
+  | File::NO_CACHE_STAT
+  | File::FILE_OPEN_ALWAYS
+  | File::WRITE
+  | File::READ
+  | File::NO_INHERIT;
 
 FileStream::FileStream (FiltersFactory* ff, u_long cycle, Stream* out,
                         FiltersChain* fc) :
diff --git a/myserver/tests/test_file.cpp b/myserver/tests/test_file.cpp
index 15dd712..e34abf2 100644
--- a/myserver/tests/test_file.cpp
+++ b/myserver/tests/test_file.cpp
@@ -53,6 +53,7 @@ class TestFile : public CppUnit::TestFixture
   {
    return  tfile->openFile (fname.c_str (), File::WRITE
                             | File::READ
+                            | File::NO_CACHE_STAT
                             | File::FILE_OPEN_ALWAYS);
   }
 public:
diff --git a/myserver/tests/test_file_stream.cpp 
b/myserver/tests/test_file_stream.cpp
index e0b5117..b71b4ff 100644
--- a/myserver/tests/test_file_stream.cpp
+++ b/myserver/tests/test_file_stream.cpp
@@ -89,7 +89,7 @@ public:
     CPPUNIT_ASSERT (!ls->log (message2, level));
     ls->close ();
     File f;
-    f.openFile ("foo", File::READ | File::OPEN_IF_EXISTS);
+    f.openFile ("foo", File::READ | File::OPEN_IF_EXISTS | 
File::NO_CACHE_STAT);
     char buf[64];
     size_t nbr;
     f.read (buf, 64, &nbr);



commit b59df2c2079163bf57d4ab8da52dc465a6609a9a
Merge: 7563eee 09939b9
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Aug 22 02:29:56 2010 +0200

    Merge branch 'master' of ~/myserver/w32




commit 09939b956cc70d3f02987212f42752b550b7d5ea
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Aug 22 02:20:28 2010 +0200

    Fix some build issues under mingw32

diff --git a/myserver/configure.ac b/myserver/configure.ac
index b1663e0..ec59895 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -56,6 +56,7 @@ AC_C_BIGENDIAN
 LT_INIT
 
 AC_DEFINE([WINVER], [0x0501], [WINVER])
+
 AC_DEFINE([DEPENDS_ON_LIBINTL], [1], [DEPENDS_ON_LIBINTL])
 AC_DEFINE([GNULIB_NAMESPACE], [gnulib], [GNULIB_NAMESPACE])
 
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index d632c04..c4185aa 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -401,7 +401,7 @@ int File::fastCopyToSocket (Socket *dest, off_t firstByte, 
MemBuf *buf, size_t *
   for (;;)
     {
       size_t nbr;
-      u_long tmpNbw;
+      size_t tmpNbw;
 
       if (read (buffer, size, &nbr))
         return -1;
diff --git a/myserver/src/base/read_directory/rec_read_directory.cpp 
b/myserver/src/base/read_directory/rec_read_directory.cpp
index 54b8862..e3e8ce4 100644
--- a/myserver/src/base/read_directory/rec_read_directory.cpp
+++ b/myserver/src/base/read_directory/rec_read_directory.cpp
@@ -16,9 +16,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <fts_.h>
 #include <include/base/read_directory/rec_read_directory.h>
-#include "myserver.h"
+#include <fts_.h>
 
 using namespace std;
 
diff --git a/myserver/src/base/socket/socket.cpp 
b/myserver/src/base/socket/socket.cpp
index 9f74949..aaf10bf 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -25,12 +25,14 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
-#ifndef WIN32
+
 # include <unistd.h>
-# include <netdb.h>
-# include <netinet/in.h>
-# include <arpa/inet.h>
-#endif
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 
 #include <include/base/exceptions/checked.h>
 
diff --git a/myserver/src/http_handler/isapi/isapi.cpp 
b/myserver/src/http_handler/isapi/isapi.cpp
index 14b6dfb..72289a3 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -292,7 +292,7 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID 
Buffer, LPDWORD lpdwByt
                       e = new HttpResponseHeader::Entry ();
                       e->name.assign ("transfer-encoding");
                       e->value.assign ("chunked");
-                      ConnInfo->td->response.other.put (*(e->name), e);
+                      ConnInfo->td->response.other.put (e->name, e);
                     }
                 }
               else
@@ -395,27 +395,36 @@ BOOL WINAPI ISAPI_ReadClientExport (HCONN hConn, LPVOID 
lpvBuffer,
                                    LPDWORD lpdwSize )
 {
   ConnTableRecord *ConnInfo;
-  u_long NumRead;
+  size_t numRead;
 
   Isapi::isapiMutex->lock ();
-  ConnInfo = Isapi::HConnRecord (hConn);
-  Isapi::isapiMutex->unlock ();
+  try
+    {
+      ConnInfo = Isapi::HConnRecord (hConn);
+      Isapi::isapiMutex->unlock ();
+    }
+  catch (...)
+    {
+      Isapi::isapiMutex->unlock ();
+      throw;
+    }
+
   if (ConnInfo == NULL)
-  {
-    ((Vhost*)(ConnInfo->td->connection->host))->warningsLogWrite
-      (_("ISAPI: internal error"));
-    return HttpDataHandler::RET_FAILURE;
-  }
+    {
+      ((Vhost*)(ConnInfo->td->connection->host))->warningsLogWrite
+        (_("ISAPI: internal error"));
+      return HttpDataHandler::RET_FAILURE;
+    }
 
-  ConnInfo->td->inputData.read ((char*) lpvBuffer, *lpdwSize, &NumRead);
+  ConnInfo->td->inputData.read ((char*) lpvBuffer, *lpdwSize, &numRead);
 
-  if (NumRead == -1)
+  if (numRead < 0)
     {
       *lpdwSize = 0;
       return HttpDataHandler::RET_FAILURE;
     }
 
-  *lpdwSize = (DWORD)NumRead;
+  *lpdwSize = (DWORD) numRead;
   return HttpDataHandler::RET_OK;
 }
 
@@ -431,8 +440,16 @@ BOOL WINAPI ISAPI_GetServerVariableExport (HCONN hConn,
   BOOL ret = HttpDataHandler::RET_OK;
 
   Isapi::isapiMutex->lock ();
-  ConnInfo = Isapi::HConnRecord (hConn);
-  Isapi::isapiMutex->unlock ();
+  try
+    {
+      ConnInfo = Isapi::HConnRecord (hConn);
+      Isapi::isapiMutex->unlock ();
+    }
+  catch (...)
+    {
+      Isapi::isapiMutex->unlock ();
+      throw;
+    }
 
   if (ConnInfo == NULL)
     {
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp 
b/myserver/src/http_handler/wincgi/wincgi.cpp
index ffd6ef3..183f076 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -79,7 +79,7 @@ int WinCgi::send (HttpThreadContext* td, const char* 
scriptpath,
   int ret;
   char execname[MAX_PATH];
   char pathname[MAX_PATH];
-  u_long nBytesRead = 0;
+  size_t nBytesRead = 0;
   u_long headerSize = 0;
   size_t nbw = 0;
   ostringstream stream;
@@ -98,8 +98,9 @@ int WinCgi::send (HttpThreadContext* td, const char* 
scriptpath,
       GetShortPathName (dataFilePath,dataFilePath,MAX_PATH);
       sprintf (&dataFilePath[strlen (dataFilePath)],"/data_%u.ini",td->id);
 
-      strcpy (outFilePath,td->outputDataPath.c_str ());
-      strcat (outFilePath,"WC");
+
+      GetShortPathName (outFilePath, dataFilePath, MAX_PATH);
+      sprintf (&outFilePath[strlen (outFilePath)],"/out_%i.ini",td->id);
       td->inputData.seek (0);
       chain.setStream (td->connection->socket);
       if (td->mime)
@@ -315,7 +316,7 @@ int WinCgi::send (HttpThreadContext* td, const char* 
scriptpath,
               return HttpDataHandler::RET_OK;
             }
 
-          u_long written;
+          size_t written;
           chain.write ((char*)(buffer + headerSize), nBytesRead - headerSize,
                        &written);
           nbw += written;



commit 7563eeeb309898e4169ac4dc4180638290762486
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Aug 21 20:54:36 2010 +0200

    Fix error message.

diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp 
b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index 949571f..af1b4cf 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -188,12 +188,12 @@ void XmlVhostHandler::changeLocationsOwner ()
           err = logManager->chown (vh, "ACCESSLOG", uid, gid);
           if (err)
             Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
-                    _("Error while changing accesses log locations owner"));
+                    _("Error while changing accesses log owner"));
 
           err = logManager->chown (vh, "WARNINGLOG", uid, gid);
           if (err)
             Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
-                    _("Error while changing log locations owner"));
+                    _("Error while changing warnings log owner"));
         }
     }
 }



commit 4e6323e25bd8c058bb8ebe35bcc539dda2cf564d
Merge: 739df1d edd637b
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Aug 21 20:39:11 2010 +0200

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




commit 739df1d72f263c52c3c5c4bdf398fc046ad53816
Merge: 548df9c a7412d6
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri May 7 23:57:32 2010 +0200

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




commit 548df9c666c2a77a1c22fb121f94acebd6880b16
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri Apr 9 21:00:26 2010 +0200

    Workaround a linker error when libintl redefines sprintf/snprintf

diff --git a/myserver/myserver.h b/myserver/myserver.h
index 5e1dbed..013c606 100644
--- a/myserver/myserver.h
+++ b/myserver/myserver.h
@@ -48,8 +48,15 @@ typedef void* HANDLE;
 #endif
 
 #ifdef HAVE_GETTEXT
+
+/*XXX: Fix me.  */
+# undef sprintf
+# undef snprintf
+
 # include <libintl.h>
+
 # define _(X) gettext (X)
+
 #else
 # define _(X) X
 #endif

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

Summary of changes:
 myserver/configure.ac                              |    1 +
 myserver/src/base/file/file.cpp                    |    2 +-
 .../src/base/read_directory/rec_read_directory.cpp |    3 +-
 myserver/src/base/socket/socket.cpp                |   12 +++--
 myserver/src/conf/vhost/xml_vhost_handler.cpp      |    4 +-
 myserver/src/http_handler/isapi/isapi.cpp          |   45 +++++++++++++------
 myserver/src/http_handler/wincgi/wincgi.cpp        |    9 ++--
 myserver/src/log/stream/file_stream.cpp            |   11 +++--
 myserver/tests/test_file.cpp                       |    1 +
 myserver/tests/test_file_stream.cpp                |    2 +-
 10 files changed, 56 insertions(+), 34 deletions(-)


hooks/post-receive
-- 
GNU MyServer