[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-516-g1fb3b72

[Giuseppe Scrivano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU MyServer".

The branch, master has been updated
       via  1fb3b72ff53ea5a9fbfd0ff03fd5bd4a0fd7f9aa (commit)
       via  bc286bae9a600ae20967dde431a01755a127ddd2 (commit)
      from  630ad2235de3336f97d232a218fe82ceadf79009 (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 1fb3b72ff53ea5a9fbfd0ff03fd5bd4a0fd7f9aa
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Oct 22 00:29:55 2011 +0200

    Fix a file descriptors leak when the server is rebooted.

diff --git a/myserver/src/base/socket_pair/socket_pair.cpp 
b/myserver/src/base/socket_pair/socket_pair.cpp
index 16df9e9..663c7b8 100644
--- a/myserver/src/base/socket_pair/socket_pair.cpp
+++ b/myserver/src/base/socket_pair/socket_pair.cpp
@@ -51,7 +51,7 @@ using namespace std;
 
 SocketPair::SocketPair ()
 {
-
+  handles[0] = handles[1] = -1;
 }
 
 /*!
diff --git a/myserver/src/connections_scheduler/connections_scheduler.cpp 
b/myserver/src/connections_scheduler/connections_scheduler.cpp
index b5c8f5c..801cfec 100644
--- a/myserver/src/connections_scheduler/connections_scheduler.cpp
+++ b/myserver/src/connections_scheduler/connections_scheduler.cpp
@@ -317,6 +317,8 @@ void ConnectionsScheduler::registerConnectionID 
(ConnectionPtr connection)
  */
 void ConnectionsScheduler::restart ()
 {
+  static int i = 0;
+
   readyMutex.init ();
   connectionsMutex.init ();
   eventsMutex.init ();
@@ -327,6 +329,7 @@ void ConnectionsScheduler::restart ()
 
   readySemaphore = new Semaphore (0);
 
+  dispatcherArg.socketPair.close ();
   initialize ();
 }
 
@@ -335,7 +338,11 @@ void ConnectionsScheduler::restart ()
  */
 void ConnectionsScheduler::initialize ()
 {
-  event_init ();
+  static int event_initialized = 0;
+
+  if (! event_initialized)
+    event_init ();
+  event_initialized = 1;
 
   dispatcherArg.terminated = true;
   dispatcherArg.terminate = false;
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 7275569..716666f 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -1516,7 +1516,6 @@ int Server::reboot ()
 
   mustEndServer = false;
 
-
   rebooting = false;
 
   ret = initialize () || postLoad ();



commit bc286bae9a600ae20967dde431a01755a127ddd2
Author: Giuseppe Scrivano <address@hidden>
Date:   Wed Oct 12 15:02:06 2011 +0200

    bootstrap: add `opendir' and `closedir' to deal with new gnulib versions.

diff --git a/myserver/binaries/Makefile.am b/myserver/binaries/Makefile.am
index a0e97db..a450359 100644
--- a/myserver/binaries/Makefile.am
+++ b/myserver/binaries/Makefile.am
@@ -21,3 +21,13 @@ examplesdir = $(docdir)/examples
 
 dist_examples_DATA = myserver-daemon MIMEtypes.default.xml 
myserver.default.xml \
                        virtualhosts.default.xml
+
+confdir = $(sysconfdir)/myserver
+
+conf_DATA = MIMEtypes.default.xml myserver.default.xml \
+                       virtualhosts.default.xml
+
+install-data-hook:
+       mv $(DESTDIR)$(sysconfdir)/myserver/MIMEtypes.default.xml 
$(DESTDIR)$(sysconfdir)/myserver/MIMEtypes.xml
+       mv $(DESTDIR)$(sysconfdir)/myserver/myserver.default.xml 
$(DESTDIR)$(sysconfdir)/myserver/myserver.xml
+       mv $(DESTDIR)$(sysconfdir)/myserver/virtualhosts.default.xml 
$(DESTDIR)$(sysconfdir)/myserver/virtualhosts.xml
diff --git a/myserver/binaries/system/Makefile.am 
b/myserver/binaries/system/Makefile.am
index f349827..f02c2d8 100644
--- a/myserver/binaries/system/Makefile.am
+++ b/myserver/binaries/system/Makefile.am
@@ -21,4 +21,5 @@ myserverdatadir = $(docdir)/examples
 dist_myserverdata_DATA = .security.xml
 
 install-data-hook:
+       cp $(DESTDIR)$(docdir)/examples/.security.xml 
$(DESTDIR)$(datadir)/myserver/system/.security.xml
        mv $(DESTDIR)$(docdir)/examples/.security.xml 
$(DESTDIR)$(docdir)/examples/security.default.xml
diff --git a/myserver/binaries/virtualhosts.default.xml 
b/myserver/binaries/virtualhosts.default.xml
index 6f43c20..e0e60da 100755
--- a/myserver/binaries/virtualhosts.default.xml
+++ b/myserver/binaries/virtualhosts.default.xml
@@ -8,15 +8,15 @@
     <PORT>80</PORT>
     <PROTOCOL>HTTP</PROTOCOL>
 
-    <DOCROOT>web</DOCROOT>
-    <SYSROOT>system</SYSROOT>
+    <DOCROOT>/var/www</DOCROOT>
+    <SYSROOT>/usr/share/myserver/system</SYSROOT>
 
     <ACCESSLOG>
-      <STREAM location="file://logs/MyServerHTTP.log" cycle="1048576"/>
+      <STREAM location="file:///var/log/myserver/MyServerHTTP.log" 
cycle="1048576"/>
     </ACCESSLOG>
 
     <WARNINGLOG>
-      <STREAM location="file://logs/MyServerHTTP.err" cycle="1048576"/>
+      <STREAM location="file:///var/log/myserver/MyServerHTTP.err" 
cycle="1048576"/>
     </WARNINGLOG>
   </VHOST>
 
@@ -26,15 +26,15 @@
     <PORT>21</PORT>
     <PROTOCOL>FTP</PROTOCOL>
 
-    <DOCROOT>web</DOCROOT>
-    <SYSROOT>system</SYSROOT>
+    <DOCROOT>/var/www</DOCROOT>
+    <SYSROOT>/usr/share/myserver/system</SYSROOT>
 
     <ACCESSLOG>
-      <STREAM location="file://logs/MyServerFTP.log" cycle="1048576"/>
+      <STREAM location="file:///var/log/myserver/MyServerFTP.log" 
cycle="1048576"/>
     </ACCESSLOG>
 
     <WARNINGLOG>
-      <STREAM location="file://logs/MyServerFTP.err" cycle="1048576"/>
+      <STREAM location="file:///var/log/myserver/MyServerFTP.err" 
cycle="1048576"/>
     </WARNINGLOG>
   </VHOST>
 </VHOSTS>
diff --git a/myserver/bootstrap.conf b/myserver/bootstrap.conf
index d059b7c..bbd3918 100644
--- a/myserver/bootstrap.conf
+++ b/myserver/bootstrap.conf
@@ -30,6 +30,7 @@ argp
 bind
 chdir-long
 close
+closedir
 crypto/md5
 crypto/sha1
 connect
@@ -53,6 +54,7 @@ mkostemp
 mktime
 nproc
 open
+opendir
 pipe
 read-file
 readlink
diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index b501a8e..9ed2258 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -800,7 +800,7 @@ int Http::logHTTPaccess ()
           HttpRequestHeader::Entry *userAgent = td->request.other.get 
("user-agent");
           HttpRequestHeader::Entry *referer = td->request.other.get ("refer");
 
-          if (strstr ((td->connection->host)->getAccessLogOpt (), 
"type=combined"))
+          if (strstr (td->connection->host->getAccessLogOpt (), 
"type=combined"))
             *td->auxiliaryBuffer << " " << (referer ? referer->value.c_str () 
: "")
             << " " << (userAgent ? userAgent->value.c_str () : "");
         }

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

Summary of changes:
 myserver/binaries/Makefile.am                      |   10 ++++++++++
 myserver/binaries/system/Makefile.am               |    1 +
 myserver/binaries/virtualhosts.default.xml         |   16 ++++++++--------
 myserver/bootstrap.conf                            |    2 ++
 myserver/src/base/socket_pair/socket_pair.cpp      |    2 +-
 .../connections_scheduler.cpp                      |    9 ++++++++-
 myserver/src/protocol/http/http.cpp                |    2 +-
 myserver/src/server/server.cpp                     |    1 -
 8 files changed, 31 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
GNU MyServer