[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-434-gb8614bc

[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  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 <address@hidden>
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 <address@hidden>
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 <address@hidden>

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