[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-220-ga7412d6

[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  a7412d6c1866f790a8bd5931aa76306818fcd79b (commit)
       via  093a5a88e86031d32a49b889e40cd34d45fc4725 (commit)
       via  4e40fe2ca1b6305a387b7bec80fe58c97d3d4d98 (commit)
      from  b53952460e1a76195eff48f216db38054a33b320 (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 a7412d6c1866f790a8bd5931aa76306818fcd79b
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri May 7 17:48:25 2010 +0200

    Remove some libraries not used anymore under mingw32.

diff --git a/myserver/configure.ac b/myserver/configure.ac
index adb5910..3899226 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -96,7 +96,7 @@ AC_CHECK_FUNCS(regcomp setgroups localtime_r posix_fallocate \
 
 case "${host}" in
     *-*-mingw32*)
-     LIBS="$LIBS -lwsock32 -lws2_32 -lgdi32 -lole32  -luuid -luserenv"
+     LIBS="$LIBS -lwsock32 -lws2_32"
      MAKE_MSCGI=yes
      LTCFLAGS=""
      ;;



commit 093a5a88e86031d32a49b889e40cd34d45fc4725
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri May 7 16:35:45 2010 +0200

    Fix some build problems when zlib is not present.

diff --git a/myserver/include/filter/gzip/gzip.h 
b/myserver/include/filter/gzip/gzip.h
index 1aa66c7..768c8d7 100644
--- a/myserver/include/filter/gzip/gzip.h
+++ b/myserver/include/filter/gzip/gzip.h
@@ -23,9 +23,7 @@
 # include <include/filter/filter.h>
 
 # ifdef HAVE_ZLIB
-#  include "zlib.h"
-# else
-#  define z_stream (void*)
+#  include <zlib.h>
 # endif
 
 # define GZIP_HEADER_LENGTH             10
@@ -38,10 +36,12 @@ class Gzip : public Filter
 public:
   struct GzipData
   {
+# ifdef HAVE_ZLIB
     z_stream stream;
     u_long crc;
     u_long data_size;
     u_long initialized;
+# endif
   };
   static u_long compressBound (int size);
 
diff --git a/myserver/include/filter/gzip/gzip_decompress.h 
b/myserver/include/filter/gzip/gzip_decompress.h
index 18e53b8..d53deec 100644
--- a/myserver/include/filter/gzip/gzip_decompress.h
+++ b/myserver/include/filter/gzip/gzip_decompress.h
@@ -25,9 +25,7 @@
 # include <include/filter/gzip/gzip.h>
 
 # ifdef HAVE_ZLIB
-#  include "zlib.h"
-# else
-#  define z_stream (void*)
+#  include <zlib.h>
 # endif
 
 
@@ -36,7 +34,9 @@ class GzipDecompress : public Filter
 public:
   struct GzipData
   {
+# ifdef HAVE_ZLIB
     z_stream stream;
+# endif
     u_long crc;
     u_long data_size;
     u_long initialized;
diff --git a/myserver/src/filter/gzip/gzip.cpp 
b/myserver/src/filter/gzip/gzip.cpp
index 021f2d1..98e3064 100644
--- a/myserver/src/filter/gzip/gzip.cpp
+++ b/myserver/src/filter/gzip/gzip.cpp
@@ -35,9 +35,10 @@
 # include <algorithm>
 #endif
 
+#ifdef HAVE_ZLIB
 char GZIP_HEADER[] = {(char)0x1f, (char)0x8b, Z_DEFLATED,
                                  0, 0, 0, 0, 0, 0, 0x03};
-
+#endif
 
 /*!
  * Initialize the gzip structure value.
@@ -244,12 +245,16 @@ u_long Gzip::getFooter (char *footer, int /*size*/)
  * \param buffer Buffer where write.
  * \param buffersize Buffer length.
  */
-u_long Gzip::getHeader (char *buffer,u_long buffersize)
+u_long Gzip::getHeader (char *buffer, u_long buffersize)
 {
+#if HAVE_ZLIB
   if (buffersize < GZIP_HEADER_LENGTH)
     return 0;
   memcpy (buffer, GZIP_HEADER, GZIP_HEADER_LENGTH);
   return GZIP_HEADER_LENGTH;
+#else
+  return 0;
+#endif
 }
 
 /*!
diff --git a/myserver/src/filter/gzip/gzip_decompress.cpp 
b/myserver/src/filter/gzip/gzip_decompress.cpp
index 4fef3b2..ab2a92a 100644
--- a/myserver/src/filter/gzip/gzip_decompress.cpp
+++ b/myserver/src/filter/gzip/gzip_decompress.cpp
@@ -195,10 +195,14 @@ u_long GzipDecompress::getFooter (char *str, int /*size*/)
  */
 u_long GzipDecompress::getHeader (char *buffer, u_long buffersize)
 {
+#ifdef HAVE_ZLIB
   if (buffersize < GZIP_HEADER_LENGTH)
     return 0;
   memcpy (buffer, GZIP_HEADER, GZIP_HEADER_LENGTH);
   return GZIP_HEADER_LENGTH;
+#else
+  return 0;
+#endif
 }
 
 /*!



commit 4e40fe2ca1b6305a387b7bec80fe58c97d3d4d98
Author: Giuseppe Scrivano <address@hidden>
Date:   Fri May 7 16:35:05 2010 +0200

    The `_E' macro accepts only a parameter.

diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp 
b/myserver/src/http_handler/wincgi/wincgi.cpp
index 143764e..9cdc554 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -366,8 +366,8 @@ int WinCgi::send (HttpThreadContext* td, const char* 
scriptpath,
     }
   catch (exception & e)
     {
-      td->connection->host->warningsLogWrite (_E ("WinCGI: internal error",
-                                                  &e));
+      td->connection->host->warningsLogWrite (_E ("WinCGI: internal error"),
+                                              &e);
       chain.clearAllFilters ();
       return td->http->raiseHTTPError (500);
     }

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

Summary of changes:
 myserver/configure.ac                          |    2 +-
 myserver/include/filter/gzip/gzip.h            |    6 +++---
 myserver/include/filter/gzip/gzip_decompress.h |    6 +++---
 myserver/src/filter/gzip/gzip.cpp              |    9 +++++++--
 myserver/src/filter/gzip/gzip_decompress.cpp   |    4 ++++
 myserver/src/http_handler/wincgi/wincgi.cpp    |    4 ++--
 6 files changed, 20 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
GNU MyServer