From MAILER-DAEMON Sun May 02 08:07:33 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O8XxN-0001od-F8
	for mharc-myserver-commit@gnu.org; Sun, 02 May 2010 08:07:33 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O8XxL-0001o5-MB
	for myserver-commit@gnu.org; Sun, 02 May 2010 08:07:31 -0400
Received: from [140.186.70.92] (port=46609 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O8XxK-0001mu-12
	for myserver-commit@gnu.org; Sun, 02 May 2010 08:07:31 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O8XxI-00089p-Nx
	for myserver-commit@gnu.org; Sun, 02 May 2010 08:07:29 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:54189
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O8XxI-00089k-KA
	for myserver-commit@gnu.org; Sun, 02 May 2010 08:07:28 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O8XxI-0007EO-Hq
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:07:28 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1O8XxB-0005iU-VL
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:07:28 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: df7c9552587fa0774a3c736685a5d95fc7e84422
X-Git-Newrev: ad5c1f510e9555267323696692d98282a224b9e1
Message-Id: <E1O8XxB-0005iU-VL@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 02 May 2010 12:07:26 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-206-gad5c1f5
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 02 May 2010 12:07:32 -0000

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  ad5c1f510e9555267323696692d98282a224b9e1 (commit)
       via  ac734d1129c1df81f4966752bd3f01584f8d9ae8 (commit)
       via  d465c28cee3d4e2efd709a2b0b043702ab0ad1e3 (commit)
      from  df7c9552587fa0774a3c736685a5d95fc7e84422 (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 ad5c1f510e9555267323696692d98282a224b9e1
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 2 14:04:46 2010 +0200

    Http path resolution uses `FilesUtility::notDirectory' to save a `stat'

diff --git a/myserver/src/protocol/http/http.cpp b/myserver/src/protocol/http/http.cpp
index 5551af4..423ca64 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -491,8 +491,7 @@ int Http::preprocessHttpRequest (string& filename, int yetmapped,
           if (next >= filenamePathLen)
             break;
 
-          if (mimeLoc || (FilesUtility::nodeExists (curr.c_str ())
-                          && !FilesUtility::isDirectory (curr.c_str ())))
+          if (mimeLoc || FilesUtility::notDirectory (curr.c_str ()))
             {
               td->pathInfo.assign (&(td->filenamePath.c_str ()[next]));
               td->filenamePath.erase (next);



commit ac734d1129c1df81f4966752bd3f01584f8d9ae8
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 2 13:31:15 2010 +0200

    Add new method helper method `notDirectory'

diff --git a/myserver/include/base/file/files_utility.h b/myserver/include/base/file/files_utility.h
index f8e79b4..988ad6f 100644
--- a/myserver/include/base/file/files_utility.h
+++ b/myserver/include/base/file/files_utility.h
@@ -58,7 +58,12 @@ public:
   static int completePath (string &fileName);
 
   static int isDirectory (const char*);
-  static int isDirectory (const string& dir){return isDirectory (dir.c_str ());}
+  static int isDirectory (const string& dir)
+  {return isDirectory (dir.c_str ());}
+
+  static bool notDirectory (const char *path);
+  static bool notDirectory (const string &path)
+  {return notDirectory (path.c_str ());}
 
   static int isLink (const char*);
   static int isLink (const string& dir){return isLink (dir.c_str ());}
diff --git a/myserver/src/base/file/files_utility.cpp b/myserver/src/base/file/files_utility.cpp
index 090f111..1151a35 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -210,6 +210,30 @@ int FilesUtility::deleteFile (const char *filename)
   return 0;
 }
 
+
+/*!
+  Return the result of `nodeExists (PATH) && !isDirectory (PATH)' using a
+  single stat.
+
+  \param path Parameter to `stat'.
+ */
+bool FilesUtility::notDirectory (const char *path)
+{
+  struct stat F_Stats;
+  int err = ::stat (path, &F_Stats);
+  if (err < 0)
+    {
+      if (errno == ENOENT || errno == ENOTDIR)
+        return true;
+
+      /* Raise an exception.  */
+      checked::checkError (err);
+    }
+
+  return (S_ISDIR (F_Stats.st_mode)) ? 0 : 1;
+}
+
+
 /*!
  * Returns a non-null value if the path is a directory.
  * \param filename The path to check.



commit d465c28cee3d4e2efd709a2b0b043702ab0ad1e3
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 2 01:10:44 2010 +0200

    Move `areSymlinksAllowed' helper function to the class `Http'.

diff --git a/myserver/include/protocol/http/http.h b/myserver/include/protocol/http/http.h
index 5d801f2..b3bcdb1 100644
--- a/myserver/include/protocol/http/http.h
+++ b/myserver/include/protocol/http/http.h
@@ -158,6 +158,18 @@ public:
 
   SecurityToken *getSecurityToken (){return &(td->securityToken);}
   HttpProtocol *getStaticData () {return staticData;}
+
+  /* Helper function used in different places.  Probably this is not
+     the best place for it.  */
+  bool areSymlinksAllowed ()
+  {
+    const char *perm = td->securityToken.getData ("symlinks.follow",
+                                                  MYSERVER_VHOST_CONF
+                                                  | MYSERVER_SERVER_CONF,
+                                                  "NO");
+    return strcasecmp (perm, "YES") == 0;
+  }
+
 protected:
   int processDefaultFile (string& uri, int permissions, int onlyHeader);
 
diff --git a/myserver/src/http_handler/http_file/http_file.cpp b/myserver/src/http_handler/http_file/http_file.cpp
index 8018654..3608202 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -36,18 +36,6 @@ using namespace std;
 # include <errno.h>
 #endif
 
-
-/* FIXME: move somewhere else, duplicated in ftp.cpp.  */
-static bool
-areSymlinkAllowed (HttpThreadContext *td)
-{
-  const char *perm = td->securityToken.getData ("symlinks.follow",
-                                                MYSERVER_VHOST_CONF
-                                                | MYSERVER_SERVER_CONF,
-                                                "NO");
-  return strcasecmp (perm, "YES") == 0;
-}
-
 /*!
   Main function to handle the HTTP PUT command.
  */
@@ -68,7 +56,8 @@ int HttpFile::putFile (HttpThreadContext* td, string& filename)
         File file;
         try
           {
-            int symFlags = areSymlinkAllowed (td) ? 0 : File::NO_FOLLOW_SYMLINK;
+            int symFlags = td->http->areSymlinksAllowed () ? 0
+              : File::NO_FOLLOW_SYMLINK;
             file.openFile (td->filenamePath.c_str (), File::OPEN_IF_EXISTS
                            | File::WRITE | symFlags);
           }
@@ -120,7 +109,8 @@ int HttpFile::putFile (HttpThreadContext* td, string& filename)
         File file;
         try
           {
-            int symFlags = areSymlinkAllowed (td) ? 0 : File::NO_FOLLOW_SYMLINK;
+            int symFlags = td->http->areSymlinksAllowed () ? 0
+              : File::NO_FOLLOW_SYMLINK;
             file.openFile (td->filenamePath.c_str (), File::FILE_CREATE_ALWAYS
                            | File::WRITE | symFlags);
           }
@@ -285,7 +275,8 @@ int HttpFile::send (HttpThreadContext* td, const char *filenamePath,
 
       try
         {
-          int symFlags = areSymlinkAllowed (td) ? 0 : File::NO_FOLLOW_SYMLINK;
+          int symFlags = td->http->areSymlinksAllowed () ? 0
+            : File::NO_FOLLOW_SYMLINK;
           file = Server::getInstance ()->getCachedFiles ()->open (filenamePath,
                                                                   symFlags);
           if (! file)
diff --git a/myserver/src/protocol/ftp/ftp.cpp b/myserver/src/protocol/ftp/ftp.cpp
index 59c23b3..3652a61 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -48,7 +48,7 @@ static DEFINE_THREAD (ReceiveAsciiFile, pParam);
 static DEFINE_THREAD (ReceiveImageFile, pParam);
 
 
-/* FIXME: move somewhere else, duplicated in http_file.cpp.  */
+/* FIXME: move somewhere else.  */
 static bool
 areSymlinkAllowed (SecurityToken *st)
 {

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

Summary of changes:
 myserver/include/base/file/files_utility.h        |    7 +++++-
 myserver/include/protocol/http/http.h             |   12 ++++++++++
 myserver/src/base/file/files_utility.cpp          |   24 +++++++++++++++++++++
 myserver/src/http_handler/http_file/http_file.cpp |   21 +++++-------------
 myserver/src/protocol/ftp/ftp.cpp                 |    2 +-
 myserver/src/protocol/http/http.cpp               |    3 +-
 6 files changed, 50 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sun May 02 12:23:14 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O8bwn-0005S0-Rh
	for mharc-myserver-commit@gnu.org; Sun, 02 May 2010 12:23:13 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O8bwl-0005Ro-O0
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:23:11 -0400
Received: from [140.186.70.92] (port=48623 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O8bwk-0005Rg-5b
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:23:11 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O8bwi-0004GR-S9
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:23:09 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:59651
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O8bwi-0004GK-QJ
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:23:08 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O8bwi-0001px-4J
	for myserver-commit@gnu.org; Sun, 02 May 2010 16:23:08 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1O8bwd-00023U-7O
	for myserver-commit@gnu.org; Sun, 02 May 2010 16:23:08 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ad5c1f510e9555267323696692d98282a224b9e1
X-Git-Newrev: 6ca61b7efcd69043d6d44b15b8d72d80a1fd1dd7
Message-Id: <E1O8bwd-00023U-7O@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 02 May 2010 16:23:06 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-207-g6ca61b7
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 02 May 2010 16:23:12 -0000

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  6ca61b7efcd69043d6d44b15b8d72d80a1fd1dd7 (commit)
      from  ad5c1f510e9555267323696692d98282a224b9e1 (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 6ca61b7efcd69043d6d44b15b8d72d80a1fd1dd7
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 2 18:23:18 2010 +0200

    Mention that symlinks are followed if they aren't the final path component

diff --git a/myserver/documentation/mime_types.texi b/myserver/documentation/mime_types.texi
index 26b18c1..bffaba1 100644
--- a/myserver/documentation/mime_types.texi
+++ b/myserver/documentation/mime_types.texi
@@ -154,7 +154,8 @@ line in the @file{myserver.xml} file.
 	<DEFINE name="symlinks.follow" value="YES" />
 @end example
 
-By default MyServer doesn't follow symbolic links.
+By default MyServer doesn't follow symbolic links.  Symbolic links are
+still followed when they are not the last component of the path.
 
 @section Different MIME type handlers
 It is possible to use different handlers to determine the file MIME

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

Summary of changes:
 myserver/documentation/mime_types.texi |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sun May 02 12:51:53 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O8cOX-00046M-7x
	for mharc-myserver-commit@gnu.org; Sun, 02 May 2010 12:51:53 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O8cOV-00046H-7H
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:51:51 -0400
Received: from [140.186.70.92] (port=32926 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O8cOS-000469-3m
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:51:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <francesco.pipita@gmail.com>) id 1O8cOQ-00086A-9f
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:51:48 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:46023
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <francesco.pipita@gmail.com>) id 1O8cOQ-000866-7L
	for myserver-commit@gnu.org; Sun, 02 May 2010 12:51:46 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <francesco.pipita@gmail.com>) id 1O8cOQ-0002Ca-3J
	for myserver-commit@gnu.org; Sun, 02 May 2010 16:51:46 +0000
Received: from francesco_pipita by vcs-noshell.in.savannah.gnu.org with local
	(Exim 4.69) (envelope-from <francesco_pipita@savannah.gnu.org>)
	id 1O8cOQ-0003TJ-07
	for myserver-commit@gnu.org; Sun, 02 May 2010 16:51:46 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6ca61b7efcd69043d6d44b15b8d72d80a1fd1dd7
X-Git-Newrev: bcb6eb8dfbd355060a73024b8aaa3d6b8b80e47e
Message-Id: <E1O8cOQ-0003TJ-07@vcs-noshell.in.savannah.gnu.org>
From: Francesco Pipita <francesco.pipita@gmail.com>
Date: Sun, 02 May 2010 16:51:46 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-210-gbcb6eb8
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 02 May 2010 16:51:51 -0000

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  bcb6eb8dfbd355060a73024b8aaa3d6b8b80e47e (commit)
       via  7ea20a520aacd3c9aef5f62a9089d4e425711738 (commit)
       via  7fc4c8d9ee1ea92306f9577aa44b61d7b0c52a2d (commit)
      from  6ca61b7efcd69043d6d44b15b8d72d80a1fd1dd7 (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 bcb6eb8dfbd355060a73024b8aaa3d6b8b80e47e
Merge: 7ea20a5 6ca61b7
Author: Francesco Pipita <francesco.pipita@gmail.com>
Date:   Sun May 2 18:51:16 2010 +0200

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




commit 7ea20a520aacd3c9aef5f62a9089d4e425711738
Author: Francesco Pipita <francesco.pipita@gmail.com>
Date:   Sun May 2 18:44:30 2010 +0200

    Little optimization in the log-related methods of the LogManager.

diff --git a/myserver/include/log/log_manager.h b/myserver/include/log/log_manager.h
index 31230af..8b7a8e3 100644
--- a/myserver/include/log/log_manager.h
+++ b/myserver/include/log/log_manager.h
@@ -16,7 +16,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef LOG_MANAGER_H
+# ifndef LOG_MANAGER_H
 # define LOG_MANAGER_H
 
 # include "myserver.h"
diff --git a/myserver/include/log/stream/console_stream.h b/myserver/include/log/stream/console_stream.h
index e526d52..61ca481 100644
--- a/myserver/include/log/stream/console_stream.h
+++ b/myserver/include/log/stream/console_stream.h
@@ -32,7 +32,8 @@ class ConsoleStream : public LogStream
 {
 public:
   ConsoleStream (FiltersFactory*, u_long, Stream*, FiltersChain*);
-  virtual int setMode (LoggingLevel level);
+  virtual int initialize (LoggingLevel);
+  virtual int finalize ();
 };
 
 #endif
diff --git a/myserver/include/log/stream/log_stream.h b/myserver/include/log/stream/log_stream.h
index c36b134..65055f9 100644
--- a/myserver/include/log/stream/log_stream.h
+++ b/myserver/include/log/stream/log_stream.h
@@ -33,11 +33,6 @@ using namespace std;
 
 enum LoggingLevel
   {
-    /* The MYSERVER_LOG_MSG_PLAIN is only used within the
-     * LogManager class to print new lines with normal text
-     * attributes over the ConsoleStream.
-     */
-    MYSERVER_LOG_MSG_PLAIN,
     MYSERVER_LOG_MSG_INFO,
     MYSERVER_LOG_MSG_WARNING,
     MYSERVER_LOG_MSG_ERROR
@@ -49,8 +44,7 @@ enum LogStreamEvent
     MYSERVER_LOG_EVT_LOG,
     MYSERVER_LOG_EVT_CLOSE,
     MYSERVER_LOG_EVT_ADD_FILTER,
-    MYSERVER_LOG_EVT_CHOWN,
-    MYSERVER_LOG_EVT_SET_MODE
+    MYSERVER_LOG_EVT_CHOWN
   };
 
 class LogStream
@@ -70,13 +64,14 @@ public:
   int setCycle (u_long cycle);
   int needToCycle ();
   list<string>& getCycledStreams ();
-  virtual int log (const string & message);
+  virtual int log (const string & message, LoggingLevel);
   virtual u_long streamSize ();
   virtual int chown (int uid, int gid);
-  virtual int setMode (LoggingLevel level);
   virtual ~LogStream ();
 protected:
   virtual int streamCycle ();
+  virtual int initialize (LoggingLevel);
+  virtual int finalize ();
   int doCycle ();
   int write (const string &message);
   int resetFilters ();
diff --git a/myserver/src/log/log_manager.cpp b/myserver/src/log/log_manager.cpp
index b5bd4d4..492485b 100644
--- a/myserver/src/log/log_manager.cpp
+++ b/myserver/src/log/log_manager.cpp
@@ -475,17 +475,15 @@ LogManager::log (const void* owner, string & message, bool appendNL,
   mutex->lock ();
   try
     {
-      failure = notify (owner, MYSERVER_LOG_EVT_SET_MODE,
-                        static_cast<void*>(&level))
-        || notify (owner,MYSERVER_LOG_EVT_LOG, &message);
       if (appendNL)
         {
-          LoggingLevel l = MYSERVER_LOG_MSG_PLAIN;
-          failure |= (notify (owner, MYSERVER_LOG_EVT_SET_MODE,
-                              (static_cast<void*>(&l)))
-                      || notify (owner, MYSERVER_LOG_EVT_LOG,
-                                 (static_cast<void*>(&newline))));
+          message.append (newline);
         }
+
+      void* params[2];
+      params[0] = static_cast<void*>(&message);
+      params[1] = static_cast<void*>(&level);
+      failure = notify (owner, MYSERVER_LOG_EVT_LOG, params);
     }
   catch (...)
     {
@@ -521,19 +519,15 @@ LogManager::log (const void* owner, const string & type, string & message,
   mutex->lock ();
   try
     {
-      failure = notify (owner, type, MYSERVER_LOG_EVT_SET_MODE,
-                        static_cast<void*>(&level))
-        || notify (owner, type, MYSERVER_LOG_EVT_LOG,
-                   static_cast<void*>(&message));
-
       if (appendNL)
         {
-          LoggingLevel l = MYSERVER_LOG_MSG_PLAIN;
-          failure |= (notify (owner, MYSERVER_LOG_EVT_SET_MODE,
-                              (static_cast<void*>(&l)))
-                      || notify (owner, MYSERVER_LOG_EVT_LOG,
-                                 (static_cast<void*>(&newline))));
+          message.append (newline);
         }
+
+      void* params[2];
+      params[0] = static_cast<void*>(&message);
+      params[1] = static_cast<void*>(&level);
+      failure = notify (owner, type, MYSERVER_LOG_EVT_LOG, params);
     }
   catch (...)
     {
@@ -571,17 +565,15 @@ LogManager::log (const void* owner, const string & type, const string & location
   mutex->lock ();
   try
     {
-      failure = notify (owner, type, MYSERVER_LOG_EVT_SET_MODE, &level)
-        || notify (owner, type, MYSERVER_LOG_EVT_LOG, &message);
-
       if (appendNL)
         {
-          LoggingLevel l = MYSERVER_LOG_MSG_PLAIN;
-          failure |= notify (owner, MYSERVER_LOG_EVT_SET_MODE,
-                             (static_cast<void*>(&l)))
-            || notify (owner, MYSERVER_LOG_EVT_LOG,
-                       static_cast<void*>(&newline));
+          message.append (newline);
         }
+
+      void* params[2];
+      params[0] = static_cast<void*>(&message);
+      params[1] = static_cast<void*>(&level);
+      failure = notify (owner, type, location, MYSERVER_LOG_EVT_LOG, params);
     }
   catch (...)
     {
@@ -647,6 +639,7 @@ LogManager::log (const void* owner, const string & type, LoggingLevel level,
 {
   int failure = 0;
   ostringstream oss;
+  string message;
 
   if (level < this->level)
     return 1;
@@ -667,8 +660,7 @@ LogManager::log (const void* owner, const string & type, LoggingLevel level,
           time[len + 3] = '-';
           time[len + 4] = ' ';
           time[len + 5] = '\0';
-          string timestr (time);
-          failure |= notify (owner, MYSERVER_LOG_EVT_LOG, &timestr);
+          message.append (time);
         }
 
       while (*fmt)
@@ -709,14 +701,18 @@ LogManager::log (const void* owner, const string & type, LoggingLevel level,
           fmt++;
         }
 
-      string message = oss.str ();
-
-      failure = notify (owner, type, MYSERVER_LOG_EVT_SET_MODE,
-                        static_cast<void*>(&level))
-             || notify (owner, type, MYSERVER_LOG_EVT_LOG, &message);
+      message.append (oss.str ());
 
       if (appendNL)
-        failure |= notify (owner, type, MYSERVER_LOG_EVT_LOG, &newline);
+        {
+          message.append (newline);
+        }
+
+      void* params[2];
+      params[0] = static_cast<void*>(&message);
+      params[1] = static_cast<void*>(&level);
+
+      failure |= notify (owner, type, MYSERVER_LOG_EVT_LOG, params);
     }
   catch (...)
     {
diff --git a/myserver/src/log/stream/console_stream.cpp b/myserver/src/log/stream/console_stream.cpp
index 01ddbad..f7c02b2 100644
--- a/myserver/src/log/stream/console_stream.cpp
+++ b/myserver/src/log/stream/console_stream.cpp
@@ -25,31 +25,21 @@ ConsoleStream::ConsoleStream (FiltersFactory* ff, u_long cycle, Stream* out,
 {
 }
 
-/*!
- * Change the console text attributes according to the logging level.
- * \param level The logging level.
- * \return 0 on success, 1 on error.
- */
 int
-ConsoleStream::setMode (LoggingLevel level)
+ConsoleStream::initialize (LoggingLevel level)
 {
-  mutex->lock ();
-  int success = 1;
   Console* c = dynamic_cast<Console*>(out);
-  if (level == MYSERVER_LOG_MSG_PLAIN)
-    {
-      success = c->setColor ("reset", "reset");
-    }
-  else
-    {
-      Server* server = Server::getInstance ();
-      LogManager* lm = server->getLogManager ();
-      map<string, string> userColors = server->getConsoleColors ();
-      map<LoggingLevel, string> levels = lm->getLoggingLevels ();
-      string fg_color = userColors[levels[level] + "_fg"];
-      string bg_color = userColors[levels[level] + "_bg"];
-      success = c->setColor (fg_color, bg_color);
-    }
-  mutex->unlock ();
-  return success;
+  Server* server = Server::getInstance ();
+  LogManager* lm = server->getLogManager ();
+  map<string, string> userColors = server->getConsoleColors ();
+  map<LoggingLevel, string> levels = lm->getLoggingLevels ();
+  string fg_color = userColors[levels[level] + "_fg"];
+  string bg_color = userColors[levels[level] + "_bg"];
+  return c->setColor (fg_color, bg_color);
+}
+
+int
+ConsoleStream::finalize ()
+{
+  return static_cast<Console*>(out)->reset ();
 }
diff --git a/myserver/src/log/stream/log_stream.cpp b/myserver/src/log/stream/log_stream.cpp
index 5f11eb6..1b1a1e1 100644
--- a/myserver/src/log/stream/log_stream.cpp
+++ b/myserver/src/log/stream/log_stream.cpp
@@ -47,24 +47,28 @@ LogStream::resetFilters ()
 }
 
 int
-LogStream::log (const string & message)
+LogStream::log (const string & message, LoggingLevel level)
 {
   int success = 0;
+
   mutex->lock ();
+
   try
     {
       if (needToCycle ())
-        success = doCycle () || write (message);
+        success = doCycle () || initialize (level) || write (message) ||
+          finalize ();
       else
-        success = write (message);
-
-      mutex->unlock ();
+        success = initialize (level) || write (message) || finalize ();
     }
   catch (...)
     {
       mutex->unlock ();
       throw;
     }
+
+  mutex->unlock ();
+
   return success;
 }
 
@@ -122,7 +126,7 @@ LogStream::close ()
     {
       success = 1;
       isOpened = fc->flush (&nbw) || out->close ();
-      if (! isOpened)
+      if (!isOpened)
         success = 0;
 
       mutex->unlock ();
@@ -145,7 +149,11 @@ LogStream::update (LogStreamEvent evt, void* message, void* reply)
       return !isOpened || setCycle (*static_cast<u_long*>(message));
 
     case MYSERVER_LOG_EVT_LOG:
-      return !isOpened || log (*static_cast<string*>(message));
+      {
+        string& logMsg = *static_cast<string*>(static_cast<void**>(message)[0]);
+        LoggingLevel lvl = *static_cast<LoggingLevel*>(static_cast<void**>(message)[1]);
+        return !isOpened || log (logMsg, lvl);
+      }
 
     case MYSERVER_LOG_EVT_CLOSE:
       return !isOpened || close ();
@@ -157,11 +165,6 @@ LogStream::update (LogStreamEvent evt, void* message, void* reply)
     case MYSERVER_LOG_EVT_CHOWN:
         return !isOpened || chown (static_cast<int*>(message)[0],
                                    static_cast<int*>(message)[1]);
-
-    case MYSERVER_LOG_EVT_SET_MODE:
-        return !isOpened
-          || setMode (*static_cast<LoggingLevel*>(message));
-
     }
 
   return 1;
@@ -252,7 +255,13 @@ LogStream::chown (int uid, int gid)
 }
 
 int
-LogStream::setMode (LoggingLevel level)
+LogStream::initialize (LoggingLevel level)
+{
+  return 0;
+}
+
+int 
+LogStream::finalize ()
 {
   return 0;
 }
diff --git a/myserver/tests/test_file_stream.cpp b/myserver/tests/test_file_stream.cpp
index a6ff1a5..e8c91ab 100644
--- a/myserver/tests/test_file_stream.cpp
+++ b/myserver/tests/test_file_stream.cpp
@@ -66,6 +66,7 @@ public:
     string message;
     string message2;
     LogStream* ls;
+    LoggingLevel level = MYSERVER_LOG_MSG_INFO;
     try
       {
         FilesUtility::deleteFile ("foo");
@@ -84,8 +85,8 @@ public:
 
     ls = fsc->create (ff, "foo", filters, 10);
     CPPUNIT_ASSERT (ls);
-    CPPUNIT_ASSERT (!ls->log (message));
-    CPPUNIT_ASSERT (!ls->log (message2));
+    CPPUNIT_ASSERT (!ls->log (message, level));
+    CPPUNIT_ASSERT (!ls->log (message2, level));
     ls->close ();
     File f;
     f.openFile ("foo", File::READ | File::OPEN_IF_EXISTS);
@@ -122,6 +123,7 @@ public:
     string message1;
     string message2;
     ostringstream oss;
+    LoggingLevel level = MYSERVER_LOG_MSG_INFO;
 
     oss << "message1" << endl;
     message1.assign (oss.str ());
@@ -138,13 +140,13 @@ public:
       }
     ls = fsc->create (ff, "foo", filters, 0);
     CPPUNIT_ASSERT (ls);
-    ls->log (message1);
+    ls->log (message1, level);
     ls->close ();
     delete ls;
 
     ls = fsc->create (ff, "foo", filters, 0);
     CPPUNIT_ASSERT (ls);
-    ls->log (message2);
+    ls->log (message2, level);
     ls->close ();
     delete ls;
 



commit 7fc4c8d9ee1ea92306f9577aa44b61d7b0c52a2d
Author: Francesco Pipita <francesco.pipita@gmail.com>
Date:   Sun May 2 17:02:57 2010 +0200

    Added doxygen information about the suppressWarnings parameter to the add method.

diff --git a/myserver/src/log/log_manager.cpp b/myserver/src/log/log_manager.cpp
index 8ec355f..b5bd4d4 100644
--- a/myserver/src/log/log_manager.cpp
+++ b/myserver/src/log/log_manager.cpp
@@ -110,6 +110,7 @@ LogManager::clear ()
  * \param location The location string for the new LogStream.
  * \param filters A list of strings, each representing a valid filter name.
  * \param cycle The cycle value for the LogStream.
+ * \param suppressWarnings by default it is 0, meaning don't suppress warnings.
  *
  * \return 0 on success, 1 on error.
  */

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

Summary of changes:
 myserver/include/log/log_manager.h           |    2 +-
 myserver/include/log/stream/console_stream.h |    3 +-
 myserver/include/log/stream/log_stream.h     |   13 ++----
 myserver/src/log/log_manager.cpp             |   65 ++++++++++++-------------
 myserver/src/log/stream/console_stream.cpp   |   38 ++++++---------
 myserver/src/log/stream/log_stream.cpp       |   35 +++++++++-----
 myserver/tests/test_file_stream.cpp          |   10 ++--
 7 files changed, 80 insertions(+), 86 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 03 14:48:29 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O90gv-0003Dq-Am
	for mharc-myserver-commit@gnu.org; Mon, 03 May 2010 14:48:29 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O90gt-0003Cq-TQ
	for myserver-commit@gnu.org; Mon, 03 May 2010 14:48:28 -0400
Received: from [140.186.70.92] (port=59083 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O90gs-0003Bk-4M
	for myserver-commit@gnu.org; Mon, 03 May 2010 14:48:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O90gq-00087R-V3
	for myserver-commit@gnu.org; Mon, 03 May 2010 14:48:25 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:57335
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O90gq-00087H-Su
	for myserver-commit@gnu.org; Mon, 03 May 2010 14:48:24 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O90gq-00042i-Bs
	for myserver-commit@gnu.org; Mon, 03 May 2010 18:48:24 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1O90gl-0002xd-7J
	for myserver-commit@gnu.org; Mon, 03 May 2010 18:48:24 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bcb6eb8dfbd355060a73024b8aaa3d6b8b80e47e
X-Git-Newrev: a2b4ab26dd260b7dadc35ac43cef968b2cd5d55f
Message-Id: <E1O90gl-0002xd-7J@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 03 May 2010 18:48:21 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-211-ga2b4ab2
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 03 May 2010 18:48:28 -0000

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  a2b4ab26dd260b7dadc35ac43cef968b2cd5d55f (commit)
      from  bcb6eb8dfbd355060a73024b8aaa3d6b8b80e47e (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 a2b4ab26dd260b7dadc35ac43cef968b2cd5d55f
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon May 3 20:48:37 2010 +0200

    Fix a sanity check by the AC_CONFIG_SRCDIR macro

diff --git a/myserver/configure.ac b/myserver/configure.ac
index 99f58c6..f34ff17 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -28,6 +28,8 @@ AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([gnu])
 
+AC_CONFIG_SRCDIR([src/myserver.cpp])
+
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 AC_CONFIG_MACRO_DIR([m4])

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

Summary of changes:
 myserver/configure.ac |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 03 16:30:20 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O92HU-0004LO-2R
	for mharc-myserver-commit@gnu.org; Mon, 03 May 2010 16:30:20 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O92HQ-0004KP-Js
	for myserver-commit@gnu.org; Mon, 03 May 2010 16:30:16 -0400
Received: from [140.186.70.92] (port=41525 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O92HO-0004Je-0I
	for myserver-commit@gnu.org; Mon, 03 May 2010 16:30:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O92HM-0007ou-Vz
	for myserver-commit@gnu.org; Mon, 03 May 2010 16:30:13 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:49954
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O92HM-0007ok-T5
	for myserver-commit@gnu.org; Mon, 03 May 2010 16:30:12 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O92HF-0005G5-7C
	for myserver-commit@gnu.org; Mon, 03 May 2010 20:30:07 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1O92HE-0007A8-BH
	for myserver-commit@gnu.org; Mon, 03 May 2010 20:30:05 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a2b4ab26dd260b7dadc35ac43cef968b2cd5d55f
X-Git-Newrev: 8852aa2642d52da00d0ada7774f57496f8fd6ab9
Message-Id: <E1O92HE-0007A8-BH@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 03 May 2010 20:30:04 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-212-g8852aa2
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 03 May 2010 20:30:18 -0000

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  8852aa2642d52da00d0ada7774f57496f8fd6ab9 (commit)
      from  a2b4ab26dd260b7dadc35ac43cef968b2cd5d55f (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 8852aa2642d52da00d0ada7774f57496f8fd6ab9
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon May 3 22:30:21 2010 +0200

    Update the bootstrap script

diff --git a/myserver/bootstrap b/myserver/bootstrap
index b52bb00..a9a778a 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-02-24.17; # UTC
+scriptversion=2010-04-30.16; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -240,6 +240,11 @@ do
   esac
 done
 
+if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then
+  echo "$0: Bootstrapping from a non-checked-out distribution is risky." >&2
+  exit 1
+fi
+
 # If $STR is not already on a line by itself in $FILE, insert it,
 # sorting the new contents of the file and replacing $FILE with the result.
 insert_sorted_if_absent() {
@@ -404,9 +409,6 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
-if test -z $gnulib_path ; then
-    gnulib_path="gnulib"
-fi
 
 # Get gnulib files.
 
@@ -422,13 +424,12 @@ case ${GNULIB_SRCDIR--} in
 
     trap cleanup_gnulib 1 2 13 15
 
-    git clone --help|grep depth > /dev/null && shallow='--depth 2' || shallow=
+    git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow=
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib
 
     trap - 1 2 13 15
   fi
-
   GNULIB_SRCDIR=$gnulib_path
   ;;
 *)
@@ -436,7 +437,7 @@ case ${GNULIB_SRCDIR--} in
   if test -d "$GNULIB_SRCDIR"/.git && \
         git_modules_config submodule.gnulib.url >/dev/null; then
     echo "$0: getting gnulib files..."
-    if git submodule --help|grep reference > /dev/null; then
+    if git submodule -h|grep -- --reference > /dev/null; then
       # Prefer the one-liner available in git 1.6.4 or newer.
       git submodule update --init --reference "$GNULIB_SRCDIR" \
         "$gnulib_path" || exit $?
@@ -487,7 +488,7 @@ update_po_files() {
   test -d $ref_po_dir || mkdir $ref_po_dir || return
   download_po_files $ref_po_dir $domain \
     && ls "$ref_po_dir"/*.po 2>/dev/null |
-      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS"
+      sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return
 
   langs=`cd $ref_po_dir && echo *.po|sed 's/\.po//g'`
   test "$langs" = '*' && langs=x
@@ -818,7 +819,7 @@ if test $with_gettext = yes; then
       a\
           '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+}
     }
-  ' po/Makevars.template >po/Makevars
+  ' po/Makevars.template >po/Makevars || exit 1
 
   if test -d runtime-po; then
     # Similarly for runtime-po/Makevars, but not quite the same.
@@ -832,7 +833,7 @@ if test $with_gettext = yes; then
         a\
             '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+}
       }
-    ' <po/Makevars.template >runtime-po/Makevars
+    ' po/Makevars.template >runtime-po/Makevars || exit 1
 
     # Copy identical files from po to runtime-po.
     (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po)
diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 93ef4bd..c376756 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -20,6 +20,8 @@
 gnulib_name=libgnu
 gnulib_tool_option_extras=
 
+checkout_only_file=
+
 # gnulib modules used by this package.
 gnulib_modules="
 accept

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

Summary of changes:
 myserver/bootstrap      |   21 +++++++++++----------
 myserver/bootstrap.conf |    2 ++
 2 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 03 20:21:08 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O95sq-0007Nh-I9
	for mharc-myserver-commit@gnu.org; Mon, 03 May 2010 20:21:08 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O95so-0007NG-Mx
	for myserver-commit@gnu.org; Mon, 03 May 2010 20:21:06 -0400
Received: from [140.186.70.92] (port=49740 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O95sl-0007MX-Oa
	for myserver-commit@gnu.org; Mon, 03 May 2010 20:21:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1O95si-0008J7-KL
	for myserver-commit@gnu.org; Mon, 03 May 2010 20:21:02 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:38824)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1O95si-0008Iu-Ce
	for myserver-commit@gnu.org; Mon, 03 May 2010 20:21:00 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o440Kw9t026708
	for <myserver-commit@gnu.org>; Tue, 4 May 2010 02:20:58 +0200
Message-Id: <201005040020.o440Kw9t026708@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Tue, 04 May 2010 02:20:58 +0200
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
X-Hydra-Instance: hydra
X-Hydra-Project: gnu
X-Hydra-Jobset: myserver-master
X-Hydra-Job: tarball
Date: Tue, 4 May 2010 02:20:57 +0200
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:tarball build
 395019: Failed with non-zero exit code
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 04 May 2010 00:21:07 -0000

Hi,

This is to let you know that Hydra build 395019 of job gnu:myserver-master:tarball has changed from 'Success' to 'Failed with non-zero exit code'.

Complete build information can be found on this page: http://hydra.nixos.org/build/395019

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 395019
Nix name:              | myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9
Short description:     | Build of a source distribution from a checkout
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/myvwag07ciwqy3wgszflwj0sw54d8i1v-myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9.drv
Output store path:     | /nix/store/7bs9nay3l1lb81cqyfgmd8kx7r7nnvh0-myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9
Time added:            | 2010-05-04 02:20:57
Build started:         | 2010-05-04 02:19:11
Build finished:        | 2010-05-04 02:20:57
Duration:              | 106s

The build inputs were:

Name        | Type | Value
------------+------+---------------------------------------------------------------------------
myserverSrc | git  | git://git.sv.gnu.org/myserver.git:8852aa2642d52da00d0ada7774f57496f8fd6ab9
hydraConfig | svn  | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:21556
gnulibSrc   | git  | git://git.sv.gnu.org/gnulib.git:c3561613692e843eaecb45908c0d75c1cc2d3147
nixpkgs     | svn  | https://svn.nixos.org/repos/nix/nixpkgs/trunk:21585

Regards,

The Hydra build daemon.

---
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/round.c' -> `../gnulib/lib/round.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/arctwo.h' -> `../gnulib/lib/arctwo.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/readline.h' -> `../gnulib/lib/readline.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/vsnprintf.c' -> `../gnulib/lib/vsnprintf.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/mknodat.c' -> `../gnulib/lib/mknodat.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/findprog-lgpl.c' -> `../gnulib/lib/findprog-lgpl.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/mbscspn.c' -> `../gnulib/lib/mbscspn.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/memmem.c' -> `../gnulib/lib/memmem.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/spawnattr_init.c' -> `../gnulib/lib/spawnattr_init.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/posixver.h' -> `../gnulib/lib/posixver.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/closein.h' -> `../gnulib/lib/closein.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/fatal-signal.h' -> `../gnulib/lib/fatal-signal.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/printf-frexpl.c' -> `../gnulib/lib/printf-frexpl.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/gettimeofday.c' -> `../gnulib/lib/gettimeofday.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/gl_rbtree_oset.h' -> `../gnulib/lib/gl_rbtree_oset.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/c-strcaseeq.h' -> `../gnulib/lib/c-strcaseeq.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/file-set.c' -> `../gnulib/lib/file-set.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/filevercmp.c' -> `../gnulib/lib/filevercmp.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/glob.c' -> `../gnulib/lib/glob.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/tanl.c' -> `../gnulib/lib/tanl.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/sincosl.c' -> `../gnulib/lib/sincosl.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/openat.c' -> `../gnulib/lib/openat.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/savewd.h' -> `../gnulib/lib/savewd.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/fseeko.c' -> `../gnulib/lib/fseeko.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/inttostr.c' -> `../gnulib/lib/inttostr.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/pt_chown.c' -> `../gnulib/lib/pt_chown.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/fprintftime.c' -> `../gnulib/lib/fprintftime.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/expl.c' -> `../gnulib/lib/expl.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/memcoll.h' -> `../gnulib/lib/memcoll.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/memset.c' -> `../gnulib/lib/memset.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/truncf.c' -> `../gnulib/lib/truncf.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/mbsinit.c' -> `../gnulib/lib/mbsinit.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/mkfifoat.c' -> `../gnulib/lib/mkfifoat.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/full-read.c' -> `../gnulib/lib/full-read.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/getopt.in.h' -> `../gnulib/lib/getopt.in.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/xmemdup0.c' -> `../gnulib/lib/xmemdup0.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/alloca.c' -> `../gnulib/lib/alloca.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/mbmemcasecoll.c' -> `../gnulib/lib/mbmemcasecoll.c'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/gl_anytreehash_list1.h' -> `../gnulib/lib/gl_anytreehash_list1.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/stdlib--.h' -> `../gnulib/lib/stdlib--.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/concat-filename.h' -> `../gnulib/lib/concat-filename.h'
`/nix/store/yac1y91rv50mywhj1z82fp112nrfgx1w-git-export/lib/at-func.c' -> `../gnulib/lib/at-func.c'
./bootstrap: Bootstrapping from checked-out myserver sources...
./bootstrap: getting translations into po/.reference for myserver...
./bootstrap: line 473: rsync: command not found
[q[qbuild time elapsed:  0m0.026s 0m0.019s 0m0.103s 0m0.464s
builder for `/nix/store/myvwag07ciwqy3wgszflwj0sw54d8i1v-myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9.drv' failed with exit code 127
error: build of `/nix/store/myvwag07ciwqy3wgszflwj0sw54d8i1v-myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9.drv' failed
Shared connection to kenny closed.

build of `/nix/store/myvwag07ciwqy3wgszflwj0sw54d8i1v-myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9.drv' on `buildfarm@kenny' failed with exit code 256



From MAILER-DAEMON Tue May 04 11:40:51 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O9KEt-00052I-Rw
	for mharc-myserver-commit@gnu.org; Tue, 04 May 2010 11:40:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9KEs-00052D-RW
	for myserver-commit@gnu.org; Tue, 04 May 2010 11:40:50 -0400
Received: from [140.186.70.92] (port=37533 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9KEr-00051s-JE
	for myserver-commit@gnu.org; Tue, 04 May 2010 11:40:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1O9KEm-0000HK-H5
	for myserver-commit@gnu.org; Tue, 04 May 2010 11:40:49 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:39398)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1O9KEm-0000H4-7y
	for myserver-commit@gnu.org; Tue, 04 May 2010 11:40:44 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o44FegTT008792
	for <myserver-commit@gnu.org>; Tue, 4 May 2010 17:40:42 +0200
Message-Id: <201005041540.o44FegTT008792@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Tue, 04 May 2010 17:40:42 +0200
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
X-Hydra-Instance: hydra
X-Hydra-Project: gnu
X-Hydra-Jobset: myserver-master
X-Hydra-Job: tarball
Date: Tue, 4 May 2010 17:40:42 +0200
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:tarball build
	396840: Success
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 04 May 2010 15:40:51 -0000

Hi,

This is to let you know that Hydra build 396840 of job gnu:myserver-master:tarball has changed from 'Failed with non-zero exit code' to 'Success'.

Complete build information can be found on this page: http://hydra.nixos.org/build/396840

A summary of the build information follows:

Build ID:              | 396840
Nix name:              | myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9
Short description:     | Build of a source distribution from a checkout
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/2fz8m4afm0klmw24s7p80911xbi6kf23-myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9.drv
Output store path:     | /nix/store/5br7x80f6spmbccfxr8kppz5g03dmzik-myserver-tarball-0pre8852aa2642d52da00d0ada7774f57496f8fd6ab9
Time added:            | 2010-05-04 17:40:42
Build started:         | 2010-05-04 17:33:38
Build finished:        | 2010-05-04 17:40:42
Duration:              | 424s

The build inputs were:

Name        | Type | Value
------------+------+---------------------------------------------------------------------------
myserverSrc | git  | git://git.sv.gnu.org/myserver.git:8852aa2642d52da00d0ada7774f57496f8fd6ab9
hydraConfig | svn  | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:21598
gnulibSrc   | git  | git://git.sv.gnu.org/gnulib.git:e2843e30e8c2885eb8cbc77e20c4e0f4d562d44d
nixpkgs     | svn  | https://svn.nixos.org/repos/nix/nixpkgs/trunk:21600

Regards,

The Hydra build daemon.



From MAILER-DAEMON Tue May 04 19:09:26 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O9RF0-0007L7-EQ
	for mharc-myserver-commit@gnu.org; Tue, 04 May 2010 19:09:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9REy-0007Jj-Ry
	for myserver-commit@gnu.org; Tue, 04 May 2010 19:09:24 -0400
Received: from [140.186.70.92] (port=44084 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9REx-0007Hg-9h
	for myserver-commit@gnu.org; Tue, 04 May 2010 19:09:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9REu-0003pT-JD
	for myserver-commit@gnu.org; Tue, 04 May 2010 19:09:23 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53293
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9REu-0003pO-GC
	for myserver-commit@gnu.org; Tue, 04 May 2010 19:09:20 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9REu-0007cR-Ho
	for myserver-commit@gnu.org; Tue, 04 May 2010 23:09:20 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1O9REr-0004Qn-0t
	for myserver-commit@gnu.org; Tue, 04 May 2010 23:09:20 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 8852aa2642d52da00d0ada7774f57496f8fd6ab9
X-Git-Newrev: efe7a52e763071a82331f75012df4883c789c82d
Message-Id: <E1O9REr-0004Qn-0t@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 04 May 2010 23:09:19 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-213-gefe7a52
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 04 May 2010 23:09:25 -0000

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  efe7a52e763071a82331f75012df4883c789c82d (commit)
      from  8852aa2642d52da00d0ada7774f57496f8fd6ab9 (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 efe7a52e763071a82331f75012df4883c789c82d
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed May 5 01:09:36 2010 +0200

    Do not repeat LT_INIT twice

diff --git a/myserver/configure.ac b/myserver/configure.ac
index f34ff17..adb5910 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -57,8 +57,6 @@ AC_DEFINE([WINVER], [0x0501], [WINVER])
 AC_DEFINE([DEPENDS_ON_LIBINTL], [1], [DEPENDS_ON_LIBINTL])
 AC_DEFINE([GNULIB_NAMESPACE], [gnulib], [GNULIB_NAMESPACE])
 
-LT_INIT
-
 AC_CANONICAL_HOST
 
 PACKAGE_STRING="m4_esyscmd([cat version])"

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

Summary of changes:
 myserver/configure.ac |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Wed May 05 10:48:48 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O9fu4-0005od-2Z
	for mharc-myserver-commit@gnu.org; Wed, 05 May 2010 10:48:48 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9fu1-0005m8-NE
	for myserver-commit@gnu.org; Wed, 05 May 2010 10:48:45 -0400
Received: from [140.186.70.92] (port=38218 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9ftv-0005fn-Sd
	for myserver-commit@gnu.org; Wed, 05 May 2010 10:48:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9ftq-0001co-N9
	for myserver-commit@gnu.org; Wed, 05 May 2010 10:48:39 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:50427
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9ftq-0001cY-J7
	for myserver-commit@gnu.org; Wed, 05 May 2010 10:48:34 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9ftq-0001xl-1v
	for myserver-commit@gnu.org; Wed, 05 May 2010 14:48:34 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1O9ftn-0004Ty-Ct
	for myserver-commit@gnu.org; Wed, 05 May 2010 14:48:34 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: efe7a52e763071a82331f75012df4883c789c82d
X-Git-Newrev: cc03a9a19ea4106513dfea5f3a3ba6d54df3507c
Message-Id: <E1O9ftn-0004Ty-Ct@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 05 May 2010 14:48:33 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-214-gcc03a9a
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 05 May 2010 14:48:46 -0000

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  cc03a9a19ea4106513dfea5f3a3ba6d54df3507c (commit)
      from  efe7a52e763071a82331f75012df4883c789c82d (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 cc03a9a19ea4106513dfea5f3a3ba6d54df3507c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed May 5 11:41:55 2010 +0200

    Fix VPATH builds

diff --git a/myserver/Makefile.am b/myserver/Makefile.am
index c6bceb2..76dfc38 100644
--- a/myserver/Makefile.am
+++ b/myserver/Makefile.am
@@ -22,9 +22,11 @@ if BUILD_DOC
 DOCS = documentation
 endif
 
-SUBDIRS = lib po src include $(CONTROL) binaries $(DOCS) $(TESTS_DIR)
+SUBDIRS = lib po include src $(CONTROL) binaries $(DOCS) $(TESTS_DIR)
 
-EXTRA_DIST = myserver.h doxygen SConstruct
+include_HEADERS = myserver.h
+
+EXTRA_DIST = doxygen SConstruct
 
 ACLOCAL_AMFLAGS = -I m4
 
@@ -32,6 +34,9 @@ localedir.h: Makefile
 	echo '/* This file is auto-generated by Makefile!  */' >$@
 	echo '#define LOCALEDIR "$(localedir)"' >> $@
 
+clean-generic:
+	rm -f localedir.h
+
 all: localedir.h
 # Generate the localedir.h file before any other rule.
 
diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index 3731bfc..1f1806e 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -20,8 +20,3 @@ EXTRA_DIST = myserver-daemon MIMEtypes.default.xml myserver.default.xml \
 						 virtualhosts.default.xml
 
 configdir = $(DESTDIR)$(prefix)/etc/myserver
-
-install: install-recursive
-	$(install_sh_DATA) MIMEtypes.default.xml $(configdir)/MIMEtypes.default.xml
-	$(install_sh_DATA) myserver.default.xml $(configdir)/myserver.default.xml
-	$(install_sh_DATA) virtualhosts.default.xml $(configdir)/virtualhosts.default.xml
diff --git a/myserver/binaries/certificates/Makefile.am b/myserver/binaries/certificates/Makefile.am
index 87b3c40..4d098ce 100644
--- a/myserver/binaries/certificates/Makefile.am
+++ b/myserver/binaries/certificates/Makefile.am
@@ -17,4 +17,4 @@
 EXTRA_DIST = how_create_certificates.txt
 install :
 	$(INSTALL) -d '$(DESTDIR)$(prefix)/etc/myserver/certificates'
-	$(INSTALL) 'how_create_certificates.txt' '$(DESTDIR)$(prefix)/etc/myserver/certificates/how_create_certificates.txt'
+
diff --git a/myserver/binaries/web/cgi-src/math_sum/Makefile.am b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
index 21ce31b..7e3e59b 100644
--- a/myserver/binaries/web/cgi-src/math_sum/Makefile.am
+++ b/myserver/binaries/web/cgi-src/math_sum/Makefile.am
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Makefile for math_sum
 
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmath_sum.la
 libmath_sum_la_SOURCES = math_sum.cpp
 libmath_sum_la_LDFLAGS = -shared -export-dynamic -no-install -no-undefined -module \
@@ -29,4 +29,7 @@ math_sum.mscgi: libmath_sum.la
 	test \! -e .libs/libmath_sum.mscgi \
 		|| cp .libs/libmath_sum.mscgi ../../cgi-bin/math_sum.mscgi
 
+clean-generic:
+	rm -f  ../../cgi-bin/math_sum.mscgi
+
 .phony : math_sum.mscgi
diff --git a/myserver/binaries/web/cgi-src/post/Makefile.am b/myserver/binaries/web/cgi-src/post/Makefile.am
index 4ac532f..c0b586f 100644
--- a/myserver/binaries/web/cgi-src/post/Makefile.am
+++ b/myserver/binaries/web/cgi-src/post/Makefile.am
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # Makefile for post
 
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libpost.la
 libpost_la_SOURCES = post.cpp
 libpost_la_LDFLAGS = -shared -export-dynamic -no-install -no-undefined -module \
@@ -29,4 +29,7 @@ post.mscgi: libpost.la
 	test \! -e .libs/libpost.mscgi \
 		|| cp .libs/libpost.mscgi ../../cgi-bin/post.mscgi
 
+clean-generic:
+	rm -f  ../../cgi-bin/post.mscgi
+
 .phony : post.mscgi
diff --git a/myserver/documentation/Makefile.am b/myserver/documentation/Makefile.am
index 9ea6347..8081b1a 100644
--- a/myserver/documentation/Makefile.am
+++ b/myserver/documentation/Makefile.am
@@ -17,6 +17,13 @@
 info_TEXINFOS=myserver.texi
 
 #any other .texi that is not myserver.texi
-myserver_TEXINFOS=basic_configuration.texi directory_listing.texi doclicense.texi error_pages.texi mime_types.texi process_security.texi virtual_hosts.texi ssl_certificates.texi
-
-SUBDIRS = 
+myserver_TEXINFOS = basic_configuration.texi \
+		    directory_listing.texi \
+		    doclicense.texi \
+	            error_pages.texi \
+		    log_management.texi \
+	            mime_types.texi \
+	            process_security.texi \
+	            security.texi \
+	            ssl_certificates.texi \
+	            virtual_hosts.texi
diff --git a/myserver/include/Makefile.am b/myserver/include/Makefile.am
index 08f0fc5..e13daeb 100644
--- a/myserver/include/Makefile.am
+++ b/myserver/include/Makefile.am
@@ -14,9 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-includeincludedir=$(includedir)/myserver/include/find_data
-includeinclude_HEADERS =
-SUBDIRS = base conf connection connections_scheduler filter http_handler log plugin protocol server
 
-install:
-# Do not do anything.
+SUBDIRS = base conf connection connections_scheduler filter http_handler \
+	  log plugin protocol server
diff --git a/myserver/include/base/Makefile.am b/myserver/include/base/Makefile.am
index 97cbc85..0292466 100644
--- a/myserver/include/base/Makefile.am
+++ b/myserver/include/base/Makefile.am
@@ -14,8 +14,11 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-baseincludedir=$(includedir)/myserver/include/base
-baseinclude_HEADERS = utility.h
+
+includedir=@includedir@/myserver/include/base
+include_HEADERS = utility.h
+
 SUBDIRS = base64 bitvec crypt dynamic_lib file files_cache read_directory \
-					hash_map home_dir mem_buff multicast pipe process regex safetime \
-					slab socket socket_pair ssl string sync thread unix_socket xml exceptions
+	hash_map home_dir mem_buff multicast pipe process regex safetime \
+	slab socket socket_pair ssl string sync thread unix_socket xml \
+	exceptions
diff --git a/myserver/include/base/base64/Makefile.am b/myserver/include/base/base64/Makefile.am
index d944e98..fd19040 100644
--- a/myserver/include/base/base64/Makefile.am
+++ b/myserver/include/base/base64/Makefile.am
@@ -14,7 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-base64includedir=$(includedir)/myserver/include/base/base64
-base64include_HEADERS = mime_utils.h
+
+includedir=@includedir@/myserver/include/base/base64
+include_HEADERS = mime_utils.h
 SUBDIRS =
 
diff --git a/myserver/include/base/bitvec/Makefile.am b/myserver/include/base/bitvec/Makefile.am
index 5812a7c..d720c1e 100644
--- a/myserver/include/base/bitvec/Makefile.am
+++ b/myserver/include/base/bitvec/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-bitvecincludedir=$(includedir)/myserver/include/base/bitvec
-bitvecinclude_HEADERS = bitvec.h
+includedir=@includedir@/myserver/include/base/bitvec
+include_HEADERS = bitvec.h
 SUBDIRS =
diff --git a/myserver/include/base/crypt/Makefile.am b/myserver/include/base/crypt/Makefile.am
index 2b411e4..b727469 100644
--- a/myserver/include/base/crypt/Makefile.am
+++ b/myserver/include/base/crypt/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-cryptincludedir=$(includedir)/myserver/include/base/crypt
-cryptinclude_HEADERS = crypt_algo.h crypt_algo_manager.h md5.h sha1.h
+includedir=@includedir@/myserver/include/base/crypt
+include_HEADERS = crypt_algo.h crypt_algo_manager.h md5.h sha1.h
 SUBDIRS =
 
diff --git a/myserver/include/base/dynamic_lib/Makefile.am b/myserver/include/base/dynamic_lib/Makefile.am
index 6d64922..4a7e919 100644
--- a/myserver/include/base/dynamic_lib/Makefile.am
+++ b/myserver/include/base/dynamic_lib/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-dynamic_libincludedir=$(includedir)/myserver/include/base/dynamic_lib
-dynamic_libinclude_HEADERS = dynamiclib.h
+includedir=@includedir@/myserver/include/base/dynamic_lib
+include_HEADERS = dynamiclib.h
 SUBDIRS =
 
diff --git a/myserver/include/base/exceptions/Makefile.am b/myserver/include/base/exceptions/Makefile.am
index 4356022..a84695d 100644
--- a/myserver/include/base/exceptions/Makefile.am
+++ b/myserver/include/base/exceptions/Makefile.am
@@ -1,3 +1,3 @@
-exceptionsincludedir=$(includedir)/myserver/include/base/exceptions
-exceptionsinclude_HEADERS = checked.h exceptions.h
+includedir=@includedir@/myserver/include/base/exceptions
+include_HEADERS = checked.h exceptions.h
 SUBDIRS =
diff --git a/myserver/include/base/file/Makefile.am b/myserver/include/base/file/Makefile.am
index ba770b2..c5809c1 100644
--- a/myserver/include/base/file/Makefile.am
+++ b/myserver/include/base/file/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-fileincludedir=$(includedir)/myserver/include/base/file
-fileinclude_HEADERS = file.h files_utility.h
+includedir=@includedir@/myserver/include/base/file
+include_HEADERS = file.h files_utility.h
 SUBDIRS =
 
diff --git a/myserver/include/base/files_cache/Makefile.am b/myserver/include/base/files_cache/Makefile.am
index 9503f3b..f542cd5 100644
--- a/myserver/include/base/files_cache/Makefile.am
+++ b/myserver/include/base/files_cache/Makefile.am
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-files_cacheincludedir=$(includedir)/myserver/include/base/files_cache
-files_cacheinclude_HEADERS = cached_file_buffer.h cached_file_factory.h \
+includedir=@includedir@/myserver/include/base/files_cache
+include_HEADERS = cached_file_buffer.h cached_file_factory.h \
 			     cached_file.h membuf_file.h
 SUBDIRS =
 
diff --git a/myserver/include/base/hash_map/Makefile.am b/myserver/include/base/hash_map/Makefile.am
index 7d37950..1869fda 100644
--- a/myserver/include/base/hash_map/Makefile.am
+++ b/myserver/include/base/hash_map/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-hash_mapincludedir=$(includedir)/myserver/include/base/hash_map
-hash_mapinclude_HEADERS = hash_map.h
+includedir=@includedir@/myserver/include/base/hash_map
+include_HEADERS = hash_map.h
 SUBDIRS =
 
diff --git a/myserver/include/base/home_dir/Makefile.am b/myserver/include/base/home_dir/Makefile.am
index 21f15c4..18f88e6 100644
--- a/myserver/include/base/home_dir/Makefile.am
+++ b/myserver/include/base/home_dir/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-home_dirincludedir=$(includedir)/myserver/include/base/home_dir
-home_dirinclude_HEADERS = home_dir.h
+includedir=@includedir@/myserver/include/base/home_dir
+include_HEADERS = home_dir.h
 SUBDIRS =
 
diff --git a/myserver/include/base/mem_buff/Makefile.am b/myserver/include/base/mem_buff/Makefile.am
index 231dea1..8b3c2dc 100644
--- a/myserver/include/base/mem_buff/Makefile.am
+++ b/myserver/include/base/mem_buff/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-mem_buffincludedir=$(includedir)/myserver/include/base/mem_buff
-mem_buffinclude_HEADERS = mem_buff.h
+includedir=@includedir@/myserver/include/base/mem_buff
+include_HEADERS = mem_buff.h
 SUBDIRS =
 
diff --git a/myserver/include/base/multicast/Makefile.am b/myserver/include/base/multicast/Makefile.am
index 0d26afd..eee7cd3 100644
--- a/myserver/include/base/multicast/Makefile.am
+++ b/myserver/include/base/multicast/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-multicastincludedir=$(includedir)/myserver/include/base/multicast
-multicastinclude_HEADERS = multicast.h
+includedir=@includedir@/myserver/include/base/multicast
+include_HEADERS = multicast.h
 SUBDIRS =
 
diff --git a/myserver/include/base/pipe/Makefile.am b/myserver/include/base/pipe/Makefile.am
index be8863e..ca8f67d 100644
--- a/myserver/include/base/pipe/Makefile.am
+++ b/myserver/include/base/pipe/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-pipeincludedir=$(includedir)/myserver/include/base/pipe
-pipeinclude_HEADERS = pipe.h
+includedir=@includedir@/myserver/include/base/pipe
+include_HEADERS = pipe.h
 SUBDIRS =
 
diff --git a/myserver/include/base/process/Makefile.am b/myserver/include/base/process/Makefile.am
index e08800c..82eff45 100644
--- a/myserver/include/base/process/Makefile.am
+++ b/myserver/include/base/process/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-processincludedir=$(includedir)/myserver/include/base/process
-processinclude_HEADERS = fork_server.h process.h process_server_manager.h
+includedir=@includedir@/myserver/include/base/process
+include_HEADERS = fork_server.h process.h process_server_manager.h
 SUBDIRS =
 
diff --git a/myserver/include/base/read_directory/Makefile.am b/myserver/include/base/read_directory/Makefile.am
index 417e144..9b25503 100644
--- a/myserver/include/base/read_directory/Makefile.am
+++ b/myserver/include/base/read_directory/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-read_directoryincludedir=$(includedir)/myserver/include/base/read_directory
-read_directoryinclude_HEADERS = read_directory.h
+includedir=@includedir@/myserver/include/base/read_directory
+include_HEADERS = read_directory.h
 SUBDIRS =
 
diff --git a/myserver/include/base/regex/Makefile.am b/myserver/include/base/regex/Makefile.am
index 9ec743a..17769ac 100644
--- a/myserver/include/base/regex/Makefile.am
+++ b/myserver/include/base/regex/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-regexincludedir=$(includedir)/myserver/include/base/regex
-regexinclude_HEADERS = myserver_regex.h
+includedir=@includedir@/myserver/include/base/regex
+include_HEADERS = myserver_regex.h
 SUBDIRS =
diff --git a/myserver/include/base/safetime/Makefile.am b/myserver/include/base/safetime/Makefile.am
index cb5801e..7f579af 100644
--- a/myserver/include/base/safetime/Makefile.am
+++ b/myserver/include/base/safetime/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-safetimeincludedir=$(includedir)/myserver/include/base/safetime
-safetimeinclude_HEADERS = safetime.h
+includedir=@includedir@/myserver/include/base/safetime
+include_HEADERS = safetime.h
 SUBDIRS =
 
diff --git a/myserver/include/base/slab/Makefile.am b/myserver/include/base/slab/Makefile.am
index d359cdc..9dc5694 100644
--- a/myserver/include/base/slab/Makefile.am
+++ b/myserver/include/base/slab/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-slabincludedir=$(includedir)/myserver/include/base/slab
-slabinclude_HEADERS = slab.h
+includedir=@includedir@/myserver/include/base/slab
+include_HEADERS = slab.h
 SUBDIRS =
diff --git a/myserver/include/base/socket/Makefile.am b/myserver/include/base/socket/Makefile.am
index 19867b8..a4a592e 100644
--- a/myserver/include/base/socket/Makefile.am
+++ b/myserver/include/base/socket/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-socketincludedir=$(includedir)/myserver/include/base/socket
-socketinclude_HEADERS = socket.h ssl_socket.h
+includedir=@includedir@/myserver/include/base/socket
+include_HEADERS = socket.h ssl_socket.h
 SUBDIRS =
 
diff --git a/myserver/include/base/socket_pair/Makefile.am b/myserver/include/base/socket_pair/Makefile.am
index e17132a..7da677e 100644
--- a/myserver/include/base/socket_pair/Makefile.am
+++ b/myserver/include/base/socket_pair/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-socket_pair_includedir=$(includedir)/myserver/include/base/socket_pair
-socket_pair_include_HEADERS = socket_pair.h
+includedir=@includedir@/myserver/include/base/socket_pair
+include_HEADERS = socket_pair.h
 SUBDIRS =
diff --git a/myserver/include/base/ssl/Makefile.am b/myserver/include/base/ssl/Makefile.am
index 48b4e09..663895e 100644
--- a/myserver/include/base/ssl/Makefile.am
+++ b/myserver/include/base/ssl/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-sslincludedir=$(includedir)/myserver/include/base/ssl
-sslinclude_HEADERS = ssl.h
+includedir=@includedir@/myserver/include/base/ssl
+include_HEADERS = ssl.h
 SUBDIRS =
 
diff --git a/myserver/include/base/string/Makefile.am b/myserver/include/base/string/Makefile.am
index 34db319..0cca370 100644
--- a/myserver/include/base/string/Makefile.am
+++ b/myserver/include/base/string/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-stringincludedir=$(includedir)/myserver/include/base/string
-stringinclude_HEADERS = securestr.h stringutils.h
+includedir=@includedir@/myserver/include/base/string
+include_HEADERS = securestr.h stringutils.h
 SUBDIRS =
 
diff --git a/myserver/include/base/sync/Makefile.am b/myserver/include/base/sync/Makefile.am
index 50a3b09..d6f245a 100644
--- a/myserver/include/base/sync/Makefile.am
+++ b/myserver/include/base/sync/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-syncincludedir=$(includedir)/myserver/include/base/sync
-syncinclude_HEADERS = event.h mutex.h read_write_lock.h recursive_mutex.h semaphore.h
+includedir=@includedir@/myserver/include/base/sync
+include_HEADERS = event.h mutex.h read_write_lock.h recursive_mutex.h semaphore.h
 SUBDIRS =
 
diff --git a/myserver/include/base/thread/Makefile.am b/myserver/include/base/thread/Makefile.am
index cfc5b82..87644dd 100644
--- a/myserver/include/base/thread/Makefile.am
+++ b/myserver/include/base/thread/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-threadincludedir=$(includedir)/myserver/include/base/thread
-threadinclude_HEADERS = thread.h
+includedir=@includedir@/myserver/include/base/thread
+include_HEADERS = thread.h
 SUBDIRS =
 
diff --git a/myserver/include/base/unix_socket/Makefile.am b/myserver/include/base/unix_socket/Makefile.am
index 28bae49..993c848 100644
--- a/myserver/include/base/unix_socket/Makefile.am
+++ b/myserver/include/base/unix_socket/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-unix_socketincludedir=$(includedir)/myserver/include/base/unix_socket
-unix_socketinclude_HEADERS = unix_socket.h
+includedir=@includedir@/myserver/include/base/unix_socket
+include_HEADERS = unix_socket.h
 SUBDIRS =
 
diff --git a/myserver/include/base/xml/Makefile.am b/myserver/include/base/xml/Makefile.am
index 10b9688..40d09e0 100644
--- a/myserver/include/base/xml/Makefile.am
+++ b/myserver/include/base/xml/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-xmlincludedir=$(includedir)/myserver/include/base/xml
-xmlinclude_HEADERS = xml_parser.h
+includedir=@includedir@/myserver/include/base/xml
+include_HEADERS = xml_parser.h
 SUBDIRS =
 
diff --git a/myserver/include/conf/Makefile.am b/myserver/include/conf/Makefile.am
index 9a5d6c3..5838b3e 100644
--- a/myserver/include/conf/Makefile.am
+++ b/myserver/include/conf/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-confincludedir=$(includedir)/myserver/include/conf
-confinclude_HEADERS = nodetree.h xml_conf.h
+includedir=@includedir@/myserver/include/conf
+include_HEADERS = nodetree.h xml_conf.h
 SUBDIRS = main mime security vhost
diff --git a/myserver/include/conf/main/Makefile.am b/myserver/include/conf/main/Makefile.am
index 875a6c1..b98a08a 100644
--- a/myserver/include/conf/main/Makefile.am
+++ b/myserver/include/conf/main/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-mainincludedir=$(includedir)/myserver/include/conf/main
-maininclude_HEADERS = main_configuration.h xml_main_configuration.h
+includedir=@includedir@/myserver/include/conf/main
+include_HEADERS = main_configuration.h xml_main_configuration.h
 SUBDIRS =
diff --git a/myserver/include/conf/mime/Makefile.am b/myserver/include/conf/mime/Makefile.am
index fe3785c..7b6e31c 100644
--- a/myserver/include/conf/mime/Makefile.am
+++ b/myserver/include/conf/mime/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-mimeincludedir=$(includedir)/myserver/include/conf/mime
-mimeinclude_HEADERS = mime_manager.h xml_mime_handler.h
+includedir=@includedir@/myserver/include/conf/mime
+include_HEADERS = mime_manager.h xml_mime_handler.h
 SUBDIRS =
 
diff --git a/myserver/include/conf/security/Makefile.am b/myserver/include/conf/security/Makefile.am
index 6145adf..7ea5237 100644
--- a/myserver/include/conf/security/Makefile.am
+++ b/myserver/include/conf/security/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-securityincludedir=$(includedir)/myserver/include/conf/security
-securityinclude_HEADERS = auth_domain.h auth_method.h auth_method_factory.h security_cache.h security_domain.h security_manager.h security_token.h validator.h validator_factory.h xml_validator.h
+includedir=@includedir@/myserver/include/conf/security
+include_HEADERS = auth_domain.h auth_method.h auth_method_factory.h security_cache.h security_domain.h security_manager.h security_token.h validator.h validator_factory.h xml_validator.h
 SUBDIRS =
 
diff --git a/myserver/include/conf/vhost/Makefile.am b/myserver/include/conf/vhost/Makefile.am
index b33541e..1ae4502 100644
--- a/myserver/include/conf/vhost/Makefile.am
+++ b/myserver/include/conf/vhost/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-vhostincludedir=$(includedir)/myserver/include/conf/vhost
-vhostinclude_HEADERS = vhost.h vhost_manager.h ip.h xml_vhost_handler.h
+includedir=@includedir@/myserver/include/conf/vhost
+include_HEADERS = vhost.h vhost_manager.h ip.h xml_vhost_handler.h
 SUBDIRS =
 
diff --git a/myserver/include/connection/Makefile.am b/myserver/include/connection/Makefile.am
index 0e48458..64c625a 100644
--- a/myserver/include/connection/Makefile.am
+++ b/myserver/include/connection/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-connectionincludedir=$(includedir)/myserver/include/connection
-connectioninclude_HEADERS = connection.h
+includedir=@includedir@/myserver/include/connection
+include_HEADERS = connection.h
 SUBDIRS =
 
diff --git a/myserver/include/connections_scheduler/Makefile.am b/myserver/include/connections_scheduler/Makefile.am
index 500506e..348c17b 100644
--- a/myserver/include/connections_scheduler/Makefile.am
+++ b/myserver/include/connections_scheduler/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-connections_schedulerincludedir=$(includedir)/myserver/include/connections_scheduler
-connections_schedulerinclude_HEADERS = connections_scheduler.h listen_threads.h
+includedir=@includedir@/myserver/include/connections_scheduler
+include_HEADERS = connections_scheduler.h listen_threads.h
 SUBDIRS =
 
diff --git a/myserver/include/filter/Makefile.am b/myserver/include/filter/Makefile.am
index 998fe83..54e0630 100644
--- a/myserver/include/filter/Makefile.am
+++ b/myserver/include/filter/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-filterincludedir=$(includedir)/myserver/include/filter
-filterinclude_HEADERS = console.h filter.h filters_chain.h filters_factory.h memory_stream.h stream.h
+includedir=@includedir@/myserver/include/filter
+include_HEADERS = console.h filter.h filters_chain.h filters_factory.h memory_stream.h stream.h
 SUBDIRS = gzip
 
diff --git a/myserver/include/filter/gzip/Makefile.am b/myserver/include/filter/gzip/Makefile.am
index bbfffee..482be95 100644
--- a/myserver/include/filter/gzip/Makefile.am
+++ b/myserver/include/filter/gzip/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-gzipincludedir=$(includedir)/myserver/include/filter/gzip
-gzipinclude_HEADERS = gzip_decompress.h gzip.h
+includedir=@includedir@/myserver/include/filter/gzip
+include_HEADERS = gzip_decompress.h gzip.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/Makefile.am b/myserver/include/http_handler/Makefile.am
index bdc72fe..8862c14 100644
--- a/myserver/include/http_handler/Makefile.am
+++ b/myserver/include/http_handler/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-http_handlerincludedir=$(includedir)/myserver/include/http_handler
-http_handlerinclude_HEADERS =
+includedir=@includedir@/myserver/include/http_handler
+include_HEADERS =
 SUBDIRS = cgi fastcgi http_dir http_file isapi mscgi proxy scgi wincgi
 
diff --git a/myserver/include/http_handler/cgi/Makefile.am b/myserver/include/http_handler/cgi/Makefile.am
index c62e855..533d230 100644
--- a/myserver/include/http_handler/cgi/Makefile.am
+++ b/myserver/include/http_handler/cgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-cgiincludedir=$(includedir)/myserver/include/http_handler/cgi
-cgiinclude_HEADERS = cgi.h
+includedir=@includedir@/myserver/include/http_handler/cgi
+include_HEADERS = cgi.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/fastcgi/Makefile.am b/myserver/include/http_handler/fastcgi/Makefile.am
index 9348b3b..23e1095 100644
--- a/myserver/include/http_handler/fastcgi/Makefile.am
+++ b/myserver/include/http_handler/fastcgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-fastcgiincludedir=$(includedir)/myserver/include/http_handler/fastcgi
-fastcgiinclude_HEADERS = fastcgi.h
+includedir=@includedir@/myserver/include/http_handler/fastcgi
+include_HEADERS = fastcgi.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/http_dir/Makefile.am b/myserver/include/http_handler/http_dir/Makefile.am
index 9ba9eb3..9e39da5 100644
--- a/myserver/include/http_handler/http_dir/Makefile.am
+++ b/myserver/include/http_handler/http_dir/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-http_dirincludedir=$(includedir)/myserver/include/http_handler/http_dir
-http_dirinclude_HEADERS = http_dir.h
+includedir=@includedir@/myserver/include/http_handler/http_dir
+include_HEADERS = http_dir.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/http_file/Makefile.am b/myserver/include/http_handler/http_file/Makefile.am
index 3428931..af8bb5a 100644
--- a/myserver/include/http_handler/http_file/Makefile.am
+++ b/myserver/include/http_handler/http_file/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-http_fileincludedir=$(includedir)/myserver/include/http_handler/http_file
-http_fileinclude_HEADERS = http_file.h
+includedir=@includedir@/myserver/include/http_handler/http_file
+include_HEADERS = http_file.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/isapi/Makefile.am b/myserver/include/http_handler/isapi/Makefile.am
index 88ef50e..770c03d 100644
--- a/myserver/include/http_handler/isapi/Makefile.am
+++ b/myserver/include/http_handler/isapi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-isapiincludedir=$(includedir)/myserver/include/http_handler/isapi
-isapiinclude_HEADERS = isapi.h
+includedir=@includedir@/myserver/include/http_handler/isapi
+include_HEADERS = isapi.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/mscgi/Makefile.am b/myserver/include/http_handler/mscgi/Makefile.am
index 47cbe11..1cd8008 100644
--- a/myserver/include/http_handler/mscgi/Makefile.am
+++ b/myserver/include/http_handler/mscgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-mscgiincludedir=$(includedir)/myserver/include/http_handler/mscgi
-mscgiinclude_HEADERS = mscgi.h mscgi_manager.h
+includedir=@includedir@/myserver/include/http_handler/mscgi
+include_HEADERS = mscgi.h mscgi_manager.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/proxy/Makefile.am b/myserver/include/http_handler/proxy/Makefile.am
index ce99393..bedb399 100644
--- a/myserver/include/http_handler/proxy/Makefile.am
+++ b/myserver/include/http_handler/proxy/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-proxyincludedir=$(includedir)/myserver/include/http_handler/proxy
-proxyinclude_HEADERS = proxy.h
+includedir=@includedir@/myserver/include/http_handler/proxy
+include_HEADERS = proxy.h
 SUBDIRS =
diff --git a/myserver/include/http_handler/scgi/Makefile.am b/myserver/include/http_handler/scgi/Makefile.am
index cf232ba..e16a561 100644
--- a/myserver/include/http_handler/scgi/Makefile.am
+++ b/myserver/include/http_handler/scgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-scgiincludedir=$(includedir)/myserver/include/http_handler/scgi
-scgiinclude_HEADERS = scgi.h
+includedir=@includedir@/myserver/include/http_handler/scgi
+include_HEADERS = scgi.h
 SUBDIRS =
 
diff --git a/myserver/include/http_handler/wincgi/Makefile.am b/myserver/include/http_handler/wincgi/Makefile.am
index f5810be..c1581c6 100644
--- a/myserver/include/http_handler/wincgi/Makefile.am
+++ b/myserver/include/http_handler/wincgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-wincgiincludedir=$(includedir)/myserver/include/http_handler/wincgi
-wincgiinclude_HEADERS = wincgi.h
+includedir=@includedir@/myserver/include/http_handler/wincgi
+include_HEADERS = wincgi.h
 SUBDIRS =
 
diff --git a/myserver/include/log/Makefile.am b/myserver/include/log/Makefile.am
index 5bdf3c9..62fc1e5 100644
--- a/myserver/include/log/Makefile.am
+++ b/myserver/include/log/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-logincludedir=$(includedir)/myserver/include/log
-loginclude_HEADERS = log_manager.h
+includedir=@includedir@/myserver/include/log
+include_HEADERS = log_manager.h
 SUBDIRS = stream
 
diff --git a/myserver/include/log/stream/Makefile.am b/myserver/include/log/stream/Makefile.am
index 8b98150..4e9f5f1 100644
--- a/myserver/include/log/stream/Makefile.am
+++ b/myserver/include/log/stream/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-streamincludedir=$(includedir)/myserver/include/log/stream
-streaminclude_HEADERS = console_stream_creator.h console_stream.h file_stream_creator.h file_stream.h log_stream_creator.h log_stream_factory.h log_stream.h socket_stream_creator.h socket_stream.h
+includedir=@includedir@/myserver/include/log/stream
+include_HEADERS = console_stream_creator.h console_stream.h file_stream_creator.h file_stream.h log_stream_creator.h log_stream_factory.h log_stream.h socket_stream_creator.h socket_stream.h
 SUBDIRS =
 
diff --git a/myserver/include/plugin/Makefile.am b/myserver/include/plugin/Makefile.am
index 74f2c1a..5f80b21 100644
--- a/myserver/include/plugin/Makefile.am
+++ b/myserver/include/plugin/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-pluginincludedir=$(includedir)/myserver/include/plugin
-plugininclude_HEADERS =  plugin.h plugin_info.h plugins_manager.h 
+includedir=@includedir@/myserver/include/plugin
+include_HEADERS =  plugin.h plugin_info.h plugins_manager.h 
 
 
diff --git a/myserver/include/protocol/Makefile.am b/myserver/include/protocol/Makefile.am
index 6d7f3b4..20a1db8 100644
--- a/myserver/include/protocol/Makefile.am
+++ b/myserver/include/protocol/Makefile.am
@@ -14,6 +14,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-protocolincludedir=$(includedir)/myserver/include/protocol
-protocolinclude_HEADERS = protocol_buffer.h protocol.h protocols_manager.h url.h
+includedir=@includedir@/myserver/include/protocol
+include_HEADERS = protocol_buffer.h protocol.h protocols_manager.h url.h
 SUBDIRS = control ftp gopher http https
diff --git a/myserver/include/protocol/control/Makefile.am b/myserver/include/protocol/control/Makefile.am
index 55c6398..f0253c1 100644
--- a/myserver/include/protocol/control/Makefile.am
+++ b/myserver/include/protocol/control/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-controlincludedir=$(includedir)/myserver/include/protocol/control
-controlinclude_HEADERS = control_errors.h control_header.h control_protocol.h
+includedir=@includedir@/myserver/include/protocol/control
+include_HEADERS = control_errors.h control_header.h control_protocol.h
 SUBDIRS =
 
diff --git a/myserver/include/protocol/ftp/Makefile.am b/myserver/include/protocol/ftp/Makefile.am
index a964394..2c60fc8 100644
--- a/myserver/include/protocol/ftp/Makefile.am
+++ b/myserver/include/protocol/ftp/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-ftpincludedir=$(includedir)/myserver/include/protocol/ftp
-ftpinclude_HEADERS = ftp_common.h ftp.h ftp_lexer.h ftp_parser.h
+includedir=@includedir@/myserver/include/protocol/ftp
+include_HEADERS = ftp_common.h ftp.h ftp_lexer.h ftp_parser.h
 SUBDIRS =
 
diff --git a/myserver/include/protocol/gopher/Makefile.am b/myserver/include/protocol/gopher/Makefile.am
index bc05d22..fee75ba 100644
--- a/myserver/include/protocol/gopher/Makefile.am
+++ b/myserver/include/protocol/gopher/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-gopherincludedir=$(includedir)/myserver/include/protocol/gopher
-gopherinclude_HEADERS = gopher.h gopher_content.h engine.h
+includedir=@includedir@/myserver/include/protocol/gopher
+include_HEADERS = gopher.h gopher_content.h engine.h
 
 
diff --git a/myserver/include/protocol/http/Makefile.am b/myserver/include/protocol/http/Makefile.am
index d716710..e1104fa 100644
--- a/myserver/include/protocol/http/Makefile.am
+++ b/myserver/include/protocol/http/Makefile.am
@@ -14,8 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-httpincludedir=$(includedir)/myserver/include/protocol/http
-httpinclude_HEADERS = dyn_http_command.h dyn_http_command_manager.h \
+includedir=@includedir@/myserver/include/protocol/http
+include_HEADERS = dyn_http_command.h dyn_http_command_manager.h \
 	dyn_http_manager.h dyn_http_manager_list.h http_data_handler.h \
 	http_data_read.h http_errors.h http.h http_header.h http_headers.h \
 	http_internal_exception.h http_request.h http_req_security_domain.h	\
diff --git a/myserver/include/protocol/http/env/Makefile.am b/myserver/include/protocol/http/env/Makefile.am
index 4b277d6..ad5be02 100644
--- a/myserver/include/protocol/http/env/Makefile.am
+++ b/myserver/include/protocol/http/env/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-envincludedir=$(includedir)/myserver/include/protocol/http/env
-envinclude_HEADERS = env.h
+includedir=@includedir@/myserver/include/protocol/http/env
+include_HEADERS = env.h
 SUBDIRS =
 
diff --git a/myserver/include/protocol/https/Makefile.am b/myserver/include/protocol/https/Makefile.am
index eb4111e..90f5f2f 100644
--- a/myserver/include/protocol/https/Makefile.am
+++ b/myserver/include/protocol/https/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-httpsincludedir=$(includedir)/myserver/include/protocol/https
-httpsinclude_HEADERS = https.h
+includedir=@includedir@/myserver/include/protocol/https
+include_HEADERS = https.h
 SUBDIRS =
 
diff --git a/myserver/include/server/Makefile.am b/myserver/include/server/Makefile.am
index 19cb42d..4e1eb5e 100644
--- a/myserver/include/server/Makefile.am
+++ b/myserver/include/server/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-serverincludedir=$(includedir)/myserver/include/server
-serverinclude_HEADERS = clients_thread.h server.h
+includedir=@includedir@/myserver/include/server
+include_HEADERS = clients_thread.h server.h
 SUBDIRS =
 
diff --git a/myserver/src/GUI/Makefile.am b/myserver/src/GUI/Makefile.am
index e5beccc..c24f169 100644
--- a/myserver/src/GUI/Makefile.am
+++ b/myserver/src/GUI/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 
 all: copy_files
 
diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index 20d0b37..cc747c2 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -15,8 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AM_CPPFLAGS = $(all_includes) -I$(top_builddir)/lib -I$(top_srcdir)/lib
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 
 SUBDIRS = base conf connection connections_scheduler filter http_handler \
 	log plugin protocol server GUI
@@ -159,7 +158,7 @@ libmyserver_la_LIBADD =  \
 		$(ZLIB_LIB) $(XML_LIBS) \
 		$(INTLLIBS) $(LDFLAGS)
 
-myserver_CXXFLAGS = $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
+myserver_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
 
 myserver_LDFLAGS = -static -no-install
 myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
@@ -167,4 +166,7 @@ myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
 	$(XML_LIBS) $(INTLLIBS) $(LDFLAGS)
 
 all-local: libmyserver.la myserver${EXEEXT}
-	$(LIBTOOL) --mode=install cp myserver $(abs_top_srcdir)/binaries/
+	$(LIBTOOL) --mode=install cp myserver $(abs_top_builddir)/binaries/
+
+generic-clean:
+	$(LIBTOOL) --mode=uninstall rm -f $(abs_top_builddir)/binaries/myserver
diff --git a/myserver/src/base/Makefile.am b/myserver/src/base/Makefile.am
index 8de5c81..4e133bd 100644
--- a/myserver/src/base/Makefile.am
+++ b/myserver/src/base/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libbase.la
 libbase_la_SOURCES = utility.cpp
 SUBDIRS = base64 bitvec crypt dynamic_lib file exceptions files_cache \
diff --git a/myserver/src/base/base64/Makefile.am b/myserver/src/base/base64/Makefile.am
index 3c28aec..85bee47 100644
--- a/myserver/src/base/base64/Makefile.am
+++ b/myserver/src/base/base64/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libbase64.la
 libbase64_la_SOURCES = mime_utils.cpp
 SUBDIRS =
diff --git a/myserver/src/base/bitvec/Makefile.am b/myserver/src/base/bitvec/Makefile.am
index 1afac54..04797fc 100644
--- a/myserver/src/base/bitvec/Makefile.am
+++ b/myserver/src/base/bitvec/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libbitvec.la
 libbitvec_la_SOURCES = bitvec.cpp
 SUBDIRS =
diff --git a/myserver/src/base/crypt/Makefile.am b/myserver/src/base/crypt/Makefile.am
index 1caa52d..b2b6980 100644
--- a/myserver/src/base/crypt/Makefile.am
+++ b/myserver/src/base/crypt/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcrypt.la
 libcrypt_la_SOURCES = crypt_algo.cpp crypt_algo_manager.cpp md5.cpp sha1.cpp
 SUBDIRS =
diff --git a/myserver/src/base/dynamic_lib/Makefile.am b/myserver/src/base/dynamic_lib/Makefile.am
index 2c2b3cc..308a460 100644
--- a/myserver/src/base/dynamic_lib/Makefile.am
+++ b/myserver/src/base/dynamic_lib/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libdynamic_lib.la
 libdynamic_lib_la_SOURCES = dynamiclib.cpp
 SUBDIRS =
diff --git a/myserver/src/base/exceptions/Makefile.am b/myserver/src/base/exceptions/Makefile.am
index d9bd820..e99a44d 100644
--- a/myserver/src/base/exceptions/Makefile.am
+++ b/myserver/src/base/exceptions/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libexceptions.la
 libexceptions_la_SOURCES = checked.cpp exceptions.cpp
 SUBDIRS =
diff --git a/myserver/src/base/file/Makefile.am b/myserver/src/base/file/Makefile.am
index 4a13660..0d5c988 100644
--- a/myserver/src/base/file/Makefile.am
+++ b/myserver/src/base/file/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfile.la
 libfile_la_SOURCES = file.cpp files_utility.cpp
 SUBDIRS =
diff --git a/myserver/src/base/files_cache/Makefile.am b/myserver/src/base/files_cache/Makefile.am
index ba62da4..e3a7156 100644
--- a/myserver/src/base/files_cache/Makefile.am
+++ b/myserver/src/base/files_cache/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfiles_cache.la
 libfiles_cache_la_SOURCES = cached_file_buffer.cpp cached_file.cpp \
 			   cached_file_factory.cpp membuf_file.cpp
diff --git a/myserver/src/base/hash_map/Makefile.am b/myserver/src/base/hash_map/Makefile.am
index 350e31f..d4a50c5 100644
--- a/myserver/src/base/hash_map/Makefile.am
+++ b/myserver/src/base/hash_map/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhash_map.la
 libhash_map_la_SOURCES = hash_map.cpp
 SUBDIRS =
diff --git a/myserver/src/base/home_dir/Makefile.am b/myserver/src/base/home_dir/Makefile.am
index 842dc87..0595e3f 100644
--- a/myserver/src/base/home_dir/Makefile.am
+++ b/myserver/src/base/home_dir/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhome_dir.la
 libhome_dir_la_SOURCES = home_dir.cpp
 SUBDIRS =
diff --git a/myserver/src/base/mem_buff/Makefile.am b/myserver/src/base/mem_buff/Makefile.am
index f61f17a..3881d73 100644
--- a/myserver/src/base/mem_buff/Makefile.am
+++ b/myserver/src/base/mem_buff/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmem_buff.la
 libmem_buff_la_SOURCES = mem_buff.cpp
 SUBDIRS =
diff --git a/myserver/src/base/multicast/Makefile.am b/myserver/src/base/multicast/Makefile.am
index 0632475..6c7d805 100644
--- a/myserver/src/base/multicast/Makefile.am
+++ b/myserver/src/base/multicast/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmulticast.la
 libmulticast_la_SOURCES = multicast.cpp
 SUBDIRS =
diff --git a/myserver/src/base/pipe/Makefile.am b/myserver/src/base/pipe/Makefile.am
index 440f949..050324f 100644
--- a/myserver/src/base/pipe/Makefile.am
+++ b/myserver/src/base/pipe/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libpipe.la
 libpipe_la_SOURCES = pipe.cpp
 SUBDIRS =
diff --git a/myserver/src/base/process/Makefile.am b/myserver/src/base/process/Makefile.am
index bba48b1..f6c4c94 100644
--- a/myserver/src/base/process/Makefile.am
+++ b/myserver/src/base/process/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libprocess.la
 libprocess_la_SOURCES = fork_server.cpp process.cpp process_server_manager.cpp
 SUBDIRS =
diff --git a/myserver/src/base/read_directory/Makefile.am b/myserver/src/base/read_directory/Makefile.am
index 8d5b572..1e0b8a3 100644
--- a/myserver/src/base/read_directory/Makefile.am
+++ b/myserver/src/base/read_directory/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libread_directory.la
 libread_directory_la_SOURCES = read_directory.cpp
 SUBDIRS =
diff --git a/myserver/src/base/regex/Makefile.am b/myserver/src/base/regex/Makefile.am
index 6776bb4..4ba2f64 100644
--- a/myserver/src/base/regex/Makefile.am
+++ b/myserver/src/base/regex/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libregex.la
 libregex_la_SOURCES = myserver_regex.cpp
 SUBDIRS =
diff --git a/myserver/src/base/safetime/Makefile.am b/myserver/src/base/safetime/Makefile.am
index 90d79c7..061a851 100644
--- a/myserver/src/base/safetime/Makefile.am
+++ b/myserver/src/base/safetime/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsafetime.la
 libsafetime_la_SOURCES = safetime.cpp
 SUBDIRS =
diff --git a/myserver/src/base/slab/Makefile.am b/myserver/src/base/slab/Makefile.am
index 7e1b627..2ce15e1 100644
--- a/myserver/src/base/slab/Makefile.am
+++ b/myserver/src/base/slab/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libslab.la
 libslab_la_SOURCES = slab.cpp
 SUBDIRS =
diff --git a/myserver/src/base/socket/Makefile.am b/myserver/src/base/socket/Makefile.am
index 90b2b68..75030e8 100644
--- a/myserver/src/base/socket/Makefile.am
+++ b/myserver/src/base/socket/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsocket.la
 libsocket_la_SOURCES = socket.cpp ssl_socket.cpp
 SUBDIRS =
diff --git a/myserver/src/base/socket_pair/Makefile.am b/myserver/src/base/socket_pair/Makefile.am
index 53540b2..2881d83 100644
--- a/myserver/src/base/socket_pair/Makefile.am
+++ b/myserver/src/base/socket_pair/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsocket_pair.la
 libsocket_pair_la_SOURCES = socket_pair.cpp
 SUBDIRS =
diff --git a/myserver/src/base/ssl/Makefile.am b/myserver/src/base/ssl/Makefile.am
index 0f67678..3e1ac42 100644
--- a/myserver/src/base/ssl/Makefile.am
+++ b/myserver/src/base/ssl/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libssl.la
 libssl_la_SOURCES = ssl.cpp
 SUBDIRS =
diff --git a/myserver/src/base/string/Makefile.am b/myserver/src/base/string/Makefile.am
index 9d8c13d..9addade 100644
--- a/myserver/src/base/string/Makefile.am
+++ b/myserver/src/base/string/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libstring.la
 libstring_la_SOURCES = securestr.cpp stringutils.cpp
 SUBDIRS =
diff --git a/myserver/src/base/sync/Makefile.am b/myserver/src/base/sync/Makefile.am
index 711953b..63e4869 100644
--- a/myserver/src/base/sync/Makefile.am
+++ b/myserver/src/base/sync/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsync.la
 libsync_la_SOURCES = event.cpp mutex.cpp read_write_lock.cpp recursive_mutex.cpp semaphore.cpp
 SUBDIRS =
diff --git a/myserver/src/base/thread/Makefile.am b/myserver/src/base/thread/Makefile.am
index 5763d32..84ec84c 100644
--- a/myserver/src/base/thread/Makefile.am
+++ b/myserver/src/base/thread/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libthread.la
 libthread_la_SOURCES = thread.cpp
 SUBDIRS =
diff --git a/myserver/src/base/unix_socket/Makefile.am b/myserver/src/base/unix_socket/Makefile.am
index 6d3eaa2..bfe2d32 100644
--- a/myserver/src/base/unix_socket/Makefile.am
+++ b/myserver/src/base/unix_socket/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libunix_socket.la
 libunix_socket_la_SOURCES = unix_socket.cpp
 SUBDIRS =
diff --git a/myserver/src/base/xml/Makefile.am b/myserver/src/base/xml/Makefile.am
index 49c9d5b..48777a1 100644
--- a/myserver/src/base/xml/Makefile.am
+++ b/myserver/src/base/xml/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libxml.la
 libxml_la_SOURCES = xml_parser.cpp
 SUBDIRS =
diff --git a/myserver/src/conf/Makefile.am b/myserver/src/conf/Makefile.am
index e224f25..97d536d 100644
--- a/myserver/src/conf/Makefile.am
+++ b/myserver/src/conf/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconf.la
 libconf_la_SOURCES = nodetree.cpp xml_conf.cpp
 SUBDIRS = main mime security vhost
diff --git a/myserver/src/conf/main/Makefile.am b/myserver/src/conf/main/Makefile.am
index 35d22f6..19ce846 100644
--- a/myserver/src/conf/main/Makefile.am
+++ b/myserver/src/conf/main/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmain.la
 libmain_la_SOURCES = main_configuration.cpp xml_main_configuration.cpp
 SUBDIRS =
diff --git a/myserver/src/conf/mime/Makefile.am b/myserver/src/conf/mime/Makefile.am
index 85038d8..9a68b39 100644
--- a/myserver/src/conf/mime/Makefile.am
+++ b/myserver/src/conf/mime/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmime.la
 libmime_la_SOURCES = mime_manager.cpp xml_mime_handler.cpp
 SUBDIRS =
diff --git a/myserver/src/conf/security/Makefile.am b/myserver/src/conf/security/Makefile.am
index 983647e..305b287 100644
--- a/myserver/src/conf/security/Makefile.am
+++ b/myserver/src/conf/security/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsecurity.la
 libsecurity_la_SOURCES = auth_domain.cpp auth_method.cpp auth_method_factory.cpp security_cache.cpp security_domain.cpp security_manager.cpp security_token.cpp validator.cpp validator_factory.cpp xml_validator.cpp
 SUBDIRS =
diff --git a/myserver/src/conf/vhost/Makefile.am b/myserver/src/conf/vhost/Makefile.am
index 482a739..65098c7 100644
--- a/myserver/src/conf/vhost/Makefile.am
+++ b/myserver/src/conf/vhost/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libvhost.la
 libvhost_la_SOURCES = vhost.cpp vhost_manager.cpp ip.cpp xml_vhost_handler.cpp
 SUBDIRS =
diff --git a/myserver/src/connection/Makefile.am b/myserver/src/connection/Makefile.am
index 9839ecd..0a8fee0 100644
--- a/myserver/src/connection/Makefile.am
+++ b/myserver/src/connection/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconnection.la
 libconnection_la_SOURCES = connection.cpp
 SUBDIRS =
diff --git a/myserver/src/connections_scheduler/Makefile.am b/myserver/src/connections_scheduler/Makefile.am
index e8f9d99..ad721b6 100644
--- a/myserver/src/connections_scheduler/Makefile.am
+++ b/myserver/src/connections_scheduler/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconnections_scheduler.la
 libconnections_scheduler_la_SOURCES = connections_scheduler.cpp listen_threads.cpp
 SUBDIRS =
diff --git a/myserver/src/filter/Makefile.am b/myserver/src/filter/Makefile.am
index 348c1f2..f975c91 100644
--- a/myserver/src/filter/Makefile.am
+++ b/myserver/src/filter/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfilter.la
 libfilter_la_SOURCES = filter.cpp filters_chain.cpp filters_factory.cpp memory_stream.cpp stream.cpp \
 			console.cpp
diff --git a/myserver/src/filter/gzip/Makefile.am b/myserver/src/filter/gzip/Makefile.am
index 17f1597..a1e8b10 100644
--- a/myserver/src/filter/gzip/Makefile.am
+++ b/myserver/src/filter/gzip/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libgzip.la
 libgzip_la_SOURCES = gzip.cpp gzip_decompress.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/Makefile.am b/myserver/src/http_handler/Makefile.am
index ab15fe8..7cf6c93 100644
--- a/myserver/src/http_handler/Makefile.am
+++ b/myserver/src/http_handler/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_handler.la
 libhttp_handler_la_SOURCES =
 SUBDIRS = cgi fastcgi http_dir http_file isapi mscgi proxy scgi wincgi
diff --git a/myserver/src/http_handler/cgi/Makefile.am b/myserver/src/http_handler/cgi/Makefile.am
index 2edb58b..e47f5d4 100644
--- a/myserver/src/http_handler/cgi/Makefile.am
+++ b/myserver/src/http_handler/cgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcgi.la
 libcgi_la_SOURCES = cgi.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/fastcgi/Makefile.am b/myserver/src/http_handler/fastcgi/Makefile.am
index 8e5ad8f..f9090cc 100644
--- a/myserver/src/http_handler/fastcgi/Makefile.am
+++ b/myserver/src/http_handler/fastcgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfastcgi.la
 libfastcgi_la_SOURCES = fastcgi.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/http_dir/Makefile.am b/myserver/src/http_handler/http_dir/Makefile.am
index cbadfee..406e17e 100644
--- a/myserver/src/http_handler/http_dir/Makefile.am
+++ b/myserver/src/http_handler/http_dir/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_dir.la
 libhttp_dir_la_SOURCES = http_dir.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/http_file/Makefile.am b/myserver/src/http_handler/http_file/Makefile.am
index aeb5b85..ac1be19 100644
--- a/myserver/src/http_handler/http_file/Makefile.am
+++ b/myserver/src/http_handler/http_file/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_file.la
 libhttp_file_la_SOURCES = http_file.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/isapi/Makefile.am b/myserver/src/http_handler/isapi/Makefile.am
index 6d0d07c..fc5eab5 100644
--- a/myserver/src/http_handler/isapi/Makefile.am
+++ b/myserver/src/http_handler/isapi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libisapi.la
 libisapi_la_SOURCES = isapi.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/mscgi/Makefile.am b/myserver/src/http_handler/mscgi/Makefile.am
index 9052756..fe1665f 100644
--- a/myserver/src/http_handler/mscgi/Makefile.am
+++ b/myserver/src/http_handler/mscgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmscgi.la
 libmscgi_la_SOURCES = mscgi.cpp mscgi_manager.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/proxy/Makefile.am b/myserver/src/http_handler/proxy/Makefile.am
index c1ca885..5468c96 100644
--- a/myserver/src/http_handler/proxy/Makefile.am
+++ b/myserver/src/http_handler/proxy/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libproxy.la
 libproxy_la_SOURCES = proxy.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/scgi/Makefile.am b/myserver/src/http_handler/scgi/Makefile.am
index 3b28392..8537788 100644
--- a/myserver/src/http_handler/scgi/Makefile.am
+++ b/myserver/src/http_handler/scgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libscgi.la
 libscgi_la_SOURCES = scgi.cpp
 SUBDIRS =
diff --git a/myserver/src/http_handler/wincgi/Makefile.am b/myserver/src/http_handler/wincgi/Makefile.am
index 76025d9..c9eb43a 100644
--- a/myserver/src/http_handler/wincgi/Makefile.am
+++ b/myserver/src/http_handler/wincgi/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libwincgi.la
 libwincgi_la_SOURCES = wincgi.cpp
 SUBDIRS =
diff --git a/myserver/src/log/Makefile.am b/myserver/src/log/Makefile.am
index 9a8ce2d..2d86aa5 100644
--- a/myserver/src/log/Makefile.am
+++ b/myserver/src/log/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = liblog.la
 liblog_la_SOURCES = log_manager.cpp
 SUBDIRS = stream
diff --git a/myserver/src/log/stream/Makefile.am b/myserver/src/log/stream/Makefile.am
index 51d0d19..8c186e8 100644
--- a/myserver/src/log/stream/Makefile.am
+++ b/myserver/src/log/stream/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libstream.la
 libstream_la_SOURCES = console_stream.cpp file_stream.cpp \
 		log_stream.cpp log_stream_factory.cpp \
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 156d8dd..f0d49cd 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -16,7 +16,7 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "myserver.h"
+#include <myserver.h>
 #include <include/server/server.h>
 #include <include/base/file/files_utility.h>
 #include <include/base/string/stringutils.h>
diff --git a/myserver/src/plugin/Makefile.am b/myserver/src/plugin/Makefile.am
index e5d21ad..756eccd 100644
--- a/myserver/src/plugin/Makefile.am
+++ b/myserver/src/plugin/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libplugin.la
 libplugin_la_SOURCES =  plugin.cpp plugin_info.cpp plugins_manager.cpp 
 AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/protocol/Makefile.am b/myserver/src/protocol/Makefile.am
index d6582a9..12cd8b2 100644
--- a/myserver/src/protocol/Makefile.am
+++ b/myserver/src/protocol/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libprotocol.la
 libprotocol_la_SOURCES = protocol_buffer.cpp protocol.cpp protocols_manager.cpp \
 			url.cpp
diff --git a/myserver/src/protocol/control/Makefile.am b/myserver/src/protocol/control/Makefile.am
index 4348bba..1ae86cc 100644
--- a/myserver/src/protocol/control/Makefile.am
+++ b/myserver/src/protocol/control/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcontrol.la
 libcontrol_la_SOURCES = control_header.cpp control_protocol.cpp
 SUBDIRS =
diff --git a/myserver/src/protocol/ftp/Makefile.am b/myserver/src/protocol/ftp/Makefile.am
index 6b32ce0..1dbb100 100644
--- a/myserver/src/protocol/ftp/Makefile.am
+++ b/myserver/src/protocol/ftp/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libftp.la
 libftp_la_SOURCES = ftp.cpp ftp_lexer.cpp ftp_parser.cpp
 EXTRA_DIST = ftp_lexer.out.cpp  ftp_parser.ypp  ftp_lexer.lpp
diff --git a/myserver/src/protocol/gopher/Makefile.am b/myserver/src/protocol/gopher/Makefile.am
index 5815b8f..1243a7a 100644
--- a/myserver/src/protocol/gopher/Makefile.am
+++ b/myserver/src/protocol/gopher/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libgopher.la
 libgopher_la_SOURCES = gopher.cpp gopher_content.cpp engine.cpp
 AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/protocol/http/Makefile.am b/myserver/src/protocol/http/Makefile.am
index 23c540f..ea23860 100644
--- a/myserver/src/protocol/http/Makefile.am
+++ b/myserver/src/protocol/http/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp.la
 libhttp_la_SOURCES = http.cpp http_data_handler.cpp http_data_read.cpp \
 	           http_errors.cpp  http_header.cpp http_headers.cpp \
diff --git a/myserver/src/protocol/http/env/Makefile.am b/myserver/src/protocol/http/env/Makefile.am
index 2e67a80..6bcd83f 100644
--- a/myserver/src/protocol/http/env/Makefile.am
+++ b/myserver/src/protocol/http/env/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libenv.la
 libenv_la_SOURCES = env.cpp
 SUBDIRS =
diff --git a/myserver/src/protocol/https/Makefile.am b/myserver/src/protocol/https/Makefile.am
index dc0be0b..16c3951 100644
--- a/myserver/src/protocol/https/Makefile.am
+++ b/myserver/src/protocol/https/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttps.la
 libhttps_la_SOURCES = https.cpp
 SUBDIRS =
diff --git a/myserver/src/server/Makefile.am b/myserver/src/server/Makefile.am
index 89cf371..75b6609 100644
--- a/myserver/src/server/Makefile.am
+++ b/myserver/src/server/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libserver.la
 libserver_la_SOURCES = clients_thread.cpp server.cpp
 SUBDIRS =
diff --git a/myserver/tests/Makefile.am b/myserver/tests/Makefile.am
index bed6775..61a127e 100644
--- a/myserver/tests/Makefile.am
+++ b/myserver/tests/Makefile.am
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
+AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 noinst_PROGRAMS = test_suite
 test_suite_SOURCES =  	main.cpp				\
 			memory_socket.h			        \

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

Summary of changes:
 myserver/Makefile.am                               |    9 +++++++--
 myserver/binaries/Makefile.am                      |    5 -----
 myserver/binaries/certificates/Makefile.am         |    2 +-
 myserver/binaries/web/cgi-src/math_sum/Makefile.am |    5 ++++-
 myserver/binaries/web/cgi-src/post/Makefile.am     |    5 ++++-
 myserver/documentation/Makefile.am                 |   13 ++++++++++---
 myserver/include/Makefile.am                       |    7 ++-----
 myserver/include/base/Makefile.am                  |   11 +++++++----
 myserver/include/base/base64/Makefile.am           |    5 +++--
 myserver/include/base/bitvec/Makefile.am           |    4 ++--
 myserver/include/base/crypt/Makefile.am            |    4 ++--
 myserver/include/base/dynamic_lib/Makefile.am      |    4 ++--
 myserver/include/base/exceptions/Makefile.am       |    4 ++--
 myserver/include/base/file/Makefile.am             |    4 ++--
 myserver/include/base/files_cache/Makefile.am      |    4 ++--
 myserver/include/base/hash_map/Makefile.am         |    4 ++--
 myserver/include/base/home_dir/Makefile.am         |    4 ++--
 myserver/include/base/mem_buff/Makefile.am         |    4 ++--
 myserver/include/base/multicast/Makefile.am        |    4 ++--
 myserver/include/base/pipe/Makefile.am             |    4 ++--
 myserver/include/base/process/Makefile.am          |    4 ++--
 myserver/include/base/read_directory/Makefile.am   |    4 ++--
 myserver/include/base/regex/Makefile.am            |    4 ++--
 myserver/include/base/safetime/Makefile.am         |    4 ++--
 myserver/include/base/slab/Makefile.am             |    4 ++--
 myserver/include/base/socket/Makefile.am           |    4 ++--
 myserver/include/base/socket_pair/Makefile.am      |    4 ++--
 myserver/include/base/ssl/Makefile.am              |    4 ++--
 myserver/include/base/string/Makefile.am           |    4 ++--
 myserver/include/base/sync/Makefile.am             |    4 ++--
 myserver/include/base/thread/Makefile.am           |    4 ++--
 myserver/include/base/unix_socket/Makefile.am      |    4 ++--
 myserver/include/base/xml/Makefile.am              |    4 ++--
 myserver/include/conf/Makefile.am                  |    4 ++--
 myserver/include/conf/main/Makefile.am             |    4 ++--
 myserver/include/conf/mime/Makefile.am             |    4 ++--
 myserver/include/conf/security/Makefile.am         |    4 ++--
 myserver/include/conf/vhost/Makefile.am            |    4 ++--
 myserver/include/connection/Makefile.am            |    4 ++--
 myserver/include/connections_scheduler/Makefile.am |    4 ++--
 myserver/include/filter/Makefile.am                |    4 ++--
 myserver/include/filter/gzip/Makefile.am           |    4 ++--
 myserver/include/http_handler/Makefile.am          |    4 ++--
 myserver/include/http_handler/cgi/Makefile.am      |    4 ++--
 myserver/include/http_handler/fastcgi/Makefile.am  |    4 ++--
 myserver/include/http_handler/http_dir/Makefile.am |    4 ++--
 .../include/http_handler/http_file/Makefile.am     |    4 ++--
 myserver/include/http_handler/isapi/Makefile.am    |    4 ++--
 myserver/include/http_handler/mscgi/Makefile.am    |    4 ++--
 myserver/include/http_handler/proxy/Makefile.am    |    4 ++--
 myserver/include/http_handler/scgi/Makefile.am     |    4 ++--
 myserver/include/http_handler/wincgi/Makefile.am   |    4 ++--
 myserver/include/log/Makefile.am                   |    4 ++--
 myserver/include/log/stream/Makefile.am            |    4 ++--
 myserver/include/plugin/Makefile.am                |    4 ++--
 myserver/include/protocol/Makefile.am              |    4 ++--
 myserver/include/protocol/control/Makefile.am      |    4 ++--
 myserver/include/protocol/ftp/Makefile.am          |    4 ++--
 myserver/include/protocol/gopher/Makefile.am       |    4 ++--
 myserver/include/protocol/http/Makefile.am         |    4 ++--
 myserver/include/protocol/http/env/Makefile.am     |    4 ++--
 myserver/include/protocol/https/Makefile.am        |    4 ++--
 myserver/include/server/Makefile.am                |    4 ++--
 myserver/src/GUI/Makefile.am                       |    2 +-
 myserver/src/Makefile.am                           |   10 ++++++----
 myserver/src/base/Makefile.am                      |    2 +-
 myserver/src/base/base64/Makefile.am               |    2 +-
 myserver/src/base/bitvec/Makefile.am               |    2 +-
 myserver/src/base/crypt/Makefile.am                |    2 +-
 myserver/src/base/dynamic_lib/Makefile.am          |    2 +-
 myserver/src/base/exceptions/Makefile.am           |    2 +-
 myserver/src/base/file/Makefile.am                 |    2 +-
 myserver/src/base/files_cache/Makefile.am          |    2 +-
 myserver/src/base/hash_map/Makefile.am             |    2 +-
 myserver/src/base/home_dir/Makefile.am             |    2 +-
 myserver/src/base/mem_buff/Makefile.am             |    2 +-
 myserver/src/base/multicast/Makefile.am            |    2 +-
 myserver/src/base/pipe/Makefile.am                 |    2 +-
 myserver/src/base/process/Makefile.am              |    2 +-
 myserver/src/base/read_directory/Makefile.am       |    2 +-
 myserver/src/base/regex/Makefile.am                |    2 +-
 myserver/src/base/safetime/Makefile.am             |    2 +-
 myserver/src/base/slab/Makefile.am                 |    2 +-
 myserver/src/base/socket/Makefile.am               |    2 +-
 myserver/src/base/socket_pair/Makefile.am          |    2 +-
 myserver/src/base/ssl/Makefile.am                  |    2 +-
 myserver/src/base/string/Makefile.am               |    2 +-
 myserver/src/base/sync/Makefile.am                 |    2 +-
 myserver/src/base/thread/Makefile.am               |    2 +-
 myserver/src/base/unix_socket/Makefile.am          |    2 +-
 myserver/src/base/xml/Makefile.am                  |    2 +-
 myserver/src/conf/Makefile.am                      |    2 +-
 myserver/src/conf/main/Makefile.am                 |    2 +-
 myserver/src/conf/mime/Makefile.am                 |    2 +-
 myserver/src/conf/security/Makefile.am             |    2 +-
 myserver/src/conf/vhost/Makefile.am                |    2 +-
 myserver/src/connection/Makefile.am                |    2 +-
 myserver/src/connections_scheduler/Makefile.am     |    2 +-
 myserver/src/filter/Makefile.am                    |    2 +-
 myserver/src/filter/gzip/Makefile.am               |    2 +-
 myserver/src/http_handler/Makefile.am              |    2 +-
 myserver/src/http_handler/cgi/Makefile.am          |    2 +-
 myserver/src/http_handler/fastcgi/Makefile.am      |    2 +-
 myserver/src/http_handler/http_dir/Makefile.am     |    2 +-
 myserver/src/http_handler/http_file/Makefile.am    |    2 +-
 myserver/src/http_handler/isapi/Makefile.am        |    2 +-
 myserver/src/http_handler/mscgi/Makefile.am        |    2 +-
 myserver/src/http_handler/proxy/Makefile.am        |    2 +-
 myserver/src/http_handler/scgi/Makefile.am         |    2 +-
 myserver/src/http_handler/wincgi/Makefile.am       |    2 +-
 myserver/src/log/Makefile.am                       |    2 +-
 myserver/src/log/stream/Makefile.am                |    2 +-
 myserver/src/myserver.cpp                          |    2 +-
 myserver/src/plugin/Makefile.am                    |    2 +-
 myserver/src/protocol/Makefile.am                  |    2 +-
 myserver/src/protocol/control/Makefile.am          |    2 +-
 myserver/src/protocol/ftp/Makefile.am              |    2 +-
 myserver/src/protocol/gopher/Makefile.am           |    2 +-
 myserver/src/protocol/http/Makefile.am             |    2 +-
 myserver/src/protocol/http/env/Makefile.am         |    2 +-
 myserver/src/protocol/https/Makefile.am            |    2 +-
 myserver/src/server/Makefile.am                    |    2 +-
 myserver/tests/Makefile.am                         |    2 +-
 123 files changed, 211 insertions(+), 195 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu May 06 05:58:41 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1O9xqq-0004lI-J4
	for mharc-myserver-commit@gnu.org; Thu, 06 May 2010 05:58:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9xqp-0004k2-Du
	for myserver-commit@gnu.org; Thu, 06 May 2010 05:58:39 -0400
Received: from [140.186.70.92] (port=50822 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9xqn-0004iW-OJ
	for myserver-commit@gnu.org; Thu, 06 May 2010 05:58:38 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1O9xqm-0006Ye-Ci
	for myserver-commit@gnu.org; Thu, 06 May 2010 05:58:37 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:40497)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1O9xqm-0006YS-3m
	for myserver-commit@gnu.org; Thu, 06 May 2010 05:58:36 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o469wXSf006987
	for <myserver-commit@gnu.org>; Thu, 6 May 2010 11:58:33 +0200
Message-Id: <201005060958.o469wXSf006987@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Thu, 06 May 2010 11:58:33 +0200
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
X-Hydra-Instance: hydra
X-Hydra-Project: gnu
X-Hydra-Jobset: myserver-master
X-Hydra-Job: manual
Date: Thu, 6 May 2010 11:58:33 +0200
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:manual build
	397991: Success
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 06 May 2010 09:58:39 -0000

Hi,

This is to let you know that Hydra build 397991 of job gnu:myserver-master:manual has changed from 'Failed with non-zero exit code' to 'Success'.

Complete build information can be found on this page: http://hydra.nixos.org/build/397991

A summary of the build information follows:

Build ID:              | 397991
Nix name:              | myserver-manual-0.9.2
Short description:     | Native Nix build on x86_64-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/035998rkav2lanvfbnmsrp4sfgzrp2di-myserver-manual-0.9.2.drv
Output store path:     | /nix/store/hccbmkbzf2pb0ay75gz4hg74cfjgcv2z-myserver-manual-0.9.2
Time added:            | 2010-05-06 11:58:33
Build started:         | 2010-05-06 11:54:38
Build finished:        | 2010-05-06 11:58:33
Duration:              | 235s

The build inputs were:

Name        | Type  | Value
------------+-------+-------------------------------------------------------------
hydraConfig | svn   | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:21598
nixpkgs     | svn   | https://svn.nixos.org/repos/nix/nixpkgs/trunk:21622
tarball     | build | 397555

Regards,

The Hydra build daemon.



From MAILER-DAEMON Thu May 06 10:10:47 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OA1mp-00079w-0X
	for mharc-myserver-commit@gnu.org; Thu, 06 May 2010 10:10:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1O9oMr-0007Xx-Tx
	for myserver-commit@gnu.org; Wed, 05 May 2010 19:51:06 -0400
Received: from [140.186.70.92] (port=36862 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1O9oMj-0007Sv-66
	for myserver-commit@gnu.org; Wed, 05 May 2010 19:51:05 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9oMg-0004D9-Qi
	for myserver-commit@gnu.org; Wed, 05 May 2010 19:50:56 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:37758
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9oMg-0004D1-O0
	for myserver-commit@gnu.org; Wed, 05 May 2010 19:50:54 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1O9oMg-00006x-8Y
	for myserver-commit@gnu.org; Wed, 05 May 2010 23:50:54 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1O9oMd-0003t6-FP
	for myserver-commit@gnu.org; Wed, 05 May 2010 23:50:54 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: cc03a9a19ea4106513dfea5f3a3ba6d54df3507c
X-Git-Newrev: c86a102eaab305acfc5e99e8e6dcd4ddd1936d49
Message-Id: <E1O9oMd-0003t6-FP@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 05 May 2010 23:50:53 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-215-gc86a102
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 05 May 2010 23:51:06 -0000

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  c86a102eaab305acfc5e99e8e6dcd4ddd1936d49 (commit)
      from  cc03a9a19ea4106513dfea5f3a3ba6d54df3507c (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 c86a102eaab305acfc5e99e8e6dcd4ddd1936d49
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu May 6 01:51:08 2010 +0200

    Remove definition of AM_CPPFLAGS in Makefile.am files

diff --git a/myserver/src/base/Makefile.am b/myserver/src/base/Makefile.am
index 4e133bd..1b15f99 100644
--- a/myserver/src/base/Makefile.am
+++ b/myserver/src/base/Makefile.am
@@ -21,7 +21,6 @@ SUBDIRS = base64 bitvec crypt dynamic_lib file exceptions files_cache \
 	  read_directory hash_map home_dir mem_buff multicast pipe process \
           regex safetime slab socket socket_pair ssl string sync thread xml \
 	  unix_socket
-AM_CPPFLAGS = $(all_includes) -I$(top_builddir)/lib -I$(top_srcdir)/lib
 
 install:
 # Do not do anything.
diff --git a/myserver/src/base/base64/Makefile.am b/myserver/src/base/base64/Makefile.am
index 85bee47..6171b0f 100644
--- a/myserver/src/base/base64/Makefile.am
+++ b/myserver/src/base/base64/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libbase64.la
 libbase64_la_SOURCES = mime_utils.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/bitvec/Makefile.am b/myserver/src/base/bitvec/Makefile.am
index 04797fc..6c2b34b 100644
--- a/myserver/src/base/bitvec/Makefile.am
+++ b/myserver/src/base/bitvec/Makefile.am
@@ -18,4 +18,3 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libbitvec.la
 libbitvec_la_SOURCES = bitvec.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/base/crypt/Makefile.am b/myserver/src/base/crypt/Makefile.am
index b2b6980..c98da0b 100644
--- a/myserver/src/base/crypt/Makefile.am
+++ b/myserver/src/base/crypt/Makefile.am
@@ -18,4 +18,3 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcrypt.la
 libcrypt_la_SOURCES = crypt_algo.cpp crypt_algo_manager.cpp md5.cpp sha1.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/base/dynamic_lib/Makefile.am b/myserver/src/base/dynamic_lib/Makefile.am
index 308a460..7c91aea 100644
--- a/myserver/src/base/dynamic_lib/Makefile.am
+++ b/myserver/src/base/dynamic_lib/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libdynamic_lib.la
 libdynamic_lib_la_SOURCES = dynamiclib.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/exceptions/Makefile.am b/myserver/src/base/exceptions/Makefile.am
index e99a44d..a8fd4f9 100644
--- a/myserver/src/base/exceptions/Makefile.am
+++ b/myserver/src/base/exceptions/Makefile.am
@@ -18,4 +18,3 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libexceptions.la
 libexceptions_la_SOURCES = checked.cpp exceptions.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/base/file/Makefile.am b/myserver/src/base/file/Makefile.am
index 0d5c988..56446bb 100644
--- a/myserver/src/base/file/Makefile.am
+++ b/myserver/src/base/file/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfile.la
 libfile_la_SOURCES = file.cpp files_utility.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/files_cache/Makefile.am b/myserver/src/base/files_cache/Makefile.am
index e3a7156..e0b3151 100644
--- a/myserver/src/base/files_cache/Makefile.am
+++ b/myserver/src/base/files_cache/Makefile.am
@@ -19,5 +19,4 @@ lib_LTLIBRARIES = libfiles_cache.la
 libfiles_cache_la_SOURCES = cached_file_buffer.cpp cached_file.cpp \
 			   cached_file_factory.cpp membuf_file.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/hash_map/Makefile.am b/myserver/src/base/hash_map/Makefile.am
index d4a50c5..9522cf7 100644
--- a/myserver/src/base/hash_map/Makefile.am
+++ b/myserver/src/base/hash_map/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhash_map.la
 libhash_map_la_SOURCES = hash_map.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/home_dir/Makefile.am b/myserver/src/base/home_dir/Makefile.am
index 0595e3f..0eb6b36 100644
--- a/myserver/src/base/home_dir/Makefile.am
+++ b/myserver/src/base/home_dir/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhome_dir.la
 libhome_dir_la_SOURCES = home_dir.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/mem_buff/Makefile.am b/myserver/src/base/mem_buff/Makefile.am
index 3881d73..cd5d0d1 100644
--- a/myserver/src/base/mem_buff/Makefile.am
+++ b/myserver/src/base/mem_buff/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmem_buff.la
 libmem_buff_la_SOURCES = mem_buff.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/multicast/Makefile.am b/myserver/src/base/multicast/Makefile.am
index 6c7d805..2d0f4ce 100644
--- a/myserver/src/base/multicast/Makefile.am
+++ b/myserver/src/base/multicast/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmulticast.la
 libmulticast_la_SOURCES = multicast.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/pipe/Makefile.am b/myserver/src/base/pipe/Makefile.am
index 050324f..5427d2b 100644
--- a/myserver/src/base/pipe/Makefile.am
+++ b/myserver/src/base/pipe/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libpipe.la
 libpipe_la_SOURCES = pipe.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/process/Makefile.am b/myserver/src/base/process/Makefile.am
index f6c4c94..29e89c4 100644
--- a/myserver/src/base/process/Makefile.am
+++ b/myserver/src/base/process/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libprocess.la
 libprocess_la_SOURCES = fork_server.cpp process.cpp process_server_manager.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/read_directory/Makefile.am b/myserver/src/base/read_directory/Makefile.am
index 1e0b8a3..8ad72ef 100644
--- a/myserver/src/base/read_directory/Makefile.am
+++ b/myserver/src/base/read_directory/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libread_directory.la
 libread_directory_la_SOURCES = read_directory.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/regex/Makefile.am b/myserver/src/base/regex/Makefile.am
index 4ba2f64..fcfc98d 100644
--- a/myserver/src/base/regex/Makefile.am
+++ b/myserver/src/base/regex/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libregex.la
 libregex_la_SOURCES = myserver_regex.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/safetime/Makefile.am b/myserver/src/base/safetime/Makefile.am
index 061a851..83f0c4c 100644
--- a/myserver/src/base/safetime/Makefile.am
+++ b/myserver/src/base/safetime/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsafetime.la
 libsafetime_la_SOURCES = safetime.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/slab/Makefile.am b/myserver/src/base/slab/Makefile.am
index 2ce15e1..ed2a9eb 100644
--- a/myserver/src/base/slab/Makefile.am
+++ b/myserver/src/base/slab/Makefile.am
@@ -18,4 +18,3 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libslab.la
 libslab_la_SOURCES = slab.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/base/socket/Makefile.am b/myserver/src/base/socket/Makefile.am
index 75030e8..62ebef6 100644
--- a/myserver/src/base/socket/Makefile.am
+++ b/myserver/src/base/socket/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsocket.la
 libsocket_la_SOURCES = socket.cpp ssl_socket.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/socket_pair/Makefile.am b/myserver/src/base/socket_pair/Makefile.am
index 2881d83..6cd0721 100644
--- a/myserver/src/base/socket_pair/Makefile.am
+++ b/myserver/src/base/socket_pair/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsocket_pair.la
 libsocket_pair_la_SOURCES = socket_pair.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/ssl/Makefile.am b/myserver/src/base/ssl/Makefile.am
index 3e1ac42..0625009 100644
--- a/myserver/src/base/ssl/Makefile.am
+++ b/myserver/src/base/ssl/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libssl.la
 libssl_la_SOURCES = ssl.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/string/Makefile.am b/myserver/src/base/string/Makefile.am
index 9addade..91011c3 100644
--- a/myserver/src/base/string/Makefile.am
+++ b/myserver/src/base/string/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libstring.la
 libstring_la_SOURCES = securestr.cpp stringutils.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/sync/Makefile.am b/myserver/src/base/sync/Makefile.am
index 63e4869..dd478d8 100644
--- a/myserver/src/base/sync/Makefile.am
+++ b/myserver/src/base/sync/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsync.la
 libsync_la_SOURCES = event.cpp mutex.cpp read_write_lock.cpp recursive_mutex.cpp semaphore.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/thread/Makefile.am b/myserver/src/base/thread/Makefile.am
index 84ec84c..54e07ce 100644
--- a/myserver/src/base/thread/Makefile.am
+++ b/myserver/src/base/thread/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libthread.la
 libthread_la_SOURCES = thread.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/unix_socket/Makefile.am b/myserver/src/base/unix_socket/Makefile.am
index bfe2d32..9f82414 100644
--- a/myserver/src/base/unix_socket/Makefile.am
+++ b/myserver/src/base/unix_socket/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libunix_socket.la
 libunix_socket_la_SOURCES = unix_socket.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/base/xml/Makefile.am b/myserver/src/base/xml/Makefile.am
index 48777a1..a17f59f 100644
--- a/myserver/src/base/xml/Makefile.am
+++ b/myserver/src/base/xml/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libxml.la
 libxml_la_SOURCES = xml_parser.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/conf/Makefile.am b/myserver/src/conf/Makefile.am
index 97d536d..2542f27 100644
--- a/myserver/src/conf/Makefile.am
+++ b/myserver/src/conf/Makefile.am
@@ -18,7 +18,6 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconf.la
 libconf_la_SOURCES = nodetree.cpp xml_conf.cpp
 SUBDIRS = main mime security vhost
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.
diff --git a/myserver/src/conf/main/Makefile.am b/myserver/src/conf/main/Makefile.am
index 19ce846..049c0fa 100644
--- a/myserver/src/conf/main/Makefile.am
+++ b/myserver/src/conf/main/Makefile.am
@@ -18,4 +18,3 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmain.la
 libmain_la_SOURCES = main_configuration.cpp xml_main_configuration.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/conf/mime/Makefile.am b/myserver/src/conf/mime/Makefile.am
index 9a68b39..f58bfc6 100644
--- a/myserver/src/conf/mime/Makefile.am
+++ b/myserver/src/conf/mime/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmime.la
 libmime_la_SOURCES = mime_manager.cpp xml_mime_handler.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/conf/security/Makefile.am b/myserver/src/conf/security/Makefile.am
index 305b287..1a1f74e 100644
--- a/myserver/src/conf/security/Makefile.am
+++ b/myserver/src/conf/security/Makefile.am
@@ -18,4 +18,3 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libsecurity.la
 libsecurity_la_SOURCES = auth_domain.cpp auth_method.cpp auth_method_factory.cpp security_cache.cpp security_domain.cpp security_manager.cpp security_token.cpp validator.cpp validator_factory.cpp xml_validator.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/conf/vhost/Makefile.am b/myserver/src/conf/vhost/Makefile.am
index 65098c7..1c7a814 100644
--- a/myserver/src/conf/vhost/Makefile.am
+++ b/myserver/src/conf/vhost/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libvhost.la
 libvhost_la_SOURCES = vhost.cpp vhost_manager.cpp ip.cpp xml_vhost_handler.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/connection/Makefile.am b/myserver/src/connection/Makefile.am
index 0a8fee0..b87bbd1 100644
--- a/myserver/src/connection/Makefile.am
+++ b/myserver/src/connection/Makefile.am
@@ -18,7 +18,6 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconnection.la
 libconnection_la_SOURCES = connection.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.
diff --git a/myserver/src/connections_scheduler/Makefile.am b/myserver/src/connections_scheduler/Makefile.am
index ad721b6..f26b3cd 100644
--- a/myserver/src/connections_scheduler/Makefile.am
+++ b/myserver/src/connections_scheduler/Makefile.am
@@ -18,7 +18,6 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libconnections_scheduler.la
 libconnections_scheduler_la_SOURCES = connections_scheduler.cpp listen_threads.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.
diff --git a/myserver/src/filter/Makefile.am b/myserver/src/filter/Makefile.am
index f975c91..fdbf318 100644
--- a/myserver/src/filter/Makefile.am
+++ b/myserver/src/filter/Makefile.am
@@ -19,7 +19,6 @@ lib_LTLIBRARIES = libfilter.la
 libfilter_la_SOURCES = filter.cpp filters_chain.cpp filters_factory.cpp memory_stream.cpp stream.cpp \
 			console.cpp
 SUBDIRS = gzip
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.
diff --git a/myserver/src/filter/gzip/Makefile.am b/myserver/src/filter/gzip/Makefile.am
index a1e8b10..084f748 100644
--- a/myserver/src/filter/gzip/Makefile.am
+++ b/myserver/src/filter/gzip/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libgzip.la
 libgzip_la_SOURCES = gzip.cpp gzip_decompress.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/Makefile.am b/myserver/src/http_handler/Makefile.am
index 7cf6c93..ee03223 100644
--- a/myserver/src/http_handler/Makefile.am
+++ b/myserver/src/http_handler/Makefile.am
@@ -18,7 +18,6 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_handler.la
 libhttp_handler_la_SOURCES =
 SUBDIRS = cgi fastcgi http_dir http_file isapi mscgi proxy scgi wincgi
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.
diff --git a/myserver/src/http_handler/cgi/Makefile.am b/myserver/src/http_handler/cgi/Makefile.am
index e47f5d4..a4741bd 100644
--- a/myserver/src/http_handler/cgi/Makefile.am
+++ b/myserver/src/http_handler/cgi/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcgi.la
 libcgi_la_SOURCES = cgi.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/fastcgi/Makefile.am b/myserver/src/http_handler/fastcgi/Makefile.am
index f9090cc..68093ec 100644
--- a/myserver/src/http_handler/fastcgi/Makefile.am
+++ b/myserver/src/http_handler/fastcgi/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libfastcgi.la
 libfastcgi_la_SOURCES = fastcgi.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/http_dir/Makefile.am b/myserver/src/http_handler/http_dir/Makefile.am
index 406e17e..17bd8aa 100644
--- a/myserver/src/http_handler/http_dir/Makefile.am
+++ b/myserver/src/http_handler/http_dir/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_dir.la
 libhttp_dir_la_SOURCES = http_dir.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/http_file/Makefile.am b/myserver/src/http_handler/http_file/Makefile.am
index ac1be19..f5bf323 100644
--- a/myserver/src/http_handler/http_file/Makefile.am
+++ b/myserver/src/http_handler/http_file/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttp_file.la
 libhttp_file_la_SOURCES = http_file.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/isapi/Makefile.am b/myserver/src/http_handler/isapi/Makefile.am
index fc5eab5..3e88018 100644
--- a/myserver/src/http_handler/isapi/Makefile.am
+++ b/myserver/src/http_handler/isapi/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libisapi.la
 libisapi_la_SOURCES = isapi.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/mscgi/Makefile.am b/myserver/src/http_handler/mscgi/Makefile.am
index fe1665f..50f1127 100644
--- a/myserver/src/http_handler/mscgi/Makefile.am
+++ b/myserver/src/http_handler/mscgi/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libmscgi.la
 libmscgi_la_SOURCES = mscgi.cpp mscgi_manager.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/proxy/Makefile.am b/myserver/src/http_handler/proxy/Makefile.am
index 5468c96..3752224 100644
--- a/myserver/src/http_handler/proxy/Makefile.am
+++ b/myserver/src/http_handler/proxy/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libproxy.la
 libproxy_la_SOURCES = proxy.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/scgi/Makefile.am b/myserver/src/http_handler/scgi/Makefile.am
index 8537788..d162ce1 100644
--- a/myserver/src/http_handler/scgi/Makefile.am
+++ b/myserver/src/http_handler/scgi/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libscgi.la
 libscgi_la_SOURCES = scgi.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/http_handler/wincgi/Makefile.am b/myserver/src/http_handler/wincgi/Makefile.am
index c9eb43a..48d6aef 100644
--- a/myserver/src/http_handler/wincgi/Makefile.am
+++ b/myserver/src/http_handler/wincgi/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libwincgi.la
 libwincgi_la_SOURCES = wincgi.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/log/Makefile.am b/myserver/src/log/Makefile.am
index 2d86aa5..4a81bda 100644
--- a/myserver/src/log/Makefile.am
+++ b/myserver/src/log/Makefile.am
@@ -18,7 +18,6 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = liblog.la
 liblog_la_SOURCES = log_manager.cpp
 SUBDIRS = stream
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.
diff --git a/myserver/src/log/stream/Makefile.am b/myserver/src/log/stream/Makefile.am
index 8c186e8..29c3fcf 100644
--- a/myserver/src/log/stream/Makefile.am
+++ b/myserver/src/log/stream/Makefile.am
@@ -22,4 +22,3 @@ libstream_la_SOURCES = console_stream.cpp file_stream.cpp \
 		console_stream_creator.cpp socket_stream.cpp \
 		socket_stream_creator.cpp
 SUBDIRS = 
-INCLUDE = $(all_includes)
diff --git a/myserver/src/plugin/Makefile.am b/myserver/src/plugin/Makefile.am
index 756eccd..538f947 100644
--- a/myserver/src/plugin/Makefile.am
+++ b/myserver/src/plugin/Makefile.am
@@ -17,7 +17,6 @@
 AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libplugin.la
 libplugin_la_SOURCES =  plugin.cpp plugin_info.cpp plugins_manager.cpp 
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.
diff --git a/myserver/src/protocol/Makefile.am b/myserver/src/protocol/Makefile.am
index 12cd8b2..4005e0a 100644
--- a/myserver/src/protocol/Makefile.am
+++ b/myserver/src/protocol/Makefile.am
@@ -19,7 +19,6 @@ lib_LTLIBRARIES = libprotocol.la
 libprotocol_la_SOURCES = protocol_buffer.cpp protocol.cpp protocols_manager.cpp \
 			url.cpp
 SUBDIRS = control ftp gopher http https
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.
diff --git a/myserver/src/protocol/control/Makefile.am b/myserver/src/protocol/control/Makefile.am
index 1ae86cc..4f6ae33 100644
--- a/myserver/src/protocol/control/Makefile.am
+++ b/myserver/src/protocol/control/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libcontrol.la
 libcontrol_la_SOURCES = control_header.cpp control_protocol.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/protocol/ftp/Makefile.am b/myserver/src/protocol/ftp/Makefile.am
index 1dbb100..8b568da 100644
--- a/myserver/src/protocol/ftp/Makefile.am
+++ b/myserver/src/protocol/ftp/Makefile.am
@@ -19,7 +19,6 @@ lib_LTLIBRARIES = libftp.la
 libftp_la_SOURCES = ftp.cpp ftp_lexer.cpp ftp_parser.cpp
 EXTRA_DIST = ftp_lexer.out.cpp  ftp_parser.ypp  ftp_lexer.lpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
 build_parser: ftp_lexer.lpp ftp_parser.ypp
 	$(YACC) $(YFLAGS) --defines=../../../include/protocol/ftp/ftp_parser.h \
diff --git a/myserver/src/protocol/gopher/Makefile.am b/myserver/src/protocol/gopher/Makefile.am
index 1243a7a..04d2fca 100644
--- a/myserver/src/protocol/gopher/Makefile.am
+++ b/myserver/src/protocol/gopher/Makefile.am
@@ -17,4 +17,3 @@
 AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libgopher.la
 libgopher_la_SOURCES = gopher.cpp gopher_content.cpp engine.cpp
-AM_CPPFLAGS = $(all_includes)
diff --git a/myserver/src/protocol/http/Makefile.am b/myserver/src/protocol/http/Makefile.am
index ea23860..e4f3f96 100644
--- a/myserver/src/protocol/http/Makefile.am
+++ b/myserver/src/protocol/http/Makefile.am
@@ -23,5 +23,4 @@ libhttp_la_SOURCES = http.cpp http_data_handler.cpp http_data_read.cpp \
 		   dyn_http_manager.cpp dyn_http_manager_list.cpp \
 		   dyn_http_command.cpp dyn_http_command_manager.cpp
 SUBDIRS = env
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/protocol/http/env/Makefile.am b/myserver/src/protocol/http/env/Makefile.am
index 6bcd83f..9eeba01 100644
--- a/myserver/src/protocol/http/env/Makefile.am
+++ b/myserver/src/protocol/http/env/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libenv.la
 libenv_la_SOURCES = env.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/protocol/https/Makefile.am b/myserver/src/protocol/https/Makefile.am
index 16c3951..bdcb0cf 100644
--- a/myserver/src/protocol/https/Makefile.am
+++ b/myserver/src/protocol/https/Makefile.am
@@ -18,5 +18,4 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libhttps.la
 libhttps_la_SOURCES = https.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
diff --git a/myserver/src/server/Makefile.am b/myserver/src/server/Makefile.am
index 75b6609..acc2f9d 100644
--- a/myserver/src/server/Makefile.am
+++ b/myserver/src/server/Makefile.am
@@ -18,7 +18,6 @@ AM_CXXFLAGS=-I"$(top_builddir)/lib" -I"$(top_srcdir)/lib" -I"$(top_srcdir)"
 lib_LTLIBRARIES = libserver.la
 libserver_la_SOURCES = clients_thread.cpp server.cpp
 SUBDIRS =
-AM_CPPFLAGS = $(all_includes)
 
 install:
 # Do not do anything.

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

Summary of changes:
 myserver/src/base/Makefile.am                   |    1 -
 myserver/src/base/base64/Makefile.am            |    1 -
 myserver/src/base/bitvec/Makefile.am            |    1 -
 myserver/src/base/crypt/Makefile.am             |    1 -
 myserver/src/base/dynamic_lib/Makefile.am       |    1 -
 myserver/src/base/exceptions/Makefile.am        |    1 -
 myserver/src/base/file/Makefile.am              |    1 -
 myserver/src/base/files_cache/Makefile.am       |    1 -
 myserver/src/base/hash_map/Makefile.am          |    1 -
 myserver/src/base/home_dir/Makefile.am          |    1 -
 myserver/src/base/mem_buff/Makefile.am          |    1 -
 myserver/src/base/multicast/Makefile.am         |    1 -
 myserver/src/base/pipe/Makefile.am              |    1 -
 myserver/src/base/process/Makefile.am           |    1 -
 myserver/src/base/read_directory/Makefile.am    |    1 -
 myserver/src/base/regex/Makefile.am             |    1 -
 myserver/src/base/safetime/Makefile.am          |    1 -
 myserver/src/base/slab/Makefile.am              |    1 -
 myserver/src/base/socket/Makefile.am            |    1 -
 myserver/src/base/socket_pair/Makefile.am       |    1 -
 myserver/src/base/ssl/Makefile.am               |    1 -
 myserver/src/base/string/Makefile.am            |    1 -
 myserver/src/base/sync/Makefile.am              |    1 -
 myserver/src/base/thread/Makefile.am            |    1 -
 myserver/src/base/unix_socket/Makefile.am       |    1 -
 myserver/src/base/xml/Makefile.am               |    1 -
 myserver/src/conf/Makefile.am                   |    1 -
 myserver/src/conf/main/Makefile.am              |    1 -
 myserver/src/conf/mime/Makefile.am              |    1 -
 myserver/src/conf/security/Makefile.am          |    1 -
 myserver/src/conf/vhost/Makefile.am             |    1 -
 myserver/src/connection/Makefile.am             |    1 -
 myserver/src/connections_scheduler/Makefile.am  |    1 -
 myserver/src/filter/Makefile.am                 |    1 -
 myserver/src/filter/gzip/Makefile.am            |    1 -
 myserver/src/http_handler/Makefile.am           |    1 -
 myserver/src/http_handler/cgi/Makefile.am       |    1 -
 myserver/src/http_handler/fastcgi/Makefile.am   |    1 -
 myserver/src/http_handler/http_dir/Makefile.am  |    1 -
 myserver/src/http_handler/http_file/Makefile.am |    1 -
 myserver/src/http_handler/isapi/Makefile.am     |    1 -
 myserver/src/http_handler/mscgi/Makefile.am     |    1 -
 myserver/src/http_handler/proxy/Makefile.am     |    1 -
 myserver/src/http_handler/scgi/Makefile.am      |    1 -
 myserver/src/http_handler/wincgi/Makefile.am    |    1 -
 myserver/src/log/Makefile.am                    |    1 -
 myserver/src/log/stream/Makefile.am             |    1 -
 myserver/src/plugin/Makefile.am                 |    1 -
 myserver/src/protocol/Makefile.am               |    1 -
 myserver/src/protocol/control/Makefile.am       |    1 -
 myserver/src/protocol/ftp/Makefile.am           |    1 -
 myserver/src/protocol/gopher/Makefile.am        |    1 -
 myserver/src/protocol/http/Makefile.am          |    1 -
 myserver/src/protocol/http/env/Makefile.am      |    1 -
 myserver/src/protocol/https/Makefile.am         |    1 -
 myserver/src/server/Makefile.am                 |    1 -
 56 files changed, 0 insertions(+), 56 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Thu May 06 10:16:11 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OA1s3-0002uv-2h
	for mharc-myserver-commit@gnu.org; Thu, 06 May 2010 10:16:11 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OA03T-0002k2-El
	for myserver-commit@gnu.org; Thu, 06 May 2010 08:19:51 -0400
Received: from [140.186.70.92] (port=45017 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OA03O-0002Z6-DA
	for myserver-commit@gnu.org; Thu, 06 May 2010 08:19:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OA03N-0005C5-Gi
	for myserver-commit@gnu.org; Thu, 06 May 2010 08:19:46 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:34701
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OA03M-0005Bv-L5
	for myserver-commit@gnu.org; Thu, 06 May 2010 08:19:45 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OA03M-0000mq-K1
	for myserver-commit@gnu.org; Thu, 06 May 2010 12:19:44 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OA03M-00063q-6m
	for myserver-commit@gnu.org; Thu, 06 May 2010 12:19:44 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c86a102eaab305acfc5e99e8e6dcd4ddd1936d49
X-Git-Newrev: b53952460e1a76195eff48f216db38054a33b320
Message-Id: <E1OA03M-00063q-6m@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 06 May 2010 12:19:44 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-217-gb539524
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 06 May 2010 12:19:51 -0000

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  b53952460e1a76195eff48f216db38054a33b320 (commit)
       via  3d4dd468da4b1609644b99bf1aa70dbf4e4c00dd (commit)
      from  c86a102eaab305acfc5e99e8e6dcd4ddd1936d49 (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 b53952460e1a76195eff48f216db38054a33b320
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu May 6 14:19:56 2010 +0200

    Fix make distcheck.

diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index cc747c2..9594b99 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -168,5 +168,5 @@ myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
 all-local: libmyserver.la myserver${EXEEXT}
 	$(LIBTOOL) --mode=install cp myserver $(abs_top_builddir)/binaries/
 
-generic-clean:
+clean-local:
 	$(LIBTOOL) --mode=uninstall rm -f $(abs_top_builddir)/binaries/myserver



commit 3d4dd468da4b1609644b99bf1aa70dbf4e4c00dd
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu May 6 13:04:09 2010 +0200

    Make the `all' rule depends from `config.h' too.

diff --git a/myserver/Makefile.am b/myserver/Makefile.am
index 76dfc38..6d7794f 100644
--- a/myserver/Makefile.am
+++ b/myserver/Makefile.am
@@ -34,12 +34,12 @@ localedir.h: Makefile
 	echo '/* This file is auto-generated by Makefile!  */' >$@
 	echo '#define LOCALEDIR "$(localedir)"' >> $@
 
+all: config.h localedir.h
+# Generate the localedir.h file before any other rule.
+
 clean-generic:
 	rm -f localedir.h
 
-all: localedir.h
-# Generate the localedir.h file before any other rule.
-
 update-po: check-gettext
 	git ls-files src/ | grep "cpp$$" \
 		| sort > $(srcdir)/po/POTFILES.in.2 ; \

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

Summary of changes:
 myserver/Makefile.am     |    6 +++---
 myserver/src/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Fri May 07 12:04:24 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OAQ2K-00018r-3r
	for mharc-myserver-commit@gnu.org; Fri, 07 May 2010 12:04:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OAQ2I-00017B-1O
	for myserver-commit@gnu.org; Fri, 07 May 2010 12:04:22 -0400
Received: from [140.186.70.92] (port=34588 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OAQ2F-00015k-NO
	for myserver-commit@gnu.org; Fri, 07 May 2010 12:04:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAQ2D-0008GT-Sy
	for myserver-commit@gnu.org; Fri, 07 May 2010 12:04:19 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:47101
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAQ2D-0008GM-R3
	for myserver-commit@gnu.org; Fri, 07 May 2010 12:04:17 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAQ2D-0003yO-IT
	for myserver-commit@gnu.org; Fri, 07 May 2010 16:04:17 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OAQ2A-0002zr-Ej
	for myserver-commit@gnu.org; Fri, 07 May 2010 16:04:17 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b53952460e1a76195eff48f216db38054a33b320
X-Git-Newrev: a7412d6c1866f790a8bd5931aa76306818fcd79b
Message-Id: <E1OAQ2A-0002zr-Ej@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 07 May 2010 16:04:17 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-220-ga7412d6
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 May 2010 16:04:22 -0000

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 <gscrivano@gnu.org>
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 <gscrivano@gnu.org>
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 <gscrivano@gnu.org>
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



From MAILER-DAEMON Fri May 07 18:31:03 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OAW4V-0005gH-4K
	for mharc-myserver-commit@gnu.org; Fri, 07 May 2010 18:31:03 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OAW4T-0005dn-8P
	for myserver-commit@gnu.org; Fri, 07 May 2010 18:31:01 -0400
Received: from [140.186.70.92] (port=44221 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OAW4R-0005bm-LB
	for myserver-commit@gnu.org; Fri, 07 May 2010 18:31:00 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAW4Q-0000qD-Gj
	for myserver-commit@gnu.org; Fri, 07 May 2010 18:30:59 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:51378
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAW4Q-0000q9-D1
	for myserver-commit@gnu.org; Fri, 07 May 2010 18:30:58 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAW4Q-0000F4-61
	for myserver-commit@gnu.org; Fri, 07 May 2010 22:30:58 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OAW4P-0004pp-Av
	for myserver-commit@gnu.org; Fri, 07 May 2010 22:30:58 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a7412d6c1866f790a8bd5931aa76306818fcd79b
X-Git-Newrev: 031dcae7452e27013fcea41debac8a5eb775790e
Message-Id: <E1OAW4P-0004pp-Av@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 07 May 2010 22:30:57 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-222-g031dcae
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 07 May 2010 22:31:01 -0000

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  031dcae7452e27013fcea41debac8a5eb775790e (commit)
       via  0b7e2f3459adbad63bd657c34d1988422d4b2858 (commit)
      from  a7412d6c1866f790a8bd5931aa76306818fcd79b (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 031dcae7452e27013fcea41debac8a5eb775790e
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat May 8 00:26:49 2010 +0200

    Specify the extension for the myserver executable.

diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index 9594b99..80de900 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -166,7 +166,7 @@ myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
 	$(XML_LIBS) $(INTLLIBS) $(LDFLAGS)
 
 all-local: libmyserver.la myserver${EXEEXT}
-	$(LIBTOOL) --mode=install cp myserver $(abs_top_builddir)/binaries/
+	$(LIBTOOL) --mode=install cp myserver$(EXEEXT) $(abs_top_builddir)/binaries/
 
 clean-local:
-	$(LIBTOOL) --mode=uninstall rm -f $(abs_top_builddir)/binaries/myserver
+	$(LIBTOOL) --mode=uninstall rm -f $(abs_top_builddir)/binaries/myserver$(EXEEXT)



commit 0b7e2f3459adbad63bd657c34d1988422d4b2858
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat May 8 00:21:52 2010 +0200

    The userenv library is required by GetProfilesDirectory.

diff --git a/myserver/configure.ac b/myserver/configure.ac
index 3899226..ac0f690 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"
+     LIBS="$LIBS -lwsock32 -lws2_32 -luserenv"
      MAKE_MSCGI=yes
      LTCFLAGS=""
      ;;

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

Summary of changes:
 myserver/configure.ac    |    2 +-
 myserver/src/Makefile.am |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sat May 08 07:44:40 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OAiSW-0006nd-81
	for mharc-myserver-commit@gnu.org; Sat, 08 May 2010 07:44:40 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OAiST-0006nV-Kx
	for myserver-commit@gnu.org; Sat, 08 May 2010 07:44:37 -0400
Received: from [140.186.70.92] (port=50657 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OAiSS-0006nN-0Q
	for myserver-commit@gnu.org; Sat, 08 May 2010 07:44:37 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAiSQ-0004tq-Ne
	for myserver-commit@gnu.org; Sat, 08 May 2010 07:44:35 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:44932
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAiSQ-0004tm-Lb
	for myserver-commit@gnu.org; Sat, 08 May 2010 07:44:34 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OAiSP-0001GU-UQ
	for myserver-commit@gnu.org; Sat, 08 May 2010 11:44:33 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OAiSN-0002Yh-Vv
	for myserver-commit@gnu.org; Sat, 08 May 2010 11:44:33 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 031dcae7452e27013fcea41debac8a5eb775790e
X-Git-Newrev: c7fe97145fa20fddb1e0a87557b405b66a49d75f
Message-Id: <E1OAiSN-0002Yh-Vv@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 08 May 2010 11:44:33 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. 0_9_2-224-gc7fe971
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 08 May 2010 11:44:38 -0000

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  c7fe97145fa20fddb1e0a87557b405b66a49d75f (commit)
       via  2b5f5326664e549bb9e9b75e454fb3bf0e7ea950 (commit)
      from  031dcae7452e27013fcea41debac8a5eb775790e (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 c7fe97145fa20fddb1e0a87557b405b66a49d75f
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat May 8 13:44:48 2010 +0200

    Refactor `HttpFile::putFile': share code between two branches.

diff --git a/myserver/src/http_handler/http_file/http_file.cpp b/myserver/src/http_handler/http_file/http_file.cpp
index 3608202..ceea526 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -42,6 +42,10 @@ using namespace std;
 int HttpFile::putFile (HttpThreadContext* td, string& filename)
 {
   u_long firstByte = td->request.rangeByteBegin;
+  int successCode = 500;
+  File file;
+  int symFlags = td->http->areSymlinksAllowed () ? 0
+    : File::NO_FOLLOW_SYMLINK;
 
   try
   {
@@ -53,11 +57,8 @@ int HttpFile::putFile (HttpThreadContext* td, string& filename)
 
     if (FilesUtility::nodeExists (td->filenamePath.c_str ()))
       {
-        File file;
         try
           {
-            int symFlags = td->http->areSymlinksAllowed () ? 0
-              : File::NO_FOLLOW_SYMLINK;
             file.openFile (td->filenamePath.c_str (), File::OPEN_IF_EXISTS
                            | File::WRITE | symFlags);
           }
@@ -69,48 +70,13 @@ int HttpFile::putFile (HttpThreadContext* td, string& filename)
             return td->http->raiseHTTPError (500);
           }
 
-        file.seek (firstByte);
-
-        for (;;)
-          {
-            u_long nbr = 0, nbw = 0;
-            if (td->inputData.read (td->buffer->getBuffer (),
-                                   td->buffer->getRealLength (), &nbr))
-              {
-                file.close ();
-                return td->http->raiseHTTPError (500);
-              }
-
-            if (nbr)
-              {
-                if (file.writeToFile (td->buffer->getBuffer (), nbr, &nbw))
-                  {
-                    file.close ();
-                    return td->http->raiseHTTPError (500);
-                  }
-              }
-            else
-              break;
-
-          if (nbw != nbr)
-            {
-              file.close ();
-              return td->http->raiseHTTPError (500);
-            }
-        }
-        file.close ();
-
-        td->http->raiseHTTPError (200);
-        return HttpDataHandler::RET_OK;
+        successCode = 200;
       }
     else
       {
         /* The file doesn't exist.  */
-        File file;
         try
           {
-            int symFlags = td->http->areSymlinksAllowed () ? 0
-              : File::NO_FOLLOW_SYMLINK;
             file.openFile (td->filenamePath.c_str (), File::FILE_CREATE_ALWAYS
                            | File::WRITE | symFlags);
           }
@@ -122,38 +88,45 @@ int HttpFile::putFile (HttpThreadContext* td, string& filename)
             return td->http->raiseHTTPError (500);
           }
 
-        for (;;)
-          {
-            u_long nbr = 0, nbw = 0;
-            if (td->inputData.read (td->buffer->getBuffer (),
-                                    td->buffer->getRealLength (), &nbr))
-              {
-                file.close ();
-                return td->http->raiseHTTPError (500);
-              }
+        successCode = 201;
+      }
 
-            if (nbr)
-              {
-                if (file.writeToFile (td->buffer->getBuffer (), nbr, &nbw))
-                  {
-                    file.close ();
-                    return td->http->raiseHTTPError (500);
-                  }
-              }
-            else
-              break;
+    if (firstByte)
+      file.seek (firstByte);
+
+    for (;;)
+      {
+        u_long nbr = 0, nbw = 0;
+        if (td->inputData.read (td->buffer->getBuffer (),
+                                td->buffer->getRealLength (), &nbr))
+          {
+            file.close ();
+            return td->http->raiseHTTPError (500);
+          }
 
-            if (nbw != nbr)
+        if (! nbr)
+          break;
+        else
+          {
+            if (file.writeToFile (td->buffer->getBuffer (), nbr, &nbw))
               {
                 file.close ();
                 return td->http->raiseHTTPError (500);
               }
           }
-        file.close ();
 
-        td->http->raiseHTTPError (201);
-        return HttpDataHandler::RET_OK;
+        if (nbw != nbr)
+          {
+            file.close ();
+            return td->http->raiseHTTPError (500);
+          }
       }
+
+    file.close ();
+
+    td->http->raiseHTTPError (successCode);
+    return HttpDataHandler::RET_OK;
+
   }
   catch (exception & e)
     {



commit 2b5f5326664e549bb9e9b75e454fb3bf0e7ea950
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat May 8 11:31:05 2010 +0200

    Avoid a gratuitous exception.

diff --git a/myserver/src/plugin/plugins_manager.cpp b/myserver/src/plugin/plugins_manager.cpp
index 8d26810..bc4c201 100644
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -151,7 +151,7 @@ PluginsManager::preLoad (Server* server, string &resource)
 
       dirname.append ("/");
       dirname.append (fdir.name);
-      if (fdir.name[0] == '.')
+      if (fdir.name[0] == '.' || !FilesUtility::isDirectory (dirname.c_str ()))
         continue;
 
       try

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

Summary of changes:
 myserver/src/http_handler/http_file/http_file.cpp |   97 ++++++++-------------
 myserver/src/plugin/plugins_manager.cpp           |    2 +-
 2 files changed, 36 insertions(+), 63 deletions(-)


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Sun May 09 13:03:55 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OB9v1-0004sJ-FS
	for mharc-myserver-commit@gnu.org; Sun, 09 May 2010 13:03:55 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OB9v0-0004r0-Hv
	for myserver-commit@gnu.org; Sun, 09 May 2010 13:03:54 -0400
Received: from [140.186.70.92] (port=50300 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OB9uz-0004nt-26
	for myserver-commit@gnu.org; Sun, 09 May 2010 13:03:54 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1OB9ux-0001z3-8M
	for myserver-commit@gnu.org; Sun, 09 May 2010 13:03:52 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:42170)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1OB9ux-0001yn-0N
	for myserver-commit@gnu.org; Sun, 09 May 2010 13:03:51 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o49H3mnc011148
	for <myserver-commit@gnu.org>; Sun, 9 May 2010 19:03:48 +0200
Message-Id: <201005091703.o49H3mnc011148@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Sun, 09 May 2010 19:03:48 +0200
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
X-Hydra-Instance: hydra
X-Hydra-Project: gnu
X-Hydra-Jobset: myserver-master
X-Hydra-Job: build
Date: Sun, 9 May 2010 19:03:48 +0200
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:build build 401239:
 Failed with non-zero exit code
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 09 May 2010 17:03:54 -0000

Hi,

This is to let you know that Hydra build 401239 of job gnu:myserver-master:build has changed from 'Success' to 'Failed with non-zero exit code'.

Complete build information can be found on this page: http://hydra.nixos.org/build/401239

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 401239
Nix name:              | myserver-0.9.2
Short description:     | Native Nix build on i686-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | i686-linux
Derivation store path: | /nix/store/rpqyacvc8y8d9rs7w5732cm5r0ar8vhg-myserver-0.9.2.drv
Output store path:     | /nix/store/2lh88xljvwabqq4zqq6nswgchzbgd843-myserver-0.9.2
Time added:            | 2010-05-09 19:03:48
Build started:         | 2010-05-09 19:00:26
Build finished:        | 2010-05-09 19:03:48
Duration:              | 202s

The build inputs were:

Name        | Type   | Value
------------+--------+-------------------------------------------------------------
hydraConfig | svn    | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:21598
nixpkgs     | svn    | https://svn.nixos.org/repos/nix/nixpkgs/trunk:21688
system      | string | i686-linux
tarball     | build  | 401166

Regards,

The Hydra build daemon.

---
TestSocketStreamCreator::testGetPort. : OK
TestSocketStreamCreator::testGetHost. : OK
TestSslSocket::testRecv. : errorE
TestThread::testThreadCreate. : OK
TestThread::testThreadTerminate. : OK
TestUnixSocket::testBind. : OK
TestUnixSocket::testClient. : OK
TestUnixSocket::testReadWriteHandle. : OK
TestUrl::testUrl. : OK
TestUrl::testUrlWithCredentials. : OK
TestUrl::testUrlWithQuery. : OK
TestUrl::testUrlWithoutPort. : OK
TestUtility::testGetTicks. : OK
TestUtility::testCWD. : OK
TestValidator::testGetPermissionMask. : OK
TestValidator::testGetPermissionMaskImpl. : OK
TestValidator::testGetValue. : OK
TestValidatorFactory::testGetValidator. : OK
TestValidatorFactory::testAddValidator. : OK
TestValidatorFactory::testIsValidatorPresent. : OK
TestXml::testOpenMemBuf. : OK
TestXml::testXPath. : OK
TestXmlMainConfiguration::testOpen. : OK
TestXmlMainConfiguration::testGetDoc. : OK
TestXmlMainConfiguration::testGetValue. : OK
TestXmlMainConfiguration::testClose. : OK
TestXmlValidator::testGetPermissionMask. : OK
TestXmlValidator::testGetPermissionMaskImpl. : OK
TestXmlValidator::testGetValue. : OK



!!!FAILURES!!!
Test Results:
Run:  276   Failures: 0   Errors: 1


1) test: TestSslSocket::testRecv (E)
uncaught exception of type AddressException
- Address already in use


make[1]: *** [check-am] Error 1
make[1]: Leaving directory `/tmp/nix-build-rpqyacvc8y8d9rs7w5732cm5r0ar8vhg-myserver-0.9.2.drv-0/myserver-0.9.2/tests'
[q[qmake: *** [check-recursive] Error 1
[q[q[qbuild time elapsed:  0m0.021s 0m0.013s 2m20.111s 0m37.602s
builder for `/nix/store/rpqyacvc8y8d9rs7w5732cm5r0ar8vhg-myserver-0.9.2.drv' failed with exit code 2
error: build of `/nix/store/rpqyacvc8y8d9rs7w5732cm5r0ar8vhg-myserver-0.9.2.drv' failed
Shared connection to stan closed.

build of `/nix/store/rpqyacvc8y8d9rs7w5732cm5r0ar8vhg-myserver-0.9.2.drv' on `buildfarm@stan' failed with exit code 256



From MAILER-DAEMON Sun May 09 14:04:24 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBArY-0000fP-4u
	for mharc-myserver-commit@gnu.org; Sun, 09 May 2010 14:04:24 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBArW-0000eo-JB
	for myserver-commit@gnu.org; Sun, 09 May 2010 14:04:22 -0400
Received: from [140.186.70.92] (port=56982 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBArV-0000e7-54
	for myserver-commit@gnu.org; Sun, 09 May 2010 14:04:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1OBArS-0002tK-S0
	for myserver-commit@gnu.org; Sun, 09 May 2010 14:04:20 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:42179)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1OBArS-0002tD-KL
	for myserver-commit@gnu.org; Sun, 09 May 2010 14:04:18 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o49I4Hmc011671
	for <myserver-commit@gnu.org>; Sun, 9 May 2010 20:04:17 +0200
Message-Id: <201005091804.o49I4Hmc011671@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Sun, 09 May 2010 20:04:17 +0200
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
X-Hydra-Instance: hydra
X-Hydra-Project: gnu
X-Hydra-Jobset: myserver-master
X-Hydra-Job: build
Date: Sun, 9 May 2010 20:04:17 +0200
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:build build 401342:
	Success
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 09 May 2010 18:04:22 -0000

Hi,

This is to let you know that Hydra build 401342 of job gnu:myserver-master:build has changed from 'Failed with non-zero exit code' to 'Success'.

Complete build information can be found on this page: http://hydra.nixos.org/build/401342

A summary of the build information follows:

Build ID:              | 401342
Nix name:              | myserver-0.9.2
Short description:     | Native Nix build on i686-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | i686-linux
Derivation store path: | /nix/store/igms0na26ij557i659i8c3qsway311cg-myserver-0.9.2.drv
Output store path:     | /nix/store/bn4xmdjw5rikkdwcdc4h1ja245ywpx9r-myserver-0.9.2
Time added:            | 2010-05-09 20:04:16
Build started:         | 2010-05-09 20:00:52
Build finished:        | 2010-05-09 20:04:16
Duration:              | 204s

The build inputs were:

Name        | Type   | Value
------------+--------+-------------------------------------------------------------
hydraConfig | svn    | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:21598
nixpkgs     | svn    | https://svn.nixos.org/repos/nix/nixpkgs/trunk:21688
system      | string | i686-linux
tarball     | build  | 401269

Regards,

The Hydra build daemon.



From MAILER-DAEMON Mon May 10 04:44:46 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBObV-00083v-RF
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:44:46 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBObT-000820-8d
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:43 -0400
Received: from [140.186.70.92] (port=41722 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBObJ-0007wx-KX
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:42 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001EP-6F
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:33 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36607
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001EL-4m
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0008Pr-0l
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOb4-0000uV-UX
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/v0.9
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 7092d8c319176e5f09a97180f0f634d315503902
Message-Id: <E1OBOb4-0000uV-UX@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:44:18 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, v0.9,
	created. 0_9
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:44:43 -0000

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 annotated tag, v0.9 has been created
        at  7092d8c319176e5f09a97180f0f634d315503902 (tag)
   tagging  aeed7ee10306b0a2f699dcd8c50cef59a572f099 (tag)
    length  332 bytes
 tagged by  Giuseppe Scrivano
        on  Mon May 10 10:42:05 2010 +0200

- Log -----------------------------------------------------------------
v0.9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkvnxt0ACgkQB5GvjMAzY/TJUQCfcrG0t73ya0oMKKHfLZIghXM8
9gkAnA1+tjuuYgf4s73ZysGgkhWndyfH
=3q4J
-----END PGP SIGNATURE-----

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


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:44:48 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBObX-00085X-Ps
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:44:47 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBObV-00083Z-EA
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:45 -0400
Received: from [140.186.70.92] (port=41731 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBObL-0007xO-92
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001EX-9L
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:35 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36608
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001ET-7n
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0008Pu-3U
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOb5-0000uu-20
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/v0.9.1
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 99ddd6d7d253905b4621e6557deda574b3284baf
Message-Id: <E1OBOb5-0000uu-20@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:44:19 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, v0.9.1,
	created. 0_9_1
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:44:47 -0000

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 annotated tag, v0.9.1 has been created
        at  99ddd6d7d253905b4621e6557deda574b3284baf (tag)
   tagging  aace56a2f23c5b264c1d3522a5e4aa3691a74b9f (tag)
    length  345 bytes
 tagged by  Giuseppe Scrivano
        on  Mon May 10 10:42:12 2010 +0200

- Log -----------------------------------------------------------------
v0.9.1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkvnxuQACgkQB5GvjMAzY/QjCQCgty8+pbsmRl92IzW4bvGk0D7o
nJEAn3L7z7C/sgWp65ZZsiSfaOdc+n0l
=hXW8
-----END PGP SIGNATURE-----

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


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:44:50 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBObZ-000872-Hd
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:44:49 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBObX-00085A-Bz
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:47 -0400
Received: from [140.186.70.92] (port=41738 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBObN-0007y8-9q
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001Ef-BZ
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:37 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36609
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001Eb-AH
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0008Px-6A
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOb5-0000vD-4V
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/v0.9.1_rc1
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: d9d7ef96ec523fcf59188cc48ddfbb1956686612
Message-Id: <E1OBOb5-0000vD-4V@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:44:19 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, v0.9.1_rc1,
	created. 0_9_1_rc1
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:44:48 -0000

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 annotated tag, v0.9.1_rc1 has been created
        at  d9d7ef96ec523fcf59188cc48ddfbb1956686612 (tag)
   tagging  c48e7a7fb1ca1a634ad46626dfc46a56cf63e6a6 (tag)
    length  354 bytes
 tagged by  Giuseppe Scrivano
        on  Mon May 10 10:42:20 2010 +0200

- Log -----------------------------------------------------------------
v0.9.1_rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkvnxuwACgkQB5GvjMAzY/QNrACfQiMtA3aDeQTI/FxGOhsnXX4e
nCcAoMarjlYmbZO/ltUFlDltD+9iz65M
=xPb9
-----END PGP SIGNATURE-----

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


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:44:51 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBObb-00088l-3q
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:44:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBObX-00085W-QJ
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:47 -0400
Received: from [140.186.70.92] (port=41739 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBObN-0007y9-Aj
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:46 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001Er-HU
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:37 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36610
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001Ej-CY
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0008Q0-8s
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOb5-0000va-7G
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/v0.9.2
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: ca5a00b78e4db92455087eff66535c2e4c273dc1
Message-Id: <E1OBOb5-0000va-7G@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:44:19 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, v0.9.2,
	created. 0_9_2
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:44:48 -0000

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 annotated tag, v0.9.2 has been created
        at  ca5a00b78e4db92455087eff66535c2e4c273dc1 (tag)
   tagging  6ac1c80d8a8940a0afe5a4c598687b1df9036eeb (tag)
    length  345 bytes
 tagged by  Giuseppe Scrivano
        on  Mon May 10 10:42:26 2010 +0200

- Log -----------------------------------------------------------------
v0.9.2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkvnxvIACgkQB5GvjMAzY/RtGACgl1rvZFvsoFCqKohz4BULALA9
BREAnAnW39cSiSfHfJBXUGSvBwDDjPoB
=6ZDJ
-----END PGP SIGNATURE-----

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


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:44:51 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBObb-000893-Av
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:44:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBObZ-00086w-9U
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:49 -0400
Received: from [140.186.70.92] (port=41755 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBObO-0007ya-BO
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:48 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001F5-MH
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:38 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36612
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001F1-Km
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0008Q6-Dj
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOb5-0000wE-CN
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/v0.9_rc2
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 3a9313bbbbdf68bd0edcbcb4f8015c9104fcd821
Message-Id: <E1OBOb5-0000wE-CN@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:44:19 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, v0.9_rc2,
	created. 0_9_rc2
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:44:49 -0000

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 annotated tag, v0.9_rc2 has been created
        at  3a9313bbbbdf68bd0edcbcb4f8015c9104fcd821 (tag)
   tagging  0b33a81327df283d066c3a6fd04d84fa5904fa72 (tag)
    length  342 bytes
 tagged by  Giuseppe Scrivano
        on  Mon May 10 10:42:37 2010 +0200

- Log -----------------------------------------------------------------
v0.9_rc2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkvnxv0ACgkQB5GvjMAzY/QZOACeKk21gLarm5NVfUcSFwWebkyi
P7EAnjDmUqc8/V7ecAldutUMcgm0x9mp
=GTkh
-----END PGP SIGNATURE-----

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


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:44:52 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBObb-00089d-PP
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:44:51 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBObZ-000873-Gc
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:49 -0400
Received: from [140.186.70.92] (port=41750 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBObO-0007yP-0M
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:48 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001Ew-Hr
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:37 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36611
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0001El-FL
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:44:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOb5-0008Q3-BP
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOb5-0000vv-9w
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:44:19 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/v0.9_rc1
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0000000000000000000000000000000000000000
X-Git-Newrev: 3b1e4336aff1440b07c7c16f6a22cf199115650a
Message-Id: <E1OBOb5-0000vv-9w@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:44:19 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, v0.9_rc1,
	created. 0_9_rc1
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:44:50 -0000

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 annotated tag, v0.9_rc1 has been created
        at  3b1e4336aff1440b07c7c16f6a22cf199115650a (tag)
   tagging  7b4c13610448bb400f9991c5753e6ae7f5173136 (tag)
    length  340 bytes
 tagged by  Giuseppe Scrivano
        on  Mon May 10 10:42:32 2010 +0200

- Log -----------------------------------------------------------------
v0.9_rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkvnxvgACgkQB5GvjMAzY/SKnwCfa2Txbx3nbPex8UPwdC4d7Saw
v0AAoLI1A+R2rIX273gLQwQR+Cq6qINO
=OAos
-----END PGP SIGNATURE-----

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


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:49:58 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBOgX-0001rC-Pv
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:49:57 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBOgT-0001pj-TQ
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:49:54 -0400
Received: from [140.186.70.92] (port=41073 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBOgO-0001me-GR
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:49:53 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgJ-0002nR-1d
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:49:48 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39476
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgI-0002nF-WC
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:49:43 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgI-0008TQ-Bl
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:49:42 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOgI-0001IW-Aa
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:49:42 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/0_9
X-Git-Reftype: annotated tag
X-Git-Oldrev: aeed7ee10306b0a2f699dcd8c50cef59a572f099
X-Git-Newrev: 0000000000000000000000000000000000000000
Message-Id: <E1OBOgI-0001IW-Aa@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:49:42 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, 0_9,
	deleted. v0.9
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:49:54 -0000

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 annotated tag, 0_9 has been deleted
       was  aeed7ee10306b0a2f699dcd8c50cef59a572f099

-----------------------------------------------------------------------
tag 0_9

0.9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkqAVxoACgkQB5GvjMAzY/Rz2wCgmP8U1tcSZ6VG+NIHROGnGq78
W4cAnRkHuxqiQhovCAdKYB8RdSMTTq69
=FvA1
-----END PGP SIGNATURE-----
60e8616f339d31bfffc23698b0233efc55556119 Bump version to 0.9.
-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:50:26 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBOh0-00027D-25
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:50:26 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBOgy-000266-Df
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:24 -0400
Received: from [140.186.70.92] (port=41227 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBOgs-00022B-2X
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002uH-HJ
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:17 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39499
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002uA-FN
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:10 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-00005J-8C
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:10 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOgk-0001Mg-2J
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:10 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/0_9_2
X-Git-Reftype: annotated tag
X-Git-Oldrev: 6ac1c80d8a8940a0afe5a4c598687b1df9036eeb
X-Git-Newrev: 0000000000000000000000000000000000000000
Message-Id: <E1OBOgk-0001Mg-2J@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:50:10 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, 0_9_2,
	deleted. v0.9.2
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:50:24 -0000

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 annotated tag, 0_9_2 has been deleted
       was  6ac1c80d8a8940a0afe5a4c598687b1df9036eeb

-----------------------------------------------------------------------
tag 0_9_2

version 0.9.2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkt4XqUACgkQB5GvjMAzY/TbKQCgyHL60YkOnmM7otkmI6U+Dbz0
TeIAoNrW8FcpLbvTZKjv3GFh2lEHk890
=LsVv
-----END PGP SIGNATURE-----
ec4ba561117523370b425485cddead9a48799c0c Bump version number.
-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:50:30 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBOh4-0002AJ-88
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:50:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBOh2-00028P-1f
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:28 -0400
Received: from [140.186.70.92] (port=41228 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBOgs-00022C-2b
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002ty-6g
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:17 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39496
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002tt-38
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:10 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgj-00005C-Th
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:09 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOgj-0001M0-N1
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:09 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/0_9_1
X-Git-Reftype: annotated tag
X-Git-Oldrev: aace56a2f23c5b264c1d3522a5e4aa3691a74b9f
X-Git-Newrev: 0000000000000000000000000000000000000000
Message-Id: <E1OBOgj-0001M0-N1@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:50:09 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, 0_9_1,
	deleted. v0.9.1
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:50:29 -0000

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 annotated tag, 0_9_1 has been deleted
       was  aace56a2f23c5b264c1d3522a5e4aa3691a74b9f

-----------------------------------------------------------------------
tag 0_9_1

0.9.1 release
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAksEa68ACgkQB5GvjMAzY/SstQCeKCady2o1vNpALYmICuJuHA7S
CJcAnjPg0wjxj9Jf+BawzxLUDI4Cj1jh
=+KdS
-----END PGP SIGNATURE-----
32f225fe222aa1468220c05c680a5b4cc570c679 Bump version to 0.9.1
-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:50:30 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBOh4-0002AU-Le
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:50:30 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBOh2-00028y-IZ
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:28 -0400
Received: from [140.186.70.92] (port=41241 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBOgs-00022O-Jl
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002uN-ID
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39500
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002uE-Ge
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:10 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-00005K-CF
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:10 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOgk-0001Mv-9I
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:10 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/0_9_rc1
X-Git-Reftype: annotated tag
X-Git-Oldrev: 7b4c13610448bb400f9991c5753e6ae7f5173136
X-Git-Newrev: 0000000000000000000000000000000000000000
Message-Id: <E1OBOgk-0001Mv-9I@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:50:10 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, 0_9_rc1,
	deleted. v0.9_rc1
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:50:29 -0000

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 annotated tag, 0_9_rc1 has been deleted
       was  7b4c13610448bb400f9991c5753e6ae7f5173136

-----------------------------------------------------------------------
tag 0_9_rc1

0.9 rc1
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkpnZpIACgkQB5GvjMAzY/Th9wCfXDGS2d2z2euWrgSziH4ur0/V
q3sAoLVajjfp8ch2/ZFOk6Gjet73P5tO
=MfP9
-----END PGP SIGNATURE-----
e9c335399e11d7b0fe9006ae908bd3ad392cb20d Compile MSCGI examples under Windows.
-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:50:32 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBOh6-0002BY-0K
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:50:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBOh3-00029s-LC
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:29 -0400
Received: from [140.186.70.92] (port=41231 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBOgs-00022J-63
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002u6-CF
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39498
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002u2-Ac
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:10 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-00005F-0O
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:10 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOgj-0001ML-VK
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:09 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/0_9_1_rc1
X-Git-Reftype: annotated tag
X-Git-Oldrev: c48e7a7fb1ca1a634ad46626dfc46a56cf63e6a6
X-Git-Newrev: 0000000000000000000000000000000000000000
Message-Id: <E1OBOgj-0001ML-VK@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:50:09 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, 0_9_1_rc1,
	deleted. v0.9.1_rc1
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:50:30 -0000

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 annotated tag, 0_9_1_rc1 has been deleted
       was  c48e7a7fb1ca1a634ad46626dfc46a56cf63e6a6

-----------------------------------------------------------------------
tag 0_9_1_rc1

0.9.1-rc1 version.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkr7G1AACgkQB5GvjMAzY/SFNwCePcQXNmrALGPpr9EZZwsR8zq7
swYAn0ZpLMy9MbzNTua088dq5sgt9BRd
=mMWf
-----END PGP SIGNATURE-----
5275860f57a0dd07542072ee9b3b9f6c68f410e8 Bump version to 0.9.1-rc1.
-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Mon May 10 04:50:32 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBOh6-0002C1-BE
	for mharc-myserver-commit@gnu.org; Mon, 10 May 2010 04:50:32 -0400
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1OBOh3-00029g-Ag
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:29 -0400
Received: from [140.186.70.92] (port=41249 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBOgs-00022Z-OV
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002uW-Kn
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:39502
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-0002uS-JR
	for myserver-commit@gnu.org; Mon, 10 May 2010 04:50:10 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBOgk-00005P-F6
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:10 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBOgk-0001NC-Cl
	for myserver-commit@gnu.org; Mon, 10 May 2010 08:50:10 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/tags/0_9_rc2
X-Git-Reftype: annotated tag
X-Git-Oldrev: 0b33a81327df283d066c3a6fd04d84fa5904fa72
X-Git-Newrev: 0000000000000000000000000000000000000000
Message-Id: <E1OBOgk-0001NC-Cl@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 10 May 2010 08:50:10 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer annotated tag, 0_9_rc2,
	deleted. v0.9_rc2
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 10 May 2010 08:50:30 -0000

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 annotated tag, 0_9_rc2 has been deleted
       was  0b33a81327df283d066c3a6fd04d84fa5904fa72

-----------------------------------------------------------------------
tag 0_9_rc2

0.9.0-rc2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEABECAAYFAkpx38gACgkQB5GvjMAzY/QF0ACffPwU5eYRPRLOq+SFPQ5pysVf
f/gAoMQ1pHXl1nuyQT4wT0zVC/nHpAa+
=ix9M
-----END PGP SIGNATURE-----
20fc8ae23b82d5d05b1bf79cea7511e9e04c57c6 Bump new version.
-----------------------------------------------------------------------


hooks/post-receive
-- 
GNU MyServer



From MAILER-DAEMON Tue May 11 06:30:51 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBmjj-0002Zz-KG
	for mharc-myserver-commit@gnu.org; Tue, 11 May 2010 06:30:51 -0400
Received: from [140.186.70.92] (port=33787 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBmjb-0002Zq-2D
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:30:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBmjX-0001Tu-Ne
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:30:42 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:58935
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBmjX-0001To-HW
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:30:39 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBmjW-0001jR-UP
	for myserver-commit@gnu.org; Tue, 11 May 2010 10:30:39 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBmjK-0001Sa-Ov
	for myserver-commit@gnu.org; Tue, 11 May 2010 10:30:37 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c7fe97145fa20fddb1e0a87557b405b66a49d75f
X-Git-Newrev: aaa3953a513a54cf43d28e4ec8b718703c868570
Message-Id: <E1OBmjK-0001Sa-Ov@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 11 May 2010 10:30:30 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-228-gaaa3953
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 May 2010 10:30:49 -0000

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  aaa3953a513a54cf43d28e4ec8b718703c868570 (commit)
       via  747e5350c01142b80c1f3b5665f0f2ed93c1854a (commit)
       via  d25111eedceb92b4f037fd9e11c5ccdf2391934a (commit)
       via  b8bef11fab3a916f0eaee8602ac88e3c2f9537a2 (commit)
      from  c7fe97145fa20fddb1e0a87557b405b66a49d75f (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 aaa3953a513a54cf43d28e4ec8b718703c868570
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue May 11 12:00:00 2010 +0200

    Workaround a bug in git-version-gen.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 7d6802d..3cf34ee 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -80,3 +80,11 @@ gnulib_extra_files="
 	$build_aux/config.rpath
 	doc/INSTALL
 "
+
+# Workaround a bug in git-version-gen, that doesn't allow to be used
+# in a sibling directory of the git repository.  Remove this as soon
+# as the bug is fixed.
+bootstrap_epilogue()
+{
+        sed -i -e"s|test -d .git|true|" build-aux/git-version-gen
+}



commit 747e5350c01142b80c1f3b5665f0f2ed93c1854a
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue May 11 10:59:18 2010 +0200

    Load the XML file in memory before parse it.

diff --git a/myserver/src/base/xml/xml_parser.cpp b/myserver/src/base/xml/xml_parser.cpp
index 22cdc04..6b8a483 100644
--- a/myserver/src/base/xml/xml_parser.cpp
+++ b/myserver/src/base/xml/xml_parser.cpp
@@ -81,41 +81,69 @@ bool XmlParser::cleanXML ()
  */
 int XmlParser::open (const char* filename, bool useXpath)
 {
+  File xmlFile;
+
   cur = NULL;
   this->useXpath = useXpath;
 
-  if (!FilesUtility::nodeExists (filename))
-    return -1;
-
   if (doc!= NULL)
     close ();
 
-  doc = xmlParseFile (filename);
-  if (doc == NULL)
+  if (xmlFile.openFile (filename, File::READ | File::OPEN_IF_EXISTS))
     return -1;
 
-  cur = xmlDocGetRootElement (doc);
-  if (!cur)
+  u_long size = xmlFile.getFileSize ();
+  char *buffer = new char [size];
+  try
     {
-      close ();
-      return -1;
-    }
+      u_long nbr;
+      xmlFile.read (buffer, size, &nbr);
 
-  mtime = FilesUtility::getLastModTime (filename);
-  if (mtime == static_cast<time_t>(-1))
-    {
-      close ();
-      return -1;
-    }
+      doc = xmlParseMemory (buffer, nbr);
 
-  if (useXpath)
-    {
-      xpathCtx = xmlXPathNewContext (doc);
-      if (xpathCtx == NULL)
+      delete [] buffer;
+      buffer = NULL;
+
+      if (doc == NULL)
+        return -1;
+
+      if (nbr != size)
         {
           close ();
           return -1;
         }
+
+      cur = xmlDocGetRootElement (doc);
+      if (!cur)
+        {
+          close ();
+          return -1;
+        }
+
+      mtime = xmlFile.getLastModTime ();
+      if (mtime == static_cast<time_t> (-1))
+        {
+          close ();
+          return -1;
+        }
+
+      if (useXpath)
+        {
+          xpathCtx = xmlXPathNewContext (doc);
+          if (xpathCtx == NULL)
+            {
+              close ();
+              return -1;
+            }
+        }
+      xmlFile.close ();
+    }
+  catch (exception & e)
+    {
+      if (buffer)
+        delete [] buffer;
+
+      throw e;
     }
   return 0;
 }
@@ -350,7 +378,7 @@ int XmlParser::close ()
  */
 int XmlParser::save (const char *filename, int *nbytes)
 {
-  int err = xmlSaveFile (filename,doc);
+  int err = xmlSaveFile (filename, doc);
   if (nbytes)
     *nbytes = err;
 
diff --git a/myserver/src/conf/security/security_cache.cpp b/myserver/src/conf/security/security_cache.cpp
index e8d7e89..934f0ba 100644
--- a/myserver/src/conf/security/security_cache.cpp
+++ b/myserver/src/conf/security/security_cache.cpp
@@ -30,7 +30,7 @@ using namespace std;
 
 /*
   Constructor for the SecurityCache object.
- */
+*/
 SecurityCache::SecurityCache ()
 {
   /*
@@ -72,11 +72,11 @@ void SecurityCache::setMaxNodes (int newLimit)
 
   /*! Remove all the additional nodes from the dictionary. */
   while (newLimit < dictionary.size ())
-  {
-    XmlParser* toremove = dictionary.remove (dictionary.begin ());
-    if (toremove)
-      delete toremove;
-  }
+    {
+      XmlParser* toremove = dictionary.remove (dictionary.begin ());
+      if (toremove)
+        delete toremove;
+    }
   limit = newLimit;
 }
 
@@ -108,43 +108,43 @@ int SecurityCache::getSecurityFile (const string& dir,
 
   /* The security file exists in the directory.  */
   if (FilesUtility::nodeExists (secFile))
-  {
-    out.assign (secFile);
-    return 0;
-  }
+    {
+      out.assign (secFile);
+      return 0;
+    }
 
 
   /* Go upper in the tree till we find a security file.  */
   for (;;)
-  {
-    if (found || !file.length ())
-      break;
-
-    for (i = file.length () - 1; i; i--)
-      if (file[i] == '/')
-      {
-        file.erase (i, file.length () - i);
+    {
+      if (found || !file.length ())
         break;
-      }
 
-    /*
-      Top of the tree, check if the security file is present in the
-      system directory.  Return an error if it is not.
-    */
-    if (i == 0)
-    {
-      out.assign (sys);
-      out.append ("/");
-      out.append (secFileName);
-      return !FilesUtility::nodeExists (out);
-    }
+      for (i = file.length () - 1; i; i--)
+        if (file[i] == '/')
+          {
+            file.erase (i, file.length () - i);
+            break;
+          }
+
+      /*
+        Top of the tree, check if the security file is present in the
+        system directory.  Return an error if it is not.
+      */
+      if (i == 0)
+        {
+          out.assign (sys);
+          out.append ("/");
+          out.append (secFileName);
+          return !FilesUtility::nodeExists (out);
+        }
 
-    secFile.assign (file);
-    secFile.append ("/");
-    secFile.append (secFileName);
+      secFile.assign (file);
+      secFile.append ("/");
+      secFile.append (secFileName);
 
-    found = FilesUtility::nodeExists (secFile);
-  }
+      found = FilesUtility::nodeExists (secFile);
+    }
 
   out.assign (secFile);
   return 0;
@@ -183,60 +183,60 @@ XmlParser* SecurityCache::getParser (const string &dir,
 
   /* If the parser is already present and satisfy XPath then use it.  */
   if (parser && (!useXpath || parser->isXpathEnabled ()))
-  {
-    time_t fileModTime;
-    fileModTime = FilesUtility::getLastModTime (file.c_str ());
-
-    if ((fileModTime != static_cast<time_t>(-1))  &&
-       (parser->getLastModTime () != fileModTime))
     {
-      parser->close ();
+      time_t fileModTime;
+      fileModTime = FilesUtility::getLastModTime (file.c_str ());
 
-      /* FIXME:  Don't open the file twice, once to check
-       * and the second time to parse.  */
-      if (maxSize)
+      if ((fileModTime != static_cast<time_t>(-1))  &&
+          (parser->getLastModTime () != fileModTime))
         {
-          File parserFile;
-          if (parserFile.openFile (file.c_str (), File::READ))
-            return NULL;
+          parser->close ();
 
-          if (parserFile.getFileSize () > maxSize)
-            return NULL;
+          /* FIXME:  Don't open the file twice, once to check
+           * and the second time to parse.  */
+          if (maxSize)
+            {
+              File parserFile;
+              if (parserFile.openFile (file.c_str (), File::READ))
+                return NULL;
 
-          parserFile.close ();
-        }
+              if (parserFile.getFileSize () > maxSize)
+                return NULL;
 
-      if (parser->open (file.c_str (), useXpath) == -1)
-      {
-        dictionary.remove (file.c_str ());
-        return NULL;
-      }
+              parserFile.close ();
+            }
 
+          if (parser->open (file.c_str (), useXpath) == -1)
+            {
+              dictionary.remove (file.c_str ());
+              return NULL;
+            }
+
+        }
     }
-  }
   else
-  {
-    /* Create the parser and add it to the dictionary.  */
-    XmlParser* old;
-    parser = new XmlParser ();
+    {
+      /* Create the parser and add it to the dictionary.  */
+      XmlParser* old;
+      parser = new XmlParser ();
 
-    if (parser == NULL)
-      return NULL;
+      if (parser == NULL)
+        return NULL;
 
-    if (dictionary.size () >= limit)
-    {
-      XmlParser* toremove = dictionary.remove (dictionary.begin ());
-      if (toremove)
-        delete toremove;
-    }
+      if (dictionary.size () >= limit)
+        {
+          XmlParser* toremove = dictionary.remove (dictionary.begin ());
+          if (toremove)
+            delete toremove;
+        }
 
-    if (parser->open (file.c_str (), useXpath) == -1)
-      return NULL;
+      if (parser->open (file.c_str (), useXpath) == -1)
+        return NULL;
 
-    old = dictionary.put (file, parser);
-    if (old)
-      delete old;
-  }
+      old = dictionary.put (file, parser);
+      if (old)
+        delete old;
+    }
 
   return parser;
 }



commit d25111eedceb92b4f037fd9e11c5ccdf2391934a
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue May 11 10:32:53 2010 +0200

    HttpHeader doesn't allocate name and value dinamically.

diff --git a/myserver/include/protocol/http/http_header.h b/myserver/include/protocol/http/http_header.h
index fe03c69..3a61ce7 100644
--- a/myserver/include/protocol/http/http_header.h
+++ b/myserver/include/protocol/http/http_header.h
@@ -30,27 +30,20 @@ struct HttpHeader
 {
   struct Entry
   {
-    string *name;
-    string *value;
-    Entry () : name (NULL), value (NULL)
+    string name;
+    string value;
+    Entry ()
     {
-      name = new string ();
-      value = new string ();
     }
 
     Entry (string& n, string& v) : name (NULL), value (NULL)
     {
-      name = new string ();
-      value = new string ();
-
-      name->assign (n);
-      value->assign (v);
+      name.assign (n);
+      value.assign (v);
     }
 
     ~Entry ()
     {
-      delete name;
-      delete value;
     }
 
   };
diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp b/myserver/src/http_handler/http_dir/http_dir.cpp
index 3fa9fdc..61872de 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -557,15 +557,15 @@ int HttpDir::send (HttpThreadContext* td,
       *td->auxiliaryBuffer << "</table>\r\n<hr />\r\n<address>"
                            << MYSERVER_VERSION;
 
-      if (host && host->value->length ())
+      if (host && host->value.length ())
         {
           ostringstream portBuff;
-          size_t portSeparator = host->value->find (':');
+          size_t portSeparator = host->value.find (':');
           *td->auxiliaryBuffer << " on ";
           if (portSeparator != string::npos)
-            *td->auxiliaryBuffer << host->value->substr (0, portSeparator).c_str () ;
+            *td->auxiliaryBuffer << host->value.substr (0, portSeparator).c_str () ;
           else
-            *td->auxiliaryBuffer << host->value->c_str () ;
+            *td->auxiliaryBuffer << host->value.c_str () ;
 
           *td->auxiliaryBuffer << " Port ";
           portBuff << td->connection->getLocalPort ();
diff --git a/myserver/src/http_handler/http_file/http_file.cpp b/myserver/src/http_handler/http_file/http_file.cpp
index ceea526..910827c 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -242,8 +242,8 @@ int HttpFile::send (HttpThreadContext* td, const char *filenamePath,
       HttpRequestHeader::Entry *ifModifiedSince =
         td->request.other.get ("last-modified");
 
-      if (ifModifiedSince && ifModifiedSince->value->length () &&
-          !ifModifiedSince->value->compare (tmpTime))
+      if (ifModifiedSince && ifModifiedSince->value.length () &&
+          !ifModifiedSince->value.compare (tmpTime))
         return td->http->sendHTTPNonModified ();
 
       try
@@ -272,19 +272,19 @@ int HttpFile::send (HttpThreadContext* td, const char *filenamePath,
     generateEtag (etag, lastMT, filesize);
 
     HttpRequestHeader::Entry *etagHeader = td->request.other.get ("etag");
-    if (etagHeader && !etagHeader->value->compare (etag))
+    if (etagHeader && !etagHeader->value.compare (etag))
       return td->http->sendHTTPNonModified ();
     else
       {
         HttpResponseHeader::Entry *e = td->response.other.get ("etag");
         if (e)
-          e->value->assign (etag);
+          e->value.assign (etag);
         else
           {
             e = new HttpResponseHeader::Entry ();
-            e->name->assign ("etag");
-            e->value->assign (etag);
-            td->response.other.put (*(e->name), e);
+            e->name.assign ("etag");
+            e->value.assign (etag);
+            td->response.other.put (e->name, e);
           }
       }
 
@@ -310,13 +310,13 @@ int HttpFile::send (HttpThreadContext* td, const char *filenamePath,
 
         e = td->response.other.get ("content-range");
         if (e)
-          e->value->assign (buffer.str ());
+          e->value.assign (buffer.str ());
         else
           {
             e = new HttpResponseHeader::Entry ();
-            e->name->assign ("content-range");
-            e->value->assign (buffer.str ());
-            td->response.other.put (*(e->name), e);
+            e->name.assign ("content-range");
+            e->value.assign (buffer.str ());
+            td->response.other.put (e->name, e);
           }
       }
     chain.setStream (&memStream);
@@ -328,7 +328,7 @@ int HttpFile::send (HttpThreadContext* td, const char *filenamePath,
                                                                td->mime->filters,
                                                                &memStream,
                                                                &nbw, 0,
-                                                               e ? e->value : NULL);
+                                                               e ? &e->value : NULL);
         memStream.refresh ();
         dataSent += nbw;
       }
@@ -354,13 +354,13 @@ int HttpFile::send (HttpThreadContext* td, const char *filenamePath,
         e = td->response.other.get ("content-encoding");
 
         if (e)
-          e->value->assign (s);
+          e->value.assign (s);
         else
           {
             e = new HttpResponseHeader::Entry ();
-            e->name->assign ("content-encoding");
-            e->value->assign (s);
-            td->response.other.put (*(e->name), e);
+            e->name.assign ("content-encoding");
+            e->value.assign (s);
+            td->response.other.put (e->name, e);
           }
         /* Do not use chunked transfer with old HTTP/1.0 clients.  */
         if (keepalive)
@@ -372,13 +372,13 @@ int HttpFile::send (HttpThreadContext* td, const char *filenamePath,
         HttpResponseHeader::Entry *e;
         e = td->response.other.get ("transfer-encoding");
         if (e)
-          e->value->assign ("chunked");
+          e->value.assign ("chunked");
         else
           {
             e = new HttpResponseHeader::Entry ();
-            e->name->assign ("transfer-encoding");
-            e->value->assign ("chunked");
-            td->response.other.put (*(e->name), e);
+            e->name.assign ("transfer-encoding");
+            e->value.assign ("chunked");
+            td->response.other.put (e->name, e);
           }
       }
     else
diff --git a/myserver/src/http_handler/isapi/isapi.cpp b/myserver/src/http_handler/isapi/isapi.cpp
index 0d4be8e..fd552db 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -228,7 +228,7 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID Buffer, LPDWORD lpdwByt
     ((Vhost*)(ConnInfo->td->connection->host))->warningsLogWrite (_("ISAPI: internal error"));
     return HttpDataHandler::RET_FAILURE;
   }
-  keepalive = connection && (!stringcmpi (connection->value->c_str (), "keep-alive")) ;
+  keepalive = connection && (!stringcmpi (connection->value.c_str (), "keep-alive")) ;
 
   /*If the HTTP header was sent do not send it again. */
   if (!ConnInfo->headerSent)
@@ -286,12 +286,12 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID Buffer, LPDWORD lpdwByt
                   HttpResponseHeader::Entry *e;
                   e = ConnInfo->td->response.other.get ("transfer-encoding");
                   if (e)
-                    e->value->assign ("chunked");
+                    e->value.assign ("chunked");
                   else
                     {
                       e = new HttpResponseHeader::Entry ();
-                      e->name->assign ("transfer-encoding");
-                      e->value->assign ("chunked");
+                      e->name.assign ("transfer-encoding");
+                      e->value.assign ("chunked");
                       ConnInfo->td->response.other.put (*(e->name), e);
                     }
                 }
@@ -501,15 +501,15 @@ BOOL Isapi::buildAllHttpHeaders (HttpThreadContext* td, ConnectionPtr /*!a*/,
   HttpRequestHeader::Entry *accept = td->request.other.get ("accept");
   HttpRequestHeader::Entry *cache = td->request.other.get ("cache-control");
 
-  if (accept && accept->value->length () && (valLen+30<maxLen))
+  if (accept && accept->value.length () && (valLen+30<maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_ACCEPT:%s\n",
-                       accept->value->c_str ());
+                       accept->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
-  if (cache && cache->value->length () && (valLen+30<maxLen))
+  if (cache && cache->value.length () && (valLen+30<maxLen))
     valLen += sprintf (&ValStr[valLen], "HTTP_CACHE_CONTROL:%s\n",
-                       cache->value->c_str ());
+                       cache->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
@@ -529,84 +529,84 @@ BOOL Isapi::buildAllHttpHeaders (HttpThreadContext* td, ConnectionPtr /*!a*/,
   HttpRequestHeader::Entry* e = td->request.other.get ("accept-encoding");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen], "HTTP_ACCEPT_ENCODING:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("accept-language");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_ACCEPT_LANGUAGE:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("accept-charset");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_ACCEPT_CHARSET:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("pragma");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_PRAGMA:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("connection");
   if (e && (valLen + 30< maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_CONNECTION:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("cookie");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_COOKIE:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("host");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_HOST:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("date");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_DATE:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("if-modified-since");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_IF_MODIFIED_SINCE:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("referer");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_REFERER:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("user-agent");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_USER_AGENT:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
   e = td->request.other.get ("from");
   if (e && (valLen + 30 < maxLen))
     valLen += sprintf (&ValStr[valLen],"HTTP_FROM:%s\n",
-                       e->value->c_str ());
+                       e->value.c_str ());
   else if (valLen + 30 < maxLen)
     return 1;
 
@@ -862,7 +862,7 @@ int Isapi::send (HttpThreadContext* td,
 
 
       HttpRequestHeader::Entry *content = td->request.other.get ("content-type");
-      ExtCtrlBlk.lpszContentType = content ? (char*)content->value->c_str () : NULL;
+      ExtCtrlBlk.lpszContentType = content ? (char*)content->value.c_str () : NULL;
 
       connTable[connIndex].td->buffer->setLength (0);
       connTable[connIndex].td->buffer->getAt (0)='\0';
@@ -883,7 +883,7 @@ int Isapi::send (HttpThreadContext* td,
       HttpRequestHeader::Entry *connection
         = connTable[connIndex].td->request.other.get ("connection");
 
-      if (connection && !stringcmpi (connection->value->c_str (), "keep-alive"))
+      if (connection && !stringcmpi (connection->value.c_str (), "keep-alive"))
         connTable[connIndex].chain.getStream ()->write ("0\r\n\r\n", 5, &nbw);
 
       switch (ret)
diff --git a/myserver/src/http_handler/proxy/proxy.cpp b/myserver/src/http_handler/proxy/proxy.cpp
index 3f96454..7e7eef2 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -40,11 +40,8 @@
   \param execute Not used.
   \param onlyHeader Specify if send only the HTTP header.
  */
-int Proxy::send (HttpThreadContext *td,
-                 const char* scriptpath,
-                 const char* exec,
-                 bool execute,
-                 bool onlyHeader)
+int Proxy::send (HttpThreadContext *td, const char* scriptpath,
+                 const char* exec, bool execute, bool onlyHeader)
 {
   Url destUrl (exec, 80);
   Socket sock;
@@ -56,7 +53,7 @@ int Proxy::send (HttpThreadContext *td,
          td->request.begin (); it != td->request.end (); it++)
     {
       HttpRequestHeader::Entry *e = *it;
-      req.setValue (e->name->c_str (), e->value->c_str ());
+      req.setValue (e->name.c_str (), e->value.c_str ());
     }
 
   if (destUrl.getProtocol ().compare ("http")
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp b/myserver/src/http_handler/wincgi/wincgi.cpp
index 9cdc554..8c1345c 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -159,23 +159,23 @@ int WinCgi::send (HttpThreadContext* td, const char* scriptpath,
         }
 
       HttpRequestHeader::Entry *referer = td->request.other.get ("referer");
-      if (referer && referer->value->length ())
+      if (referer && referer->value.length ())
         {
-          sprintf (buffer,"Referer=%s\r\n", referer->value->c_str ());
+          sprintf (buffer,"Referer=%s\r\n", referer->value.c_str ());
           DataFileHandle.writeToFile (buffer,(u_long) strlen (buffer),&nbr);
         }
 
       HttpRequestHeader::Entry *contentType = td->request.other.get ("content-type");
-      if (contentType && contentType->value->length ())
+      if (contentType && contentType->value.length ())
         {
-          sprintf (buffer, "Content Type=%s\r\n", contentType->value->c_str ());
+          sprintf (buffer, "Content Type=%s\r\n", contentType->value.c_str ());
           DataFileHandle.writeToFile (buffer, (u_long) strlen (buffer), &nbr);
         }
 
       HttpRequestHeader::Entry *userAgent = td->request.other.get ("user-agent");
-      if (userAgent && userAgent->value->length ())
+      if (userAgent && userAgent->value.length ())
         {
-          sprintf (buffer,"User Agent=%s\r\n", userAgent->value->c_str ());
+          sprintf (buffer,"User Agent=%s\r\n", userAgent->value.c_str ());
           DataFileHandle.writeToFile (buffer, (u_long) strlen (buffer), &nbr);
         }
 
@@ -205,7 +205,7 @@ int WinCgi::send (HttpThreadContext* td, const char* scriptpath,
 
       HttpRequestHeader::Entry *host = td->request.other.get ("host");
       if (host)
-        sprintf (buffer, "Server Name=%s\r\n", host->value->c_str ());
+        sprintf (buffer, "Server Name=%s\r\n", host->value.c_str ());
       DataFileHandle.writeToFile (buffer, (u_long) strlen (buffer), &nbr);
 
       strcpy (buffer, "[System]\r\n");
diff --git a/myserver/src/protocol/http/env/env.cpp b/myserver/src/protocol/http/env/env.cpp
index 4ba281f..13af4f4 100644
--- a/myserver/src/protocol/http/env/env.cpp
+++ b/myserver/src/protocol/http/env/env.cpp
@@ -207,7 +207,7 @@ void Env::buildEnvironmentString (HttpThreadContext* td, char *cgiEnv,
   if (reqEntry)
   {
     memCgi << end_str << "CONTENT_TYPE=";
-    memCgi << reqEntry->value->c_str ();
+    memCgi << reqEntry->value.c_str ();
   }
 
   buildHttpHeaderEnvString (memCgi, td->request);
@@ -232,13 +232,13 @@ void Env::buildHttpHeaderEnvString (MemBuf& memCgi, HttpRequestHeader & req)
     string name;
 
     name.assign ("HTTP_");
-    name.append (en->name->c_str ());
+    name.append (en->name.c_str ());
     transform (name.begin ()+5, name.end (), name.begin ()+5, ::toupper);
     for (int i = name.length (); i > 5; i--)
       if (name[i] == '-')
         name[i] = '_';
 
-    memCgi  << end_str << name.c_str () << "=" << en->value->c_str ();
+    memCgi  << end_str << name.c_str () << "=" << en->value.c_str ();
   }
 }
 
diff --git a/myserver/src/protocol/http/http.cpp b/myserver/src/protocol/http/http.cpp
index 423ca64..61257a2 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -136,8 +136,8 @@ int Http::optionsHTTPRESOURCE (string& filename, int yetmapped)
       *td->auxiliaryBuffer << "HTTP/1.1 200 OK\r\n";
       *td->auxiliaryBuffer << "Date: " << time;
       *td->auxiliaryBuffer << "\r\nServer: GNU MyServer " << MYSERVER_VERSION;
-      if (connection && connection->value->length ())
-        *td->auxiliaryBuffer << "\r\nConnection:" << connection->value->c_str () << "\r\n";
+      if (connection && connection->value.length ())
+        *td->auxiliaryBuffer << "\r\nConnection:" << connection->value.c_str () << "\r\n";
       *td->auxiliaryBuffer << "Content-length: 0\r\nAccept-Ranges: bytes\r\n";
       *td->auxiliaryBuffer << "Allow: " << methods << "\r\n\r\n";
       td->connection->socket->send (td->auxiliaryBuffer->getBuffer (),
@@ -178,8 +178,8 @@ int Http::traceHTTPRESOURCE (string& filename, int yetmapped)
       *td->auxiliaryBuffer << "Date: " << time << "\r\n";
       *td->auxiliaryBuffer << "Server: GNU MyServer " << MYSERVER_VERSION << "\r\n";
       connection = td->request.other.get ("connection");
-      if (connection && connection->value->length ())
-        *td->auxiliaryBuffer << "Connection:" << connection->value->c_str () << "\r\n";
+      if (connection && connection->value.length ())
+        *td->auxiliaryBuffer << "Connection:" << connection->value.c_str () << "\r\n";
 
       *td->auxiliaryBuffer << "Content-length:" << tmp << "\r\n"
               << "Content-type: message/http\r\n"
@@ -795,8 +795,8 @@ int Http::logHTTPaccess ()
           HttpRequestHeader::Entry *referer = td->request.other.get ("refer");
 
           if (strstr ((td->connection->host)->getAccessLogOpt (), "type=combined"))
-            *td->auxiliaryBuffer << " " << (referer ? referer->value->c_str () : "")
-            << " " << (userAgent ? userAgent->value->c_str () : "");
+            *td->auxiliaryBuffer << " " << (referer ? referer->value.c_str () : "")
+            << " " << (userAgent ? userAgent->value.c_str () : "");
         }
 
       *td->auxiliaryBuffer << end_str;
@@ -974,11 +974,11 @@ int Http::controlConnection (ConnectionPtr a, char*, char*, u_long, u_long,
           HttpRequestHeader::Entry *connection
             = td->request.other.get ("connection");
           if (connection)
-            keepalive = !stringcmpi (connection->value->c_str (), "keep-alive")
+            keepalive = !stringcmpi (connection->value.c_str (), "keep-alive")
               && !td->request.ver.compare ("HTTP/1.1");
 
           if (! td->request.ver.compare ("HTTP/1.1")
-              && (host == NULL || host->value->length () == 0))
+              && (host == NULL || host->value.length () == 0))
             {
               int ret = raiseHTTPError (400);
               logHTTPaccess ();
@@ -990,7 +990,7 @@ int Http::controlConnection (ConnectionPtr a, char*, char*, u_long, u_long,
 
           /* Find the virtual host to check both host name and IP value.  */
           Vhost* newHost = Server::getInstance ()->getVhosts ()->getVHost (host ?
-                                                       host->value->c_str () : "",
+                                                       host->value.c_str () : "",
                                          a->getLocalIpAddr (), a->getLocalPort ());
           if (a->host)
             a->host->removeRef ();
@@ -1218,13 +1218,13 @@ int Http::requestAuthorization ()
   *td->auxiliaryBuffer << "Server: GNU MyServer " << MYSERVER_VERSION << "\r\n";
   *td->auxiliaryBuffer << "Content-type: text/html\r\n"
           << "Connection: ";
-  *td->auxiliaryBuffer << (connection ? connection->value->c_str () : "");
+  *td->auxiliaryBuffer << (connection ? connection->value.c_str () : "");
   *td->auxiliaryBuffer << "\r\nContent-length: 0\r\n";
 
   if (td->authScheme == HTTP_AUTH_SCHEME_BASIC)
     {
       *td->auxiliaryBuffer << "WWW-Authenticate: Basic realm=\""
-                           << (host ? host->value->c_str () : "")
+                           << (host ? host->value.c_str () : "")
                            << "\"\r\n";
     }
   else if (td->authScheme == HTTP_AUTH_SCHEME_DIGEST)
@@ -1242,7 +1242,7 @@ int Http::requestAuthorization ()
           hud->reset ();
         }
 
-      myserver_strlcpy (hud->realm, host ? host->value->c_str () : "", 48);
+      myserver_strlcpy (hud->realm, host ? host->value.c_str () : "", 48);
 
       /* Just a random string.  */
       md5Str[0] = (char) td->id;
@@ -1331,7 +1331,7 @@ int Http::raiseHTTPError (int ID)
 
       HttpHeaders::buildDefaultHTTPResponseHeader (&(td->response));
 
-      if (connection && !stringcmpi (connection->value->c_str (), "keep-alive"))
+      if (connection && !stringcmpi (connection->value.c_str (), "keep-alive"))
         td->response.setValue ("connection", "keep-alive");
 
       td->response.httpStatus = ID;
@@ -1346,7 +1346,7 @@ int Http::raiseHTTPError (int ID)
         {
           ostringstream nURL;
           int isPortSpecified = 0;
-          const char* hostStr = host ? host->value->c_str () : "";
+          const char* hostStr = host ? host->value.c_str () : "";
           /* Change the URI to reflect the default file name.  */
           nURL << protocolPrefix << hostStr;
           for (int i = 0; hostStr[i]; i++)
@@ -1647,7 +1647,7 @@ int Http::sendHTTPRedirect (const char *newURL)
           << "Location: " << newURL << "\r\n"
           << "Content-length: 0\r\n";
 
-  if (connection && !stringcmpi (connection->value->c_str (), "keep-alive"))
+  if (connection && !stringcmpi (connection->value.c_str (), "keep-alive"))
     *td->auxiliaryBuffer << "Connection: keep-alive\r\n";
   else
     *td->auxiliaryBuffer << "Connection: close\r\n";
@@ -1674,7 +1674,7 @@ int Http::sendHTTPNonModified ()
   *td->auxiliaryBuffer << "HTTP/1.1 304 Not Modified\r\nAccept-Ranges: bytes\r\n"
           << "Server: GNU MyServer " << MYSERVER_VERSION << "\r\n";
 
-  if (connection && !stringcmpi (connection->value->c_str (), "keep-alive"))
+  if (connection && !stringcmpi (connection->value.c_str (), "keep-alive"))
     *td->auxiliaryBuffer << "Connection: keep-alive\r\n";
   else
     *td->auxiliaryBuffer << "Connection: close\r\n";
diff --git a/myserver/src/protocol/http/http_data_handler.cpp b/myserver/src/protocol/http/http_data_handler.cpp
index b4f8bd5..dca42f8 100644
--- a/myserver/src/protocol/http/http_data_handler.cpp
+++ b/myserver/src/protocol/http/http_data_handler.cpp
@@ -207,13 +207,13 @@ HttpDataHandler::checkDataChunks (HttpThreadContext* td, bool* keepalive,
       HttpResponseHeader::Entry *e;
       e = td->response.other.get ("transfer-encoding");
       if (e)
-        e->value->assign ("chunked");
+        e->value.assign ("chunked");
       else
         {
           e = new HttpResponseHeader::Entry ();
-          e->name->assign ("transfer-encoding");
-          e->value->assign ("chunked");
-          td->response.other.put (*(e->name), e);
+          e->name.assign ("transfer-encoding");
+          e->value.assign ("chunked");
+          td->response.other.put (e->name, e);
         }
       *useChunks = true;
     }
diff --git a/myserver/src/protocol/http/http_data_read.cpp b/myserver/src/protocol/http/http_data_read.cpp
index aeb5852..85fd7d3 100644
--- a/myserver/src/protocol/http/http_data_read.cpp
+++ b/myserver/src/protocol/http/http_data_read.cpp
@@ -252,12 +252,12 @@ int HttpDataRead::readPostData (HttpThreadContext* td, int* httpRetCode)
   if (contentType == 0)
   {
     contentType = new HttpRequestHeader::Entry ();
-    contentType->name->assign ("content-type");
-    contentType->value->assign ("application/x-www-form-urlencoded");
+    contentType->name.assign ("content-type");
+    contentType->value.assign ("application/x-www-form-urlencoded");
   }
-  else if (contentType->value->length () == 0)
+  else if (contentType->value.length () == 0)
   {
-    contentType->value->assign ("application/x-www-form-urlencoded");
+    contentType->value.assign ("application/x-www-form-urlencoded");
   }
 
   td->request.uriOptsPtr = &(td->buffer->getBuffer ())[td->nHeaderChars];
@@ -286,7 +286,7 @@ int HttpDataRead::readPostData (HttpThreadContext* td, int* httpRetCode)
     HttpRequestHeader::Entry *content =
       td->request.other.get ("content-encoding");
 
-    if (content && (content->value->length () == '\0')
+    if (content && (content->value.length () == '\0')
            && (td->request.contentLength.length () == 0))
     {
       *httpRetCode = 400;
@@ -315,7 +315,7 @@ int HttpDataRead::readPostData (HttpThreadContext* td, int* httpRetCode)
   /* If it is specified a transfer encoding read data using it.  */
   if (encoding)
   {
-    if (!encoding->value->compare ("chunked"))
+    if (!encoding->value.compare ("chunked"))
     {
       int ret = readChunkedPostData (td->request.uriOptsPtr,
                                      &inPos,
diff --git a/myserver/src/protocol/http/http_header.cpp b/myserver/src/protocol/http/http_header.cpp
index c231478..32c8eaa 100644
--- a/myserver/src/protocol/http/http_header.cpp
+++ b/myserver/src/protocol/http/http_header.cpp
@@ -37,8 +37,8 @@ string* HttpHeader::getValue (const char *name, string *out)
   if (e)
     {
       if (out)
-        out->assign (*(e->value));
-      return e->value;
+        out->assign (e->value);
+      return &(e->value);
     }
 
   return NULL;
@@ -55,14 +55,14 @@ string* HttpHeader::setValue (const char *name, const char *in)
   Entry *e = other.get (key);
   if (e)
     {
-      e->value->assign (in);
-      return (e->value);
+      e->value.assign (in);
+      return &(e->value);
     }
   else
     {
       e = new Entry;
-      e->name->assign (name);
-      e->value->assign (in);
+      e->name.assign (name);
+      e->value.assign (in);
       other.put (key, e);
     }
 
diff --git a/myserver/src/protocol/http/http_headers.cpp b/myserver/src/protocol/http/http_headers.cpp
index 4145db7..7899815 100644
--- a/myserver/src/protocol/http/http_headers.cpp
+++ b/myserver/src/protocol/http/http_headers.cpp
@@ -75,7 +75,7 @@ u_long HttpHeaders::buildHTTPResponseHeader (char *str,
        */
       HttpResponseHeader::Entry *e = response->other.get ("transfer-encoding");
 
-      if (!e || (e && e->value->find ("chunked", 0) == string::npos ))
+      if (!e || (e && e->value.find ("chunked", 0) == string::npos ))
         {
           pos += myserver_strlcpy (pos, "Content-length: ", MAX - (long)(pos - str));
           pos += myserver_strlcpy (pos, response->contentLength.c_str (),
@@ -89,9 +89,9 @@ u_long HttpHeaders::buildHTTPResponseHeader (char *str,
   for (; it != response->other.end (); it++)
     {
       HttpResponseHeader::Entry *e = *it;
-      pos += myserver_strlcpy (pos, e->name->c_str (), MAX - (long)(pos - str));
+      pos += myserver_strlcpy (pos, e->name.c_str (), MAX - (long)(pos - str));
       pos += myserver_strlcpy (pos, ": ", MAX - (long)(pos - str));
-      pos += myserver_strlcpy (pos, e->value->c_str (), MAX - (long)(pos - str));
+      pos += myserver_strlcpy (pos, e->value.c_str (), MAX - (long)(pos - str));
       pos += myserver_strlcpy (pos, "\r\n", MAX - (long)(pos - str));
     }
 
@@ -181,10 +181,10 @@ u_long HttpHeaders::buildHTTPRequestHeader (char * str,
         HttpRequestHeader::Entry *e = *it;
         if (e)
           {
-            pos += myserver_strlcpy (pos, e->name->c_str (),
+            pos += myserver_strlcpy (pos, e->name.c_str (),
                                      MAX - (long)(pos - str));
             pos += myserver_strlcpy (pos, ": ", MAX - (long)(pos - str));
-            pos += myserver_strlcpy (pos, e->value->c_str (),
+            pos += myserver_strlcpy (pos, e->value.c_str (),
                                      MAX - (long)(pos - str));
             pos += myserver_strlcpy (pos, "\r\n", MAX - (long)(pos - str));
           }
@@ -580,18 +580,18 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char *input,
           HttpRequestHeader::Entry *old = request->other.get (cmdStr);
           if (old)
             {
-              old->value->append (", ");
-              old->value->append (token,
+              old->value.append (", ");
+              old->value.append (token,
                              std::min (static_cast<int>(HTTP_RESPONSE_OTHER_DIM
-                                                        - old->value->length ()),
+                                                        - old->value.length ()),
                                        static_cast<int>(tokenOff)));
             }
           else
             {
               HttpRequestHeader::Entry *e = new HttpRequestHeader::Entry ();
-              e->name->assign (cmdStr.c_str (),
+              e->name.assign (cmdStr.c_str (),
                                std::min (HTTP_RESPONSE_OTHER_DIM, tokenOff));
-              e->value->assign (token, std::min (HTTP_RESPONSE_OTHER_DIM,
+              e->value.assign (token, std::min (HTTP_RESPONSE_OTHER_DIM,
                                                  tokenOff));
               request->other.put (cmdStr, e);
             }
@@ -1064,23 +1064,23 @@ int HttpHeaders::buildHTTPResponseHeaderStruct (const char *input,
 
             HttpResponseHeader::Entry *old = NULL;
             HttpResponseHeader::Entry *e = new HttpResponseHeader::Entry ();
-            e->name->assign (command);
-            transform (e->name->begin (), e->name->end (), e->name->begin (),
+            e->name.assign (command);
+            transform (e->name.begin (), e->name.end (), e->name.begin (),
                        ::tolower);
-            old = response->other.put (*e->name, e);
+            old = response->other.put (e->name, e);
             if (old)
               {
                 if (append)
                   {
-                    e->value->assign (*old->value);
-                    e->value->append (", ");
+                    e->value.assign (old->value);
+                    e->value.append (", ");
                   }
 
-                e->value->append (token);
+                e->value.append (token);
                 delete old;
               }
             else
-              e->value->assign (token);
+              e->value.assign (token);
           }
       }
     token = strtok (NULL, cmdSeps);
diff --git a/myserver/src/protocol/http/http_request.cpp b/myserver/src/protocol/http/http_request.cpp
index 9249d8b..572aa34 100644
--- a/myserver/src/protocol/http/http_request.cpp
+++ b/myserver/src/protocol/http/http_request.cpp
@@ -85,7 +85,7 @@ bool HttpRequestHeader::isKeepAlive ()
 {
   Entry *connection = other.get ("connection");
   if (connection)
-    return (! stringcmpi (*connection->value,
+    return (! stringcmpi (connection->value,
                           "keep-alive"));
 
   return false;



commit b8bef11fab3a916f0eaee8602ac88e3c2f9537a2
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon May 10 11:03:59 2010 +0200

    Use the gnulib `git-version-gen' module.

diff --git a/myserver/Makefile.am b/myserver/Makefile.am
index 6d7794f..b69052d 100644
--- a/myserver/Makefile.am
+++ b/myserver/Makefile.am
@@ -26,10 +26,19 @@ SUBDIRS = lib po include src $(CONTROL) binaries $(DOCS) $(TESTS_DIR)
 
 include_HEADERS = myserver.h
 
-EXTRA_DIST = doxygen SConstruct
+EXTRA_DIST = doxygen SConstruct .version
 
 ACLOCAL_AMFLAGS = -I m4
 
+BUILT_SOURCES = .version
+.version:
+	$(AM_V_GEN)echo $(VERSION) > $@-t && mv $@-t $@
+
+# Arrange so that .tarball-version appears only in the distribution
+# tarball, and never in a checked-out repository.
+dist-hook:
+	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
+
 localedir.h: Makefile
 	echo '/* This file is auto-generated by Makefile!  */' >$@
 	echo '#define LOCALEDIR "$(localedir)"' >> $@
diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index c376756..7d6802d 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -41,6 +41,7 @@ getsockname
 getsockopt
 gettext
 gettimeofday
+git-version-gen
 ioctl
 listen
 malloc
diff --git a/myserver/configure.ac b/myserver/configure.ac
index ac0f690..af0fc26 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -17,7 +17,9 @@ dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([GNU MyServer],[m4_esyscmd(cat version)],[bug-myserver@gnu.org])
+AC_INIT([GNU MyServer],
+m4_esyscmd([build-aux/git-version-gen .tarball-version]),
+[bug-myserver@gnu.org])
 AC_PREREQ(2.65)
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_HEADERS([config.h])

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

Summary of changes:
 myserver/Makefile.am                              |   11 ++-
 myserver/bootstrap.conf                           |    9 ++
 myserver/configure.ac                             |    4 +-
 myserver/include/protocol/http/http_header.h      |   17 +--
 myserver/src/base/xml/xml_parser.cpp              |   70 +++++++---
 myserver/src/conf/security/security_cache.cpp     |  152 ++++++++++----------
 myserver/src/http_handler/http_dir/http_dir.cpp   |    8 +-
 myserver/src/http_handler/http_file/http_file.cpp |   40 +++---
 myserver/src/http_handler/isapi/isapi.cpp         |   44 +++---
 myserver/src/http_handler/proxy/proxy.cpp         |    9 +-
 myserver/src/http_handler/wincgi/wincgi.cpp       |   14 +-
 myserver/src/protocol/http/env/env.cpp            |    6 +-
 myserver/src/protocol/http/http.cpp               |   32 ++--
 myserver/src/protocol/http/http_data_handler.cpp  |    8 +-
 myserver/src/protocol/http/http_data_read.cpp     |   12 +-
 myserver/src/protocol/http/http_header.cpp        |   12 +-
 myserver/src/protocol/http/http_headers.cpp       |   34 +++---
 myserver/src/protocol/http/http_request.cpp       |    2 +-
 18 files changed, 261 insertions(+), 223 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Tue May 11 06:41:28 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBmu0-0003nB-MZ
	for mharc-myserver-commit@gnu.org; Tue, 11 May 2010 06:41:28 -0400
Received: from [140.186.70.92] (port=47585 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBmtx-0003lX-JJ
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:41:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1OBmtv-000378-Aw
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:41:25 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:43235)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1OBmtv-00036q-3G
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:41:23 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o4BAfKCN013637
	for <myserver-commit@gnu.org>; Tue, 11 May 2010 12:41:20 +0200
Message-Id: <201005111041.o4BAfKCN013637@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Tue, 11 May 2010 12:41:20 +0200
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
X-Hydra-Instance: hydra
X-Hydra-Project: gnu
X-Hydra-Jobset: myserver-master
X-Hydra-Job: build
Date: Tue, 11 May 2010 12:41:20 +0200
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:build build 404303:
 Failed with non-zero exit code
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 May 2010 10:41:27 -0000

Hi,

This is to let you know that Hydra build 404303 of job gnu:myserver-master:build has changed from 'Success' to 'Failed with non-zero exit code'.

Complete build information can be found on this page: http://hydra.nixos.org/build/404303

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 404303
Nix name:              | myserver-UNKNOWN
Short description:     | Native Nix build on i686-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | i686-linux
Derivation store path: | /nix/store/g79rvjvfnq48s4p8n3pmk0i36s6x340m-myserver-UNKNOWN.drv
Output store path:     | /nix/store/iaq3qj49iqxwb2wir0x3hj0sfn6qll6w-myserver-UNKNOWN
Time added:            | 2010-05-11 12:41:20
Build started:         | 2010-05-11 12:38:12
Build finished:        | 2010-05-11 12:41:20
Duration:              | 188s

The build inputs were:

Name        | Type   | Value
------------+--------+-------------------------------------------------------------
hydraConfig | svn    | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:21705
nixpkgs     | svn    | https://svn.nixos.org/repos/nix/nixpkgs/trunk:21717
system      | string | i686-linux
tarball     | build  | 404300

Regards,

The Hydra build daemon.

---
TestUtility::testGetTicks. : OK
TestUtility::testCWD. : OK
TestValidator::testGetPermissionMask. : OK
TestValidator::testGetPermissionMaskImpl. : OK
TestValidator::testGetValue. : OK
TestValidatorFactory::testGetValidator. : OK
TestValidatorFactory::testAddValidator. : OK
TestValidatorFactory::testIsValidatorPresent. : OK
TestXml::testOpenMemBuf. : OK
TestXml::testXPath. : OK
TestXmlMainConfiguration::testOpen. : OK
TestXmlMainConfiguration::testGetDoc. : OK
TestXmlMainConfiguration::testGetValue. : OK
TestXmlMainConfiguration::testClose. : OK
TestXmlValidator::testGetPermissionMask. : OK
TestXmlValidator::testGetPermissionMaskImpl. : OK
TestXmlValidator::testGetValue. : OK



!!!FAILURES!!!
Test Results:
Run:  276   Failures: 1   Errors: 2


1) test: TestUnixSocket::testBind (F) line: 104 test_unix_socket.cpp
assertion failed
- Expression: ret


2) test: TestUnixSocket::testClient (E)
uncaught exception of type FileNotFoundException
- No such file or directory


3) test: TestUnixSocket::testReadWriteHandle (E)
uncaught exception of type FileNotFoundException
- No such file or directory


make[2]: *** [check-am] Error 1
make[2]: Leaving directory `/tmp/nix-build-g79rvjvfnq48s4p8n3pmk0i36s6x340m-myserver-UNKNOWN.drv-0/myserver-UNKNOWN/tests'
[q[qmake[1]: *** [check-recursive] Error 1
make[1]: Leaving directory `/tmp/nix-build-g79rvjvfnq48s4p8n3pmk0i36s6x340m-myserver-UNKNOWN.drv-0/myserver-UNKNOWN'
[q[qmake: *** [check] Error 2
[q[q[qbuild time elapsed:  0m0.022s 0m0.008s 2m19.546s 0m36.363s
builder for `/nix/store/g79rvjvfnq48s4p8n3pmk0i36s6x340m-myserver-UNKNOWN.drv' failed with exit code 2
error: build of `/nix/store/g79rvjvfnq48s4p8n3pmk0i36s6x340m-myserver-UNKNOWN.drv' failed
Shared connection to kenny closed.

build of `/nix/store/g79rvjvfnq48s4p8n3pmk0i36s6x340m-myserver-UNKNOWN.drv' on `buildfarm@kenny' failed with exit code 256


From MAILER-DAEMON Tue May 11 06:41:31 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBmu2-0003p8-UG
	for mharc-myserver-commit@gnu.org; Tue, 11 May 2010 06:41:31 -0400
Received: from [140.186.70.92] (port=47620 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBmu0-0003n6-Is
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:41:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1OBmtv-00037D-BI
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:41:28 -0400
Received: from proliant.st.ewi.tudelft.nl ([130.161.158.3]:43234)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <e.dolstra@tudelft.nl>) id 1OBmtv-00036o-3C
	for myserver-commit@gnu.org; Tue, 11 May 2010 06:41:23 -0400
Received: from hydra (buildfarm.st.ewi.tudelft.nl [130.161.158.181])
	by proliant.st.ewi.tudelft.nl (8.12.11/8.12.8) with SMTP id
	o4BAfKnc013636
	for <myserver-commit@gnu.org>; Tue, 11 May 2010 12:41:20 +0200
Message-Id: <201005111041.o4BAfKnc013636@proliant.st.ewi.tudelft.nl>
Received: by hydra (sSMTP sendmail emulation); Tue, 11 May 2010 12:41:20 +0200
To: myserver-commit@gnu.org
From: Hydra Build Daemon <e.dolstra@tudelft.nl>
X-Hydra-Instance: hydra
X-Hydra-Project: gnu
X-Hydra-Jobset: myserver-master
X-Hydra-Job: build
Date: Tue, 11 May 2010 12:41:20 +0200
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6
Subject: [myserver-commit] Hydra job gnu:myserver-master:build build 404301:
 Failed with non-zero exit code
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 May 2010 10:41:29 -0000

Hi,

This is to let you know that Hydra build 404301 of job gnu:myserver-master:build has changed from 'Success' to 'Failed with non-zero exit code'.

Complete build information can be found on this page: http://hydra.nixos.org/build/404301

The last 50 lines of the build log are shown at the bottom of this email.

A summary of the build information follows:

Build ID:              | 404301
Nix name:              | myserver-UNKNOWN
Short description:     | Native Nix build on x86_64-linux
Maintainer(s):         | myserver-commit@gnu.org
System:                | x86_64-linux
Derivation store path: | /nix/store/n85hmsx288d7jq0ay28yvnynwgk4rb81-myserver-UNKNOWN.drv
Output store path:     | /nix/store/wrizxz8gmplbh7qszrcx3n83y9hhzxsk-myserver-UNKNOWN
Time added:            | 2010-05-11 12:41:20
Build started:         | 2010-05-11 12:38:12
Build finished:        | 2010-05-11 12:41:20
Duration:              | 188s

The build inputs were:

Name        | Type   | Value
------------+--------+-------------------------------------------------------------
hydraConfig | svn    | https://svn.nixos.org/repos/nix/hydra-config/gnu/trunk:21705
nixpkgs     | svn    | https://svn.nixos.org/repos/nix/nixpkgs/trunk:21717
system      | string | x86_64-linux
tarball     | build  | 404300

Regards,

The Hydra build daemon.

---
TestUtility::testGetTicks. : OK
TestUtility::testCWD. : OK
TestValidator::testGetPermissionMask. : OK
TestValidator::testGetPermissionMaskImpl. : OK
TestValidator::testGetValue. : OK
TestValidatorFactory::testGetValidator. : OK
TestValidatorFactory::testAddValidator. : OK
TestValidatorFactory::testIsValidatorPresent. : OK
TestXml::testOpenMemBuf. : OK
TestXml::testXPath. : OK
TestXmlMainConfiguration::testOpen. : OK
TestXmlMainConfiguration::testGetDoc. : OK
TestXmlMainConfiguration::testGetValue. : OK
TestXmlMainConfiguration::testClose. : OK
TestXmlValidator::testGetPermissionMask. : OK
TestXmlValidator::testGetPermissionMaskImpl. : OK
TestXmlValidator::testGetValue. : OK



!!!FAILURES!!!
Test Results:
Run:  276   Failures: 1   Errors: 2


1) test: TestUnixSocket::testBind (F) line: 104 test_unix_socket.cpp
assertion failed
- Expression: ret


2) test: TestUnixSocket::testClient (E)
uncaught exception of type FileNotFoundException
- No such file or directory


3) test: TestUnixSocket::testReadWriteHandle (E)
uncaught exception of type FileNotFoundException
- No such file or directory


make[2]: *** [check-am] Error 1
make[2]: Leaving directory `/tmp/nix-build-n85hmsx288d7jq0ay28yvnynwgk4rb81-myserver-UNKNOWN.drv-0/myserver-UNKNOWN/tests'
[q[qmake[1]: *** [check-recursive] Error 1
make[1]: Leaving directory `/tmp/nix-build-n85hmsx288d7jq0ay28yvnynwgk4rb81-myserver-UNKNOWN.drv-0/myserver-UNKNOWN'
[q[qmake: *** [check] Error 2
[q[q[qbuild time elapsed:  0m0.017s 0m0.012s 2m17.607s 0m42.978s
builder for `/nix/store/n85hmsx288d7jq0ay28yvnynwgk4rb81-myserver-UNKNOWN.drv' failed with exit code 2
error: build of `/nix/store/n85hmsx288d7jq0ay28yvnynwgk4rb81-myserver-UNKNOWN.drv' failed
Shared connection to stan closed.

build of `/nix/store/n85hmsx288d7jq0ay28yvnynwgk4rb81-myserver-UNKNOWN.drv' on `buildfarm@stan' failed with exit code 256


From MAILER-DAEMON Tue May 11 08:23:36 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OBoUq-0004ms-39
	for mharc-myserver-commit@gnu.org; Tue, 11 May 2010 08:23:36 -0400
Received: from [140.186.70.92] (port=57292 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OBoUl-0004Sq-6n
	for myserver-commit@gnu.org; Tue, 11 May 2010 08:23:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBoUV-000279-EB
	for myserver-commit@gnu.org; Tue, 11 May 2010 08:23:16 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:57008
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBoUV-000271-Au
	for myserver-commit@gnu.org; Tue, 11 May 2010 08:23:15 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OBoUU-00033x-QE
	for myserver-commit@gnu.org; Tue, 11 May 2010 12:23:14 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OBoUU-0008SN-Ji
	for myserver-commit@gnu.org; Tue, 11 May 2010 12:23:14 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: aaa3953a513a54cf43d28e4ec8b718703c868570
X-Git-Newrev: 17673a34336b925fa10a30f98331d60efe2891b2
Message-Id: <E1OBoUU-0008SN-Ji@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Tue, 11 May 2010 12:23:14 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-229-g17673a3
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Tue, 11 May 2010 12:23:34 -0000

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  17673a34336b925fa10a30f98331d60efe2891b2 (commit)
      from  aaa3953a513a54cf43d28e4ec8b718703c868570 (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 17673a34336b925fa10a30f98331d60efe2891b2
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Tue May 11 12:52:56 2010 +0200

    Rewrite the workaround to be usable in a distribution tarball.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 3cf34ee..357d393 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -86,5 +86,8 @@ gnulib_extra_files="
 # as the bug is fixed.
 bootstrap_epilogue()
 {
-        sed -i -e"s|test -d .git|true|" build-aux/git-version-gen
+        sed -i \
+        -e's@test -d .git@(test -n "$(git log -z -n1 .)") > /dev/null 2>\&1@' \
+                  build-aux/git-version-gen
+        autoreconf -f
 }

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

Summary of changes:
 myserver/bootstrap.conf |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Wed May 12 04:18:24 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OC796-0001QD-8F
	for mharc-myserver-commit@gnu.org; Wed, 12 May 2010 04:18:24 -0400
Received: from [140.186.70.92] (port=48873 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OC792-0001PB-IW
	for myserver-commit@gnu.org; Wed, 12 May 2010 04:18:21 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OC791-0000tE-DR
	for myserver-commit@gnu.org; Wed, 12 May 2010 04:18:20 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:44209
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OC791-0000tA-Bh
	for myserver-commit@gnu.org; Wed, 12 May 2010 04:18:19 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OC790-00012k-Sf
	for myserver-commit@gnu.org; Wed, 12 May 2010 08:18:18 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OC78y-00066b-VK
	for myserver-commit@gnu.org; Wed, 12 May 2010 08:18:18 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 17673a34336b925fa10a30f98331d60efe2891b2
X-Git-Newrev: 6ba713c332131f33796539a9ee504cdef6a51bb1
Message-Id: <E1OC78y-00066b-VK@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Wed, 12 May 2010 08:18:18 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-230-g6ba713c
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 12 May 2010 08:18:21 -0000

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  6ba713c332131f33796539a9ee504cdef6a51bb1 (commit)
      from  17673a34336b925fa10a30f98331d60efe2891b2 (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 6ba713c332131f33796539a9ee504cdef6a51bb1
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Wed May 12 10:18:38 2010 +0200

    Avoid some memory allocations.

diff --git a/myserver/include/connection/connection.h b/myserver/include/connection/connection.h
index c18eb09..eb7360e 100644
--- a/myserver/include/connection/connection.h
+++ b/myserver/include/connection/connection.h
@@ -131,11 +131,11 @@ public:
   /*! Check if the connection/connection.has a continuation.  */
   bool hasContinuation (){return continuation ? true : false;}
 
-  MemBuf *getConnectionBuffer (){return connectionBuffer;}
+  MemBuf *getConnectionBuffer (){return &connectionBuffer;}
 protected:
 
   /*! This buffer must be used only by the ClientsTHREAD class.  */
-  MemBuf *connectionBuffer;
+  MemBuf connectionBuffer;
 
   ClientsThread *thread;
 
@@ -152,19 +152,19 @@ protected:
   u_short port;
 
   /*! Login name.  */
-  string *login;
+  string login;
 
   /*! Password used to log in.  */
-  string *password;
+  string password;
 
   /*! # of tries for an authorized login.  */
   char nTries;
 
   /*! Remote IP address.  */
-  string *ipAddr;
+  string ipAddr;
 
   /*! Local IP used to connect to.  */
-  string *localIpAddr;
+  string localIpAddr;
 
   /*! Local port used to connect to.  */
   u_short localPort;
diff --git a/myserver/src/connection/connection.cpp b/myserver/src/connection/connection.cpp
index 5091544..be457e4 100644
--- a/myserver/src/connection/connection.cpp
+++ b/myserver/src/connection/connection.cpp
@@ -28,10 +28,6 @@ void Connection::init ()
 {
   thread = 0;
   scheduled = 0;
-  login = new string ();
-  password = new string ();
-  ipAddr = new string ();
-  localIpAddr = new string ();
   nTries = 0;
   port = 0;
   localPort = 0;
@@ -43,7 +39,6 @@ void Connection::init ()
   socket = NULL;
   priority = -1;
   continuation = NULL;
-	connectionBuffer = new MemBuf ();
 }
 
 /*!
@@ -65,21 +60,6 @@ void Connection::destroy ()
         }
     }
 
-  if (login)
-    delete login;
-
-  if (password)
-    delete password;
-
-  if (ipAddr)
-    delete ipAddr;
-
-  if (localIpAddr)
-    delete localIpAddr;
-
-  if (connectionBuffer)
-    delete connectionBuffer;
-
   if (protocolBuffer)
     delete protocolBuffer;
 
@@ -87,12 +67,7 @@ void Connection::destroy ()
   if (host)
     ((Vhost*) host)->removeRef ();
 
-  login = NULL;
-  password = NULL;
-  ipAddr = NULL;
-  localIpAddr = NULL;
   protocolBuffer = NULL;
-  connectionBuffer = NULL;
 
   host = NULL;
 }
@@ -167,7 +142,7 @@ void Connection::setPort (u_short newPort)
  */
 const char* Connection::getLogin ()
 {
-  return login->c_str ();
+  return login.c_str ();
 }
 
 /*!
@@ -176,7 +151,7 @@ const char* Connection::getLogin ()
  */
 void Connection::setLogin (const char* loginName)
 {
-  login->assign (loginName);
+  login.assign (loginName);
 }
 
 /*!
@@ -208,7 +183,7 @@ void Connection::incnTries ()
  */
 const char* Connection::getIpAddr ()
 {
-  return ipAddr->c_str ();
+  return ipAddr.c_str ();
 }
 
 /*!
@@ -217,7 +192,7 @@ const char* Connection::getIpAddr ()
  */
 void Connection::setIpAddr (const char* na)
 {
-  ipAddr->assign (na);
+  ipAddr.assign (na);
 }
 
 /*!
@@ -225,7 +200,7 @@ void Connection::setIpAddr (const char* na)
  */
 const char* Connection::getLocalIpAddr ()
 {
-  return localIpAddr->c_str ();
+  return localIpAddr.c_str ();
 }
 
 /*!
@@ -234,7 +209,7 @@ const char* Connection::getLocalIpAddr ()
  */
 void Connection::setLocalIpAddr (const char* na)
 {
-  localIpAddr->assign (na);
+  localIpAddr.assign (na);
 }
 
 /*!
@@ -309,7 +284,7 @@ void Connection::setForceControl (int fp)
  */
 const char* Connection::getPassword ()
 {
-  return password->c_str ();
+  return password.c_str ();
 }
 
 /*!
@@ -318,7 +293,7 @@ const char* Connection::getPassword ()
  */
 void Connection::setPassword (const char* p)
 {
-  password->assign (p);
+  password.assign (p);
 }
 
 /*!

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

Summary of changes:
 myserver/include/connection/connection.h |   12 ++++----
 myserver/src/connection/connection.cpp   |   41 ++++++------------------------
 2 files changed, 14 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Thu May 13 18:39:56 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OCh4O-0007E6-NJ
	for mharc-myserver-commit@gnu.org; Thu, 13 May 2010 18:39:56 -0400
Received: from [140.186.70.92] (port=52621 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OCh4M-0007Dw-EG
	for myserver-commit@gnu.org; Thu, 13 May 2010 18:39:55 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCh4L-00024S-7H
	for myserver-commit@gnu.org; Thu, 13 May 2010 18:39:54 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:38671
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCh4L-00024O-5X
	for myserver-commit@gnu.org; Thu, 13 May 2010 18:39:53 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCh4K-0003Pa-V8
	for myserver-commit@gnu.org; Thu, 13 May 2010 22:39:52 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OCh4J-0005bY-DC
	for myserver-commit@gnu.org; Thu, 13 May 2010 22:39:52 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6ba713c332131f33796539a9ee504cdef6a51bb1
X-Git-Newrev: d8f39d2f66322b9acf6494470db2e3955bd5d3c4
Message-Id: <E1OCh4J-0005bY-DC@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 13 May 2010 22:39:52 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-232-gd8f39d2
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 13 May 2010 22:39:56 -0000

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  d8f39d2f66322b9acf6494470db2e3955bd5d3c4 (commit)
       via  07f5940df93fb1682c1957412a25dae50103d862 (commit)
      from  6ba713c332131f33796539a9ee504cdef6a51bb1 (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 d8f39d2f66322b9acf6494470db2e3955bd5d3c4
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu May 13 15:36:22 2010 -0700

    Don't assume the errno value.

diff --git a/myserver/tests/test_exceptions.cpp b/myserver/tests/test_exceptions.cpp
index d5e628f..1a983d4 100644
--- a/myserver/tests/test_exceptions.cpp
+++ b/myserver/tests/test_exceptions.cpp
@@ -84,19 +84,19 @@ public:
 
   void testWrongCwd ()
   {
+    bool success = false;
     try
       {
         char *p = checked::getcwd (buf, 1);
         CPPUNIT_FAIL ("The exception in testWrongCwd wasn't thrown or caught");
       }
-    catch (OverflowException& e)
-      {
-        CPPUNIT_ASSERT (e.getErrno () == ERANGE);
-      }
     catch (...)
       {
-        CPPUNIT_FAIL ("The wrong exception in testWrongCwd was thrown");
+	success = true;
       }
+
+    if (! success)
+      CPPUNIT_FAIL ("No exception was thrown!");
   }
 };
 



commit 07f5940df93fb1682c1957412a25dae50103d862
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu May 13 15:30:51 2010 -0700

    Remove a test that cause a segfault under FreeBSD.

diff --git a/myserver/tests/test_exceptions.cpp b/myserver/tests/test_exceptions.cpp
index 362ba48..d5e628f 100644
--- a/myserver/tests/test_exceptions.cpp
+++ b/myserver/tests/test_exceptions.cpp
@@ -31,7 +31,6 @@ using namespace std;
 class TestExceptions : public CppUnit::TestFixture
 {
   CPPUNIT_TEST_SUITE ( TestExceptions );
-  CPPUNIT_TEST (testWrongCloseDir);
   CPPUNIT_TEST (testWrongCwd);
   CPPUNIT_TEST (testErrno);
   CPPUNIT_TEST (testGetBacktrace);
@@ -49,23 +48,6 @@ public:
 
   void tearDown () {}
 
-  void testWrongCloseDir ()
-  {
-    try
-      {
-        checked::closedir (foodir);
-        CPPUNIT_FAIL ("The exception in testWrongCloseDir wasn't thrown or caught");
-      }
-    catch (ArgumentListException& e)
-      {
-        CPPUNIT_ASSERT (e.getErrno () == EINVAL);
-      }
-    catch (...)
-      {
-        CPPUNIT_FAIL ("The wrong exception in testWrongCloseDir was thrown");
-      }
-  }
-
   void testGetBacktrace ()
   {
     try

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

Summary of changes:
 myserver/tests/test_exceptions.cpp |   28 +++++-----------------------
 1 files changed, 5 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Fri May 14 05:18:20 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OCr2C-0004AA-4K
	for mharc-myserver-commit@gnu.org; Fri, 14 May 2010 05:18:20 -0400
Received: from [140.186.70.92] (port=47474 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OCr28-00048U-DR
	for myserver-commit@gnu.org; Fri, 14 May 2010 05:18:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCr27-00023A-55
	for myserver-commit@gnu.org; Fri, 14 May 2010 05:18:16 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:40425
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCr27-000236-3b
	for myserver-commit@gnu.org; Fri, 14 May 2010 05:18:15 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCr27-0002fS-0T
	for myserver-commit@gnu.org; Fri, 14 May 2010 09:18:15 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OCr26-0004MJ-S6
	for myserver-commit@gnu.org; Fri, 14 May 2010 09:18:14 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d8f39d2f66322b9acf6494470db2e3955bd5d3c4
X-Git-Newrev: 591368cdf5330118e50132449cc92dcbf87b846c
Message-Id: <E1OCr26-0004MJ-S6@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 14 May 2010 09:18:14 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-234-g591368c
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 14 May 2010 09:18:18 -0000

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  591368cdf5330118e50132449cc92dcbf87b846c (commit)
       via  7f5eb82b2a470ca2481f3235e971c3f5a9c7669c (commit)
      from  d8f39d2f66322b9acf6494470db2e3955bd5d3c4 (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 591368cdf5330118e50132449cc92dcbf87b846c
Merge: 7f5eb82 d8f39d2
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri May 14 11:18:28 2010 +0200

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




commit 7f5eb82b2a470ca2481f3235e971c3f5a9c7669c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri May 14 10:27:08 2010 +0200

    Assign directly the header name without check its length.

diff --git a/myserver/src/protocol/http/http_headers.cpp b/myserver/src/protocol/http/http_headers.cpp
index 7899815..491be23 100644
--- a/myserver/src/protocol/http/http_headers.cpp
+++ b/myserver/src/protocol/http/http_headers.cpp
@@ -589,8 +589,7 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char *input,
           else
             {
               HttpRequestHeader::Entry *e = new HttpRequestHeader::Entry ();
-              e->name.assign (cmdStr.c_str (),
-                               std::min (HTTP_RESPONSE_OTHER_DIM, tokenOff));
+              e->name = cmdStr;
               e->value.assign (token, std::min (HTTP_RESPONSE_OTHER_DIM,
                                                  tokenOff));
               request->other.put (cmdStr, e);

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

Summary of changes:
 myserver/src/protocol/http/http_headers.cpp |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Fri May 14 05:44:52 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OCrRr-0006sz-U8
	for mharc-myserver-commit@gnu.org; Fri, 14 May 2010 05:44:52 -0400
Received: from [140.186.70.92] (port=47842 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OCrRc-0006i3-Ab
	for myserver-commit@gnu.org; Fri, 14 May 2010 05:44:48 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCrRV-00050m-5k
	for myserver-commit@gnu.org; Fri, 14 May 2010 05:44:30 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36638
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCrRV-00050e-46
	for myserver-commit@gnu.org; Fri, 14 May 2010 05:44:29 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OCrRU-0002yE-FK
	for myserver-commit@gnu.org; Fri, 14 May 2010 09:44:28 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OCrRU-00031z-Df
	for myserver-commit@gnu.org; Fri, 14 May 2010 09:44:28 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 591368cdf5330118e50132449cc92dcbf87b846c
X-Git-Newrev: 18bd00e098058f1b357fe1119dfca1ffc1a4744b
Message-Id: <E1OCrRU-00031z-Df@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 14 May 2010 09:44:28 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-236-g18bd00e
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 14 May 2010 09:44:49 -0000

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  18bd00e098058f1b357fe1119dfca1ffc1a4744b (commit)
       via  00ad7d08569912e564e557fbab291fd2d1ed5ec8 (commit)
      from  591368cdf5330118e50132449cc92dcbf87b846c (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 18bd00e098058f1b357fe1119dfca1ffc1a4744b
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri May 14 11:45:11 2010 +0200

    bootstrap: ensure gnulib_path is not empty.

diff --git a/myserver/bootstrap b/myserver/bootstrap
index 688c74d..b74bc0b 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -425,7 +425,7 @@ case ${GNULIB_SRCDIR--} in
 
     trap cleanup_gnulib 1 2 13 15
 
-    git clone -h|grep -- --depth 2>&1 > /dev/null \
+    git clone 2>&1 -h|grep -- --depth > /dev/null \
         && shallow='--depth 2'|| shallow=
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib



commit 00ad7d08569912e564e557fbab291fd2d1ed5ec8
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri May 14 11:44:07 2010 +0200

    bootstrap: ensure gnulib_path is not empty.

diff --git a/myserver/bootstrap b/myserver/bootstrap
index a9a778a..688c74d 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-04-30.16; # UTC
+scriptversion=2010-05-14.09; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -409,6 +409,7 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
+test -n "$gnulib_path" || gnulib_path="gnulib"
 
 # Get gnulib files.
 
@@ -424,7 +425,8 @@ case ${GNULIB_SRCDIR--} in
 
     trap cleanup_gnulib 1 2 13 15
 
-    git clone -h|grep -- --depth > /dev/null && shallow='--depth 2' || shallow=
+    git clone -h|grep -- --depth 2>&1 > /dev/null \
+        && shallow='--depth 2'|| shallow=
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib
 

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

Summary of changes:
 myserver/bootstrap |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Sat May 15 11:22:20 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ODJC0-0005cI-KO
	for mharc-myserver-commit@gnu.org; Sat, 15 May 2010 11:22:20 -0400
Received: from [140.186.70.92] (port=58222 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ODJBy-0005bs-UH
	for myserver-commit@gnu.org; Sat, 15 May 2010 11:22:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODJBx-0006uQ-O2
	for myserver-commit@gnu.org; Sat, 15 May 2010 11:22:18 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:36992
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODJBx-0006uM-L5
	for myserver-commit@gnu.org; Sat, 15 May 2010 11:22:17 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODJBx-0007Xd-7i
	for myserver-commit@gnu.org; Sat, 15 May 2010 15:22:17 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1ODJBt-000283-LM
	for myserver-commit@gnu.org; Sat, 15 May 2010 15:22:17 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 18bd00e098058f1b357fe1119dfca1ffc1a4744b
X-Git-Newrev: acffb7a7648a70a05a12649b173bc738cf0500e6
Message-Id: <E1ODJBt-000283-LM@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 15 May 2010 15:22:16 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-237-gacffb7a
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 15 May 2010 15:22:19 -0000

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  acffb7a7648a70a05a12649b173bc738cf0500e6 (commit)
      from  18bd00e098058f1b357fe1119dfca1ffc1a4744b (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 acffb7a7648a70a05a12649b173bc738cf0500e6
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat May 15 16:26:32 2010 +0200

    Add gnulib `getopt-gnu' module.

diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index 357d393..630df4d 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -35,6 +35,7 @@ connect
 c++defs
 fsync
 getcwd
+getopt-gnu
 getpeername
 gethostname
 getsockname

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

Summary of changes:
 myserver/bootstrap.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Sun May 16 07:26:28 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ODbzI-0002CL-LB
	for mharc-myserver-commit@gnu.org; Sun, 16 May 2010 07:26:28 -0400
Received: from [140.186.70.92] (port=59944 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ODbzF-0002C4-BA
	for myserver-commit@gnu.org; Sun, 16 May 2010 07:26:27 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODbzD-00042K-Dr
	for myserver-commit@gnu.org; Sun, 16 May 2010 07:26:25 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:41297
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODbzD-00042E-B8
	for myserver-commit@gnu.org; Sun, 16 May 2010 07:26:23 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODbzC-0005Ag-45
	for myserver-commit@gnu.org; Sun, 16 May 2010 11:26:22 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1ODbz8-0001qj-2Y
	for myserver-commit@gnu.org; Sun, 16 May 2010 11:26:22 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: acffb7a7648a70a05a12649b173bc738cf0500e6
X-Git-Newrev: d6791bead4a08d3aedfc6961ab2f111f291f06fd
Message-Id: <E1ODbz8-0001qj-2Y@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 16 May 2010 11:26:20 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-240-gd6791be
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 16 May 2010 11:26:27 -0000

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  d6791bead4a08d3aedfc6961ab2f111f291f06fd (commit)
       via  96182a5d07f6e341f332403303bd229d76a33d1a (commit)
       via  7c07c7987f544d60a9b29ed45be2a661f03582bc (commit)
      from  acffb7a7648a70a05a12649b173bc738cf0500e6 (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 d6791bead4a08d3aedfc6961ab2f111f291f06fd
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 16 13:22:24 2010 +0200

    Add a new argument mask to `File::openFile'.

diff --git a/myserver/include/base/file/file.h b/myserver/include/base/file/file.h
index efcdd96..fe38dfd 100644
--- a/myserver/include/base/file/file.h
+++ b/myserver/include/base/file/file.h
@@ -55,9 +55,9 @@ public:
   virtual int writeToFile (const char *, u_long , u_long *);
   virtual int createTemporaryFile (const char *, bool unlink = true);
 
-  virtual int openFile (const char *, u_long);
-  virtual int openFile (string const &file, u_long opt)
-  {return openFile (file.c_str (), opt);}
+  virtual int openFile (const char *, u_long, mode_t mask = 00700);
+  virtual int openFile (string const &file, u_long opt, mode_t mask = 00700)
+  {return openFile (file.c_str (), opt, mask);}
 
   virtual u_long getFileSize ();
   virtual int seek (u_long);
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index 53b8ae4..8b2ba64 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -127,13 +127,14 @@ void File::fstat (struct stat *fstat)
 }
 
 /*!
- *Open (or create if not exists) a file, but must explicitly use read and/or
- *write flags and open flag.
- *\param nfilename Filename to open.
- *\param opt Specify how open the file.
- *openFile returns 0 if the call was successful, any other value on errors.
+  Open (or create if not exists) a file, but must explicitly use read and/or
+  write flags and open flag.
+  \param nfilename Filename to open.
+  \param opt Specify how open the file.
+  \param mask Creation mode when a new file is created.
+  openFile returns 0 if the call was successful, any other value on errors.
  */
-int File::openFile (const char* nfilename, u_long opt)
+int File::openFile (const char* nfilename, u_long opt, mode_t mask)
 {
   int flags;
 



commit 96182a5d07f6e341f332403303bd229d76a33d1a
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 16 11:18:00 2010 +0200

    Save a `stat' when a file is opened.
    
    Remove FILE_CREATE_ALWAYS from the open flags.  It can be considered a
    duplicate for FILE_OPEN_ALWAYS.

diff --git a/myserver/include/base/file/file.h b/myserver/include/base/file/file.h
index a267e4b..efcdd96 100644
--- a/myserver/include/base/file/file.h
+++ b/myserver/include/base/file/file.h
@@ -42,9 +42,8 @@ public:
       FILE_OPEN_ALWAYS = (1 << 5),
       OPEN_IF_EXISTS = (1 << 6),
       APPEND = (1 << 7),
-      FILE_CREATE_ALWAYS = (1 << 8),
-      NO_INHERIT = (1 << 9),
-      NO_FOLLOW_SYMLINK = (1 << 10)
+      NO_INHERIT = (1 << 8),
+      NO_FOLLOW_SYMLINK = (1 << 9)
     };
 
   File ();
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index 530632b..53b8ae4 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -135,7 +135,6 @@ void File::fstat (struct stat *fstat)
  */
 int File::openFile (const char* nfilename, u_long opt)
 {
-  struct stat fStats;
   int flags;
 
   filename.assign (nfilename);
@@ -150,44 +149,22 @@ int File::openFile (const char* nfilename, u_long opt)
   if (opt & File::NO_FOLLOW_SYMLINK)
     flags = O_NOFOLLOW;
 
-  /* FIXME: how avoid a stat?  */
-  bool exists = stat (filename.c_str (), &fStats) == 0;
-  if (opt & File::OPEN_IF_EXISTS && !exists)
-    return 1;
-
-  if (exists && (opt & File::APPEND))
+  if (opt & File::APPEND)
     flags |= O_APPEND;
 
-  if (exists)
-    handle = checked::open (filename.c_str (), O_APPEND | flags);
-  else
-    handle = checked::open (filename.c_str (), O_CREAT | flags,
-                            S_IRUSR | S_IWUSR);
-
-  try
+  handle = gnulib::open (filename.c_str (), flags);
+  if (handle < 0)
     {
-      if (opt & File::FILE_CREATE_ALWAYS)
-        if (truncate ())
-          {
-            close ();
-            return -1;
-          }
- 
-      if (opt & File::TEMPORARY)
-        if (checked::unlink (filename.c_str ()))
-          {
-            close ();
-            return -1;
-          }
-    }
-  catch (exception &e)
-    {
-      /* Ensure the file is closed if something went wrong and don't leave
-         open descriptors around.  */
-      close ();
-      throw;
+      if (! ((errno == ENOENT) && (opt & File::FILE_OPEN_ALWAYS)))
+        checked::raiseException ();
+
+      flags |= O_CREAT;
+      handle = checked::open (filename.c_str (), flags, S_IRUSR | S_IWUSR);
     }
 
+  if (opt & File::TEMPORARY)
+    checked::unlink (filename.c_str ());
+
   this->opt = opt;
   return handle < 0;
 }
@@ -254,7 +231,7 @@ int File::createTemporaryFile (const char* filename, bool unlink)
   u_long temporaryOpt = unlink ? File::TEMPORARY : File::TEMPORARY_DELAYED;
 
   return openFile (filename, File::READ | File::WRITE | File::NO_INHERIT
-                   | File::FILE_CREATE_ALWAYS | temporaryOpt);
+                   | File::FILE_OPEN_ALWAYS | temporaryOpt);
 }
 
 /*!
diff --git a/myserver/src/base/file/files_utility.cpp b/myserver/src/base/file/files_utility.cpp
index 1151a35..09ede45 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -158,7 +158,7 @@ int FilesUtility::copyFile (const char* src, const char* dest, int overwrite)
     return -1;
 
   if (destFile.openFile (dest, File::WRITE
-                         | (overwrite ? File::FILE_CREATE_ALWAYS : 0)))
+                         | (overwrite ? File::FILE_OPEN_ALWAYS : 0)))
     {
       srcFile.close ();
       return -1;
diff --git a/myserver/src/http_handler/http_file/http_file.cpp b/myserver/src/http_handler/http_file/http_file.cpp
index 910827c..381e67f 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -77,7 +77,7 @@ int HttpFile::putFile (HttpThreadContext* td, string& filename)
         /* The file doesn't exist.  */
         try
           {
-            file.openFile (td->filenamePath.c_str (), File::FILE_CREATE_ALWAYS
+            file.openFile (td->filenamePath.c_str (), File::FILE_OPEN_ALWAYS
                            | File::WRITE | symFlags);
           }
         catch (exception & e)
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp b/myserver/src/http_handler/wincgi/wincgi.cpp
index 8c1345c..ac5f9cb 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -112,7 +112,7 @@ int WinCgi::send (HttpThreadContext* td, const char* scriptpath,
         }
 
       /* The WinCGI protocol uses a .ini file to send data to the new process.  */
-      DataFileHandle.openFile (dataFilePath, File::FILE_CREATE_ALWAYS
+      DataFileHandle.openFile (dataFilePath, File::FILE_OPEN_ALWAYS
                                | File::WRITE);
 
       td->auxiliaryBuffer->setLength (0);
@@ -237,7 +237,7 @@ int WinCgi::send (HttpThreadContext* td, const char* scriptpath,
        *Create the out file.
        */
       if (! FilesUtility::nodeExists (outFilePath))
-        OutFileHandle.openFile (outFilePath, File::FILE_CREATE_ALWAYS
+        OutFileHandle.openFile (outFilePath, File::FILE_OPEN_ALWAYS
                                 | File::WRITE);
 
       OutFileHandle.close ();
diff --git a/myserver/src/log/log_manager.cpp b/myserver/src/log/log_manager.cpp
index 492485b..84223bc 100644
--- a/myserver/src/log/log_manager.cpp
+++ b/myserver/src/log/log_manager.cpp
@@ -32,7 +32,7 @@
  * \param ff The FiltersFactory object.
  * \param level The default level of logging.
  */
-LogManager::LogManager (FiltersFactory* ff,LoggingLevel level) : level (level)
+LogManager::LogManager (FiltersFactory* ff, LoggingLevel level) : level (level)
 {
   this->ff = ff;
   lsf = new LogStreamFactory ();
diff --git a/myserver/src/protocol/ftp/ftp.cpp b/myserver/src/protocol/ftp/ftp.cpp
index 3652a61..8d3b972 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -1168,7 +1168,7 @@ DEFINE_THREAD (ReceiveAsciiFile, pParam)
       if (pWt->m_bappend)
         flags = File::APPEND | File::WRITE;
       else
-        flags = File::FILE_CREATE_ALWAYS | File::WRITE;
+        flags = File::FILE_OPEN_ALWAYS | File::WRITE;
       flags |= areSymlinkAllowed (pWt->st) ? 0 : File::NO_FOLLOW_SYMLINK;
 
       if (file.openFile (pWt->m_sFilePath.c_str (), flags))
@@ -1368,7 +1368,7 @@ DEFINE_THREAD (ReceiveImageFile, pParam)
       if (pWt->m_bappend)
         flags = File::APPEND | File::WRITE;
       else
-        flags = File::FILE_CREATE_ALWAYS | File::WRITE;
+        flags = File::FILE_OPEN_ALWAYS | File::WRITE;
       flags |= areSymlinkAllowed (pWt->st) ? 0 : File::NO_FOLLOW_SYMLINK;
 
       if (file.openFile (pWt->m_sFilePath.c_str (), flags))
diff --git a/myserver/src/protocol/http/http_data_read.cpp b/myserver/src/protocol/http/http_data_read.cpp
index 85fd7d3..39c0f35 100644
--- a/myserver/src/protocol/http/http_data_read.cpp
+++ b/myserver/src/protocol/http/http_data_read.cpp
@@ -298,7 +298,7 @@ int HttpDataRead::readPostData (HttpThreadContext* td, int* httpRetCode)
    *Create the file that contains the posted data.
    *This data is the stdin file in the CGI.
    */
-  if (td->inputData.openFile (td->inputDataPath, File::FILE_CREATE_ALWAYS |
+  if (td->inputData.openFile (td->inputDataPath, File::FILE_OPEN_ALWAYS |
                             File::READ |
                             File::WRITE))
   {
diff --git a/myserver/tests/test_file.cpp b/myserver/tests/test_file.cpp
index 0330020..caf0ec7 100644
--- a/myserver/tests/test_file.cpp
+++ b/myserver/tests/test_file.cpp
@@ -53,7 +53,7 @@ class TestFile : public CppUnit::TestFixture
   {
    return  tfile->openFile (fname.c_str (), File::WRITE
                             | File::READ
-                            | File::FILE_CREATE_ALWAYS);
+                            | File::FILE_OPEN_ALWAYS);
   }
 public:
   void setUp ()
diff --git a/myserver/tests/test_log_manager.cpp b/myserver/tests/test_log_manager.cpp
index df1fca1..c8927bf 100644
--- a/myserver/tests/test_log_manager.cpp
+++ b/myserver/tests/test_log_manager.cpp
@@ -227,7 +227,7 @@ public:
     File f;
     char buf[64];
     u_long nbr;
-    LogStream* ls;
+    LogStream* ls = NULL;
     list<string> cs;
     list<string>::iterator it;
     try
@@ -250,6 +250,7 @@ public:
     gotMessage1.assign (buf);
 
     lm->get (this, "test", "file://foobar", &ls);
+    CPPUNIT_ASSERT (ls);
     cs = ls->getCycledStreams ();
     for (it = cs.begin (); it != cs.end (); it++)
       {
@@ -406,7 +407,7 @@ public:
     u_long nbr = 0;
     list<string> cs;
     list<string>::iterator it;
-    LogStream* ls;
+    LogStream* ls = NULL;
 
     try
       {
@@ -429,6 +430,7 @@ public:
     gzipDecomp[message1.size ()] = '\0';
     gotMessage1.assign (gzipDecomp);
     lm->get (this, "test", "file://fooc", &ls);
+    CPPUNIT_ASSERT (ls);
     cs = ls->getCycledStreams ();
     for (it = cs.begin (); it != cs.end (); it++)
       {
diff --git a/myserver/tests/test_membuf_file.cpp b/myserver/tests/test_membuf_file.cpp
index 997792d..4de8401 100644
--- a/myserver/tests/test_membuf_file.cpp
+++ b/myserver/tests/test_membuf_file.cpp
@@ -84,7 +84,7 @@ public:
     const char *file = "tmp.dat";
     CPPUNIT_ASSERT_EQUAL (tfile->openFile (file, File::WRITE
                                            | File::READ
-                                           | File::FILE_CREATE_ALWAYS), -1);
+                                           | File::FILE_OPEN_ALWAYS), -1);
   }
 
   void testWrite ()
diff --git a/myserver/tests/test_socket_pair.cpp b/myserver/tests/test_socket_pair.cpp
index 509e409..fdb1c7e 100644
--- a/myserver/tests/test_socket_pair.cpp
+++ b/myserver/tests/test_socket_pair.cpp
@@ -86,7 +86,7 @@ public:
 
     FilesUtility::temporaryFileName (0, fname);
     file.openFile (fname.c_str (), File::WRITE | File::READ
-                   | File::FILE_CREATE_ALWAYS);
+                   | File::FILE_OPEN_ALWAYS);
     file.writeToFile (outputBuffer, bsize, &nbw);
     file.seek (0);
 
diff --git a/myserver/tests/test_ssl_socket.cpp b/myserver/tests/test_ssl_socket.cpp
index f54d831..012ae3e 100644
--- a/myserver/tests/test_ssl_socket.cpp
+++ b/myserver/tests/test_ssl_socket.cpp
@@ -115,11 +115,11 @@ public:
     u_long nbw;
     File f;
 
-    f.openFile (TESTSERVERKEY,  File::WRITE | File::FILE_CREATE_ALWAYS);
+    f.openFile (TESTSERVERKEY,  File::WRITE | File::FILE_OPEN_ALWAYS);
     f.writeToFile (serverKey, strlen (serverKey), &nbw);
     f.close ();
 
-    f.openFile (TESTSERVERPEM,  File::WRITE | File::FILE_CREATE_ALWAYS);
+    f.openFile (TESTSERVERPEM,  File::WRITE | File::FILE_OPEN_ALWAYS);
     f.writeToFile (serverPem, strlen (serverPem), &nbw);
     f.close ();
   }
diff --git a/myserver/tests/test_xml_main_configuration.cpp b/myserver/tests/test_xml_main_configuration.cpp
index 4a25c46..229dcfb 100644
--- a/myserver/tests/test_xml_main_configuration.cpp
+++ b/myserver/tests/test_xml_main_configuration.cpp
@@ -49,7 +49,7 @@ public:
   {
     u_long nbw;
     xmlFile.openFile (XML_FILE, File::WRITE | File::READ
-                      | File::FILE_CREATE_ALWAYS);
+                      | File::FILE_OPEN_ALWAYS);
     CPPUNIT_ASSERT_EQUAL (xmlFile.write (XML_CONTENT, strlen (XML_CONTENT),
                                            &nbw), 0);
     CPPUNIT_ASSERT_EQUAL (nbw, static_cast<u_long> (strlen (XML_CONTENT)));
@@ -65,10 +65,25 @@ public:
   void testOpen ()
   {
     XmlMainConfiguration tmpXmlConf;
-
-    /* These files don't exist.  */
-    CPPUNIT_ASSERT (tmpXmlConf.open ("foo/bar/baz.xml"));
-    CPPUNIT_ASSERT (tmpXmlConf.open ("baz.xml"));
+    int exceptions = 0;
+    try
+      {
+        tmpXmlConf.open ("baz.xml");
+      }
+    catch (exception & e)
+      {
+        exceptions++;
+      }
+    try
+      {
+        tmpXmlConf.open ("foo/bar/baz.xml");
+      }
+    catch (exception & e)
+      {
+        exceptions++;
+      }
+
+    CPPUNIT_ASSERT_EQUAL (exceptions, 2);
 
     CPPUNIT_ASSERT_EQUAL (tmpXmlConf.open (XML_FILE), 0);
     CPPUNIT_ASSERT_EQUAL (tmpXmlConf.close (), 0);



commit 7c07c7987f544d60a9b29ed45be2a661f03582bc
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 16 11:15:13 2010 +0200

    Use an enum for file opening flags.

diff --git a/myserver/include/base/file/file.h b/myserver/include/base/file/file.h
index df77f65..a267e4b 100644
--- a/myserver/include/base/file/file.h
+++ b/myserver/include/base/file/file.h
@@ -32,17 +32,20 @@ using namespace std;
 class File : public Stream
 {
 public:
-  static const u_long READ;
-  static const u_long WRITE;
-  static const u_long TEMPORARY_DELAYED;
-  static const u_long TEMPORARY;
-  static const u_long HIDDEN;
-  static const u_long FILE_OPEN_ALWAYS;
-  static const u_long OPEN_IF_EXISTS;
-  static const u_long APPEND;
-  static const u_long FILE_CREATE_ALWAYS;
-  static const u_long NO_INHERIT;
-  static const u_long NO_FOLLOW_SYMLINK;
+  enum
+    {
+      READ = (1 << 0),
+      WRITE = (1 << 1),
+      TEMPORARY = (1 << 2),
+      TEMPORARY_DELAYED = (1 << 3),
+      HIDDEN = (1 << 4),
+      FILE_OPEN_ALWAYS = (1 << 5),
+      OPEN_IF_EXISTS = (1 << 6),
+      APPEND = (1 << 7),
+      FILE_CREATE_ALWAYS = (1 << 8),
+      NO_INHERIT = (1 << 9),
+      NO_FOLLOW_SYMLINK = (1 << 10)
+    };
 
   File ();
   File (char *,int);
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index ceb65ac..530632b 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -50,19 +50,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace std;
 
-const u_long File::READ = (1 << 0);
-const u_long File::WRITE = (1 << 1);
-const u_long File::TEMPORARY = (1 << 2);
-const u_long File::TEMPORARY_DELAYED = (1 << 3);
-const u_long File::HIDDEN = (1 << 4);
-const u_long File::FILE_OPEN_ALWAYS = (1 << 5);
-const u_long File::OPEN_IF_EXISTS = (1 << 6);
-const u_long File::APPEND = (1 << 7);
-const u_long File::FILE_CREATE_ALWAYS = (1 << 8);
-const u_long File::NO_INHERIT = (1 << 9);
-const u_long File::NO_FOLLOW_SYMLINK = (1 << 10);
-
-
 /*!
  *Costructor of the class.
  */

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

Summary of changes:
 myserver/include/base/file/file.h                 |   30 +++++----
 myserver/src/base/file/file.cpp                   |   73 ++++++---------------
 myserver/src/base/file/files_utility.cpp          |    2 +-
 myserver/src/http_handler/http_file/http_file.cpp |    2 +-
 myserver/src/http_handler/wincgi/wincgi.cpp       |    4 +-
 myserver/src/log/log_manager.cpp                  |    2 +-
 myserver/src/protocol/ftp/ftp.cpp                 |    4 +-
 myserver/src/protocol/http/http_data_read.cpp     |    2 +-
 myserver/tests/test_file.cpp                      |    2 +-
 myserver/tests/test_log_manager.cpp               |    6 +-
 myserver/tests/test_membuf_file.cpp               |    2 +-
 myserver/tests/test_socket_pair.cpp               |    2 +-
 myserver/tests/test_ssl_socket.cpp                |    4 +-
 myserver/tests/test_xml_main_configuration.cpp    |   25 ++++++--
 14 files changed, 72 insertions(+), 88 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Sun May 16 18:16:47 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1ODm8d-00053g-8x
	for mharc-myserver-commit@gnu.org; Sun, 16 May 2010 18:16:47 -0400
Received: from [140.186.70.92] (port=57547 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ODm8Z-00053I-D5
	for myserver-commit@gnu.org; Sun, 16 May 2010 18:16:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODm8X-0001z1-Ve
	for myserver-commit@gnu.org; Sun, 16 May 2010 18:16:43 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:59478
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODm8X-0001yx-OA
	for myserver-commit@gnu.org; Sun, 16 May 2010 18:16:41 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1ODm8X-0004Z9-6O
	for myserver-commit@gnu.org; Sun, 16 May 2010 22:16:41 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1ODm8U-00066c-FB
	for myserver-commit@gnu.org; Sun, 16 May 2010 22:16:41 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 59cad33ceac112256571971b333aff896b6b42aa
X-Git-Newrev: 6820d668ea7afb38c9d32ac2105813e0263ebc74
Message-Id: <E1ODm8U-00066c-FB@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 16 May 2010 22:16:40 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-244-g6820d66
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 16 May 2010 22:16:45 -0000

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  6820d668ea7afb38c9d32ac2105813e0263ebc74 (commit)
       via  a35680902adf62510957db1294de7aacc210ee1c (commit)
      from  59cad33ceac112256571971b333aff896b6b42aa (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 6820d668ea7afb38c9d32ac2105813e0263ebc74
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon May 17 00:16:55 2010 +0200

    Be more conservative to destroy unused threads.

diff --git a/myserver/include/connections_scheduler/connections_scheduler.h b/myserver/include/connections_scheduler/connections_scheduler.h
index 6e79569..620638c 100644
--- a/myserver/include/connections_scheduler/connections_scheduler.h
+++ b/myserver/include/connections_scheduler/connections_scheduler.h
@@ -109,7 +109,8 @@ public:
 
   void newData (short event, SocketHandle handle);
 
-private:
+  Semaphore *getReadySemaphore () {return readySemaphore;}
+protected:
   Server* server;
   void addWaitingConnectionImpl (ConnectionPtr, int lock);
   void addReadyConnectionImpl (ConnectionPtr);
diff --git a/myserver/include/server/server.h b/myserver/include/server/server.h
index 43c8c35..1663545 100644
--- a/myserver/include/server/server.h
+++ b/myserver/include/server/server.h
@@ -110,7 +110,8 @@ public:
   u_long getTimeout ();
   const char *getAddresses ();
   const char *getPath ();
-  u_long getNumThreads ();
+  void getThreadsNumberInformation (u_long *num, u_long *max = NULL,
+                                    u_long *staticThreads = NULL);
 
   NodeTree<string>* getNodeTree (string& key)
   {
diff --git a/myserver/src/connections_scheduler/connections_scheduler.cpp b/myserver/src/connections_scheduler/connections_scheduler.cpp
index 798558f..fed80e5 100644
--- a/myserver/src/connections_scheduler/connections_scheduler.cpp
+++ b/myserver/src/connections_scheduler/connections_scheduler.cpp
@@ -168,6 +168,9 @@ static void listenerHandler (int fd, short event, void *arg)
   ConnectionsScheduler::ListenerArg* s
     = (ConnectionsScheduler::ListenerArg*) arg;
 
+  if (event == EV_TIMEOUT)
+    s->scheduler->getReadySemaphore ()->unlock ();
+
   if (event == EV_READ)
     {
       MYSERVER_SOCKADDRIN asockIn;
@@ -575,14 +578,15 @@ ConnectionPtr ConnectionsScheduler::getConnection ()
 void ConnectionsScheduler::release ()
 {
   u_long nbw;
-  u_long max = 0;
+  u_long threads = 0;
   releasing = true;
   dispatcherArg.terminate = true;
 
   if (server)
-    max = server->getNumThreads () * 2;
+    server->getThreadsNumberInformation (&threads);
+  threads *= 2;
 
-  for (u_long i = 0; i < max; i++)
+  for (u_long i = 0; i < threads; i++)
     readySemaphore->unlock ();
 
   eventsSocketMutex.lock ();
diff --git a/myserver/src/server/clients_thread.cpp b/myserver/src/server/clients_thread.cpp
index 61707ae..15e8a60 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -147,22 +147,19 @@ DEFINE_THREAD (clients_thread, pParam)
       int ret;
       try
         {
-          /* If the thread can be destroyed don't use it.  */
-          if ((!ct->isStatic ()) && ct->isToDestroy ())
-            {
-              Thread::wait (1000);
-              break;
-            }
-
           ret = ct->controlConnections ();
           ct->server->increaseFreeThread ();
           ct->busy = false;
 
-          /*
-            The thread served the connection, so update the timeout value.
-           */
+          /* The thread served the connection, so update the timeout value.  */
           if (ret != 1)
             ct->setTimeout (getTicks ());
+
+          if ((!ct->isStatic ()) && ct->isToDestroy ())
+            {
+              Thread::wait (MYSERVER_SEC (60));
+              break;
+            }
         }
       catch (bad_alloc &ba)
         {
@@ -257,7 +254,7 @@ int ClientsThread::controlConnections ()
 
   server->decreaseFreeThread ();
 
-  if (!c)
+  if (! c)
     return 1;
 
   busy = true;
@@ -284,12 +281,12 @@ int ClientsThread::controlConnections ()
       return 0;
     }
 
-  if (getTicks () - c->getTimeout () > 5000)
+  if (getTicks () - c->getTimeout () > MYSERVER_SEC (5))
     c->setnTries (0);
 
   if (dataRead)
-    memcpy ((char*)buffer.getBuffer (), c->getConnectionBuffer ()->getBuffer (),
-            dataRead);
+    memcpy ((char*) buffer.getBuffer (),
+            c->getConnectionBuffer ()->getBuffer (), dataRead);
 
   c->setActiveThread (this);
   try
@@ -326,7 +323,6 @@ int ClientsThread::controlConnections ()
   if (retcode == DELETE_CONNECTION)
     {
       server->deleteConnection (c);
-      return 0;
     }
   /* Keep the connection.  */
   else if (retcode == KEEP_CONNECTION)
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 9833ea7..9683c59 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -443,10 +443,9 @@ void Server::mainLoop ()
    */
   while (!endServer)
     {
-      Thread::wait (1000000);
+      Thread::wait (MYSERVER_SEC (1));
 
-      /* Check threads.  */
-      if (purgeThreadsCounter++ >= 10)
+      if (purgeThreadsCounter++ >= 120)
         {
           purgeThreadsCounter = 0;
           purgeThreads ();
@@ -462,8 +461,8 @@ void Server::mainLoop ()
             FilesUtility::getLastModTime (mimeConfigurationFile.c_str ());
 
           /* If a configuration file was modified reboot the server. */
-          if (((mainConfTimeNow != -1) && (hostsConfTimeNow != -1)  &&
-               (mimeConfNow != -1)) || toReboot)
+          if (((mainConfTimeNow != -1) && (hostsConfTimeNow != -1)
+               && (mimeConfNow != -1)) || toReboot)
             {
               if ( (mainConfTimeNow  != mainConfTime) || toReboot)
                 {
@@ -596,7 +595,7 @@ int Server::purgeThreads ()
   u_long ticks = getTicks ();
   u_long destroyed = 0;
 
-  purgeThreadsThreshold = std::min (purgeThreadsThreshold << 1,
+  purgeThreadsThreshold = std::min (purgeThreadsThreshold * 3 / 2,
                                     nMaxThreads);
   threadsMutex->lock ();
   for (list<ClientsThread*>::iterator it = threads.begin ();
@@ -610,11 +609,8 @@ int Server::purgeThreads ()
           list<ClientsThread*>::iterator next = it;
           next++;
 
-          thread->join ();
           threads.erase (it);
           delete thread;
-
-          destroyed++;
           it = next;
         }
       else if (thread->isToDestroy ())
@@ -622,14 +618,17 @@ int Server::purgeThreads ()
           if (destroyed < purgeThreadsThreshold)
             thread->stop ();
 
+          destroyed++;
           it++;
         }
       else
         {
-          if (!thread->isStatic ())
-            if (ticks - thread->getTimeout () > MYSERVER_SEC (15))
-              thread->setToDestroy (1);
-
+          if (! thread->isStatic ())
+            if (ticks - thread->getTimeout () > MYSERVER_SEC (20))
+              {
+                thread->setToDestroy (1);
+                destroyed++;
+              }
           it++;
         }
     }
@@ -1315,15 +1314,23 @@ const char *Server::getServerName ()
 }
 
 /*!
-  Gets the number of threads.
- */
-u_long Server::getNumThreads ()
+  Get Information on the number of threads.
+  \param num if not NULL will contain the number of active threads.
+  \param max if not NULL will contain the maximum number of threads.
+  \param staticThreads if not NULL will contain the maximum number of always
+  active threads.
+*/
+void Server::getThreadsNumberInformation (u_long *num, u_long *max,
+                                          u_long *staticThreads)
 {
-  u_long ret;
-  threadsMutex->lock ();
-  ret = threads.size ();
-  threadsMutex->unlock ();
-  return ret;
+  if (num)
+    *num = threads.size ();
+
+  if (max)
+    *max = nMaxThreads;
+
+  if (staticThreads)
+    *staticThreads = nStaticThreads;
 }
 
 /*!
@@ -1588,7 +1595,6 @@ int Server::addThread (bool staticThread)
   newThread = new ClientsThread (this);
 
   handlers = getHandlers (msg);
-
   if (handlers)
     {
       for (size_t i = 0; i < handlers->size (); i++)



commit a35680902adf62510957db1294de7aacc210ee1c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 16 21:57:39 2010 +0200

    Change precision of getTicks to microseconds.

diff --git a/myserver/src/base/utility.cpp b/myserver/src/base/utility.cpp
index 017d6d3..3bc47be 100644
--- a/myserver/src/base/utility.cpp
+++ b/myserver/src/base/utility.cpp
@@ -195,20 +195,16 @@ int endPrintError ()
 }
 
 /*!
-  Return the ticks count in milliseconds.
+  Return the ticks count in microseconds.
   Return 0 on errors.
  */
 u_long getTicks ()
 {
-#ifdef WIN32
-  return GetTickCount ();
-#else
   struct timeval tval;
   int ret = checked::gettimeofday (&tval, 0);
   if (ret == -1)
     return 0;
-  return  (tval.tv_sec * 1000) + (tval.tv_usec / 1000);
-#endif
+  return  (tval.tv_sec * 1000000) + tval.tv_usec;
 }
 
 /*!

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

Summary of changes:
 .../connections_scheduler/connections_scheduler.h  |    3 +-
 myserver/include/server/server.h                   |    3 +-
 myserver/src/base/utility.cpp                      |    8 +--
 .../connections_scheduler.cpp                      |   10 +++-
 myserver/src/server/clients_thread.cpp             |   26 ++++------
 myserver/src/server/server.cpp                     |   50 +++++++++++---------
 6 files changed, 52 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Sat May 22 07:30:20 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OFmuK-0002nC-F7
	for mharc-myserver-commit@gnu.org; Sat, 22 May 2010 07:30:20 -0400
Received: from [140.186.70.92] (port=55054 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OFmuH-0002lU-CY
	for myserver-commit@gnu.org; Sat, 22 May 2010 07:30:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OFmuC-0000MS-4W
	for myserver-commit@gnu.org; Sat, 22 May 2010 07:30:13 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:49665
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OFmuC-0000MN-2f
	for myserver-commit@gnu.org; Sat, 22 May 2010 07:30:12 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OFmuB-0000Pv-Ud
	for myserver-commit@gnu.org; Sat, 22 May 2010 11:30:11 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OFmu9-0006qw-Ov
	for myserver-commit@gnu.org; Sat, 22 May 2010 11:30:11 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 6820d668ea7afb38c9d32ac2105813e0263ebc74
X-Git-Newrev: 446475f1bd09d6dc3c392e1833a29e3b1a66b541
Message-Id: <E1OFmu9-0006qw-Ov@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 22 May 2010 11:30:11 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-246-g446475f
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sat, 22 May 2010 11:30:19 -0000

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  446475f1bd09d6dc3c392e1833a29e3b1a66b541 (commit)
       via  2406624ad78d5fb84291a6edd2e42c909a61d944 (commit)
      from  6820d668ea7afb38c9d32ac2105813e0263ebc74 (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 446475f1bd09d6dc3c392e1833a29e3b1a66b541
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat May 22 13:30:22 2010 +0200

    Specify plugins license.

diff --git a/plugins/src/guile/guile.cpp b/plugins/src/guile/guile.cpp
index a2b03ea..0e253b8 100644
--- a/plugins/src/guile/guile.cpp
+++ b/plugins/src/guile/guile.cpp
@@ -21,6 +21,7 @@
 
 
 PLUGIN_NAME ("guile");
+DECLARE_LICENSE (gpl);
 
 EXPORTABLE(SCM) eval (char *const string)
 {
diff --git a/plugins/src/guile_conf/guile_conf.cpp b/plugins/src/guile_conf/guile_conf.cpp
index a0cd0cc..3501b6f 100644
--- a/plugins/src/guile_conf/guile_conf.cpp
+++ b/plugins/src/guile_conf/guile_conf.cpp
@@ -28,6 +28,7 @@
 #define CONF_FILE_NAME "myserver.sch"
 
 PLUGIN_NAME ("guile_conf");
+DECLARE_LICENSE (gpl);
 
 /*! Define the interface to read from the main configuration file.  */
 class GuileConfiguration : public MainConfiguration
diff --git a/plugins/src/hello/hello.cpp b/plugins/src/hello/hello.cpp
index a5ea40f..44f52e4 100644
--- a/plugins/src/hello/hello.cpp
+++ b/plugins/src/hello/hello.cpp
@@ -19,6 +19,7 @@
 #include <include/plugin/plugin.h>
 
 PLUGIN_NAME ("hello");
+DECLARE_LICENSE (gpl);
 
 EXPORTABLE(int) load (void* server)
 {
diff --git a/plugins/src/http_checker/http_checker.cpp b/plugins/src/http_checker/http_checker.cpp
index 8b97d7c..5b9f16c 100644
--- a/plugins/src/http_checker/http_checker.cpp
+++ b/plugins/src/http_checker/http_checker.cpp
@@ -30,6 +30,7 @@ typedef int (*executePROC)(char*, u_long);
 typedef int (*executeFromFilePROC)(char*);
 
 PLUGIN_NAME ("http_checker");
+DECLARE_LICENSE (gpl);
 
 struct ThreadData
 {
diff --git a/plugins/src/mime_magic/mime_magic.cpp b/plugins/src/mime_magic/mime_magic.cpp
index 8cf6c7d..24fe767 100755
--- a/plugins/src/mime_magic/mime_magic.cpp
+++ b/plugins/src/mime_magic/mime_magic.cpp
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2007, 2009 The Free Software Foundation Inc.
+Copyright (C) 2007, 2009, 2010 The Free Software Foundation Inc.
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 3 of the License, or
@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <include/plugin/plugin.h>
 
 PLUGIN_NAME ("mime_magic");
+DECLARE_LICENSE (gpl);
 
 class MagicHandler : public MimeManagerHandler
 {
diff --git a/plugins/src/python/python.cpp b/plugins/src/python/python.cpp
index 7e37ac4..e326546 100644
--- a/plugins/src/python/python.cpp
+++ b/plugins/src/python/python.cpp
@@ -23,6 +23,7 @@ HashMap<ThreadID, PythonData*> pythonThreadData;
 static Server *serverInstance;
 
 PLUGIN_NAME ("python");
+DECLARE_LICENSE (gpl);
 
 PyInterpreterState* PythonData::getInterpreter ()
 {
diff --git a/plugins/src/python_http_handler/python_http_handler.cpp b/plugins/src/python_http_handler/python_http_handler.cpp
index bd588a5..650f9ca 100644
--- a/plugins/src/python_http_handler/python_http_handler.cpp
+++ b/plugins/src/python_http_handler/python_http_handler.cpp
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2007, 2008, 2009 The Free Software Foundation Inc.
+Copyright (C) 2007, 2008, 2009, 2010 The Free Software Foundation Inc.
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 3 of the License, or
@@ -29,6 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 PLUGIN_NAME ("python_http_handler");
+DECLARE_LICENSE (gpl);
 
 static Server* serverInstance;
 
diff --git a/plugins/src/rules_checker/rules_checker.cpp b/plugins/src/rules_checker/rules_checker.cpp
index ae38dd6..6503f5f 100644
--- a/plugins/src/rules_checker/rules_checker.cpp
+++ b/plugins/src/rules_checker/rules_checker.cpp
@@ -1,6 +1,6 @@
 /*
   MyServer
-  Copyright (C) 2007, 2009 The Free Software Foundation Inc.
+  Copyright (C) 2007, 2009, 2010 The Free Software Foundation Inc.
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 3 of the License, or
@@ -24,6 +24,7 @@
 #include <include/plugin/plugin.h>
 
 PLUGIN_NAME ("rules_checker");
+DECLARE_LICENSE (gpl);
 
 class RulesCheckerObserver : public Multicast<string, void*, int>
 {



commit 2406624ad78d5fb84291a6edd2e42c909a61d944
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat May 22 13:29:15 2010 +0200

    Deny loading of plugins that are not GPL'ed.

diff --git a/myserver/include/base/dynamic_lib/dynamiclib.h b/myserver/include/base/dynamic_lib/dynamiclib.h
index 44d998e..167c033 100644
--- a/myserver/include/base/dynamic_lib/dynamiclib.h
+++ b/myserver/include/base/dynamic_lib/dynamiclib.h
@@ -38,10 +38,10 @@ public:
   int validHandle ();
   DynamicLibrary ();
   ~DynamicLibrary ();
-  int loadLibrary (const char* filename, int globally=0);
-  void* getProc (const char*);
+  int loadLibrary (const char *filename, int globally = 0);
+  void *getProc (const char *sym);
   int close ();
-  const char* getFileName (){return fileName.c_str ();}
+  const char *getFileName (){return fileName.c_str ();}
 private:
   string fileName;
   void *handle;
diff --git a/myserver/include/plugin/plugin.h b/myserver/include/plugin/plugin.h
index e6423a9..f9ea7c8 100644
--- a/myserver/include/plugin/plugin.h
+++ b/myserver/include/plugin/plugin.h
@@ -25,7 +25,10 @@
 #  define EXPORTABLE(x) extern "C" x
 # endif
 
-# define PLUGIN_NAME(X) static const char * __name = X; \
+# define DECLARE_LICENSE(x) EXPORTABLE (const char *) __##x##_license;  \
+  const char *__##x##_license = "1";
+
+# define PLUGIN_NAME(X) static const char *__name = X; \
         EXPORTABLE(const char*) name (){return X;}
 
 # include "myserver.h"
@@ -48,7 +51,7 @@ public:
   virtual int postLoad (Server* server);
   virtual int unLoad ();
   virtual const char* getName ();
-  virtual void* getDirectMethod (char* name);
+  virtual void* findSymbol (const char *name);
 protected:
   DynamicLibrary hinstLib;
 };
diff --git a/myserver/src/base/dynamic_lib/dynamiclib.cpp b/myserver/src/base/dynamic_lib/dynamiclib.cpp
index 0a733b7..0083eff 100644
--- a/myserver/src/base/dynamic_lib/dynamiclib.cpp
+++ b/myserver/src/base/dynamic_lib/dynamiclib.cpp
@@ -59,7 +59,7 @@ DynamicLibrary::~DynamicLibrary ()
   \param filename Name of the file to load.
   \param globally Set if the library is loaded globally.
  */
-int DynamicLibrary::loadLibrary (const char* filename, int globally)
+int DynamicLibrary::loadLibrary (const char *filename, int globally)
 {
   fileName.assign (filename);
 #ifdef WIN32
@@ -89,19 +89,19 @@ int DynamicLibrary::loadLibrary (const char* filename, int globally)
 }
 
 /*!
-  Get a pointer to the specified function. Returns 0 on errors or
-  the function address.
-  \param fnName Function name to find.
+  Get a pointer to the specified symbol. Returns 0 on errors or
+  the symbol address.
+  \param fnName Symbol to find.
  */
-void* DynamicLibrary::getProc (const char* fnName)
+void *DynamicLibrary::getProc (const char *sym)
 {
   if (!handle)
     return 0;
 #ifdef WIN32
-    return (void*) GetProcAddress ((HMODULE) handle, fnName);
+    return (void *) GetProcAddress ((HMODULE) handle, sym);
 #endif
 #ifdef HAVE_DL
-    return (void*) dlsym (handle, fnName);
+    return (void *) dlsym (handle, sym);
 #endif
 }
 
diff --git a/myserver/src/plugin/plugin.cpp b/myserver/src/plugin/plugin.cpp
index 5185e2b..cfaa818 100644
--- a/myserver/src/plugin/plugin.cpp
+++ b/myserver/src/plugin/plugin.cpp
@@ -52,7 +52,7 @@ Plugin::~Plugin ()
  */
 int Plugin::load (Server* server)
 {
-  loadPROC proc = (loadPROC)hinstLib.getProc ("load");
+  loadPROC proc = (loadPROC) hinstLib.getProc ("load");
   if (proc)
     return proc (server);
   return 0;
@@ -124,9 +124,10 @@ const char* Plugin::getName ()
   Get directly access to a method.
   \param name The method name.
  */
-void* Plugin::getDirectMethod (char* name)
+void* Plugin::findSymbol (const char *name)
 {
   if (!hinstLib.validHandle ())
     return 0;
+
   return hinstLib.getProc (name);
 }
diff --git a/myserver/src/plugin/plugins_manager.cpp b/myserver/src/plugin/plugins_manager.cpp
index f7508c4..7c28125 100644
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -223,25 +223,23 @@ PluginsManager::preLoad (Server* server, string &resource)
   \param pinfo Plugin information.
  */
 int
-PluginsManager::loadFile (Server* server, string &name, string &file,
-                          PluginInfo* pinfo)
+PluginsManager::loadFile (Server *server, string &name, string &file,
+                          PluginInfo *pinfo)
 {
   int ret = 0;
   if (pinfo->isEnabled ())
     {
       Plugin* plugin = preLoadPlugin (file, server,
                                       pinfo->isGlobal ());
-      if (plugin)
-        pinfo->setPlugin (plugin);
+      if (! plugin)
+        ret = 1;
       else
         {
-          ret = 1;
-          server->log (MYSERVER_LOG_MSG_ERROR,
-                       _("Error loading plugin `%s'"), file.c_str ());
+          pinfo->setPlugin (plugin);
+          addPluginInfo (name, pinfo);
         }
     }
 
-  addPluginInfo (name, pinfo);
   return ret;
 }
 
@@ -501,8 +499,8 @@ PluginsManager::preLoadPlugin (string &file, Server* server, bool global)
       delete plugin;
       return NULL;
     }
-  namePtr = plugin->getName ();
 
+  namePtr = plugin->getName ();
   if (namePtr)
     name.assign (namePtr);
   else
@@ -514,12 +512,21 @@ PluginsManager::preLoadPlugin (string &file, Server* server, bool global)
       return NULL;
     }
 
+  if (plugin->findSymbol ("__gpl_license") == NULL)
+    {
+      server->log (MYSERVER_LOG_MSG_ERROR,
+                   _("Error loading plugin `%s', the license is not GPL"),
+                   file.c_str ());
+      delete plugin;
+      return NULL;
+    }
+
   return plugin;
 }
 
 void
 PluginsManager::recursiveDependencesFallDown (Server* server, string &name,
-                                  HashMap<string, bool> &remove,
+                                              HashMap<string, bool> &remove,
                                   HashMap<string, list<string>*> &dependsOn)
 {
   remove.put (name, true);
@@ -655,9 +662,7 @@ PluginsManager::load (Server *server)
     }
 
   for (it = pluginsInfos.begin (); it != pluginsInfos.end (); it++)
-    {
-      (*it)->getPlugin ()->load (server);
-    }
+    (*it)->getPlugin ()->load (server);
 
   return 0;
 }
diff --git a/myserver/tests/test_plugins_manager.cpp b/myserver/tests/test_plugins_manager.cpp
index cd8e836..62eb8ee 100644
--- a/myserver/tests/test_plugins_manager.cpp
+++ b/myserver/tests/test_plugins_manager.cpp
@@ -58,12 +58,12 @@ public:
     return 0;
   }
 
-  virtual const char* getName (char* buffer, u_long len)
+  virtual const char *getName (char* buffer, u_long len)
   {
     return 0;
   }
 
-  virtual void* getDirectMethod (char* name)
+  virtual void *findSymbol (char* name)
   {
     return 0;
   }

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

Summary of changes:
 myserver/include/base/dynamic_lib/dynamiclib.h     |    6 ++--
 myserver/include/plugin/plugin.h                   |    7 +++-
 myserver/src/base/dynamic_lib/dynamiclib.cpp       |   14 ++++----
 myserver/src/plugin/plugin.cpp                     |    5 ++-
 myserver/src/plugin/plugins_manager.cpp            |   31 +++++++++++--------
 myserver/tests/test_plugins_manager.cpp            |    4 +-
 plugins/src/guile/guile.cpp                        |    1 +
 plugins/src/guile_conf/guile_conf.cpp              |    1 +
 plugins/src/hello/hello.cpp                        |    1 +
 plugins/src/http_checker/http_checker.cpp          |    1 +
 plugins/src/mime_magic/mime_magic.cpp              |    3 +-
 plugins/src/python/python.cpp                      |    1 +
 .../python_http_handler/python_http_handler.cpp    |    3 +-
 plugins/src/rules_checker/rules_checker.cpp        |    3 +-
 14 files changed, 49 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Sun May 23 07:36:18 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OG9Te-00017Y-79
	for mharc-myserver-commit@gnu.org; Sun, 23 May 2010 07:36:18 -0400
Received: from [140.186.70.92] (port=46966 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OG9Tb-00016n-QR
	for myserver-commit@gnu.org; Sun, 23 May 2010 07:36:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OG9Ta-0007sn-Md
	for myserver-commit@gnu.org; Sun, 23 May 2010 07:36:15 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53856
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OG9Ta-0007sg-Jb
	for myserver-commit@gnu.org; Sun, 23 May 2010 07:36:14 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OG9TZ-0000xh-Vq
	for myserver-commit@gnu.org; Sun, 23 May 2010 11:36:14 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OG9TX-0004Qd-GH
	for myserver-commit@gnu.org; Sun, 23 May 2010 11:36:13 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 446475f1bd09d6dc3c392e1833a29e3b1a66b541
X-Git-Newrev: 56a82e2184951621173a8cd3d1a41fe4fac379c7
Message-Id: <E1OG9TX-0004Qd-GH@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 23 May 2010 11:36:13 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-247-g56a82e2
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Sun, 23 May 2010 11:36:17 -0000

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  56a82e2184951621173a8cd3d1a41fe4fac379c7 (commit)
      from  446475f1bd09d6dc3c392e1833a29e3b1a66b541 (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 56a82e2184951621173a8cd3d1a41fe4fac379c7
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun May 23 12:33:09 2010 +0200

    Properly capitalize HTTP response header.

diff --git a/myserver/src/protocol/http/http_headers.cpp b/myserver/src/protocol/http/http_headers.cpp
index 0f51a53..f1258ea 100644
--- a/myserver/src/protocol/http/http_headers.cpp
+++ b/myserver/src/protocol/http/http_headers.cpp
@@ -89,7 +89,13 @@ u_long HttpHeaders::buildHTTPResponseHeader (char *str,
   for (; it != response->other.end (); it++)
     {
       HttpResponseHeader::Entry *e = *it;
+      char *old_pos = pos;
       pos += myserver_strlcpy (pos, e->name.c_str (), MAX - (long)(pos - str));
+      *old_pos = toupper (*old_pos);
+      while (old_pos++ != pos)
+        if (*(old_pos - 1) == '-')
+          *old_pos = toupper (*old_pos);
+
       pos += myserver_strlcpy (pos, ": ", MAX - (long)(pos - str));
       pos += myserver_strlcpy (pos, e->value.c_str (), MAX - (long)(pos - str));
       pos += myserver_strlcpy (pos, "\r\n", MAX - (long)(pos - str));
@@ -349,19 +355,19 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char *input,
   validRequest = validHTTPRequest (input, inputSize, &nLines, &maxTotchars);
 
   /* Invalid header.  */
-  if (validRequest!=200)
-  {
-    /* Incomplete header.  */
-    if (validRequest==-1)
-      return -1;
-    /* Keep trace of first line for logging. */
-    tokenOff = getEndLine (input, HTTP_REQUEST_URI_DIM);
-    if (tokenOff > 0)
-      request->uri.assign ( input, min (HTTP_REQUEST_URI_DIM, tokenOff) );
-    else
-      request->uri.assign (input, HTTP_REQUEST_URI_DIM );
-    return validRequest;
-  }
+  if (validRequest != 200)
+    {
+      /* Incomplete header.  */
+      if (validRequest == -1)
+        return -1;
+      /* Keep trace of first line for logging. */
+      tokenOff = getEndLine (input, HTTP_REQUEST_URI_DIM);
+      if (tokenOff > 0)
+        request->uri.assign (input, min (HTTP_REQUEST_URI_DIM, tokenOff));
+      else
+        request->uri.assign (input, HTTP_REQUEST_URI_DIM);
+      return validRequest;
+    }
 
   /* Get the first token, this is the HTTP command.*/
   tokenOff = getCharInString (token, cmdSeps, HTTP_REQUEST_CMD_DIM);
@@ -371,9 +377,9 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char *input,
       /* Keep trace of first line for logging.  */
       tokenOff = getEndLine (token, HTTP_REQUEST_URI_DIM);
       if (tokenOff > 0)
-        request->uri.assign (input, min (HTTP_REQUEST_URI_DIM, tokenOff) );
+        request->uri.assign (input, min (HTTP_REQUEST_URI_DIM, tokenOff));
       else
-        request->uri.assign (input, HTTP_REQUEST_URI_DIM );
+        request->uri.assign (input, HTTP_REQUEST_URI_DIM);
     }
 
   do
@@ -416,7 +422,7 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char *input,
               if (tokenOff > 0)
                 request->uri.assign (input, min (HTTP_REQUEST_URI_DIM, tokenOff));
               else
-                request->uri.assign (input, HTTP_REQUEST_URI_DIM );
+                request->uri.assign (input, HTTP_REQUEST_URI_DIM);
               return 400;
             }
           if (tokenOff > maxUri)
@@ -425,12 +431,12 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char *input,
               request->cmd.clear ();
               tokenOff = getEndLine (input, HTTP_REQUEST_URI_DIM);
               if (tokenOff > 0)
-                request->uri.assign (input, min (HTTP_REQUEST_URI_DIM, tokenOff) );
+                request->uri.assign (input, min (HTTP_REQUEST_URI_DIM, tokenOff));
               else
-                request->uri.assign (input, HTTP_REQUEST_URI_DIM );
+                request->uri.assign (input, HTTP_REQUEST_URI_DIM);
               return 400;
             }
-          max = (int)tokenOff;
+          max = (int) tokenOff;
           while ((token[max] != ' ') && (lenToken - max < HTTP_REQUEST_VER_DIM))
             max--;
 
@@ -529,7 +535,7 @@ int HttpHeaders::buildHTTPRequestHeaderStruct (const char *input,
                 request->uri.assign (input, min (HTTP_REQUEST_URI_DIM,
                                                  tokenOff));
               else
-                request->uri.assign (input, HTTP_REQUEST_URI_DIM );
+                request->uri.assign (input, HTTP_REQUEST_URI_DIM);
               return 400;
             }
 

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

Summary of changes:
 myserver/src/protocol/http/http_headers.cpp |   46 +++++++++++++++-----------
 1 files changed, 26 insertions(+), 20 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Mon May 24 06:19:37 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OGUky-0004sn-Uw
	for mharc-myserver-commit@gnu.org; Mon, 24 May 2010 06:19:37 -0400
Received: from [140.186.70.92] (port=41797 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OGUkv-0004qS-HB
	for myserver-commit@gnu.org; Mon, 24 May 2010 06:19:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OGUkt-0005i2-4Z
	for myserver-commit@gnu.org; Mon, 24 May 2010 06:19:33 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:53323
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OGUkt-0005hp-1Q
	for myserver-commit@gnu.org; Mon, 24 May 2010 06:19:31 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OGUks-0000TQ-Hb
	for myserver-commit@gnu.org; Mon, 24 May 2010 10:19:30 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OGUkq-0001j1-27
	for myserver-commit@gnu.org; Mon, 24 May 2010 10:19:30 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 56a82e2184951621173a8cd3d1a41fe4fac379c7
X-Git-Newrev: 2a1142ee58090b6750a85531789568b15b9a88e3
Message-Id: <E1OGUkq-0001j1-27@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Mon, 24 May 2010 10:19:30 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-249-g2a1142e
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Mon, 24 May 2010 10:19:35 -0000

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  2a1142ee58090b6750a85531789568b15b9a88e3 (commit)
       via  4854f135492cabdcd6c87edac1f49da698542951 (commit)
      from  56a82e2184951621173a8cd3d1a41fe4fac379c7 (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 2a1142ee58090b6750a85531789568b15b9a88e3
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon May 24 12:20:28 2010 +0200

    Silently ignore exceptions happening before a virtual host is found

diff --git a/myserver/src/server/clients_thread.cpp b/myserver/src/server/clients_thread.cpp
index 15e8a60..b16a530 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -168,9 +168,7 @@ DEFINE_THREAD (clients_thread, pParam)
         }
       catch (exception &e)
         {
-          ct->server->log (MYSERVER_LOG_MSG_ERROR, _("Error : %s"),
-                                  e.what ());
-        };
+        }
   }
 
   ct->server->decreaseFreeThread ();



commit 4854f135492cabdcd6c87edac1f49da698542951
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Mon May 24 11:22:53 2010 +0200

    Specify correctly if only the HTTP header must be sent.
    
    Change some variables type from `int' to `bool' when used merely as 1 or 0.

diff --git a/myserver/include/base/xml/xml_parser.h b/myserver/include/base/xml/xml_parser.h
index 527394d..e3da646 100644
--- a/myserver/include/base/xml/xml_parser.h
+++ b/myserver/include/base/xml/xml_parser.h
@@ -58,9 +58,9 @@ public:
   XmlParser ();
   ~XmlParser ();
   xmlDocPtr getDoc ();
-  int open (const char* filename, bool useXpath = 0);
-  int open (string const &filename, bool useXpath = 0){return open (filename.c_str (), useXpath);};
-  int openMemBuf (MemBuf &, bool useXpath = 0);
+  int open (const char* filename, bool useXpath = false);
+  int open (string const &filename, bool useXpath = false){return open (filename.c_str (), useXpath);};
+  int openMemBuf (MemBuf &, bool useXpath = false);
 
   const char *getValue (const char* field);
   const char *getValue (string const &field){return getValue (field.c_str ());};
diff --git a/myserver/include/http_handler/cgi/cgi.h b/myserver/include/http_handler/cgi/cgi.h
index a727439..002b123 100644
--- a/myserver/include/http_handler/cgi/cgi.h
+++ b/myserver/include/http_handler/cgi/cgi.h
@@ -38,9 +38,9 @@ public:
                     bool onlyHeader = false);
 private:
   int sendData (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain& chain,
-                Process& cgiProc, int onlyHeader, bool nph);
+                Process& cgiProc, bool onlyHeader, bool nph);
   int sendHeader (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain& chain,
-                  Process& cgiProc, int onlyHeader, bool nph, u_long procStartTime,
+                  Process& cgiProc, bool onlyHeader, bool nph, u_long procStartTime,
                   bool keepalive, bool useChunks, int *ret);
 };
 #endif
diff --git a/myserver/include/http_handler/http_dir/http_dir.h b/myserver/include/http_handler/http_dir/http_dir.h
index f26eec2..4040863 100644
--- a/myserver/include/http_handler/http_dir/http_dir.h
+++ b/myserver/include/http_handler/http_dir/http_dir.h
@@ -42,7 +42,7 @@ public:
   virtual int unLoad ();
   virtual int send (HttpThreadContext*,
                     const char *filenamePath, const char* cgi,
-                    bool execute = false, bool OnlyHeader = false);
+                    bool execute = false, bool onlyHeader = false);
   HttpDir ();
   virtual ~HttpDir ();
 private:
diff --git a/myserver/include/http_handler/http_file/http_file.h b/myserver/include/http_handler/http_file/http_file.h
index fb5b986..e672e9a 100644
--- a/myserver/include/http_handler/http_file/http_file.h
+++ b/myserver/include/http_handler/http_file/http_file.h
@@ -31,7 +31,7 @@ public:
   virtual int unLoad ();
   virtual int send (HttpThreadContext* td,
                     const char *filenamePath, const char* cgi,
-                    bool execute = false, bool OnlyHeader = false);
+                    bool execute = false, bool onlyHeader = false);
   HttpFile ();
   virtual ~HttpFile ();
 
diff --git a/myserver/include/http_handler/isapi/isapi.h b/myserver/include/http_handler/isapi/isapi.h
index 1a29b61..26eaed2 100644
--- a/myserver/include/http_handler/isapi/isapi.h
+++ b/myserver/include/http_handler/isapi/isapi.h
@@ -113,7 +113,7 @@ struct ConnTableRecord
 {
   FiltersChain chain;
   BOOL Allocated;
-  int onlyHeader;
+  bool onlyHeader;
   int headerSent;
   int headerSize;
   HttpThreadContext *td;
diff --git a/myserver/include/http_handler/proxy/proxy.h b/myserver/include/http_handler/proxy/proxy.h
index b485647..0c5e4c2 100644
--- a/myserver/include/http_handler/proxy/proxy.h
+++ b/myserver/include/http_handler/proxy/proxy.h
@@ -40,7 +40,7 @@ public:
                     bool onlyHeader = false);
 protected:
   int flushToClient (HttpThreadContext* td, Socket& client,
-                     FiltersChain &out, int onlyHeader);
+                     FiltersChain &out, bool onlyHeader);
   int readPayLoad (HttpThreadContext* td,
                    HttpResponseHeader* res,
                    FiltersChain *out,
diff --git a/myserver/include/http_handler/scgi/scgi.h b/myserver/include/http_handler/scgi/scgi.h
index c8a5f77..af21069 100644
--- a/myserver/include/http_handler/scgi/scgi.h
+++ b/myserver/include/http_handler/scgi/scgi.h
@@ -64,7 +64,7 @@ private:
   static int initialized;
   Socket getScgiConnection ();
   int sendPostData (ScgiContext* ctx);
-  int sendResponse (ScgiContext* ctx, int onlyHeader, FiltersChain*);
+  int sendResponse (ScgiContext* ctx, bool onlyHeader, FiltersChain*);
   int buildScgiEnvironmentString (HttpThreadContext*, char*, char*);
   int sendNetString (ScgiContext*, const char*, int);
   ScgiServer* isScgiServerRunning (const char*);
diff --git a/myserver/include/plugin/plugin_info.h b/myserver/include/plugin/plugin_info.h
index 79eefb7..87d4d00 100644
--- a/myserver/include/plugin/plugin_info.h
+++ b/myserver/include/plugin/plugin_info.h
@@ -36,7 +36,7 @@ class PluginInfo
 {
 public:
 
-  PluginInfo (string& name, bool enabled = 1, bool global = 0);
+  PluginInfo (string& name, bool enabled = true, bool global = false);
   ~PluginInfo ();
 
   bool isEnabled ();
diff --git a/myserver/include/protocol/http/dyn_http_command.h b/myserver/include/protocol/http/dyn_http_command.h
index 2cb2b5d..eaa1b95 100644
--- a/myserver/include/protocol/http/dyn_http_command.h
+++ b/myserver/include/protocol/http/dyn_http_command.h
@@ -36,9 +36,9 @@ public:
   virtual ~DynamicHttpCommand ();
   string getName ();
   virtual int acceptData () = 0;
-  virtual int send (HttpThreadContext* context, ConnectionPtr lpconnection,
-                    string& Uri, int systemrequest = 0,
-                    int OnlyHeader = 0, int yetmapped = 0) = 0;
+  virtual int send (HttpThreadContext* context, ConnectionPtr connection,
+                    string& Uri, bool systemrequest = false,
+                    bool onlyHeader = false, bool yetmapped = false) = 0;
 private:
   string name;
 };
diff --git a/myserver/include/protocol/http/dyn_http_manager.h b/myserver/include/protocol/http/dyn_http_manager.h
index a31be00..6d0c83a 100644
--- a/myserver/include/protocol/http/dyn_http_manager.h
+++ b/myserver/include/protocol/http/dyn_http_manager.h
@@ -36,7 +36,7 @@ public:
   DynamicHttpManager ();
   virtual ~DynamicHttpManager ();
   virtual int send (HttpThreadContext*, ConnectionPtr s, const char *filenamePath,
-                    const char* cgi, int selfExecuted, int onlyHeader = 0) = 0;
+                    const char* cgi, int selfExecuted, bool onlyHeader = false) = 0;
 
 };
 
diff --git a/myserver/include/protocol/http/http.h b/myserver/include/protocol/http/http.h
index 476bfcb..cb4e222 100644
--- a/myserver/include/protocol/http/http.h
+++ b/myserver/include/protocol/http/http.h
@@ -81,25 +81,25 @@ public:
   int requestAuthorization ();
 
   int sendHTTPResource (string& filename,
-                        int systemrequest = 0,
-                        int onlyHeader = 0,
-                        int yetMapped = 0);
+                        bool systemrequest = false,
+                        bool onlyHeader = false,
+                        bool yetMapped = false);
 
   int putHTTPRESOURCE (string &filename,
-                       int systemrequest = 0,
-                       int onlyHeader = 0,
-                       int yetMapped = 0);
+                       bool systemrequest = false,
+                       bool onlyHeader = false,
+                       bool yetMapped = false);
 
   int optionsHTTPRESOURCE (string &filename,
-                           int yetMapped = 0);
+                           bool yetMapped = false);
 
   int traceHTTPRESOURCE (string& filename,
-                         int yetMapped = 0);
+                         bool yetMapped = false);
 
   int deleteHTTPRESOURCE (string &filename,
-                          int systemrequest = 0,
-                          int onlyHeader = 0,
-                          int yetMapped = 0);
+                          bool systemrequest = false,
+                          bool onlyHeader = false,
+                          bool yetMapped = false);
 
   bool allowMethod (const char *name);
 
@@ -112,25 +112,25 @@ public:
 
   int getPath (string& filenamePath,
                const string& filename,
-               int systemrequest)
+               bool systemrequest)
   {return getPath (td, filenamePath, filename.c_str (), systemrequest);}
 
   int getPath (string& filenamePath,
                const char *filename,
-               int systemrequest)
+               bool systemrequest)
   {return getPath (td, filenamePath, filename, systemrequest);}
 
 
   static int getPath (HttpThreadContext* td,
                       string& filenamePath,
                       const string& filename,
-                      int systemrequest)
+                      bool systemrequest)
   {return getPath (td, filenamePath, filename.c_str (), systemrequest);}
 
   static int getPath (HttpThreadContext* td,
                       string& filenamePath,
                       const char *filename,
-                      int systemrequest);
+                      bool systemrequest);
 
   MimeRecord* getMIME (string& filename);
 
@@ -149,12 +149,12 @@ public:
   static int loadProtocolStatic ();
 
   u_long getTimeout ();
-  int preprocessHttpRequest (string& filename, int yetmapped,
+  int preprocessHttpRequest (string& filename, bool yetmapped,
                              int* permissions);
 
   int getFilePermissions (string& filename, string& directory,
                           string& file, string &filenamePath,
-                          int yetmapped, int* permissions);
+                          bool yetmapped, int* permissions);
 
   SecurityToken *getSecurityToken (){return &(td->securityToken);}
   HttpProtocol *getStaticData () {return staticData;}
@@ -171,7 +171,7 @@ public:
   }
 
 protected:
-  int processDefaultFile (string& uri, int permissions, int onlyHeader);
+  int processDefaultFile (string& uri, int permissions, bool onlyHeader);
 
   struct HttpThreadContext *td;
   void clean ();
diff --git a/myserver/include/protocol/http/http_thread_context.h b/myserver/include/protocol/http/http_thread_context.h
index 5c99528..25bf3b2 100644
--- a/myserver/include/protocol/http/http_thread_context.h
+++ b/myserver/include/protocol/http/http_thread_context.h
@@ -50,7 +50,7 @@ class MimeRecord;
  */
 struct HttpThreadContext
 {
-  int appendOutputs;
+  bool appendOutputs;
 
   /*! Set by raiseHTTPError.  */
   int lastError;
diff --git a/myserver/src/http_handler/cgi/cgi.cpp b/myserver/src/http_handler/cgi/cgi.cpp
index b71ed2e..bb19bc9 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -299,7 +299,7 @@ int Cgi::send (HttpThreadContext* td, const char* scriptpath,
   Read data from the CGI process and send it back to the client.
  */
 int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain& chain,
-                   Process &cgiProc, int onlyHeader, bool nph)
+                   Process &cgiProc, bool onlyHeader, bool nph)
 {
   u_long nbw = 0;
   u_long nbw2 = 0;
@@ -386,7 +386,7 @@ int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain& chain,
   \return nonzero if the reply is already complete.
  */
 int Cgi::sendHeader (HttpThreadContext *td, Pipe &stdOutFile, FiltersChain &chain,
-                     Process &cgiProc, int onlyHeader, bool nph,
+                     Process &cgiProc, bool onlyHeader, bool nph,
                      u_long procStartTime, bool keepalive, bool useChunks,
                      int *ret)
 {
diff --git a/myserver/src/http_handler/proxy/proxy.cpp b/myserver/src/http_handler/proxy/proxy.cpp
index 27158d0..1dbe690 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -128,7 +128,7 @@ int Proxy::send (HttpThreadContext *td, const char* scriptpath,
   Flush the server reply to the client.
  */
 int Proxy::flushToClient (HttpThreadContext* td, Socket& client,
-                          FiltersChain &out, int onlyHeader)
+                          FiltersChain &out, bool onlyHeader)
 {
   u_long read = 0;
   u_long headerLength;
diff --git a/myserver/src/http_handler/scgi/scgi.cpp b/myserver/src/http_handler/scgi/scgi.cpp
index e609cd2..d3033ad 100644
--- a/myserver/src/http_handler/scgi/scgi.cpp
+++ b/myserver/src/http_handler/scgi/scgi.cpp
@@ -211,7 +211,7 @@ int Scgi::send (HttpThreadContext* td, const char* scriptpath,
 /*!
   Send the response to the client.
  */
-int Scgi::sendResponse (ScgiContext* ctx, int onlyHeader, FiltersChain* chain)
+int Scgi::sendResponse (ScgiContext* ctx, bool onlyHeader, FiltersChain* chain)
 {
   clock_t initialTicks = getTicks ();
   bool useChunks = false;
diff --git a/myserver/src/protocol/http/http.cpp b/myserver/src/protocol/http/http.cpp
index 11b0a3a..29603c2 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -107,7 +107,7 @@ int HttpProtocol::unLoadProtocol ()
 /*!
   Build a response for an OPTIONS request.
  */
-int Http::optionsHTTPRESOURCE (string& filename, int yetmapped)
+int Http::optionsHTTPRESOURCE (string& filename, bool yetmapped)
 {
   int ret;
   string time;
@@ -154,7 +154,7 @@ int Http::optionsHTTPRESOURCE (string& filename, int yetmapped)
 /*!
   Handle the HTTP TRACE command.
  */
-int Http::traceHTTPRESOURCE (string& filename, int yetmapped)
+int Http::traceHTTPRESOURCE (string& filename, bool yetmapped)
 {
   int ret;
   char tmpStr[12];
@@ -232,8 +232,8 @@ u_long Http::getTimeout ()
 /*!
   Main function to handle the HTTP PUT command.
  */
-int Http::putHTTPRESOURCE (string& filename, int sysReq, int onlyHeader,
-                           int yetmapped)
+int Http::putHTTPRESOURCE (string& filename, bool sysReq, bool onlyHeader,
+                           bool yetmapped)
 {
   return sendHTTPResource (filename, sysReq, onlyHeader, yetmapped);
 }
@@ -250,7 +250,7 @@ int Http::putHTTPRESOURCE (string& filename, int sysReq, int onlyHeader,
   \return Any other value is the HTTP error code.
  */
 int Http::getFilePermissions (string& filename, string& directory, string& file,
-                              string &filenamePath, int yetmapped, int* permissions)
+                              string &filenamePath, bool yetmapped, int* permissions)
 {
   try
     {
@@ -426,7 +426,7 @@ int Http::getFilePermissions (string& filename, string& directory, string& file,
   \return Return 200 on success.
   \return Any other value is the HTTP error code.
  */
-int Http::preprocessHttpRequest (string& filename, int yetmapped,
+int Http::preprocessHttpRequest (string& filename, bool yetmapped,
                                  int* permissions)
 {
   string directory;
@@ -538,8 +538,8 @@ int Http::preprocessHttpRequest (string& filename, int yetmapped,
 /*!
   Delete the resource identified by filename.
  */
-int Http::deleteHTTPRESOURCE (string& filename, int sysReq, int onlyHeader,
-                          int yetmapped)
+int Http::deleteHTTPRESOURCE (string& filename, bool sysReq, bool onlyHeader,
+                              bool yetmapped)
 {
   return sendHTTPResource (filename, sysReq, onlyHeader, yetmapped);
 }
@@ -656,8 +656,8 @@ HttpUserData::reset ()
   Main function to send a resource to a client.
  */
 int
-Http::sendHTTPResource (string& uri, int systemrequest, int onlyHeader,
-                        int yetmapped)
+Http::sendHTTPResource (string& uri, bool systemrequest, bool onlyHeader,
+                        bool yetmapped)
 {
   /*
     With this code we manage a request of a file or a directory or anything
@@ -722,7 +722,7 @@ Http::sendHTTPResource (string& uri, int systemrequest, int onlyHeader,
           return raiseHTTPError (500);
         }
 
-      return manager->send (td, td->filenamePath.c_str (), 0, onlyHeader);
+      return manager->send (td, td->filenamePath.c_str (), NULL, false, onlyHeader);
     }
   catch (exception & e)
     {
@@ -844,8 +844,8 @@ int Http::controlConnection (ConnectionPtr a, char*, char*, u_long, u_long,
       td->id = id;
       td->lastError = 0;
       td->http = this;
-      td->appendOutputs = 0;
-      td->onlyHeader = 0;
+      td->appendOutputs = false;
+      td->onlyHeader = false;
       td->filenamePath.assign ("");
       td->outputDataPath.assign ("");
       td->inputDataPath.assign ("");
@@ -1113,7 +1113,7 @@ int Http::controlConnection (ConnectionPtr a, char*, char*, u_long, u_long,
                 ret = sendHTTPResource (td->request.uri);
               else if (!td->request.cmd.compare ("HEAD"))
                 {
-                  td->onlyHeader = 1;
+                  td->onlyHeader = true;
                   ret = sendHTTPResource (td->request.uri, 0, 1);
                 }
               else if (!td->request.cmd.compare ("DELETE"))
@@ -1134,7 +1134,7 @@ int Http::controlConnection (ConnectionPtr a, char*, char*, u_long, u_long,
                     ret = raiseHTTPError (501);
                   else
                     ret = dynamicCommand->send (td, a, td->request.uri, 0,
-                                                0, 0);
+                                                false, false);
                 }
             }
         }
@@ -1503,7 +1503,7 @@ MimeRecord* Http::getMIME (string &filename)
   Any other return value is the HTTP error.
  */
 int Http::getPath (HttpThreadContext* td, string& filenamePath,
-                   const char *filename, int systemrequest)
+                   const char *filename, bool systemrequest)
 {
   if (systemrequest)
     {
@@ -1572,7 +1572,7 @@ int Http::getPath (HttpThreadContext* td, string& filenamePath,
   \param permissions The permission mask for the client.
   \param onlyHeader specify if the client requested only the header.
  */
-int Http::processDefaultFile (string& uri, int permissions, int onlyHeader)
+int Http::processDefaultFile (string& uri, int permissions, bool onlyHeader)
 {
   string key ("http.default_file");
   NodeTree<string> *node = td->securityToken.getNodeTree (key,
@@ -1628,7 +1628,7 @@ int Http::processDefaultFile (string& uri, int permissions, int onlyHeader)
       return raiseHTTPError (500);
     }
 
-  return handler->send (td, td->filenamePath.c_str (), 0, onlyHeader);
+  return handler->send (td, td->filenamePath.c_str (), NULL, 0, onlyHeader);
 }
 
 /*!
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 9683c59..79a4e07 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -960,8 +960,8 @@ void Server::checkThreadsNumber ()
   threadsMutex->lock ();
 
   /*
-   *Create a new thread if there are not available threads and
-   *we did not reach the limit.
+    Create a new thread if there are not available threads and
+    we did not reach the limit.
    */
   if ((threads.size () < nMaxThreads) && (freeThreads < 1))
     addThread (false);

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

Summary of changes:
 myserver/include/base/xml/xml_parser.h             |    6 ++--
 myserver/include/http_handler/cgi/cgi.h            |    4 +-
 myserver/include/http_handler/http_dir/http_dir.h  |    2 +-
 .../include/http_handler/http_file/http_file.h     |    2 +-
 myserver/include/http_handler/isapi/isapi.h        |    2 +-
 myserver/include/http_handler/proxy/proxy.h        |    2 +-
 myserver/include/http_handler/scgi/scgi.h          |    2 +-
 myserver/include/plugin/plugin_info.h              |    2 +-
 myserver/include/protocol/http/dyn_http_command.h  |    6 ++--
 myserver/include/protocol/http/dyn_http_manager.h  |    2 +-
 myserver/include/protocol/http/http.h              |   36 ++++++++++----------
 .../include/protocol/http/http_thread_context.h    |    2 +-
 myserver/src/http_handler/cgi/cgi.cpp              |    4 +-
 myserver/src/http_handler/proxy/proxy.cpp          |    2 +-
 myserver/src/http_handler/scgi/scgi.cpp            |    2 +-
 myserver/src/protocol/http/http.cpp                |   36 ++++++++++----------
 myserver/src/server/clients_thread.cpp             |    4 +--
 myserver/src/server/server.cpp                     |    4 +-
 18 files changed, 59 insertions(+), 61 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Thu May 27 11:46:46 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OHfIE-0004gV-5A
	for mharc-myserver-commit@gnu.org; Thu, 27 May 2010 11:46:46 -0400
Received: from [140.186.70.92] (port=57812 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OHfIA-0004g7-Ve
	for myserver-commit@gnu.org; Thu, 27 May 2010 11:46:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OHfI9-0006Q2-Mw
	for myserver-commit@gnu.org; Thu, 27 May 2010 11:46:42 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:49820
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OHfI9-0006Py-Lc
	for myserver-commit@gnu.org; Thu, 27 May 2010 11:46:41 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OHfI9-0008CE-Hm
	for myserver-commit@gnu.org; Thu, 27 May 2010 15:46:41 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OHfI6-0002SW-Ad
	for myserver-commit@gnu.org; Thu, 27 May 2010 15:46:41 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2a1142ee58090b6750a85531789568b15b9a88e3
X-Git-Newrev: dfdc6a1d856b83d9fe598c50007e565a24275e49
Message-Id: <E1OHfI6-0002SW-Ad@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 27 May 2010 15:46:40 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-250-gdfdc6a1
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 27 May 2010 15:46:44 -0000

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  dfdc6a1d856b83d9fe598c50007e565a24275e49 (commit)
      from  2a1142ee58090b6750a85531789568b15b9a88e3 (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 dfdc6a1d856b83d9fe598c50007e565a24275e49
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Thu May 27 15:31:03 2010 +0200

    Now `HttpDir::formatHtml' considers different ranges.

diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp b/myserver/src/http_handler/http_dir/http_dir.cpp
index 72fa5d4..e2f06c6 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -616,22 +616,22 @@ void HttpDir::formatHtml (string& in, string& out)
   string::size_type pos = 0;
   out.assign (in);
   /*
-    Replace characters in the ranges 32-65 91-96 123-126 160-255
+    Replace characters in the ranges 32-47 58-64 123-126 160-255
     with "&#CODE;".
    */
   for (pos = 0; out[pos] != '\0'; pos++)
     {
-      if (((u_char)out[pos] >= 32
-           && (u_char)out[pos] <= 65)
-          || ((u_char)out[pos] >= 91
-              && (u_char)out[pos] <= 96)
-          || ((u_char)out[pos] >= 123
-              && (u_char)out[pos] <= 126)
-          || ((u_char)out[pos] >= 160
-              && (u_char)out[pos] < 255))
+      if (((u_char) out[pos] >= 32
+           && (u_char) out[pos] <= 47)
+          || ((u_char) out[pos] >= 58
+              && (u_char) out[pos] <= 64)
+          || ((u_char) out[pos] >= 123
+              && (u_char) out[pos] <= 126)
+          || ((u_char) out[pos] >= 160
+              && (u_char) out[pos] < 255))
         {
           ostringstream os;
-          os << "&#" << (int)((unsigned char)out[pos]) << ";";
+          os << "&#" << (int)((unsigned char) out[pos]) << ";";
           out.replace (pos, 1, os.str ());
           pos += os.str ().length () - 1;
         }

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

Summary of changes:
 myserver/src/http_handler/http_dir/http_dir.cpp |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Fri May 28 07:58:59 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OHyDL-0003MG-7k
	for mharc-myserver-commit@gnu.org; Fri, 28 May 2010 07:58:59 -0400
Received: from [140.186.70.92] (port=53915 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OHyDI-0003MA-UV
	for myserver-commit@gnu.org; Fri, 28 May 2010 07:58:57 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OHyDH-0001Vl-E5
	for myserver-commit@gnu.org; Fri, 28 May 2010 07:58:56 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:51291
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OHyDH-0001Vg-Ci
	for myserver-commit@gnu.org; Fri, 28 May 2010 07:58:55 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OHyDG-0005rp-Sg
	for myserver-commit@gnu.org; Fri, 28 May 2010 11:58:54 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OHyDC-0001ss-C0
	for myserver-commit@gnu.org; Fri, 28 May 2010 11:58:54 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: dfdc6a1d856b83d9fe598c50007e565a24275e49
X-Git-Newrev: 02a444106a21c3c757b3b58977e78f1a036c20ce
Message-Id: <E1OHyDC-0001ss-C0@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 28 May 2010 11:58:54 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-253-g02a4441
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 28 May 2010 11:58:58 -0000

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  02a444106a21c3c757b3b58977e78f1a036c20ce (commit)
       via  b6dbfb58fcfdf429bbfde914a628bfbcf5485050 (commit)
       via  0452992670c2f90fad8e7a2b93d5e2186afb239d (commit)
      from  dfdc6a1d856b83d9fe598c50007e565a24275e49 (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 02a444106a21c3c757b3b58977e78f1a036c20ce
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri May 28 13:58:33 2010 +0200

    Remove a connection immediately if the socket is closed.

diff --git a/myserver/src/server/clients_thread.cpp b/myserver/src/server/clients_thread.cpp
index b16a530..0d2eb0f 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -259,11 +259,16 @@ int ClientsThread::controlConnections ()
   dataRead = c->getConnectionBuffer ()->getLength ();
 
   if (! c->isForceControl ())
-    err = c->socket->recv (&((char*)(buffer.getBuffer ()))[dataRead],
-                           MYSERVER_KB (8) - dataRead - 1, 0);
+    {
+      err = c->socket->recv (&((char*)(buffer.getBuffer ()))[dataRead],
+                             MYSERVER_KB (8) - dataRead - 1, 0);
 
-  if (err == -1 && !server->deleteConnection (c))
-    return 0;
+      if (err <= 0)
+        {
+          server->deleteConnection (c);
+          return 0;
+        }
+    }
 
   buffer.setLength (dataRead + err);
   c->setForceControl (0);



commit b6dbfb58fcfdf429bbfde914a628bfbcf5485050
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri May 28 12:24:19 2010 +0200

    Call directly `stat' to check if a path exists.

diff --git a/myserver/src/base/file/files_utility.cpp b/myserver/src/base/file/files_utility.cpp
index b042c8a..fac0ddf 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -268,14 +268,8 @@ int FilesUtility::isLink (const char* filename)
 int FilesUtility::nodeExists (const char* filename)
 {
   struct stat fstats;
-  try
-    {
-      checked::stat (filename, &fstats);
-    }
-  catch (...)
-    {
-      return 0;
-    }
+  if (::stat (filename, &fstats) < 0)
+    return 0;
 
   return 1;
 }



commit 0452992670c2f90fad8e7a2b93d5e2186afb239d
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri May 28 12:14:55 2010 +0200

    Avoid an exception `accept'ing from a nonblocking socket.

diff --git a/myserver/src/base/socket/socket.cpp b/myserver/src/base/socket/socket.cpp
index 1376266..57eb5c9 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -183,15 +183,20 @@ int Socket::listen (int max)
 /*!
   Accept a new connection.
  */
-Socket* Socket::accept (MYSERVER_SOCKADDR* sa, socklen_t* sockaddrlen)
+Socket* Socket::accept (MYSERVER_SOCKADDR *sa, socklen_t *sockaddrlen)
 {
-  int acceptedHandle = checked::accept (fd, (struct sockaddr *)sa,
+  int acceptedHandle = gnulib::accept (fd, (struct sockaddr *)sa,
                                        sockaddrlen);
 
-  if (acceptedHandle >= 0)
-    return new Socket ((SocketHandle) acceptedHandle);
-  else
-    return NULL;
+  if (acceptedHandle < 0)
+    {
+      if (errno == EAGAIN)
+        return NULL;
+      else
+        checked::raiseException ();
+    }
+
+  return new Socket (acceptedHandle);
 }
 
 /*!

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

Summary of changes:
 myserver/src/base/file/files_utility.cpp |   10 ++--------
 myserver/src/base/socket/socket.cpp      |   17 +++++++++++------
 myserver/src/server/clients_thread.cpp   |   13 +++++++++----
 3 files changed, 22 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Fri May 28 12:10:20 2010
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1OI28a-0002J3-4W
	for mharc-myserver-commit@gnu.org; Fri, 28 May 2010 12:10:20 -0400
Received: from [140.186.70.92] (port=60292 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OI28W-0002HD-NW
	for myserver-commit@gnu.org; Fri, 28 May 2010 12:10:18 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OI28T-0002YG-QZ
	for myserver-commit@gnu.org; Fri, 28 May 2010 12:10:14 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:58658
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OI28T-0002YC-Nq
	for myserver-commit@gnu.org; Fri, 28 May 2010 12:10:13 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by internal.in.savannah.gnu.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1OI28T-0000Zd-0d
	for myserver-commit@gnu.org; Fri, 28 May 2010 16:10:13 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1OI28Q-00021P-8d
	for myserver-commit@gnu.org; Fri, 28 May 2010 16:10:12 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 02a444106a21c3c757b3b58977e78f1a036c20ce
X-Git-Newrev: 6820a5ec13af7472af93c345f1a36d690c9f3121
Message-Id: <E1OI28Q-00021P-8d@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 28 May 2010 16:10:12 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-254-g6820a5e
X-BeenThere: myserver-commit@gnu.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: myserver-commit.gnu.org
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/myserver-commit>
List-Post: <mailto:myserver-commit@gnu.org>
List-Help: <mailto:myserver-commit-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/myserver-commit>,
	<mailto:myserver-commit-request@gnu.org?subject=subscribe>
X-List-Received-Date: Fri, 28 May 2010 16:10:18 -0000

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  6820a5ec13af7472af93c345f1a36d690c9f3121 (commit)
      from  02a444106a21c3c757b3b58977e78f1a036c20ce (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 6820a5ec13af7472af93c345f1a36d690c9f3121
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri May 28 15:28:32 2010 +0200

    Do a `close' in both cases `shutdown' succeeds or not.

diff --git a/myserver/src/connection/connection.cpp b/myserver/src/connection/connection.cpp
index f33025a..859778e 100644
--- a/myserver/src/connection/connection.cpp
+++ b/myserver/src/connection/connection.cpp
@@ -51,6 +51,13 @@ void Connection::destroy ()
       try
         {
           socket->shutdown (SHUT_RDWR);
+        }
+      catch (std::exception & e)
+        {
+        }
+
+      try
+        {
           socket->close ();
           delete socket;
           socket = NULL;
@@ -58,6 +65,7 @@ void Connection::destroy ()
       catch (SocketException & e)
         {
         }
+
     }
 
   if (protocolBuffer)

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

Summary of changes:
 myserver/src/connection/connection.cpp |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
GNU MyServer


