[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-67-g
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-67-gcb02215 |
|
Date: |
Mon, 01 Mar 2010 22:00: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 cb02215daa8ee1a11974a22491d7c24d6d516f94 (commit)
via a177f2c266a5db03b15757934b115a983632f01a (commit)
via db17b3f78e450097ef710ebf5868b93dc17e1757 (commit)
via 2c27c403fd42c81d11c70e8dd932975fd2886540 (commit)
via 41080a29f4368c94ee06478dc941c4683a6d4d08 (commit)
from 59af38244e9dea8871df6294c59158676198ea63 (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 cb02215daa8ee1a11974a22491d7c24d6d516f94
Author: Giuseppe Scrivano <address@hidden>
Date: Mon Mar 1 23:00:52 2010 +0100
Make XmlVhostHandler a base class for the guile_conf plugin vhost manager
diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h
b/myserver/include/conf/vhost/xml_vhost_handler.h
index 7f6f2fc..9fcd225 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -39,7 +39,7 @@ public:
vector<Vhost*>* getVHostList ();
/*! Get a pointer to a vhost. */
- Vhost* getVHost (const char*, const char*, u_short);
+ virtual Vhost* getVHost (const char*, const char*, u_short);
/*! Add an element to the vhost list. */
int addVHost (Vhost*);
diff --git a/plugins/src/guile_conf/guile_conf.cpp
b/plugins/src/guile_conf/guile_conf.cpp
index 868f51f..a0cd0cc 100644
--- a/plugins/src/guile_conf/guile_conf.cpp
+++ b/plugins/src/guile_conf/guile_conf.cpp
@@ -20,6 +20,7 @@
#include <guile/gh.h>
#include <include/plugin/plugin.h>
#include <include/conf/main/main_configuration.h>
+#include <include/conf/vhost/xml_vhost_handler.h>
#include <include/server/server.h>
#include <string.h>
@@ -122,57 +123,12 @@ GuileConfiguration::readData (list<NodeTree<string>*>
*hashedDataTrees,
}
}
-class GuileVhostManagerHandler : public VhostManagerHandler
+class GuileVhostManagerHandler : public XmlVhostHandler
{
- vector<Vhost*> vhosts;
- ListenThreads* lt;
- LogManager* lm;
public:
- GuileVhostManagerHandler (ListenThreads* lt, LogManager* lm)
+ GuileVhostManagerHandler (ListenThreads* lt, LogManager* lm) :
+ XmlVhostHandler (lt, lm)
{
- this->lm = lm;
- this->lt = lt;
- }
-
- virtual Vhost* getVHost (const char *host, const char *ip, u_short port)
- {
- vector<Vhost*>::iterator it;
-
- try
- {
- it = vhosts.begin ();
-
- /*Do a linear search here. We have to use the first full-matching
- *virtual host.
- */
- for (; it != vhosts.end (); it++)
- {
- Vhost* vh = *it;
- /* Control if the host port is the correct one. */
- if (vh->getPort () != port)
- continue;
- /* If ip is defined check that it is allowed to connect to the
host. */
- if (ip && !vh->isIPAllowed (ip))
- continue;
- /* If host is defined check if it is allowed to connect to the
host. */
- if (host && !vh->isHostAllowed (host))
- continue;
- /* We find a valid host. */
- /* Add a reference. */
- vh->addRef ();
- return vh;
- }
- return 0;
- }
- catch (...)
- {
- return 0;
- };
- }
-
- virtual Vhost* getVHost (int n)
- {
- return vhosts[n];
}
virtual int load (const char *resource)
@@ -185,7 +141,7 @@ public:
{
size_t len;
SCM v = gh_car (list);
- Vhost *vh = new Vhost (lm);
+ Vhost *vh = new Vhost (logManager);
char *name = gh_scm2newstr (gh_car (v), &len);
vh->setName (name);
free (name);
@@ -211,9 +167,10 @@ public:
/* TODO: read other information!!! */
- lt->addListeningThread (port);
- vhosts.push_back (vh);
+ listenThreads->addListeningThread (port);
+ addVHost (vh);
}
+
return 0;
}
};
commit a177f2c266a5db03b15757934b115a983632f01a
Author: Giuseppe Scrivano <address@hidden>
Date: Mon Mar 1 22:54:19 2010 +0100
Raise an error at configure time when libguile is not present
diff --git a/plugins/src/guile/SConscript b/plugins/src/guile/SConscript
index f8ea846..46a8302 100644
--- a/plugins/src/guile/SConscript
+++ b/plugins/src/guile/SConscript
@@ -19,8 +19,9 @@ env = Environment(CPPPATH=local_listinc)
conf = Configure(env, config_h="config.h")
-if conf.CheckHeader("libguile.h") and conf.CheckLib("guile"):
- conf.Define('GUILE', 1)
+if not conf.CheckHeader("libguile.h") or not conf.CheckLib("guile"):
+ print "unable to find lib guile"
+ Exit(1)
env = conf.Finish()
diff --git a/plugins/src/guile_conf/SConscript
b/plugins/src/guile_conf/SConscript
index 4cb9227..f55fe56 100644
--- a/plugins/src/guile_conf/SConscript
+++ b/plugins/src/guile_conf/SConscript
@@ -19,8 +19,9 @@ env = Environment(CPPPATH=local_listinc)
conf = Configure(env, config_h="config.h")
-if conf.CheckHeader("libguile.h") and conf.CheckLib("guile"):
- conf.Define('GUILE', 1)
+if not conf.CheckHeader("libguile.h") or not conf.CheckLib("guile"):
+ print "unable to find lib guile"
+ Exit(1)
env = conf.Finish()
commit db17b3f78e450097ef710ebf5868b93dc17e1757
Author: Giuseppe Scrivano <address@hidden>
Date: Mon Mar 1 22:43:49 2010 +0100
Don't abbreviate Windows to win32, use w32 instead.
diff --git a/plugins/SConstruct b/plugins/SConstruct
index 4de4c7c..b443ec4 100644
--- a/plugins/SConstruct
+++ b/plugins/SConstruct
@@ -4,7 +4,7 @@
# MyServer
# http://www.gnu.org/software/myserver/
#
-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
@@ -39,7 +39,7 @@ command = ARGUMENTS.get('command', "build")
arch = ""
import os
if os.name=="nt":
- arch = "win32"
+ arch = "w32"
else:
arch = string.lower(os.uname()[0])
if string.find(os.uname()[4],"64")==-1:
@@ -135,6 +135,3 @@ elif command=='source':
#if command == "tests":
# AddPostAction('tests/tests_suite', env.Execute('tests/tests_suite'))
-
-
-
commit 2c27c403fd42c81d11c70e8dd932975fd2886540
Author: Giuseppe Scrivano <address@hidden>
Date: Mon Mar 1 22:19:51 2010 +0100
Move members in the private section of XmlVhostHandler to protected
diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h
b/myserver/include/conf/vhost/xml_vhost_handler.h
index 6b7f5c9..7f6f2fc 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -35,11 +35,11 @@ public:
Vhost* getVHost (int n);
void clean ();
int removeVHost (int n);
- int switchVhosts (int n1,int n2);
+ int switchVhosts (int n1, int n2);
vector<Vhost*>* getVHostList ();
/*! Get a pointer to a vhost. */
- Vhost* getVHost (const char*,const char*,u_short);
+ Vhost* getVHost (const char*, const char*, u_short);
/*! Add an element to the vhost list. */
int addVHost (Vhost*);
@@ -51,7 +51,8 @@ public:
void changeLocationsOwner ();
static void registerBuilder (VhostManager& manager);
-private:
+
+protected:
void loadXMLlogData (string, Vhost*, xmlNode*);
ListenThreads* listenThreads;
commit 41080a29f4368c94ee06478dc941c4683a6d4d08
Author: Giuseppe Scrivano <address@hidden>
Date: Mon Mar 1 22:07:51 2010 +0100
Use a std::vector instead of a std::list to store virtual hosts.
Now some operations are done in a constant time.
diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h
b/myserver/include/conf/vhost/xml_vhost_handler.h
index 3f9f4f0..6b7f5c9 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -22,6 +22,10 @@
# include "myserver.h"
# include <include/conf/vhost/vhost_manager.h>
+# include <vector>
+
+using namespace std;
+
class XmlVhostHandler : public VhostManagerHandler
{
public:
@@ -32,7 +36,7 @@ public:
void clean ();
int removeVHost (int n);
int switchVhosts (int n1,int n2);
- list<Vhost*>* getVHostList ();
+ vector<Vhost*>* getVHostList ();
/*! Get a pointer to a vhost. */
Vhost* getVHost (const char*,const char*,u_short);
@@ -52,7 +56,7 @@ private:
ListenThreads* listenThreads;
/*! List of virtual hosts. */
- list<Vhost*> hostList;
+ vector<Vhost*> hosts;
LogManager* logManager;
};
diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp
b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index 6730090..539aca3 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -49,12 +49,12 @@ void XmlVhostHandler::registerBuilder (VhostManager&
manager)
*/
int XmlVhostHandler::addVHost (Vhost* vh)
{
- list<Vhost*>::iterator it;
+ vector<Vhost*>::iterator it;
/* Be sure there is a listening thread on the specified port. */
listenThreads->addListeningThread (vh->getPort ());
- it = hostList.begin ();
+ it = hosts.begin ();
try
{
@@ -72,7 +72,7 @@ int XmlVhostHandler::addVHost (Vhost* vh)
_("The protocol \"%s\" is used but not
loaded"),
protocol.c_str ());
- hostList.push_back (vh);
+ hosts.push_back (vh);
return 0;
}
catch (...)
@@ -86,12 +86,12 @@ int XmlVhostHandler::addVHost (Vhost* vh)
*/
Vhost* XmlVhostHandler::getVHost (const char* host, const char* ip, u_short
port)
{
- list<Vhost*>::iterator it;
+ vector<Vhost*>::iterator it;
/*
Do a linear search here. We have to use the first full-matching
virtual host.
*/
- for (it = hostList.begin (); it != hostList.end (); it++)
+ for (it = hosts.begin (); it != hosts.end (); it++)
{
Vhost* vh = *it;
@@ -124,7 +124,6 @@ Vhost* XmlVhostHandler::getVHost (const char* host, const
char* ip, u_short port
XmlVhostHandler::XmlVhostHandler (ListenThreads* lt, LogManager* lm)
{
listenThreads = lt;
- hostList.clear ();
logManager = lm;
}
@@ -133,16 +132,15 @@ XmlVhostHandler::XmlVhostHandler (ListenThreads* lt,
LogManager* lm)
*/
void XmlVhostHandler::clean ()
{
- list<Vhost*>::iterator it;
-
- it = hostList.begin ();
+ vector<Vhost*>::iterator it;
+ it = hosts.begin ();
try
{
- for (;it != hostList.end (); it++)
+ for (;it != hosts.end (); it++)
delete *it;
- hostList.clear ();
+ hosts.clear ();
}
catch (...)
{
@@ -161,9 +159,9 @@ XmlVhostHandler::~XmlVhostHandler ()
/*!
*Returns the entire virtual hosts list.
*/
-list<Vhost*>* XmlVhostHandler::getVHostList ()
+vector<Vhost*>* XmlVhostHandler::getVHostList ()
{
- return &(this->hostList);
+ return &(this->hosts);
}
/*!
@@ -181,7 +179,7 @@ void XmlVhostHandler::changeLocationsOwner ()
*Change the log files owner if a different user or group
*identifier is specified.
*/
- for (list<Vhost*>::iterator it = hostList.begin (); it != hostList.end
(); it++)
+ for (vector<Vhost*>::iterator it = hosts.begin (); it != hosts.end ();
it++)
{
int err;
Vhost* vh = *it;
@@ -206,7 +204,7 @@ void XmlVhostHandler::changeLocationsOwner ()
*/
int XmlVhostHandler::getHostsNumber ()
{
- return hostList.size ();
+ return hosts.size ();
}
@@ -237,7 +235,7 @@ XmlVhostHandler::loadXMLlogData (string name, Vhost* vh,
xmlNode* lcur)
for (; stream; stream = stream->next, location.assign (""), cycle = 0,
filters.clear ())
{
if (stream->type == XML_ELEMENT_NODE &&
- !xmlStrcmp (stream->name, (xmlChar const*)"STREAM"))
+ !xmlStrcmp (stream->name, (xmlChar const*) "STREAM"))
{
xmlAttr* streamAttr = stream->properties;
while (streamAttr)
@@ -256,7 +254,7 @@ XmlVhostHandler::loadXMLlogData (string name, Vhost* vh,
xmlNode* lcur)
for (; filterList; filterList = filterList->next)
{
if (filterList->type == XML_ELEMENT_NODE &&
- !xmlStrcmp (filterList->name, (xmlChar const*)"FILTER"))
+ !xmlStrcmp (filterList->name, (xmlChar const*) "FILTER"))
{
if (filterList->children && filterList->children->content)
{
@@ -314,7 +312,7 @@ int XmlVhostHandler::load (const char *filename)
{
xmlNodePtr lcur;
Vhost *vh;
- if (xmlStrcmp (node->name, (const xmlChar *)"VHOST"))
+ if (xmlStrcmp (node->name, (const xmlChar *) "VHOST"))
continue;
lcur = node->children;
vh = new Vhost (logManager);
@@ -340,31 +338,31 @@ int XmlVhostHandler::load (const char *filename)
continue;
}
- if (!xmlStrcmp (lcur->name, (const xmlChar *)"HOST"))
+ if (!xmlStrcmp (lcur->name, (const xmlChar *) "HOST"))
{
int useRegex = 0;
for (xmlAttr *attrs = lcur->properties; attrs; attrs =
attrs->next)
{
- if (!xmlStrcmp (attrs->name, (const xmlChar *)"isRegex")
+ if (!xmlStrcmp (attrs->name, (const xmlChar *) "isRegex")
&& attrs->children && attrs->children->content
&& (!xmlStrcmp (attrs->children->content,
- (const xmlChar *)"YES")))
+ (const xmlChar *) "YES")))
useRegex = 1;
}
vh->addHost ((const char*)lcur->children->content, useRegex);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"NAME"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "NAME"))
{
vh->setName ((char*)lcur->children->content);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"LOCATION"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "LOCATION"))
{
string loc (vh->getDocumentRoot ());
loc.append ("/");
for (xmlAttr *attrs = lcur->properties; attrs; attrs =
attrs->next)
- if (!xmlStrcmp (attrs->name, (const xmlChar *)"path"))
+ if (!xmlStrcmp (attrs->name, (const xmlChar *) "path"))
loc.append ((const char*) attrs->children->content);
MimeRecord *record = XmlMimeHandler::readRecord (lcur);
@@ -380,35 +378,35 @@ int XmlVhostHandler::load (const char *filename)
vh->getLocationsMime ()->put (loc, record);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_PRIVATEKEY"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SSL_PRIVATEKEY"))
{
string pk ((char*)lcur->children->content);
sslContext->setPrivateKeyFile (pk);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_CERTIFICATE"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *)
"SSL_CERTIFICATE"))
{
string certificate ((char*)lcur->children->content);
sslContext->setCertificateFile (certificate);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar
*)"CONNECTIONS_PRIORITY"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *)
"CONNECTIONS_PRIORITY"))
{
vh->setDefaultPriority (atoi ((const
char*)lcur->children->content));
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SSL_PASSWORD"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SSL_PASSWORD"))
{
string pw ((char*)lcur->children->content);
sslContext->setPassword (pw);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"IP"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "IP"))
{
int useRegex = 0;
xmlAttr *attrs = lcur->properties;
while (attrs)
{
- if (!xmlStrcmp (attrs->name, (const xmlChar *)"isRegex")
+ if (!xmlStrcmp (attrs->name, (const xmlChar *) "isRegex")
&& !xmlStrcmp (attrs->children->content,
- (const xmlChar *)"YES"))
+ (const xmlChar *) "YES"))
useRegex = 1;
attrs = attrs->next;
@@ -416,7 +414,7 @@ int XmlVhostHandler::load (const char *filename)
vh->addIP ((char*)lcur->children->content, useRegex);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"PORT"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "PORT"))
{
int val = atoi ((char*)lcur->children->content);
if (val > (1 << 16) || val <= 0)
@@ -424,7 +422,7 @@ int XmlVhostHandler::load (const char *filename)
_("Specified invalid port %s"), lcur->children->content);
vh->setPort ((u_short)val);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"PROTOCOL"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "PROTOCOL"))
{
char* lastChar = (char*)lcur->children->content;
while (*lastChar != '\0')
@@ -434,7 +432,7 @@ int XmlVhostHandler::load (const char *filename)
}
vh->setProtocolName ((char*)lcur->children->content);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"DOCROOT"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "DOCROOT"))
{
char* lastChar = (char*)lcur->children->content;
while (*(lastChar+1) != '\0')
@@ -445,7 +443,7 @@ int XmlVhostHandler::load (const char *filename)
vh->setDocumentRoot ((const char*)lcur->children->content);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"SYSROOT"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "SYSROOT"))
{
char* lastChar = (char*)lcur->children->content;
@@ -457,25 +455,25 @@ int XmlVhostHandler::load (const char *filename)
vh->setSystemRoot ((const char*)lcur->children->content);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"ACCESSLOG"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "ACCESSLOG"))
{
loadXMLlogData ("ACCESSLOG", vh, lcur);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"WARNINGLOG"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "WARNINGLOG"))
{
loadXMLlogData ("WARNINGLOG", vh, lcur);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"MIME_FILE"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *) "MIME_FILE"))
{
string hnd ("xml");
for (xmlAttr *attrs = lcur->properties; attrs; attrs =
attrs->next)
{
- if (!xmlStrcmp (attrs->name, (const xmlChar *)"name")
+ if (!xmlStrcmp (attrs->name, (const xmlChar *) "name")
&& attrs->children && 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);
@@ -494,7 +492,7 @@ int XmlVhostHandler::load (const char *filename)
}
vh->setMimeHandler (handler);
}
- else if (!xmlStrcmp (lcur->name, (const xmlChar *)"THROTTLING_RATE"))
+ else if (!xmlStrcmp (lcur->name, (const xmlChar *)
"THROTTLING_RATE"))
{
u_long rate = (u_long)atoi ((char*)lcur->children->content);
vh->setThrottlingRate (rate);
@@ -543,18 +541,10 @@ int XmlVhostHandler::load (const char *filename)
*/
Vhost* XmlVhostHandler::getVHost (int n)
{
- Vhost* ret = NULL;
- list<Vhost*>::iterator i = hostList.begin ();
- for ( ; i != hostList.end (); i++)
- {
- if (!(n--))
- {
- ret = *i;
- ret->addRef ();
- break;
- }
- }
- return ret;
+ if (n > hosts.size ())
+ return NULL;
+
+ return hosts.at (n - 1);
}
/*!
@@ -564,15 +554,7 @@ Vhost* XmlVhostHandler::getVHost (int n)
*/
int XmlVhostHandler::removeVHost (int n)
{
- list<Vhost*>::iterator i = hostList.begin ();
-
- for ( ;i != hostList.end (); i++)
- {
- if (!(n--))
- {
- delete *i;
- return 1;
- }
- }
+ vector<Vhost*>::iterator it = hosts.erase (hosts.begin () + n - 1);
+ delete *it;
return 0;
}
-----------------------------------------------------------------------
Summary of changes:
myserver/include/conf/vhost/xml_vhost_handler.h | 15 ++-
myserver/src/conf/vhost/xml_vhost_handler.cpp | 108 ++++++++++-------------
plugins/SConstruct | 7 +-
plugins/src/guile/SConscript | 5 +-
plugins/src/guile_conf/SConscript | 5 +-
plugins/src/guile_conf/guile_conf.cpp | 59 ++-----------
6 files changed, 71 insertions(+), 128 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-67-gcb02215,
Giuseppe Scrivano <=