From MAILER-DAEMON Thu Mar 03 18:54:36 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PvILs-0006XA-MI
	for mharc-myserver-commit@gnu.org; Thu, 03 Mar 2011 18:54:36 -0500
Received: from [140.186.70.92] (port=43987 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PvILp-0006WL-KS
	for myserver-commit@gnu.org; Thu, 03 Mar 2011 18:54:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1PvILo-0002Bg-Cn
	for myserver-commit@gnu.org; Thu, 03 Mar 2011 18:54:33 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:58442
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1PvILo-0002Bc-A1
	for myserver-commit@gnu.org; Thu, 03 Mar 2011 18:54:32 -0500
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 1PvILn-00068Q-Sr
	for myserver-commit@gnu.org; Thu, 03 Mar 2011 23:54:31 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1PvILn-0001iG-IR
	for myserver-commit@gnu.org; Thu, 03 Mar 2011 23:54:31 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2f4d0eeeee99ce2dbb7977d74cedb2d4d8c3320c
X-Git-Newrev: 3e208e0d780dac871c6611439691cb723553e926
Message-Id: <E1PvILn-0001iG-IR@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Thu, 03 Mar 2011 23:54:31 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-429-g3e208e0
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, 03 Mar 2011 23:54: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  3e208e0d780dac871c6611439691cb723553e926 (commit)
      from  2f4d0eeeee99ce2dbb7977d74cedb2d4d8c3320c (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 3e208e0d780dac871c6611439691cb723553e926
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 4 00:18:52 2011 +0100

    Make the myserver binary installable.
    
    Based on a patch by: Ludovic Courtès <ludo@gnu.org>

diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index a2e7dc8..b18dd93 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -90,7 +90,6 @@ libmyserver_la_LIBADD =	base/base64/libbase64.la \
 
 myserver_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"
 
-myserver_LDFLAGS = -static -no-install
 myserver_LDADD = libmyserver.la $(PTHREAD_LIB) $(IDN_LIB) \
 	$(XNET_LIB) $(DL_LIB) $(ZLIB_LIB) \
 	$(XML_LIBS) $(INTLLIBS) $(LDFLAGS)

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

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


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Fri Mar 11 12:19:30 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Py5zu-000273-7l
	for mharc-myserver-commit@gnu.org; Fri, 11 Mar 2011 12:19:30 -0500
Received: from [140.186.70.92] (port=43399 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Py5zq-00026m-Vh
	for myserver-commit@gnu.org; Fri, 11 Mar 2011 12:19:28 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1Py5zo-0000lu-Vm
	for myserver-commit@gnu.org; Fri, 11 Mar 2011 12:19:26 -0500
Received: from colonialone.fsf.org ([140.186.70.51]:45105
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1Py5zo-0000ll-OU
	for myserver-commit@gnu.org; Fri, 11 Mar 2011 12:19:24 -0500
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 1Py5zo-0001KK-BI
	for myserver-commit@gnu.org; Fri, 11 Mar 2011 17:19:24 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Py5zn-00032l-JC
	for myserver-commit@gnu.org; Fri, 11 Mar 2011 17:19:24 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3e208e0d780dac871c6611439691cb723553e926
X-Git-Newrev: 01bec26fc619c47390a3d7ef706d9ff7030089c0
Message-Id: <E1Py5zn-00032l-JC@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Fri, 11 Mar 2011 17:19:23 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-432-g01bec26
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, 11 Mar 2011 17:19: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  01bec26fc619c47390a3d7ef706d9ff7030089c0 (commit)
       via  39ff3b05edaa51263eceb5fa3eb00b347b28ce5a (commit)
       via  7ad8d37adcdf0ba31a53678a90003a96ba2b9735 (commit)
      from  3e208e0d780dac871c6611439691cb723553e926 (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 01bec26fc619c47390a3d7ef706d9ff7030089c0
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 11 18:19:19 2011 +0100

    Show an error if the log files section contain an unexpected element.

diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h b/myserver/include/conf/vhost/xml_vhost_handler.h
index 13c0662..2c53279 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -44,7 +44,7 @@ public:
   int addVHost (Vhost *);
 
   /*! Load the virtual hosts list from a xml configuration file.  */
-  virtual int load (const char *);
+  virtual int load (const char *name);
 
   /*! Set the right owner for the log locations.  */
   void changeLocationsOwner ();
diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index cc0d928..a329fe3 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -213,7 +213,7 @@ int XmlVhostHandler::getHostsNumber ()
   Load a log XML node.
  */
 void
-XmlVhostHandler::loadXMLlogData (string name, Vhost* vh, xmlNode* lcur)
+XmlVhostHandler::loadXMLlogData (string name, Vhost *vh, xmlNode *lcur)
 {
   xmlAttr *attr;
   string opt;
@@ -229,61 +229,71 @@ XmlVhostHandler::loadXMLlogData (string name, Vhost* vh, xmlNode* lcur)
         }
       attr = attr->next;
     }
+
   string location;
   list<string> filters;
   u_long cycle;
   xmlNode* stream = lcur->children;
-  for (; stream; stream = stream->next, location.assign (""), cycle = 0, filters.clear ())
+  for (; stream; stream = stream->next)
     {
-      if (stream->type == XML_ELEMENT_NODE &&
-          !xmlStrcmp (stream->name, (xmlChar const*) "STREAM"))
+      location.assign ("");
+      cycle = 0;
+      filters.clear ();
+
+      if (stream->type != XML_ELEMENT_NODE)
+        continue;
+
+      if (xmlStrcmp (stream->name, (xmlChar const *) "STREAM"))
+        Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
+                                     _("Unexpected element in virtual host streams"));
+
+      xmlAttr* streamAttr = stream->properties;
+      while (streamAttr)
         {
-          xmlAttr* streamAttr = stream->properties;
-          while (streamAttr)
-            {
-              if (!strcmp ((char *) streamAttr->name, "location"))
-                location.assign ((char *) streamAttr->children->content);
-              else if (!strcmp ((char *) streamAttr->name, "cycle"))
-                cycle = atoi ((char *) streamAttr->children->content);
+          if (!strcmp ((char *) streamAttr->name, "location"))
+            location.assign ((char *) streamAttr->children->content);
+          else if (!strcmp ((char *) streamAttr->name, "cycle"))
+            cycle = atoi ((char *) streamAttr->children->content);
 
-              streamAttr = streamAttr->next;
-            }
-          xmlNode* filterList = stream->children;
-          for (; filterList; filterList = filterList->next)
+          streamAttr = streamAttr->next;
+        }
+
+      xmlNode* filterList = stream->children;
+      for (; filterList; filterList = filterList->next)
+        {
+          if (filterList->type == XML_ELEMENT_NODE &&
+              !xmlStrcmp (filterList->name, (xmlChar const *) "FILTER"))
             {
-              if (filterList->type == XML_ELEMENT_NODE &&
-                  !xmlStrcmp (filterList->name, (xmlChar const*) "FILTER"))
+              if (filterList->children && filterList->children->content)
                 {
-                  if (filterList->children && filterList->children->content)
-                    {
-                      string filter ((char *) filterList->children->content);
-                      filters.push_back (filter);
-                    }
+                  string filter ((char *) filterList->children->content);
+                  filters.push_back (filter);
                 }
             }
-          int err = 1;
-          string str ("XmlVhostHandler::loadXMLlogData : Unrecognized log type");
+        }
 
-          if (!name.compare ("ACCESSLOG"))
-            {
-              err = vh->openAccessLog (location, filters, cycle);
-              vh->setAccessLogOpt (opt.c_str ());
-              if (err)
-                Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
-                                                   _("Error opening %s"), location.c_str ());
-            }
-          else if (!name.compare ("WARNINGLOG"))
-            {
-              err = vh->openWarningLog (location, filters, cycle);
-              vh->setWarningLogOpt (opt.c_str ());
-              if (err)
-                Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
-                                                   _("Error opening %s"), location.c_str ());
-            }
-          else
+      int err = 1;
+      string str ("XmlVhostHandler::loadXMLlogData : Unrecognized log type");
+
+      if (! name.compare ("ACCESSLOG"))
+        {
+          err = vh->openAccessLog (location, filters, cycle);
+          vh->setAccessLogOpt (opt.c_str ());
+          if (err)
+            Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
+                                         _("Error opening %s"), location.c_str ());
+        }
+      else if (! name.compare ("WARNINGLOG"))
+        {
+          err = vh->openWarningLog (location, filters, cycle);
+          vh->setWarningLogOpt (opt.c_str ());
+          if (err)
             Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
-                                               _(" Unrecognized log type"));
+                                         _("Error opening %s"), location.c_str ());
         }
+      else
+        Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
+                                     _(" Unrecognized log type"));
     }
 }
 
@@ -410,7 +420,8 @@ int XmlVhostHandler::load (const char *filename)
               int val = atoi ((char *) lcur->children->content);
               if (val > (1 << 16) || val <= 0)
                 Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
-                      _("Specified invalid port %s"), lcur->children->content);
+                      _("An invalid port was specified: %s"),
+                                             lcur->children->content);
               vh->setPort ((u_short)val);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "PROTOCOL"))



commit 39ff3b05edaa51263eceb5fa3eb00b347b28ce5a
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 11 18:06:55 2011 +0100

    doc: fix example for virtual host log files.

diff --git a/myserver/documentation/virtual_hosts.texi b/myserver/documentation/virtual_hosts.texi
index cbc7a40..cd0afff 100644
--- a/myserver/documentation/virtual_hosts.texi
+++ b/myserver/documentation/virtual_hosts.texi
@@ -34,8 +34,12 @@ A sample virtual hosts configuration file looks like:
     <DOCROOT>web</DOCROOT>
     <SYSROOT>system</SYSROOT>
     <HOST>foo.bar.com</HOST>
-    <ACCESSLOG>logs/myServer.log</ACCESSLOG>
-    <WARNINGLOG>logs/myServer.err</WARNINGLOG>
+    <ACCESSLOG>
+      <STREAM location="file://logs/myServer.log" cycle="1048576"/>
+	  </ACCESSLOG>
+    <WARNINGLOG>
+      <STREAM location="file://logs/myServer.err" cycle="1048576"/>
+    </WARNINGLOG>
     <ALLOW_CGI>NO</ALLOW_CGI>
   </VHOST>
 </VHOSTS>
@@ -63,9 +67,10 @@ it is your virtual host's name. The optional useRegex="YES"
 means the address would act as a regular expression, not only a fixed
 value.  Multiple host names can be defined for the same virtual host.
 @item <ACCESSLOG>
-it is the access log used by the virtual host
+it is a list of streams where log accesses to the virtual host.
 @item <WARNINGLOG>
-it is the errors log file used by the virtual host.
+it is a list of streams where log warning and error messages for the
+virtual host.
 @end itemize
 
 Log files can have extra options:
@@ -93,8 +98,12 @@ Here is an example of a FTP virtual host:
     <DOCROOT>web</DOCROOT>
     <SYSROOT>system</SYSROOT>
     <HOST>ftp.foo.bar.com</HOST>
-    <ACCESSLOG>logs/myServer.log</ACCESSLOG>
-    <WARNINGLOG>logs/myServer.err</WARNINGLOG>
+    <ACCESSLOG>
+      <STREAM location="file://logs/myServer.log" cycle="1048576"/>
+	  </ACCESSLOG>
+    <WARNINGLOG>
+      <STREAM location="file://logs/myServer.err" cycle="1048576"/>
+    </WARNINGLOG>
   </VHOST>
 </VHOSTS>
 @end example



commit 7ad8d37adcdf0ba31a53678a90003a96ba2b9735
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Fri Mar 11 17:07:12 2011 +0100

    Minor aesthetic changes.

diff --git a/myserver/src/conf/vhost/vhost.cpp b/myserver/src/conf/vhost/vhost.cpp
index d0e8e7b..b24b15d 100644
--- a/myserver/src/conf/vhost/vhost.cpp
+++ b/myserver/src/conf/vhost/vhost.cpp
@@ -185,8 +185,8 @@ Vhost::openWarningLog (string location, list<string>& filters, u_long cycle)
 int
 Vhost::openLogFiles ()
 {
-  return logManager->count (this, accessLogType) == 0 ||
-    logManager->count (this, warningLogType) == 0;
+  return logManager->count (this, accessLogType) == 0
+    || logManager->count (this, warningLogType) == 0;
 }
 
 /*!
diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index bd494ed..cc0d928 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -220,9 +220,9 @@ XmlVhostHandler::loadXMLlogData (string name, Vhost* vh, xmlNode* lcur)
   attr = lcur->properties;
   while (attr)
     {
-      opt.append ((char*)attr->name);
+      opt.append ((char *) attr->name);
       opt.append ("=");
-      opt.append ((char*)attr->children->content);
+      opt.append ((char *) attr->children->content);
       if (attr->next)
         {
           opt.append (",");
@@ -241,14 +241,11 @@ XmlVhostHandler::loadXMLlogData (string name, Vhost* vh, xmlNode* lcur)
           xmlAttr* streamAttr = stream->properties;
           while (streamAttr)
             {
-              if (!strcmp ((char*)streamAttr->name, "location"))
-                {
-                  location.assign ((char*)streamAttr->children->content);
-                }
-              else if (!strcmp ((char*)streamAttr->name, "cycle"))
-                {
-                  cycle = atoi ((char*)streamAttr->children->content);
-                }
+              if (!strcmp ((char *) streamAttr->name, "location"))
+                location.assign ((char *) streamAttr->children->content);
+              else if (!strcmp ((char *) streamAttr->name, "cycle"))
+                cycle = atoi ((char *) streamAttr->children->content);
+
               streamAttr = streamAttr->next;
             }
           xmlNode* filterList = stream->children;
@@ -259,7 +256,7 @@ XmlVhostHandler::loadXMLlogData (string name, Vhost* vh, xmlNode* lcur)
                 {
                   if (filterList->children && filterList->children->content)
                     {
-                      string filter ((char*)filterList->children->content);
+                      string filter ((char *) filterList->children->content);
                       filters.push_back (filter);
                     }
                 }
@@ -345,11 +342,11 @@ int XmlVhostHandler::load (const char *filename)
                         useRegex = 1;
                 }
 
-              vh->addHost ((const char*)lcur->children->content, useRegex);
+              vh->addHost ((const char *)lcur->children->content, useRegex);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "NAME"))
             {
-              vh->setName ((char*)lcur->children->content);
+              vh->setName ((char *) lcur->children->content);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "LOCATION"))
             {
@@ -357,7 +354,7 @@ int XmlVhostHandler::load (const char *filename)
 
               for (xmlAttr *attrs = lcur->properties; attrs; attrs = attrs->next)
                 if (!xmlStrcmp (attrs->name, (const xmlChar *) "path"))
-                  loc = ((const char*) attrs->children->content);
+                  loc = ((const char *) attrs->children->content);
 
               MimeRecord *record = XmlMimeHandler::readRecord (lcur);
               MimeRecord *prev = vh->addLocationMime (loc, record);
@@ -374,21 +371,21 @@ int XmlVhostHandler::load (const char *filename)
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SSL_PRIVATEKEY"))
             {
-              string pk ((char*)lcur->children->content);
+              string pk ((char *) lcur->children->content);
               sslContext->setPrivateKeyFile (pk);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SSL_CERTIFICATE"))
             {
-              string certificate ((char*)lcur->children->content);
+              string certificate ((char *) lcur->children->content);
               sslContext->setCertificateFile (certificate);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "CONNECTIONS_PRIORITY"))
             {
-              vh->setDefaultPriority (atoi ((const char*)lcur->children->content));
+              vh->setDefaultPriority (atoi ((const char *)lcur->children->content));
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SSL_PASSWORD"))
             {
-              string pw ((char*)lcur->children->content);
+              string pw ((char *) lcur->children->content);
               sslContext->setPassword (pw);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "IP"))
@@ -406,11 +403,11 @@ int XmlVhostHandler::load (const char *filename)
                   attrs = attrs->next;
                 }
 
-              vh->addIP ((char*)lcur->children->content, useRegex);
+              vh->addIP ((char *) lcur->children->content, useRegex);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "PORT"))
             {
-              int val = atoi ((char*)lcur->children->content);
+              int val = atoi ((char *) lcur->children->content);
               if (val > (1 << 16) || val <= 0)
                 Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
                       _("Specified invalid port %s"), lcur->children->content);
@@ -418,28 +415,28 @@ int XmlVhostHandler::load (const char *filename)
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "PROTOCOL"))
             {
-              char* lastChar = (char*)lcur->children->content;
+              char* lastChar = (char *) lcur->children->content;
               while (*lastChar != '\0')
                 {
                   *lastChar = tolower (*lastChar);
                   lastChar++;
                 }
-              vh->setProtocolName ((char*)lcur->children->content);
+              vh->setProtocolName ((char *) lcur->children->content);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "DOCROOT"))
             {
-              char* lastChar = (char*)lcur->children->content;
+              char* lastChar = (char *) lcur->children->content;
               while (*(lastChar+1) != '\0')
                 lastChar++;
 
               if (*lastChar == '\\' || *lastChar == '/')
                 *lastChar = '\0';
 
-              vh->setDocumentRoot ((const char*)lcur->children->content);
+              vh->setDocumentRoot ((const char *)lcur->children->content);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SYSROOT"))
             {
-              char* lastChar = (char*)lcur->children->content;
+              char* lastChar = (char *) lcur->children->content;
 
               while (*(lastChar+1) != '\0')
                 lastChar++;
@@ -447,7 +444,7 @@ int XmlVhostHandler::load (const char *filename)
               if (*lastChar == '\\' || *lastChar == '/')
                 *lastChar = '\0';
 
-              vh->setSystemRoot ((const char*)lcur->children->content);
+              vh->setSystemRoot ((const char *)lcur->children->content);
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "ACCESSLOG"))
             {
@@ -464,10 +461,10 @@ int XmlVhostHandler::load (const char *filename)
                 {
                   if (!xmlStrcmp (attrs->name, (const xmlChar *) "name")
                       && attrs->children && attrs->children->content)
-                    hnd.assign((const char*) attrs->children->content);
+                    hnd.assign((const char *) attrs->children->content);
                 }
 
-              const char *filename = (const char*) lcur->children->content;
+              const char *filename = (const char *) lcur->children->content;
               MimeManagerHandler *handler =
                 Server::getInstance ()->getMimeManager ()->buildHandler (hnd);
 
@@ -488,7 +485,7 @@ int XmlVhostHandler::load (const char *filename)
             }
           else if (!xmlStrcmp (lcur->name, (const xmlChar *) "THROTTLING_RATE"))
             {
-              u_long rate = (u_long)atoi ((char*)lcur->children->content);
+              u_long rate = (u_long)atoi ((char *) lcur->children->content);
               vh->setThrottlingRate (rate);
             }
 
diff --git a/myserver/src/log/stream/file_stream_creator.cpp b/myserver/src/log/stream/file_stream_creator.cpp
index 0039e99..70609cd 100644
--- a/myserver/src/log/stream/file_stream_creator.cpp
+++ b/myserver/src/log/stream/file_stream_creator.cpp
@@ -25,11 +25,11 @@ FileStreamCreator::create (FiltersFactory* ff, string location,
 {
   File *out = new File ();
   FiltersChain *fc = NULL;
-  char *path = const_cast<char*>(location.c_str ());
   try
     {
       size_t nbw;
-      out->openFile (path, FileStream::defaultFileMask);
+      out->openFile (location.c_str (),
+                     FileStream::defaultFileMask);
       fc = ff->chain (filters, out, &nbw);
       if (fc)
         return new FileStream (ff, cycle, out, fc);

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

Summary of changes:
 myserver/documentation/virtual_hosts.texi       |   21 +++-
 myserver/include/conf/vhost/xml_vhost_handler.h |    2 +-
 myserver/src/conf/vhost/vhost.cpp               |    4 +-
 myserver/src/conf/vhost/xml_vhost_handler.cpp   |  142 ++++++++++++-----------
 myserver/src/log/stream/file_stream_creator.cpp |    4 +-
 5 files changed, 95 insertions(+), 78 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Sun Mar 13 17:03:46 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1PysS2-0001Ht-8l
	for mharc-myserver-commit@gnu.org; Sun, 13 Mar 2011 17:03:46 -0400
Received: from [140.186.70.92] (port=42793 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PysRz-0001Fq-Rk
	for myserver-commit@gnu.org; Sun, 13 Mar 2011 17:03:45 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1PysRy-0006LC-UB
	for myserver-commit@gnu.org; Sun, 13 Mar 2011 17:03:43 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:59335
	helo=internal.in.savannah.gnu.org)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1PysRy-0006L8-S9
	for myserver-commit@gnu.org; Sun, 13 Mar 2011 17:03:42 -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 1PysRy-0003KU-Eq
	for myserver-commit@gnu.org; Sun, 13 Mar 2011 21:03:42 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1PysRx-0001k6-SY
	for myserver-commit@gnu.org; Sun, 13 Mar 2011 21:03:42 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 01bec26fc619c47390a3d7ef706d9ff7030089c0
X-Git-Newrev: b8614bc80e8c7cc103ec020c75a7763ccfc0285c
Message-Id: <E1PysRx-0001k6-SY@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sun, 13 Mar 2011 21:03:41 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-434-gb8614bc
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, 13 Mar 2011 21:03: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  b8614bc80e8c7cc103ec020c75a7763ccfc0285c (commit)
       via  dd2f7d5b995d1228dd5b5567f9a6cbccd1c15c61 (commit)
      from  01bec26fc619c47390a3d7ef706d9ff7030089c0 (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 b8614bc80e8c7cc103ec020c75a7763ccfc0285c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Mar 13 21:31:11 2011 +0100

    Remove redundant check.

diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index a329fe3..3e96b10 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -170,8 +170,8 @@ vector<Vhost*>* XmlVhostHandler::getVHostList ()
  */
 void XmlVhostHandler::changeLocationsOwner ()
 {
-  if (Server::getInstance ()->getUid () ||
-     Server::getInstance ()->getGid ())
+  if (Server::getInstance ()->getUid ()
+      || Server::getInstance ()->getGid ())
     {
       string uid (Server::getInstance ()->getUid ());
       string gid (Server::getInstance ()->getGid ());
@@ -316,7 +316,7 @@ int XmlVhostHandler::load (const char *filename)
   doc = parser.getDoc ();
   node = doc->children->children;
 
-  for (;node;node = node->next )
+  for (; node; node = node->next )
     {
       xmlNodePtr lcur;
       Vhost *vh;
@@ -324,15 +324,6 @@ int XmlVhostHandler::load (const char *filename)
         continue;
       lcur = node->children;
       vh = new Vhost (logManager);
-      if (vh == 0)
-        {
-          parser.close ();
-          clean ();
-          Server::getInstance ()->log (MYSERVER_LOG_MSG_ERROR,
-                                             _("internal error"), filename);
-          return -1;
-        }
-
       SslContext* sslContext = vh->getVhostSSLContext ();
 
       while (lcur)



commit dd2f7d5b995d1228dd5b5567f9a6cbccd1c15c61
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sun Mar 13 20:31:18 2011 +0100

    Http: remove the connection immediately if the host is not found
    
    do not attempt any access to the virtual host if it is not found.
    
    Reported by: Ludovic Courtès <ludo@gnu.org>

diff --git a/myserver/src/protocol/http/http.cpp b/myserver/src/protocol/http/http.cpp
index 11f2f37..c99e8b2 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -1000,12 +1000,13 @@ int Http::controlConnection (ConnectionPtr a, char*, char*, u_long, u_long,
           a->host = newHost;
           if (a->host == NULL)
             {
-              int ret = raiseHTTPError (400);
-              logHTTPaccess ();
-              if (ret == HttpDataHandler::RET_OK && keepalive)
-                return ClientsThread::KEEP_CONNECTION;
-              else
-                return ClientsThread::DELETE_CONNECTION;
+              Server::getInstance ()->log (MYSERVER_LOG_MSG_WARNING,
+                                           _("Cannot find host %s on %s (port %i)"),
+                                           host ? host->value.c_str () : "(NULL)",
+                                           a->getLocalIpAddr (),
+                                           a->getLocalPort ());
+
+              return ClientsThread::DELETE_CONNECTION;
             }
 
           if (td->request.uri.length () > 2 && td->request.uri[1] == '~')

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

Summary of changes:
 myserver/src/conf/vhost/xml_vhost_handler.cpp |   15 +++------------
 myserver/src/protocol/http/http.cpp           |   13 +++++++------
 2 files changed, 10 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Sat Mar 26 08:29:19 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q3ScJ-00076k-3f
	for mharc-myserver-commit@gnu.org; Sat, 26 Mar 2011 08:29:19 -0400
Received: from [140.186.70.92] (port=42742 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q3ScG-00076Q-PH
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 08:29:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1Q3ScF-0000kj-Jh
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 08:29:16 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:56786)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1Q3ScF-0000kf-H2
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 08:29:15 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Q3ScF-0003ib-8m
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 12:29:15 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Q3ScD-00016P-Vl
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 12:29:15 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: b8614bc80e8c7cc103ec020c75a7763ccfc0285c
X-Git-Newrev: e4a24e26a040e3e8bc597ffb5391e91b61850797
Message-Id: <E1Q3ScD-00016P-Vl@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 26 Mar 2011 12:29:14 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-435-ge4a24e2
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, 26 Mar 2011 12:29: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  e4a24e26a040e3e8bc597ffb5391e91b61850797 (commit)
      from  b8614bc80e8c7cc103ec020c75a7763ccfc0285c (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 e4a24e26a040e3e8bc597ffb5391e91b61850797
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 26 13:24:21 2011 +0100

    Remove unused variables.

diff --git a/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp b/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
index a0c6436..32f9a1c 100644
--- a/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
+++ b/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
@@ -1,11 +1,11 @@
 #include <include/http_handler/mscgi/mscgi_manager.h>
 
-static int isNumber (char* s)
+static int isNumber (char *s)
 {
-  if (!s)
+  if (! s)
     return 0;
   for (u_long i = 0; i < strlen (s); i++)
-    if (!isdigit (s[i]))
+    if (! isdigit (s[i]))
       return 0;
   return 1;
 }
@@ -17,7 +17,7 @@ EXPORTABLE(int) myserver_main (char *cmd, MsCgiData* data)
 {
   try
     {
-      MscgiManager cm(data);
+      MscgiManager cm (data);
       program_name = cmd;
       if (strlen (cmd) == 0)
         {
@@ -64,7 +64,7 @@ EXPORTABLE(int) myserver_main (char *cmd, MsCgiData* data)
             validNumbers = 0;
 
           tmp = cm.getParam ("b");
-          if (tmp && !isNumber(tmp))
+          if (tmp && !isNumber (tmp))
             validNumbers = 0;
 
           if (validNumbers)
@@ -91,15 +91,11 @@ EXPORTABLE(int) myserver_main (char *cmd, MsCgiData* data)
                   cm.write (tmp);
                 }
               else
-                cm.write("0");
+                cm.write ("0");
 
-              cm.write(" = ");
+              cm.write (" = ");
               iRes = a + b;
-#ifdef	WIN32
-              _i64toa(iRes, res, 10);
-#else
-              sprintf(res,"%i", (int) iRes);
-#endif
+              sprintf (res,"%i", (int) iRes);
               cm.write (res);
             }
           else
diff --git a/myserver/src/server/clients_thread.cpp b/myserver/src/server/clients_thread.cpp
index af5c39d..28018bd 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -115,8 +115,9 @@ DEFINE_THREAD (clients_thread, pParam)
 #ifdef WIN32
     return 1;
 #endif
+
 #ifdef HAVE_PTHREAD
-  return (void*)1;
+  return (void *) 1;
 #endif
 
   ct->threadIsRunning = true;
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 84c137c..94837ff 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -173,10 +173,6 @@ void Server::start (string &mainConf, string &mimeConf, string &vhostConf,
 
 {
   int err = 0;
-#ifdef WIN32
-  DWORD eventsCount, cNumRead;
-  INPUT_RECORD irInBuf[128];
-#endif
 
   this->genMainConf = genMainConf;
 

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

Summary of changes:
 .../binaries/web/cgi-src/math_sum/math_sum.cpp     |   20 ++++++++------------
 myserver/src/server/clients_thread.cpp             |    3 ++-
 myserver/src/server/server.cpp                     |    4 ----
 3 files changed, 10 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
GNU MyServer


From MAILER-DAEMON Sat Mar 26 12:23:36 2011
Received: from mailman by lists.gnu.org with archive (Exim 4.43)
	id 1Q3WH2-0000YR-S2
	for mharc-myserver-commit@gnu.org; Sat, 26 Mar 2011 12:23:36 -0400
Received: from [140.186.70.92] (port=47778 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q3WGy-0000YJ-Re
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 12:23:35 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1Q3WGw-0001fs-5O
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 12:23:32 -0400
Received: from colonialone.fsf.org ([140.186.70.51]:60714)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <gscrivano@gnu.org>) id 1Q3WGw-0001fo-0b
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 12:23:30 -0400
Received: from [10.1.0.108] (helo=vcs-noshell.in.savannah.gnu.org)
	by colonialone.fsf.org with esmtp (Exim 4.69)
	(envelope-from <gscrivano@gnu.org>) id 1Q3WGv-0006QR-HX
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 16:23:29 +0000
Received: from gscrivano by vcs-noshell.in.savannah.gnu.org with local (Exim
	4.69) (envelope-from <gscrivano@savannah.gnu.org>)
	id 1Q3WGv-0002J3-1Y
	for myserver-commit@gnu.org; Sat, 26 Mar 2011 16:23:29 +0000
To: myserver-commit@gnu.org
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e4a24e26a040e3e8bc597ffb5391e91b61850797
X-Git-Newrev: d43d99348dacaf75cd659a7dbc3bfad826e62442
Message-Id: <E1Q3WGv-0002J3-1Y@vcs-noshell.in.savannah.gnu.org>
From: Giuseppe Scrivano <gscrivano@gnu.org>
Date: Sat, 26 Mar 2011 16:23:29 +0000
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2)
X-Received-From: 140.186.70.51
Subject: [myserver-commit] [SCM] GNU MyServer branch, master,
	updated. v0.9.2-438-gd43d993
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, 26 Mar 2011 16:23: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  d43d99348dacaf75cd659a7dbc3bfad826e62442 (commit)
       via  4410223951f813987fd67a3e57610ac051d1c5a7 (commit)
       via  1d1cdfb9b06214fd9f0a6f89f7cdaf37d589941c (commit)
      from  e4a24e26a040e3e8bc597ffb5391e91b61850797 (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 d43d99348dacaf75cd659a7dbc3bfad826e62442
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 26 17:16:51 2011 +0100

    Do not `sync' at shutdown.

diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 12939c2..cd75834 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -66,7 +66,6 @@ void registerSignals ();
 void Sig_Quit (int signal)
 {
   Server::getInstance ()->log ("Exiting...");
-  sync ();
   Server::getInstance ()->stop ();
   registerSignals ();
 }



commit 4410223951f813987fd67a3e57610ac051d1c5a7
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 26 17:16:20 2011 +0100

    Simplify time functions using `strftime' instead of `asctime'.

diff --git a/myserver/include/base/string/stringutils.h b/myserver/include/base/string/stringutils.h
index 82bf044..295698c 100644
--- a/myserver/include/base/string/stringutils.h
+++ b/myserver/include/base/string/stringutils.h
@@ -40,14 +40,10 @@ const char *getRFC822LocalTime (const time_t, string &out);
 int getCharInString (const char*,const char*,int max);
 
 const char* getLocalLogFormatDate (const time_t t, char* out);
-const char* getGMTLogFormatDate (const time_t t, char* out);
 const char* getLocalLogFormatDate (char* out);
-const char* getGMTLogFormatDate (char* out);
 
 const char* getLocalLogFormatDate (const time_t t, string& out);
-const char* getGMTLogFormatDate (const time_t t, string& out);
 const char* getLocalLogFormatDate (string& out);
-const char* getGMTLogFormatDate (string& out);
 
 time_t getTime (const char* str);
 inline time_t getTime (string const& str){ return getTime (str.c_str ()); }
diff --git a/myserver/src/base/string/stringutils.cpp b/myserver/src/base/string/stringutils.cpp
index 11cf580..8944511 100644
--- a/myserver/src/base/string/stringutils.cpp
+++ b/myserver/src/base/string/stringutils.cpp
@@ -88,7 +88,7 @@ const char *getRFC822LocalTime (const time_t t, string &out)
 /*!
   This function format current time to the RFC 822 format.
  */
-const char *getRFC822GMTTime (char* out)
+const char *getRFC822GMTTime (char *out)
 {
   time_t ltime;
   time (&ltime);
@@ -98,49 +98,10 @@ const char *getRFC822GMTTime (char* out)
 /*!
   This function formats a time to the RFC 822 format.
  */
-const char *getRFC822GMTTime (const time_t ltime, char* out)
+const char *getRFC822GMTTime (const time_t ltime, char *out)
 {
-  char *asct;
-  char buffer[32];
-  u_long ind = 0;
   tm* gmTime = gmtime (&ltime);
-  gmTime->tm_year += 1900;
-  asct = asctime_r (gmTime, buffer);
-  out[ind++]= asct[0];
-  out[ind++]= asct[1];
-  out[ind++]= asct[2];
-  out[ind++] = ',';
-
-  if (asct[8] != ' ')
-    out[ind++] = ' ';
-
-  out[ind++] = asct[8];
-  out[ind++] = asct[9];
-  out[ind++] = ' ';
-  out[ind++]= asct[4];
-  out[ind++]= asct[5];
-  out[ind++]= asct[6];
-  out[ind++] = ' ';
-
-  sprintf (&out[ind], "%i", gmTime->tm_year);
-  ind += 4;
-
-  out[ind++] = ' ';
-  out[ind++]= asct[11];
-  out[ind++]= asct[12];
-  out[ind++] = ':';
-  out[ind++]= asct[14];
-  out[ind++]= asct[15];
-  out[ind++] = ':';
-  out[ind++]= asct[17];
-  out[ind++]= asct[18];
-  out[ind++] = ' ';
-  out[ind++] = 'G';
-  out[ind++] = 'M';
-  out[ind++] = 'T';
-  out[ind++] = '\0';
-  out[ind++] = '\0';
-  out[ind++] = '\0';
+  strftime (out, 32, "%a, %d %b %Y %H:%M:%S GMT", gmTime);
   return out;
 }
 
@@ -319,7 +280,7 @@ time_t getTime (const char* str)
 /*!
   This function format current time to the RFC 822 format.
  */
-const char *getRFC822LocalTime (char* out)
+const char *getRFC822LocalTime (char *out)
 {
   time_t ltime;
   time (&ltime);
@@ -328,59 +289,21 @@ const char *getRFC822LocalTime (char* out)
 /*!
   This function formats a time to the RFC 822 format.
  */
-const char *getRFC822LocalTime (const time_t ltime, char* out)
+const char *getRFC822LocalTime (const time_t ltime, char *out)
 {
   char *asct;
   tm result;
-  u_long ind = 0;
-  char buffer[32];
 
   myserver_localtime (&ltime, &result);
+  strftime (out, 32, "%a, %d %b %Y %H:%M:%S %z", &result);
 
-  result.tm_year += 1900;
-  asct = asctime_r (&result, buffer);
-  out[ind++] = asct[0];
-  out[ind++] = asct[1];
-  out[ind++] = asct[2];
-  out[ind++] = ',';
-
-  if (asct[8] != ' ')
-    out[ind++] = ' ';
-
-  out[ind++] = asct[8];
-  out[ind++] = asct[9];
-  out[ind++] = ' ';
-  out[ind++] = asct[4];
-  out[ind++] = asct[5];
-  out[ind++] = asct[6];
-  out[ind++] = ' ';
-
-  sprintf (&out[ind], "%i", result.tm_year);
-  ind += 4;
-
-  out[ind++] = ' ';
-  out[ind++] = asct[11];
-  out[ind++] = asct[12];
-  out[ind++] = ':';
-  out[ind++] = asct[14];
-  out[ind++] = asct[15];
-  out[ind++] = ':';
-  out[ind++] = asct[17];
-  out[ind++] = asct[18];
-  out[ind++] = ' ';
-  out[ind++] = '\0';
-  out[ind++] = '\0';
-  out[ind++] = '\0';
-  out[ind++] = '\0';
-  out[ind++] = '\0';
-  out[ind++] = '\0';
   return out;
 }
 
 /*!
   Get the local time string.
  */
-const char* getLocalLogFormatDate (char* out)
+const char* getLocalLogFormatDate (char *out)
 {
   time_t ltime;
   time (&ltime);
@@ -388,17 +311,6 @@ const char* getLocalLogFormatDate (char* out)
 }
 
 /*!
-  Get the GMT time string.
- */
-const char* getGMTLogFormatDate (char* out)
-{
-  time_t ltime;
-  time (&ltime);
-  return getGMTLogFormatDate (ltime, out);
-}
-
-
-/*!
   Get the local time string.
  */
 const char* getLocalLogFormatDate (const time_t t, string& out)
@@ -410,16 +322,6 @@ const char* getLocalLogFormatDate (const time_t t, string& out)
 }
 
 /*!
-  Get the GMT time string.
- */
-const char* getGMTLogFormatDate (const time_t t, string& out)
-{
-  char buff[32];
-  getGMTLogFormatDate (t, buff);
-  out.assign (buff);
-  return out.c_str ();
-}
-/*!
   Get the local time string.
  */
 const char* getLocalLogFormatDate (string& out)
@@ -431,51 +333,20 @@ const char* getLocalLogFormatDate (string& out)
 }
 
 /*!
-  Get the GMT time string.
- */
-const char* getGMTLogFormatDate (string& out)
-{
-  char buff[32];
-  getGMTLogFormatDate (buff);
-  out.assign (buff);
-  return out.c_str ();
-}
-
-/*!
   Get a string in the format "day/month/year:hour:minute:second offset"
   for the local zone.
  */
-const char* getLocalLogFormatDate (const time_t t, char* out)
+const char* getLocalLogFormatDate (const time_t t, char *out)
 {
   int offset = 0;
   time_t ltime;
-  time (&ltime);
   char *asct;
-  tm gmTime;
+  tm localTime;
   char buffer[32];
 
-  myserver_localtime (&ltime, &gmTime);
-
-  gmTime.tm_year += 1900;
-  asct = asctime_r (&gmTime, buffer);
-  out[0] = asct[8] != ' ' ? asct[8] : '0';
-  out[1] = asct[9];
-  out[2] = '/';
-  out[3] = asct[4];
-  out[4]= asct[5];
-  out[5] = asct[6];
-  out[6] = '/';
-  sprintf (&out[7], "%i", gmTime.tm_year);
-  out[11] = ':';
-  out[12] = asct[11];
-  out[13] = asct[12];
-  out[14] = ':';
-  out[15] = asct[14];
-  out[16] = asct[15];
-  out[17] = ':';
-  out[18] = asct[17];
-  out[19] = asct[18];
-  out[20] = ' ';
+  time (&ltime);
+
+  myserver_localtime (&ltime, &localTime);
 
 #ifndef WIN32
   extern long timezone;
@@ -488,7 +359,6 @@ const char* getLocalLogFormatDate (const time_t t, char* out)
 
   gettimeofday (&tv, &tz);
   offset = -tz.tz_minuteswest * 60;
-
 # else
   TIME_ZONE_INFORMATION tzi;
   GetTimeZoneInformation (&tzi);
@@ -497,6 +367,9 @@ const char* getLocalLogFormatDate (const time_t t, char* out)
 
 #endif
 
+  strftime (out, 32, "%d/%b/%Y:%H:%M:%S", &localTime);
+  out[20] = ' ';
+
   if (offset < 0)
     {
       offset = -offset;
@@ -504,51 +377,9 @@ const char* getLocalLogFormatDate (const time_t t, char* out)
     }
   else
     out[21] = '+';
-  sprintf (&out[22], "%.2i%.2i", offset / (60 * 60), offset % (60 * 60) / 60);
-  out[26] = '\0';
-  return out;
-}
 
+  sprintf (&out[22], "%.2i%.2i", offset / (60 * 60), offset % (60 * 60) / 60);
 
-/*!
-  Get a string in the format "day/month/year:hour:minute:second offset"
-  for the GMT zone.
- */
-const char* getGMTLogFormatDate (const time_t t, char* out)
-{
-  time_t ltime;
-  time (&ltime);
-  char *asct;
-  tm result;
-  char buffer[32];
-
-  myserver_localtime ( &ltime, &result );
-
-  result.tm_year += 1900;
-  asct = asctime_r (&result, buffer);
-  out[0] = asct[8] != ' ' ? asct[8] : '0';
-  out[1] = asct[9];
-  out[2] = '/';
-  out[3] = asct[4];
-  out[4] = asct[5];
-  out[5] = asct[6];
-  out[6] = '/';
-  sprintf (&out[7], "%i", result.tm_year);
-  out[11] = ':';
-  out[12] = asct[11];
-  out[13] = asct[12];
-  out[14] = ':';
-  out[15] = asct[14];
-  out[16] = asct[15];
-  out[17] = ':';
-  out[18] = asct[17];
-  out[19] = asct[18];
-  out[20] = ' ';
-  out[21] = '+';
-  out[22] = '0';
-  out[23] = '0';
-  out[24] = '0';
-  out[25] = '0';
   out[26] = '\0';
   return out;
 }
diff --git a/myserver/tests/test_stringutils.cpp b/myserver/tests/test_stringutils.cpp
index 100dee8..cb9b14b 100644
--- a/myserver/tests/test_stringutils.cpp
+++ b/myserver/tests/test_stringutils.cpp
@@ -93,12 +93,12 @@ public:
     time_t epoch = 0;
     string out;
     const char* ret = getRFC822GMTTime (epoch, out);
-    CPPUNIT_ASSERT (! strcasecmp (ret, "Thu, 1 Jan 1970 00:00:00 GMT"));
-    CPPUNIT_ASSERT (! strcasecmp (out.c_str (), "Thu, 1 Jan 1970 00:00:00 GMT"));
+    CPPUNIT_ASSERT (! strcasecmp (ret, "Thu, 01 Jan 1970 00:00:00 GMT"));
+    CPPUNIT_ASSERT (! strcasecmp (out.c_str (), "Thu, 01 Jan 1970 00:00:00 GMT"));
 
     ret = getRFC822GMTTime (1009972800, out);
-    CPPUNIT_ASSERT (! strcasecmp (ret, "Wed, 2 Jan 2002 12:00:00 GMT"));
-    CPPUNIT_ASSERT (! strcasecmp (out.c_str (), "Wed, 2 Jan 2002 12:00:00 GMT"));
+    CPPUNIT_ASSERT (! strcasecmp (ret, "Wed, 02 Jan 2002 12:00:00 GMT"));
+    CPPUNIT_ASSERT (! strcasecmp (out.c_str (), "Wed, 02 Jan 2002 12:00:00 GMT"));
   }
 
   void testGetTime ()



commit 1d1cdfb9b06214fd9f0a6f89f7cdaf37d589941c
Author: Giuseppe Scrivano <gscrivano@gnu.org>
Date:   Sat Mar 26 14:32:17 2011 +0100

    Update `bootstrap' from upstream.

diff --git a/myserver/bootstrap b/myserver/bootstrap
index 1ffaaa9..f004ad3 100755
--- a/myserver/bootstrap
+++ b/myserver/bootstrap
@@ -1,11 +1,10 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-05-14.09; # UTC
+scriptversion=2011-03-03.12; # UTC
 
 # Bootstrap this package from checked-out sources.
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-# Free Software Foundation, Inc.
+# Copyright (C) 2003-2011 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
@@ -43,24 +42,32 @@ local_gl_dir=gl
 bt='._bootmp'
 bt_regex=`echo "$bt"| sed 's/\./[.]/g'`
 bt2=${bt}2
+me=$0
 
 usage() {
   cat <<EOF
-Usage: $0 [OPTION]...
+Usage: $me [OPTION]...
 Bootstrap this package from the checked-out sources.
 
 Options:
- --gnulib-srcdir=DIRNAME  Specify the local directory where gnulib
+ --gnulib-srcdir=DIRNAME  specify the local directory where gnulib
                           sources reside.  Use this if you already
                           have gnulib sources on your machine, and
                           do not want to waste your bandwidth downloading
-                          them again.  Defaults to \$GNULIB_SRCDIR.
- --copy                   Copy files instead of creating symbolic links.
- --force                  Attempt to bootstrap even if the sources seem
-                          not to have been checked out.
- --skip-po                Do not download po files.
-
-If the file $0.conf exists in the same directory as this script, its
+                          them again.  Defaults to \$GNULIB_SRCDIR
+ --bootstrap-sync         if this bootstrap script is not identical to
+                          the version in the local gnulib sources,
+                          update this script, and then restart it with
+                          /bin/sh or the shell \$CONFIG_SHELL
+ --no-bootstrap-sync      do not check whether bootstrap is out of sync
+ --copy                   copy files instead of creating symbolic links
+ --force                  attempt to bootstrap even if the sources seem
+                          not to have been checked out
+ --no-git                 do not use git to update gnulib.  Requires that
+                          --gnulib-srcdir point to a correct gnulib snapshot
+ --skip-po                do not download po files
+
+If the file $me.conf exists in the same directory as this script, its
 contents are read as shell variables to configure the bootstrap.
 
 For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR
@@ -81,6 +88,10 @@ gnulib_modules=
 # Any gnulib files needed that are not in modules.
 gnulib_files=
 
+# A function to be called to edit gnulib.mk right after it's created.
+# Override it via your own definition in bootstrap.conf.
+gnulib_mk_hook() { :; }
+
 # A function to be called after everything else in this script.
 # Override it via your own definition in bootstrap.conf.
 bootstrap_epilogue() { :; }
@@ -91,7 +102,8 @@ bootstrap_epilogue() { :; }
 # options because the latest/%s directory and the .po files within are
 # all symlinks.
 po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
 
 extract_package_name='
   /^AC_INIT(/{
@@ -164,6 +176,13 @@ copy=false
 # on which version control system (if any) is used in the source directory.
 vc_ignore=auto
 
+# Set this to true in bootstrap.conf to enable --bootstrap-sync by
+# default.
+bootstrap_sync=false
+
+# Use git to update gnulib sources
+use_git=true
+
 # find_tool ENVVAR NAMES...
 # -------------------------
 # Search for a required program.  Use the value of ENVVAR, if set,
@@ -188,11 +207,11 @@ find_tool ()
     find_tool_error_prefix="\$$find_tool_envvar: "
   fi
   if test x"$find_tool_res" = x; then
-    echo >&2 "$0: one of these is required: $find_tool_names"
+    echo >&2 "$me: one of these is required: $find_tool_names"
     exit 1
   fi
   ($find_tool_res --version </dev/null) >/dev/null 2>&1 || {
-    echo >&2 "$0: ${find_tool_error_prefix}cannot run $find_tool_res --version"
+    echo >&2 "$me: ${find_tool_error_prefix}cannot run $find_tool_res --version"
     exit 1
   }
   eval "$find_tool_envvar=\$find_tool_res"
@@ -235,12 +254,25 @@ do
     checkout_only_file=;;
   --copy)
     copy=true;;
+  --bootstrap-sync)
+    bootstrap_sync=true;;
+  --no-bootstrap-sync)
+    bootstrap_sync=false;;
+  --no-git)
+    use_git=false;;
   *)
     echo >&2 "$0: $option: unknown option"
     exit 1;;
   esac
 done
 
+if $use_git || test -d "$GNULIB_SRCDIR"; then
+  :
+else
+  echo "$0: Error: --no-git requires --gnulib-srcdir" >&2
+  exit 1
+fi
+
 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
@@ -257,6 +289,21 @@ insert_sorted_if_absent() {
     || exit 1
 }
 
+# Adjust $PATTERN for $VC_IGNORE_FILE and insert it with
+# insert_sorted_if_absent.
+insert_vc_ignore() {
+  vc_ignore_file="$1"
+  pattern="$2"
+  case $vc_ignore_file in
+  *.gitignore)
+    # A .gitignore entry that does not start with `/' applies
+    # recursively to subdirectories, so prepend `/' to every
+    # .gitignore entry.
+    pattern=`echo "$pattern" | sed s,^,/,`;;
+  esac
+  insert_sorted_if_absent "$vc_ignore_file" "$pattern"
+}
+
 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac.
 found_aux_dir=no
 grep '^[	 ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \
@@ -275,7 +322,7 @@ if test ! -d $build_aux; then
   mkdir $build_aux
   for dot_ig in x $vc_ignore; do
     test $dot_ig = x && continue
-    insert_sorted_if_absent $dot_ig $build_aux
+    insert_vc_ignore $dot_ig $build_aux
   done
 fi
 
@@ -325,17 +372,18 @@ get_version() {
   $app --version >/dev/null 2>&1 || return 1
 
   $app --version 2>&1 |
-  sed -n '# extract version within line
-          s/.*[v ]\{1,\}\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
-          t done
+  sed -n '# Move version to start of line.
+          s/.*[v ]\([0-9]\)/\1/
+
+          # Skip lines that do not start with version.
+          /^[0-9]/!d
 
-          # extract version at start of line
-          s/^\([0-9]\{1,\}\.[.a-z0-9-]*\).*/\1/
-          t done
+          # Remove characters after the version.
+          s/[^.a-z0-9-].*//
 
-          d
+          # The first component must be digits only.
+          s/^\([0-9]*\)[a-z-].*/\1/
 
-          :done
           #the following essentially does s/5.005/5.5/
           s/\.0*\([1-9]\)/.\1/g
           p
@@ -346,18 +394,26 @@ check_versions() {
   ret=0
 
   while read app req_ver; do
+    # We only need libtoolize from the libtool package.
+    if test "$app" = libtool; then
+      app=libtoolize
+    fi
+    # Exempt git if --no-git is in effect.
+    if test "$app" = git; then
+      $use_git || continue
+    fi
     # Honor $APP variables ($TAR, $AUTOCONF, etc.)
-    appvar=`echo $app | tr '[a-z]' '[A-Z]'`
+    appvar=`echo $app | tr '[a-z]-' '[A-Z]_'`
     test "$appvar" = TAR && appvar=AMTAR
     eval "app=\${$appvar-$app}"
     inst_ver=$(get_version $app)
     if [ ! "$inst_ver" ]; then
-      echo "Error: '$app' not found" >&2
+      echo "$me: Error: '$app' not found" >&2
       ret=1
     elif [ ! "$req_ver" = "-" ]; then
       latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2)
       if [ ! "$latest_ver" = "$inst_ver" ]; then
-        echo "Error: '$app' version == $inst_ver is too old" >&2
+        echo "$me: Error: '$app' version == $inst_ver is too old" >&2
         echo "       '$app' version >= $req_ver is required" >&2
         ret=1
       fi
@@ -370,16 +426,30 @@ check_versions() {
 print_versions() {
   echo "Program    Min_version"
   echo "----------------------"
-  printf "$buildreq"
+  printf %s "$buildreq"
   echo "----------------------"
   # can't depend on column -t
 }
 
+use_libtool=0
+# We'd like to use grep -E, to see if any of LT_INIT,
+# AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
+# but that's not portable enough (e.g., for Solaris).
+grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
+  && use_libtool=1
+grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
+  && use_libtool=1
+if test $use_libtool = 1; then
+  find_tool LIBTOOLIZE glibtoolize libtoolize
+fi
+
 if ! printf "$buildreq" | check_versions; then
-  test -f README-prereq &&
-  echo "See README-prereq for notes on obtaining these prerequisite programs:" >&2
-  echo
-  print_versions
+  echo >&2
+  if test -f README-prereq; then
+    echo "$0: See README-prereq for how to get the prerequisite programs" >&2
+  else
+    echo "$0: Please install the prerequisite programs" >&2
+  fi
   exit 1
 fi
 
@@ -390,11 +460,11 @@ if test -d .git && (git --version) >/dev/null 2>/dev/null ; then
   if git config merge.merge-changelog.driver >/dev/null ; then
     :
   elif (git-merge-changelog --version) >/dev/null 2>/dev/null ; then
-    echo "initializing git-merge-changelog driver"
+    echo "$0: initializing git-merge-changelog driver"
     git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver'
     git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B'
   else
-    echo "consider installing git-merge-changelog from gnulib"
+    echo "$0: consider installing git-merge-changelog from gnulib"
   fi
 fi
 
@@ -410,7 +480,7 @@ git_modules_config () {
 }
 
 gnulib_path=`git_modules_config submodule.gnulib.path`
-test -n "$gnulib_path" || gnulib_path="gnulib"
+test -z "$gnulib_path" && gnulib_path=gnulib
 
 # Get gnulib files.
 
@@ -426,8 +496,8 @@ case ${GNULIB_SRCDIR--} in
 
     trap cleanup_gnulib 1 2 13 15
 
-    git clone 2>&1 -h|grep -- --depth > /dev/null \
-        && shallow='--depth 2'|| shallow=
+    shallow=
+    git clone -h 2>&1 | grep -- --depth > /dev/null && shallow='--depth 2'
     git clone $shallow git://git.sv.gnu.org/gnulib "$gnulib_path" ||
       cleanup_gnulib
 
@@ -463,6 +533,16 @@ case ${GNULIB_SRCDIR--} in
   ;;
 esac
 
+if $bootstrap_sync; then
+  cmp -s "$0" "$GNULIB_SRCDIR/build-aux/bootstrap" || {
+    echo "$0: updating bootstrap and restarting..."
+    exec sh -c \
+      'cp "$1" "$2" && shift && exec "${CONFIG_SHELL-/bin/sh}" "$@"' \
+      -- "$GNULIB_SRCDIR/build-aux/bootstrap" \
+      "$0" "$@" --no-bootstrap-sync
+  }
+fi
+
 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 <$gnulib_tool || exit
 
@@ -471,20 +551,22 @@ gnulib_tool=$GNULIB_SRCDIR/gnulib-tool
 download_po_files() {
   subdir=$1
   domain=$2
-  echo "$0: getting translations into $subdir for $domain..."
+  echo "$me: getting translations into $subdir for $domain..."
   cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
   eval "$cmd"
 }
 
-# Download .po files to $po_dir/.reference and copy only the new
+# Mirror .po files to $po_dir/.reference and copy only the new
 # or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
 update_po_files() {
   # Directory containing primary .po files.
   # Overwrite them only when we're sure a .po file is new.
   po_dir=$1
   domain=$2
 
-  # Download *.po files into this dir.
+  # Mirror *.po files into this dir.
   # Usually contains *.s1 checksum files.
   ref_po_dir="$po_dir/.reference"
 
@@ -503,7 +585,7 @@ update_po_files() {
         ! test -f "$po_dir/$po.po" ||
         ! $SHA1SUM -c --status "$cksum_file" \
             < "$new_po" > /dev/null; then
-      echo "updated $po_dir/$po.po..."
+      echo "$me: updated $po_dir/$po.po..."
       cp "$new_po" "$po_dir/$po.po" \
           && $SHA1SUM < "$new_po" > "$cksum_file"
     fi
@@ -541,20 +623,20 @@ symlink_to_dir()
       for dot_ig in x $vc_ignore; do
         test $dot_ig = x && continue
         ig=$parent/$dot_ig
-        insert_sorted_if_absent $ig `echo "$dst_dir"|sed 's,.*/,,'`
+        insert_vc_ignore $ig `echo "$dst_dir"|sed 's,.*/,,'`
       done
     fi
 
     if $copy; then
       {
         test ! -h "$dst" || {
-          echo "$0: rm -f $dst" &&
+          echo "$me: rm -f $dst" &&
           rm -f "$dst"
         }
       } &&
       test -f "$dst" &&
       cmp -s "$src" "$dst" || {
-        echo "$0: cp -fp $src $dst" &&
+        echo "$me: cp -fp $src $dst" &&
         cp -fp "$src" "$dst"
       }
     else
@@ -568,7 +650,7 @@ symlink_to_dir()
         *)
           case /$dst/ in
           *//* | */../* | */./* | /*/*/*/*/*/)
-             echo >&2 "$0: invalid symlink calculation: $src -> $dst"
+             echo >&2 "$me: invalid symlink calculation: $src -> $dst"
              exit 1;;
           /*/*/*/*/)	dot_dots=../../../;;
           /*/*/*/)	dot_dots=../../;;
@@ -576,7 +658,7 @@ symlink_to_dir()
           esac;;
         esac
 
-        echo "$0: ln -fs $dot_dots$src $dst" &&
+        echo "$me: ln -fs $dot_dots$src $dst" &&
         ln -fs "$dot_dots$src" "$dst"
       }
     fi
@@ -609,7 +691,7 @@ cp_mark_as_generated()
       cmp -s "$cp_src" "$cp_dst" || {
         # Copy the file first to get proper permissions if it
         # doesn't already exist.  Then overwrite the copy.
-        echo "$0: cp -f $cp_src $cp_dst" &&
+        echo "$me: cp -f $cp_src $cp_dst" &&
         rm -f "$cp_dst" &&
         cp "$cp_src" "$cp_dst-t" &&
         sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
@@ -627,7 +709,7 @@ cp_mark_as_generated()
       if cmp -s "$cp_dst-t" "$cp_dst"; then
         rm -f "$cp_dst-t"
       else
-        echo "$0: cp $cp_src $cp_dst # with edits" &&
+        echo "$me: cp $cp_src $cp_dst # with edits" &&
         mv -f "$cp_dst-t" "$cp_dst"
       fi
     fi
@@ -646,7 +728,7 @@ version_controlled_file() {
   elif test -d .svn; then
     svn log -r HEAD "$dir/$file" > /dev/null 2>&1 && found=yes
   else
-    echo "$0: no version control for $dir/$file?" >&2
+    echo "$me: no version control for $dir/$file?" >&2
   fi
   test $found = yes
 }
@@ -658,7 +740,8 @@ slurp() {
     for file in `ls -a $1/$dir`; do
       case $file in
       .|..) continue;;
-      .*) continue;; # FIXME: should all file names starting with "." be ignored?
+      # FIXME: should all file names starting with "." be ignored?
+      .*) continue;;
       esac
       test -d $1/$dir/$file && continue
       for excluded_file in $excluded_files; do
@@ -667,18 +750,20 @@ slurp() {
       if test $file = Makefile.am && test "X$gnulib_mk" != XMakefile.am; then
         copied=$copied${sep}$gnulib_mk; sep=$nl
         remove_intl='/^[^#].*\/intl/s/^/#/;'"s!$bt_regex/!!g"
-        sed "$remove_intl" $1/$dir/$file | cmp - $dir/$gnulib_mk > /dev/null || {
-          echo "$0: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
+        sed "$remove_intl" $1/$dir/$file |
+        cmp - $dir/$gnulib_mk > /dev/null || {
+          echo "$me: Copying $1/$dir/$file to $dir/$gnulib_mk ..." &&
           rm -f $dir/$gnulib_mk &&
-          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk
+          sed "$remove_intl" $1/$dir/$file >$dir/$gnulib_mk &&
+          gnulib_mk_hook $dir/$gnulib_mk
         }
       elif { test "${2+set}" = set && test -r $2/$dir/$file; } ||
            version_controlled_file $dir $file; then
-        echo "$0: $dir/$file overrides $1/$dir/$file"
+        echo "$me: $dir/$file overrides $1/$dir/$file"
       else
         copied=$copied$sep$file; sep=$nl
         if test $file = gettext.m4; then
-          echo "$0: patching m4/gettext.m4 to remove need for intl/* ..."
+          echo "$me: patching m4/gettext.m4 to remove need for intl/* ..."
           rm -f $dir/$file
           sed '
             /^AC_DEFUN(\[AM_INTL_SUBDIR],/,/^]/c\
@@ -698,18 +783,25 @@ slurp() {
       test $dot_ig = x && continue
       ig=$dir/$dot_ig
       if test -n "$copied"; then
-        insert_sorted_if_absent $ig "$copied"
+        insert_vc_ignore $ig "$copied"
         # If an ignored file name ends with .in.h, then also add
         # the name with just ".h".  Many gnulib headers are generated,
         # e.g., stdint.in.h -> stdint.h, dirent.in.h ->..., etc.
         # Likewise for .gperf -> .h, .y -> .c, and .sin -> .sed
-        f=`echo "$copied"|sed 's/\.in\.h$/.h/;s/\.sin$/.sed/;s/\.y$/.c/;s/\.gperf$/.h/'`
-        insert_sorted_if_absent $ig "$f"
+        f=`echo "$copied" |
+          sed '
+            s/\.in\.h$/.h/
+            s/\.sin$/.sed/
+            s/\.y$/.c/
+            s/\.gperf$/.h/
+          '
+        `
+        insert_vc_ignore $ig "$f"
 
         # For files like sys_stat.in.h and sys_time.in.h, record as
         # ignorable the directory we might eventually create: sys/.
         f=`echo "$copied"|sed 's/sys_.*\.in\.h$/sys/'`
-        insert_sorted_if_absent $ig "$f"
+        insert_vc_ignore $ig "$f"
       fi
     done
   done
@@ -734,6 +826,12 @@ gnulib_tool_options="\
  --local-dir $local_gl_dir\
  $gnulib_tool_option_extras\
 "
+if test $use_libtool = 1; then
+  case "$gnulib_tool_options " in
+    *' --libtool '*) ;;
+    *) gnulib_tool_options="$gnulib_tool_options --libtool" ;;
+  esac
+fi
 echo "$0: $gnulib_tool $gnulib_tool_options --import ..."
 $gnulib_tool $gnulib_tool_options --import $gnulib_modules &&
 slurp $bt || exit
@@ -776,26 +874,18 @@ grep -E '^[	 ]*AC_CONFIG_HEADERS?\>' configure.ac >/dev/null ||
 
 for command in \
   libtool \
-  "${ACLOCAL-aclocal} --force -I m4" \
+  "${ACLOCAL-aclocal} --force -I '$m4_base' $ACLOCAL_FLAGS" \
   "${AUTOCONF-autoconf} --force" \
   "${AUTOHEADER-autoheader} --force" \
   "${AUTOMAKE-automake} --add-missing --copy --force-missing"
 do
   if test "$command" = libtool; then
-    use_libtool=0
-    # We'd like to use grep -E, to see if any of LT_INIT,
-    # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac,
-    # but that's not portable enough (e.g., for Solaris).
-    grep '^[	 ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \
-      && use_libtool=1
-    grep '^[	 ]*LT_INIT' configure.ac >/dev/null \
-      && use_libtool=1
     test $use_libtool = 0 \
       && continue
     command="${LIBTOOLIZE-libtoolize} -c -f"
   fi
   echo "$0: $command ..."
-  $command || exit
+  eval "$command" || exit
 done
 
 

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

Summary of changes:
 myserver/bootstrap                         |  228 +++++++++++++++++++---------
 myserver/include/base/string/stringutils.h |    4 -
 myserver/src/base/string/stringutils.cpp   |  201 ++----------------------
 myserver/src/myserver.cpp                  |    1 -
 myserver/tests/test_stringutils.cpp        |    8 +-
 5 files changed, 179 insertions(+), 263 deletions(-)


hooks/post-receive
-- 
GNU MyServer


