[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 5d3d08dda1
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 5d3d08dda187d4b4e9344c9d8d56a013734b3ef6 |
|
Date: |
Sun, 23 Aug 2009 11:11:41 +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 5d3d08dda187d4b4e9344c9d8d56a013734b3ef6 (commit)
via b7b4c13225b272241621135fdfaabc60d0dbda93 (commit)
via 6da4f27bea1bfcf3113a6401ff815a578f76e754 (commit)
via 6fcef38af252b8a13b5101a284c5fbacf2334eb2 (commit)
via 5e9e52af4414077f8cdabc509c829146db17f4e2 (commit)
via 72de355587d8e3beeb719a6053660abbd774d762 (commit)
from 0875df6e43e49dae7f882c57f9a32cc693e9b856 (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 5d3d08dda187d4b4e9344c9d8d56a013734b3ef6
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Aug 23 13:08:39 2009 +0200
Plugins use the new logging facilities.
diff --git a/plugins/src/http_checker/http_checker.cpp
b/plugins/src/http_checker/http_checker.cpp
index ba2ceee..3bc77f2 100644
--- a/plugins/src/http_checker/http_checker.cpp
+++ b/plugins/src/http_checker/http_checker.cpp
@@ -239,7 +239,7 @@ EXPORTABLE(int) load(void* server,void* parser)
if(!staticData)
{
- serverInstance->logWriteln("HttpChecker: Invalid HTTP static data");
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR, _("HttpChecker: invalid
HTTP static data"));
return -1;
}
@@ -247,7 +247,7 @@ EXPORTABLE(int) load(void* server,void* parser)
if(!python)
{
- serverInstance->logWriteln("HttpChecker: Cannot find executors::python");
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR, _("HttpChecker: cannot find
executors::python"));
return -1;
}
observer.setPythonExecutor(python);
@@ -258,7 +258,7 @@ EXPORTABLE(int) load(void* server,void* parser)
if(!init)
{
- serverInstance->logWriteln("HttpChecker: Cannot find method initModule
in executors::python");
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR, _("HttpChecker: cannot find
method initModule in executors::python"));
return -1;
}
@@ -289,7 +289,7 @@ EXPORTABLE(int) load(void* server,void* parser)
if(!data)
{
- serverInstance->logWriteln("HttpChecker: Invalid rule");
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR, _("HttpChecker: invalid
rule"));
return -1;
}
diff --git a/plugins/src/mime_magic/mime_magic.cpp
b/plugins/src/mime_magic/mime_magic.cpp
index ea4a5a2..b5da922 100755
--- a/plugins/src/mime_magic/mime_magic.cpp
+++ b/plugins/src/mime_magic/mime_magic.cpp
@@ -118,7 +118,7 @@ EXPORTABLE(int) postLoad(void* server)
MagicHandler *handler = new MagicHandler;
if (handler->load ())
{
- serverInstance->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR,
_("cannot load mime magic configuration"));
return 1;
}
diff --git a/plugins/src/php/php.cpp b/plugins/src/php/php.cpp
index 621f64f..ab17b3c 100644
--- a/plugins/src/php/php.cpp
+++ b/plugins/src/php/php.cpp
@@ -293,11 +293,11 @@ int load(void* server)
{
::server = (Server*)server;
const char *data;
- data = ::server->getHashedData("PHP_NO_REBOOT");
+ data = ::server->getData("PHP_NO_REBOOT");
if(!(::server->isRebooting() && !(data && !strcmpi(data, "YES"))))
{
- data = ::server->getHashedData("PHP_SAFE_MODE");
+ data = ::server->getData("PHP_SAFE_MODE");
if(data && !strcmpi(data, "YES"))
singleRequest = 1;
@@ -317,7 +317,7 @@ extern "C"
int postLoad(void* server)
{
const char *data;
- data = ::server->getHashedData("PHP_NO_REBOOT");
+ data = ::server->getData("PHP_NO_REBOOT");
if(!(::server->isRebooting() && !(data && !strcmpi(data, "YES"))))
{
@@ -336,7 +336,7 @@ extern "C"
int unLoad(void* p)
{
const char *data;
- data = ::server->getHashedData("PHP_NO_REBOOT");
+ data = ::server->getData("PHP_NO_REBOOT");
if(!(::server->isRebooting() && !(data && !strcmpi(data, "YES"))))
{
diff --git a/plugins/src/python/python.cpp b/plugins/src/python/python.cpp
index fa3976b..9fc6ec7 100644
--- a/plugins/src/python/python.cpp
+++ b/plugins/src/python/python.cpp
@@ -56,13 +56,13 @@ void PythonData::clear ()
int load (void* server)
{
serverInstance = (Server*)server;
- const char* pathData = serverInstance->getHashedData("PYTHON_PATH");
+ const char* pathData = serverInstance->getData("PYTHON_PATH");
PyThreadState * mainThreadState;
if (pathData)
- {
+ {
string path (pathData);
FilesUtility::completePath (path);
-
+
setenv ("PYTHONPATH", path.c_str(), 1);
}
else
@@ -112,7 +112,7 @@ int unLoad (void* p)
Py_Finalize ();
-
+
PyThreadState_Swap (NULL);
@@ -153,7 +153,7 @@ int executeImpl (char* code, u_long length, PyThreadState
*threadState, int newT
PyRun_SimpleString (code);
-
+
PyThreadState_Swap (NULL);
if (newThreadState)
@@ -202,20 +202,13 @@ int executeFromFileImpl(char* filename, PyThreadState
*threadState, int newThrea
if(file == 0)
{
- string msg;
- msg.assign ("Python: Cannot load file ");
- msg.append (filename);
-
-
- serverInstance->logWriteln (msg.c_str ());
-
-
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR, _("Python: cannot load file
%s"), filename);
ret = -1;
}
else
ret = PyRun_AnyFileEx (file, filename, 1);
-
+
PyThreadState_Swap (NULL);
if (newThreadState)
@@ -235,7 +228,7 @@ PyObject* callObject(PyObject *obj, PyObject *args)
return callObjectImpl(obj, args, NULL, 1);
}
-
+
PyObject* callObjectImpl(PyObject *obj, PyObject *args, PyThreadState
*threadState, int newThreadState)
{
PyInterpreterState *interpreter = NULL;
diff --git a/plugins/src/python_http_handler/python_http_handler.cpp
b/plugins/src/python_http_handler/python_http_handler.cpp
index c6b1134..377e4d7 100644
--- a/plugins/src/python_http_handler/python_http_handler.cpp
+++ b/plugins/src/python_http_handler/python_http_handler.cpp
@@ -161,7 +161,7 @@ static PyObject *log_server_error(PyObject *self, PyObject
*args)
if (!PyArg_ParseTuple(args, (char*)"s", &msg))
return NULL;
- serverInstance->logWriteln(msg);
+ serverInstance->log(MYSERVER_LOG_MSG_ERROR, "%s", msg);
return NULL;
}
@@ -357,7 +357,7 @@ public:
for(it = rules.begin(); it != rules.end(); it++)
{
- if((*it).file)
+ if((*it).file)
{
executeFromFilePROC execute =
((executeFromFilePROC)python->getDirectMethod((char*)"executeFromFile"));
if (execute)
@@ -365,7 +365,7 @@ public:
}else
{
executePROC execute =
((executePROC)python->getDirectMethod((char*)"execute"));
-
+
if (execute)
execute((char*)(*it).data.c_str(),
(*it).data.length());
}
@@ -409,17 +409,17 @@ EXPORTABLE(int) load (void* server)
XmlParser* configuration;
xmlDocPtr xmlDoc;
if(!staticData)
- {
- serverInstance->logWriteln("PythonHttpHandler: Invalid HTTP
static data");
- return -1;
- }
- python = serverInstance->getPluginsManager()->getPlugin(pythonName);
+ {
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR, _("PythonHttpHandler:
Invalid HTTP static data"));
+ return -1;
+ }
+ python = serverInstance->getPluginsManager ()->getPlugin (pythonName);
if(!python)
- {
- serverInstance->logWriteln("PythonHttpHandler: Cannot find
executors::python");
- return -1;
- }
+ {
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR, _("PythonHttpHandler:
Cannot find executors::python"));
+ return -1;
+ }
observer.setPythonExecutor(python);
staticData->addMulticast(msg, &observer);
@@ -427,10 +427,10 @@ EXPORTABLE(int) load (void* server)
init = (INIT_MODULE) python->getDirectMethod((char*)"initModule");
if(!init)
- {
- serverInstance->logWriteln("PythonHttpHandler: Cannot find
method initModule in executors::python");
- return -1;
- }
+ {
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR, _("PythonHttpHandler:
Cannot find method initModule in executors::python"));
+ return -1;
+ }
configuration = serverInstance->getXmlConfiguration();
xmlDoc = configuration->getDoc();
@@ -438,31 +438,31 @@ EXPORTABLE(int) load (void* server)
{
if(!xmlStrcmp(ptr->name, (const xmlChar *)"PYTHON_HTTP_HANDLER"))
{
- bool file = false;
- xmlAttrPtr properties = ptr->properties;
- char* data = 0;
- while(properties)
- {
- if(!xmlStrcmp(properties->name, (const xmlChar *)"file"))
- {
- if(properties->children &&
properties->children->content)
- data = (char*)properties->children->content;
-
- file = true;
- }
- properties = properties->next;
- }
-
- if(!file && ptr->children && ptr->children->next &&
ptr->children->next->content)
- data = (char*)ptr->children->next->content;
-
- if(!data)
- {
- serverInstance->logWriteln("PythonHttpHandler: Invalid
rule");
- return -1;
- }
-
- observer.addRule(data, file);
+ bool file = false;
+ xmlAttrPtr properties = ptr->properties;
+ char* data = 0;
+ while(properties)
+ {
+ if(!xmlStrcmp(properties->name, (const xmlChar *)"file"))
+ {
+ if(properties->children && properties->children->content)
+ data = (char*)properties->children->content;
+
+ file = true;
+ }
+ properties = properties->next;
+ }
+
+ if(!file && ptr->children && ptr->children->next &&
ptr->children->next->content)
+ data = (char*)ptr->children->next->content;
+
+ if(!data)
+ {
+ serverInstance->log (MYSERVER_LOG_MSG_ERROR,
_("PythonHttpHandler: Invalid rule"));
+ return -1;
+ }
+
+ observer.addRule (data, file);
}
}
diff --git a/plugins/src/rules_checker/rules_checker.cpp
b/plugins/src/rules_checker/rules_checker.cpp
index a5d7f05..954d78b 100644
--- a/plugins/src/rules_checker/rules_checker.cpp
+++ b/plugins/src/rules_checker/rules_checker.cpp
@@ -102,7 +102,7 @@ EXPORTABLE(int) load (void* server)
xmlDocPtr xmlDoc;
if(!staticData)
{
- serverInstance->logWriteln("RulesChecker: Invalid HTTP static data");
+ serverInstance->log("RulesChecker: Invalid HTTP static data");
return -1;
}
@@ -123,7 +123,7 @@ EXPORTABLE(int) load (void* server)
if(!data)
{
- serverInstance->logWriteln("RulesChecker: Invalid rule");
+ serverInstance->log("RulesChecker: Invalid rule");
return -1;
}
commit b7b4c13225b272241621135fdfaabc60d0dbda93
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Aug 23 13:00:45 2009 +0200
Fix test failure.
diff --git a/myserver/src/base/files_cache/cached_file.cpp
b/myserver/src/base/files_cache/cached_file.cpp
index 880dae4..65d529b 100644
--- a/myserver/src/base/files_cache/cached_file.cpp
+++ b/myserver/src/base/files_cache/cached_file.cpp
@@ -169,10 +169,11 @@ u_long CachedFile::getFileSize ()
*/
int CachedFile::seek (u_long initialByte)
{
- if (initialByte <= buffer->getFileSize())
- fseek = initialByte;
- else
+ if (initialByte > buffer->getFileSize())
return -1;
+
+ fseek = initialByte;
+ return 0;
}
/*!
commit 6da4f27bea1bfcf3113a6401ff815a578f76e754
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Aug 23 12:48:37 2009 +0200
Refactoring: rename any `logWriteln' to `log'.
diff --git a/myserver/include/log/log_manager.h
b/myserver/include/log/log_manager.h
index b5250b7..e3a4270 100644
--- a/myserver/include/log/log_manager.h
+++ b/myserver/include/log/log_manager.h
@@ -96,7 +96,7 @@ private:
int add (const void *owner, string type, string location, LogStream* ls);
int computeNewLine ();
void associateLoggingLevelsWithNames ();
- int logWriteln (const string &, LoggingLevel);
+ int log (const string &, LoggingLevel);
LoggingLevel level;
Mutex* mutex;
diff --git a/myserver/include/server/server.h b/myserver/include/server/server.h
index 5b0eb2f..1c67d51 100644
--- a/myserver/include/server/server.h
+++ b/myserver/include/server/server.h
@@ -130,29 +130,29 @@ public:
void stop();
void finalCleanup();
int terminate();
- int logWriteln (LoggingLevel level, const char *fmt, ...);
- int logWriteln(char const*, LoggingLevel level = MYSERVER_LOG_MSG_INFO);
- int logWriteln(string const &str)
- {return logWriteln(str.c_str());};
- int setLogLocation(string);
- u_long getBuffersize();
- u_long getBuffersize2();
- u_long getThrottlingRate();
- int waitNewConnection(u_long tid, u_long timeout);
- ListenThreads *getListenThreads(){return &listenThreads;}
-
- void *getEnvString(){return envString;}
- VhostManager *getVhosts(){return vhostList;}
- MimeManager *getMimeManager(){return mimeManager;}
-
- void setProcessPermissions();
- ConnectionsScheduler* getConnectionsScheduler(){return
&connectionsScheduler;}
- int deleteConnection(ConnectionPtr);
-
- int notifyDeleteConnection(ConnectionPtr);
-
- void increaseFreeThread();
- void decreaseFreeThread();
+ int log (LoggingLevel level, const char *fmt, ...);
+ int log (char const*, LoggingLevel level = MYSERVER_LOG_MSG_INFO);
+ int log (string const &str)
+ {return log (str.c_str());};
+ int setLogLocation (string);
+ u_long getBuffersize ();
+ u_long getBuffersize2 ();
+ u_long getThrottlingRate ();
+ int waitNewConnection (u_long tid, u_long timeout);
+ ListenThreads *getListenThreads (){return &listenThreads;}
+
+ void *getEnvString (){return envString;}
+ VhostManager *getVhosts (){return vhostList;}
+ MimeManager *getMimeManager (){return mimeManager;}
+
+ void setProcessPermissions ();
+ ConnectionsScheduler* getConnectionsScheduler (){return
&connectionsScheduler;}
+ int deleteConnection (ConnectionPtr);
+
+ int notifyDeleteConnection (ConnectionPtr);
+
+ void increaseFreeThread ();
+ void decreaseFreeThread ();
SecurityManager *getSecurityManager (){return &securityManager;}
AuthMethodFactory *getAuthMethodFactory () {return &authMethodFactory;}
diff --git a/myserver/src/base/process/process_server_manager.cpp
b/myserver/src/base/process/process_server_manager.cpp
index 57492b6..701106b 100644
--- a/myserver/src/base/process/process_server_manager.cpp
+++ b/myserver/src/base/process/process_server_manager.cpp
@@ -120,14 +120,14 @@ void ProcessServerManager::load ()
ostringstream msg;
msg << "Error: incomplete remote PROCESS_SERVER block, "
<< domain << ":" << name << " needs a port";
- ::Server::getInstance ()->logWriteln (msg.str ().c_str (),
MYSERVER_LOG_MSG_ERROR);
+ ::Server::getInstance ()->log (msg.str ().c_str (),
MYSERVER_LOG_MSG_ERROR);
}
}
}
else
{
const char *msg = "Error: incomplete PROCESS_SERVER block";
- ::Server::getInstance ()->logWriteln (msg, MYSERVER_LOG_MSG_ERROR);
+ ::Server::getInstance ()->log (msg, MYSERVER_LOG_MSG_ERROR);
}
}
@@ -401,7 +401,7 @@ int
ProcessServerManager::runServer(ProcessServerManager::Server* server,
ostringstream stream;
stream << "Cannot run process " << path
<< ": Reached max number of servers";
- ::Server::getInstance()->logWriteln(stream.str().c_str(),
MYSERVER_LOG_MSG_ERROR);
+ ::Server::getInstance()->log(stream.str().c_str(), MYSERVER_LOG_MSG_ERROR);
return 1;
}
diff --git a/myserver/src/conf/vhost/vhost_manager.cpp
b/myserver/src/conf/vhost/vhost_manager.cpp
index acd5790..10820be 100644
--- a/myserver/src/conf/vhost/vhost_manager.cpp
+++ b/myserver/src/conf/vhost/vhost_manager.cpp
@@ -49,7 +49,7 @@ int VhostManager::addVHost(Vhost* vh)
if (!vh->getProtocolName ())
{
vh->setProtocolName("http");
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_WARNING,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_WARNING,
_("Protocol not defined for vhost: %s, using HTTP by
default"),
vh->getName ());
}
@@ -201,12 +201,12 @@ void VhostManager::changeLocationsOwner ()
/* Chown the log files. */
err = logManager->chown (vh, "ACCESSLOG", uid, gid);
if(err)
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Error while changing accesses log locations owner"));
err = logManager->chown (vh, "WARNINGLOG", uid, gid);
if(err)
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Error while changing log locations owner"));
}
}
@@ -285,7 +285,7 @@ VhostManager::loadXMLlogData (string name, Vhost* vh,
xmlNode* lcur)
err = vh->openAccessLog (location, filters, cycle);
vh->setAccessLogOpt (opt.c_str ());
if (err)
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Error opening %s"),
location.c_str ());
}
else if (!name.compare ("WARNINGLOG"))
@@ -293,11 +293,11 @@ VhostManager::loadXMLlogData (string name, Vhost* vh,
xmlNode* lcur)
err = vh->openWarningLog (location, filters, cycle);
vh->setWarningLogOpt (opt.c_str ());
if (err)
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Error opening %s"),
location.c_str ());
}
else
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_(" Unrecognized log type"));
}
}
@@ -315,7 +315,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
xmlNodePtr node;
if(parser.open(filename))
{
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Error opening %s"), filename);
return -1;
}
@@ -334,7 +334,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
{
parser.close();
clean();
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("internal error"), filename);
return -1;
}
@@ -424,7 +424,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
{
int val = atoi ((char*)lcur->children->content);
if (val > (1 << 16) || strlen ((const
char*)lcur->children->content) > 6)
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Specified invalid port %s"),
lcur->children->content);
vh->setPort ((u_short)val);
}
@@ -494,7 +494,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
if (vh->openLogFiles ())
{
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Error opening log files"));
delete vh;
vh = 0;
@@ -503,7 +503,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
if (vh->initializeSSL () < 0)
{
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Error initializing SSL for
%s"),
vh->getName ());
delete vh;
@@ -513,7 +513,7 @@ int VhostManager::loadXMLConfigurationFile(const char
*filename)
if (addVHost (vh))
{
- Server::getInstance()->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ Server::getInstance()->log (MYSERVER_LOG_MSG_ERROR,
_("Internal error"));
delete vh;
vh = 0;
diff --git a/myserver/src/connections_scheduler/connections_scheduler.cpp
b/myserver/src/connections_scheduler/connections_scheduler.cpp
index b15cde0..6a5c05d 100644
--- a/myserver/src/connections_scheduler/connections_scheduler.cpp
+++ b/myserver/src/connections_scheduler/connections_scheduler.cpp
@@ -275,7 +275,7 @@ void ConnectionsScheduler::initialize ()
if (err == -1)
{
if (server)
- server->logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error initializing
socket pair"));
+ server->log (MYSERVER_LOG_MSG_ERROR, _("Error initializing socket
pair"));
return;
}
@@ -287,7 +287,7 @@ void ConnectionsScheduler::initialize ()
if (Thread::create (&dispatchedThreadId, dispatcher, &dispatcherArg))
{
if (server)
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while initializing the dispatcher
thread"));
dispatchedThreadId = 0;
diff --git a/myserver/src/connections_scheduler/listen_threads.cpp
b/myserver/src/connections_scheduler/listen_threads.cpp
index a5e399d..c6cb761 100644
--- a/myserver/src/connections_scheduler/listen_threads.cpp
+++ b/myserver/src/connections_scheduler/listen_threads.cpp
@@ -91,7 +91,7 @@ int ListenThreads::createServerAndListener(u_short port)
serverSocketIPv4->socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (serverSocketIPv4->getHandle() == (Handle)INVALID_SOCKET)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
delete serverSocketIPv4;
serverSocketIPv4 = NULL;
@@ -110,7 +110,7 @@ int ListenThreads::createServerAndListener(u_short port)
(const char *)&optvalReuseAddr,
sizeof(optvalReuseAddr)) < 0)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
delete serverSocketIPv4;
@@ -119,15 +119,15 @@ int ListenThreads::createServerAndListener(u_short port)
#endif
if (serverSocketIPv4)
{
- server->logWriteln (MYSERVER_LOG_MSG_INFO,
+ server->log (MYSERVER_LOG_MSG_INFO,
_("Binding the port"));
if (!serverSocketIPv4->bind (&sockServerSocketIPv4,
sizeof(sockaddr_in)))
- server->logWriteln (MYSERVER_LOG_MSG_INFO, _("Port was
bound"));
+ server->log (MYSERVER_LOG_MSG_INFO, _("Port was bound"));
else
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server
socket"));
delete serverSocketIPv4;
serverSocketIPv4 = NULL;
@@ -145,7 +145,7 @@ int ListenThreads::createServerAndListener(u_short port)
serverSocketIPv6->socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
if (serverSocketIPv6->getHandle () == (FileHandle)INVALID_SOCKET)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
@@ -162,7 +162,7 @@ int ListenThreads::createServerAndListener(u_short port)
(const char *)&optvalReuseAddr,
sizeof(optvalReuseAddr)) < 0)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
@@ -172,7 +172,7 @@ int ListenThreads::createServerAndListener(u_short port)
(const char *)&optvalReuseAddr,
sizeof(optvalReuseAddr)) < 0)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
@@ -180,16 +180,16 @@ int ListenThreads::createServerAndListener(u_short port)
# endif
if (serverSocketIPv6)
{
- server->logWriteln (MYSERVER_LOG_MSG_INFO,
+ server->log (MYSERVER_LOG_MSG_INFO,
_("Binding the port"));
if (!serverSocketIPv6->bind (&sockServerSocketIPv6,
sizeof(sockaddr_in6)))
- server->logWriteln (MYSERVER_LOG_MSG_INFO,
+ server->log (MYSERVER_LOG_MSG_INFO,
_("Port was bound"));
else
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
@@ -207,7 +207,7 @@ int ListenThreads::createServerAndListener(u_short port)
if (serverSocketIPv4 != NULL && serverSocketIPv4->listen (SOMAXCONN))
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
delete serverSocketIPv4;
serverSocketIPv4 = NULL;
@@ -215,7 +215,7 @@ int ListenThreads::createServerAndListener(u_short port)
if (serverSocketIPv6 != NULL && serverSocketIPv6->listen (SOMAXCONN))
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error while creating the server socket"));
delete serverSocketIPv6;
serverSocketIPv6 = NULL;
@@ -227,7 +227,7 @@ int ListenThreads::createServerAndListener(u_short port)
return 1;
}
- server->logWriteln (MYSERVER_LOG_MSG_INFO,
+ server->log (MYSERVER_LOG_MSG_INFO,
_("Listening on the port: %i"), port);
si->ipv4 = serverSocketIPv4;
@@ -241,12 +241,12 @@ int ListenThreads::createServerAndListener(u_short port)
}
catch(bad_alloc &ba)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR, _("Bad alloc: %s"),
+ server->log (MYSERVER_LOG_MSG_ERROR, _("Bad alloc: %s"),
ba.what ());
}
catch(exception &e)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error: %s"),
+ server->log (MYSERVER_LOG_MSG_ERROR, _("Error: %s"),
e.what ());
};
return 1;
diff --git a/myserver/src/http_handler/isapi/isapi.cpp
b/myserver/src/http_handler/isapi/isapi.cpp
index 518ef0b..db701cb 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -52,7 +52,7 @@ BOOL WINAPI ISAPI_ServerSupportFunctionExport(HCONN hConn,
DWORD dwHSERRequest,
Isapi::isapiMutex->unlock();
if (ConnInfo == NULL)
{
- Server::getInstance()->logWriteln("isapi::ServerSupportFunctionExport:
invalid hConn");
+ Server::getInstance()->log("isapi::ServerSupportFunctionExport: invalid
hConn");
return 0;
}
@@ -422,7 +422,7 @@ BOOL WINAPI ISAPI_GetServerVariableExport(HCONN hConn,
Isapi::isapiMutex->unlock();
if (ConnInfo == NULL)
{
- Server::getInstance()->logWriteln(
+ Server::getInstance()->log(
"Isapi::GetServerVariableExport: invalid hConn");
return 0;
}
diff --git a/myserver/src/log/log_manager.cpp b/myserver/src/log/log_manager.cpp
index ceb0dca..3a9a02a 100644
--- a/myserver/src/log/log_manager.cpp
+++ b/myserver/src/log/log_manager.cpp
@@ -136,7 +136,7 @@ LogManager::add (const void *owner, string type, string
location,
if (!failure && newSize > oldSize)
{
oss << "Warning: \'" << location << "\' shared between " << newSize
<< " objects.";
- logWriteln (oss.str (), MYSERVER_LOG_MSG_WARNING);
+ log (oss.str (), MYSERVER_LOG_MSG_WARNING);
}
}
mutex->unlock ();
@@ -1121,10 +1121,10 @@ LogManager::getOwnersList (string location, list<const
void*>* l)
* \return 0 on success, 1 on error.
*/
int
-LogManager::logWriteln (const string & msg, LoggingLevel l)
+LogManager::log (const string & msg, LoggingLevel l)
{
if (Server::getInstance ())
- return Server::getInstance ()->logWriteln (msg.c_str (), l);
+ return Server::getInstance ()->log (msg.c_str (), l);
return 1;
}
diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index 13c6e30..262b395 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -67,7 +67,7 @@ void registerSignals ();
#ifndef WIN32
void Sig_Quit (int signal)
{
- Server::getInstance ()->logWriteln("Exiting...");
+ Server::getInstance ()->log("Exiting...");
sync ();
Server::getInstance ()->stop();
registerSignals ();
@@ -84,7 +84,7 @@ void Sig_Hup (int signal)
#else
static BOOL SignalHandler (DWORD type)
{
- Server::getInstance ()->logWriteln ("Exiting...");
+ Server::getInstance ()->log ("Exiting...");
Server::getInstance ()->stop ();
registerSignals ();
}
@@ -722,7 +722,7 @@ void __stdcall myServerCtrlHandler(u_long fdwControl)
*/
void runService ()
{
- Server::getInstance()->logWriteln ("Running service...");
+ Server::getInstance()->log ("Running service...");
#ifdef WIN32
SERVICE_TABLE_ENTRY serviceTable[] =
{
@@ -733,11 +733,11 @@ void runService ()
if (!StartServiceCtrlDispatcher (serviceTable))
{
if (GetLastError () == ERROR_INVALID_DATA)
- Server::getInstance ()->logWriteln("Invalid data");
+ Server::getInstance ()->log("Invalid data");
else if (GetLastError () == ERROR_SERVICE_ALREADY_RUNNING)
- Server::getInstance ()->logWriteln("Already running");
+ Server::getInstance ()->log("Already running");
else
- Server::getInstance ()->logWriteln("Error running service");
+ Server::getInstance ()->log("Error running service");
}
#endif
}
diff --git a/myserver/src/plugin/plugins_manager.cpp
b/myserver/src/plugin/plugins_manager.cpp
index b69dda2..bf97140 100755
--- a/myserver/src/plugin/plugins_manager.cpp
+++ b/myserver/src/plugin/plugins_manager.cpp
@@ -110,7 +110,7 @@ PluginsManager::loadOptions (Server *server)
addPluginInfo (plugin, new PluginInfo (plugin, enabled, global));
else
{
- server->logWriteln (MYSERVER_LOG_MSG_WARNING,
+ server->log (MYSERVER_LOG_MSG_WARNING,
_("Invalid plugin name in PLUGIN block."));
ret = -1;
}
@@ -143,7 +143,7 @@ PluginsManager::preLoad (Server* server, string& resource)
if (ret == -1)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Invalid plugins source"));
return ret;
}
@@ -213,7 +213,7 @@ PluginsManager::preLoad (Server* server, string& resource)
if (!plugin)
{
ret |= 1;
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s"), libname.c_str ());
}
else
@@ -259,7 +259,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
if (xml.open (path, true))
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s"), name.c_str ());
return NULL;
}
@@ -273,7 +273,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
if (size != 1)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s, invalid plugin.xml"),
name.c_str ());
return NULL;
@@ -289,7 +289,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
}
else
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s, invalid plugin.xml"),
name.c_str ());
return NULL;
@@ -305,7 +305,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
}
else
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s, invalid plugin.xml"),
name.c_str ());
delete xpathRes;
@@ -320,7 +320,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
if (size != 1)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s, invalid plugin.xml"),
name.c_str ());
delete xpathRes;
@@ -344,7 +344,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
if (size != 1)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s, invalid plugin.xml"),
name.c_str ());
delete xpathRes;
@@ -358,7 +358,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
pinfo->setVersion (version);
else
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s, invalid plugin.xml"),
name.c_str ());
delete xpathRes;
@@ -381,7 +381,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
if (!xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "min-version") ||
!xmlHasProp (nodes->nodeTab[i], (const xmlChar*) "max-version"))
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s, invalid plugin.xml"),
name.c_str ());
delete xpathRes;
@@ -398,7 +398,7 @@ PluginsManager::loadInfo (Server* server, string& name,
string& path)
if (minVersion == -1 || maxVersion == -1)
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error loading plugin %s, invalid plugin.xml"),
name.c_str ());
delete xpathRes;
@@ -430,7 +430,7 @@ PluginsManager::preLoadPlugin (string& file, Server*
server, bool global)
if (plugin->preLoad (file, global))
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error pre-loading plugin %s"),
file.c_str ());
delete plugin;
@@ -442,7 +442,7 @@ PluginsManager::preLoadPlugin (string& file, Server*
server, bool global)
name.assign (namePtr);
else
{
- server->logWriteln (MYSERVER_LOG_MSG_ERROR,
+ server->log (MYSERVER_LOG_MSG_ERROR,
_("Error pre-loading plugin %s"),
file.c_str ());
delete plugin;
@@ -468,7 +468,7 @@ PluginsManager::recursiveDependencesFallDown (Server*
server, string &name,
{
recursiveDependencesFallDown (server, *lit, remove, dependsOn);
- server->logWriteln (MYSERVER_LOG_MSG_WARNING,
+ server->log (MYSERVER_LOG_MSG_WARNING,
_("Missing plugin dependence %s --> %s"),
name.c_str (), (*lit).c_str ());
}
@@ -502,7 +502,7 @@ PluginsManager::load (Server *server)
int msVersion = PluginInfo::convertVersion (&msversion);
if (msVersion < pinfo->getMyServerMinVersion ()
|| msVersion > pinfo->getMyServerMaxVersion ())
- server->logWriteln (MYSERVER_LOG_MSG_WARNING,
+ server->log (MYSERVER_LOG_MSG_WARNING,
_("Plugin %s not compatible with this version"),
name.c_str ());
else
@@ -564,7 +564,7 @@ PluginsManager::load (Server *server)
PluginInfo* dep = getPluginInfo (depN);
if (!dep || remove.get (depN))
{
- server->logWriteln (MYSERVER_LOG_MSG_WARNING,
+ server->log (MYSERVER_LOG_MSG_WARNING,
_("Missing plugin dependence %s --> %s"),
dname.c_str (), depN.c_str ());
recursiveDependencesFallDown (server, dname, remove, dependsOn);
@@ -577,7 +577,7 @@ PluginsManager::load (Server *server)
|| dep->getVersion () > pdep->second)
{
recursiveDependencesFallDown (server, dname, remove, dependsOn);
- server->logWriteln (MYSERVER_LOG_MSG_WARNING,
+ server->log (MYSERVER_LOG_MSG_WARNING,
_("Plugin %s not compatible with this version"),
dname.c_str ());
break;
@@ -611,7 +611,7 @@ PluginsManager::postLoad (Server *server)
if (plugin)
{
plugin->postLoad (server);
- server->logWriteln (MYSERVER_LOG_MSG_INFO,
+ server->log (MYSERVER_LOG_MSG_INFO,
_("Plugin %s loaded"),
(*it)->getName ().c_str ());
}
diff --git a/myserver/src/protocol/http/http.cpp
b/myserver/src/protocol/http/http.cpp
index 77dfcfb..bb96053 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -987,7 +987,7 @@ int Http::controlConnection (ConnectionPtr a, char* /*b1*/,
char* /*b2*/,
errMsg.assign ("Invalid virtual host requested from ");
errMsg.append (a->getIpAddr ());
- Server::getInstance ()->logWriteln (errMsg.c_str (),
MYSERVER_LOG_MSG_ERROR);
+ Server::getInstance ()->log (errMsg.c_str (),
MYSERVER_LOG_MSG_ERROR);
raiseHTTPError (400);
/*
diff --git a/myserver/src/server/clients_thread.cpp
b/myserver/src/server/clients_thread.cpp
index 0629f37..e191201 100644
--- a/myserver/src/server/clients_thread.cpp
+++ b/myserver/src/server/clients_thread.cpp
@@ -184,12 +184,12 @@ DEFINE_THREAD(clients_thread, pParam)
}
catch (bad_alloc &ba)
{
- ct->server->logWriteln (MYSERVER_LOG_MSG_ERROR, _("Bad alloc: %s"),
+ ct->server->log (MYSERVER_LOG_MSG_ERROR, _("Bad alloc: %s"),
ba.what ());
}
catch (exception &e)
{
- ct->server->logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error : %s"),
+ ct->server->log (MYSERVER_LOG_MSG_ERROR, _("Error : %s"),
e.what ());
};
}
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index e008880..d627d46 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -150,7 +150,7 @@ int Server::checkConfigurationPaths ()
if (copyConfigurationFromDefault ("myserver.xml"))
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error loading configuration
file"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error loading configuration file"));
return -1;
}
}
@@ -161,7 +161,7 @@ int Server::checkConfigurationPaths ()
if (copyConfigurationFromDefault ("MIMEtypes.xml"))
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error loading MIME configuration
file"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error loading MIME configuration file"));
return -1;
}
}
@@ -172,7 +172,7 @@ int Server::checkConfigurationPaths ()
if (copyConfigurationFromDefault ("virtualhosts.xml") != 0)
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error loading virtual hosts
configuration file"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error loading virtual hosts
configuration file"));
return -1;
}
}
@@ -229,7 +229,7 @@ int Server::loadLibraries ()
gnutls_global_init ();
if (Socket::startupSocketLib () != 0)
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error loading the socket
library"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error loading the socket library"));
return 1;
}
@@ -290,7 +290,7 @@ void Server::start (string &mainConf, string &mimeConf,
string &vhostConf,
if (loadLibraries ())
return;
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Initializing server
configuration..."));
+ log (MYSERVER_LOG_MSG_INFO, _("Initializing server configuration..."));
if (!resetConfigurationPaths (mainConf, mimeConf, vhostConf, externPath))
return;
@@ -306,7 +306,7 @@ void Server::start (string &mainConf, string &mimeConf,
string &vhostConf,
/* Initialize the SSL library. */
initializeSSL();
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Loading server configuration..."));
+ log (MYSERVER_LOG_MSG_INFO, _("Loading server configuration..."));
if (postLoad ())
return;
@@ -314,15 +314,15 @@ void Server::start (string &mainConf, string &mimeConf,
string &vhostConf,
setProcessPermissions ();
if (getGid ()[0])
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Using gid: %s"), gid.c_str ());
+ log (MYSERVER_LOG_MSG_INFO, _("Using gid: %s"), gid.c_str ());
if (getUid ()[0])
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Using uid: %s"), uid.c_str ());
+ log (MYSERVER_LOG_MSG_INFO, _("Using uid: %s"), uid.c_str ());
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Server is ready!"));
+ log (MYSERVER_LOG_MSG_INFO, _("Server is ready!"));
if (logLocation.find ("console://") != string::npos)
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Press Ctrl-C to terminate its
execution"));
+ log (MYSERVER_LOG_MSG_INFO, _("Press Ctrl-C to terminate its
execution"));
serverReady = true;
@@ -332,11 +332,11 @@ void Server::start (string &mainConf, string &mimeConf,
string &vhostConf,
}
catch(bad_alloc &ba)
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Bad alloc: %s"), ba.what ());
+ log (MYSERVER_LOG_MSG_ERROR, _("Bad alloc: %s"), ba.what ());
}
catch(exception &e)
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error: %s"), e.what ());
+ log (MYSERVER_LOG_MSG_ERROR, _("Error: %s"), e.what ());
};
this->terminate ();
finalCleanup ();
@@ -358,7 +358,7 @@ int Server::postLoad ()
memset (serverName, 0, HOST_NAME_MAX+1);
Socket::gethostname (serverName, HOST_NAME_MAX);
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Host name: %s"), serverName);
+ log (MYSERVER_LOG_MSG_INFO, _("Host name: %s"), serverName);
/* Find the IP addresses of the local machine. */
if (ipAddresses)
@@ -367,14 +367,14 @@ int Server::postLoad ()
if (Socket::getLocalIPsList (*ipAddresses))
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error reading IP list"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error reading IP list"));
return -1;
}
- logWriteln (MYSERVER_LOG_MSG_INFO, _("IP: %s"), ipAddresses->c_str ());
+ log (MYSERVER_LOG_MSG_INFO, _("IP: %s"), ipAddresses->c_str ());
/* Load the MIME types. */
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Loading MIME types..."));
+ log (MYSERVER_LOG_MSG_INFO, _("Loading MIME types..."));
if (mimeManager)
delete mimeManager;
@@ -382,11 +382,11 @@ int Server::postLoad ()
mimeManager = new MimeManager ();
if (int nMIMEtypes = mimeManager->loadXML(mimeConfigurationFile->c_str ()))
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Using %i MIME types"), nMIMEtypes);
+ log (MYSERVER_LOG_MSG_INFO, _("Using %i MIME types"), nMIMEtypes);
else
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error while loading MIME types"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error while loading MIME types"));
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Detected %i CPUs"), (int) getCPUCount
());
+ log (MYSERVER_LOG_MSG_INFO, _("Detected %i CPUs"), (int) getCPUCount ());
connectionsScheduler.restart ();
@@ -418,15 +418,15 @@ int Server::postLoad ()
for (u_long i = 0; i < nStaticThreads; i++)
{
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Creating thread %i..."), (int) (i
+ 1));
+ log (MYSERVER_LOG_MSG_INFO, _("Creating thread %i..."), (int) (i + 1));
if (addThread (true))
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error while creating
thread"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error while creating thread"));
return -1;
}
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Thread %i created"), (int)(i +
1));
+ log (MYSERVER_LOG_MSG_INFO, _("Thread %i created"), (int)(i + 1));
}
@@ -448,7 +448,7 @@ void Server::loadPlugins ()
authMethodFactory.addAuthMethod (xml, (AuthMethod*) xmlV);
if (filtersFactory.insert ("gzip", Gzip::factory))
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error while loading plugins"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error while loading plugins"));
Protocol *protocolsSet[] = {new HttpProtocol(),
new HttpsProtocol(),
@@ -536,11 +536,11 @@ void Server::mainLoop()
string beepStr (beep);
logManager->log (this, "MAINLOG", logLocation, beepStr);
}
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Reloading MIME
types"));
+ log (MYSERVER_LOG_MSG_INFO, _("Reloading MIME types"));
getMimeManager ()->loadXML (getMIMEConfFile ());
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Reloaded"));
+ log (MYSERVER_LOG_MSG_INFO, _("Reloaded"));
mimeConfTime = mimeConfNow;
}
@@ -558,7 +558,7 @@ void Server::mainLoop()
logManager->log (this, "MAINLOG", logLocation, beepStr);
}
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Rebooting..."));
+ log (MYSERVER_LOG_MSG_INFO, _("Rebooting..."));
Socket::stopBlockingOperations (true);
@@ -589,7 +589,7 @@ void Server::mainLoop()
listenThreads.commitFastReboot ();
hostsConfTime = hostsConfTimeNow;
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Reloaded"));
+ log (MYSERVER_LOG_MSG_INFO, _("Reloaded"));
}
}
}//end if (autoRebootEnabled)
@@ -780,7 +780,7 @@ void Server::stop ()
*/
int Server::terminate ()
{
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Stopping threads"));
+ log (MYSERVER_LOG_MSG_INFO, _("Stopping threads"));
listenThreads.terminate ();
@@ -807,9 +807,9 @@ int Server::terminate ()
/* Clear the home directories data. */
homeDir.clear ();
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Threads stopped"));
+ log (MYSERVER_LOG_MSG_INFO, _("Threads stopped"));
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Cleaning memory"));
+ log (MYSERVER_LOG_MSG_INFO, _("Cleaning memory"));
freeHashedData ();
@@ -855,7 +855,7 @@ int Server::terminate ()
nStaticThreads = 0;
- logWriteln (MYSERVER_LOG_MSG_INFO, _("MyServer has stopped"));
+ log (MYSERVER_LOG_MSG_INFO, _("MyServer has stopped"));
logManager->clear ();
@@ -1504,10 +1504,10 @@ void Server::setProcessPermissions ()
ostringstream out;
if (Process::setAdditionalGroups (0, 0))
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error setting additional
groups"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error setting additional groups"));
if (Process::setgid (gid.c_str ()))
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error setting gid"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error setting gid"));
autoRebootEnabled = false;
}
@@ -1521,7 +1521,7 @@ void Server::setProcessPermissions ()
{
ostringstream out;
if (Process::setuid (uid.c_str ()))
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error setting uid"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error setting uid"));
autoRebootEnabled = false;
}
@@ -1563,7 +1563,7 @@ int Server::reboot ()
logManager->log (this, "MAINLOG", logLocation, beepStr);
}
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Rebooting"));
+ log (MYSERVER_LOG_MSG_INFO, _("Rebooting"));
if (mustEndServer)
return 0;
@@ -1586,7 +1586,7 @@ int Server::reboot ()
serverReady = true;
- logWriteln (MYSERVER_LOG_MSG_INFO, _("Restarted"));
+ log (MYSERVER_LOG_MSG_INFO, _("Restarted"));
return 0;
}
@@ -1740,7 +1740,7 @@ int Server::addThread (bool staticThread)
if (ret)
{
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error creating thread"));
+ log (MYSERVER_LOG_MSG_ERROR, _("Error creating thread"));
return -1;
}
@@ -1827,7 +1827,7 @@ int Server::countAvailableThreads ()
* \see LogManager#log (void*, string, string, LoggingLeve, bool, va_list)
* \return 0 on success, 1 on error.
*/
-int Server::logWriteln (LoggingLevel level, const char *fmt, ...)
+int Server::log (LoggingLevel level, const char *fmt, ...)
{
int failure = 0;
@@ -1850,9 +1850,9 @@ int Server::logWriteln (LoggingLevel level, const char
*fmt, ...)
/*!
* Write a string to the log file and terminate the line.
*/
-int Server::logWriteln (char const* str, LoggingLevel level)
+int Server::log (char const* str, LoggingLevel level)
{
- return logWriteln (level, "%s", str);
+ return log (level, "%s", str);
}
/*!
commit 6fcef38af252b8a13b5101a284c5fbacf2334eb2
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Aug 23 12:43:46 2009 +0200
Refactoring: rename any `getHashedData' to `getData'.
diff --git a/myserver/include/conf/mime/mime_manager.h
b/myserver/include/conf/mime/mime_manager.h
index 96b35db..4e47d27 100644
--- a/myserver/include/conf/mime/mime_manager.h
+++ b/myserver/include/conf/mime/mime_manager.h
@@ -72,7 +72,7 @@ struct MimeRecord
int addFilter (const char*, bool acceptDuplicate = true);
~MimeRecord ();
void clear ();
- const char* getHashedData(string &name);
+ const char* getData(string &name);
};
diff --git a/myserver/include/conf/security/security_token.h
b/myserver/include/conf/security/security_token.h
index 8236991..9a3ef30 100644
--- a/myserver/include/conf/security/security_token.h
+++ b/myserver/include/conf/security/security_token.h
@@ -51,7 +51,7 @@ public:
SecurityToken();
void reset();
- const char* getHashedData (const char* name, int domains, const char *def =
NULL);
+ const char* getData (const char* name, int domains, const char *def = NULL);
NodeTree<string>* getNodeTree (string& key, int domains, NodeTree<string>*
def = NULL);
diff --git a/myserver/include/conf/vhost/vhost.h
b/myserver/include/conf/vhost/vhost.h
index 95b8ac2..c30064c 100644
--- a/myserver/include/conf/vhost/vhost.h
+++ b/myserver/include/conf/vhost/vhost.h
@@ -140,7 +140,7 @@ public:
Vhost(LogManager* lm);
~Vhost();
- const char* getHashedData (const char* name);
+ const char* getData (const char* name);
NodeTree<string>* getNodeTree (string& key)
{
diff --git a/myserver/include/protocol/http/http_thread_context.h
b/myserver/include/protocol/http/http_thread_context.h
index ab3b477..dcde452 100755
--- a/myserver/include/protocol/http/http_thread_context.h
+++ b/myserver/include/protocol/http/http_thread_context.h
@@ -93,7 +93,7 @@ struct HttpThreadContext
const char* getVhostDir();
const char* getVhostSys();
- const char* getHashedData (const char *name);
+ const char* getData (const char *name);
};
#endif
diff --git a/myserver/include/server/server.h b/myserver/include/server/server.h
index a7d92dc..5b0eb2f 100644
--- a/myserver/include/server/server.h
+++ b/myserver/include/server/server.h
@@ -83,7 +83,7 @@ public:
int loadLibraries();
CachedFileFactory* getCachedFiles();
- const char* getHashedData(const char* name);
+ const char* getData(const char* name);
void setGlobalData(const char* name, void* data);
void* getGlobalData(const char* name);
diff --git a/myserver/src/conf/mime/mime_manager.cpp
b/myserver/src/conf/mime/mime_manager.cpp
index a83e149..a680c1a 100644
--- a/myserver/src/conf/mime/mime_manager.cpp
+++ b/myserver/src/conf/mime/mime_manager.cpp
@@ -130,7 +130,7 @@ void MimeRecord::clear ()
/*!
* Get the value stored in the hash dictionary for the `name' key.
*/
-const char* MimeRecord::getHashedData(string &name)
+const char* MimeRecord::getData(string &name)
{
string *str = hashedData.get (name);
if (str)
diff --git a/myserver/src/conf/security/security_token.cpp
b/myserver/src/conf/security/security_token.cpp
index 098f1a8..b9af5c8 100644
--- a/myserver/src/conf/security/security_token.cpp
+++ b/myserver/src/conf/security/security_token.cpp
@@ -112,7 +112,7 @@ NodeTree<string>* SecurityToken::getNodeTree (string& key,
int domains, NodeTree
*\li Global security file.
*\li Default value.
*/
-const char* SecurityToken::getHashedData (const char* name, int domains, const
char *def)
+const char* SecurityToken::getData (const char* name, int domains, const char
*def)
{
if (domains & MYSERVER_SECURITY_CONF)
{
@@ -126,7 +126,7 @@ const char* SecurityToken::getHashedData (const char* name,
int domains, const c
if (mimeRecord && (domains & MYSERVER_MIME_CONF))
{
string strName (name);
- const char *ret = mimeRecord->getHashedData (strName);
+ const char *ret = mimeRecord->getData (strName);
if (ret)
return ret;
@@ -134,7 +134,7 @@ const char* SecurityToken::getHashedData (const char* name,
int domains, const c
if (vhost && (domains & MYSERVER_VHOST_CONF))
{
- const char* ret = vhost->getHashedData (name);
+ const char* ret = vhost->getData (name);
if (ret)
return ret;
@@ -142,7 +142,7 @@ const char* SecurityToken::getHashedData (const char* name,
int domains, const c
if (server && (domains & MYSERVER_SERVER_CONF))
{
- const char* ret = server->getHashedData (name);
+ const char* ret = server->getData (name);
if (ret)
return ret;
diff --git a/myserver/src/conf/security/xml_validator.cpp
b/myserver/src/conf/security/xml_validator.cpp
index bfb1869..5db26f0 100644
--- a/myserver/src/conf/security/xml_validator.cpp
+++ b/myserver/src/conf/security/xml_validator.cpp
@@ -42,7 +42,7 @@ SecurityCache* XmlValidator::getCache (SecurityToken *st)
{
if (!secCache)
{
- const char *data = st->getHashedData ("SECURITY_CACHE_NODES",
MYSERVER_SERVER_CONF, NULL);
+ const char *data = st->getData ("SECURITY_CACHE_NODES",
MYSERVER_SERVER_CONF, NULL);
secCache = new SecurityCache ();
@@ -68,9 +68,9 @@ XmlParser* XmlValidator::getParser (SecurityToken* st)
if (!cache)
return NULL;
- secName = st->getHashedData ("security.filename", MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, ".security.xml");
+ secName = st->getData ("security.filename", MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, ".security.xml");
- u_long maxSize = atol (st->getHashedData ("security.max_size",
MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF, "0"));
+ u_long maxSize = atol (st->getData ("security.max_size", MYSERVER_VHOST_CONF
| MYSERVER_SERVER_CONF, "0"));
return cache->getParser (*(st->getDirectory ()), *(st->getSysDirectory ()),
false, secName);
}
diff --git a/myserver/src/conf/vhost/vhost.cpp
b/myserver/src/conf/vhost/vhost.cpp
index 083cc9f..83fb370 100644
--- a/myserver/src/conf/vhost/vhost.cpp
+++ b/myserver/src/conf/vhost/vhost.cpp
@@ -454,7 +454,7 @@ void Vhost::setRef (int n)
* Get the value for name in the hash dictionary.
* \param name The hashed entry key.
*/
-const char* Vhost::getHashedData (const char* name)
+const char* Vhost::getData (const char* name)
{
NodeTree<string> *s = hashedData.get(name);
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index 25b10d7..df68e9c 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -239,11 +239,11 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
spi.cmdLine = cmdLine.str ();
spi.cwd.assign (td->scriptDir);
- spi.gid = atoi (td->securityToken.getHashedData ("cgi.gid",
MYSERVER_VHOST_CONF |
+ spi.gid = atoi (td->securityToken.getData ("cgi.gid", MYSERVER_VHOST_CONF |
MYSERVER_MIME_CONF |
MYSERVER_SECURITY_CONF |
MYSERVER_SERVER_CONF,
"0"));
- spi.uid = atoi (td->securityToken.getHashedData ("cgi.uid",
MYSERVER_VHOST_CONF |
+ spi.uid = atoi (td->securityToken.getData ("cgi.uid", MYSERVER_VHOST_CONF |
MYSERVER_MIME_CONF |
MYSERVER_SECURITY_CONF |
MYSERVER_SERVER_CONF,
"0"));
diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp
b/myserver/src/http_handler/http_dir/http_dir.cpp
index 5c12254..d048d61 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -308,7 +308,7 @@ int HttpDir::send(HttpThreadContext* td,
char sortType = 0;
bool sortReverse = false;
string linkPrefix;
- const char *formatString = td->securityToken.getHashedData
("http.dir.format",
+ const char *formatString = td->securityToken.getData ("http.dir.format",
MYSERVER_SECURITY_CONF |
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, "%f%t%s");
@@ -385,7 +385,7 @@ int HttpDir::send(HttpThreadContext* td,
sort (files.begin(), files.end(), compareFileStructByName);
}
- browseDirCSSpath = td->securityToken.getHashedData ("http.dir.css",
+ browseDirCSSpath = td->securityToken.getData ("http.dir.css",
MYSERVER_SECURITY_CONF |
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
NULL);
diff --git a/myserver/src/http_handler/http_file/http_file.cpp
b/myserver/src/http_handler/http_file/http_file.cpp
index 6263aab..98047fe 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -330,7 +330,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
/*
* Use GZIP compression to send files bigger than GZIP threshold.
*/
- const char *val = td->securityToken.getHashedData ("gzip.threshold",
+ const char *val = td->securityToken.getData ("gzip.threshold",
MYSERVER_SECURITY_CONF
| MYSERVER_VHOST_CONF
| MYSERVER_MIME_CONF
diff --git a/myserver/src/http_handler/isapi/isapi.cpp
b/myserver/src/http_handler/isapi/isapi.cpp
index 3ff1119..518ef0b 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -705,7 +705,7 @@ BOOL Isapi::buildAllRawHeaders(HttpThreadContext*
td,ConnectionPtr a,
if(valLen + 30 < maxLen)
valLen += sprintf(&ValStr[valLen], "SERVER_ADMIN:%s\n",
- td->securityToken.getHashedData ("server.admin",
MYSERVER_VHOST_CONF |
+ td->securityToken.getData ("server.admin",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
""));
else if(valLen + 30 < maxLen)
return 0;
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp
b/myserver/src/http_handler/wincgi/wincgi.cpp
index 970c2da..7bd6e15 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -139,7 +139,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
DataFileHandle.writeToFile (buffer,26,&nbr);
*td->secondaryBuffer << "Server Admin=" <<
- td->securityToken.getHashedData ("server.admin", MYSERVER_VHOST_CONF |
+ td->securityToken.getData ("server.admin", MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, "")<< "\r\n";
DataFileHandle.writeToFile (buffer,td->secondaryBuffer->getLength(),&nbr);
diff --git a/myserver/src/protocol/control/control_protocol.cpp
b/myserver/src/protocol/control/control_protocol.cpp
index ff65877..f90b6a1 100755
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -109,26 +109,26 @@ int ControlProtocol::loadProtocol ()
const char *data = 0;
- data = Server::getInstance ()->getHashedData ("control.enabled");
+ data = Server::getInstance ()->getData ("control.enabled");
if (data && (!strcmpi (data, "YES")))
controlEnabled = 1;
else
controlEnabled = 0;
- data = Server::getInstance ()->getHashedData ("control.admin");
+ data = Server::getInstance ()->getData ("control.admin");
if (data)
strncpy (tmpName, data, 64);
- data = Server::getInstance ()->getHashedData ("control.password");
+ data = Server::getInstance ()->getData ("control.password");
if (data)
strncpy (tmpPassword, data, 64);
- data = Server::getInstance ()->getHashedData ("control.admin.md5");
+ data = Server::getInstance ()->getData ("control.admin.md5");
if (data)
if (strcmpi (data, "YES") == 0)
adminNameMD5ized = 1;
- data = Server::getInstance ()->getHashedData ("control.password.md5");
+ data = Server::getInstance ()->getData ("control.password.md5");
if (data)
if (strcmpi (data, "YES") == 0)
adminPasswordMD5ized = 1;
diff --git a/myserver/src/protocol/ftp/ftp.cpp
b/myserver/src/protocol/ftp/ftp.cpp
index 51a0b2d..fa98a2c 100755
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -397,27 +397,27 @@ int Ftp::loadProtocolstatic ()
Server *server = Server::getInstance ();
// allow anonymous access
- const char *pData = server->getHashedData ("ftp.allow_anonymous");
+ const char *pData = server->getData ("ftp.allow_anonymous");
if (pData != NULL)
m_ballowAnonymous = strcmpi ("Yes", pData) == 0 ? true : false;
// request password for anonymous
- pData = server->getHashedData ("ftp.anonymous_need_pass");
+ pData = server->getData ("ftp.anonymous_need_pass");
if (pData != NULL)
m_bAnonymousNeedPass = strcmpi ("Yes", pData) == 0 ? true : false;
// enable asyncronous cmds
- pData = server->getHashedData ("ftp.allow_asynchronous_cmds");
+ pData = server->getData ("ftp.allow_asynchronous_cmds");
if (pData != NULL)
m_ballowAsynchronousCmds = strcmpi ("Yes", pData) == 0 ? true : false;
// enable pipelining
- pData = server->getHashedData ("ftp.allow_pipelining");
+ pData = server->getData ("ftp.allow_pipelining");
if (pData != NULL)
m_bEnablePipelining = strcmpi ("Yes", pData) == 0 ? true : false;
// enable write commands
- pData = server->getHashedData ("ftp.allow_store");
+ pData = server->getData ("ftp.allow_store");
if (pData != NULL)
m_bEnablestoreCmds = strcmpi ("Yes", pData) == 0 ? true : false;
@@ -603,7 +603,7 @@ void Ftp::retrstor (bool bretr, bool bappend, const
std::string & sPath)
FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
/* The security file doesn't exist in any case. */
- const char *secName = td.st.getHashedData ("security.filename",
+ const char *secName = td.st.getData ("security.filename",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
".security.xml");
@@ -1747,7 +1747,7 @@ Ftp::list (const std::string & sParam /*= ""*/ )
return;
}
- const char *secName = td.st.getHashedData ("security.filename",
+ const char *secName = td.st.getData ("security.filename",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
".security.xml");
@@ -1985,7 +1985,7 @@ Ftp::nlst (const std::string & sParam /* = "" */ )
MemBuf & secondaryBuffer = *td.secondaryBuffer;
secondaryBuffer.setLength (0);
- const char *secName = td.st.getHashedData ("security.filename",
+ const char *secName = td.st.getData ("security.filename",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
".security.xml");
@@ -2272,7 +2272,7 @@ void Ftp::dele (const std::string & sPath)
FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
/* The security file doesn't exist in any case. */
- const char *secName = td.st.getHashedData ("security.filename",
+ const char *secName = td.st.getData ("security.filename",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
".security.xml");
@@ -2402,7 +2402,7 @@ void Ftp::rnfr (const std::string & sPath)
std::string sLocalDir, sLocalFileName;
FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
- const char *secName = td.st.getHashedData ("security.filename",
+ const char *secName = td.st.getData ("security.filename",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
".security.xml");
@@ -2446,7 +2446,7 @@ void Ftp::Rnto (const std::string & sPath)
return;
}
- const char *secName = td.st.getHashedData ("security.filename",
+ const char *secName = td.st.getData ("security.filename",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
".security.xml");
@@ -2496,9 +2496,9 @@ int Ftp::checkRights (const std::string & suser, const
std::string & sPass,
td.st.setResource (&sFileName);
AuthDomain auth (&td.st);
- string validator (td.st.getHashedData ("sec.validator", MYSERVER_VHOST_CONF
+ string validator (td.st.getData ("sec.validator", MYSERVER_VHOST_CONF
| MYSERVER_SERVER_CONF, "xml"));
- string authMethod (td.st.getHashedData ("sec.auth_method",
MYSERVER_VHOST_CONF
+ string authMethod (td.st.getData ("sec.auth_method", MYSERVER_VHOST_CONF
| MYSERVER_SERVER_CONF, "xml"));
SecurityDomain *domains[] = { &auth, NULL };
@@ -2523,7 +2523,7 @@ void Ftp::size (const std::string & sPath)
FilesUtility::splitPath (sLocalPath, sLocalDir, sLocalFileName);
/* The security file doesn't exist in any case. */
- const char *secName = td.st.getHashedData ("security.filename",
+ const char *secName = td.st.getData ("security.filename",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
".security.xml");
diff --git a/myserver/src/protocol/http/env/env.cpp
b/myserver/src/protocol/http/env/env.cpp
index 08bd0c8..04478e0 100644
--- a/myserver/src/protocol/http/env/env.cpp
+++ b/myserver/src/protocol/http/env/env.cpp
@@ -80,7 +80,7 @@ void Env::buildEnvironmentString(HttpThreadContext* td, char
*cgiEnv,
memCgi << end_str << "SERVER_PORT="<< portBuffer;
memCgi << end_str << "SERVER_ADMIN=";
- memCgi << td->securityToken.getHashedData ("server.admin",
+ memCgi << td->securityToken.getData ("server.admin",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, "");
diff --git a/myserver/src/protocol/http/http.cpp
b/myserver/src/protocol/http/http.cpp
index 2f38639..77dfcfb 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -198,7 +198,7 @@ bool Http::allowMethod (const char *method)
{
char name[64];
sprintf (name, "http.%s.allow", method);
- const char *allow = td->securityToken.getHashedData (name,
+ const char *allow = td->securityToken.getData (name,
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
"YES");
@@ -280,7 +280,7 @@ int Http::getFilePermissions (string& filename, string&
directory, string& file,
if (FilesUtility::isLink (td->filenamePath.c_str ()))
{
- const char *perm = td->securityToken.getHashedData
("symlinks.follow",
+ const char *perm = td->securityToken.getData ("symlinks.follow",
MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
"NO");
if (!perm || strcmpi (perm, "YES"))
@@ -330,9 +330,9 @@ int Http::getFilePermissions (string& filename, string&
directory, string& file,
AuthDomain auth (&(td->securityToken));
HttpReqSecurityDomain httpReqSecDom (&(td->request));
- string validator (td->securityToken.getHashedData ("sec.validator",
MYSERVER_VHOST_CONF |
+ string validator (td->securityToken.getData ("sec.validator",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
"xml"));
- string authMethod (td->securityToken.getHashedData ("sec.auth_method",
MYSERVER_VHOST_CONF |
+ string authMethod (td->securityToken.getData ("sec.auth_method",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, "xml"));
@@ -341,7 +341,7 @@ int Http::getFilePermissions (string& filename, string&
directory, string& file,
Server::getInstance ()->getSecurityManager ()->getPermissionMask
(&(td->securityToken),
domains, validator,
authMethod);
- const char *authType = td->securityToken.getHashedData ("http.auth",
+ const char *authType = td->securityToken.getData ("http.auth",
MYSERVER_SECURITY_CONF | MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF);
*permissions = td->securityToken.getMask ();
@@ -377,7 +377,7 @@ int Http::getFilePermissions (string& filename, string&
directory, string& file,
return 500;
}
- const char *tr = td->securityToken.getHashedData ("connection.throttling",
+ const char *tr = td->securityToken.getData ("connection.throttling",
MYSERVER_SECURITY_CONF |
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF);
@@ -1024,11 +1024,11 @@ int Http::controlConnection (ConnectionPtr a, char*
/*b1*/, char* /*b2*/,
if (documentRoot.length ())
{
- const char *useHomeDir = td->securityToken.getHashedData
("http.use_home_directory",
+ const char *useHomeDir = td->securityToken.getData
("http.use_home_directory",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, "YES");
- const char *homeDir = td->securityToken.getHashedData
("http.home_directory",
+ const char *homeDir = td->securityToken.getData
("http.home_directory",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF,
"public_html");
@@ -1058,7 +1058,7 @@ int Http::controlConnection (ConnectionPtr a, char*
/*b1*/, char* /*b2*/,
*virtual host A value of zero means no limit.
*/
{
- const char* val = td->securityToken.getHashedData
("MAX_CONNECTIONS",
+ const char* val = td->securityToken.getData ("MAX_CONNECTIONS",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, NULL);
@@ -1357,7 +1357,7 @@ int Http::raiseHTTPError (int ID)
int useMessagesFiles = 1;
HttpRequestHeader::Entry *host = td->request.other.get ("Host");
HttpRequestHeader::Entry *connection = td->request.other.get
("Connection");
- const char *useMessagesVal = td->securityToken.getHashedData
("http.use_error_file",
+ const char *useMessagesVal = td->securityToken.getData
("http.use_error_file",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, NULL);
@@ -1389,7 +1389,7 @@ int Http::raiseHTTPError (int ID)
char errorName [32];
sprintf (errorName, "http.error.file.%i", ID);
- const char *defErrorFile = td->securityToken.getHashedData (errorName,
+ const char *defErrorFile = td->securityToken.getData (errorName,
MYSERVER_SECURITY_CONF |
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF);
@@ -1451,7 +1451,7 @@ int Http::raiseHTTPError (int ID)
/* Send only the header (and the body if specified). */
{
- const char* value = td->securityToken.getHashedData ("http.error_body",
+ const char* value = td->securityToken.getData ("http.error_body",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, NULL);
@@ -1554,7 +1554,7 @@ Internal Server Error\n\
*/
MimeRecord* Http::getMIME (string &filename)
{
- const char *handler = td->securityToken.getHashedData ("mime.handler",
+ const char *handler = td->securityToken.getData ("mime.handler",
MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF, NULL);
if (staticHttp.allowVhostMime && td->connection->host->isMIME ())
@@ -1812,7 +1812,7 @@ int Http::loadProtocolStatic ()
staticHttp.dynManagerList.addHttpManager ("ISAPI", new Isapi ());
staticHttp.dynManagerList.addHttpManager ("PROXY", new Proxy ());
- data = Server::getInstance ()->getHashedData ("vhost.allow_mime");
+ data = Server::getInstance ()->getData ("vhost.allow_mime");
if (data)
{
@@ -1821,7 +1821,7 @@ int Http::loadProtocolStatic ()
else
staticHttp.allowVhostMime = 0;
}
- data = Server::getInstance ()->getHashedData ("cgi.timeout");
+ data = Server::getInstance ()->getData ("cgi.timeout");
if (data)
{
staticHttp.timeout = MYSERVER_SEC (atoi (data));
diff --git a/myserver/src/protocol/http/http_thread_context.cpp
b/myserver/src/protocol/http/http_thread_context.cpp
index 6701d08..8630bfc 100755
--- a/myserver/src/protocol/http/http_thread_context.cpp
+++ b/myserver/src/protocol/http/http_thread_context.cpp
@@ -26,7 +26,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
*is propagated to the virtual host, if it is defined.
*\param name The key name to look for in the hash map.
*/
-const char* HttpThreadContext::getHashedData (const char *name)
+const char* HttpThreadContext::getData (const char *name)
{
Vhost *vh = (Vhost*)connection->host;
@@ -35,7 +35,7 @@ const char* HttpThreadContext::getHashedData (const char
*name)
if (ret)
return ret->c_str ();
else
- return vh ? vh->getHashedData (name) : NULL;
+ return vh ? vh->getData (name) : NULL;
}
/*!
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 97ea8cc..e008880 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -917,53 +917,53 @@ int Server::initialize ()
string fullFg ("log_color." + *it + "_fg");
string fullBg ("log_color." + *it + "_bg");
- data = getHashedData (fullFg.c_str ());
+ data = getData (fullFg.c_str ());
if (data)
consoleColors[fg] = string (data);
- data = getHashedData (fullBg.c_str ());
+ data = getData (fullBg.c_str ());
if (data)
consoleColors[bg] = string (data);
}
initLogManager ();
- data = getHashedData ("server.buffer_size");
+ data = getData ("server.buffer_size");
if (data)
buffersize = secondaryBufferSize= (atol(data) > 81920) ? atol(data) :
81920 ;
- data = getHashedData ("server.connection_timeout");
+ data = getData ("server.connection_timeout");
if (data)
connectionTimeout = MYSERVER_SEC ((u_long)atol(data));
- data = getHashedData ("server.static_threads");
+ data = getData ("server.static_threads");
if (data)
nStaticThreads = atoi(data);
- data = getHashedData ("server.max_threads");
+ data = getData ("server.max_threads");
if (data)
nMaxThreads = atoi(data);
/* Get the max connections number to allow. */
- data = getHashedData ("server.max_connections");
+ data = getData ("server.max_connections");
if (data)
maxConnections = atoi(data);
/* Get the max connections number to accept. */
- data = getHashedData ("server.max_accepted_connections");
+ data = getData ("server.max_accepted_connections");
if (data)
maxConnectionsToAccept = atoi(data);
- data = getHashedData ("server.connections_pool.size");
+ data = getData ("server.connections_pool.size");
if (data)
connectionsPool.init (atoi (data));
/* Get the default throttling rate to use on connections. */
- data = getHashedData ("connection.throttling");
+ data = getData ("connection.throttling");
if (data)
throttlingRate = (u_long)atoi(data);
- data = getHashedData ("server.max_log_size");
+ data = getData ("server.max_log_size");
if (data)
maxLogFileSize=(u_long)atol(data);
@@ -976,7 +976,7 @@ int Server::initialize ()
else
cachedFiles.initialize (1 << 23);
- data = getHashedData ("server.temp_directory");
+ data = getData ("server.temp_directory");
if (data)
{
string tmpPath (data);
@@ -986,33 +986,33 @@ int Server::initialize ()
else
FilesUtility::resetTmpPath ();
- data = getHashedData ("server.max_file_cache");
+ data = getData ("server.max_file_cache");
if (data)
{
u_long maxSize = (u_long)atol(data);
cachedFiles.setMaxSize (maxSize);
}
- data = getHashedData ("server.min_file_cache");
+ data = getData ("server.min_file_cache");
if (data)
{
u_long minSize = (u_long)atol(data);
cachedFiles.setMinSize (minSize);
}
- data = getHashedData ("server.uid");
+ data = getData ("server.uid");
if (data)
uid.assign (data);
else
uid.assign ("");
- data = getHashedData ("server.gid");
+ data = getData ("server.gid");
if (data)
gid.assign (data);
else
gid.assign ("");
- data = getHashedData ("server.max_servers");
+ data = getData ("server.max_servers");
if (data)
{
int maxServersProcesses = atoi(data);
@@ -1464,7 +1464,7 @@ int Server::freeHashedData ()
/*!
* Get the value for name in the hash dictionary.
*/
-const char* Server::getHashedData (const char* name)
+const char* Server::getData (const char* name)
{
NodeTree<string> *s = hashedData.get (name);
commit 5e9e52af4414077f8cdabc509c829146db17f4e2
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Aug 23 12:40:58 2009 +0200
Remove log verbosity as a global server variable.
diff --git a/myserver/include/server/server.h b/myserver/include/server/server.h
index 667cf13..a7d92dc 100644
--- a/myserver/include/server/server.h
+++ b/myserver/include/server/server.h
@@ -124,10 +124,8 @@ public:
}
const char *getServerName();
- u_long getVerbosity();
int getMaxLogFileSize();
int mustUseLogonOption();
- void setVerbosity(u_long);
void start(string &, string &, string &, string &);
void stop();
void finalCleanup();
@@ -221,7 +219,6 @@ private:
LogManager* logManager;
bool serverReady;
- u_long verbosity;
u_long throttlingRate;
u_long buffersize;
u_long secondaryBufferSize;
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index 7e4454e..97ea8cc 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -759,22 +759,6 @@ u_long Server::getNumTotalConnections ()
}
/*!
- * Get the verbosity value.
- */
-u_long Server::getVerbosity ()
-{
- return verbosity;
-}
-
-/*!
- * Set the verbosity value.
- */
-void Server::setVerbosity (u_long nv)
-{
- verbosity=nv;
-}
-
-/*!
* Return a home directory object.
*/
HomeDir* Server::getHomeDir ()
@@ -912,7 +896,6 @@ int Server::initialize ()
freeThreads = 0;
connectionTimeout = MYSERVER_SEC (180);
endServer = false;
- verbosity = 1;
purgeThreadsThreshold = 1;
throttlingRate = 0;
maxConnections = 0;
@@ -945,10 +928,6 @@ int Server::initialize ()
initLogManager ();
- data = getHashedData ("server.verbosity");
- if (data)
- verbosity = (u_long)atoi(data);
-
data = getHashedData ("server.buffer_size");
if (data)
buffersize = secondaryBufferSize= (atol(data) > 81920) ? atol(data) :
81920 ;
commit 72de355587d8e3beeb719a6053660abbd774d762
Author: Giuseppe Scrivano <address@hidden>
Date: Sun Aug 23 10:48:55 2009 +0200
Mass update: apply the emacs delete-trailing-whitespace function to every
(.cpp|.h)$ file.
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 7e8fba3..497b07b 100644
--- a/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
+++ b/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
@@ -8,18 +8,18 @@ int isNumber(char* s)
if(!isdigit(s[i]))
return 0;
return 1;
-
+
}
#ifdef WIN32
extern "C" int EXPORTABLE myserver_main (char *cmd, MsCgiData* data)
#else
extern "C" int myserver_main (char *cmd, MsCgiData* data)
#endif
-{
+{
MscgiManager cm(data);
- if(strlen (cmd) == 0)
- {
+ if(strlen (cmd) == 0)
+ {
cm.write("<?xml version=\"1.0\"
encoding=\"UTF-8\"?>\r\n<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\r\n\
\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\";>\r\n\
<html xmlns=\"http://www.w3.org/1999/xhtml\"; xml:lang=\"en\">\r\n\
@@ -29,9 +29,9 @@ extern "C" int myserver_main (char *cmd, MsCgiData* data)
<br />\r\n<img src=\"/logo.png\" alt=\"\" style=\"border: 0px;\" />\r\n<br
/><br />\r\n\
<form action=\"math_sum.mscgi\" method=\"get\" enctype=\"text/plain\">\r\n\
<div>\r\n<input type=\"text\" name=\"a\" size=\"20\" />\r\n<br /><br
/>\r\n+<br /><br />\r\n<input type=\"text\" name=\"b\" size=\"20\" />\r\n<br
/><br />\r\n<input type=\"submit\" value=\"Compute!\"
/>\r\n</div>\r\n</form>\r\n<br />\r\n</div>\r\n</body>\r\n</html>");
- }
- else
- {
+ }
+ else
+ {
u_long dim = 120;
char lb[120];
int a = 0;
@@ -65,7 +65,7 @@ extern "C" int myserver_main (char *cmd, MsCgiData* data)
tmp = cm.getParam("a");
if (tmp && tmp[0] != '\0')
{
- if (strlen(tmp) > 11)
+ if (strlen(tmp) > 11)
tmp[11] = '\0';
a = atoi(tmp);
cm.write(tmp);
@@ -75,7 +75,7 @@ extern "C" int myserver_main (char *cmd, MsCgiData* data)
cm.write("0");
}
cm.write(" + ");
-
+
tmp = cm.getParam("b");
if (tmp && tmp[0] != '\0')
@@ -108,23 +108,23 @@ extern "C" int myserver_main (char *cmd, MsCgiData* data)
cm.write("(");
cm.getenv("HTTP_HOST", lb, &dim);
cm.write(lb);
-
+
cm.write(")\r\n</div>\r\n</body>\r\n</html>");
}
cm.clean();
- return 0;
-}
+ return 0;
+}
#ifdef WIN32
-BOOL APIENTRY DllMain( HANDLE,DWORD ul_reason_for_call,LPVOID)
-{
- switch (ul_reason_for_call)
- {
- case DLL_PROCESS_ATTACH:
- case DLL_THREAD_ATTACH:
- case DLL_THREAD_DETACH:
- case DLL_PROCESS_DETACH:
- break;
- }
- return TRUE;
+BOOL APIENTRY DllMain( HANDLE,DWORD ul_reason_for_call,LPVOID)
+{
+ switch (ul_reason_for_call)
+ {
+ case DLL_PROCESS_ATTACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
+ case DLL_PROCESS_DETACH:
+ break;
+ }
+ return TRUE;
}
#endif
diff --git a/myserver/binaries/web/cgi-src/post/post.cpp
b/myserver/binaries/web/cgi-src/post/post.cpp
index 5a44ae6..844a3e4 100644
--- a/myserver/binaries/web/cgi-src/post/post.cpp
+++ b/myserver/binaries/web/cgi-src/post/post.cpp
@@ -11,7 +11,7 @@ extern "C" int EXPORTABLE myserver_main (char *cmd,MsCgiData*
data)
char *post = cm.postParam("T1");
if(post == NULL)
- {
+ {
cm.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n<!DOCTYPE html
PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\r\n\
\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\";>\r\n\
<html xmlns=\"http://www.w3.org/1999/xhtml\"; xml:lang=\"en\">\r\n\
@@ -42,14 +42,14 @@ extern "C" int EXPORTABLE myserver_main (char
*cmd,MsCgiData* data)
#ifdef WIN32
BOOL APIENTRY DllMain( HANDLE,DWORD ul_reason_for_call,LPVOID)
{
- switch (ul_reason_for_call)
+ switch (ul_reason_for_call)
{
- case DLL_PROCESS_ATTACH:
- case DLL_THREAD_ATTACH:
- case DLL_THREAD_DETACH:
+ case DLL_PROCESS_ATTACH:
+ case DLL_THREAD_ATTACH:
+ case DLL_THREAD_DETACH:
case DLL_PROCESS_DETACH:
- break;
- }
+ break;
+ }
return TRUE;
}
#endif
diff --git a/myserver/include/base/base64/mime_utils.h
b/myserver/include/base/base64/mime_utils.h
index 5ebd1af..3a97e57 100644
--- a/myserver/include/base/base64/mime_utils.h
+++ b/myserver/include/base/base64/mime_utils.h
@@ -44,6 +44,6 @@ public:
char* decode(char*in);
CQPUtils();
~CQPUtils();
-};
+};
#endif
diff --git a/myserver/include/base/bitvec/bitvec.h
b/myserver/include/base/bitvec/bitvec.h
index d59c14c..07e7c63 100644
--- a/myserver/include/base/bitvec/bitvec.h
+++ b/myserver/include/base/bitvec/bitvec.h
@@ -32,7 +32,7 @@ public:
int find ();
- /*!
+ /*!
* Set the value of a bit to 1.
* \param i index of the bit to set.
*/
@@ -41,7 +41,7 @@ public:
data[i / (sizeof (long int) * 8)] |= 1l << i % (sizeof (long int) * 8);
}
- /*!
+ /*!
* Set the value of a bit to 1.
* \param i index of the bit to set.
*/
@@ -50,7 +50,7 @@ public:
data[i / (sizeof (long int) * 8)] &= ~(1l << i % (sizeof (long int) * 8));
}
- /*!
+ /*!
* Get the value of the specified bit.
* \param i index of the bit to get.
*/
@@ -64,7 +64,7 @@ public:
{
delete [] data;
}
-
+
size_t getCapacity ()
{
return capacity;
diff --git a/myserver/include/base/dynamic_lib/dynamiclib.h
b/myserver/include/base/dynamic_lib/dynamiclib.h
index a5ea966..024a0ca 100644
--- a/myserver/include/base/dynamic_lib/dynamiclib.h
+++ b/myserver/include/base/dynamic_lib/dynamiclib.h
@@ -22,7 +22,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <string>
-extern "C"
+extern "C"
{
#ifdef WIN32
#include <direct.h>
diff --git a/myserver/include/base/file/file.h
b/myserver/include/base/file/file.h
index 5960f74..44f1724 100644
--- a/myserver/include/base/file/file.h
+++ b/myserver/include/base/file/file.h
@@ -71,7 +71,7 @@ public:
virtual int read(char* buffer, u_long len, u_long *nbr);
virtual int write(const char* buffer, u_long len, u_long *nbw);
- virtual int fastCopyToSocket (Socket *dest, u_long offset,
+ virtual int fastCopyToSocket (Socket *dest, u_long offset,
MemBuf *buf, u_long *nbw);
int truncate (u_long size = 0);
diff --git a/myserver/include/base/files_cache/cached_file.h
b/myserver/include/base/files_cache/cached_file.h
index a47ed7d..fca362b 100644
--- a/myserver/include/base/files_cache/cached_file.h
+++ b/myserver/include/base/files_cache/cached_file.h
@@ -47,7 +47,7 @@ public:
virtual int operator =(CachedFile);
virtual int close();
- virtual int fastCopyToSocket (Socket *dest, u_long offset,
+ virtual int fastCopyToSocket (Socket *dest, u_long offset,
MemBuf *buf, u_long *nbw);
virtual int write(const char* buffer, u_long len, u_long *nbw);
diff --git a/myserver/include/base/find_data/find_data.h
b/myserver/include/base/find_data/find_data.h
index 132e010..b26c2bd 100644
--- a/myserver/include/base/find_data/find_data.h
+++ b/myserver/include/base/find_data/find_data.h
@@ -21,7 +21,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
# include "stdafx.h"
-extern "C"
+extern "C"
{
# ifdef WIN32
# include <io.h>
@@ -55,8 +55,8 @@ using namespace std;
# define intptr_t int
# endif
-class FindData
-{
+class FindData
+{
public:
char * name;
int attrib;
diff --git a/myserver/include/base/md5/md5.h b/myserver/include/base/md5/md5.h
index c6cf804..dfac789 100644
--- a/myserver/include/base/md5/md5.h
+++ b/myserver/include/base/md5/md5.h
@@ -6,12 +6,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/include/base/mem_buff/mem_buff.h
b/myserver/include/base/mem_buff/mem_buff.h
index d0b76e5..0a351fc 100644
--- a/myserver/include/base/mem_buff/mem_buff.h
+++ b/myserver/include/base/mem_buff/mem_buff.h
@@ -104,7 +104,7 @@ public:
u_int m_nSizeLimit; // The maximun size that the buffer can reached ; 0
if none
u_int m_nBlockLength; // Minimun size of new allocated blocks during
addings
// We assume that
m_nBlockLength < m_nSizeLimit
-
+
void hashMD5(const void* pAdr, u_int nSize);
void hashCRC(const void* pAdr, u_int nSize);
void hex(const void* pAdr, u_int nSize);
@@ -118,7 +118,7 @@ public:
void hashMD5(MemBuf& membuf);
void hashCRC(MemBuf& membuf);
void uintToStr(u_int i, char* pBufToUse, u_int nBufSize) ;
- void xIntToStr(u_int i, int bNegative, char* pBufToUse, u_int
nBufSize);
+ void xIntToStr(u_int i, int bNegative, char* pBufToUse, u_int nBufSize);
void intToStr(int i, char* pBufToUse, u_int nBufSize);
protected:
diff --git a/myserver/include/base/multicast/multicast.h
b/myserver/include/base/multicast/multicast.h
index 5f2a587..3039657 100644
--- a/myserver/include/base/multicast/multicast.h
+++ b/myserver/include/base/multicast/multicast.h
@@ -26,10 +26,10 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <vector>
using namespace std;
-template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
+template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
class MulticastRegistry;
-template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
+template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
class Multicast
{
public:
@@ -37,7 +37,7 @@ public:
virtual ~Multicast(){}
};
-template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
+template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
class MulticastRegistry
{
public:
diff --git a/myserver/include/base/process/fork_server.h
b/myserver/include/base/process/fork_server.h
index b7379cb..6f92b5e 100644
--- a/myserver/include/base/process/fork_server.h
+++ b/myserver/include/base/process/fork_server.h
@@ -47,7 +47,7 @@ class ForkServer
int forkServerLoop (UnixSocket *socket);
int executeProcess (StartProcInfo *spi, int flags,
- int *pid, int *port,
+ int *pid, int *port,
bool waitEnd = false);
u_short getPort (){return port;}
diff --git a/myserver/include/base/process/process_server_manager.h
b/myserver/include/base/process/process_server_manager.h
index 84a89fc..a071f74 100644
--- a/myserver/include/base/process/process_server_manager.h
+++ b/myserver/include/base/process/process_server_manager.h
@@ -39,8 +39,8 @@ public:
{
/*! Server executable path. */
string path;
-
- union
+
+ union
{
unsigned long fileHandle;
SocketHandle sock;
@@ -49,7 +49,7 @@ public:
Socket socket;
string host;
- Process process;
+ Process process;
u_short port;
struct ServerDomain* sd;
bool isLocal;
@@ -74,7 +74,7 @@ public:
clear = 0;
}
};
-
+
ServerDomain* createDomain(const char* name);
ServerDomain* getDomain(const char* name);
void clear();
@@ -87,16 +87,16 @@ public:
void removeDomain(const char* domain);
int domainServers(const char* domain);
void load();
- Server* runAndAddServer(const char* domain, const char* name,
+ Server* runAndAddServer(const char* domain, const char* name,
int uid = 0, int gid = 0, u_short port = 0);
- Server* addRemoteServer(const char* domain, const char* name,
+ Server* addRemoteServer(const char* domain, const char* name,
const char* host, u_short port);
private:
int maxServers;
int nServers;
Mutex mutex;
HashMap<string, ServerDomain*> domains;
- int runServer(Server* server, const char* path, int uid = 0,
+ int runServer(Server* server, const char* path, int uid = 0,
int gid = 0, u_short port = 0);
void addServer(Server* server, const char* domain, const char* name);
};
diff --git a/myserver/include/base/regex/myserver_regex.h
b/myserver/include/base/regex/myserver_regex.h
index 7617a36..f2b4fb6 100644
--- a/myserver/include/base/regex/myserver_regex.h
+++ b/myserver/include/base/regex/myserver_regex.h
@@ -22,7 +22,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
# include "stdafx.h"
-extern "C"
+extern "C"
{
# include <stdio.h>
@@ -52,14 +52,14 @@ public:
~Regex();
int isCompiled();
int compile(const char *pattern, int flags);
- int exec(const char *string, size_t nmatch, regmatch_t matchptr [],
+ int exec(const char *string, size_t nmatch, regmatch_t matchptr [],
int eflags);
void free();
Regex(string const &pattern, int flags){Regex(pattern.c_str(), flags);}
int compile(string const &str, int flags){
return compile(str.c_str(), flags );}
- int exec(string const &str, size_t nmatch, regmatch_t matchptr [],
+ int exec(string const &str, size_t nmatch, regmatch_t matchptr [],
int eflags)
{return exec(str.c_str(), nmatch, matchptr, eflags);}
private:
diff --git a/myserver/include/base/socket/socket.h
b/myserver/include/base/socket/socket.h
index 5d9ccf5..1dd7bbe 100644
--- a/myserver/include/base/socket/socket.h
+++ b/myserver/include/base/socket/socket.h
@@ -40,7 +40,7 @@ extern "C" {
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <netinet/in.h>
+#include <netinet/in.h>
#include <netdb.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/myserver/include/base/socket/ssl_socket.h
b/myserver/include/base/socket/ssl_socket.h
index f3b10d6..34af34e 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -34,7 +34,7 @@ extern "C" {
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <netinet/in.h>
+#include <netinet/in.h>
#include <netdb.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/myserver/include/base/thread/thread.h
b/myserver/include/base/thread/thread.h
index 7dd388d..b933a60 100755
--- a/myserver/include/base/thread/thread.h
+++ b/myserver/include/base/thread/thread.h
@@ -38,14 +38,14 @@ public:
static void wait(u_long);
static ThreadID threadID();
#ifdef WIN32
- static int create(ThreadID* thread,
+ static int create(ThreadID* thread,
unsigned int (_stdcall *start_routine)(void *), void * arg);
#endif
#ifdef HAVE_PTHREAD
- static int create(ThreadID* thread, void * (*start_routine)(void *),
+ static int create(ThreadID* thread, void * (*start_routine)(void *),
void * arg);
#endif
- static void terminate();
+ static void terminate();
static int join(ThreadID);
};
#endif
diff --git a/myserver/include/base/xml/xml_parser.h
b/myserver/include/base/xml/xml_parser.h
index d55aa30..684c0a9 100644
--- a/myserver/include/base/xml/xml_parser.h
+++ b/myserver/include/base/xml/xml_parser.h
@@ -22,11 +22,11 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include "stdafx.h"
#include <include/base/file/file.h>
#include <include/base/mem_buff/mem_buff.h>
-extern "C"
+extern "C"
{
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
-#include <libxml/tree.h>
+#include <libxml/tree.h>
#include <libxml/xpath.h>
#include <libxml/xpathInternals.h>
}
@@ -89,10 +89,10 @@ public:
{
setAttr(name.c_str(), value.c_str());
};
-
+
void addLineFeed();
time_t getLastModTime();
-
+
XmlXPathResult* evaluateXpath(string & path){return
evaluateXpath(path.c_str());}
XmlXPathResult* evaluateXpath(const char*);
bool isXpathEnabled(){return useXpath;}
diff --git a/myserver/include/conf/security/security_cache.h
b/myserver/include/conf/security/security_cache.h
index 58ff627..b349be9 100644
--- a/myserver/include/conf/security/security_cache.h
+++ b/myserver/include/conf/security/security_cache.h
@@ -7,7 +7,7 @@ it under the terms of the GNU General Public License as
published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -46,7 +46,7 @@ public:
/////////OLD NASTY AND DISGUSTING. TEMPORARY SOLUTION TO DON'T BREAK
APIs////////////////////////////////////
int getPermissionMask (SecurityToken* st){return 0;}
- int getErrorFileName (const char *root, int error,
+ int getErrorFileName (const char *root, int error,
const char* sysdirectory, string& out){return 0;}
private:
diff --git a/myserver/include/conf/security/security_manager.h
b/myserver/include/conf/security/security_manager.h
index fb41426..f181d7b 100644
--- a/myserver/include/conf/security/security_manager.h
+++ b/myserver/include/conf/security/security_manager.h
@@ -71,13 +71,13 @@ public:
SecurityManager(ValidatorFactory*, AuthMethodFactory*);
~SecurityManager();
- int getPermissionMask (SecurityToken* st,
- SecurityDomain **domains,
+ int getPermissionMask (SecurityToken* st,
+ SecurityDomain **domains,
string& validator,
string& authMethod);
- int getPermissionMask (SecurityToken* st,
- list<SecurityDomain*> *domains,
+ int getPermissionMask (SecurityToken* st,
+ list<SecurityDomain*> *domains,
string& validator,
string& authMethod);
diff --git a/myserver/include/conf/security/security_token.h
b/myserver/include/conf/security/security_token.h
index 7ea7b70..8236991 100644
--- a/myserver/include/conf/security/security_token.h
+++ b/myserver/include/conf/security/security_token.h
@@ -94,7 +94,7 @@ public:
{
return providedMask;
}
-
+
string& getNeededPassword ()
{
return neededPassword;
@@ -155,7 +155,7 @@ public:
{
providedMask = p;
}
-
+
void setNeededPassword (string& pw)
{
neededPassword.assign (pw);
@@ -211,7 +211,7 @@ private:
int mask;
/*!
- *Password that the user should provide to have access.
+ *Password that the user should provide to have access.
*This is used in authorization schemes like the HTTP digest,
*where the password is not sent in clear on the network.
*/
@@ -219,7 +219,7 @@ private:
/*! The provided password is correct. */
bool authenticated;
-
+
/*! The obtained mask if password were correct. */
int providedMask;
diff --git a/myserver/include/conf/security/validator.h
b/myserver/include/conf/security/validator.h
index a29817c..2d129a5 100644
--- a/myserver/include/conf/security/validator.h
+++ b/myserver/include/conf/security/validator.h
@@ -36,11 +36,11 @@ public:
Validator ();
virtual ~Validator ();
- int getPermissionMask (SecurityToken* st,
+ int getPermissionMask (SecurityToken* st,
SecurityDomain **domains,
AuthMethod* authMethod);
- int getPermissionMask (SecurityToken* st,
+ int getPermissionMask (SecurityToken* st,
list<SecurityDomain*> *domains,
AuthMethod* authMethod);
@@ -59,7 +59,7 @@ protected:
hashedDomains->put (name, domain);
}
- int getPermissionMaskInt (SecurityToken* st,
+ int getPermissionMaskInt (SecurityToken* st,
HashMap<string, SecurityDomain*> *hashedDomains,
AuthMethod* authMethod);
};
diff --git a/myserver/include/conf/security/xml_validator.h
b/myserver/include/conf/security/xml_validator.h
index a51b0fe..c9c9abd 100644
--- a/myserver/include/conf/security/xml_validator.h
+++ b/myserver/include/conf/security/xml_validator.h
@@ -47,24 +47,24 @@ public:
private:
XmlParser* getParser(SecurityToken* st);
- bool doCondition (xmlNodePtr node,
+ bool doCondition (xmlNodePtr node,
HashMap<string, SecurityDomain*> *hashedDomains);
- void doReturn (xmlNodePtr node,
- int *cmd,
+ void doReturn (xmlNodePtr node,
+ int *cmd,
HashMap<string, SecurityDomain*> *hashedDomains);
void doDefine (xmlNodePtr node,
- SecurityToken *st,
+ SecurityToken *st,
HashMap<string, SecurityDomain*> *hashedDomains);
void doPermission (xmlNodePtr node,
- SecurityToken *st,
+ SecurityToken *st,
HashMap<string, SecurityDomain*> *hashedDomains);
- int computeXmlNode (xmlNodePtr node,
- SecurityToken *st,
- int *cmd,
+ int computeXmlNode (xmlNodePtr node,
+ SecurityToken *st,
+ int *cmd,
HashMap<string, SecurityDomain*> *hashedDomains);
int getPermissions (xmlAttr* attrs, xmlChar** user = NULL, xmlChar**
password = NULL);
diff --git a/myserver/include/connections_scheduler/connections_scheduler.h
b/myserver/include/connections_scheduler/connections_scheduler.h
index 8e138a9..f770457 100644
--- a/myserver/include/connections_scheduler/connections_scheduler.h
+++ b/myserver/include/connections_scheduler/connections_scheduler.h
@@ -67,7 +67,7 @@ public:
struct DispatcherArg
{
- bool terminated;
+ bool terminated;
bool terminate;
Mutex* mutex;
event loopEvent;
@@ -123,6 +123,6 @@ private:
DispatcherArg dispatcherArg;
bool releasing;
};
-
+
#endif
diff --git a/myserver/include/filter/filters_factory.h
b/myserver/include/filter/filters_factory.h
index 3fcb63f..035b0d9 100644
--- a/myserver/include/filter/filters_factory.h
+++ b/myserver/include/filter/filters_factory.h
@@ -32,7 +32,7 @@ using namespace std;
typedef Filter* (*FILTERCREATE)(const char* name);
-class FiltersFactory
+class FiltersFactory
{
public:
class FiltersSource
@@ -44,9 +44,9 @@ public:
int insert(const char*, FILTERCREATE ptr);
int insert(const char*, FiltersSource* ptr);
Filter *getFilter(const char*);
- FiltersChain* chain(list<string> &l, Stream* out, u_long *nbw,
+ FiltersChain* chain(list<string> &l, Stream* out, u_long *nbw,
int onlyNotModifiers = 0);
- int chain(FiltersChain*, list<string> &l, Stream* out, u_long *nbw,
+ int chain(FiltersChain*, list<string> &l, Stream* out, u_long *nbw,
int onlyNotModifiers = 0);
FiltersFactory();
~FiltersFactory();
diff --git a/myserver/include/http_handler/cgi/cgi.h
b/myserver/include/http_handler/cgi/cgi.h
index 6baad47..77bbc16 100644
--- a/myserver/include/http_handler/cgi/cgi.h
+++ b/myserver/include/http_handler/cgi/cgi.h
@@ -34,10 +34,10 @@ public:
const char* exec = 0, bool execute = false,
bool onlyHeader = false);
private:
- int sendData (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain& chain,
+ int sendData (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain& chain,
Process& cgiProc, int onlyHeader, bool nph);
- int sendHeader (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain&
chain,
- Process& cgiProc, int onlyHeader, bool nph, u_long
procStartTime,
+ int sendHeader (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain& chain,
+ Process& cgiProc, int onlyHeader, bool nph, u_long
procStartTime,
bool keepalive, bool useChunks, int *ret);
};
#endif
diff --git a/myserver/include/http_handler/fastcgi/fastcgi.h
b/myserver/include/http_handler/fastcgi/fastcgi.h
index 509b63e..c590e83 100644
--- a/myserver/include/http_handler/fastcgi/fastcgi.h
+++ b/myserver/include/http_handler/fastcgi/fastcgi.h
@@ -41,7 +41,7 @@ using namespace std;
*/
#define FCGI_LISTENSOCK_FILENO 0
-typedef struct
+typedef struct
{
unsigned char version;
unsigned char type;
@@ -79,7 +79,7 @@ typedef struct
#define FCGIUNKNOWN_TYPE 11
#define FCGIMAXTYPE (FCGIUNKNOWN_TYPE)
-typedef struct
+typedef struct
{
unsigned char roleB1;
unsigned char roleB0;
@@ -87,7 +87,7 @@ typedef struct
unsigned char reserved[5];
} FcgiBeginRequestBody;
-typedef struct
+typedef struct
{
FcgiHeader header;
FcgiBeginRequestBody body;
@@ -105,7 +105,7 @@ typedef struct
#define FCGIAUTHORIZER 2
#define FCGIFILTER 3
-typedef struct
+typedef struct
{
unsigned char appStatusB3;
unsigned char appStatusB2;
@@ -115,7 +115,7 @@ typedef struct
unsigned char reserved[3];
} FcgiEndRequestBody;
-typedef struct
+typedef struct
{
FcgiHeader header;
FcgiEndRequestBody body;
@@ -129,13 +129,13 @@ typedef struct
#define FCGIOVERLOADED 2
#define FCGIUNKNOWN_ROLE 3
-typedef struct
+typedef struct
{
- unsigned char type;
+ unsigned char type;
unsigned char reserved[7];
} FcgiUnknownTypeBody;
-typedef struct
+typedef struct
{
FcgiHeader header;
FcgiUnknownTypeBody body;
@@ -174,9 +174,9 @@ private:
static int timeout;
static int initialized;
- int handleHeader (FcgiContext* con, FiltersChain* chain,
+ int handleHeader (FcgiContext* con, FiltersChain* chain,
bool *responseCompleted);
- int sendData (FcgiContext* con, u_long dim,
+ int sendData (FcgiContext* con, u_long dim,
u_long timeout, FiltersChain* chain,
bool *responseCompleted, int onlyHeader);
int fastCgiRequest (FcgiContext* con, int id);
diff --git a/myserver/include/http_handler/http_dir/http_dir.h
b/myserver/include/http_handler/http_dir/http_dir.h
index 98a608b..fbd69a9 100644
--- a/myserver/include/http_handler/http_dir/http_dir.h
+++ b/myserver/include/http_handler/http_dir/http_dir.h
@@ -52,7 +52,7 @@ private:
static bool compareFileStructByTime (HttpDir::FileStruct i,
HttpDir::FileStruct j);
static bool compareFileStructBySize (HttpDir::FileStruct i,
HttpDir::FileStruct j);
void getFormattedSize(u_long bytes, string& out);
-
+
void generateHeader (MemBuf &out, char sortType, bool sortReverse, const
char *formatString);
void generateElement (MemBuf &out, FileStruct& fs, string &linkPrefix, const
char *formatString);
diff --git a/myserver/include/http_handler/isapi/isapi.h
b/myserver/include/http_handler/isapi/isapi.h
index 0bc3982..bd0ccdb 100644
--- a/myserver/include/http_handler/isapi/isapi.h
+++ b/myserver/include/http_handler/isapi/isapi.h
@@ -67,23 +67,23 @@ typedef LPVOID HCONN;
-typedef struct _HSE_VERSION_INFO
+typedef struct _HSE_VERSION_INFO
{
DWORD dwExtensionVersion;
CHAR lpszExtensionDesc[HSE_MAX_EXT_DLL_NAME_LEN];
} HSE_VERSION_INFO, *LPHSE_VERSION_INFO;
-typedef struct _HSE_URL_MAPEX_INFO
+typedef struct _HSE_URL_MAPEX_INFO
{
- CHAR *lpszPath;
+ CHAR *lpszPath;
DWORD dwFlags;
- DWORD cchMatchingPath;
- DWORD cchMatchingURL;
+ DWORD cchMatchingPath;
+ DWORD cchMatchingURL;
DWORD dwReserved1;
DWORD dwReserved2;
} HSE_URL_MAPEX_INFO, * LPHSE_URL_MAPEX_INFO;
-typedef struct _EXTENSION_CONTROL_BLOCK
+typedef struct _EXTENSION_CONTROL_BLOCK
{
DWORD cbSize;
DWORD dwVersion;
@@ -100,11 +100,11 @@ typedef struct _EXTENSION_CONTROL_BLOCK
LPSTR lpszContentType;
BOOL (WINAPI * GetServerVariable)(HCONN hConn, LPSTR lpszVariableName,
LPVOID lpvBuffer, LPDWORD lpdwSize);
- BOOL (WINAPI * WriteClient)(HCONN ConnID, LPVOID Buffer, LPDWORD lpdwBytes,
+ BOOL (WINAPI * WriteClient)(HCONN ConnID, LPVOID Buffer, LPDWORD lpdwBytes,
DWORD dwReserved);
BOOL (WINAPI * ReadClient)(HCONN ConnID, LPVOID lpvBuffer, LPDWORD lpdwSize);
- BOOL (WINAPI * ServerSupportFunction)(HCONN hConn, DWORD dwHSERRequest,
- LPVOID lpvBuffer, LPDWORD lpdwSize,
+ BOOL (WINAPI * ServerSupportFunction)(HCONN hConn, DWORD dwHSERRequest,
+ LPVOID lpvBuffer, LPDWORD lpdwSize,
LPDWORD lpdwDataType);
} EXTENSION_CONTROL_BLOCK, *LPEXTENSION_CONTROL_BLOCK;
@@ -129,7 +129,7 @@ typedef DWORD (WINAPI *
PFN_HTTPEXTENSIONPROC)(EXTENSION_CONTROL_BLOCK *pECB);
class Isapi : public HttpDataHandler
{
-public:
+public:
#ifdef WIN32
static ConnTableRecord *HConnRecord(HCONN hConn);
int Redirect(HttpThreadContext* td,ConnectionPtr a,char *URL);
@@ -139,7 +139,7 @@ public:
LPVOID output, LPDWORD maxLen);
static BOOL buildAllRawHeaders(HttpThreadContext* td,ConnectionPtr a,
LPVOID output, LPDWORD maxLen);
-#endif
+#endif
Isapi();
static Mutex *isapiMutex;
virtual int load ();
@@ -155,12 +155,12 @@ private:
#endif
};
-#ifdef WIN32
+#ifdef WIN32
BOOL WINAPI ISAPI_ServerSupportFunctionExport(HCONN hConn, DWORD dwHSERRequest,
- LPVOID lpvBuffer, LPDWORD
lpdwSize,
+ LPVOID lpvBuffer, LPDWORD
lpdwSize,
LPDWORD lpdwDataType);
BOOL WINAPI ISAPI_ReadClientExport(HCONN hConn, LPVOID lpvBuffer, LPDWORD
lpdwSize ) ;
-BOOL WINAPI ISAPI_WriteClientExport(HCONN hConn, LPVOID Buffer, LPDWORD
lpdwBytes,
+BOOL WINAPI ISAPI_WriteClientExport(HCONN hConn, LPVOID Buffer, LPDWORD
lpdwBytes,
DWORD dwReserved);
BOOL WINAPI ISAPI_GetServerVariableExport(HCONN, LPSTR, LPVOID, LPDWORD);
#endif
diff --git a/myserver/include/log/stream/log_stream.h
b/myserver/include/log/stream/log_stream.h
index cf83313..14570d2 100644
--- a/myserver/include/log/stream/log_stream.h
+++ b/myserver/include/log/stream/log_stream.h
@@ -32,7 +32,7 @@ using namespace std;
enum LoggingLevel
{
/* The MYSERVER_LOG_MSG_PLAIN is only used within the
- * LogManager class to print new lines with normal text
+ * LogManager class to print new lines with normal text
* attributes over the ConsoleStream.
*/
MYSERVER_LOG_MSG_PLAIN,
diff --git a/myserver/include/log/stream/socket_stream.h
b/myserver/include/log/stream/socket_stream.h
index 4dddbff..f7cd2fb 100644
--- a/myserver/include/log/stream/socket_stream.h
+++ b/myserver/include/log/stream/socket_stream.h
@@ -28,7 +28,7 @@
class SocketStream : public LogStream
{
public:
- SocketStream (FiltersFactory* filtersFactory,
+ SocketStream (FiltersFactory* filtersFactory,
u_long cycleLog,
Stream* outStream,
FiltersChain* filtersChain);
diff --git a/myserver/include/plugin/plugin_info.h
b/myserver/include/plugin/plugin_info.h
index 3225643..95e3c16 100755
--- a/myserver/include/plugin/plugin_info.h
+++ b/myserver/include/plugin/plugin_info.h
@@ -37,46 +37,46 @@ class PluginInfo
public:
PluginInfo(string& name, bool enabled = 1, bool global = 0);
-
+
~PluginInfo();
-
+
bool isEnabled();
bool isGlobal();
-
+
void addDependence(string, int minVersion, int maxVersion);
-
+
int getVersion();
-
+
void setVersion(int v);
-
+
string getName();
-
+
int getMyServerMinVersion();
-
+
int getMyServerMaxVersion();
-
+
int setMyServerMinVersion(int v);
-
+
int setMyServerMaxVersion(int v);
-
+
HashMap<string, pair<int,int>* >::Iterator begin(){return
dependences.begin();}
HashMap<string, pair<int,int>* >::Iterator end(){return
dependences.end();}
-
+
void setPlugin(Plugin* plugin);
Plugin* getPlugin();
Plugin* removePlugin();
-
+
void setEnabled(bool enabled);
-
+
pair<int,int>* getDependence(string name);
-
+
static int convertVersion(string* s);
-
-
-
-
-
-private:
+
+
+
+
+
+private:
string name;
bool enabled;
bool global;
diff --git a/myserver/include/protocol/control/control_errors.h
b/myserver/include/protocol/control/control_errors.h
index 773ffc3..3f6ff5c 100755
--- a/myserver/include/protocol/control/control_errors.h
+++ b/myserver/include/protocol/control/control_errors.h
@@ -24,16 +24,16 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
*/
/*! The request was accepted and served. */
-#define CONTROL_OK 100
-
+#define CONTROL_OK 100
+
/*! A generic error was encountered. */
-#define CONTROL_ERROR 200
+#define CONTROL_ERROR 200
/*! An internal server error happened. */
-#define CONTROL_INTERNAL 201
+#define CONTROL_INTERNAL 201
/*! The Authorization was not accepted. */
-#define CONTROL_AUTH 202
+#define CONTROL_AUTH 202
/*! A malformed request was sent. */
#define CONTROL_MALFORMED 203
diff --git a/myserver/include/protocol/ftp/ftp_common.h
b/myserver/include/protocol/ftp/ftp_common.h
index de5a49d..fec113e 100644
--- a/myserver/include/protocol/ftp/ftp_common.h
+++ b/myserver/include/protocol/ftp/ftp_common.h
@@ -37,4 +37,4 @@ int getPortNo(const FtpHost &host);
std::string getPortNo(unsigned int nport);
std::string getHost(const FtpHost &host);
-#endif //__FTP_COMMON_H__
+#endif //__FTP_COMMON_H__
diff --git a/myserver/include/protocol/ftp/ftp_lexer.h
b/myserver/include/protocol/ftp/ftp_lexer.h
index e85448f..87aef87 100644
--- a/myserver/include/protocol/ftp/ftp_lexer.h
+++ b/myserver/include/protocol/ftp/ftp_lexer.h
@@ -38,7 +38,7 @@
#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
/* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
- * if you want the limit (max/min) macros for int types.
+ * if you want the limit (max/min) macros for int types.
*/
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS 1
@@ -55,7 +55,7 @@ typedef uint32_t flex_uint32_t;
typedef signed char flex_int8_t;
typedef short int flex_int16_t;
typedef int flex_int32_t;
-typedef unsigned char flex_uint8_t;
+typedef unsigned char flex_uint8_t;
typedef unsigned short int flex_uint16_t;
typedef unsigned int flex_uint32_t;
@@ -193,7 +193,7 @@ struct yy_buffer_state
int yy_bs_lineno; /**< The line count. */
int yy_bs_column; /**< The column count. */
-
+
/* Whether to try to fill the input buffer when we reach the
* end of it.
*/
@@ -285,9 +285,9 @@ YYSTYPE * yyget_lval (yyscan_t yyscanner );
void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
YYLTYPE *yyget_lloc (yyscan_t yyscanner );
-
+
void yyset_lloc (YYLTYPE * yylloc_param ,yyscan_t yyscanner );
-
+
/* Macros after this point can all be overridden by user definitions in
* section 1.
*/
diff --git a/myserver/include/protocol/ftp/ftp_parser.h
b/myserver/include/protocol/ftp/ftp_parser.h
index 3d0b19c..d43b69b 100644
--- a/myserver/include/protocol/ftp/ftp_parser.h
+++ b/myserver/include/protocol/ftp/ftp_parser.h
@@ -2,20 +2,20 @@
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton interface for Bison's Yacc-like parsers in C
-
+
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
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
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -28,7 +28,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
diff --git a/myserver/include/protocol/http/dyn_http_command.h
b/myserver/include/protocol/http/dyn_http_command.h
index adb7cf2..6ae1a1b 100755
--- a/myserver/include/protocol/http/dyn_http_command.h
+++ b/myserver/include/protocol/http/dyn_http_command.h
@@ -29,15 +29,15 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <string>
using namespace std;
-class DynamicHttpCommand
+class DynamicHttpCommand
{
public:
DynamicHttpCommand(string&);
virtual ~DynamicHttpCommand();
string getName();
virtual int acceptData() = 0;
- virtual int send(HttpThreadContext* context, ConnectionPtr lpconnection,
-
string& Uri, int systemrequest = 0,
+ virtual int send(HttpThreadContext* context, ConnectionPtr lpconnection,
+
string& Uri, int systemrequest = 0,
int
OnlyHeader = 0, int yetmapped = 0) = 0;
private:
string name;
diff --git a/myserver/include/protocol/http/dyn_http_command_manager.h
b/myserver/include/protocol/http/dyn_http_command_manager.h
index 9a038d0..132f188 100755
--- a/myserver/include/protocol/http/dyn_http_command_manager.h
+++ b/myserver/include/protocol/http/dyn_http_command_manager.h
@@ -32,19 +32,19 @@ class DynamicHttpCommand;
using namespace std;
-class DynHttpCommandManager
+class DynHttpCommandManager
{
public:
DynHttpCommandManager();
virtual ~DynHttpCommandManager();
-
+
DynamicHttpCommand* getHttpCommand(string& name);
-
+
HashMap<string, DynamicHttpCommand*>::Iterator begin(){return
dynamicHttpCommands.begin();}
HashMap<string, DynamicHttpCommand*>::Iterator end(){return
dynamicHttpCommands.end();}
-
+
void clear ();
-
+
void addHttpCommand(string& name, DynamicHttpCommand* httpCommand);
void addHttpCommand(char* name, DynamicHttpCommand* httpCommand)
diff --git a/myserver/include/protocol/http/dyn_http_manager.h
b/myserver/include/protocol/http/dyn_http_manager.h
index fa00380..0dc3dca 100755
--- a/myserver/include/protocol/http/dyn_http_manager.h
+++ b/myserver/include/protocol/http/dyn_http_manager.h
@@ -30,7 +30,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
using namespace std;
-class DynamicHttpManager
+class DynamicHttpManager
{
public:
DynamicHttpManager();
diff --git a/myserver/include/protocol/http/http.h
b/myserver/include/protocol/http/http.h
index f6f5c03..6ac1c98 100644
--- a/myserver/include/protocol/http/http.h
+++ b/myserver/include/protocol/http/http.h
@@ -104,8 +104,8 @@ public:
int requestAuthorization();
int sendHTTPResource(string& filename,
- int systemrequest = 0,
- int onlyHeader = 0,
+ int systemrequest = 0,
+ int onlyHeader = 0,
int yetMapped = 0);
int putHTTPRESOURCE(string &filename,
@@ -150,7 +150,7 @@ public:
int systemrequest)
{return getPath(td, filenamePath, filename.c_str(), systemrequest);}
- static int getPath(HttpThreadContext* td,
+ static int getPath(HttpThreadContext* td,
string& filenamePath,
const char *filename,
int systemrequest);
@@ -165,23 +165,23 @@ public:
virtual char* registerName(char* out,int len){return registerNameImpl(out,
len);}
static char* registerNameImpl(char*, int len);
- int controlConnection(ConnectionPtr a,
- char *b1,
- char *b2,
- int bs1,
- int bs2,
- u_long nbtr,
+ int controlConnection(ConnectionPtr a,
+ char *b1,
+ char *b2,
+ int bs1,
+ int bs2,
+ u_long nbtr,
u_long id);
static int loadProtocolStatic();
static int unLoadProtocolStatic();
u_long getTimeout ();
- int preprocessHttpRequest(string& filename, int yetmapped,
+ int preprocessHttpRequest(string& filename, int yetmapped,
int* permissions);
- int getFilePermissions(string& filename, string& directory,
- string& file, string &filenamePath,
+ int getFilePermissions(string& filename, string& directory,
+ string& file, string &filenamePath,
int yetmapped, int* permissions);
static HttpStaticData* getStaticData();
@@ -235,7 +235,7 @@ public:
{
return Http::loadProtocolStatic ();
}
-
+
virtual int unLoadProtocol ()
{
return Http::unLoadProtocolStatic ();
diff --git a/myserver/include/protocol/http/http_data_handler.h
b/myserver/include/protocol/http/http_data_handler.h
index d714b80..80962a0 100644
--- a/myserver/include/protocol/http/http_data_handler.h
+++ b/myserver/include/protocol/http/http_data_handler.h
@@ -54,12 +54,12 @@ public:
u_long realBufferSize,
MemoryStream *tmpStream);
- static int appendDataToHTTPChannel(HttpThreadContext* td,
+ static int appendDataToHTTPChannel(HttpThreadContext* td,
char* buffer,
u_long size,
- File* appendFile,
+ File* appendFile,
FiltersChain* chain,
- bool append,
+ bool append,
bool useChunks);
};
diff --git a/myserver/include/protocol/http/http_data_read.h
b/myserver/include/protocol/http/http_data_read.h
index 985711b..a50cb11 100644
--- a/myserver/include/protocol/http/http_data_read.h
+++ b/myserver/include/protocol/http/http_data_read.h
@@ -61,7 +61,7 @@ public:
u_long timeout,
Stream* out,
long maxChunks);
-
+
};
#endif
diff --git a/myserver/include/protocol/http/http_headers.h
b/myserver/include/protocol/http/http_headers.h
index 45570af..26f3a98 100755
--- a/myserver/include/protocol/http/http_headers.h
+++ b/myserver/include/protocol/http/http_headers.h
@@ -50,11 +50,11 @@ public:
static int buildHTTPRequestHeaderStruct (const char* input,
u_long inputSize,
u_long* nHeaderChars,
- HttpRequestHeader *request,
+ HttpRequestHeader *request,
Connection* connection);
-
- static int buildHTTPResponseHeaderStruct (const char *input,
- HttpResponseHeader *response,
+
+ static int buildHTTPResponseHeaderStruct (const char *input,
+ HttpResponseHeader *response,
u_long* nbtr);
static int validHTTPRequest (const char*, u_long, u_long*, u_long*);
@@ -70,13 +70,13 @@ public:
static u_long buildHTTPRequestHeader (char*, HttpRequestHeader*);
protected:
- static int readReqAuthLine (HttpRequestHeader *request,
- Connection *connection,
+ static int readReqAuthLine (HttpRequestHeader *request,
+ Connection *connection,
const char *token,
int *lenOut);
- static int readReqRangeLine (HttpRequestHeader *request,
- Connection *connection,
+ static int readReqRangeLine (HttpRequestHeader *request,
+ Connection *connection,
const char *token,
int *lenOut);
};
diff --git a/myserver/include/protocol/http/http_request.h
b/myserver/include/protocol/http/http_request.h
index f28dbe8..9c968df 100644
--- a/myserver/include/protocol/http/http_request.h
+++ b/myserver/include/protocol/http/http_request.h
@@ -51,7 +51,7 @@ struct HttpRequestHeader : public HttpHeader
name = new string();
value = new string();
}
-
+
Entry(string& n, string& v)
{
name = new string();
@@ -65,29 +65,29 @@ struct HttpRequestHeader : public HttpHeader
{
delete name;
delete value;
-
+
}
};
- string cmd;
- string ver;
+ string cmd;
+ string ver;
string auth;
string contentLength;
string uri;
- string uriOpts;
- char *uriOptsPtr;
- string rangeType;
+ string uriOpts;
+ char *uriOptsPtr;
+ string rangeType;
u_long rangeByteBegin;
u_long rangeByteEnd;
int uriEndsWithSlash;
-
+
/*! Digest authorization scheme stuff. */
char digestRealm[48+1];
char digestOpaque[48+1];
char digestNonce[48+1];
char digestCnonce[48+1];
char digestUri[1024+1];
- char digestMethod[16+1];
+ char digestMethod[16+1];
char digestUsername[48+1];
char digestResponse[48+1];
char digestQop[16+1];
@@ -108,7 +108,7 @@ struct HttpRequestHeader : public HttpHeader
HttpRequestHeader();
~HttpRequestHeader();
void free();
-
+
};
#endif
diff --git a/myserver/include/protocol/http/http_response.h
b/myserver/include/protocol/http/http_response.h
index 4b5ec41..414f2bc 100644
--- a/myserver/include/protocol/http/http_response.h
+++ b/myserver/include/protocol/http/http_response.h
@@ -64,11 +64,11 @@ struct HttpResponseHeader : public HttpHeader
value = new string();
}
- Entry(string& n, string& v)
+ Entry(string& n, string& v)
{
name = new string();
value = new string();
-
+
name->assign(n);
value->assign(v);
}
@@ -76,11 +76,11 @@ struct HttpResponseHeader : public HttpHeader
{
delete name;
delete value;
-
+
}
};
int httpStatus;
- string ver;
+ string ver;
string serverName;
string contentType;
string connection;
@@ -90,10 +90,10 @@ struct HttpResponseHeader : public HttpHeader
string errorType;
string lastModified;
string location;
- string date;
- string dateExp;
+ string date;
+ string dateExp;
string auth;
- HashMap<string,HttpResponseHeader::Entry*> other;
+ HashMap<string,HttpResponseHeader::Entry*> other;
HttpResponseHeader();
~HttpResponseHeader();
diff --git a/myserver/include/protocol/http/http_thread_context.h
b/myserver/include/protocol/http/http_thread_context.h
index 47921c5..ab3b477 100755
--- a/myserver/include/protocol/http/http_thread_context.h
+++ b/myserver/include/protocol/http/http_thread_context.h
@@ -51,7 +51,7 @@ class MimeRecord;
struct HttpThreadContext
{
int appendOutputs;
-
+
/*! Used by SSI and set by raiseHTTPError. */
int lastError;
diff --git a/myserver/include/protocol/https/https.h
b/myserver/include/protocol/https/https.h
index f1e20a0..afc4dfa 100755
--- a/myserver/include/protocol/https/https.h
+++ b/myserver/include/protocol/https/https.h
@@ -76,7 +76,7 @@ public:
{
return Https::loadProtocolStatic(parser);
}
-
+
virtual int unLoadProtocol(XmlParser* parser)
{
return Https::unLoadProtocolStatic(parser);
diff --git a/myserver/include/protocol/protocol.h
b/myserver/include/protocol/protocol.h
index d89da41..cabb96a 100755
--- a/myserver/include/protocol/protocol.h
+++ b/myserver/include/protocol/protocol.h
@@ -29,7 +29,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*This is the base class to derive other protocols implementations for the
server.
*/
-class Protocol
+class Protocol
{
public:
Protocol();
diff --git a/myserver/include/protocol/protocols_manager.h
b/myserver/include/protocol/protocols_manager.h
index 9f88384..9f66cdf 100755
--- a/myserver/include/protocol/protocols_manager.h
+++ b/myserver/include/protocol/protocols_manager.h
@@ -30,7 +30,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
using namespace std;
-class ProtocolsManager
+class ProtocolsManager
{
public:
ProtocolsManager();
diff --git a/myserver/src/base/base64/mime_utils.cpp
b/myserver/src/base/base64/mime_utils.cpp
index 1d9ded1..fbcc4e9 100644
--- a/myserver/src/base/base64/mime_utils.cpp
+++ b/myserver/src/base/base64/mime_utils.cpp
@@ -20,7 +20,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <include/base/string/stringutils.h>
#include <include/base/string/securestr.h>
-extern "C"
+extern "C"
{
#include <stdio.h>
#include <stdlib.h>
@@ -103,7 +103,7 @@ const char base64map[] =
-const char hexmap[] =
+const char hexmap[] =
{
SKIP, SKIP, SKIP, SKIP, SKIP, SKIP, SKIP, SKIP,
SKIP, SKIP, SKIP, SKIP, SKIP, SKIP, SKIP, SKIP,
@@ -141,7 +141,7 @@ const char hexmap[] =
-const char QpEncodeMap[] =
+const char QpEncodeMap[] =
{
SKIP, SKIP, SKIP, SKIP, SKIP, SKIP, SKIP, SKIP,
SKIP, SKIP, NOSKIP, SKIP, SKIP, NOSKIP, SKIP, SKIP,
@@ -239,7 +239,7 @@ char* CBase64Utils::mimeDecodeMailHeaderField(char *s)
int sLen;
int pos = static_cast<int>(strupos(s1, (char*) "?B?"));
s1 += pos;
- if (strlen(s1) < 4) return s;
+ if (strlen(s1) < 4) return s;
s1 += 3;
sLen = static_cast<int>(strlen(s1));
decodedText = bu.decode(s1, &sLen);
@@ -280,7 +280,7 @@ CBase64Utils::~CBase64Utils()
char* CBase64Utils::encode(const char *input, int bufsize)
{
int alsize = ((bufsize * 4) / 3);
- char *finalresult = (char*)calloc(alsize + ((alsize / 76) * 2) +
+ char *finalresult = (char*)calloc(alsize + ((alsize / 76) * 2) +
(10 * sizeof(char)), sizeof(char));
int count = 0;
int LineLen = 0;
@@ -470,12 +470,12 @@ CQPUtils::~CQPUtils()
char* CQPUtils::decode(char *input)
{
char *s = input;
- char *finalresult = (char*)calloc(strlen(input) + sizeof(char),
+ char *finalresult = (char*)calloc(strlen(input) + sizeof(char),
sizeof(char));
char *result = finalresult;
while (*s != '\0')
{
- if (*s == '=')
+ if (*s == '=')
{
int i;
for (i = 0; i < 3; i++)
@@ -529,7 +529,7 @@ char* CQPUtils::decode(char *input)
-char* CQPUtils::expandBuffer(char *buffer, int UsedSize, int *BufSize,
+char* CQPUtils::expandBuffer(char *buffer, int UsedSize, int *BufSize,
int Singlechar)
{
int AddVal;
@@ -548,7 +548,7 @@ char* CQPUtils::encode(char *input)
{
int BufSize = static_cast<int>(strlen(input) + BufAdd);
int UsedSize = 0;
- int LineLen = 0;
+ int LineLen = 0;
char *finalresult = (char*)calloc(BufSize, sizeof(char));
char *fresult = finalresult;
char *s = input;
diff --git a/myserver/src/base/file/file.cpp b/myserver/src/base/file/file.cpp
index ac4f2f7..1f599c7 100644
--- a/myserver/src/base/file/file.cpp
+++ b/myserver/src/base/file/file.cpp
@@ -170,7 +170,7 @@ int File::openFile (const char* nfilename,u_long opt)
if (opt & File::TEMPORARY)
{
- openFlag |= FILE_ATTRIBUTE_TEMPORARY;
+ openFlag |= FILE_ATTRIBUTE_TEMPORARY;
attributeFlag |= FILE_FLAG_DELETE_ON_CLOSE;
}
if (opt & File::HIDDEN)
@@ -235,7 +235,7 @@ int File::openFile (const char* nfilename,u_long opt)
return handle < 0;
#endif
-
+
return 0;
}
@@ -293,12 +293,12 @@ const char *File::getFilename()
*\param filename The new temporary file name.
*/
int File::createTemporaryFile(const char* filename)
-{
+{
if (FilesUtility::fileExists(filename))
FilesUtility::deleteFile(filename);
- return openFile(filename, File::READ |
- File::WRITE|
+ return openFile(filename, File::READ |
+ File::WRITE|
File::FILE_CREATE_ALWAYS |
File::TEMPORARY |
File::NO_INHERIT);
diff --git a/myserver/src/base/file/files_utility.cpp
b/myserver/src/base/file/files_utility.cpp
index 03eba95..56be830 100644
--- a/myserver/src/base/file/files_utility.cpp
+++ b/myserver/src/base/file/files_utility.cpp
@@ -199,15 +199,15 @@ int FilesUtility::copyFile (File& src, File& dest)
return -1;
#endif
- for (;;)
+ for (;;)
{
ret = src.read (buffer, 4096, &nbr);
if (ret)
return -1;
-
+
if (!nbr)
break;
-
+
ret = dest.writeToFile (buffer, nbr, &nbw);
if (ret)
return -1;
diff --git a/myserver/src/base/files_cache/cached_file.cpp
b/myserver/src/base/files_cache/cached_file.cpp
index 555854f..880dae4 100644
--- a/myserver/src/base/files_cache/cached_file.cpp
+++ b/myserver/src/base/files_cache/cached_file.cpp
@@ -141,7 +141,7 @@ int CachedFile::read (char* buffer, u_long buffersize,
u_long* nbr)
*\param filename The new temporary file name.
*/
int CachedFile::createTemporaryFile (const char* filename)
-{
+{
return -1;
}
@@ -190,9 +190,9 @@ int CachedFile::write (const char* buffer, u_long len,
u_long *nbw)
*\param buf Temporary buffer that can be used by this function.
*\param nbw Number of bytes sent.
*/
-int CachedFile::fastCopyToSocket (Socket *dest, u_long firstByte,
+int CachedFile::fastCopyToSocket (Socket *dest, u_long firstByte,
MemBuf *buf, u_long *nbw)
{
- return dest->write (&(this->buffer->getBuffer()[firstByte]),
+ return dest->write (&(this->buffer->getBuffer()[firstByte]),
buffer->getFileSize() - firstByte, nbw);
}
diff --git a/myserver/src/base/find_data/find_data.cpp
b/myserver/src/base/find_data/find_data.cpp
index a33d86e..511b593 100644
--- a/myserver/src/base/find_data/find_data.cpp
+++ b/myserver/src/base/find_data/find_data.cpp
@@ -137,9 +137,9 @@ int FindData::findnext ()
#else
struct dirent * dirInfo;
string tempName;
-
+
dirInfo = readdir (dh);
-
+
if (dirInfo == NULL)
return -1;
diff --git a/myserver/src/base/hash_map/hash_map.cpp
b/myserver/src/base/hash_map/hash_map.cpp
index b7eae02..4dd1aa4 100644
--- a/myserver/src/base/hash_map/hash_map.cpp
+++ b/myserver/src/base/hash_map/hash_map.cpp
@@ -937,7 +937,7 @@ ValueType HashMap<string, ValueType>::get(const string& key)
{
unsigned int tempHash;
typename list < Shkv<string, ValueType> >::iterator dataIter;
-
+
tempHash=hash(key.c_str(), key.size());
if(map[tempHash & mask]>=offset)
{
diff --git a/myserver/src/base/home_dir/home_dir.cpp
b/myserver/src/base/home_dir/home_dir.cpp
index fc3c93f..0bc94fb 100755
--- a/myserver/src/base/home_dir/home_dir.cpp
+++ b/myserver/src/base/home_dir/home_dir.cpp
@@ -110,7 +110,7 @@ int HomeDir::load ()
{
int ret;
loadMutex.lock ();
-
+
ret = loadImpl ();
loadMutex.unlock ();
@@ -158,7 +158,7 @@ int HomeDir::loadImpl ()
return 1;
}
- buffer = new char[size+1];
+ buffer = new char[size+1];
usersFile.read (buffer, size, &read);
buffer[read] = '\0';
diff --git a/myserver/src/base/md5/md5.cpp b/myserver/src/base/md5/md5.cpp
index 1f43559..4d1f061 100644
--- a/myserver/src/base/md5/md5.cpp
+++ b/myserver/src/base/md5/md5.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -85,7 +85,7 @@ void Md5::update(unsigned char const *buf, unsigned long len)
bytes[1]++; /* Carry from low to high */
t = 64 - (t & 0x3f); /* Space available in in (at least 1) */
- if (t > len)
+ if (t > len)
{
memcpy((unsigned char *)in + 64 - t, buf, len);
return;
@@ -98,7 +98,7 @@ void Md5::update(unsigned char const *buf, unsigned long len)
len -= t;
/* Process data in 64-byte chunks */
- while (len >= 64)
+ while (len >= 64)
{
memcpy(in, buf, 64);
byteSwap(in, 16);
@@ -112,7 +112,7 @@ void Md5::update(unsigned char const *buf, unsigned long
len)
}
/*!
- *Final wrapup - pad to 64-byte boundary with the bit pattern
+ *Final wrapup - pad to 64-byte boundary with the bit pattern
*1 0* (64-bit count of bits processed, MSB-first)
*/
void Md5::final(unsigned char digest[16])
@@ -151,7 +151,7 @@ void Md5::final(unsigned char digest[16])
for(i = 0; i < 2; i++)
bytes[i] = 0;
- for(i = 0; i < 16; i++)
+ for(i = 0; i < 16; i++)
in[i] = 0;
}
@@ -280,11 +280,11 @@ char* Md5::end(char *buf)
long i;
unsigned char digest[16];
static const char hex[]="0123456789abcdef";
-
+
if (!buf)
return 0;
final(digest);
- for ( i = 0; i < 16; i++)
+ for ( i = 0; i < 16; i++)
{
buf[(i << 1)] = hex[digest[i] >> 4];
buf[(i << 1) + 1] = hex[digest[i] & 0x0f];
diff --git a/myserver/src/base/mem_buff/mem_buff.cpp
b/myserver/src/base/mem_buff/mem_buff.cpp
index 05b21a6..5d0a79a 100644
--- a/myserver/src/base/mem_buff/mem_buff.cpp
+++ b/myserver/src/base/mem_buff/mem_buff.cpp
@@ -591,20 +591,20 @@ MemBuf::~MemBuf()
if(m_buffer != NULL && m_bCanDelete)
mem_free(m_buffer);
}
-
-void MemBuf::addBuffer(MemBuf *nmb)
+
+void MemBuf::addBuffer(MemBuf *nmb)
{
addBuffer(nmb->m_buffer, nmb->m_nSize);
}
/*! free used memory */
-int MemBuf::free()
+int MemBuf::free()
{
- if(m_buffer != NULL && m_bCanDelete)
+ if(m_buffer != NULL && m_bCanDelete)
{
- mem_free(m_buffer);
- m_buffer = NULL;
- m_nSize = m_nRealSize = 0;
+ mem_free(m_buffer);
+ m_buffer = NULL;
+ m_nSize = m_nRealSize = 0;
return 0;
}
return 1;
@@ -617,19 +617,19 @@ u_int MemBuf::getRealLength()
return m_nRealSize;
}
-u_int MemBuf::find(MemBuf *smb, u_int start)
+u_int MemBuf::find(MemBuf *smb, u_int start)
{
return find(smb->m_buffer, smb->m_nSize, start);
}
-char& MemBuf::getAt(u_int nIndex)
+char& MemBuf::getAt(u_int nIndex)
{
#ifdef ASSERT
- ASSERT(m_buffer != NULL);
- ASSERT(nIndex <= m_nSize);
+ ASSERT(m_buffer != NULL);
+ ASSERT(nIndex <= m_nSize);
#endif
return *(m_buffer + nIndex);
}
-char& MemBuf::operator[](u_int nIndex)
+char& MemBuf::operator[](u_int nIndex)
{
return getAt(nIndex);
}
@@ -639,12 +639,12 @@ u_int MemBuf::getLength()
return m_nSize;
}
-int MemBuf::isValid()
+int MemBuf::isValid()
{
return ((m_nSize != 0) || (m_buffer != NULL))?1:0;
}
-char* MemBuf::getBuffer()
+char* MemBuf::getBuffer()
{
return ( char*) m_buffer;
}
@@ -653,71 +653,71 @@ MemBuf::operator const void*()
{
return (const void*) m_buffer;
}
-MemBuf MemBuf::operator+ (MemBuf& src)
-{
- MemBuf temp(*this);
- temp.addBuffer(&src);
+MemBuf MemBuf::operator+ (MemBuf& src)
+{
+ MemBuf temp(*this);
+ temp.addBuffer(&src);
return temp;
}
-MemBuf MemBuf::operator+ (const char* src)
+MemBuf MemBuf::operator+ (const char* src)
{
- MemBuf temp(*this);
- temp.addBuffer((const void*) src, (u_int)strlen(src));
+ MemBuf temp(*this);
+ temp.addBuffer((const void*) src, (u_int)strlen(src));
return temp;
}
-const MemBuf& MemBuf::operator+= (MemBuf& add)
+const MemBuf& MemBuf::operator+= (MemBuf& add)
{
- addBuffer(&add);
+ addBuffer(&add);
return *this;
}
-const MemBuf& MemBuf::operator+= (const char* pStr)
+const MemBuf& MemBuf::operator+= (const char* pStr)
{
- addBuffer(pStr, (u_int)strlen(pStr));
+ addBuffer(pStr, (u_int)strlen(pStr));
return *this;
}
-const MemBuf& MemBuf::operator+= (char c)
+const MemBuf& MemBuf::operator+= (char c)
{
- addBuffer(&c, 1);
+ addBuffer(&c, 1);
return *this;
}
-MemBuf& MemBuf::operator<< (const char* pSrc)
+MemBuf& MemBuf::operator<< (const char* pSrc)
{
- addBuffer(pSrc, (u_int)strlen(pSrc));
+ addBuffer(pSrc, (u_int)strlen(pSrc));
return *this;
}
-MemBuf& MemBuf::operator<< (int i)
+MemBuf& MemBuf::operator<< (int i)
{
- addBuffer(&i, 4);
+ addBuffer(&i, 4);
return *this;
}
-MemBuf& MemBuf::operator<< (unsigned int i)
+MemBuf& MemBuf::operator<< (unsigned int i)
{
- addBuffer(&i, 4);
+ addBuffer(&i, 4);
return *this;
}
-MemBuf& MemBuf::operator<< (long i)
+MemBuf& MemBuf::operator<< (long i)
{
- addBuffer(&i, 4);
+ addBuffer(&i, 4);
return *this;
}
-MemBuf& MemBuf::operator<< (unsigned long i)
+MemBuf& MemBuf::operator<< (unsigned long i)
{
- addBuffer(&i, 4);
+ addBuffer(&i, 4);
return *this;
}
-MemBuf& MemBuf::operator<< (char c)
+MemBuf& MemBuf::operator<< (char c)
{
- addBuffer(&c, 1);
+ addBuffer(&c, 1);
return *this;
}
-MemBuf& MemBuf::operator<< (unsigned char c)
+MemBuf& MemBuf::operator<< (unsigned char c)
{
- addBuffer(&c, 1);
+ addBuffer(&c, 1);
return *this;
}
-MemBuf& MemBuf::operator<< (const MemBuf &src)
+MemBuf& MemBuf::operator<< (const MemBuf &src)
{
- addBuffer(src.m_buffer, src.m_nSize);
+ addBuffer(src.m_buffer, src.m_nSize);
return *this;
}
MemBuf& MemBuf::operator<< (const string &src)
@@ -727,38 +727,38 @@ MemBuf& MemBuf::operator<< (const string &src)
}
MemBuf& MemBuf::operator=(const MemBuf& src)
{
- setBuffer(src.m_buffer, src.m_nRealSize);
+ setBuffer(src.m_buffer, src.m_nRealSize);
return *this;
}
-MemBuf& MemBuf::operator=(const char* src)
+MemBuf& MemBuf::operator=(const char* src)
{
- setBuffer((const void*) src, (u_int)strlen(src) + 1);
+ setBuffer((const void*) src, (u_int)strlen(src) + 1);
return* this;
}
-
-void MemBuf::uintToStr(u_int i)
+
+void MemBuf::uintToStr(u_int i)
{
xIntToStr(i, 0);
}
-void MemBuf::uintToStr(u_int i, char* pBufToUse, u_int nBufSize)
+void MemBuf::uintToStr(u_int i, char* pBufToUse, u_int nBufSize)
{
xIntToStr(i, 0, pBufToUse, nBufSize);
}
void MemBuf::intToStr(int i)
{
- if (i < 0)
- xIntToStr( (u_int)(-i), 1);
- else
+ if (i < 0)
+ xIntToStr( (u_int)(-i), 1);
+ else
xIntToStr( (u_int) i, 0);
}
-void MemBuf::intToStr(int i, char* pBufToUse, u_int nBufSize)
+void MemBuf::intToStr(int i, char* pBufToUse, u_int nBufSize)
{
- if (i < 0)
- xIntToStr((u_int)(-i), 1, pBufToUse, nBufSize);
- else
+ if (i < 0)
+ xIntToStr((u_int)(-i), 1, pBufToUse, nBufSize);
+ else
xIntToStr((u_int) i, 0, pBufToUse, nBufSize);
}
@@ -766,11 +766,11 @@ void MemBuf::hex(MemBuf& membuf)
{
hex(membuf.m_buffer, membuf.m_nSize);
}
-void MemBuf::hashMD5(MemBuf& membuf)
+void MemBuf::hashMD5(MemBuf& membuf)
{
hashMD5(membuf.m_buffer, membuf.m_nSize);
}
-void MemBuf::hashCRC(MemBuf& membuf)
+void MemBuf::hashCRC(MemBuf& membuf)
{
hashCRC(membuf.m_buffer, membuf.m_nSize);
}
@@ -780,7 +780,7 @@ void MemBuf::allocBuffer(u_int size)
if(size > m_nRealSize || m_buffer == NULL)
{
free();
- m_buffer = mem_alloc(size);
+ m_buffer = mem_alloc(size);
m_nRealSize = size;
}
}
diff --git a/myserver/src/base/multicast/multicast.cpp
b/myserver/src/base/multicast/multicast.cpp
index acc39b2..771814a 100644
--- a/myserver/src/base/multicast/multicast.cpp
+++ b/myserver/src/base/multicast/multicast.cpp
@@ -21,7 +21,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*Register the handler for the specified message type.
*/
-template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
+template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::addMulticast(MSG_TYPE
msg, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>* handler)
{
vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.get(msg);
@@ -37,7 +37,7 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::addMulticast(MSG_TYPE msg,
/*!
*Remove the handler from the vector for a message type.
*/
-template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
+template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
void MulticastRegistry<MSG_TYPE, ARG_TYPE, RET_TYPE>::removeMulticast(MSG_TYPE
msg, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>* handler)
{
vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.get(msg);
@@ -46,7 +46,7 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::removeMulticast(MSG_TYPE m
{
return;
}
-
+
for(it = msgHandlers->begin(); it != msgHandlers->end(); it++)
if(*it == handler)
{
@@ -58,7 +58,7 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::removeMulticast(MSG_TYPE m
/*!
*Remove all the handlers for a specified message.
*/
-template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
+template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::removeMulticasts(MSG_TYPE msg)
{
vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.remove(msg);
@@ -71,7 +71,7 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::removeMulticasts(MSG_TYPE
/*!
*Notify the message to all the registered handlers passing an argument.
*/
-template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
+template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::notifyMulticast(MSG_TYPE& msg, ARG_TYPE arg)
{
vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*> *msgHandlers =
handlers.get(msg);
@@ -90,7 +90,7 @@ void MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>::notifyMulticast(MSG_TYPE&
/*!
*Get the vector of handlers for a specified message.
*/
-template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
+template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>* MulticastRegistry<MSG_TYPE,
ARG_TYPE, RET_TYPE>::getHandlers(MSG_TYPE& msg)
{
return handlers.get(msg);
diff --git a/myserver/src/base/process/fork_server.cpp
b/myserver/src/base/process/fork_server.cpp
index a60bf5a..05b846c 100644
--- a/myserver/src/base/process/fork_server.cpp
+++ b/myserver/src/base/process/fork_server.cpp
@@ -75,7 +75,7 @@ int ForkServer::writeInt (Socket *socket, int num)
int ForkServer::readInt (Socket *sock, int *dest)
{
u_long nbr;
-
+
if (sock->read ((char*)dest, 4, &nbr) || nbr < 4)
{
return -1;
@@ -97,7 +97,7 @@ int ForkServer::readString (Socket *sock, char **out)
{
int len;
u_long nbr;
-
+
if (sock->read ((char*)&len, 4, &nbr) || nbr < 4)
{
return -1;
@@ -109,7 +109,7 @@ int ForkServer::readString (Socket *sock, char **out)
if (len && (sock->read (*out, len, &nbr) || nbr < len))
{
delete [] *out;
- return -1;
+ return -1;
}
return 0;
@@ -136,10 +136,10 @@ int ForkServer::handleRequest (Socket *sock)
if (flags & FLAG_USE_OUT)
readFileHandle (sock->getHandle (), &stdOut);
-
+
if (flags & FLAG_USE_ERR)
readFileHandle (sock->getHandle (), &stdErr);
-
+
readString (sock, &gid);
readString (sock, &uid);
@@ -147,7 +147,7 @@ int ForkServer::handleRequest (Socket *sock)
readString (sock, &cwd);
readString (sock, &arg);
-
+
string argS (arg);
readString (sock, &env);
@@ -207,7 +207,7 @@ int ForkServer::handleRequest (Socket *sock)
if (flags & FLAG_USE_OUT)
close (stdOut);
-
+
if (flags & FLAG_USE_ERR)
close (stdErr);
@@ -231,10 +231,10 @@ int ForkServer::forkServerLoop (UnixSocket *serverSocket)
try
{
Socket socket = serverSocket->accept ();
-
+
char command;
u_long nbr;
-
+
if (socket.read (&command, 1, &nbr))
{
socket.close ();
@@ -256,7 +256,7 @@ int ForkServer::forkServerLoop (UnixSocket *serverSocket)
}
}
}
- /* Don't let the fork server come back from this function
+ /* Don't let the fork server come back from this function
in _any_ case. */
catch(...)
{
@@ -279,9 +279,9 @@ int ForkServer::forkServerLoop (UnixSocket *serverSocket)
*\param waitEnd If true `executeProcess' will wait until
*the process terminates.
*/
-int ForkServer::executeProcess (StartProcInfo *spi,
- int flags,
- int *pid,
+int ForkServer::executeProcess (StartProcInfo *spi,
+ int flags,
+ int *pid,
int *port,
bool waitEnd)
{
@@ -298,30 +298,30 @@ int ForkServer::executeProcess (StartProcInfo *spi,
sock.socket ();
sock.connect (socketPath.c_str ());
sock.write ("r", 1, &nbw);
-
+
writeInt (&sock, flags);
-
+
if (flags & FLAG_USE_IN)
writeFileHandle (sock.getHandle (), spi->stdIn);
-
+
if (flags & FLAG_USE_OUT)
writeFileHandle (sock.getHandle (), spi->stdOut);
-
+
if (flags & FLAG_USE_ERR)
writeFileHandle (sock.getHandle (), spi->stdError);
-
+
writeString (&sock, spi->gid.c_str (), spi->gid.length ());
writeString (&sock, spi->uid.c_str (), spi->uid.length ());
-
+
writeString (&sock, spi->cmd.c_str (), spi->cmd.length ());
writeString (&sock, spi->cwd.c_str (), spi->cwd.length ());
writeString (&sock, spi->arg.c_str (), spi->arg.length ());
-
+
if (env)
for (len = 0; env[len] != '\0' || env[len + 1] != '\0' ; len++);
-
+
writeString (&sock, env, len);
-
+
readInt (&sock, pid);
readInt (&sock, port);
}
@@ -334,7 +334,7 @@ int ForkServer::executeProcess (StartProcInfo *spi,
{
return waitpid (*pid, NULL, 0);
}
-
+
return 0;
#endif
@@ -352,7 +352,7 @@ void ForkServer::killServer ()
s.write ("e", 1, &nbw);
s.close ();
}
-
+
/*!
*Initialize the fork server.
*
@@ -382,7 +382,7 @@ int ForkServer::startForkServer ()
socket.close ();
initialized = true;
break;
- }
+ }
#endif
return 0;
}
diff --git a/myserver/src/base/process/process_server_manager.cpp
b/myserver/src/base/process/process_server_manager.cpp
index d244f2c..57492b6 100644
--- a/myserver/src/base/process/process_server_manager.cpp
+++ b/myserver/src/base/process/process_server_manager.cpp
@@ -44,7 +44,7 @@ ProcessServerManager::~ProcessServerManager()
*/
void ProcessServerManager::load ()
{
-
+
string key ("server.process_servers");
NodeTree<string> *node = ::Server::getInstance()->getNodeTree (key);
@@ -137,7 +137,7 @@ void ProcessServerManager::load ()
*Get a servers process domain by its name.
*\param name The domain name.
*/
-ProcessServerManager::ServerDomain*
+ProcessServerManager::ServerDomain*
ProcessServerManager::getDomain(const char* name)
{
ServerDomain* ret;
@@ -151,7 +151,7 @@ ProcessServerManager::getDomain(const char* name)
*Create a new servers process domain by its name and return it.
*\param name The domain name.
*/
-ProcessServerManager::ServerDomain*
+ProcessServerManager::ServerDomain*
ProcessServerManager::createDomain (const char* name)
{
ServerDomain* ret;
@@ -218,7 +218,7 @@ void ProcessServerManager::clear()
*\param name The server name name.
*\param seed Random seed to use for choosing a server.
*/
-ProcessServerManager::Server*
+ProcessServerManager::Server*
ProcessServerManager::getServer(const char* domain, const char* name, int seed)
{
ServerDomain* sd;
@@ -233,7 +233,7 @@ ProcessServerManager::getServer(const char* domain, const
char* name, int seed)
if (slist)
s = slist->at (seed % slist->size ());
}
-
+
if(s && s->isLocal && !s->process.isProcessAlive())
{
s->socket.close();
@@ -242,7 +242,7 @@ ProcessServerManager::getServer(const char* domain, const
char* name, int seed)
s->path.assign(name);
s->port = 0;
-
+
if(runServer(s, s->path.c_str(), s->port))
{
sd->servers.remove(name);
@@ -261,7 +261,7 @@ ProcessServerManager::getServer(const char* domain, const
char* name, int seed)
*\param domain The server's domain.
*\param name The server's name.
*/
-void ProcessServerManager::addServer(ProcessServerManager::Server* server,
+void ProcessServerManager::addServer(ProcessServerManager::Server* server,
const char* domain, const char* name)
{
ServerDomain *sd = createDomain (domain);
@@ -289,7 +289,7 @@ void
ProcessServerManager::addServer(ProcessServerManager::Server* server,
*\param host The host name to connect to.
*\param port The port number to use for the connection.
*/
-ProcessServerManager::Server*
+ProcessServerManager::Server*
ProcessServerManager::addRemoteServer (const char* domain, const char* name,
const char* host, u_short port)
{
@@ -363,7 +363,7 @@ int ProcessServerManager::domainServers(const char* domain)
*\param gid Group id to use for the new process.
*\param port Port to use for the server.
*/
-ProcessServerManager::Server*
+ProcessServerManager::Server*
ProcessServerManager::runAndAddServer(const char* domain, const char* path,
int uid, int gid, u_short port)
{
@@ -385,8 +385,8 @@ ProcessServerManager::runAndAddServer(const char* domain,
const char* path,
*\param gid Group id to use for the new process.
*\param port The listening port.
*/
-int ProcessServerManager::runServer(ProcessServerManager::Server* server,
- const char* path, int uid, int gid,
+int ProcessServerManager::runServer(ProcessServerManager::Server* server,
+ const char* path, int uid, int gid,
u_short port)
{
StartProcInfo spi;
@@ -399,7 +399,7 @@ int
ProcessServerManager::runServer(ProcessServerManager::Server* server,
if(nServers >= maxServers)
{
ostringstream stream;
- stream << "Cannot run process " << path
+ stream << "Cannot run process " << path
<< ": Reached max number of servers";
::Server::getInstance()->logWriteln(stream.str().c_str(),
MYSERVER_LOG_MSG_ERROR);
return 1;
@@ -424,14 +424,14 @@ int
ProcessServerManager::runServer(ProcessServerManager::Server* server,
if(path[i] == '"' && path[i - 1] != '\\')
subString = !subString;
}
-
+
if(i < len)
{
string tmpString(path);
int begin = tmpString[0] == '"' ? 1 : 0;
int end = tmpString[i] == '"' ? i + 1 : i ;
tmpCgiPath.assign(tmpString.substr(begin, end));
- moreArg.assign(tmpString.substr(i, len));
+ moreArg.assign(tmpString.substr(i, len));
}
else
{
@@ -440,10 +440,10 @@ int
ProcessServerManager::runServer(ProcessServerManager::Server* server,
tmpCgiPath.assign(&path[begin], end-begin);
moreArg.assign("");
}
-
+
spi.envString = 0;
spi.stdOut = spi.stdError = (FileHandle) -1;
-
+
spi.cmd.assign(tmpCgiPath);
spi.arg.assign(moreArg);
spi.cmdLine.assign(path);
@@ -455,8 +455,8 @@ int
ProcessServerManager::runServer(ProcessServerManager::Server* server,
if (Process::getForkServer ()->isInitialized ())
{
int ret, port, pid;
- ret = Process::getForkServer ()->executeProcess (&spi,
-
ForkServer::FLAG_STDIN_SOCKET,
+ ret = Process::getForkServer ()->executeProcess (&spi,
+
ForkServer::FLAG_STDIN_SOCKET,
&pid,
&port);
@@ -477,9 +477,9 @@ int
ProcessServerManager::runServer(ProcessServerManager::Server* server,
((sockaddr_in *)(&serverSockAddrIn))->sin_family = AF_INET;
- ((sockaddr_in *)(&serverSockAddrIn))->sin_addr.s_addr =
+ ((sockaddr_in *)(&serverSockAddrIn))->sin_addr.s_addr =
htonl(INADDR_LOOPBACK);
- ((sockaddr_in *)(&serverSockAddrIn))->sin_port =
+ ((sockaddr_in *)(&serverSockAddrIn))->sin_port =
htons(server->port);
if ( server->socket.bind (&serverSockAddrIn,
@@ -514,7 +514,7 @@ int ProcessServerManager::connect(Socket* sock,
{
MYSERVER_SOCKADDRIN serverSock = { 0 };
socklen_t nLength = sizeof(MYSERVER_SOCKADDRIN);
-
+
if (server->socket.getHandle())
server->socket.getsockname ((MYSERVER_SOCKADDR*)&serverSock,
(int*)&nLength);
@@ -523,7 +523,7 @@ int ProcessServerManager::connect(Socket* sock,
/*! Try to create the socket. */
if(sock->socket(AF_INET, SOCK_STREAM, 0) == -1)
return -1;
-
+
/*! If the socket was created try to connect. */
if(sock->connect(server->host.c_str(), server->port) == -1)
{
diff --git a/myserver/src/base/regex/myserver_regex.cpp
b/myserver/src/base/regex/myserver_regex.cpp
index 0f66108..575b49e 100644
--- a/myserver/src/base/regex/myserver_regex.cpp
+++ b/myserver/src/base/regex/myserver_regex.cpp
@@ -36,7 +36,7 @@ int Regex::compile(const char *p, int f)
/*!
* Match the pattern against strings.
*/
-int Regex::exec(const char *text, size_t nmatch, regmatch_t matchptr [],
+int Regex::exec(const char *text, size_t nmatch, regmatch_t matchptr [],
int eflags)
{
#ifdef REGEX | TRE
diff --git a/myserver/src/base/safetime/safetime.cpp
b/myserver/src/base/safetime/safetime.cpp
index ca15fe9..7e4d8be 100644
--- a/myserver/src/base/safetime/safetime.cpp
+++ b/myserver/src/base/safetime/safetime.cpp
@@ -6,7 +6,7 @@ it under the terms of the GNU General Public License as
published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/myserver/src/base/socket/socket.cpp
b/myserver/src/base/socket/socket.cpp
index 49d84fe..fc0b5db 100644
--- a/myserver/src/base/socket/socket.cpp
+++ b/myserver/src/base/socket/socket.cpp
@@ -292,23 +292,23 @@ int Socket::getLocalIPsList(string &out)
addrinfo aiHints = { 0 }, *pHostInfo = NULL, *pCrtHostInfo = NULL;
/* only interested in socket types the that server will listen to. */
aiHints.ai_socktype = SOCK_STREAM;
- if ( getaddrinfo(serverName, NULL, &aiHints, &pHostInfo) == 0 &&
+ if ( getaddrinfo(serverName, NULL, &aiHints, &pHostInfo) == 0 &&
pHostInfo != NULL )
{
sockaddr_storage *pCurrentSockAddr = NULL;
char straddr[NI_MAXHOST] = "";
memset(straddr, 0, NI_MAXHOST);
ostringstream stream;
- for ( pCrtHostInfo = pHostInfo; pCrtHostInfo != NULL;
+ for ( pCrtHostInfo = pHostInfo; pCrtHostInfo != NULL;
pCrtHostInfo = pCrtHostInfo->ai_next )
{
- pCurrentSockAddr =
+ pCurrentSockAddr =
reinterpret_cast<sockaddr_storage *>(pCrtHostInfo->ai_addr);
if ( pCurrentSockAddr == NULL )
continue;
- if ( !getnameinfo(reinterpret_cast<sockaddr *>(pCurrentSockAddr),
- sizeof(sockaddr_storage), straddr, NI_MAXHOST,
+ if ( !getnameinfo(reinterpret_cast<sockaddr *>(pCurrentSockAddr),
+ sizeof(sockaddr_storage), straddr, NI_MAXHOST,
NULL, 0, NI_NUMERICHOST) )
{
stream << ( !stream.str().empty() ? ", " : "" ) << straddr;
@@ -411,14 +411,14 @@ int Socket::send(const char* buffer, int len, int flags)
/*! When we can send data again? */
u_long time = getTicks() + (1000 * 1024 / throttlingRate) ;
/*! If a throttling rate is specified, send chunks of 1024 bytes. */
- ret = rawSend(buffer + (len - toSend), toSend < 1024 ?
+ ret = rawSend(buffer + (len - toSend), toSend < 1024 ?
toSend : 1024, flags);
/*! On errors returns directly -1. */
if(ret < 0)
return -1;
toSend -= (u_long)ret;
- /*!
- *If there are other bytes to send wait before cycle again.
+ /*!
+ *If there are other bytes to send wait before cycle again.
*/
if(toSend)
{
@@ -456,7 +456,7 @@ int Socket::connect(const char* host, u_short port)
{
if ( host == NULL )
return -1;
-
+
#if ( HAVE_IPV6 )
MYSERVER_SOCKADDRIN thisSock = { 0 };
int nLength = sizeof(MYSERVER_SOCKADDRIN);
@@ -470,11 +470,11 @@ int Socket::connect(const char* host, u_short port)
addrinfo aiHints = { 0 };
/*
- *If the socket is not created, wait to see what address families
- *have this host, than create socket.
+ *If the socket is not created, wait to see what address families
+ *have this host, than create socket.
*/
-
- //getsockname(&thisSock, &nLength);
+
+ //getsockname(&thisSock, &nLength);
if ( getsockname(&thisSock, &nLength) == 0 )
{
aiHints.ai_family = thisSock.ss_family;
@@ -491,19 +491,19 @@ int Socket::connect(const char* host, u_short port)
if (nGetaddrinfoRet != 0 || pHostInfo == NULL )
return -1;
- for ( pCrtHostInfo = pHostInfo; pCrtHostInfo != NULL;
+ for ( pCrtHostInfo = pHostInfo; pCrtHostInfo != NULL;
pCrtHostInfo = pCrtHostInfo->ai_next )
{
pCurrentSockAddr = reinterpret_cast<sockaddr_storage *>
(pCrtHostInfo->ai_addr);
- if ( pCurrentSockAddr == NULL ||
- (thisSock.ss_family != 0 &&
+ if ( pCurrentSockAddr == NULL ||
+ (thisSock.ss_family != 0 &&
pCurrentSockAddr->ss_family != thisSock.ss_family) )
continue;
if ( thisSock.ss_family == 0 )// socket not created yet
{
- //so try to create one now based on 'pCurrentSockAddr'
+ //so try to create one now based on 'pCurrentSockAddr'
if ( pCurrentSockAddr->ss_family == AF_INET )
{
if(Socket::socket(AF_INET, SOCK_STREAM, 0) == -1)
@@ -520,15 +520,15 @@ int Socket::connect(const char* host, u_short port)
memset(&connectionSockAddrIn, 0, sizeof(connectionSockAddrIn));
connectionSockAddrIn.ss_family = pCurrentSockAddr->ss_family;
-
- if ( connectionSockAddrIn.ss_family != AF_INET &&
+
+ if ( connectionSockAddrIn.ss_family != AF_INET &&
connectionSockAddrIn.ss_family != AF_INET6 )
continue;
-
+
if ( connectionSockAddrIn.ss_family == AF_INET )
{
nSockLen = sizeof(sockaddr_in);
- memcpy((sockaddr_in *)&connectionSockAddrIn,
+ memcpy((sockaddr_in *)&connectionSockAddrIn,
(sockaddr_in *)pCurrentSockAddr, nSockLen);
((sockaddr_in *)(&connectionSockAddrIn))->sin_port = htons(port);
@@ -536,12 +536,12 @@ int Socket::connect(const char* host, u_short port)
else// if ( connectionSockAddrIn.ss_family == AF_INET6 )
{
nSockLen = sizeof(sockaddr_in6);
- memcpy((sockaddr_in6 *)&connectionSockAddrIn,
+ memcpy((sockaddr_in6 *)&connectionSockAddrIn,
(sockaddr_in6 *)pCurrentSockAddr, nSockLen);
((sockaddr_in6 *)&connectionSockAddrIn)->sin6_port = htons(port);
}
- if(Socket::connect((MYSERVER_SOCKADDR*)(&connectionSockAddrIn),
+ if(Socket::connect((MYSERVER_SOCKADDR*)(&connectionSockAddrIn),
nSockLen) == -1)
{
Socket::close();
@@ -568,7 +568,7 @@ int Socket::connect(const char* host, u_short port)
if(Socket::socket(AF_INET, SOCK_STREAM, 0) == -1)
{
return -1;
- }
+ }
}
sockLen = sizeof(sockAddr);
memset(&sockAddr, 0, sizeof(sockAddr));
@@ -593,13 +593,13 @@ int Socket::connect (MYSERVER_SOCKADDR* sa, int na)
if ( sa == NULL )
return -1;
- if ( (sa->ss_family == AF_INET && na != sizeof(sockaddr_in))
+ if ( (sa->ss_family == AF_INET && na != sizeof(sockaddr_in))
#if HAVE_IPV6
|| (sa->ss_family == AF_INET6 && na != sizeof(sockaddr_in6))
#endif
)
return -1;
-
+
#ifdef WIN32
return ::connect((SOCKET)socketHandle,(const sockaddr *)sa, na);
#else
diff --git a/myserver/src/base/socket/ssl_socket.cpp
b/myserver/src/base/socket/ssl_socket.cpp
index 55a9387..db9b74d 100644
--- a/myserver/src/base/socket/ssl_socket.cpp
+++ b/myserver/src/base/socket/ssl_socket.cpp
@@ -122,7 +122,7 @@ int SslSocket::connect(MYSERVER_SOCKADDR* sa, int na)
sslContext = SSL_CTX_new(sslMethod);
if(sslContext == 0)
return -1;
-
+
/*! Do the TCP connection. */
if(::connect((int)socketHandle,(const sockaddr *)sa, na))
{
@@ -214,7 +214,7 @@ int SslSocket::sslAccept()
close();
return -1;
}
-
+
do
{
sslAccept = SSL_accept (sslConnection);
@@ -254,7 +254,7 @@ int SslSocket::recv(char* buffer, int len, int flags)
break;
sslError = SSL_get_error (sslConnection, err);
-
+
if ((sslError != SSL_ERROR_WANT_READ) &&
(sslError != SSL_ERROR_WANT_WRITE))
break;
diff --git a/myserver/src/base/socket_pair/socket_pair.cpp
b/myserver/src/base/socket_pair/socket_pair.cpp
index 81b7e1c..29b9042 100644
--- a/myserver/src/base/socket_pair/socket_pair.cpp
+++ b/myserver/src/base/socket_pair/socket_pair.cpp
@@ -83,7 +83,7 @@ int SocketPair::create ()
int e;
int addrlen = sizeof(addr);
DWORD flags = 0;
-
+
if (handles == 0)
return -1;
@@ -104,14 +104,14 @@ int SocketPair::create ()
closesocket (listener);
return -1;
}
-
+
e = ::getsockname(listener, (struct sockaddr*) &addr, &addrlen);
if (e == SOCKET_ERROR)
{
closesocket (listener);
return -1;
}
-
+
do
{
if (::listen (listener, 1) == SOCKET_ERROR)
@@ -122,17 +122,17 @@ int SocketPair::create ()
break;
if ((handles[1] = ::accept (listener, NULL, NULL)) == INVALID_SOCKET)
break;
-
+
socketHandle = handles[0];
closesocket (listener);
return 0;
} while (0);
-
+
closesocket (listener);
closesocket (handles[0]);
closesocket (handles[1]);
-
+
return -1;
#endif
diff --git a/myserver/src/base/ssl/ssl.cpp b/myserver/src/base/ssl/ssl.cpp
index 2e93e63..8781e26 100644
--- a/myserver/src/base/ssl/ssl.cpp
+++ b/myserver/src/base/ssl/ssl.cpp
@@ -85,7 +85,7 @@ int SslContext::initialize ()
return -1;
return 1;
-}
+}
int SslContext::free ()
{
@@ -96,7 +96,7 @@ int SslContext::free ()
ret = 1;
context = 0;
}
- else
+ else
ret = 0;
certificateFile.assign ("");
privateKeyFile.assign ("");
diff --git a/myserver/src/base/sync/event.cpp b/myserver/src/base/sync/event.cpp
index e73675e..347bfc2 100755
--- a/myserver/src/base/sync/event.cpp
+++ b/myserver/src/base/sync/event.cpp
@@ -83,7 +83,7 @@ int Event::init(bool broadcast)
/*!
*Wait for the event.
*\param id The calling thread id.
- *\param timeout Timeout value in milliseconds.
+ *\param timeout Timeout value in milliseconds.
*/
int Event::wait(u_long id, u_long timeout)
{
@@ -124,13 +124,13 @@ int Event::wait(u_long id, u_long timeout)
return -1;
#endif
-
+
}
/*!
*Signal the event.
*The behaviour of this message is influenced by the broadcast flag, if this
- *is a broadcast event then the event will be signaled to all the waiting
+ *is a broadcast event then the event will be signaled to all the waiting
*threads otherwise only one thread will be signaled.
*\param id The calling thread id.
*/
@@ -157,7 +157,7 @@ int Event::signal(u_long id)
/* Reset the event for later reusability. */
ResetEvent(event);
-
+
#endif
return 0;
}
diff --git a/myserver/src/base/sync/mutex.cpp b/myserver/src/base/sync/mutex.cpp
index 8050e0d..172ffad 100755
--- a/myserver/src/base/sync/mutex.cpp
+++ b/myserver/src/base/sync/mutex.cpp
@@ -113,7 +113,7 @@ int Mutex::lock(u_long /*id*/)
}
#endif
-#else
+#else
WaitForSingleObject(mutex, INFINITE);
#endif
locked = true;
@@ -121,7 +121,7 @@ int Mutex::lock(u_long /*id*/)
}
/*!
- *Check if the mutex is already locked.
+ *Check if the mutex is already locked.
*
*\return Return true if the mutex is currently locked.
*/
@@ -138,7 +138,7 @@ int Mutex::unlock(u_long/*! id*/)
#ifdef HAVE_PTHREAD
int err;
err = pthread_mutex_unlock(&mutex);
-#else
+#else
ReleaseMutex(mutex);
#endif
locked = false;
diff --git a/myserver/src/base/sync/semaphore.cpp
b/myserver/src/base/sync/semaphore.cpp
index 4eeb08e..cd9b739 100755
--- a/myserver/src/base/sync/semaphore.cpp
+++ b/myserver/src/base/sync/semaphore.cpp
@@ -109,7 +109,7 @@ int Semaphore::lock(u_long /*id*/)
Thread::wait(1);
#endif
-#else
+#else
err = (WaitForSingleObject(semaphore, INFINITE) == WAIT_FAILED) ? 1 : 0;
#endif
return err;
@@ -123,7 +123,7 @@ int Semaphore::unlock(u_long/*! id*/)
int err;
#ifdef HAVE_PTHREAD
err = sem_post(&semaphore);
-#else
+#else
err = (ReleaseSemaphore(semaphore, 1, NULL) == FALSE) ? 1 : 0;
#endif
return err;
diff --git a/myserver/src/base/xml/xml_parser.cpp
b/myserver/src/base/xml/xml_parser.cpp
index dec0aef..0c12f07 100644
--- a/myserver/src/base/xml/xml_parser.cpp
+++ b/myserver/src/base/xml/xml_parser.cpp
@@ -19,7 +19,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <include/base/utility.h>
#include <include/base/file/files_utility.h>
-extern "C"
+extern "C"
{
#include <string.h>
}
@@ -52,7 +52,7 @@ static int MemBufCloseCallback(void * context)
/**
* Initializes the libxml2 library
* Calls xmlInitParser()
- * @return Returns true
+ * @return Returns true
*/
bool XmlParser::startXML()
{
@@ -144,18 +144,18 @@ int XmlParser::openMemBuf(MemBuf & memory, bool useXpath)
mtime = 0;
cur = NULL;
this->useXpath = useXpath;
-
+
if(memory.getLength() == 0)
return -1;
-
+
if(!doc)
{
- doc = xmlParseMemory((const char * )memory.getBuffer(),
+ doc = xmlParseMemory((const char * )memory.getBuffer(),
memory.getLength());
}
else
close();
-
+
if(!doc)
return -1;
@@ -228,19 +228,19 @@ char *XmlParser::getValue(const char* vName)
lcur = cur->xmlChildrenNode;
buffer.assign("");
-
+
while(lcur)
{
if(!xmlStrcmp(lcur->name, (const xmlChar *)vName))
{
lastNode = lcur;
-
+
if(lcur->children->content)
{
int inlen = strlen((const char*)lcur->children->content);
int outlen = inlen * 2;
char* tmpBuff = new char[outlen];
- if(UTF8Toisolat1((unsigned char*)tmpBuff, &outlen,
+ if(UTF8Toisolat1((unsigned char*)tmpBuff, &outlen,
(unsigned char*)lcur->children->content, &inlen)
>= 0)
{
tmpBuff[outlen] = '\0';
@@ -253,13 +253,13 @@ char *XmlParser::getValue(const char* vName)
ret = (char*)buffer.c_str();
}
-
+
break;
}
-
+
lcur = lcur->next;
}
-
+
return ret;
}
@@ -274,22 +274,22 @@ int XmlParser::setValue(const char* vName, const char
*value)
{
xmlNodePtr lcur = cur->xmlChildrenNode;
buffer.assign("");
-
+
while(lcur)
{
if(!xmlStrcmp(lcur->name, (const xmlChar *)vName))
{
lastNode = lcur;
-
+
if(lcur->children->content)
strcpy((char*)lcur->children->content, value);
-
+
return 0;
}
-
+
lcur=lcur->next;
}
-
+
return 1;
}
@@ -304,28 +304,28 @@ char *XmlParser::getAttr(const char* field, const char
*attr)
{
xmlNodePtr lcur = cur->xmlChildrenNode;
buffer.assign("");
-
+
while(lcur)
{
if(!xmlStrcmp(lcur->name, (const xmlChar *)field))
{
lastNode = lcur;
xmlAttr *attrs = lcur->properties;
-
+
while(attrs)
{
if(!xmlStrcmp(attrs->name, (const xmlChar *)attr))
{
return (char*)attrs->children->content;
}
-
+
attrs = attrs->next;
}
}
-
+
lcur = lcur->next;
}
-
+
return 0;
}
@@ -343,8 +343,8 @@ XmlXPathResult* XmlParser::evaluateXpath(const char* expr)
return NULL;
xpathObj = xmlXPathEvalExpression((const xmlChar*)expr, xpathCtx);
-
- if(xpathObj == NULL)
+
+ if(xpathObj == NULL)
return NULL;
return new XmlXPathResult(xpathObj);
@@ -363,7 +363,7 @@ int XmlParser::close()
if(useXpath && xpathCtx)
{
- xmlXPathFreeContext(xpathCtx);
+ xmlXPathFreeContext(xpathCtx);
}
doc = NULL;
@@ -385,10 +385,10 @@ int XmlParser::close()
int XmlParser::save(const char *filename,int *nbytes)
{
int err = xmlSaveFile(filename,doc);
-
+
if(nbytes)
*nbytes = err;
-
+
return err;
}
@@ -409,16 +409,16 @@ int XmlParser::saveMemBuf(MemBuf & memory,int *nbytes)
MemBufCloseCallback,
(void *)&memory,
NULL);
-
+
/*! Clear the buffer */
- memory.free();
-
+ memory.free();
+
/*! Let libxml2 fill the MemBuf class with our interal callbacks. */
int err = xmlSaveFileTo(callback, doc, NULL);
-
+
if(nbytes)
*nbytes = err;
-
+
return err;
}
@@ -431,12 +431,12 @@ void XmlParser::newfile(const char * root)
{
if(doc != NULL)
close();
-
+
doc = xmlNewDoc((const xmlChar*)"1.0");
cur = xmlNewDocNode(doc, NULL, (const xmlChar*)root, NULL);
-
+
xmlDocSetRootElement(doc, cur);
-
+
addLineFeed();
addLineFeed();
}
@@ -451,7 +451,7 @@ void XmlParser::addChild(const char * name, const char *
value)
{
lastNode = xmlNewTextChild(cur, NULL, (const xmlChar*)name,
(const xmlChar*)value);
-
+
addLineFeed();
}
@@ -468,7 +468,7 @@ void XmlParser::addGroup(const char * name)
prevCur = cur;
cur = xmlNewTextChild(cur, NULL, (const xmlChar*)name, NULL);
lastNode = cur;
-
+
addLineFeed();
}
}
@@ -484,7 +484,7 @@ void XmlParser::endGroup()
{
cur = prevCur;
prevCur = NULL;
-
+
addLineFeed();
addLineFeed();
}
@@ -500,7 +500,7 @@ void XmlParser::setAttr(const char * name, const char *
value)
{
if(lastNode == NULL)
return;
-
+
xmlSetProp(lastNode, (const xmlChar*)name, (const xmlChar*)value);
}
@@ -515,6 +515,6 @@ void XmlParser::addLineFeed()
#else
xmlNodePtr endline = xmlNewDocText(doc, (const xmlChar *)"\n");
#endif
-
+
xmlAddChild(cur, endline);
}
diff --git a/myserver/src/conf/security/auth_method_factory.cpp
b/myserver/src/conf/security/auth_method_factory.cpp
index 7527d82..5c1ef66 100644
--- a/myserver/src/conf/security/auth_method_factory.cpp
+++ b/myserver/src/conf/security/auth_method_factory.cpp
@@ -52,7 +52,7 @@ AuthMethod* AuthMethodFactory::getAuthMethod(string &name)
AuthMethod* AuthMethodFactory::addAuthMethod(string &name, AuthMethod*
authMethod)
{
return authMethods.put (name, authMethod);
-
+
}
/*!
diff --git a/myserver/src/conf/security/security_cache.cpp
b/myserver/src/conf/security/security_cache.cpp
index 37f6d21..f7871a5 100644
--- a/myserver/src/conf/security/security_cache.cpp
+++ b/myserver/src/conf/security/security_cache.cpp
@@ -6,7 +6,7 @@ it under the terms of the GNU General Public License as
published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -24,7 +24,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <string>
using namespace std;
-
+
/*!
*Constructor for the SecurityCache object.
*/
@@ -61,7 +61,7 @@ void SecurityCache::free ()
/*!
*Set a new limit on the nodes to keep in memory.
- *\param newLimit Number of files to cache. it is adjusted
+ *\param newLimit Number of files to cache. it is adjusted
*to be >= 1.
*/
void SecurityCache::setMaxNodes (int newLimit)
@@ -74,7 +74,7 @@ void SecurityCache::setMaxNodes (int newLimit)
{
XmlParser* toremove = dictionary.remove(dictionary.begin());
if(toremove)
- delete toremove;
+ delete toremove;
}
limit = newLimit;
}
@@ -84,11 +84,11 @@ void SecurityCache::setMaxNodes (int newLimit)
*zero on success.
*\param dir The directory we need a security parser for.
*\param sys The system directory.
- *\param out Output string where put the security file path.
+ *\param out Output string where put the security file path.
*\param secFileName The security file name.
*/
-int SecurityCache::getSecurityFile (const string& dir,
- const string& sys,
+int SecurityCache::getSecurityFile (const string& dir,
+ const string& sys,
string& out,
const char* secFileName)
{
@@ -112,7 +112,7 @@ int SecurityCache::getSecurityFile (const string& dir,
return 0;
}
-
+
/* Go upper in the tree till we find a security file. */
for(;;)
{
@@ -126,8 +126,8 @@ int SecurityCache::getSecurityFile (const string& dir,
break;
}
- /*
- *Top of the tree, check if the security file is present in the
+ /*
+ *Top of the tree, check if the security file is present in the
*system directory. Return an error if it is not.
*/
if(i == 0)
@@ -166,8 +166,8 @@ int SecurityCache::getMaxNodes()
*\param secFileName The security file name.
*\param maxSize The maximum file size allowed for the security file.
*/
-XmlParser* SecurityCache::getParser (const string &dir,
- const string &sys,
+XmlParser* SecurityCache::getParser (const string &dir,
+ const string &sys,
bool useXpath,
const char* secFileName,
u_long maxSize)
@@ -189,7 +189,7 @@ XmlParser* SecurityCache::getParser (const string &dir,
/*! If the file was modified reload it. */
fileModTime = FilesUtility::getLastModTime (file.c_str ());
- if ((fileModTime != static_cast<time_t>(-1)) &&
+ if ((fileModTime != static_cast<time_t>(-1)) &&
(parser->getLastModTime () != fileModTime))
{
parser->close ();
@@ -225,7 +225,7 @@ XmlParser* SecurityCache::getParser (const string &dir,
parser = new XmlParser ();
if (parser == NULL)
- {
+ {
return NULL;
}
diff --git a/myserver/src/conf/security/security_manager.cpp
b/myserver/src/conf/security/security_manager.cpp
index 7516523..77c4b94 100644
--- a/myserver/src/conf/security/security_manager.cpp
+++ b/myserver/src/conf/security/security_manager.cpp
@@ -43,8 +43,8 @@ SecurityManager::~SecurityManager ()
/*!
*Get the permission mask for the requested resource.
*/
-int SecurityManager::getPermissionMask (SecurityToken* st,
- SecurityDomain **domains,
+int SecurityManager::getPermissionMask (SecurityToken* st,
+ SecurityDomain **domains,
string &validator,
string &authMethod)
{
@@ -60,8 +60,8 @@ int SecurityManager::getPermissionMask (SecurityToken* st,
/*!
*Get the permission mask for the requested resource.
*/
-int SecurityManager::getPermissionMask (SecurityToken* st,
- list<SecurityDomain*> *domains,
+int SecurityManager::getPermissionMask (SecurityToken* st,
+ list<SecurityDomain*> *domains,
string &validator,
string &authMethod)
{
@@ -79,7 +79,7 @@ int SecurityManager::getPermissionMask (SecurityToken* st,
*Initialize the pointers to the specified Validator and AuthMethod.
*\param validatorName The validator name to find.
*\param authMethodName The auth method name to find.
- *\param validator Pointer to the Validator to initialize.
+ *\param validator Pointer to the Validator to initialize.
*\param authMethod Pointer to the AuthMethod initialize.
*\return 0 if the pointers were successfully initialized.
*/
diff --git a/myserver/src/conf/security/validator.cpp
b/myserver/src/conf/security/validator.cpp
index 8c81c34..d21b926 100644
--- a/myserver/src/conf/security/validator.cpp
+++ b/myserver/src/conf/security/validator.cpp
@@ -34,7 +34,7 @@ Validator::~Validator ()
*Get the permission mask for the requested resource.
*Delegate the problem to getPermissionMaskInt.
*/
-int Validator::getPermissionMask (SecurityToken* st,
+int Validator::getPermissionMask (SecurityToken* st,
list<SecurityDomain*> *domains,
AuthMethod* authMethod)
{
@@ -45,7 +45,7 @@ int Validator::getPermissionMask (SecurityToken* st,
if (domains)
{
- for (list<SecurityDomain*>::iterator it = domains->begin ();
+ for (list<SecurityDomain*>::iterator it = domains->begin ();
it != domains->end (); it++)
{
addDomain (&hashedDomains, *it);
@@ -59,7 +59,7 @@ int Validator::getPermissionMask (SecurityToken* st,
*Get the permission mask for the requested resource.
*Delegate the problem to getPermissionMaskInt.
*/
-int Validator::getPermissionMask (SecurityToken* st,
+int Validator::getPermissionMask (SecurityToken* st,
SecurityDomain **domains,
AuthMethod* authMethod)
{
@@ -85,7 +85,7 @@ int Validator::getPermissionMask (SecurityToken* st,
*Get the permission mask for the requested resource.
*Decorate getPermissionMaskImpl.
*/
-int Validator::getPermissionMaskInt (SecurityToken* st,
+int Validator::getPermissionMaskInt (SecurityToken* st,
HashMap<string, SecurityDomain*>
*hashedDomains,
AuthMethod* authMethod)
{
@@ -93,10 +93,10 @@ int Validator::getPermissionMaskInt (SecurityToken* st,
if (authMethod)
ret = authMethod->getPermissionMask (st);
-
+
if (!getPermissionMaskImpl (st, hashedDomains, authMethod))
ret = 0;
-
+
st->setDone (true);
return ret;
@@ -141,6 +141,6 @@ string *Validator::getValue (HashMap<string,
SecurityDomain*> *hashedDomains, st
if (securityDomain)
return securityDomain->getValue (var);
-
+
return NULL;
}
diff --git a/myserver/src/conf/security/xml_validator.cpp
b/myserver/src/conf/security/xml_validator.cpp
index e738849..bfb1869 100644
--- a/myserver/src/conf/security/xml_validator.cpp
+++ b/myserver/src/conf/security/xml_validator.cpp
@@ -101,15 +101,15 @@ int XmlValidator::getPermissionMask (SecurityToken* st)
{
if (xmlStrcmp (cur->name, (const xmlChar *) "USER"))
continue;
-
+
xmlAttr *attrs = cur->properties;
-
+
xmlChar* name = NULL;
xmlChar* password = NULL;
int permissions = getPermissions (attrs, &name, &password);
- if (!name || !password ||
+ if (!name || !password ||
xmlStrcmp (name, (const xmlChar *)st->getUser ().c_str ()))
continue;
@@ -125,7 +125,7 @@ int XmlValidator::getPermissionMask (SecurityToken* st)
st->setAuthenticated (true);
st->setMask (permissions);
}
-
+
return st->getMask ();
}
@@ -148,7 +148,7 @@ int XmlValidator::getPermissions (xmlAttr* attrs, xmlChar**
user, xmlChar** pass
if (user && !xmlStrcmp (attrs->name, (const xmlChar *)"name") &&
attrs->children && attrs->children->content)
*user = attrs->children->content;
-
+
else if (password && !xmlStrcmp (attrs->name, (const xmlChar
*)"password") &&
attrs->children && attrs->children->content)
*password = attrs->children->content;
@@ -172,7 +172,7 @@ int XmlValidator::getPermissions (xmlAttr* attrs, xmlChar**
user, xmlChar** pass
attrs->children && attrs->children->content &&
!xmlStrcmp(attrs->children->content, (const xmlChar *) "YES"))
permissions |= MYSERVER_PERMISSION_BROWSE;
-
+
attrs = attrs->next;
}
@@ -220,9 +220,9 @@ int XmlValidator::getPermissionMaskImpl (SecurityToken* st,
/*!
*Compute the current XML node.
*/
-int XmlValidator::computeXmlNode (xmlNodePtr node,
- SecurityToken *st,
- int *cmd,
+int XmlValidator::computeXmlNode (xmlNodePtr node,
+ SecurityToken *st,
+ int *cmd,
HashMap<string, SecurityDomain*>
*hashedDomains)
{
if (!node)
@@ -248,7 +248,7 @@ int XmlValidator::computeXmlNode (xmlNodePtr node,
if (cur->type != XML_ELEMENT_NODE)
continue;
-
+
if (!xmlStrcmp (cur->name, (const xmlChar *) "CONDITION"))
{
if (doCondition (cur, hashedDomains))
@@ -282,13 +282,13 @@ bool XmlValidator::doCondition (xmlNodePtr node,
HashMap<string, SecurityDomain*
const xmlChar *value = (const xmlChar*)"";
const xmlChar *regex = (const xmlChar*)"";
xmlAttr *attrs = node->properties;
-
+
while (attrs)
{
if (!xmlStrcmp (attrs->name, (const xmlChar *)"name") &&
attrs->children && attrs->children->content)
name.assign ((const char*)attrs->children->content);
-
+
if (!xmlStrcmp (attrs->name, (const xmlChar *)"value") &&
attrs->children && attrs->children->content)
value = attrs->children->content;
@@ -300,10 +300,10 @@ bool XmlValidator::doCondition (xmlNodePtr node,
HashMap<string, SecurityDomain*
if (!xmlStrcmp (attrs->name, (const xmlChar *)"regex") &&
attrs->children && attrs->children->content)
regex = attrs->children->content;
-
+
attrs = attrs->next;
}
-
+
string *storedValue = getValue (hashedDomains, name);
if (!storedValue)
@@ -324,10 +324,10 @@ bool XmlValidator::doCondition (xmlNodePtr node,
HashMap<string, SecurityDomain*
}
else
eq = storedValue->compare ((const char*)value) == 0;
-
+
if (!xmlStrcmp (isNot, (const xmlChar *) "yes"))
return !eq;
-
+
return eq;
}
@@ -354,13 +354,13 @@ void XmlValidator::doDefine (xmlNodePtr node,
SecurityToken *st, HashMap<string,
string name;
const xmlChar *value = (const xmlChar*)"";
xmlAttr *attrs = node->properties;
-
+
while (attrs)
{
if(!xmlStrcmp (attrs->name, (const xmlChar *)"name") &&
attrs->children && attrs->children->content)
name.assign ((const char*)attrs->children->content);
-
+
if(!xmlStrcmp (attrs->name, (const xmlChar *)"value") &&
attrs->children && attrs->children->content)
value = attrs->children->content;
@@ -393,7 +393,7 @@ void XmlValidator::doReturn (xmlNodePtr node, int *cmd,
HashMap<string, Security
if (!xmlStrcmp (attrs->name, (const xmlChar *)"value") &&
attrs->children && attrs->children->content)
value = attrs->children->content;
-
+
attrs = attrs->next;
}
diff --git a/myserver/src/conf/xml_conf.cpp b/myserver/src/conf/xml_conf.cpp
index de00f3c..5b7a962 100644
--- a/myserver/src/conf/xml_conf.cpp
+++ b/myserver/src/conf/xml_conf.cpp
@@ -54,10 +54,10 @@ void XmlConf::readNode (xmlNodePtr lcur,
for (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)
name = (const char*)attrs->children->content;
- else if (!xmlStrcmp (attrs->name, (const xmlChar *)"value") &&
+ else if (!xmlStrcmp (attrs->name, (const xmlChar *)"value") &&
attrs->children && attrs->children->content)
value = (const char*)attrs->children->content;
else
@@ -71,7 +71,7 @@ void XmlConf::readNode (xmlNodePtr lcur,
string *v = value ? new string((const char*)value) : NULL;
node->setValue (v);
-
+
if(name)
{
string key((const char*)name);
diff --git a/myserver/src/connection/connection.cpp
b/myserver/src/connection/connection.cpp
index 69f6564..db4987b 100644
--- a/myserver/src/connection/connection.cpp
+++ b/myserver/src/connection/connection.cpp
@@ -102,7 +102,7 @@ u_long Connection::getID ()
/*!
*Set the IDentifier for the connection.
- *\param nID The new ID.
+ *\param nID The new ID.
*/
void Connection::setID (u_long nID)
{
@@ -167,7 +167,7 @@ const char* Connection::getLogin ()
/*!
*Set the login name for the connection user.
- *\param loginName The login name.
+ *\param loginName The login name.
*/
void Connection::setLogin (const char* loginName)
{
@@ -242,7 +242,7 @@ u_short Connection::getLocalPort ()
/*!
*Set the local port used to connect to.
- *\param np The new local port.
+ *\param np The new local port.
*/
void Connection::setLocalPort (u_short np)
{
@@ -259,7 +259,7 @@ u_long Connection::getTimeout ()
/*!
*Set the timeout to use with the connection.
- *\param nTimeout The new timeout value.
+ *\param nTimeout The new timeout value.
*/
void Connection::setTimeout (u_long nTimeout)
{
@@ -276,7 +276,7 @@ int Connection::getToRemove ()
/*!
*Set the reason to remove the connection.
- *\param r Set if the connection/connection.has to be removed.
+ *\param r Set if the connection/connection.has to be removed.
*/
void Connection::setToRemove (int r)
{
@@ -292,7 +292,7 @@ int Connection::isForceControl ()
}
/*!
*Force the control of this connection on next server loop.
- *\param fp The new force control value even if there is new data.
+ *\param fp The new force control value even if there is new data.
*/
void Connection::setForceControl (int fp)
{
diff --git a/myserver/src/filter/console.cpp b/myserver/src/filter/console.cpp
index b2671bd..1c0a4b3 100644
--- a/myserver/src/filter/console.cpp
+++ b/myserver/src/filter/console.cpp
@@ -66,13 +66,13 @@ Console::Console () : Stream ()
Console::~Console ()
{
- if (fd)
+ if (fd)
{
reset ();
}
}
-int
+int
Console::flush (u_long* nbw)
{
if (fd)
diff --git a/myserver/src/filter/filter.cpp b/myserver/src/filter/filter.cpp
index 0689f41..692934b 100644
--- a/myserver/src/filter/filter.cpp
+++ b/myserver/src/filter/filter.cpp
@@ -127,7 +127,7 @@ int Filter::modifyData()
}
/*!
- *Return a string with the filter name.
+ *Return a string with the filter name.
*If an external buffer is provided write the name there too.
*\param name The buffer where write the filter name.
*\param len The buffer length.
diff --git a/myserver/src/filter/filters_chain.cpp
b/myserver/src/filter/filters_chain.cpp
index 9000fba..4c2d36a 100644
--- a/myserver/src/filter/filters_chain.cpp
+++ b/myserver/src/filter/filters_chain.cpp
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include "stdafx.h"
#include <include/filter/filters_chain.h>
#include <include/base/string/stringutils.h>
@@ -34,7 +34,7 @@ int FiltersChain::read(char* buffer, u_long len, u_long* nbr)
return -1;
if(firstFilter)
return firstFilter->read(buffer, len, nbr);
-
+
return stream->read(buffer, len, nbr);
}
@@ -95,7 +95,7 @@ void FiltersChain::setAcceptDuplicates(int v)
}
/*!
- *Return if the chain can have the same filter in multiple places.
+ *Return if the chain can have the same filter in multiple places.
*/
int FiltersChain::getAcceptDuplicates()
{
@@ -111,9 +111,9 @@ FiltersChain::~FiltersChain()
}
/*!
- *Add a filter to the chain.
+ *Add a filter to the chain.
*Returns 0 on success.
- *the number of bytes written to initialize the filter.
+ *the number of bytes written to initialize the filter.
*/
int FiltersChain::addFilter(Filter* f, u_long *nbw, int sendData)
{
@@ -153,7 +153,7 @@ int FiltersChain::addFilter(Filter* f, u_long *nbw, int
sendData)
}
}
- /*!
+ /*!
*Add the new filter at the end of the list.
*The new filter will write directly the old firstFilter.
*/
@@ -167,10 +167,10 @@ int FiltersChain::addFilter(Filter* f, u_long *nbw, int
sendData)
return ret;
}
-/*!
+/*!
*Flush remaining data.
*Additional footer data for filters is added at the end.
- *Returns 0 on success.
+ *Returns 0 on success.
*/
int FiltersChain::flush(u_long* nbw)
{
@@ -192,7 +192,7 @@ int FiltersChain::flush(u_long* nbw)
;
/*!
- *Position on the last element.
+ *Position on the last element.
*/
i = filters.end();
@@ -209,7 +209,7 @@ int FiltersChain::flush(u_long* nbw)
f->getParent()->write(buffer, tmpNbw, nbw);
written += (*nbw);
}
-
+
/*! Set the final value. */
*nbw = written;
return 0;
@@ -248,7 +248,7 @@ int FiltersChain::isFilterPresent(const char* name)
int FiltersChain::removeFilter(Filter* f)
{
list<Filter*>::iterator i = filters.begin();
- list<Filter*>::iterator prev = filters.end();
+ list<Filter*>::iterator prev = filters.end();
for( ; i != filters.end(); ++i )
{
if(*i == f)
@@ -259,8 +259,8 @@ int FiltersChain::removeFilter(Filter* f)
}
else
{
- /*!
- *It is the first filter according to the linked list.
+ /*!
+ *It is the first filter according to the linked list.
*Do not use the getParent function here as it can be a Stream.
*/
if(i == filters.end())
@@ -281,7 +281,7 @@ int FiltersChain::removeFilter(Filter* f)
}
prev = i;
}
-
+
return 0;
}
diff --git a/myserver/src/filter/filters_factory.cpp
b/myserver/src/filter/filters_factory.cpp
index 8a0a3be..cb73fd7 100644
--- a/myserver/src/filter/filters_factory.cpp
+++ b/myserver/src/filter/filters_factory.cpp
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include "stdafx.h"
#include <include/filter/filters_factory.h>
@@ -64,7 +64,7 @@ int FiltersFactory::insert(const char* name, FILTERCREATE fnc)
}
/*!
- *Get a new filter by its name.
+ *Get a new filter by its name.
*The object have to be freed after its use to avoid memory leaks.
*Returns the new created object on success.
*Returns 0 on errors.
@@ -77,7 +77,7 @@ Filter *FiltersFactory::getFilter(const char* name)
if(staticFactory)
return staticFactory(name);
-
+
dynamicFactory = dynamicFilters.get(name);
if(dynamicFactory)
@@ -87,13 +87,13 @@ Filter *FiltersFactory::getFilter(const char* name)
}
/*!
- *Create a FiltersChain starting from a list of strings.
+ *Create a FiltersChain starting from a list of strings.
*On success returns the new object.
*If specified [onlyNotModifiers] the method wil check that all the filters
*will not modify the data.
*On errors returns 0.
*/
-FiltersChain* FiltersFactory::chain(list<string> &l, Stream* out, u_long *nbw,
+FiltersChain* FiltersFactory::chain(list<string> &l, Stream* out, u_long *nbw,
int onlyNotModifiers)
{
FiltersChain *ret = new FiltersChain();
@@ -114,7 +114,7 @@ FiltersChain* FiltersFactory::chain(list<string> &l,
Stream* out, u_long *nbw,
*will not modify the data.
*On errors returns nonzero.
*/
-int FiltersFactory::chain(FiltersChain* c, list<string> &l, Stream* out,
+int FiltersFactory::chain(FiltersChain* c, list<string> &l, Stream* out,
u_long *nbw, int onlyNotModifiers)
{
diff --git a/myserver/src/filter/memory_stream.cpp
b/myserver/src/filter/memory_stream.cpp
index c8bd270..fb64242 100644
--- a/myserver/src/filter/memory_stream.cpp
+++ b/myserver/src/filter/memory_stream.cpp
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public
License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include <include/filter/memory_stream.h>
#include <string>
@@ -45,7 +45,7 @@ int MemoryStream::read(char* buffer, u_long len, u_long *nbr)
*/
int MemoryStream::read(Stream* s, u_long len, u_long *nbr)
{
- u_long towrite = *nbr = std::min(len, static_cast<u_long>(data->getLength()
- readSeek));
+ u_long towrite = *nbr = std::min(len, static_cast<u_long>(data->getLength()
- readSeek));
int ret = s->write(data->getBuffer()+readSeek, towrite, nbr);
readSeek += towrite;
return ret;
diff --git a/myserver/src/filter/stream.cpp b/myserver/src/filter/stream.cpp
index afb490a..01581e9 100644
--- a/myserver/src/filter/stream.cpp
+++ b/myserver/src/filter/stream.cpp
@@ -48,8 +48,8 @@ int Stream::write (const char* buffer, u_long len, u_long
*nbw)
return 0;
}
-/*!
- *Write remaining data to the stream.
+/*!
+ *Write remaining data to the stream.
*/
int Stream::flush (u_long* nbw)
{
@@ -67,7 +67,7 @@ Stream::~Stream ()
}
-/*!
+/*!
*Get the file handle.
*/
Handle Stream::getHandle ()
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index 7b24ae3..25b10d7 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -6,7 +6,7 @@ it under the terms of the GNU General Public License as
published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -57,9 +57,9 @@ using namespace std;
int Cgi::send (HttpThreadContext* td, const char* scriptpath,
const char *cgipath, bool execute, bool onlyHeader)
{
- /*
- *Use this flag to check if the CGI executable is
- *nph (Non Parsed Header).
+ /*
+ *Use this flag to check if the CGI executable is
+ *nph (Non Parsed Header).
*/
bool nph = false;
ostringstream cmdLine;
@@ -73,7 +73,7 @@ int Cgi::send (HttpThreadContext* td, const char* scriptpath,
string tmpScriptPath;
/*!
- *Standard CGI uses STDOUT to output the result and the STDIN
+ *Standard CGI uses STDOUT to output the result and the STDIN
*to get other params like in a POST request.
*/
Pipe stdOutFile;
@@ -88,7 +88,7 @@ int Cgi::send (HttpThreadContext* td, const char* scriptpath,
if (!FilesUtility::fileExists (scriptpath))
return td->http->raiseHTTPError(404);
-
+
int subString = cgipath[0] == '"';
/* Do not modify the text between " and ". */
for (i = 1; i < len; i++)
@@ -101,8 +101,8 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
/*
*Save the cgi path and the possible arguments.
- *the (x < len) case is when additional arguments are specified.
- *If the cgipath is enclosed between " and " do not consider them
+ *the (x < len) case is when additional arguments are specified.
+ *If the cgipath is enclosed between " and " do not consider them
*when splitting directory and file name.
*/
if (i < len)
@@ -121,14 +121,14 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
moreArg.assign ("");
}
FilesUtility::splitPath (tmpCgiPath, td->cgiRoot, td->cgiFile);
-
+
tmpScriptPath.assign (scriptpath);
FilesUtility::splitPath (tmpScriptPath, td->scriptDir, td->scriptFile);
chain.setProtocol (td->http);
chain.setProtocolData (td);
chain.setStream (td->connection->socket);
-
+
if (execute)
{
const char *args = 0;
@@ -192,17 +192,17 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
spi.arg.assign (moreArg);
spi.arg.append (" ");
- spi.arg.append (td->scriptFile);
-
+ spi.arg.append (td->scriptFile);
+
cmdLine << "\"" << td->cgiRoot << "/" << td->cgiFile << "\" "
<< moreArg << " " << td->scriptFile;
-
+
spi.cmd.assign (td->cgiRoot);
spi.cmd.append ("/");
spi.cmd.append (td->cgiFile);
- if (td->cgiFile.length() > 4 && td->cgiFile[0] == 'n'
- && td->cgiFile[1] == 'p' && td->cgiFile[2] == 'h'
+ if (td->cgiFile.length() > 4 && td->cgiFile[0] == 'n'
+ && td->cgiFile[1] == 'p' && td->cgiFile[2] == 'h'
&& td->cgiFile[3] == '-' )
nph = true;
else
@@ -210,7 +210,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
}
/*
- *Open the stdout file for the new CGI process.
+ *Open the stdout file for the new CGI process.
*/
if (stdOutFile.create())
{
@@ -228,14 +228,14 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
chain.clearAllFilters ();
return td->http->raiseHTTPError (500);
}
-
+
/*
*Build the environment string used by the CGI process.
*Use the td->secondaryBuffer to build the environment string.
*/
(td->secondaryBuffer->getBuffer ())[0] = '\0';
Env::buildEnvironmentString (td, td->secondaryBuffer->getBuffer ());
-
+
spi.cmdLine = cmdLine.str ();
spi.cwd.assign (td->scriptDir);
@@ -271,11 +271,11 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
int pid;
int port;
- ret = Process::getForkServer ()->executeProcess (&spi,
-
ForkServer::FLAG_USE_IN |
-
ForkServer::FLAG_USE_OUT |
-
ForkServer::FLAG_USE_ERR,
- &pid,
+ ret = Process::getForkServer ()->executeProcess (&spi,
+
ForkServer::FLAG_USE_IN |
+
ForkServer::FLAG_USE_OUT |
+
ForkServer::FLAG_USE_ERR,
+ &pid,
&port);
cgiProc.setPid (pid);
}
@@ -313,7 +313,7 @@ int Cgi::send (HttpThreadContext* td, const char*
scriptpath,
/*
*Read data from the CGI process and send it back to the client.
*/
-int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain&
chain,
+int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain&
chain,
Process &cgiProc, int onlyHeader, bool nph)
{
u_long nbw = 0;
@@ -376,35 +376,35 @@ int Cgi::sendData (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chain,
if (!aliveProcess && !nBytesRead)
break;
- if (nBytesRead &&
- HttpDataHandler::appendDataToHTTPChannel (td,
+ if (nBytesRead &&
+ HttpDataHandler::appendDataToHTTPChannel (td,
td->secondaryBuffer->getBuffer(),
nBytesRead,
&(td->outputData),
&chain,
- td->appendOutputs,
+ td->appendOutputs,
useChunks))
- return 0;
-
+ return 0;
+
nbw += nBytesRead;
}
/* Send the last null chunk if needed. */
if(useChunks && chain.getStream ()->write ("0\r\n\r\n", 5, &nbw2))
- return 0;
+ return 0;
}
/* Update the Content-Length field for logging activity. */
td->sentData += nbw;
- return 1;
+ return 1;
}
/*!
*Send the HTTP header.
*\return nonzero if the reply is already complete.
*/
-int Cgi::sendHeader (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain&
chain,
- Process& cgiProc, int onlyHeader, bool nph, u_long
procStartTime,
+int Cgi::sendHeader (HttpThreadContext* td, Pipe &stdOutFile, FiltersChain&
chain,
+ Process& cgiProc, int onlyHeader, bool nph, u_long
procStartTime,
bool keepalive, bool useChunks, int *ret)
{
u_long headerSize = 0;
@@ -424,10 +424,10 @@ int Cgi::sendHeader (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chai
bad influence on the performances. */
if (td->secondaryBuffer->getRealLength() - headerOffset - 1 < 512)
break;
-
+
term = stdOutFile.pipeTerminated ();
- if (!term &&
+ if (!term &&
stdOutFile.waitForData ((timeout - ticks) / 1000, (timeout - ticks) %
1000) == 0)
{
td->connection->host->warningsLogWrite (_("Cgi: process %i timeout"),
cgiProc.getPid ());
diff --git a/myserver/src/http_handler/mscgi/mscgi_manager.cpp
b/myserver/src/http_handler/mscgi/mscgi_manager.cpp
index af670a4..289bca1 100644
--- a/myserver/src/http_handler/mscgi/mscgi_manager.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi_manager.cpp
@@ -115,14 +115,14 @@ char* MscgiManager::getParam(const char* param)
{
while((*c) && strncmp(c, param, std::min(strlen(param), strlen(c))))
c++;
-
+
if(*c == '\0')
{
return &localbuffer[0];
}
-
+
c += strlen(param);
-
+
if(*c == '=')
{
c++;
@@ -146,12 +146,12 @@ char* MscgiManager::postParam(const char* param)
char buffer[LOCAL_BUFFER_DIM + 50];
u_long nbr = 0;
char c;
-
+
u_long toRead = td->inputData.getFileSize();
buffer[0] = '\0';
localbuffer[0] = '\0';
-
+
if( (toRead == 0) || (toRead == (u_long)-1) )
return 0;
do
@@ -204,12 +204,12 @@ char *MscgiManager::operator >>(const char* str)
return postParam(str);
else
return getParam(str);
-}
+}
/*!
*Get the value of an environment variable.
*/
-void MscgiManager::getenv(const char* lpszVariableName, char *lpvBuffer,
+void MscgiManager::getenv(const char* lpszVariableName, char *lpvBuffer,
u_long* lpdwSize)
{
((char*)lpvBuffer)[0] = '\0';
@@ -217,12 +217,12 @@ void MscgiManager::getenv(const char* lpszVariableName,
char *lpvBuffer,
size_t variableNameLen = strlen(lpszVariableName);
for(u_long i = 0; ; i += (u_long)strlen(&localEnv[i]) + 1)
{
- if(((localEnv[i+variableNameLen])== '=') &&
+ if(((localEnv[i+variableNameLen])== '=') &&
(!strncmp(&localEnv[i], lpszVariableName, variableNameLen)))
{
u_long j = 0;
u_long min_v = std::min((u_long)strlen(&localEnv[i + variableNameLen+1]),
- (u_long)(*lpvBuffer)-1);
+ (u_long)(*lpvBuffer)-1);
for(j = 0; j < min_v; j++)
lpvBuffer[j] = localEnv[i + variableNameLen + j + 1];
lpvBuffer[j] = '\0';
@@ -237,7 +237,7 @@ void MscgiManager::getenv(const char* lpszVariableName,
char *lpvBuffer,
}
/*!
- *Returns the CGI data structure.
+ *Returns the CGI data structure.
*This structure is shared with the MyServer core so use it carefully!
*/
MsCgiData* MscgiManager::getCgiData()
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index 743123d..26d7ab1 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -184,7 +184,7 @@ int Proxy::flushToClient (HttpThreadContext* td, Socket&
client,
hasTransferEncoding = false;
transferEncoding.assign (*tmp);
}
-
+
if (useChunks)
td->response.setValue ("Transfer-Encoding", "chunked");
diff --git a/myserver/src/log/stream/console_stream.cpp
b/myserver/src/log/stream/console_stream.cpp
index 0259f3c..421a95d 100644
--- a/myserver/src/log/stream/console_stream.cpp
+++ b/myserver/src/log/stream/console_stream.cpp
@@ -19,7 +19,7 @@
#include <include/server/server.h>
ConsoleStream::ConsoleStream (FiltersFactory* ff, u_long cycle, Stream* out,
- FiltersChain* fc) :
+ FiltersChain* fc) :
LogStream (ff, cycle, out, fc)
{
}
diff --git a/myserver/src/log/stream/console_stream_creator.cpp
b/myserver/src/log/stream/console_stream_creator.cpp
index 03b846d..b38372f 100644
--- a/myserver/src/log/stream/console_stream_creator.cpp
+++ b/myserver/src/log/stream/console_stream_creator.cpp
@@ -18,7 +18,7 @@
#include <include/log/stream/console_stream_creator.h>
LogStream*
-ConsoleStreamCreator::create (FiltersFactory* ff, string location,
+ConsoleStreamCreator::create (FiltersFactory* ff, string location,
list<string>& filters, u_long cycle)
{
Console* out = new Console ();
diff --git a/myserver/src/log/stream/file_stream.cpp
b/myserver/src/log/stream/file_stream.cpp
index e5243e8..447097b 100644
--- a/myserver/src/log/stream/file_stream.cpp
+++ b/myserver/src/log/stream/file_stream.cpp
@@ -17,15 +17,15 @@
#include <include/log/stream/file_stream.h>
-int const FileStream::defaultFileMask =
- File::APPEND |
+int const FileStream::defaultFileMask =
+ File::APPEND |
File::FILE_OPEN_ALWAYS |
- File::WRITE |
- File::READ |
+ File::WRITE |
+ File::READ |
File::NO_INHERIT;
FileStream::FileStream (FiltersFactory* ff, u_long cycle, Stream* out,
- FiltersChain* fc) :
+ FiltersChain* fc) :
LogStream (ff, cycle, out, fc)
{
}
@@ -68,7 +68,7 @@ FileStream::makeNewFileName (string oldFileName)
getRFC822LocalTime (time, 32);
time = trim (time.substr (5, 32));
-
+
for (int i = 0; i < static_cast<int>(time.length ()); i++)
if ((time[i] == ' ') || (time[i] == ':'))
time[i]= '.';
diff --git a/myserver/src/log/stream/file_stream_creator.cpp
b/myserver/src/log/stream/file_stream_creator.cpp
index a509cfd..9330cee 100644
--- a/myserver/src/log/stream/file_stream_creator.cpp
+++ b/myserver/src/log/stream/file_stream_creator.cpp
@@ -18,7 +18,7 @@
#include <include/log/stream/file_stream_creator.h>
LogStream*
-FileStreamCreator::create (FiltersFactory* ff, string location,
+FileStreamCreator::create (FiltersFactory* ff, string location,
list<string>& filters, u_long cycle)
{
File* out = new File ();
diff --git a/myserver/src/log/stream/socket_stream.cpp
b/myserver/src/log/stream/socket_stream.cpp
index 2f9e0c9..c1957e7 100644
--- a/myserver/src/log/stream/socket_stream.cpp
+++ b/myserver/src/log/stream/socket_stream.cpp
@@ -20,7 +20,7 @@
SocketStream::SocketStream (FiltersFactory* filtersFactory,
u_long cycleLog,
Stream* outStream,
- FiltersChain* filtersChain) :
+ FiltersChain* filtersChain) :
LogStream (filtersFactory,
cycleLog,
outStream,
diff --git a/myserver/src/log/stream/socket_stream_creator.cpp
b/myserver/src/log/stream/socket_stream_creator.cpp
index d3f110c..59450aa 100644
--- a/myserver/src/log/stream/socket_stream_creator.cpp
+++ b/myserver/src/log/stream/socket_stream_creator.cpp
@@ -18,7 +18,7 @@
#include <include/log/stream/socket_stream_creator.h>
LogStream*
-SocketStreamCreator::create (FiltersFactory* ff, string location,
+SocketStreamCreator::create (FiltersFactory* ff, string location,
list<string>& filters, u_long cycle)
{
Socket* out = new Socket ();
diff --git a/myserver/src/plugin/plugin_info.cpp
b/myserver/src/plugin/plugin_info.cpp
index 693ca01..ce78fcd 100755
--- a/myserver/src/plugin/plugin_info.cpp
+++ b/myserver/src/plugin/plugin_info.cpp
@@ -26,12 +26,12 @@ Regex* PluginInfo::regex = new
Regex("^[1-2]?[1-9]?[0-9](\\.[1-2]?[0-9]?[0-9](\\
/*!
*Construct a plugin info object.
*\param name plugin name.
- *\param enabled is true if the plugin has to be enabled.
+ *\param enabled is true if the plugin has to be enabled.
*\param global is true if the plugin's symbols have to be loaded globally.
*/
PluginInfo::PluginInfo(string& name, bool enabled, bool global)
{
- this->name = name;
+ this->name = name;
this->enabled = enabled;
this->global = global;
this->version = 0;
@@ -45,7 +45,7 @@ PluginInfo::PluginInfo(string& name, bool enabled, bool
global)
/*!
*Destroy the object.
-*/
+*/
PluginInfo::~PluginInfo()
{
if (this->plugin)
@@ -54,10 +54,10 @@ PluginInfo::~PluginInfo()
/*!
*Returns true if the plugin is enabled.
-*/
+*/
bool PluginInfo::isEnabled()
{
- return this->enabled;
+ return this->enabled;
}
/*!
@@ -65,9 +65,9 @@ bool PluginInfo::isEnabled()
*/
bool PluginInfo::isGlobal()
{
- return this->global;
+ return this->global;
}
-
+
/*!
* Adds a dependence to the plugin.
*\param name plugin name
@@ -75,10 +75,10 @@ bool PluginInfo::isGlobal()
*\param maxVersion max version for the dependence.
*/
void PluginInfo::addDependence(string name, int minVersion, int maxVersion)
-{
+{
dependences.put(name, new pair<int,int>(minVersion,maxVersion));
}
-
+
/*!
* Returns the plugin version.
*/
@@ -102,7 +102,7 @@ int PluginInfo::getMyServerMinVersion()
{
return this->msMinVersion;
}
-
+
/*!
* Returns the maximum MyServer version plugin is compatible.
@@ -121,7 +121,7 @@ int PluginInfo::setMyServerMinVersion(int v)
this->msMinVersion = v;
return this->msMinVersion;
}
-
+
/*!
* Sets the maximum MyServer version plugin is compatible.
*/
@@ -152,14 +152,14 @@ Plugin* PluginInfo::getPlugin()
*/
void PluginInfo::setEnabled(bool enabled)
{
- this->enabled = enabled;
+ this->enabled = enabled;
}
/*!
* Returns the depandence, if any exists, with a plugin with the specified
name.
*/
pair<int,int>* PluginInfo::getDependence(string name)
-{
+{
if(dependences.empty())
return NULL;
if (!this->dependences.containsKey(name))
@@ -195,29 +195,29 @@ Plugin* PluginInfo::removePlugin()
*/
int PluginInfo::convertVersion(string* s)
{
-
+
int ret = regex->exec(s->c_str(),0,NULL,0);
if (ret!=0)
- return -1;
-
+ return -1;
+
string::size_type pos = s->find(".",0);
if (pos == string::npos)
return atoi(s->c_str()) << 24;
-
+
int n1 = 0;
int n2 = 0;
int n3 = 0;
int n4 = 0;
-
+
string sa = s->substr(0,pos);
n1 = atoi(sa.c_str());
if (n1>255)
return -1;
string::size_type oldpos = pos;
-
-
+
+
if (oldpos!=string::npos)
{
pos = s->find(".",oldpos+1);
@@ -226,8 +226,8 @@ int PluginInfo::convertVersion(string* s)
if (n2>255)
return -1;
}
-
-
+
+
oldpos = pos;
if (oldpos!=string::npos)
{
@@ -237,8 +237,8 @@ int PluginInfo::convertVersion(string* s)
if (n3>255)
return -1;
}
-
-
+
+
oldpos = pos;
if (oldpos!=string::npos)
{
diff --git a/myserver/src/protocol/control/control_header.cpp
b/myserver/src/protocol/control/control_header.cpp
index 871cc1f..d11cf3e 100755
--- a/myserver/src/protocol/control/control_header.cpp
+++ b/myserver/src/protocol/control/control_header.cpp
@@ -20,7 +20,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <include/protocol/control/control_header.h>
#include <include/base/xml/xml_parser.h>
#include <include/protocol/control/control_errors.h>
-extern "C"
+extern "C"
{
#ifdef WIN32
#include <direct.h>
@@ -175,20 +175,20 @@ int ControlHeader::parse_header(char *buffer, int
bufferlen, int *len)
/*! Get the length of the field name. */
fieldLen = getCharInString(field, " ", 32);
-
+
/*! Return nonzero on errors. */
if(fieldLen == -1)
return CONTROL_MALFORMED;
- /*!
- *For first line field name is the command itself.
+ /*!
+ *For first line field name is the command itself.
*Do not copy initial /.
*/
myserver_strlcpy(command, field, std::min(fieldLen + 1 , 32) );
-
+
/*! Update the offset. */
offset += fieldLen + 1;
-
+
int versionLen = getCharInString(offset, " \r", 32);
if(versionLen == -1)
return CONTROL_MALFORMED;
@@ -255,18 +255,18 @@ int ControlHeader::parse_header(char *buffer, int
bufferlen, int *len)
myserver_strlcpy(tmp_buff, offset, std::min(len + 1 , 12));
length = atoi(tmp_buff);
offset += len + 2;
- }
+ }
else
{
int len = getCharInString(offset, "\r", 32);
if(len == -1)
return CONTROL_MALFORMED;
offset += len + 2;
- }
+ }
}
/*! Increment the nLine value for the next line parsing. */
nLine++;
-
+
/*! Do we need more than 20 lines? */
if(nLine > 20)
return CONTROL_MALFORMED;
diff --git a/myserver/src/protocol/ftp/ftp_parser.cpp
b/myserver/src/protocol/ftp/ftp_parser.cpp
index deea0ab..09fa198 100644
--- a/myserver/src/protocol/ftp/ftp_parser.cpp
+++ b/myserver/src/protocol/ftp/ftp_parser.cpp
@@ -2,20 +2,20 @@
/* A Bison parser, made by GNU Bison 2.4.1. */
/* Skeleton implementation for Bison's Yacc-like parsers in C
-
+
Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
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
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
@@ -28,7 +28,7 @@
special exception, which will cause the skeleton and the resulting
Bison output files to be licensed under the GNU General Public
License without this special exception.
-
+
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
diff --git a/myserver/src/protocol/http/dyn_http_command.cpp
b/myserver/src/protocol/http/dyn_http_command.cpp
index e988ea1..9bcae78 100755
--- a/myserver/src/protocol/http/dyn_http_command.cpp
+++ b/myserver/src/protocol/http/dyn_http_command.cpp
@@ -23,7 +23,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*Default constructor.
*/
-DynamicHttpCommand::DynamicHttpCommand(string& name)
+DynamicHttpCommand::DynamicHttpCommand(string& name)
{
this->name = name;
}
@@ -31,7 +31,7 @@ DynamicHttpCommand::DynamicHttpCommand(string& name)
/*!
*Default constructor.
*/
-string DynamicHttpCommand::getName()
+string DynamicHttpCommand::getName()
{
return name;
}
diff --git a/myserver/src/protocol/http/dyn_http_manager.cpp
b/myserver/src/protocol/http/dyn_http_manager.cpp
index d9306ea..cdaa155 100755
--- a/myserver/src/protocol/http/dyn_http_manager.cpp
+++ b/myserver/src/protocol/http/dyn_http_manager.cpp
@@ -26,7 +26,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*Default constructor.
*/
-DynamicHttpManager::DynamicHttpManager()
+DynamicHttpManager::DynamicHttpManager()
{
}
diff --git a/myserver/src/protocol/http/dyn_http_manager_list.cpp
b/myserver/src/protocol/http/dyn_http_manager_list.cpp
index 705e68a..2851569 100755
--- a/myserver/src/protocol/http/dyn_http_manager_list.cpp
+++ b/myserver/src/protocol/http/dyn_http_manager_list.cpp
@@ -27,7 +27,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
/*!
*Initialize the object.
*/
-DynHttpManagerList::DynHttpManagerList ()
+DynHttpManagerList::DynHttpManagerList ()
{
}
diff --git a/myserver/src/protocol/http/env/env.cpp
b/myserver/src/protocol/http/env/env.cpp
index a1fa59d..08bd0c8 100644
--- a/myserver/src/protocol/http/env/env.cpp
+++ b/myserver/src/protocol/http/env/env.cpp
@@ -6,7 +6,7 @@ it under the terms of the GNU General Public License as
published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
@@ -40,10 +40,10 @@ using namespace std;
*This function is used by other server side protocols too.
*\param td The HTTP thread context.
*\param cgiEnv The zero terminated list of environment string.
- *\param processEnv Specify if add current process environment
+ *\param processEnv Specify if add current process environment
*variables too.
*/
-void Env::buildEnvironmentString(HttpThreadContext* td, char *cgiEnv,
+void Env::buildEnvironmentString(HttpThreadContext* td, char *cgiEnv,
int processEnv)
{
MemBuf memCgi;
@@ -66,36 +66,36 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
#endif
/* Must use REDIRECT_STATUS for php and others. */
memCgi << end_str << "REDIRECT_STATUS=TRUE";
-
+
memCgi << end_str << "SERVER_NAME=";
memCgi << Server::getInstance()->getServerName();
-
+
memCgi << end_str << "SERVER_SIGNATURE=";
memCgi << "<address>GNU MyServer " << MYSERVER_VERSION << "</address>";
-
+
memCgi << end_str << "SERVER_PROTOCOL=";
- memCgi << td->request.ver.c_str();
-
+ memCgi << td->request.ver.c_str();
+
portBuffer.uintToStr( td->connection->getLocalPort());
memCgi << end_str << "SERVER_PORT="<< portBuffer;
memCgi << end_str << "SERVER_ADMIN=";
- memCgi << td->securityToken.getHashedData ("server.admin",
+ memCgi << td->securityToken.getHashedData ("server.admin",
MYSERVER_VHOST_CONF |
MYSERVER_SERVER_CONF, "");
memCgi << end_str << "REQUEST_METHOD=";
memCgi << td->request.cmd.c_str();
-
+
memCgi << end_str << "REQUEST_URI=";
-
+
memCgi << td->request.uri.c_str();
memCgi << end_str << "QUERY_STRING=";
memCgi << td->request.uriOpts.c_str();
-
+
memCgi << end_str << "GATEWAY_INTERFACE=CGI/1.1";
-
+
if(td->request.contentLength.length())
{
memCgi << end_str << "CONTENT_LENGTH=";
@@ -105,7 +105,7 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
{
u_long fs = 0;
ostringstream stream;
-
+
if(td->inputData.getHandle())
fs = td->inputData.getFileSize();
@@ -129,7 +129,7 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
{
rangeBuffer << td->request.rangeByteEnd;
memCgi << rangeBuffer.str();
- }
+ }
}
@@ -144,7 +144,7 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
memCgi << end_str << "REMOTE_USER=";
memCgi << td->connection->getLogin();
-
+
if(td->http->getProtocolOptions() & PROTOCOL_USES_SSL)
memCgi << end_str << "SSL=ON";
else
@@ -155,7 +155,7 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
{
memCgi << end_str << "PATH_INFO=";
memCgi << td->pathInfo;
-
+
memCgi << end_str << "PATH_TRANSLATED=";
memCgi << td->pathTranslated;
}
@@ -167,9 +167,9 @@ void Env::buildEnvironmentString(HttpThreadContext* td,
char *cgiEnv,
memCgi << end_str << "SCRIPT_FILENAME=";
memCgi << td->filenamePath;
-
+
/*
- *For the DOCUMENT_URI and SCRIPT_NAME copy the
+ *For the DOCUMENT_URI and SCRIPT_NAME copy the
*requested uri without the pathInfo.
*/
memCgi << end_str << "SCRIPT_NAME=";
@@ -230,14 +230,14 @@ void Env::buildHttpHeaderEnvString(MemBuf& memCgi,
HttpRequestHeader & req)
{
HttpRequestHeader::Entry* en = *it;
string name;
-
+
name.assign("HTTP_");
name.append(en->name->c_str());
transform(name.begin()+5, name.end(), name.begin()+5, ::toupper);
for(int i = name.length(); i > 5; i--)
if(name[i] == '-')
name[i] = '_';
-
+
memCgi << end_str << name.c_str() << "=" << en->value->c_str();
}
}
@@ -248,13 +248,13 @@ void Env::buildHttpHeaderEnvString(MemBuf& memCgi,
HttpRequestHeader & req)
void Env::buildProcessEnvString(MemBuf& memCgi)
{
#ifdef WIN32
- LPTSTR lpszVariable;
- LPVOID lpvEnv;
+ LPTSTR lpszVariable;
+ LPVOID lpvEnv;
lpvEnv = Server::getInstance()->getEnvString();
memCgi << end_str;
if (lpvEnv)
- for (lpszVariable = (LPTSTR) lpvEnv; *lpszVariable; lpszVariable++)
- {
+ for (lpszVariable = (LPTSTR) lpvEnv; *lpszVariable; lpszVariable++)
+ {
if(((char*)lpszVariable)[0] != '=' )
{
memCgi << (char*)lpszVariable << end_str;
diff --git a/myserver/src/protocol/http/http.cpp
b/myserver/src/protocol/http/http.cpp
index a86ce26..2f38639 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -280,7 +280,7 @@ int Http::getFilePermissions (string& filename, string&
directory, string& file,
if (FilesUtility::isLink (td->filenamePath.c_str ()))
{
- const char *perm = td->securityToken.getHashedData
("symlinks.follow",
+ const char *perm = td->securityToken.getHashedData
("symlinks.follow",
MYSERVER_VHOST_CONF | MYSERVER_SERVER_CONF,
"NO");
if (!perm || strcmpi (perm, "YES"))
diff --git a/myserver/src/protocol/http/http_data_handler.cpp
b/myserver/src/protocol/http/http_data_handler.cpp
index 97daa19..8d37368 100644
--- a/myserver/src/protocol/http/http_data_handler.cpp
+++ b/myserver/src/protocol/http/http_data_handler.cpp
@@ -6,7 +6,7 @@ it under the terms of the GNU General Public License as
published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/myserver/src/protocol/http/http_data_read.cpp
b/myserver/src/protocol/http/http_data_read.cpp
index afb3744..d8e17f3 100644
--- a/myserver/src/protocol/http/http_data_read.cpp
+++ b/myserver/src/protocol/http/http_data_read.cpp
@@ -223,7 +223,7 @@ int HttpDataRead::readChunkedPostData(const char* inBuffer,
*\param td The Active thread context.
*\param httpRetCode The HTTP error to report to the client.
*\return Return 0 on success.
- *\return Return -1 on irreversible error and
+ *\return Return -1 on irreversible error and
* the connection should be removed immediately.
*\return Any other value is a protocol error specified in HTTPRETCODE.
*/
diff --git a/myserver/src/protocol/http/http_request.cpp
b/myserver/src/protocol/http/http_request.cpp
index fff336f..a9dc63b 100755
--- a/myserver/src/protocol/http/http_request.cpp
+++ b/myserver/src/protocol/http/http_request.cpp
@@ -102,57 +102,57 @@ string* HttpRequestHeader::getValue(const char* name,
string* out)
if(out)
out->assign(cmd.c_str());
return &cmd;
- }
+ }
if(!strcmpi(name, "ver"))
- {
+ {
if(out)
- out->assign(ver.c_str());
+ out->assign(ver.c_str());
return &ver;
}
-
+
if(!strcmpi(name, "uri"))
- {
+ {
if(out)
- out->assign(uri.c_str());
+ out->assign(uri.c_str());
return &uri;
- }
-
+ }
+
if(!strcmpi(name, "uriOpts"))
- {
+ {
if(out)
out->assign(uriOpts.c_str());
return &uriOpts;
- }
+ }
if(!strcmpi(name, "Authorization"))
- {
+ {
if(out)
- out->assign(auth.c_str());
+ out->assign(auth.c_str());
return &auth;
}
-
+
if(!strcmpi(name, "Content-Length"))
- {
+ {
if(out)
- out->assign(contentLength.c_str());
+ out->assign(contentLength.c_str());
return &contentLength;
- }
+ }
if(!strcmpi(name, "rangeType"))
- {
+ {
if(out)
- out->assign(rangeType.c_str());
+ out->assign(rangeType.c_str());
return &rangeType;
- }
-
+ }
+
if(!strcmpi(name, "rangeByteBegin"))
{
ostringstream s;
s << rangeByteBegin;
if(out)
out->assign(s.str());
- return 0;
+ return 0;
}
if(!strcmpi(name, "rangeByteEnd"))
@@ -161,7 +161,7 @@ string* HttpRequestHeader::getValue(const char* name,
string* out)
s << rangeByteEnd;
if(out)
out->assign(s.str());
- return 0;
+ return 0;
}
{
@@ -169,7 +169,7 @@ string* HttpRequestHeader::getValue(const char* name,
string* out)
if(e)
{
if(out)
- out->assign(*(e->value));
+ out->assign(*(e->value));
return (e->value);
}
return 0;
@@ -188,54 +188,54 @@ string* HttpRequestHeader::setValue(const char* name,
const char* in)
{
cmd.assign(in);
return &cmd;
- }
+ }
if(!strcmpi(name, "ver"))
- {
+ {
ver.assign(in);
return &ver;
}
-
+
if(!strcmpi(name, "uri"))
- {
+ {
uri.assign(in);
return &uri;
- }
-
+ }
+
if(!strcmpi(name, "uriOpts"))
- {
+ {
uriOpts.assign(in);
return &uriOpts;
- }
+ }
if(!strcmpi(name, "Authorization"))
- {
+ {
auth.assign(in);
return &auth;
}
-
+
if(!strcmpi(name, "Content-Length"))
- {
+ {
contentLength.assign(in);
return &contentLength;
- }
+ }
if(!strcmpi(name, "rangeType"))
- {
+ {
rangeType.assign(in);
return &rangeType;
- }
-
+ }
+
if(!strcmpi(name, "rangeByteBegin"))
{
rangeByteBegin = atoi(in);
- return 0;
+ return 0;
}
if(!strcmpi(name, "rangeByteEnd"))
{
rangeByteEnd = atoi(in);
- return 0;
+ return 0;
}
{
diff --git a/myserver/src/protocol/http/http_response.cpp
b/myserver/src/protocol/http/http_response.cpp
index 03ab770..b6876d3 100755
--- a/myserver/src/protocol/http/http_response.cpp
+++ b/myserver/src/protocol/http/http_response.cpp
@@ -46,7 +46,7 @@ HttpResponseHeader::~HttpResponseHeader()
*/
void HttpResponseHeader::free()
{
- ver.clear();
+ ver.clear();
serverName.clear();
contentType.clear();
connection.clear();
@@ -55,7 +55,7 @@ void HttpResponseHeader::free()
contentLength.clear();
errorType.clear();
location.clear();
- date.clear();
+ date.clear();
auth.clear();
dateExp.clear();
{
@@ -78,89 +78,89 @@ string* HttpResponseHeader::getValue(const char* name,
string* out)
if(out)
out->assign(ver.c_str());
return &ver;
- }
+ }
if(!strcmpi(name, "Server"))
- {
+ {
if(out)
- out->assign(serverName.c_str());
+ out->assign(serverName.c_str());
return &ver;
}
if(!strcmpi(name, "Content-Type"))
- {
+ {
if(out)
- out->assign(contentType.c_str());
+ out->assign(contentType.c_str());
return &contentType;
}
if(!strcmpi(name, "Connection"))
- {
+ {
if(out)
- out->assign(connection.c_str());
+ out->assign(connection.c_str());
return &connection;
}
if(!strcmpi(name, "Content-Type"))
- {
+ {
if(out)
- out->assign(contentType.c_str());
+ out->assign(contentType.c_str());
return &contentType;
}
if(!strcmpi(name, "MIME-Version"))
- {
+ {
if(out)
- out->assign(mimeVer.c_str());
+ out->assign(mimeVer.c_str());
return &mimeVer;
}
if(!strcmpi(name, "Cookie"))
- {
+ {
if(out)
- out->assign(cookie.c_str());
+ out->assign(cookie.c_str());
return &cookie;
}
if(!strcmpi(name, "Content-Length"))
- {
+ {
if(out)
- out->assign(contentLength.c_str());
+ out->assign(contentLength.c_str());
return &contentLength;
}
if(!strcmpi(name, "Last-Modified"))
- {
+ {
if(out)
- out->assign(lastModified.c_str());
+ out->assign(lastModified.c_str());
return &lastModified;
}
if(!strcmpi(name, "Location"))
- {
+ {
if(out)
- out->assign(location.c_str());
+ out->assign(location.c_str());
return &location;
}
if(!strcmpi(name, "Date"))
- {
+ {
if(out)
- out->assign(date.c_str());
+ out->assign(date.c_str());
return &date;
}
if(!strcmpi(name, "Date-Expires"))
- {
+ {
if(out)
- out->assign(dateExp.c_str());
+ out->assign(dateExp.c_str());
return &dateExp;
}
if(!strcmpi(name, "WWW-Authenticate"))
- {
+ {
if(out)
- out->assign(auth.c_str());
+ out->assign(auth.c_str());
return &auth;
}
@@ -174,7 +174,7 @@ string* HttpResponseHeader::getValue(const char* name,
string* out)
}
return 0;
}
-}
+}
/*!
@@ -186,76 +186,76 @@ string* HttpResponseHeader::setValue(const char* name,
const char* in)
{
ver.assign(in);
return &ver;
- }
+ }
if(!strcmpi(name, "Server"))
- {
+ {
serverName.assign(in);
return &ver;
}
if(!strcmpi(name, "Content-Type"))
- {
+ {
contentType.assign(in);
return &contentType;
}
if(!strcmpi(name, "Connection"))
- {
+ {
connection.assign(in);
return &connection;
}
if(!strcmpi(name, "Content-Type"))
- {
+ {
contentType.assign(in);
return &contentType;
}
if(!strcmpi(name, "MIME-Version"))
- {
+ {
mimeVer.assign(in);
return &mimeVer;
}
if(!strcmpi(name, "Cookie"))
- {
+ {
cookie.assign(in);
return &cookie;
}
if(!strcmpi(name, "Content-Length"))
- {
+ {
contentLength.assign(in);
return &contentLength;
}
if(!strcmpi(name, "Last-Modified"))
- {
+ {
lastModified.assign(in);
return &lastModified;
}
if(!strcmpi(name, "Location"))
- {
+ {
location.assign(in);
return &location;
}
if(!strcmpi(name, "Date"))
- {
+ {
date.assign(in);
return &date;
}
if(!strcmpi(name, "Date-Expires"))
- {
+ {
dateExp.assign(in);
return &dateExp;
}
if(!strcmpi(name, "WWW-Authenticate"))
- {
+ {
auth.assign(in);
return &auth;
}
@@ -277,7 +277,7 @@ string* HttpResponseHeader::setValue(const char* name,
const char* in)
return 0;
}
-}
+}
/*!
*Get the kind of HTTP status code specified by the httpStatus variable.
@@ -290,12 +290,12 @@ int HttpResponseHeader::getStatusType()
if (httpStatus < 300)
return HttpResponseHeader::SUCCESSFUL;
-
+
if (httpStatus < 400)
return HttpResponseHeader::REDIRECTION;
if (httpStatus < 500)
return HttpResponseHeader::CLIENT_ERROR;
-
+
return HttpResponseHeader::SERVER_ERROR;
}
diff --git a/myserver/src/protocol/https/https.cpp
b/myserver/src/protocol/https/https.cpp
index 196519d..e066ff5 100755
--- a/myserver/src/protocol/https/https.cpp
+++ b/myserver/src/protocol/https/https.cpp
@@ -18,7 +18,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <include/protocol/protocol.h>
#include <include/protocol/https/https.h>
-extern "C"
+extern "C"
{
#ifdef WIN32
#include <direct.h>
@@ -32,7 +32,7 @@ extern "C"
/*!
- *Returns the name of the protocol. If an out buffer is defined
+ *Returns the name of the protocol. If an out buffer is defined
*fullfill it with the name too.
*/
char* Https::registerNameImpl(char* out, int len)
@@ -52,7 +52,7 @@ char* Https::registerName(char* out, int len)
/*!
*Https class constructor.
*/
-Https::Https()
+Https::Https()
{
protocolPrefix.assign("https://";);
protocolOptions = PROTOCOL_USES_SSL;
diff --git a/myserver/src/protocol/protocol.cpp
b/myserver/src/protocol/protocol.cpp
index 573e6cc..f73095d 100755
--- a/myserver/src/protocol/protocol.cpp
+++ b/myserver/src/protocol/protocol.cpp
@@ -44,7 +44,7 @@ int Protocol::controlConnection (ConnectionPtr /*a*/,char*
/*b1*/,
}
/*!
- * Returns the name of the protocol. If an out buffer is
+ * Returns the name of the protocol. If an out buffer is
* defined fullfill it with the name too.
*/
char* Protocol::registerName (char* /*out*/,int /*len*/)
diff --git a/myserver/src/protocol/protocol_buffer.cpp
b/myserver/src/protocol/protocol_buffer.cpp
index 10a0d67..f8186a6 100644
--- a/myserver/src/protocol/protocol_buffer.cpp
+++ b/myserver/src/protocol/protocol_buffer.cpp
@@ -34,7 +34,7 @@ ProtocolBuffer::~ProtocolBuffer()
}
/*!
- *Check if the protocol allows the connection to be removed.
+ *Check if the protocol allows the connection to be removed.
*\param wait Define if the protocol can wait that the current job is
*finished before.
*/
diff --git a/myserver/src/protocol/protocols_manager.cpp
b/myserver/src/protocol/protocols_manager.cpp
index 7bc933d..ff3fc5b 100755
--- a/myserver/src/protocol/protocols_manager.cpp
+++ b/myserver/src/protocol/protocols_manager.cpp
@@ -19,7 +19,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <include/protocol/protocols_manager.h>
#include <string>
#include <algorithm>
-#include <cctype>
+#include <cctype>
/*!
* Class constructor.
diff --git a/myserver/src/server/server.cpp b/myserver/src/server/server.cpp
index f5f296b..7e4454e 100644
--- a/myserver/src/server/server.cpp
+++ b/myserver/src/server/server.cpp
@@ -19,11 +19,9 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
#include <include/server/server.h>
#include <include/server/clients_thread.h>
#include <include/base/safetime/safetime.h>
-
-/*! Include headers for built-in protocols. */
-#include <include/protocol/http/http.h> /*Include the HTTP protocol. */
-#include <include/protocol/https/https.h> /*Include the HTTPS protocol. */
-#include <include/protocol/control/control_protocol.h> /*Include the control
protocol. */
+#include <include/protocol/http/http.h>
+#include <include/protocol/https/https.h>
+#include <include/protocol/control/control_protocol.h>
#include <include/protocol/ftp/ftp.h>
#include <include/base/string/stringutils.h>
#include <include/base/socket/socket.h>
@@ -140,9 +138,9 @@ bool Server::resetConfigurationPaths (string &mainConf,
string &mimeConf,
}
/*!
- *Check that the configuration paths are not empty, otherwise fall back to
- *the default ones.
- *Returns nonzero on error.
+ *Check that the configuration paths are not empty, otherwise fall back to
+ * the default ones.
+ * Returns nonzero on error.
*/
int Server::checkConfigurationPaths ()
{
@@ -183,8 +181,8 @@ int Server::checkConfigurationPaths ()
}
/*!
- *Copy a configuration file from the default one.
- *Return nonzero on errors.
+ * Copy a configuration file from the default one.
+ * Return nonzero on errors.
*/
int Server::copyConfigurationFromDefault (const char *fileName)
{
@@ -220,22 +218,20 @@ int Server::copyConfigurationFromDefault (const char
*fileName)
/*!
- *Load here all the libraries.
+ * Load here all the libraries.
*/
int Server::loadLibraries ()
{
Process::initialize ();
-
- XmlParser::startXML();
+ XmlParser::startXML ();
myserver_safetime_init ();
gnutls_global_init ();
-
if (Socket::startupSocketLib () != 0)
- {
- logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error loading the socket library"));
- return 1;
- }
+ {
+ logWriteln (MYSERVER_LOG_MSG_ERROR, _("Error loading the socket
library"));
+ return 1;
+ }
return 0;
}
@@ -294,9 +290,6 @@ void Server::start (string &mainConf, string &mimeConf,
string &vhostConf,
if (loadLibraries ())
return;
- /*
- * Setup the server configuration.
- */
logWriteln (MYSERVER_LOG_MSG_INFO, _("Initializing server
configuration..."));
if (!resetConfigurationPaths (mainConf, mimeConf, vhostConf, externPath))
@@ -443,7 +436,7 @@ int Server::postLoad ()
}
/*!
- *Load the plugins.
+ * Load the plugins.
*/
void Server::loadPlugins ()
{
@@ -614,7 +607,7 @@ void Server::logWriteNTimes (string str, unsigned n)
}
/*!
- *Display the MyServer boot.
+ * Display the MyServer boot.
*/
void Server::displayBoot ()
{
@@ -635,7 +628,7 @@ void Server::displayBoot ()
#endif /* CLEAR_BOOT_SCREEN. */
/*
- *Print the MyServer signature only if the log writes to the console.
+ * Print the MyServer signature only if the log writes to the console.
*/
if (logLocation.find ("console://") != string::npos)
{
@@ -669,8 +662,8 @@ void Server::displayBoot ()
}
/*!
- *Removed threads that can be destroyed.
- *The function returns the number of threads that were destroyed.
+ * Removed threads that can be destroyed.
+ * The function returns the number of threads that were destroyed.
*/
int Server::purgeThreads ()
{
@@ -724,7 +717,7 @@ int Server::purgeThreads ()
}
/*!
- *Do the final cleanup. Called once when the process is terminated.
+ * Do the final cleanup. Called once when the process is terminated.
*/
void Server::finalCleanup ()
{
@@ -734,7 +727,7 @@ void Server::finalCleanup ()
}
/*!
- *Return the user identifier to use for the process.
+ * Return the user identifier to use for the process.
*/
const char *Server::getUid ()
{
@@ -742,7 +735,7 @@ const char *Server::getUid ()
}
/*!
- *Return the group identifier to use for the process.
+ * Return the group identifier to use for the process.
*/
const char *Server::getGid ()
{
@@ -750,7 +743,7 @@ const char *Server::getGid ()
}
/*!
- *Returns the numbers of active connections the list.
+ * Returns the numbers of active connections the list.
*/
u_long Server::getNumConnections ()
{
@@ -758,7 +751,7 @@ u_long Server::getNumConnections ()
}
/*!
- *Returns the numbers of all the connections to the server.
+ * Returns the numbers of all the connections to the server.
*/
u_long Server::getNumTotalConnections ()
{
@@ -766,7 +759,7 @@ u_long Server::getNumTotalConnections ()
}
/*!
- *Get the verbosity value.
+ * Get the verbosity value.
*/
u_long Server::getVerbosity ()
{
@@ -774,7 +767,7 @@ u_long Server::getVerbosity ()
}
/*!
- *Set the verbosity value.
+ * Set the verbosity value.
*/
void Server::setVerbosity (u_long nv)
{
@@ -782,7 +775,7 @@ void Server::setVerbosity (u_long nv)
}
/*!
- *Return a home directory object.
+ * Return a home directory object.
*/
HomeDir* Server::getHomeDir ()
{
@@ -790,7 +783,7 @@ HomeDir* Server::getHomeDir ()
}
/*!
- *Stop the execution of the server.
+ * Stop the execution of the server.
*/
void Server::stop ()
{
@@ -798,8 +791,8 @@ void Server::stop ()
}
/*!
- *Unload the server.
- *Return nonzero on errors.
+ * Unload the server.
+ * Return nonzero on errors.
*/
int Server::terminate ()
{
@@ -851,7 +844,7 @@ int Server::terminate ()
#ifdef WIN32
/*
- *Under WIN32 cleanup environment strings.
+ * Under WIN32 cleanup environment strings.
*/
FreeEnvironmentStrings ((LPTSTR)envString);
#endif
@@ -869,7 +862,7 @@ int Server::terminate ()
globalData.clear ();
/*
- *Free all the threads.
+ * Free all the threads.
*/
threadsMutex->lock ();
threads.clear ();
@@ -897,9 +890,9 @@ XmlParser *Server::getXmlConfiguration ()
/*!
- *Here is loaded the configuration of the server.
- *The configuration file is a XML file.
- *Return nonzero on errors.
+ * Here is loaded the configuration of the server.
+ * The configuration file is a XML file.
+ * Return nonzero on errors.
*/
int Server::initialize ()
{
@@ -1051,7 +1044,7 @@ int Server::initialize ()
}
/*!
- *Read the values defined in the global configuration file.
+ * Read the values defined in the global configuration file.
*/
void Server::readHashedData (xmlNodePtr lcur)
{
@@ -1062,8 +1055,8 @@ void Server::readHashedData (xmlNodePtr lcur)
/*!
- *Check if there are free threads to handle a new request. If there
- *are not enough threads create a new one.
+ * Check if there are free threads to handle a new request. If there
+ * are not enough threads create a new one.
*/
void Server::checkThreadsNumber ()
{
@@ -1080,7 +1073,7 @@ void Server::checkThreadsNumber ()
}
/*!
- *Get the default throttling rate to use with connections to the server.
+ * Get the default throttling rate to use with connections to the server.
*/
u_long Server::getThrottlingRate ()
{
@@ -1088,8 +1081,8 @@ u_long Server::getThrottlingRate ()
}
/*!
- *This function returns the max size of the logs file as defined in the
- *configuration file.
+ * This function returns the max size of the logs file as defined in the
+ * configuration file.
*/
int Server::getMaxLogFileSize ()
{
@@ -1097,7 +1090,7 @@ int Server::getMaxLogFileSize ()
}
/*!
- *Returns the connection timeout.
+ * Returns the connection timeout.
*/
u_long Server::getTimeout ()
{
@@ -1105,7 +1098,7 @@ u_long Server::getTimeout ()
}
/*!
- *This function add a new connection to the list.
+ * This function add a new connection to the list.
*/
int Server::addConnection (Socket s, MYSERVER_SOCKADDRIN *asockIn)
{
@@ -1119,13 +1112,13 @@ int Server::addConnection (Socket s,
MYSERVER_SOCKADDRIN *asockIn)
int dim;
/*
- *We can use MAX_IP_STRING_LEN only because we use NI_NUMERICHOST
- *in getnameinfo call; Otherwise we should have used NI_MAXHOST.
- *ip is the string containing the address of the remote host connecting
- *to the server.
- *localIp is the local address used by the connection.
- *port is the remote port used by the client to open the connection.
- *myPort is the port used by the server to listen.
+ * We can use MAX_IP_STRING_LEN only because we use NI_NUMERICHOST
+ * in getnameinfo call; Otherwise we should have used NI_MAXHOST.
+ * ip is the string containing the address of the remote host connecting
+ * to the server.
+ * localIp is the local address used by the connection.
+ * port is the remote port used by the client to open the connection.
+ * myPort is the port used by the server to listen.
*/
if ( asockIn == NULL ||
(asockIn->ss_family != AF_INET && asockIn->ss_family != AF_INET6))
@@ -1138,11 +1131,12 @@ int Server::addConnection (Socket s,
MYSERVER_SOCKADDRIN *asockIn)
return 0;
/*
- *Do not accept this connection if a MAX_CONNECTIONS_TO_ACCEPT limit is
- *defined.
+ * Do not accept this connection if a MAX_CONNECTIONS_TO_ACCEPT limit is
+ * defined.
*/
- if (maxConnectionsToAccept &&
- ((u_long)connectionsScheduler.getConnectionsNumber () >=
maxConnectionsToAccept))
+ if (maxConnectionsToAccept
+ && ((u_long)connectionsScheduler.getConnectionsNumber ()
+ >= maxConnectionsToAccept))
return 0;
#if ( HAVE_IPV6 )
@@ -1213,7 +1207,7 @@ int Server::addConnection (Socket s, MYSERVER_SOCKADDRIN
*asockIn)
}
/*!
- *Return the max number of threads that the server can start.
+ * Return the max number of threads that the server can start.
*/
int Server::getMaxThreads ()
{
@@ -1221,7 +1215,7 @@ int Server::getMaxThreads ()
}
/*!
- *Add a new connection.
+ * Add a new connection.
*A connection is defined using a connection struct.
*/
ConnectionPtr Server::addConnectionToList (Socket* s,
@@ -1776,8 +1770,8 @@ int Server::addThread (bool staticThread)
}
/*!
- *Remove a thread.
- *Return zero if a thread was removed.
+ * Remove a thread.
+ * Return zero if a thread was removed.
*/
int Server::removeThread (u_long ID)
{
@@ -1814,9 +1808,9 @@ int Server::removeThread (u_long ID)
}
/*!
- *Create the class instance. Call this before use
- *the Server class. The instance is not created in
- *getInstance to have a faster inline function.
+ * Create the class instance. Call this before use
+ * the Server class. The instance is not created in
+ * getInstance to have a faster inline function.
*/
void Server::createInstance ()
{
@@ -1825,7 +1819,7 @@ void Server::createInstance ()
}
/*!
- *Get a pointer to a filters factory object.
+ * Get a pointer to a filters factory object.
*/
FiltersFactory* Server::getFiltersFactory ()
{
@@ -1833,7 +1827,7 @@ FiltersFactory* Server::getFiltersFactory ()
}
/*!
- *Check how many threads are not working.
+ * Check how many threads are not working.
*/
int Server::countAvailableThreads ()
{
@@ -1899,7 +1893,7 @@ Server::setLogLocation (string location)
}
/*!
- *Get the size for the first buffer.
+ * Get the size for the first buffer.
*/
u_long Server::getBuffersize ()
{
@@ -1915,7 +1909,7 @@ u_long Server::getBuffersize2 ()
}
/*!
- *Set a global descriptor.
+ * Set a global descriptor.
*/
void Server::setGlobalData (const char* name, void* data)
{
@@ -1924,7 +1918,7 @@ void Server::setGlobalData (const char* name, void* data)
}
/*!
- *Get a global descriptor.
+ * Get a global descriptor.
*/
void* Server::getGlobalData (const char* name)
{
diff --git a/myserver/tests/main.cpp b/myserver/tests/main.cpp
index 9827712..b6e974d 100644
--- a/myserver/tests/main.cpp
+++ b/myserver/tests/main.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_auth_domain.cpp
b/myserver/tests/test_auth_domain.cpp
index 5bd274e..1bbe25e 100644
--- a/myserver/tests/test_auth_domain.cpp
+++ b/myserver/tests/test_auth_domain.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -34,7 +34,7 @@ class TestAuthDomain : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE( TestAuthDomain );
CPPUNIT_TEST( testGetName );
CPPUNIT_TEST_SUITE_END();
-
+
SecurityToken *secToken;
AuthDomain* authDomain;
public:
diff --git a/myserver/tests/test_base64.cpp b/myserver/tests/test_base64.cpp
index 4bf54f9..b719a4e 100644
--- a/myserver/tests/test_base64.cpp
+++ b/myserver/tests/test_base64.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_bitvec.cpp b/myserver/tests/test_bitvec.cpp
index 1c26f8d..d34dcda 100644
--- a/myserver/tests/test_bitvec.cpp
+++ b/myserver/tests/test_bitvec.cpp
@@ -5,16 +5,16 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include <cppunit/CompilerOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h>
@@ -26,21 +26,21 @@
class TestBitVec : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE ( TestBitVec );
-
+
CPPUNIT_TEST ( testSet );
CPPUNIT_TEST ( testGet );
CPPUNIT_TEST ( testFfs );
CPPUNIT_TEST ( testFind );
CPPUNIT_TEST ( testRevert );
CPPUNIT_TEST ( testInit );
-
+
CPPUNIT_TEST_SUITE_END ();
public:
void setUp ()
{
}
-
+
void tearDown ()
{
}
@@ -56,7 +56,7 @@ public:
vec.init (i, false);
CPPUNIT_ASSERT_EQUAL (vec.getCapacity (), i);
}
-
+
}
void testFfs ()
@@ -86,7 +86,7 @@ public:
vec.unset (0);
CPPUNIT_ASSERT_EQUAL (vec.get (0), false);
}
-
+
void testGet ()
{
diff --git a/myserver/tests/test_cached_file.cpp
b/myserver/tests/test_cached_file.cpp
index 105055f..ce9bd24 100644
--- a/myserver/tests/test_cached_file.cpp
+++ b/myserver/tests/test_cached_file.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -37,7 +37,7 @@ class TestCachedFile : public CppUnit::TestFixture
CPPUNIT_TEST(testRead);
CPPUNIT_TEST_SUITE_END();
-
+
CachedFileBuffer *cfb;
CachedFile *cf;
@@ -86,7 +86,7 @@ public:
{
CPPUNIT_ASSERT(cf->writeToFile(NULL, 0, NULL));
}
-
+
void testRead()
{
u_long nbr = 0;
diff --git a/myserver/tests/test_cached_file_buffer.cpp
b/myserver/tests/test_cached_file_buffer.cpp
index 3616936..ee07dbf 100644
--- a/myserver/tests/test_cached_file_buffer.cpp
+++ b/myserver/tests/test_cached_file_buffer.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -34,7 +34,7 @@ class TestCachedFileBuffer : public CppUnit::TestFixture
CPPUNIT_TEST(testFactoryToNotify);
CPPUNIT_TEST(testRefCounter);
CPPUNIT_TEST_SUITE_END();
-
+
CachedFileBuffer *cfb;
public:
void setUp()
@@ -58,7 +58,7 @@ public:
void testFactoryToNotify()
{
CachedFileFactory cff;
-
+
cfb->setFactoryToNotify(&cff);
CPPUNIT_ASSERT_EQUAL(cfb->getFactoryToNotify(), &cff);
diff --git a/myserver/tests/test_cached_file_factory.cpp
b/myserver/tests/test_cached_file_factory.cpp
index 036c3b3..7830d3f 100644
--- a/myserver/tests/test_cached_file_factory.cpp
+++ b/myserver/tests/test_cached_file_factory.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_connection.cpp
b/myserver/tests/test_connection.cpp
index b01a555..8786ecc 100644
--- a/myserver/tests/test_connection.cpp
+++ b/myserver/tests/test_connection.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_connections_scheduler.cpp
b/myserver/tests/test_connections_scheduler.cpp
index a62c76b..16f4011 100644
--- a/myserver/tests/test_connections_scheduler.cpp
+++ b/myserver/tests/test_connections_scheduler.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -134,7 +134,7 @@ public:
conn->socket = new MockSocket((FileHandle) i);
scheduler->addWaitingConnection(conn);
}
-
+
scheduler->accept(&visitor, arg);
CPPUNIT_ASSERT_EQUAL(arg, visitor.getArg());
@@ -145,7 +145,7 @@ public:
{
ConnectionPtr conn = new Connection;
conn->socket = new MockSocket((FileHandle) 1);
-
+
list<ConnectionPtr> out;
scheduler->getConnections(out);
@@ -154,7 +154,7 @@ public:
conn = new Connection;
conn->socket = new MockSocket((FileHandle) 2);
-
+
scheduler->addWaitingConnection(conn);
scheduler->getConnections(out);
@@ -216,7 +216,7 @@ public:
scheduler->addWaitingConnection(conn);
CPPUNIT_ASSERT_EQUAL(scheduler->getConnectionsNumber(), 1ul);
-
+
scheduler->removeConnection(conn);
CPPUNIT_ASSERT_EQUAL(scheduler->getNumTotalConnections(), 0ul);
diff --git a/myserver/tests/test_file.cpp b/myserver/tests/test_file.cpp
index 14b7da7..e4c1d9b 100644
--- a/myserver/tests/test_file.cpp
+++ b/myserver/tests/test_file.cpp
@@ -5,16 +5,16 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include <cppunit/CompilerOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h>
@@ -35,7 +35,7 @@ class TestFile : public CppUnit::TestFixture
{
File *tfile;
string fname;
-
+
CPPUNIT_TEST_SUITE ( TestFile );
CPPUNIT_TEST ( testCreateTemporaryFile );
@@ -51,19 +51,19 @@ public:
FilesUtility::temporaryFileName (0, fname);
tfile = new File;
}
-
+
void tearDown ()
{
delete tfile;
}
-
+
void testCreateTemporaryFile ()
{
CPPUNIT_ASSERT_EQUAL (tfile->createTemporaryFile (fname.c_str()), 0);
-
+
CPPUNIT_ASSERT_EQUAL (tfile->close (), 0);
}
-
+
void testOnFile ()
{
char buf[] = { 'H', 'e', 'l', 'l', 'o', ',', ' ', 'm', 'y', 'W', 'o', 'r',
'l', 'd', 0 };
@@ -71,12 +71,12 @@ public:
u_long nbw;
u_long nbr;
- CPPUNIT_ASSERT_EQUAL (tfile->openFile (fname.c_str (), File::WRITE |
- File::READ |
+ CPPUNIT_ASSERT_EQUAL (tfile->openFile (fname.c_str (), File::WRITE |
+ File::READ |
File::FILE_CREATE_ALWAYS), 0);
CPPUNIT_ASSERT_EQUAL (tfile->writeToFile (buf, bufLen, &nbw), 0);
-
+
memset (buf, 0, bufLen);
CPPUNIT_ASSERT_EQUAL (tfile->seek (0), 0);
@@ -108,8 +108,8 @@ public:
CPPUNIT_ASSERT_EQUAL (FilesUtility::deleteFile (fname.c_str ()), 0);
- CPPUNIT_ASSERT_EQUAL (tfile->openFile (fname.c_str (), File::WRITE |
- File::READ |
+ CPPUNIT_ASSERT_EQUAL (tfile->openFile (fname.c_str (), File::WRITE |
+ File::READ |
File::FILE_CREATE_ALWAYS), 0);
CPPUNIT_ASSERT_EQUAL (tfile->getFileSize (), 0ul);
diff --git a/myserver/tests/test_file_stream.cpp
b/myserver/tests/test_file_stream.cpp
index 34a9804..e24ed34 100644
--- a/myserver/tests/test_file_stream.cpp
+++ b/myserver/tests/test_file_stream.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -108,7 +108,7 @@ public:
oss.str ("message2");
oss << endl;
message2.assign (oss.str ());
-
+
FilesUtility::deleteFile ("foo");
ls = fsc->create (ff, "foo", filters, 0);
CPPUNIT_ASSERT (ls);
@@ -129,7 +129,7 @@ public:
CPPUNIT_ASSERT_EQUAL (nbr, (u_long)(message1.length () + message2.length
()));
CPPUNIT_ASSERT (!string (buf).compare (message1.append (message2)));
}
-
+
void tearDown ()
{
delete ff;
diff --git a/myserver/tests/test_file_stream_creator.cpp
b/myserver/tests/test_file_stream_creator.cpp
index 703013b..28366ad 100644
--- a/myserver/tests/test_file_stream_creator.cpp
+++ b/myserver/tests/test_file_stream_creator.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -39,7 +39,7 @@ public:
fsc = new FileStreamCreator ();
ff = new FiltersFactory ();
}
-
+
void testCreation ()
{
list<string> filters;
@@ -50,7 +50,7 @@ public:
delete ls;
FilesUtility::deleteFile ("foo");
}
-
+
void tearDown ()
{
delete fsc;
diff --git a/myserver/tests/test_files_utility.cpp
b/myserver/tests/test_files_utility.cpp
index d12d82e..029e61e 100644
--- a/myserver/tests/test_files_utility.cpp
+++ b/myserver/tests/test_files_utility.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -36,7 +36,7 @@ class TestFilesUtility : public CppUnit::TestFixture
CPPUNIT_TEST( testGetFileExt );
CPPUNIT_TEST_SUITE_END();
-
+
public:
void setUp() {}
void tearDown() {}
diff --git a/myserver/tests/test_filter_chain.cpp
b/myserver/tests/test_filter_chain.cpp
index c69afb0..01a4793 100644
--- a/myserver/tests/test_filter_chain.cpp
+++ b/myserver/tests/test_filter_chain.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -45,7 +45,7 @@ class TestFilterChain : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE_END();
FiltersChain *fc;
-
+
public:
void setUp()
{
@@ -140,7 +140,7 @@ public:
CPPUNIT_ASSERT(fc->isEmpty() != 0);
}
-
+
void testIsFilterPresent()
{
u_long nbw;
diff --git a/myserver/tests/test_fork_server.cpp
b/myserver/tests/test_fork_server.cpp
index 3bffabc..bd3c9fa 100644
--- a/myserver/tests/test_fork_server.cpp
+++ b/myserver/tests/test_fork_server.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -36,7 +36,7 @@ class TestForkServer : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE_END();
ForkServer *fs;
-
+
public:
void setUp()
{
@@ -54,7 +54,7 @@ public:
CPPUNIT_ASSERT_EQUAL (fs->isInitialized (), false);
int ret = fs->startForkServer ();
-
+
CPPUNIT_ASSERT_EQUAL (ret, 0);
CPPUNIT_ASSERT_EQUAL (fs->isInitialized (), true);
@@ -78,7 +78,7 @@ public:
Pipe pipe;
pipe.create();
-
+
spi.stdIn = -1;
spi.stdError = -1;
spi.stdOut = pipe.getWriteHandle();
diff --git a/myserver/tests/test_ftp.cpp b/myserver/tests/test_ftp.cpp
index 2696020..fea5df8 100644
--- a/myserver/tests/test_ftp.cpp
+++ b/myserver/tests/test_ftp.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_gzip.cpp b/myserver/tests/test_gzip.cpp
index 920a3af..24d807d 100644
--- a/myserver/tests/test_gzip.cpp
+++ b/myserver/tests/test_gzip.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -27,7 +27,7 @@ class TestGzip : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE( TestGzip );
CPPUNIT_TEST( testGzipCompression );
CPPUNIT_TEST_SUITE_END();
-
+
public:
void setUp() {}
void tearDown() {}
@@ -39,10 +39,10 @@ public:
char szDecompressed[64];
gzip.compress(szTest, 64, szCompressed, 64);
-
+
GzipDecompress gzipdc;
gzipdc.decompress(szCompressed, 64, szDecompressed, 64);
-
+
CPPUNIT_ASSERT(strcmp(szTest, szDecompressed) == 0);
}
};
diff --git a/myserver/tests/test_hashmap.cpp b/myserver/tests/test_hashmap.cpp
index 0571cb9..479de46 100644
--- a/myserver/tests/test_hashmap.cpp
+++ b/myserver/tests/test_hashmap.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -48,43 +48,43 @@ public:
void testContainsKey()
{
map->put((char*)"one", 1);
- CPPUNIT_ASSERT_EQUAL(map->containsKey("one"), true);
- CPPUNIT_ASSERT_EQUAL(map->containsKey("two"), false);
+ CPPUNIT_ASSERT_EQUAL(map->containsKey("one"), true);
+ CPPUNIT_ASSERT_EQUAL(map->containsKey("two"), false);
}
void testClear()
{
map->put((char*)"one", 1);
- CPPUNIT_ASSERT_EQUAL(map->empty(), false);
+ CPPUNIT_ASSERT_EQUAL(map->empty(), false);
map->clear();
- CPPUNIT_ASSERT_EQUAL(map->empty(), true);
+ CPPUNIT_ASSERT_EQUAL(map->empty(), true);
}
void testSize()
{
- CPPUNIT_ASSERT_EQUAL(map->size(), 0);
+ CPPUNIT_ASSERT_EQUAL(map->size(), 0);
map->put((char*)"one", 1);
- CPPUNIT_ASSERT_EQUAL(map->size(), 1);
+ CPPUNIT_ASSERT_EQUAL(map->size(), 1);
map->put((char*)"two", 2);
- CPPUNIT_ASSERT_EQUAL(map->size(), 2);
+ CPPUNIT_ASSERT_EQUAL(map->size(), 2);
}
void testEmpty()
{
- CPPUNIT_ASSERT_EQUAL(map->empty(), true);
+ CPPUNIT_ASSERT_EQUAL(map->empty(), true);
map->put((char*)"key", 0);
- CPPUNIT_ASSERT_EQUAL(map->empty(), false);
-
+ CPPUNIT_ASSERT_EQUAL(map->empty(), false);
+
}
void testPut()
{
map->put((char*)"one", 1);
- CPPUNIT_ASSERT_EQUAL(map->get((char*)"one"), 1);
+ CPPUNIT_ASSERT_EQUAL(map->get((char*)"one"), 1);
}
void testRemove()
@@ -109,7 +109,7 @@ public:
map->put((char*)"eight", 8);
map->put((char*)"nine", 9);
map->put((char*)"ten", 10);
-
+
int values[11];
for(int i = 0; i < 11; i++)
@@ -119,7 +119,7 @@ public:
{
values[*it] = 1;
}
-
+
for(int i = 0; i < 11; i++)
CPPUNIT_ASSERT_EQUAL(values[i], 1);
}
diff --git a/myserver/tests/test_homedir.cpp b/myserver/tests/test_homedir.cpp
index a392124..745c152 100644
--- a/myserver/tests/test_homedir.cpp
+++ b/myserver/tests/test_homedir.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -35,7 +35,7 @@ public:
void testLoadClear()
{
CPPUNIT_ASSERT(!homeDir->isLoaded());
-
+
homeDir->load();
CPPUNIT_ASSERT(homeDir->isLoaded());
@@ -53,7 +53,7 @@ public:
/* Try to get home dir for Administrator under Windows. */
username.assign("Administrator");
#else
- /* Under systems different than Windows, "root" should be present,
+ /* Under systems different than Windows, "root" should be present,
* if it doesn't handle this differently. */
username.assign("root");
#endif
diff --git a/myserver/tests/test_http_req_security_domain.cpp
b/myserver/tests/test_http_req_security_domain.cpp
index 4a6f87b..3939bab 100644
--- a/myserver/tests/test_http_req_security_domain.cpp
+++ b/myserver/tests/test_http_req_security_domain.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_http_request.cpp
b/myserver/tests/test_http_request.cpp
index 2920ea5..87b4622 100644
--- a/myserver/tests/test_http_request.cpp
+++ b/myserver/tests/test_http_request.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -64,7 +64,7 @@ public:
int ret = HttpHeaders::buildHTTPRequestHeaderStruct(requestStr,
bufferLength,
&requestLength,
- &header,
+ &header,
&connection);
CPPUNIT_ASSERT_EQUAL(ret, 200);
@@ -91,10 +91,10 @@ public:
ret = HttpHeaders::buildHTTPRequestHeaderStruct(requestStr,
bufferLength,
&requestLength,
- &header,
+ &header,
&connection);
-
+
CPPUNIT_ASSERT(ret == 200);
CPPUNIT_ASSERT(header.rangeByteBegin == 10);
CPPUNIT_ASSERT(header.rangeByteEnd == 20);
@@ -107,10 +107,10 @@ public:
ret = HttpHeaders::buildHTTPRequestHeaderStruct(requestStr,
bufferLength,
&requestLength,
- &header,
+ &header,
&connection);
-
+
CPPUNIT_ASSERT(ret == 200);
CPPUNIT_ASSERT(header.rangeByteBegin == 10);
CPPUNIT_ASSERT(header.rangeByteEnd == 0);
@@ -125,7 +125,7 @@ public:
u_long nChars;
ret = HttpHeaders::validHTTPRequest(request,
strlen(request),
- &nLines,
+ &nLines,
&nChars);
CPPUNIT_ASSERT_EQUAL(ret, 200);
@@ -139,12 +139,12 @@ public:
u_long nChars;
ret = HttpHeaders::validHTTPRequest(incompleteRequest,
strlen(incompleteRequest),
- &nLines,
+ &nLines,
&nChars);
CPPUNIT_ASSERT_EQUAL(ret, -1);
}
-
+
void testDefaultHttpRequest()
{
@@ -159,7 +159,7 @@ public:
CPPUNIT_ASSERT(header.uriOptsPtr == NULL);
CPPUNIT_ASSERT(header.getValue("NotExists", 0) == NULL);
}
-
+
void testResetHttpRequest()
{
@@ -173,7 +173,7 @@ public:
CPPUNIT_ASSERT(header.uriOptsPtr == NULL);
CPPUNIT_ASSERT(header.getValue("NotExists", 0) == NULL);
}
-
+
};
diff --git a/myserver/tests/test_http_response.cpp
b/myserver/tests/test_http_response.cpp
index 86a4136..9f9b649 100644
--- a/myserver/tests/test_http_response.cpp
+++ b/myserver/tests/test_http_response.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -78,7 +78,7 @@ public:
CPPUNIT_ASSERT(ret != 0);
}
-
+
void testInvalidResponse()
{
@@ -108,7 +108,7 @@ public:
HttpHeaders::resetHTTPResponse(&header);
- CPPUNIT_ASSERT(header.ver.length() == 0);
+ CPPUNIT_ASSERT(header.ver.length() == 0);
CPPUNIT_ASSERT(header.serverName.length() == 0);
CPPUNIT_ASSERT(header.contentType.length() == 0);
CPPUNIT_ASSERT(header.connection.length() == 0);
@@ -117,7 +117,7 @@ public:
CPPUNIT_ASSERT(header.contentLength.length() == 0);
CPPUNIT_ASSERT(header.errorType.length() == 0);
CPPUNIT_ASSERT(header.location.length() == 0);
- CPPUNIT_ASSERT(header.date.length() == 0);
+ CPPUNIT_ASSERT(header.date.length() == 0);
CPPUNIT_ASSERT(header.auth.length() == 0);
CPPUNIT_ASSERT(header.dateExp.length() == 0);
}
@@ -129,7 +129,7 @@ public:
header.httpStatus = 100;
CPPUNIT_ASSERT_EQUAL(header.getStatusType(),
HttpResponseHeader::INFORMATIONAL);
-
+
header.httpStatus = 200;
CPPUNIT_ASSERT_EQUAL(header.getStatusType(),
HttpResponseHeader::SUCCESSFUL);
@@ -142,8 +142,8 @@ public:
header.httpStatus = 500;
CPPUNIT_ASSERT_EQUAL(header.getStatusType(),
HttpResponseHeader::SERVER_ERROR);
}
-
-
+
+
};
diff --git a/myserver/tests/test_ip.cpp b/myserver/tests/test_ip.cpp
index 005a71d..4cee1dc 100644
--- a/myserver/tests/test_ip.cpp
+++ b/myserver/tests/test_ip.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_log_stream_factory.cpp
b/myserver/tests/test_log_stream_factory.cpp
index 8148b93..582c9f4 100644
--- a/myserver/tests/test_log_stream_factory.cpp
+++ b/myserver/tests/test_log_stream_factory.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -38,7 +38,7 @@ public:
{
lsf = new LogStreamFactory ();
}
-
+
void testGetProtocol ()
{
CPPUNIT_ASSERT (!lsf->protocolCheck (lsf->getProtocol ("foo")));
@@ -70,7 +70,7 @@ public:
CPPUNIT_ASSERT (!lsf->create (&ff, "socket://127.0.0.1:0", filters, 0));
delete ls;
}
-
+
void tearDown ()
{
delete lsf;
diff --git a/myserver/tests/test_md5.cpp b/myserver/tests/test_md5.cpp
index 075e0e7..7304a19 100644
--- a/myserver/tests/test_md5.cpp
+++ b/myserver/tests/test_md5.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_mem_buff.cpp b/myserver/tests/test_mem_buff.cpp
index 8241ecb..9c1e7ec 100644
--- a/myserver/tests/test_mem_buff.cpp
+++ b/myserver/tests/test_mem_buff.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -132,7 +132,7 @@ public:
void testGetPart()
{
*memBuff << "0123456789abcdef";
-
+
MemBuf dest;
memBuff->getPart(3, 10, dest);
@@ -157,7 +157,7 @@ public:
*memBuff << "foo";
-
+
CPPUNIT_ASSERT(memcmp(buffer, "foo", 3) == 0);
}
diff --git a/myserver/tests/test_mem_stream.cpp
b/myserver/tests/test_mem_stream.cpp
index 95e9293..2aa0587 100644
--- a/myserver/tests/test_mem_stream.cpp
+++ b/myserver/tests/test_mem_stream.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -63,13 +63,13 @@ public:
return nbw;
}
-
+
void testAvailableToRead()
{
u_long size = addSomeData(stream);
CPPUNIT_ASSERT_EQUAL(size, (u_long)stream->availableToRead());
- }
+ }
void testRead()
{
@@ -81,7 +81,7 @@ public:
CPPUNIT_ASSERT_EQUAL(size, (u_long)stream->availableToRead());
stream->read(buffer, 20, &nbr);
-
+
CPPUNIT_ASSERT_EQUAL(size - 20u, (u_long)stream->availableToRead());
}
@@ -118,7 +118,7 @@ public:
u_long nbw;
addSomeData(stream);
int ret = stream->flush(&nbw);
-
+
CPPUNIT_ASSERT(nbw >= 0);
CPPUNIT_ASSERT_EQUAL(ret, 0);
}
diff --git a/myserver/tests/test_mime_manager.cpp
b/myserver/tests/test_mime_manager.cpp
index e40b592..1c5685b 100644
--- a/myserver/tests/test_mime_manager.cpp
+++ b/myserver/tests/test_mime_manager.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -58,7 +58,7 @@ public:
CPPUNIT_ASSERT_EQUAL (mm->getNumMIMELoaded(), 2ul);
CPPUNIT_ASSERT_EQUAL (mm->isLoaded(), true);
-
+
delete parser;
}
@@ -73,7 +73,7 @@ public:
mm->addRecord (&mr);
CPPUNIT_ASSERT_EQUAL (mm->getNumMIMELoaded(), 3ul);
-
+
delete parser;
}
diff --git a/myserver/tests/test_multicast.cpp
b/myserver/tests/test_multicast.cpp
index 1a2ad74..2af3d0c 100644
--- a/myserver/tests/test_multicast.cpp
+++ b/myserver/tests/test_multicast.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -35,7 +35,7 @@ public:
if(handlers)
return handlers->size();
-
+
return 0;
}
@@ -98,7 +98,7 @@ public:
registry->addMulticast(msg, observer);
registry->notifyMulticast(msg, arg);
- CPPUNIT_ASSERT_EQUAL(msg, observer->getMsg());
+ CPPUNIT_ASSERT_EQUAL(msg, observer->getMsg());
CPPUNIT_ASSERT_EQUAL(arg, observer->getArg());
}
diff --git a/myserver/tests/test_mutex.cpp b/myserver/tests/test_mutex.cpp
index 0bac228..dd8cb9b 100644
--- a/myserver/tests/test_mutex.cpp
+++ b/myserver/tests/test_mutex.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_pipe.cpp b/myserver/tests/test_pipe.cpp
index fc29082..ff7619b 100644
--- a/myserver/tests/test_pipe.cpp
+++ b/myserver/tests/test_pipe.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -27,7 +27,7 @@
class TestPipe : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE( TestPipe );
- CPPUNIT_TEST( testCreateClose );
+ CPPUNIT_TEST( testCreateClose );
CPPUNIT_TEST( testWriteRead );
CPPUNIT_TEST( testInverted );
CPPUNIT_TEST( testWaitForData );
@@ -50,7 +50,7 @@ public:
void testCreateClose()
{
int ret = pipe->create();
-
+
CPPUNIT_ASSERT_EQUAL(pipe->pipeTerminated(), false);
CPPUNIT_ASSERT_EQUAL(ret, 0);
@@ -118,7 +118,7 @@ public:
CPPUNIT_ASSERT_EQUAL(pipeInv.getReadHandle(), pipe->getWriteHandle());
CPPUNIT_ASSERT_EQUAL(pipe->getReadHandle(), pipeInv.getWriteHandle());
-
+
pipe->close();
}
diff --git a/myserver/tests/test_plugin_info.cpp
b/myserver/tests/test_plugin_info.cpp
index 51141af..dfe99f0 100644
--- a/myserver/tests/test_plugin_info.cpp
+++ b/myserver/tests/test_plugin_info.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -44,7 +44,7 @@ class TestPluginInfo : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE_END();
private:
PluginInfo* pluginfo;
-
+
public:
void setUp()
{
@@ -61,7 +61,7 @@ public:
{
CPPUNIT_ASSERT(!pluginfo->isEnabled());
}
-
+
void testIsEnabled()
{
delete(pluginfo);
@@ -74,7 +74,7 @@ public:
{
CPPUNIT_ASSERT(!pluginfo->isGlobal());
}
-
+
void testIsGlobal()
{
delete(pluginfo);
@@ -82,27 +82,27 @@ public:
pluginfo = new PluginInfo(name,false,true);
CPPUNIT_ASSERT(pluginfo->isGlobal());
}
-
+
void testGetVersion()
{
CPPUNIT_ASSERT_EQUAL(pluginfo->getVersion(),0);
}
-
+
void testGetMyServerMinVersion()
{
CPPUNIT_ASSERT_EQUAL(pluginfo->getMyServerMinVersion(),0);
}
-
+
void testGetMyServerMaxVersion()
{
CPPUNIT_ASSERT_EQUAL(pluginfo->getMyServerMaxVersion(),0);
}
-
+
void testGetName()
{
CPPUNIT_ASSERT_EQUAL(pluginfo->getName().compare("test"),0);
}
-
+
void testDependencies()
{
string test("test-dep");
@@ -111,56 +111,56 @@ public:
CPPUNIT_ASSERT_EQUAL( (*(pluginfo->begin()))->second , 1);
CPPUNIT_ASSERT_EQUAL( pluginfo->begin().getKey().compare("test-dep"),0);
}
-
-
+
+
void testVersionConversionStringInt()
{
int v = PluginInfo::convertVersion(new string("1"));
CPPUNIT_ASSERT_EQUAL(1<<24,v);
-
+
v = PluginInfo::convertVersion(new string("255"));
CPPUNIT_ASSERT_EQUAL(255<<24,v);
-
+
v = PluginInfo::convertVersion(new string("1.2"));
CPPUNIT_ASSERT_EQUAL((1<<24) + (2<<16),v);
-
+
v = PluginInfo::convertVersion(new string("1.2.3"));
CPPUNIT_ASSERT_EQUAL((1<<24) + (2<<16) + (3<<8),v);
-
+
v = PluginInfo::convertVersion(new string("1.2.3.4"));
CPPUNIT_ASSERT_EQUAL((1<<24) + (2<<16) + (3<<8) + 4,v);
-
+
v = PluginInfo::convertVersion(new string("1."));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1.2."));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1.2.3."));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1.2.3.4."));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1.2.3.4...."));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("......1.2.3.4"));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1..2.3.4"));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1.2...3.4"));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1.2.3....4"));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1.300.3.4"));
CPPUNIT_ASSERT_EQUAL(-1,v);
-
+
v = PluginInfo::convertVersion(new string("1.3.299.4"));
CPPUNIT_ASSERT_EQUAL(-1,v);
}
diff --git a/myserver/tests/test_recursive_mutex.cpp
b/myserver/tests/test_recursive_mutex.cpp
index 24d1b69..e6a3564 100644
--- a/myserver/tests/test_recursive_mutex.cpp
+++ b/myserver/tests/test_recursive_mutex.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_regex.cpp b/myserver/tests/test_regex.cpp
index 622172b..f1404e2 100644
--- a/myserver/tests/test_regex.cpp
+++ b/myserver/tests/test_regex.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_safetime.cpp b/myserver/tests/test_safetime.cpp
index 2d78057..449fbc6 100644
--- a/myserver/tests/test_safetime.cpp
+++ b/myserver/tests/test_safetime.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_security_cache.cpp
b/myserver/tests/test_security_cache.cpp
index 082c44c..54e5e7c 100644
--- a/myserver/tests/test_security_cache.cpp
+++ b/myserver/tests/test_security_cache.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -36,7 +36,7 @@ class TestSecurityCache : public CppUnit::TestFixture
CPPUNIT_TEST ( testGetParser );
CPPUNIT_TEST ( testGetSecurityFile );
CPPUNIT_TEST_SUITE_END ();
-
+
SecurityCache *secCache;
public:
void setUp ()
diff --git a/myserver/tests/test_security_domain.cpp
b/myserver/tests/test_security_domain.cpp
index c1090de..a6cc9de 100644
--- a/myserver/tests/test_security_domain.cpp
+++ b/myserver/tests/test_security_domain.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -36,7 +36,7 @@ class TestSecurityDomain : public CppUnit::TestFixture
CPPUNIT_TEST( testGetValue );
CPPUNIT_TEST( testGetName );
CPPUNIT_TEST_SUITE_END();
-
+
SecurityDomain* securityDomain;
public:
void setUp()
diff --git a/myserver/tests/test_security_manager.cpp
b/myserver/tests/test_security_manager.cpp
index 45e15fb..ae65e93 100644
--- a/myserver/tests/test_security_manager.cpp
+++ b/myserver/tests/test_security_manager.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -36,7 +36,7 @@ class TestSecurityManager : public CppUnit::TestFixture
CPPUNIT_TEST_SUITE( TestSecurityManager );
CPPUNIT_TEST( testGetPermissionMask );
CPPUNIT_TEST_SUITE_END();
-
+
AuthMethodFactory authMethodFactory;
ValidatorFactory validatorFactory;
SecurityManager* securityManager;
diff --git a/myserver/tests/test_security_token.cpp
b/myserver/tests/test_security_token.cpp
index 52407bc..da5d635 100644
--- a/myserver/tests/test_security_token.cpp
+++ b/myserver/tests/test_security_token.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -117,7 +117,7 @@ public:
securityToken->setProvidedMask (mask);
CPPUNIT_ASSERT_EQUAL (securityToken->getProvidedMask (), mask);
}
-
+
void testNeededPassword ()
{
string password ("foo");
@@ -149,7 +149,7 @@ public:
securityToken->setServer (s);
CPPUNIT_ASSERT_EQUAL (securityToken->getServer (), s);
}
-
+
void testVhost ()
{
Vhost *v = (Vhost*)0x100; //XXX: Dirty.
diff --git a/myserver/tests/test_semaphore.cpp
b/myserver/tests/test_semaphore.cpp
index 95af4c0..da0090b 100644
--- a/myserver/tests/test_semaphore.cpp
+++ b/myserver/tests/test_semaphore.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
diff --git a/myserver/tests/test_slab.cpp b/myserver/tests/test_slab.cpp
index 4d08d28..8011acf 100644
--- a/myserver/tests/test_slab.cpp
+++ b/myserver/tests/test_slab.cpp
@@ -5,16 +5,16 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
+
#include <cppunit/CompilerOutputter.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <cppunit/ui/text/TestRunner.h>
@@ -44,7 +44,7 @@ public:
void setUp ()
{
}
-
+
void tearDown ()
{
}
diff --git a/myserver/tests/test_socket.cpp b/myserver/tests/test_socket.cpp
index e7018f9..ebaaa7d 100644
--- a/myserver/tests/test_socket.cpp
+++ b/myserver/tests/test_socket.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -41,31 +41,31 @@ class TestSocket : public CppUnit::TestFixture
{
Socket *obj;
ThreadID tid;
-
+
CPPUNIT_TEST_SUITE( TestSocket );
-
+
CPPUNIT_TEST( testGethostname );
CPPUNIT_TEST( testRecv );
CPPUNIT_TEST( testGetLocalIPsList );
-
+
CPPUNIT_TEST_SUITE_END( );
-
+
public:
-
+
void setUp ( )
{
CPPUNIT_ASSERT_EQUAL( Socket::startupSocketLib ( ), 0 );
-
+
obj = new Socket;
}
-
+
void tearDown ( )
{
delete obj;
}
-
+
void testGethostname ( )
- {
+ {
int len;
#ifdef HOST_NAME_MAX
len = HOST_NAME_MAX;
@@ -76,10 +76,10 @@ public:
#endif
int status = obj->gethostname ( host, len );
-
+
CPPUNIT_ASSERT_EQUAL( status, 0 );
}
-
+
void testRecv ( )
{
ThreadID tid;
@@ -88,15 +88,15 @@ public:
int port = 6543;
MYSERVER_SOCKADDRIN sockIn = { 0 };
int status;
-
+
((sockaddr_in*) (&sockIn))->sin_family = AF_INET;
((sockaddr_in*) (&sockIn))->sin_addr.s_addr = inet_addr ( "127.0.0.1" );
((sockaddr_in*) (&sockIn))->sin_port = htons ( port );
-
+
socklen_t sockInLen = sizeof ( sockaddr_in );
-
+
CPPUNIT_ASSERT( obj->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
-
+
CPPUNIT_ASSERT( obj->setsockopt ( SOL_SOCKET, SO_REUSEADDR,
(const char*) &optvalReuseAddr,
sizeof(optvalReuseAddr) ) != -1 );
@@ -106,7 +106,7 @@ public:
while ( ++port < 28000 )
{
((sockaddr_in*) (&sockIn))->sin_port = htons ( port );
-
+
if ( ( status = obj->bind ( &sockIn, sockInLen ) ) == 0 )
break;
}
@@ -141,19 +141,19 @@ public:
CPPUNIT_ASSERT( obj->close ( ) != -1 );
}
-
+
void testGetLocalIPsList ( )
{
int status = obj->socket ( AF_INET, SOCK_STREAM, 0 );
CPPUNIT_ASSERT( status != -1 );
-
+
string out;
-
+
status = obj->getLocalIPsList ( out );
-
+
CPPUNIT_ASSERT( status != -1 );
-
+
status = obj->close ( );
CPPUNIT_ASSERT( status != -1 );
diff --git a/myserver/tests/test_socket_pair.cpp
b/myserver/tests/test_socket_pair.cpp
index 83225a8..7c198fe 100644
--- a/myserver/tests/test_socket_pair.cpp
+++ b/myserver/tests/test_socket_pair.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -30,10 +30,10 @@ class TestSocketPair : public CppUnit::TestFixture
CPPUNIT_TEST( testInverted );
CPPUNIT_TEST( testWriteRead );
CPPUNIT_TEST_SUITE_END();
-
+
public:
- void setUp()
+ void setUp()
{
}
@@ -84,7 +84,7 @@ public:
CPPUNIT_ASSERT_EQUAL(ret, 0);
ret = readSock.read (outBuffer, 256, &nbr);
-
+
CPPUNIT_ASSERT_EQUAL(ret, 0);
diff --git a/myserver/tests/test_socket_stream_creator.cpp
b/myserver/tests/test_socket_stream_creator.cpp
index bf3baaf..4f8c57d 100644
--- a/myserver/tests/test_socket_stream_creator.cpp
+++ b/myserver/tests/test_socket_stream_creator.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -40,7 +40,7 @@ public:
ssc = new SocketStreamCreator ();
ff = new FiltersFactory ();
}
-
+
void testCreation ()
{
list<string> filters;
diff --git a/myserver/tests/test_ssl_socket.cpp
b/myserver/tests/test_ssl_socket.cpp
index c9a5e00..b377db8 100644
--- a/myserver/tests/test_ssl_socket.cpp
+++ b/myserver/tests/test_ssl_socket.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -92,13 +92,13 @@ static DEFINE_THREAD(testSslRecvClient, pParam);
class TestSslSocket : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE( TestSslSocket );
-
+
CPPUNIT_TEST( testRecv );
-
+
CPPUNIT_TEST_SUITE_END( );
-
+
public:
-
+
void setUp ( )
{
initializeSSL ();
@@ -113,38 +113,38 @@ public:
f.writeToFile (serverPem, strlen (serverPem), &nbw);
f.close ();
}
-
+
void tearDown ( )
{
FilesUtility::deleteFile (TESTSERVERPEM);
FilesUtility::deleteFile (TESTSERVERKEY);
}
-
+
void testRecv ( )
{
Socket *obj = new Socket;
SslSocket *sslObj = NULL;
SSL_CTX *ctx = NULL;;
ThreadID tid;
-
+
int optvalReuseAddr = 1;
char host[] = "localhost";
int port = 6543;
MYSERVER_SOCKADDRIN sockIn = { 0 };
int status;
-
+
((sockaddr_in*) (&sockIn))->sin_family = AF_INET;
((sockaddr_in*) (&sockIn))->sin_addr.s_addr = inet_addr ( "127.0.0.1" );
((sockaddr_in*) (&sockIn))->sin_port = htons ( port );
-
+
socklen_t sockInLen = sizeof ( sockaddr_in );
-
+
CPPUNIT_ASSERT( obj->socket ( AF_INET, SOCK_STREAM, 0 ) != -1 );
-
+
CPPUNIT_ASSERT( obj->setsockopt ( SOL_SOCKET, SO_REUSEADDR,
(const char*) &optvalReuseAddr,
sizeof(optvalReuseAddr) ) != -1 );
-
+
ctx = SSL_CTX_new ( SSLv23_server_method() );
if ( SSL_CTX_use_certificate_file ( ctx, TESTSERVERPEM, SSL_FILETYPE_PEM )
!= 1 )
@@ -186,9 +186,9 @@ public:
SSL_CTX_free ( ctx );
CPPUNIT_ASSERT (false);
}
-
+
char buf[32] = {0};
-
+
ret = sslObj->recv ( buf, sizeof(buf), 0 );
sslObj->send ( "a", 1, 0);
diff --git a/myserver/tests/test_thread.cpp b/myserver/tests/test_thread.cpp
index c7a198d..5d78cbd 100644
--- a/myserver/tests/test_thread.cpp
+++ b/myserver/tests/test_thread.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -59,7 +59,7 @@ class TestThread : public CppUnit::TestFixture
public:
void setUp()
{
-
+
}
void tearDown()
@@ -77,8 +77,8 @@ public:
Thread::join(tid);
- CPPUNIT_ASSERT_EQUAL(res, 0);
- CPPUNIT_ASSERT_EQUAL(data, expected);
+ CPPUNIT_ASSERT_EQUAL(res, 0);
+ CPPUNIT_ASSERT_EQUAL(data, expected);
}
void testThreadTerminate()
@@ -89,8 +89,8 @@ public:
Thread::join(tid);
- CPPUNIT_ASSERT_EQUAL(res, 0);
- CPPUNIT_ASSERT_EQUAL(data, 0);
+ CPPUNIT_ASSERT_EQUAL(res, 0);
+ CPPUNIT_ASSERT_EQUAL(data, 0);
}
diff --git a/myserver/tests/test_unix_socket.cpp
b/myserver/tests/test_unix_socket.cpp
index a22303f..a8c289d 100644
--- a/myserver/tests/test_unix_socket.cpp
+++ b/myserver/tests/test_unix_socket.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -46,17 +46,17 @@ void* test_unix_socket_server (void* pParam)
if (client.getHandle () == 0)
return NULL;
-
+
char buffer [256];
if (client.recv(buffer, 256, 0, MYSERVER_SEC (1)) == 0)
{
client.close ();
return NULL;
}
-
+
server->result = !strcmpi (buffer, TEST_STRING);
-
+
client.close ();
return NULL;
}
@@ -69,11 +69,11 @@ class TestUnixSocket : public CppUnit::TestFixture
CPPUNIT_TEST( testBind );
CPPUNIT_TEST( testClient );
CPPUNIT_TEST_SUITE_END();
-
+
UnixSocket *sock;
public:
- void setUp ()
+ void setUp ()
{
sock = new UnixSocket ();
}
@@ -124,7 +124,7 @@ public:
sock->socket ();
sock->bind (path.c_str ());
CPPUNIT_ASSERT_EQUAL (sock->listen (1), 0);
-
+
int res = Thread::create (&tid, test_unix_socket_server, &data);
UnixSocket client;
diff --git a/myserver/tests/test_url.cpp b/myserver/tests/test_url.cpp
index 696e709..3129888 100644
--- a/myserver/tests/test_url.cpp
+++ b/myserver/tests/test_url.cpp
@@ -6,7 +6,7 @@
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
diff --git a/myserver/tests/test_validator.cpp
b/myserver/tests/test_validator.cpp
index cf69fe1..5c93e09 100644
--- a/myserver/tests/test_validator.cpp
+++ b/myserver/tests/test_validator.cpp
@@ -20,7 +20,7 @@ class TestValidator : public CppUnit::TestFixture
CPPUNIT_TEST( testGetPermissionMaskImpl );
CPPUNIT_TEST( testGetValue );
CPPUNIT_TEST_SUITE_END();
-
+
Validator* validator;
public:
void setUp()
@@ -39,13 +39,13 @@ public:
HashMap<string, SecurityDomain*> hashedDomains;
CPPUNIT_ASSERT_EQUAL (validator->getValue (&hashedDomains, val),
(string*)NULL);
}
-
+
void testGetPermissionMaskImpl ()
{
string val ("value");
SecurityToken secToken;
CPPUNIT_ASSERT_EQUAL (validator->getPermissionMaskImpl (&secToken, NULL,
NULL), 0);
-
+
}
void testGetPermissionMask ()
diff --git a/myserver/tests/test_validator_factory.cpp
b/myserver/tests/test_validator_factory.cpp
index b81f686..37a9c66 100644
--- a/myserver/tests/test_validator_factory.cpp
+++ b/myserver/tests/test_validator_factory.cpp
@@ -22,7 +22,7 @@ class TestValidatorFactory : public CppUnit::TestFixture
CPPUNIT_TEST( testAddValidator );
CPPUNIT_TEST( testIsValidatorPresent );
CPPUNIT_TEST_SUITE_END();
-
+
ValidatorFactory* factory;
public:
void setUp()
@@ -39,14 +39,14 @@ public:
{
string val("foo");
CPPUNIT_ASSERT_EQUAL(factory->getValidator(val), (Validator*)NULL);
-
+
}
-
+
void testAddValidator()
{
string val("bar");
Validator *validator = new Validator;
-
+
Validator* old = factory->addValidator(val, validator);
CPPUNIT_ASSERT_EQUAL(old, (Validator*)NULL);
@@ -58,11 +58,11 @@ public:
string val("bar");
Validator *validator = new Validator;
-
+
CPPUNIT_ASSERT_EQUAL(factory->isValidatorPresent(val), false);
-
+
factory->addValidator(val, validator);
-
+
CPPUNIT_ASSERT_EQUAL(factory->isValidatorPresent(val), true);
}
};
diff --git a/myserver/tests/test_xml.cpp b/myserver/tests/test_xml.cpp
index 015c932..311ddaf 100644
--- a/myserver/tests/test_xml.cpp
+++ b/myserver/tests/test_xml.cpp
@@ -5,12 +5,12 @@
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+
+ This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -46,7 +46,7 @@ class TestXml : public CppUnit::TestFixture
<< "<NODE><ELEMENT>d</ELEMENT><ELEMENT>e</ELEMENT></NODE>"
<< "<NODE><ELEMENT>f</ELEMENT></NODE>"
<< "</ROOT>";
-
+
return memBuf;
}
@@ -54,14 +54,14 @@ public:
void setUp()
{
-
+
}
void tearDown()
{
}
-
+
void testOpenMemBuf()
{
MemBuf* memBuf = getXmlMemBuf();
@@ -94,7 +94,7 @@ public:
CPPUNIT_ASSERT(obj);
CPPUNIT_ASSERT_EQUAL(nodes->nodeNr, 1);
-
+
CPPUNIT_ASSERT(!strcmp((const char*)nodes->nodeTab[0]->content, "a"));
delete xpathRes;
diff --git a/myserver/tests/test_xml_validator.cpp
b/myserver/tests/test_xml_validator.cpp
index 7749f03..7ea1ef8 100644
--- a/myserver/tests/test_xml_validator.cpp
+++ b/myserver/tests/test_xml_validator.cpp
@@ -20,7 +20,7 @@ class TestXmlValidator : public CppUnit::TestFixture
CPPUNIT_TEST( testGetPermissionMaskImpl );
CPPUNIT_TEST( testGetValue );
CPPUNIT_TEST_SUITE_END();
-
+
XmlValidator* xmlValidator;
public:
void setUp()
@@ -39,9 +39,9 @@ public:
HashMap<string, SecurityDomain*> hashedDomains;
CPPUNIT_ASSERT_EQUAL(xmlValidator->getValue(&hashedDomains, val),
(string*)NULL);
-
+
}
-
+
void testGetPermissionMaskImpl()
{
string val("value");
@@ -51,7 +51,7 @@ public:
secToken.setDirectory (&val);
secToken.setSysDirectory (&val);
CPPUNIT_ASSERT_EQUAL(xmlValidator->getPermissionMaskImpl(&secToken, NULL,
NULL), 0);
-
+
}
void testGetPermissionMask()
-----------------------------------------------------------------------
Summary of changes:
.../binaries/web/cgi-src/math_sum/math_sum.cpp | 46 ++--
myserver/binaries/web/cgi-src/post/post.cpp | 14 +-
myserver/include/base/base64/mime_utils.h | 2 +-
myserver/include/base/bitvec/bitvec.h | 8 +-
myserver/include/base/dynamic_lib/dynamiclib.h | 2 +-
myserver/include/base/file/file.h | 2 +-
myserver/include/base/files_cache/cached_file.h | 2 +-
myserver/include/base/find_data/find_data.h | 6 +-
myserver/include/base/md5/md5.h | 6 +-
myserver/include/base/mem_buff/mem_buff.h | 4 +-
myserver/include/base/multicast/multicast.h | 6 +-
myserver/include/base/process/fork_server.h | 2 +-
.../include/base/process/process_server_manager.h | 14 +-
myserver/include/base/regex/myserver_regex.h | 6 +-
myserver/include/base/socket/socket.h | 2 +-
myserver/include/base/socket/ssl_socket.h | 2 +-
myserver/include/base/thread/thread.h | 6 +-
myserver/include/base/xml/xml_parser.h | 8 +-
myserver/include/conf/mime/mime_manager.h | 2 +-
myserver/include/conf/security/security_cache.h | 4 +-
myserver/include/conf/security/security_manager.h | 8 +-
myserver/include/conf/security/security_token.h | 10 +-
myserver/include/conf/security/validator.h | 6 +-
myserver/include/conf/security/xml_validator.h | 16 +-
myserver/include/conf/vhost/vhost.h | 2 +-
.../connections_scheduler/connections_scheduler.h | 4 +-
myserver/include/filter/filters_factory.h | 6 +-
myserver/include/http_handler/cgi/cgi.h | 6 +-
myserver/include/http_handler/fastcgi/fastcgi.h | 20 +-
myserver/include/http_handler/http_dir/http_dir.h | 2 +-
myserver/include/http_handler/isapi/isapi.h | 28 +-
myserver/include/log/log_manager.h | 2 +-
myserver/include/log/stream/log_stream.h | 2 +-
myserver/include/log/stream/socket_stream.h | 2 +-
myserver/include/plugin/plugin_info.h | 42 ++--
myserver/include/protocol/control/control_errors.h | 10 +-
myserver/include/protocol/ftp/ftp_common.h | 2 +-
myserver/include/protocol/ftp/ftp_lexer.h | 10 +-
myserver/include/protocol/ftp/ftp_parser.h | 10 +-
myserver/include/protocol/http/dyn_http_command.h | 6 +-
.../protocol/http/dyn_http_command_manager.h | 10 +-
myserver/include/protocol/http/dyn_http_manager.h | 2 +-
myserver/include/protocol/http/http.h | 26 +-
myserver/include/protocol/http/http_data_handler.h | 6 +-
myserver/include/protocol/http/http_data_read.h | 2 +-
myserver/include/protocol/http/http_headers.h | 16 +-
myserver/include/protocol/http/http_request.h | 20 +-
myserver/include/protocol/http/http_response.h | 14 +-
.../include/protocol/http/http_thread_context.h | 4 +-
myserver/include/protocol/https/https.h | 2 +-
myserver/include/protocol/protocol.h | 2 +-
myserver/include/protocol/protocols_manager.h | 2 +-
myserver/include/server/server.h | 51 ++--
myserver/src/base/base64/mime_utils.cpp | 18 +-
myserver/src/base/file/file.cpp | 10 +-
myserver/src/base/file/files_utility.cpp | 6 +-
myserver/src/base/files_cache/cached_file.cpp | 13 +-
myserver/src/base/find_data/find_data.cpp | 4 +-
myserver/src/base/hash_map/hash_map.cpp | 2 +-
myserver/src/base/home_dir/home_dir.cpp | 4 +-
myserver/src/base/md5/md5.cpp | 18 +-
myserver/src/base/mem_buff/mem_buff.cpp | 118 +++++-----
myserver/src/base/multicast/multicast.cpp | 12 +-
myserver/src/base/process/fork_server.cpp | 50 ++--
.../src/base/process/process_server_manager.cpp | 50 ++--
myserver/src/base/regex/myserver_regex.cpp | 2 +-
myserver/src/base/safetime/safetime.cpp | 2 +-
myserver/src/base/socket/socket.cpp | 52 ++--
myserver/src/base/socket/ssl_socket.cpp | 6 +-
myserver/src/base/socket_pair/socket_pair.cpp | 12 +-
myserver/src/base/ssl/ssl.cpp | 4 +-
myserver/src/base/sync/event.cpp | 8 +-
myserver/src/base/sync/mutex.cpp | 6 +-
myserver/src/base/sync/semaphore.cpp | 4 +-
myserver/src/base/xml/xml_parser.cpp | 80 +++---
myserver/src/conf/mime/mime_manager.cpp | 2 +-
myserver/src/conf/security/auth_method_factory.cpp | 2 +-
myserver/src/conf/security/security_cache.cpp | 28 +-
myserver/src/conf/security/security_manager.cpp | 10 +-
myserver/src/conf/security/security_token.cpp | 8 +-
myserver/src/conf/security/validator.cpp | 14 +-
myserver/src/conf/security/xml_validator.cpp | 44 ++--
myserver/src/conf/vhost/vhost.cpp | 2 +-
myserver/src/conf/vhost/vhost_manager.cpp | 24 +-
myserver/src/conf/xml_conf.cpp | 6 +-
myserver/src/connection/connection.cpp | 12 +-
.../connections_scheduler.cpp | 4 +-
.../src/connections_scheduler/listen_threads.cpp | 32 ++--
myserver/src/filter/console.cpp | 4 +-
myserver/src/filter/filter.cpp | 2 +-
myserver/src/filter/filters_chain.cpp | 28 +-
myserver/src/filter/filters_factory.cpp | 12 +-
myserver/src/filter/memory_stream.cpp | 4 +-
myserver/src/filter/stream.cpp | 6 +-
myserver/src/http_handler/cgi/cgi.cpp | 74 +++---
myserver/src/http_handler/http_dir/http_dir.cpp | 4 +-
myserver/src/http_handler/http_file/http_file.cpp | 2 +-
myserver/src/http_handler/isapi/isapi.cpp | 6 +-
myserver/src/http_handler/mscgi/mscgi_manager.cpp | 20 +-
myserver/src/http_handler/proxy/proxy.cpp | 2 +-
myserver/src/http_handler/wincgi/wincgi.cpp | 2 +-
myserver/src/log/log_manager.cpp | 6 +-
myserver/src/log/stream/console_stream.cpp | 2 +-
myserver/src/log/stream/console_stream_creator.cpp | 2 +-
myserver/src/log/stream/file_stream.cpp | 12 +-
myserver/src/log/stream/file_stream_creator.cpp | 2 +-
myserver/src/log/stream/socket_stream.cpp | 2 +-
myserver/src/log/stream/socket_stream_creator.cpp | 2 +-
myserver/src/myserver.cpp | 12 +-
myserver/src/plugin/plugin_info.cpp | 48 ++--
myserver/src/plugin/plugins_manager.cpp | 38 ++--
myserver/src/protocol/control/control_header.cpp | 18 +-
myserver/src/protocol/control/control_protocol.cpp | 10 +-
myserver/src/protocol/ftp/ftp.cpp | 28 +-
myserver/src/protocol/ftp/ftp_parser.cpp | 10 +-
myserver/src/protocol/http/dyn_http_command.cpp | 4 +-
myserver/src/protocol/http/dyn_http_manager.cpp | 2 +-
.../src/protocol/http/dyn_http_manager_list.cpp | 2 +-
myserver/src/protocol/http/env/env.cpp | 50 ++--
myserver/src/protocol/http/http.cpp | 32 ++--
myserver/src/protocol/http/http_data_handler.cpp | 2 +-
myserver/src/protocol/http/http_data_read.cpp | 2 +-
myserver/src/protocol/http/http_request.cpp | 80 +++---
myserver/src/protocol/http/http_response.cpp | 88 ++++----
myserver/src/protocol/http/http_thread_context.cpp | 4 +-
myserver/src/protocol/https/https.cpp | 6 +-
myserver/src/protocol/protocol.cpp | 2 +-
myserver/src/protocol/protocol_buffer.cpp | 2 +-
myserver/src/protocol/protocols_manager.cpp | 2 +-
myserver/src/server/clients_thread.cpp | 4 +-
myserver/src/server/server.cpp | 271 +++++++++-----------
myserver/tests/main.cpp | 6 +-
myserver/tests/test_auth_domain.cpp | 8 +-
myserver/tests/test_base64.cpp | 6 +-
myserver/tests/test_bitvec.cpp | 18 +-
myserver/tests/test_cached_file.cpp | 10 +-
myserver/tests/test_cached_file_buffer.cpp | 10 +-
myserver/tests/test_cached_file_factory.cpp | 6 +-
myserver/tests/test_connection.cpp | 6 +-
myserver/tests/test_connections_scheduler.cpp | 14 +-
myserver/tests/test_file.cpp | 28 +-
myserver/tests/test_file_stream.cpp | 10 +-
myserver/tests/test_file_stream_creator.cpp | 10 +-
myserver/tests/test_files_utility.cpp | 8 +-
myserver/tests/test_filter_chain.cpp | 10 +-
myserver/tests/test_fork_server.cpp | 12 +-
myserver/tests/test_ftp.cpp | 6 +-
myserver/tests/test_gzip.cpp | 12 +-
myserver/tests/test_hashmap.cpp | 32 ++--
myserver/tests/test_homedir.cpp | 10 +-
myserver/tests/test_http_req_security_domain.cpp | 6 +-
myserver/tests/test_http_request.cpp | 26 +-
myserver/tests/test_http_response.cpp | 18 +-
myserver/tests/test_ip.cpp | 6 +-
myserver/tests/test_log_stream_factory.cpp | 10 +-
myserver/tests/test_md5.cpp | 6 +-
myserver/tests/test_mem_buff.cpp | 10 +-
myserver/tests/test_mem_stream.cpp | 14 +-
myserver/tests/test_mime_manager.cpp | 10 +-
myserver/tests/test_multicast.cpp | 10 +-
myserver/tests/test_mutex.cpp | 6 +-
myserver/tests/test_pipe.cpp | 12 +-
myserver/tests/test_plugin_info.cpp | 56 ++--
myserver/tests/test_recursive_mutex.cpp | 6 +-
myserver/tests/test_regex.cpp | 6 +-
myserver/tests/test_safetime.cpp | 6 +-
myserver/tests/test_security_cache.cpp | 8 +-
myserver/tests/test_security_domain.cpp | 8 +-
myserver/tests/test_security_manager.cpp | 8 +-
myserver/tests/test_security_token.cpp | 10 +-
myserver/tests/test_semaphore.cpp | 6 +-
myserver/tests/test_slab.cpp | 10 +-
myserver/tests/test_socket.cpp | 48 ++--
myserver/tests/test_socket_pair.cpp | 12 +-
myserver/tests/test_socket_stream_creator.cpp | 8 +-
myserver/tests/test_ssl_socket.cpp | 34 ++--
myserver/tests/test_thread.cpp | 16 +-
myserver/tests/test_unix_socket.cpp | 18 +-
myserver/tests/test_url.cpp | 2 +-
myserver/tests/test_validator.cpp | 6 +-
myserver/tests/test_validator_factory.cpp | 14 +-
myserver/tests/test_xml.cpp | 14 +-
myserver/tests/test_xml_validator.cpp | 8 +-
plugins/src/http_checker/http_checker.cpp | 8 +-
plugins/src/mime_magic/mime_magic.cpp | 2 +-
plugins/src/php/php.cpp | 8 +-
plugins/src/python/python.cpp | 23 +-
.../python_http_handler/python_http_handler.cpp | 82 +++---
plugins/src/rules_checker/rules_checker.cpp | 4 +-
189 files changed, 1413 insertions(+), 1449 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 5d3d08dda187d4b4e9344c9d8d56a013734b3ef6,
Giuseppe Scrivano <=