[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9-397-gf
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9-397-gf4d8d8a |
|
Date: |
Mon, 09 Nov 2009 15:49:50 +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 f4d8d8a3011332a400b96629f8fdec658377b2a9 (commit)
via 1fc0de47e41cada1092798f9ea87ea7925ec5642 (commit)
from d8308f65925f11a9acdaa822e625c4f833fda2af (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 f4d8d8a3011332a400b96629f8fdec658377b2a9
Author: Giuseppe Scrivano <address@hidden>
Date: Mon Nov 9 16:49:09 2009 +0100
Remove a not-used method.
diff --git a/myserver/include/conf/security/security_cache.h
b/myserver/include/conf/security/security_cache.h
index cfde7a1..332c75d 100644
--- a/myserver/include/conf/security/security_cache.h
+++ b/myserver/include/conf/security/security_cache.h
@@ -47,14 +47,11 @@ public:
const char* secName = ".security.xml", u_long maxSize
= 0);
int getSecurityFile (const string &file, const string &sys,
string &out, const char* secName = ".security.xml");
-
- /////////OLD NASTY AND DISGUSTING. TEMPORARY SOLUTION TO DON'T BREAK
APIs////////////////////////////////////
- int getPermissionMask (SecurityToken* st){return 0;}
int getErrorFileName (const char *root, int error,
const char* sysdirectory, string& out){return 0;}
private:
- /*! Store a list of opened files using a hash dictionary. */
+ /* Store a list of opened files using a hash dictionary. */
HashMap<string, XmlParser*> dictionary;
int limit;
};
commit 1fc0de47e41cada1092798f9ea87ea7925ec5642
Author: Giuseppe Scrivano <address@hidden>
Date: Mon Nov 9 16:42:46 2009 +0100
Mass update: reindent .h files.
diff --git a/myserver/include/base/base64/mime_utils.h
b/myserver/include/base/base64/mime_utils.h
index a4be1f7..885cd21 100644
--- a/myserver/include/base/base64/mime_utils.h
+++ b/myserver/include/base/base64/mime_utils.h
@@ -25,27 +25,27 @@
class CBase64Utils
{
private:
- int ErrorCode;
+ int ErrorCode;
public:
- int GetLastError () {return ErrorCode;};
- CBase64Utils ();
- ~CBase64Utils ();
- char* decode (const char *in, int *bufsize);
- char* encode (const char *in, int bufsize);
+ int GetLastError () {return ErrorCode;};
+ CBase64Utils ();
+ ~CBase64Utils ();
+ char* decode (const char *in, int *bufsize);
+ char* encode (const char *in, int bufsize);
char* mimeDecodeMailHeaderField (char *s);
};
class CQPUtils
{
private:
- char* expandBuffer (char *buffer, int UsedSize, int *BufSize, int
SingleChar = 1);
- int ErrorCode;
+ char* expandBuffer (char *buffer, int UsedSize, int *BufSize, int SingleChar
= 1);
+ int ErrorCode;
public:
- int getLastError () {return ErrorCode;};
- char* encode (char*in);
- char* decode (char*in);
- CQPUtils ();
- ~CQPUtils ();
+ int getLastError () {return ErrorCode;};
+ char* encode (char*in);
+ char* decode (char*in);
+ CQPUtils ();
+ ~CQPUtils ();
};
#endif
diff --git a/myserver/include/base/bitvec/bitvec.h
b/myserver/include/base/bitvec/bitvec.h
index f382802..97c9298 100644
--- a/myserver/include/base/bitvec/bitvec.h
+++ b/myserver/include/base/bitvec/bitvec.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2009 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/>.
+ MyServer
+ Copyright (C) 2009 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/>.
*/
#ifndef BITVEC_H
diff --git a/myserver/include/base/dynamic_lib/dynamiclib.h
b/myserver/include/base/dynamic_lib/dynamiclib.h
index 3574175..65c5cf8 100644
--- a/myserver/include/base/dynamic_lib/dynamiclib.h
+++ b/myserver/include/base/dynamic_lib/dynamiclib.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2005, 2007, 2009 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/>.
+ MyServer
+ Copyright (C) 2005, 2007, 2009 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/>.
*/
#ifndef DYNAMICLIBRARY_H
@@ -43,9 +43,9 @@ public:
int loadLibrary (const char* filename, int globally=0);
void* getProc (const char*);
int close ();
- const char* getFileName (){return fileName.c_str ();}
+ const char* getFileName (){return fileName.c_str ();}
private:
- string fileName;
+ string fileName;
void *handle;
};
diff --git a/myserver/include/base/file/file.h
b/myserver/include/base/file/file.h
index 1463c25..861130a 100644
--- a/myserver/include/base/file/file.h
+++ b/myserver/include/base/file/file.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2008, 2009 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/>.
*/
#ifndef FILE_H
@@ -52,7 +52,7 @@ public:
virtual int openFile (const char*, u_long );
virtual int openFile (string const &file, u_long opt)
- {return openFile (file.c_str (), opt);}
+ {return openFile (file.c_str (), opt);}
virtual u_long getFileSize ();
virtual int seek (u_long);
@@ -64,7 +64,7 @@ public:
virtual const char *getFilename ();
virtual int setFilename (const char*);
virtual int setFilename (string const &name)
- {return setFilename (name.c_str ());}
+ {return setFilename (name.c_str ());}
virtual int operator =(File);
virtual int close ();
diff --git a/myserver/include/base/file/files_utility.h
b/myserver/include/base/file/files_utility.h
index 9b28de0..82866a5 100644
--- a/myserver/include/base/file/files_utility.h
+++ b/myserver/include/base/file/files_utility.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 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/>.
*/
#ifndef FILES_UTILITY_H
@@ -39,19 +39,19 @@ public:
static time_t getLastModTime (const char *filename);
static time_t getLastModTime (string const &filename)
- {return getLastModTime (filename.c_str ());}
+ {return getLastModTime (filename.c_str ());}
static time_t getCreationTime (const char *filename);
static time_t getCreationTime (string const &filename)
- {return getCreationTime (filename.c_str ());}
+ {return getCreationTime (filename.c_str ());}
static time_t getLastAccTime (const char *filename);
static time_t getLastAccTime (string const &filename)
- {return getLastAccTime (filename.c_str ());}
+ {return getLastAccTime (filename.c_str ());}
static int chown (const char* filename, string &uid, string &gid);
static int chown (string const &filename, string &uid, string &gid)
- {return chown (filename.c_str (), uid, gid);}
+ {return chown (filename.c_str (), uid, gid);}
static int completePath (char**, int *size, int dontRealloc=0);
static int completePath (string &fileName);
@@ -66,15 +66,15 @@ public:
static int fileExists (const char * );
static int fileExists (string const &file)
- {return fileExists (file.c_str ());}
+ {return fileExists (file.c_str ());}
static int deleteFile (const char * );
static int deleteFile (string const &file)
- {return deleteFile (file.c_str ());}
+ {return deleteFile (file.c_str ());}
- static int renameFile (const char*, const char*);
+ static int renameFile (const char*, const char*);
static int renameFile (string const &before, string const &after)
- {return renameFile (before.c_str (), after.c_str ());}
+ {return renameFile (before.c_str (), after.c_str ());}
static int copyFile (const char*, const char*, int overwrite);
static int copyFile (File&, File&);
@@ -106,6 +106,6 @@ public:
static void setTmpPath (string & path){tmpPath.assign (path);}
private:
- static string tmpPath;
+ static string tmpPath;
};
#endif
diff --git a/myserver/include/base/files_cache/cached_file_buffer.h
b/myserver/include/base/files_cache/cached_file_buffer.h
index 4e9de07..4d2484c 100644
--- a/myserver/include/base/files_cache/cached_file_buffer.h
+++ b/myserver/include/base/files_cache/cached_file_buffer.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2006, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2006, 2007, 2008, 2009 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/>.
*/
#ifndef CACHED_FILE_BUFFER_H
diff --git a/myserver/include/base/files_cache/cached_file_factory.h
b/myserver/include/base/files_cache/cached_file_factory.h
index 9c0e98e..a00a93e 100644
--- a/myserver/include/base/files_cache/cached_file_factory.h
+++ b/myserver/include/base/files_cache/cached_file_factory.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2006, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2006, 2007, 2008, 2009 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/>.
*/
#ifndef CACHED_FILE_FACTORY_H
diff --git a/myserver/include/base/hash_map/hash_map.h
b/myserver/include/base/hash_map/hash_map.h
index fe9b7f9..e8d7a06 100644
--- a/myserver/include/base/hash_map/hash_map.h
+++ b/myserver/include/base/hash_map/hash_map.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2005, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2005, 2007, 2008, 2009 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/>.
*/
//valueType putList ( const list <keyType>&, const list <valueType>&);
@@ -35,18 +35,18 @@ using namespace std;
template <typename KeyType, typename ValueType>
struct Shkv
{
- unsigned int hash;
- KeyType key;
- ValueType value;
+ unsigned int hash;
+ KeyType key;
+ ValueType value;
};
//hashmap Hash-Key-Value Struct
template <typename ValueType>
struct Shkv <char*, ValueType>
{
- unsigned int hash;
- string key;
- ValueType value;
+ unsigned int hash;
+ string key;
+ ValueType value;
};
template <typename KeyType, typename ValueType>
@@ -55,190 +55,190 @@ class HashMap;
template <typename KeyType, typename ValueType>
class MyIterator
{
- public:
-
- template <typename KType, typename VType>
- friend class HashMap;
-
- MyIterator ();
- inline KeyType getKey () const;
-
- inline bool operator==(const MyIterator&) const;
- inline bool operator!=(const MyIterator&) const;
- inline ValueType& operator*() const;
- inline MyIterator& operator++(); //prefix
- inline MyIterator operator++(int); //postfix
- inline MyIterator& operator--(); //prefix
- inline MyIterator operator--(int); //postfix
- //inline MyIterator operator delete (void*);
-
- private:
-
- unsigned int offset;
- vector< list< Shkv<KeyType, ValueType> > > *vectorPtr;
- typename vector <unsigned int>::iterator mapIter;
- typename vector< list< Shkv<KeyType, ValueType> > >::iterator
vectorIter;
- typename list< Shkv<KeyType, ValueType> >::iterator listIter;
+public:
+
+ template <typename KType, typename VType>
+ friend class HashMap;
+
+ MyIterator ();
+ inline KeyType getKey () const;
+
+ inline bool operator==(const MyIterator&) const;
+ inline bool operator!=(const MyIterator&) const;
+ inline ValueType& operator*() const;
+ inline MyIterator& operator++(); //prefix
+ inline MyIterator operator++(int); //postfix
+ inline MyIterator& operator--(); //prefix
+ inline MyIterator operator--(int); //postfix
+ //inline MyIterator operator delete (void*);
+
+private:
+
+ unsigned int offset;
+ vector< list< Shkv<KeyType, ValueType> > > *vectorPtr;
+ typename vector <unsigned int>::iterator mapIter;
+ typename vector< list< Shkv<KeyType, ValueType> > >::iterator vectorIter;
+ typename list< Shkv<KeyType, ValueType> >::iterator listIter;
};
template <typename KeyType, typename ValueType>
class HashMap
{
- public:
-
- typedef MyIterator<KeyType, ValueType> Iterator;
-
- HashMap ();
- HashMap (int);
- HashMap (const float);
- HashMap (int, const float);
- inline bool empty (void) const;
- inline void clear (void);
- inline int size (void) const;
- inline Iterator begin (void);
- inline Iterator back (void);
- inline Iterator end (void);
- ValueType remove (const Iterator&);
- bool containsKey (const KeyType&);
- ValueType get (const KeyType&);
- Iterator getI (const KeyType&);
- ValueType put (KeyType&, const ValueType&);
- ValueType remove (const KeyType&);
-
- private:
-
- Iterator tempIterator;
- Shkv<KeyType, ValueType> tempShkv;
- vector < list < Shkv<KeyType, ValueType> > > data;
- typename list < Shkv<KeyType, ValueType> >::iterator dataIter,
tempdataIter;
- vector <unsigned int> map;
- unsigned int offset, tempHash;
- int capacity, power, mask, load;
- float highLoadFactor, lowLoadFactor;
-
- void increaseSize (const int);
- void decreaseSize (const int);
- unsigned int hash (const char *, int);
+public:
+
+ typedef MyIterator<KeyType, ValueType> Iterator;
+
+ HashMap ();
+ HashMap (int);
+ HashMap (const float);
+ HashMap (int, const float);
+ inline bool empty (void) const;
+ inline void clear (void);
+ inline int size (void) const;
+ inline Iterator begin (void);
+ inline Iterator back (void);
+ inline Iterator end (void);
+ ValueType remove (const Iterator&);
+ bool containsKey (const KeyType&);
+ ValueType get (const KeyType&);
+ Iterator getI (const KeyType&);
+ ValueType put (KeyType&, const ValueType&);
+ ValueType remove (const KeyType&);
+
+private:
+
+ Iterator tempIterator;
+ Shkv<KeyType, ValueType> tempShkv;
+ vector < list < Shkv<KeyType, ValueType> > > data;
+ typename list < Shkv<KeyType, ValueType> >::iterator dataIter, tempdataIter;
+ vector <unsigned int> map;
+ unsigned int offset, tempHash;
+ int capacity, power, mask, load;
+ float highLoadFactor, lowLoadFactor;
+
+ void increaseSize (const int);
+ void decreaseSize (const int);
+ unsigned int hash (const char *, int);
};
template <typename ValueType>
class HashMap <string, ValueType>
{
- public:
-
- typedef MyIterator<string, ValueType> Iterator;
-
- HashMap ();
- HashMap (int);
- HashMap (const float);
- HashMap (int, const float);
- inline bool empty (void) const;
- inline void clear (void);
- inline int size (void) const;
- inline Iterator begin (void);
- inline Iterator back (void);
- inline Iterator end (void);
- ValueType remove (const Iterator&);
- bool containsKey (const string&);
- ValueType get (const string&);
- Iterator getI (const string&);
- ValueType put (string&, const ValueType&);
- ValueType remove (const string&);
-
- private:
-
- Iterator tempIterator;
- Shkv<string, ValueType> tempShkv;
- vector < list < Shkv<string, ValueType> > > data;
- typename list < Shkv<string, ValueType> >::iterator dataIter,
tempdataIter;
- vector <unsigned int> map;
- unsigned int offset, tempHash;
- int capacity, power, mask, load;
- float highLoadFactor, lowLoadFactor;
-
- void increaseSize (const int);
- void decreaseSize (const int);
- unsigned int hash (const char *, int);
+public:
+
+ typedef MyIterator<string, ValueType> Iterator;
+
+ HashMap ();
+ HashMap (int);
+ HashMap (const float);
+ HashMap (int, const float);
+ inline bool empty (void) const;
+ inline void clear (void);
+ inline int size (void) const;
+ inline Iterator begin (void);
+ inline Iterator back (void);
+ inline Iterator end (void);
+ ValueType remove (const Iterator&);
+ bool containsKey (const string&);
+ ValueType get (const string&);
+ Iterator getI (const string&);
+ ValueType put (string&, const ValueType&);
+ ValueType remove (const string&);
+
+private:
+
+ Iterator tempIterator;
+ Shkv<string, ValueType> tempShkv;
+ vector < list < Shkv<string, ValueType> > > data;
+ typename list < Shkv<string, ValueType> >::iterator dataIter, tempdataIter;
+ vector <unsigned int> map;
+ unsigned int offset, tempHash;
+ int capacity, power, mask, load;
+ float highLoadFactor, lowLoadFactor;
+
+ void increaseSize (const int);
+ void decreaseSize (const int);
+ unsigned int hash (const char *, int);
};
template <typename ValueType>
class HashMap <char*, ValueType>
{
- public:
-
- typedef MyIterator<char*, ValueType> Iterator;
-
- HashMap ();
- HashMap (int);
- HashMap (const float);
- HashMap (int, const float);
- inline bool empty (void) const;
- inline void clear (void);
- inline int size (void) const;
- inline Iterator begin (void);
- inline Iterator back (void);
- inline Iterator end (void);
- ValueType remove (const Iterator&);
- bool containsKey (const char* const);
- ValueType get (const char* const);
- Iterator getI (const char* const);
- ValueType put (char* const, const ValueType&);
- ValueType remove (const char* const);
-
- private:
-
- Iterator tempIterator;
- Shkv<char*, ValueType> tempShkv;
- vector < list < Shkv<char*, ValueType> > > data;
- typename list < Shkv<char*, ValueType> >::iterator dataIter,
tempdataIter;
- vector <unsigned int> map;
- unsigned int offset, tempHash;
- int capacity, power, mask, load;
- float highLoadFactor, lowLoadFactor;
-
- void increaseSize (const int);
- void decreaseSize (const int);
- unsigned int hash (const char *, int);
+public:
+
+ typedef MyIterator<char*, ValueType> Iterator;
+
+ HashMap ();
+ HashMap (int);
+ HashMap (const float);
+ HashMap (int, const float);
+ inline bool empty (void) const;
+ inline void clear (void);
+ inline int size (void) const;
+ inline Iterator begin (void);
+ inline Iterator back (void);
+ inline Iterator end (void);
+ ValueType remove (const Iterator&);
+ bool containsKey (const char* const);
+ ValueType get (const char* const);
+ Iterator getI (const char* const);
+ ValueType put (char* const, const ValueType&);
+ ValueType remove (const char* const);
+
+private:
+
+ Iterator tempIterator;
+ Shkv<char*, ValueType> tempShkv;
+ vector < list < Shkv<char*, ValueType> > > data;
+ typename list < Shkv<char*, ValueType> >::iterator dataIter, tempdataIter;
+ vector <unsigned int> map;
+ unsigned int offset, tempHash;
+ int capacity, power, mask, load;
+ float highLoadFactor, lowLoadFactor;
+
+ void increaseSize (const int);
+ void decreaseSize (const int);
+ unsigned int hash (const char *, int);
};
template <typename ValueType>
class HashMap <void*, ValueType>
{
- public:
-
- typedef MyIterator<void*, ValueType> Iterator;
-
- HashMap ();
- HashMap (int);
- HashMap (const float);
- HashMap (int, const float);
- inline bool empty (void) const;
- inline void clear (void);
- inline int size (void) const;
- inline Iterator begin (void);
- inline Iterator back (void);
- inline Iterator end (void);
- ValueType remove (const Iterator&);
- bool containsKey (const void* const);
- ValueType get (const void* const);
- Iterator getI (const void* const);
- ValueType put (void* const, const ValueType&);
- ValueType remove (const void* const);
-
- private:
-
- Iterator tempIterator;
- Shkv<void*, ValueType> tempShkv;
- vector < list < Shkv<void*, ValueType> > > data;
- typename list < Shkv<void*, ValueType> >::iterator dataIter,
tempdataIter;
- vector <unsigned int> map;
- unsigned int offset, tempHash;
- int capacity, power, mask, load;
- float highLoadFactor, lowLoadFactor;
-
- void increaseSize (const int);
- void decreaseSize (const int);
- unsigned int hash (const char *, int);
+public:
+
+ typedef MyIterator<void*, ValueType> Iterator;
+
+ HashMap ();
+ HashMap (int);
+ HashMap (const float);
+ HashMap (int, const float);
+ inline bool empty (void) const;
+ inline void clear (void);
+ inline int size (void) const;
+ inline Iterator begin (void);
+ inline Iterator back (void);
+ inline Iterator end (void);
+ ValueType remove (const Iterator&);
+ bool containsKey (const void* const);
+ ValueType get (const void* const);
+ Iterator getI (const void* const);
+ ValueType put (void* const, const ValueType&);
+ ValueType remove (const void* const);
+
+private:
+
+ Iterator tempIterator;
+ Shkv<void*, ValueType> tempShkv;
+ vector < list < Shkv<void*, ValueType> > > data;
+ typename list < Shkv<void*, ValueType> >::iterator dataIter, tempdataIter;
+ vector <unsigned int> map;
+ unsigned int offset, tempHash;
+ int capacity, power, mask, load;
+ float highLoadFactor, lowLoadFactor;
+
+ void increaseSize (const int);
+ void decreaseSize (const int);
+ unsigned int hash (const char *, int);
};
# ifndef HASHMAP_CPP
diff --git a/myserver/include/base/home_dir/home_dir.h
b/myserver/include/base/home_dir/home_dir.h
index b288f4d..0b5d13b 100644
--- a/myserver/include/base/home_dir/home_dir.h
+++ b/myserver/include/base/home_dir/home_dir.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2006, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2006, 2008, 2009 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/>.
*/
#ifndef HOME_DIR_H
@@ -31,13 +31,13 @@ using namespace std;
class HomeDir
{
public:
- HomeDir ();
- ~HomeDir ();
+ HomeDir ();
+ ~HomeDir ();
- void clear ();
- int load ();
+ void clear ();
+ int load ();
- int getHomeDir (string& userName, string& out);
+ int getHomeDir (string& userName, string& out);
int isLoaded (){return loaded;}
@@ -48,9 +48,9 @@ private:
# ifdef WIN32
string data;
# elif !GETPWNAM
- HashMap<string, string*> data;
+ HashMap<string, string*> data;
# endif
- time_t timestamp;
- int loaded;
+ time_t timestamp;
+ int loaded;
};
#endif
diff --git a/myserver/include/base/multicast/multicast.h
b/myserver/include/base/multicast/multicast.h
index 87a6a4c..37bfdd8 100644
--- a/myserver/include/base/multicast/multicast.h
+++ b/myserver/include/base/multicast/multicast.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2007, 2008, 2009 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/>.
*/
#ifndef MULTICAST_H
@@ -33,23 +33,23 @@ template<typename MSG_TYPE, typename ARG_TYPE, typename
RET_TYPE>
class Multicast
{
public:
- virtual RET_TYPE updateMulticast (MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>*, MSG_TYPE&, ARG_TYPE) = 0;
- virtual ~Multicast (){}
+ virtual RET_TYPE updateMulticast (MulticastRegistry<MSG_TYPE, ARG_TYPE,
RET_TYPE>*, MSG_TYPE&, ARG_TYPE) = 0;
+ virtual ~Multicast (){}
};
template<typename MSG_TYPE, typename ARG_TYPE, typename RET_TYPE>
class MulticastRegistry
{
public:
- void addMulticast (MSG_TYPE, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*);
- void removeMulticast (MSG_TYPE, Multicast<MSG_TYPE, ARG_TYPE,
RET_TYPE>*);
- void notifyMulticast (MSG_TYPE&, ARG_TYPE);
+ void addMulticast (MSG_TYPE, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*);
+ void removeMulticast (MSG_TYPE, Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*);
+ void notifyMulticast (MSG_TYPE&, ARG_TYPE);
protected:
- void removeMulticasts (MSG_TYPE);
- vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>* getHandlers
(MSG_TYPE&);
- void clearMulticastRegistry ();
+ void removeMulticasts (MSG_TYPE);
+ vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>* getHandlers (MSG_TYPE&);
+ void clearMulticastRegistry ();
private:
- HashMap<MSG_TYPE, vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>*>
handlers;
+ HashMap<MSG_TYPE, vector<Multicast<MSG_TYPE, ARG_TYPE, RET_TYPE>*>*>
handlers;
};
diff --git a/myserver/include/base/pipe/pipe.h
b/myserver/include/base/pipe/pipe.h
index 7268b00..5095e3a 100644
--- a/myserver/include/base/pipe/pipe.h
+++ b/myserver/include/base/pipe/pipe.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2008, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2008, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PIPE_H
diff --git a/myserver/include/base/process/process.h
b/myserver/include/base/process/process.h
index e7e1ad6..1cf3fc9 100644
--- a/myserver/include/base/process/process.h
+++ b/myserver/include/base/process/process.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 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/>.
*/
#ifndef PROCESS_H
@@ -39,21 +39,21 @@ struct StartProcInfo
handlesToClose = NULL;
}
- /*! STDIN file for new process. */
- FileHandle stdIn;
+ /*! STDIN file for new process. */
+ FileHandle stdIn;
- /*! STDOUT file for new process. */
- FileHandle stdOut;
+ /*! STDOUT file for new process. */
+ FileHandle stdOut;
- /*! STDERR file for new process. */
- FileHandle stdError;
+ /*! STDERR file for new process. */
+ FileHandle stdError;
- string cmdLine;
- string cwd;
+ string cmdLine;
+ string cwd;
- /*! added for unix support. */
- string cmd;
- string arg;
+ /*! added for unix support. */
+ string cmd;
+ string arg;
/*! Group id for the new process. */
string gid;
@@ -61,7 +61,7 @@ struct StartProcInfo
/*! User id for the new process. */
string uid;
- void *envString;
+ void *envString;
/*! Pointer to a NULL terminated array of
* file pointers to close. */
@@ -77,19 +77,19 @@ class Process
{
public:
# ifdef HAVE_PTHREAD
- static Mutex forkMutex;
- static void forkPrepare ();
- static void forkParent ();
- static void forkChild ();
+ static Mutex forkMutex;
+ static void forkPrepare ();
+ static void forkParent ();
+ static void forkChild ();
# endif
- static void initialize ();
+ static void initialize ();
int exec (StartProcInfo *spi, bool waitEnd = false);
int terminateProcess ();
int isProcessAlive ();
static int chroot (const char *root);
static int setuid (const char*);
static int setgid (const char*);
- static int setAdditionalGroups (u_long len, u_long *groups);
+ static int setAdditionalGroups (u_long len, u_long *groups);
Process ();
~Process ();
diff --git a/myserver/include/base/process/process_server_manager.h
b/myserver/include/base/process/process_server_manager.h
index cbcaa98..83f9086 100644
--- a/myserver/include/base/process/process_server_manager.h
+++ b/myserver/include/base/process/process_server_manager.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2008, 2009 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.
+ MyServer
+ Copyright (C) 2007, 2008, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PROCESS_SERVER_MANAGER_H
@@ -36,71 +36,71 @@ using namespace std;
class ProcessServerManager
{
public:
- struct Server
- {
- /* Server executable path. */
- string path;
+ struct Server
+ {
+ /* Server executable path. */
+ string path;
- union
- {
- unsigned long fileHandle;
- SocketHandle sock;
- unsigned int value;
- }DESCRIPTOR;
+ union
+ {
+ unsigned long fileHandle;
+ SocketHandle sock;
+ unsigned int value;
+ }DESCRIPTOR;
- Socket socket;
- string host;
- Process process;
- u_short port;
- struct ServerDomain *sd;
- bool isLocal;
+ Socket socket;
+ string host;
+ Process process;
+ u_short port;
+ struct ServerDomain *sd;
+ bool isLocal;
- void terminate ()
- {
- if (isLocal)
- {
- socket.close ();
- process.terminateProcess ();
- }
- }
- };
+ void terminate ()
+ {
+ if (isLocal)
+ {
+ socket.close ();
+ process.terminateProcess ();
+ }
+ }
+ };
- struct ServerDomain
- {
- string domainName;
- HashMap<string, vector<Server*> *> servers;
- void (*clear)(Server*);
- ServerDomain ()
- {
- clear = 0;
- }
- };
+ struct ServerDomain
+ {
+ string domainName;
+ HashMap<string, vector<Server*> *> servers;
+ void (*clear)(Server*);
+ ServerDomain ()
+ {
+ clear = 0;
+ }
+ };
- ServerDomain *createDomain (const char *name);
- ServerDomain *getDomain (const char *name);
- void clear ();
- Server *getServer (const char *domain, const char *name, int seed = 0);
- ProcessServerManager ();
- ~ProcessServerManager ();
- int connect (Socket *sock, Server *server);
- void setMaxServers (int max){maxServers = max;}
- int getMaxServers (){return maxServers;}
- void removeDomain (const char *domain);
- int domainServers (const char *domain);
- void load ();
- Server *runAndAddServer (const char *domain, const char *name,
- const char *chroot = NULL, int uid = 0,
- int gid = 0, u_short port = 0);
- Server *addRemoteServer (const char *domain, const char *name,
-
const char *host, u_short port);
+ ServerDomain *createDomain (const char *name);
+ ServerDomain *getDomain (const char *name);
+ void clear ();
+ Server *getServer (const char *domain, const char *name, int seed = 0);
+ ProcessServerManager ();
+ ~ProcessServerManager ();
+ int connect (Socket *sock, Server *server);
+ void setMaxServers (int max){maxServers = max;}
+ int getMaxServers (){return maxServers;}
+ void removeDomain (const char *domain);
+ int domainServers (const char *domain);
+ void load ();
+ Server *runAndAddServer (const char *domain, const char *name,
+ const char *chroot = NULL, int uid = 0,
+ int gid = 0, u_short port = 0);
+ Server *addRemoteServer (const char *domain, const char *name,
+ const char *host, u_short port);
private:
- int maxServers;
- int nServers;
+ int maxServers;
+ int nServers;
Mutex mutex;
- HashMap<string, ServerDomain*> domains;
+ HashMap<string, ServerDomain*> domains;
int runServer (Server *server, const char *path, u_short port = 0,
const char *chroot = NULL, int uid = 0, int gid = 0);
- void addServer (Server *server, const char *domain, const char *name);
+ void addServer (Server *server, const char *domain, const char *name);
};
#endif
diff --git a/myserver/include/base/read_directory/read_directory.h
b/myserver/include/base/read_directory/read_directory.h
index e8552a4..6a2931a 100644
--- a/myserver/include/base/read_directory/read_directory.h
+++ b/myserver/include/base/read_directory/read_directory.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2008, 2009 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/>.
*/
#ifndef FIND_DATA_H
diff --git a/myserver/include/base/regex/myserver_regex.h
b/myserver/include/base/regex/myserver_regex.h
index bacce75..5f07fd1 100644
--- a/myserver/include/base/regex/myserver_regex.h
+++ b/myserver/include/base/regex/myserver_regex.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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/>.
*/
#ifndef MYSERVER_REGEX_H
@@ -44,15 +44,15 @@ public:
int isCompiled ();
int compile (const char *pattern, int flags);
int exec (const char *string, size_t nmatch, regmatch_t matchptr [],
- int eflags);
+ 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 );}
+ return compile (str.c_str (), flags );}
int exec (string const &str, size_t nmatch, regmatch_t matchptr [],
- int eflags)
- {return exec (str.c_str (), nmatch, matchptr, eflags);}
+ int eflags)
+ {return exec (str.c_str (), nmatch, matchptr, eflags);}
private:
regex_t compiledRegex;
regmatch_t match;
diff --git a/myserver/include/base/safetime/safetime.h
b/myserver/include/base/safetime/safetime.h
index 67ad34c..e3e3e66 100644
--- a/myserver/include/base/safetime/safetime.h
+++ b/myserver/include/base/safetime/safetime.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2009 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/>.
+ MyServer
+ Copyright (C) 2007, 2009 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/>.
*/
#ifndef SAFETIME_H
diff --git a/myserver/include/base/slab/slab.h
b/myserver/include/base/slab/slab.h
index 459b6a1..0be95a8 100644
--- a/myserver/include/base/slab/slab.h
+++ b/myserver/include/base/slab/slab.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2009 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/>.
+ MyServer
+ Copyright (C) 2009 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/>.
*/
#ifndef SLAB_H
diff --git a/myserver/include/base/socket/socket.h
b/myserver/include/base/socket/socket.h
index 4f1e495..8f79913 100644
--- a/myserver/include/base/socket/socket.h
+++ b/myserver/include/base/socket/socket.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 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/>.
*/
#ifndef SOCKET_H
diff --git a/myserver/include/base/socket/ssl_socket.h
b/myserver/include/base/socket/ssl_socket.h
index ae9b59c..24405c7 100644
--- a/myserver/include/base/socket/ssl_socket.h
+++ b/myserver/include/base/socket/ssl_socket.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 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/>.
*/
#ifndef SSL_SOCKET_H
@@ -45,34 +45,34 @@ class SslSocket : public Socket
{
public:
- int setSSLContext (SSL_CTX*);
- int sslAccept ();
+ int setSSLContext (SSL_CTX*);
+ int sslAccept ();
- int freeSSL ();
- SSL* getSSLConnection ();
+ int freeSSL ();
+ SSL* getSSLConnection ();
- virtual int close ();
- virtual int shutdown (int how);
- virtual int connect (MYSERVER_SOCKADDR* sa, int na);
- virtual int recv (char* buffer,int len,int flags);
- virtual int rawSend (const char* buffer, int len, int flags);
- virtual u_long bytesToRead ();
+ virtual int close ();
+ virtual int shutdown (int how);
+ virtual int connect (MYSERVER_SOCKADDR* sa, int na);
+ virtual int recv (char* buffer,int len,int flags);
+ virtual int rawSend (const char* buffer, int len, int flags);
+ virtual u_long bytesToRead ();
# ifdef __HURD__
- virtual int dataOnRead (int sec = 1, int usec = 500);
+ virtual int dataOnRead (int sec = 1, int usec = 500);
# else
- virtual int dataOnRead (int sec = 0, int usec = 500);
+ virtual int dataOnRead (int sec = 0, int usec = 500);
# endif
- SslSocket (Socket*);
- virtual ~SslSocket ();
+ SslSocket (Socket*);
+ virtual ~SslSocket ();
protected:
- bool externalContext;
- Socket* socket;
- SSL *sslConnection;
- SSL_CTX *sslContext;
- const X509 *clientCert;
+ bool externalContext;
+ Socket* socket;
+ SSL *sslConnection;
+ SSL_CTX *sslContext;
+ const X509 *clientCert;
/*! This is used only by clients sockets. */
SSL_METHOD* sslMethod;
diff --git a/myserver/include/base/ssl/ssl.h b/myserver/include/base/ssl/ssl.h
index 34480f4..01c3c78 100644
--- a/myserver/include/base/ssl/ssl.h
+++ b/myserver/include/base/ssl/ssl.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2007, 2008, 2009 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/>.
*/
#ifndef SSL_H
@@ -29,29 +29,29 @@ using namespace std;
class SslContext
{
public:
- SslContext ();
+ SslContext ();
- int initialize ();
- int free ();
+ int initialize ();
+ int free ();
- SSL_CTX* getContext (){return context;}
- SSL_METHOD* getMethod (){return method;}
+ SSL_CTX* getContext (){return context;}
+ SSL_METHOD* getMethod (){return method;}
- string& getCertificateFile (){return certificateFile;}
- string& getPrivateKeyFile (){return privateKeyFile;}
- string& getPassword (){return password;}
+ string& getCertificateFile (){return certificateFile;}
+ string& getPrivateKeyFile (){return privateKeyFile;}
+ string& getPassword (){return password;}
- void setCertificateFile (string& c){certificateFile.assign (c);}
- void setPrivateKeyFile (string& pk){privateKeyFile.assign (pk);}
- void setPassword (string& p){password.assign (p);}
+ void setCertificateFile (string& c){certificateFile.assign (c);}
+ void setPrivateKeyFile (string& pk){privateKeyFile.assign (pk);}
+ void setPassword (string& p){password.assign (p);}
private:
- SSL_CTX* context;
- SSL_METHOD* method;
+ SSL_CTX* context;
+ SSL_METHOD* method;
- string certificateFile;
- string privateKeyFile;
- string password;
+ string certificateFile;
+ string privateKeyFile;
+ string password;
};
void initializeSSL ();
diff --git a/myserver/include/base/string/securestr.h
b/myserver/include/base/string/securestr.h
index 110ad30..ce84278 100644
--- a/myserver/include/base/string/securestr.h
+++ b/myserver/include/base/string/securestr.h
@@ -1,21 +1,21 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-* strlcpy and strlcat by codingmaster
-Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
-Copyright (C) 2004 by codingmaster
-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.
+ MyServer
+ * strlcpy and strlcat by codingmaster
+ Copyright (C) 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2004 by codingmaster
+ 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.
+ 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/>.
+ 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"
#ifndef SECURESTR_H
diff --git a/myserver/include/base/string/stringutils.h
b/myserver/include/base/string/stringutils.h
index 6455c4c..dfff3b4 100644
--- a/myserver/include/base/string/stringutils.h
+++ b/myserver/include/base/string/stringutils.h
@@ -78,7 +78,7 @@ int stringcmp (string const &a, const char* b);
# ifndef WIN32
extern "C"
{
-char* strupr (char * string);
+ char* strupr (char * string);
# include <string.h>
}
# endif
diff --git a/myserver/include/base/sync/event.h
b/myserver/include/base/sync/event.h
index 7f0eed9..7c94601 100644
--- a/myserver/include/base/sync/event.h
+++ b/myserver/include/base/sync/event.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2006, 2009 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.
+ MyServer
+ Copyright (C) 2006, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef EVENT_H
@@ -23,29 +23,29 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
# include <include/base/sync/mutex.h>
# ifdef HAVE_PTHREAD
- typedef pthread_cond_t EventHandle;
+typedef pthread_cond_t EventHandle;
# else
- typedef HANDLE EventHandle;
+typedef HANDLE EventHandle;
# endif
class Event
{
private:
- bool initialized;
- bool broadcast;
+ bool initialized;
+ bool broadcast;
# ifdef HAVE_PTHREAD
- /*!
- *Under pthread a condition is associated with a mutex.
- */
- pthread_mutex_t mutex;
+ /*!
+ *Under pthread a condition is associated with a mutex.
+ */
+ pthread_mutex_t mutex;
# endif
- EventHandle event;
+ EventHandle event;
public:
- Event (bool broadcast);
- ~Event ();
- int init (bool broadcast);
- int destroy ();
- int wait (u_long id = 0, u_long timeout = 0);
- int signal (u_long id = 0);
+ Event (bool broadcast);
+ ~Event ();
+ int init (bool broadcast);
+ int destroy ();
+ int wait (u_long id = 0, u_long timeout = 0);
+ int signal (u_long id = 0);
};
#endif
diff --git a/myserver/include/base/sync/mutex.h
b/myserver/include/base/sync/mutex.h
index 8e63cfb..9c44fa8 100644
--- a/myserver/include/base/sync/mutex.h
+++ b/myserver/include/base/sync/mutex.h
@@ -1,20 +1,20 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2008, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2008, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MUTEX_H
@@ -25,25 +25,25 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
# include <include/base/string/stringutils.h>
# ifdef HAVE_PTHREAD
- typedef pthread_mutex_t MutexHandle;
+typedef pthread_mutex_t MutexHandle;
# else
- typedef HANDLE MutexHandle;
+typedef HANDLE MutexHandle;
# endif
class Mutex
{
public:
- Mutex ();
- virtual ~Mutex ();
- virtual int init ();
- int destroy ();
- int lock (u_long id = 0);
- int unlock (u_long id = 0);
+ Mutex ();
+ virtual ~Mutex ();
+ virtual int init ();
+ int destroy ();
+ int lock (u_long id = 0);
+ int unlock (u_long id = 0);
bool isLocked ();
MutexHandle getHandle ();
protected:
bool locked;
- int initialized;
- MutexHandle mutex;
+ int initialized;
+ MutexHandle mutex;
};
#endif
diff --git a/myserver/include/base/sync/read_write_lock.h
b/myserver/include/base/sync/read_write_lock.h
index 9d64038..3df349b 100644
--- a/myserver/include/base/sync/read_write_lock.h
+++ b/myserver/include/base/sync/read_write_lock.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2009 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.
+ MyServer
+ Copyright (C) 2007, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef READ_WRITE_LOCK_H
@@ -25,15 +25,15 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class ReadWriteLock
{
public:
- ReadWriteLock (int maxReaders);
- ~ReadWriteLock ();
- void readLock ();
- void readUnlock ();
+ ReadWriteLock (int maxReaders);
+ ~ReadWriteLock ();
+ void readLock ();
+ void readUnlock ();
- void writeLock ();
- void writeUnlock ();
+ void writeLock ();
+ void writeUnlock ();
private:
- int maxReaders;
- Semaphore semaphore;
+ int maxReaders;
+ Semaphore semaphore;
};
#endif
diff --git a/myserver/include/base/sync/recursive_mutex.h
b/myserver/include/base/sync/recursive_mutex.h
index 2d300c7..0febed1 100644
--- a/myserver/include/base/sync/recursive_mutex.h
+++ b/myserver/include/base/sync/recursive_mutex.h
@@ -1,20 +1,20 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2008, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2008, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef RECURSIVE_MUTEX_H
@@ -27,8 +27,8 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class RecursiveMutex : public Mutex
{
public:
- RecursiveMutex ();
- virtual ~RecursiveMutex ();
- virtual int init ();
+ RecursiveMutex ();
+ virtual ~RecursiveMutex ();
+ virtual int init ();
};
#endif
diff --git a/myserver/include/base/sync/semaphore.h
b/myserver/include/base/sync/semaphore.h
index 48e02c2..62f4b4b 100644
--- a/myserver/include/base/sync/semaphore.h
+++ b/myserver/include/base/sync/semaphore.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2006, 2007, 2008, 2009 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.
+ MyServer
+ Copyright (C) 2006, 2007, 2008, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SEMAPHORE_H
@@ -31,16 +31,16 @@ typedef HANDLE SemaphoreHandle;
class Semaphore
{
public:
- Semaphore (int n);
- ~Semaphore ();
- int init (int n);
- int destroy ();
- int lock (u_long id = 0);
- int unlock (u_long id = 0);
+ Semaphore (int n);
+ ~Semaphore ();
+ int init (int n);
+ int destroy ();
+ int lock (u_long id = 0);
+ int unlock (u_long id = 0);
SemaphoreHandle *getHandle (){return &semaphore;}
int isInitialized (){return initialized;}
private:
- int initialized;
- SemaphoreHandle semaphore;
+ int initialized;
+ SemaphoreHandle semaphore;
};
#endif
diff --git a/myserver/include/base/thread/thread.h
b/myserver/include/base/thread/thread.h
index 2c45c47..dc03e7b 100644
--- a/myserver/include/base/thread/thread.h
+++ b/myserver/include/base/thread/thread.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2007, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef THREAD_H
@@ -24,11 +24,11 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
# include <include/base/string/stringutils.h>
# ifdef WIN32
- typedef unsigned int ThreadID;
+typedef unsigned int ThreadID;
# define DEFINE_THREAD(NAME,PARAM) unsigned int __stdcall NAME (void* PARAM)
# endif
# ifdef HAVE_PTHREAD
- typedef pthread_t ThreadID;
+typedef pthread_t ThreadID;
# define DEFINE_THREAD(NAME,PARAM) void* NAME (void* PARAM)
# endif
@@ -36,16 +36,16 @@ class Thread
{
public:
static void wait (u_long);
- static ThreadID threadID ();
+ static ThreadID threadID ();
# ifdef WIN32
- static int create (ThreadID* thread,
- unsigned int (_stdcall *start_routine)(void *), void * arg);
+ 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 *),
- void * arg);
+ static int create (ThreadID* thread, void * (*start_routine)(void *),
+ void * arg);
# endif
- static void terminate ();
- static int join (ThreadID);
+ static void terminate ();
+ static int join (ThreadID);
};
#endif
diff --git a/myserver/include/base/unix_socket/unix_socket.h
b/myserver/include/base/unix_socket/unix_socket.h
index 985aef9..66f5fe1 100644
--- a/myserver/include/base/unix_socket/unix_socket.h
+++ b/myserver/include/base/unix_socket/unix_socket.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2009 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.
+ MyServer
+ Copyright (C) 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef UNIX_SOCKET_H
diff --git a/myserver/include/base/utility.h b/myserver/include/base/utility.h
index 067023d..ea1d2d0 100644
--- a/myserver/include/base/utility.h
+++ b/myserver/include/base/utility.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2006, 2008, 2009 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/>.
*/
#ifndef UTILITY_H
diff --git a/myserver/include/base/xml/xml_parser.h
b/myserver/include/base/xml/xml_parser.h
index 77a038f..bd0382d 100644
--- a/myserver/include/base/xml/xml_parser.h
+++ b/myserver/include/base/xml/xml_parser.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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/>.
*/
#ifndef CXMLPARSER_IN
diff --git a/myserver/include/conf/main/main_configuration.h
b/myserver/include/conf/main/main_configuration.h
index 02ba8ca..3feee7e 100644
--- a/myserver/include/conf/main/main_configuration.h
+++ b/myserver/include/conf/main/main_configuration.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2009 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/>.
+ MyServer
+ Copyright (C) 2009 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/>.
*/
#ifndef MAIN_CONFIGURATION_H
diff --git a/myserver/include/conf/main/xml_main_configuration.h
b/myserver/include/conf/main/xml_main_configuration.h
index 51d9d79..4baf3ff 100644
--- a/myserver/include/conf/main/xml_main_configuration.h
+++ b/myserver/include/conf/main/xml_main_configuration.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2009 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.
+ MyServer
+ Copyright (C) 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef XML_MAIN_CONFIGURATION_H
diff --git a/myserver/include/conf/security/auth_domain.h
b/myserver/include/conf/security/auth_domain.h
index 6959aa5..df372dd 100644
--- a/myserver/include/conf/security/auth_domain.h
+++ b/myserver/include/conf/security/auth_domain.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2008, 2009 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/>.
*/
#ifndef AUTH_DOMAIN_H
diff --git a/myserver/include/conf/security/auth_method.h
b/myserver/include/conf/security/auth_method.h
index 18b85a8..834ca57 100644
--- a/myserver/include/conf/security/auth_method.h
+++ b/myserver/include/conf/security/auth_method.h
@@ -1,20 +1,20 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2008, 2009 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/>.
*/
#ifndef AUTH_METHOD_H
diff --git a/myserver/include/conf/security/auth_method_factory.h
b/myserver/include/conf/security/auth_method_factory.h
index 7758fc0..82d288e 100644
--- a/myserver/include/conf/security/auth_method_factory.h
+++ b/myserver/include/conf/security/auth_method_factory.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2008, 2009 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/>.
*/
#ifndef AUTH_METHOD_FACTORY_H
@@ -40,6 +40,6 @@ public:
private:
CryptAlgoManager *cryptAlgoManager;
- HashMap<string, AuthMethod*> authMethods;
+ HashMap<string, AuthMethod*> authMethods;
};
#endif
diff --git a/myserver/include/conf/security/security_cache.h
b/myserver/include/conf/security/security_cache.h
index f6e361b..cfde7a1 100644
--- a/myserver/include/conf/security/security_cache.h
+++ b/myserver/include/conf/security/security_cache.h
@@ -45,12 +45,13 @@ public:
XmlParser* getParser (const string &dir, const string &sys, bool useXpath =
true,
const char* secName = ".security.xml", u_long maxSize
= 0);
- int getSecurityFile (const string &file, const string &sys, string
&out, const char* secName = ".security.xml");
+ int getSecurityFile (const string &file, const string &sys,
+ string &out, const char* secName = ".security.xml");
/////////OLD NASTY AND DISGUSTING. TEMPORARY SOLUTION TO DON'T BREAK
APIs////////////////////////////////////
int getPermissionMask (SecurityToken* st){return 0;}
int getErrorFileName (const char *root, int error,
- const char* sysdirectory, string& out){return 0;}
+ const char* sysdirectory, string& out){return 0;}
private:
/*! Store a list of opened files using a hash dictionary. */
diff --git a/myserver/include/conf/security/security_domain.h
b/myserver/include/conf/security/security_domain.h
index b0919a5..f143b72 100644
--- a/myserver/include/conf/security/security_domain.h
+++ b/myserver/include/conf/security/security_domain.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2008, 2009 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/>.
*/
#ifndef SECURITY_DOMAIN_H
diff --git a/myserver/include/conf/security/security_manager.h
b/myserver/include/conf/security/security_manager.h
index c646015..5f77f2f 100644
--- a/myserver/include/conf/security/security_manager.h
+++ b/myserver/include/conf/security/security_manager.h
@@ -1,20 +1,20 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2008, 2009 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/>.
*/
#ifndef SECURITY_MANAGER_H
@@ -43,28 +43,28 @@ class Server;
*Define permissions flags.
*/
enum PERMISSION_MASK
-{
- /*! No permissions. */
- MYSERVER_PERMISSION_NONE = 0,
+ {
+ /*! No permissions. */
+ MYSERVER_PERMISSION_NONE = 0,
- /*! Current user can read the file. */
- MYSERVER_PERMISSION_READ = (1<<0),
+ /*! Current user can read the file. */
+ MYSERVER_PERMISSION_READ = (1<<0),
- /*! Current user can write to the file. */
- MYSERVER_PERMISSION_WRITE = (1<<1),
+ /*! Current user can write to the file. */
+ MYSERVER_PERMISSION_WRITE = (1<<1),
- /*! Current user can execute the file. */
- MYSERVER_PERMISSION_EXECUTE = (1<<2),
+ /*! Current user can execute the file. */
+ MYSERVER_PERMISSION_EXECUTE = (1<<2),
- /*! Current user can remove the file. */
- MYSERVER_PERMISSION_DELETE = (1<<3),
+ /*! Current user can remove the file. */
+ MYSERVER_PERMISSION_DELETE = (1<<3),
- /*! Current user can browse the directory content. */
- MYSERVER_PERMISSION_BROWSE = (1<<4),
+ /*! Current user can browse the directory content. */
+ MYSERVER_PERMISSION_BROWSE = (1<<4),
- /*! All permissions. */
- MYSERVER_PERMISSION_ALL = -1
-};
+ /*! All permissions. */
+ MYSERVER_PERMISSION_ALL = -1
+ };
class SecurityManager
{
diff --git a/myserver/include/conf/security/validator.h
b/myserver/include/conf/security/validator.h
index ba7343d..abaee15 100644
--- a/myserver/include/conf/security/validator.h
+++ b/myserver/include/conf/security/validator.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2008, 2009 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/>.
*/
#ifndef VALIDATOR_H
@@ -46,7 +46,7 @@ public:
AuthMethod* authMethod);
virtual int getPermissionMaskImpl (SecurityToken* st,
- HashMap<string, SecurityDomain*> *hashedDomains,
+ HashMap<string, SecurityDomain*>
*hashedDomains,
AuthMethod* authMethod);
diff --git a/myserver/include/conf/security/validator_factory.h
b/myserver/include/conf/security/validator_factory.h
index 08033fd..687246f 100644
--- a/myserver/include/conf/security/validator_factory.h
+++ b/myserver/include/conf/security/validator_factory.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2008, 2009 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.
+ MyServer
+ Copyright (C) 2008, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef VALIDATOR_FACTORY_H
@@ -36,6 +36,6 @@ public:
Validator* addValidator (string &name, Validator* validator);
bool isValidatorPresent (string &name);
private:
- HashMap<string, Validator*> validators;
+ HashMap<string, Validator*> validators;
};
#endif
diff --git a/myserver/include/conf/vhost/ip.h b/myserver/include/conf/vhost/ip.h
index d1af85a..cd1d748 100644
--- a/myserver/include/conf/vhost/ip.h
+++ b/myserver/include/conf/vhost/ip.h
@@ -24,7 +24,7 @@
class IpRange
{
- public:
+public:
virtual bool InRange (const std::string &ip) = 0;
virtual bool InRange (const IpRange *pRange) = 0;
diff --git a/myserver/include/conf/xml_conf.h b/myserver/include/conf/xml_conf.h
index 38f659c..e3fd8b0 100644
--- a/myserver/include/conf/xml_conf.h
+++ b/myserver/include/conf/xml_conf.h
@@ -34,12 +34,12 @@ using namespace std;
*/
class XmlConf
{
- public:
+public:
static int build (xmlNodePtr root,
list<NodeTree<string>*> *rootNodes,
HashMap<string, NodeTree<string>*> *hashedData);
- protected:
+protected:
static void readNode (xmlNodePtr lcur,
NodeTree<string> *root,
list<NodeTree<string>*> *rootNodes,
diff --git a/myserver/include/connections_scheduler/connections_scheduler.h
b/myserver/include/connections_scheduler/connections_scheduler.h
index 5fe13bd..fd93490 100644
--- a/myserver/include/connections_scheduler/connections_scheduler.h
+++ b/myserver/include/connections_scheduler/connections_scheduler.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2007, 2008, 2009 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/>.
*/
#ifndef CONNECTIONS_SCHEDULER_H
@@ -77,7 +77,7 @@ public:
ConnectionsScheduler* scheduler;
SocketPair socketPair;
Socket socketPairWrite;
- };
+ };
ConnectionsScheduler (Server* server = NULL);
~ConnectionsScheduler ();
diff --git a/myserver/include/connections_scheduler/listen_threads.h
b/myserver/include/connections_scheduler/listen_threads.h
index 1b3af00..782f2b3 100644
--- a/myserver/include/connections_scheduler/listen_threads.h
+++ b/myserver/include/connections_scheduler/listen_threads.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2009 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.
+ MyServer
+ Copyright (C) 2007, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LISTEN_THREADS_H
# define LISTEN_THREADS_H
@@ -27,37 +27,37 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class ListenThreads
{
public:
- void addListeningThread (u_short port);
- int initialize ();
- int terminate ();
- /*! Initialize the shutdown phase. */
- void shutdown (){shutdownStatus = true;}
- /*! Is it shutdown phase? */
- bool isShutdown (){return shutdownStatus;}
- void commitFastReboot ();
- void beginFastReboot ();
- void rollbackFastReboot ();
- ListenThreads (ConnectionsScheduler*, Server*);
+ void addListeningThread (u_short port);
+ int initialize ();
+ int terminate ();
+ /*! Initialize the shutdown phase. */
+ void shutdown (){shutdownStatus = true;}
+ /*! Is it shutdown phase? */
+ bool isShutdown (){return shutdownStatus;}
+ void commitFastReboot ();
+ void beginFastReboot ();
+ void rollbackFastReboot ();
+ ListenThreads (ConnectionsScheduler*, Server*);
private:
- struct SocketInformation
- {
- Socket *ipv4;
- Socket *ipv6;
- u_short port;
- ConnectionsScheduler::ListenerArg laIpv4;
- ConnectionsScheduler::ListenerArg laIpv6;
- };
+ struct SocketInformation
+ {
+ Socket *ipv4;
+ Socket *ipv6;
+ u_short port;
+ ConnectionsScheduler::ListenerArg laIpv4;
+ ConnectionsScheduler::ListenerArg laIpv6;
+ };
- bool fastRebooting;
- bool committingFastReboot;
- list<u_short> frPortsToAdd;
- list <SocketInformation*> frPortsToRemove;
+ bool fastRebooting;
+ bool committingFastReboot;
+ list<u_short> frPortsToAdd;
+ list <SocketInformation*> frPortsToRemove;
- bool shutdownStatus;
- HashMap<u_short, SocketInformation*> usedPorts;
- int createServerAndListener (u_short port);
- void registerListener (SocketInformation*);
+ bool shutdownStatus;
+ HashMap<u_short, SocketInformation*> usedPorts;
+ int createServerAndListener (u_short port);
+ void registerListener (SocketInformation*);
Server *server;
ConnectionsScheduler *scheduler;
diff --git a/myserver/include/filter/filter.h b/myserver/include/filter/filter.h
index 403738b..8463aaa 100644
--- a/myserver/include/filter/filter.h
+++ b/myserver/include/filter/filter.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2005, 2007, 2009 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.
+ MyServer
+ Copyright (C) 2005, 2007, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef FILTER_H
@@ -40,8 +40,8 @@ public:
virtual int getFooter (char* buffer, u_long len, u_long* nbw);
virtual int read (char* buffer, u_long len, u_long*);
virtual int write (const char* buffer, u_long len, u_long*);
- virtual int flush (u_long*);
- virtual int modifyData ();
+ virtual int flush (u_long*);
+ virtual int modifyData ();
virtual const char* getName (char*, u_long);
void setParent (Stream*);
Stream* getParent ();
diff --git a/myserver/include/filter/filters_factory.h
b/myserver/include/filter/filters_factory.h
index 6f55b63..c9f28ff 100644
--- a/myserver/include/filter/filters_factory.h
+++ b/myserver/include/filter/filters_factory.h
@@ -1,20 +1,20 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2007, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2007, 2009 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/>.
*/
#ifndef FILTERS_FACTORY_H
@@ -47,7 +47,7 @@ public:
int insert (const char*, FiltersSource* ptr);
Filter *getFilter (const char*);
FiltersChain* chain (list<string> &l, Stream* out, u_long *nbw,
- int onlyNotModifiers = 0);
+ int onlyNotModifiers = 0);
int chain (FiltersChain*, list<string> &l, Stream* out, u_long *nbw,
int onlyNotModifiers = 0, string *accepted = NULL);
diff --git a/myserver/include/filter/gzip/gzip.h
b/myserver/include/filter/gzip/gzip.h
index 0995039..4b926f0 100644
--- a/myserver/include/filter/gzip/gzip.h
+++ b/myserver/include/filter/gzip/gzip.h
@@ -27,8 +27,8 @@
# define z_stream (void*)
# endif
-# define GZIP_HEADER_LENGTH 10
-# define GZIP_FOOTER_LENGTH 8
+# define GZIP_HEADER_LENGTH 10
+# define GZIP_FOOTER_LENGTH 8
extern char GZIP_HEADER[];
class Gzip : public Filter
diff --git a/myserver/include/filter/gzip/gzip_decompress.h
b/myserver/include/filter/gzip/gzip_decompress.h
index 92fe2dd..471229f 100644
--- a/myserver/include/filter/gzip/gzip_decompress.h
+++ b/myserver/include/filter/gzip/gzip_decompress.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GZIP_DECOMPRESS_H
@@ -33,43 +33,43 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
class GzipDecompress : public Filter
{
public:
- struct GzipData
- {
- z_stream stream;
- u_long crc;
- u_long data_size;
- u_long initialized;
- };
+ struct GzipData
+ {
+ z_stream stream;
+ u_long crc;
+ u_long data_size;
+ u_long initialized;
+ };
GzipDecompress ();
~GzipDecompress ();
- u_long updateCRC (char* buffer,int size);
- u_long getFooter (char *str,int size);
- u_long initialize ();
- u_long decompress (const char* in, u_long sizeIn,
-
char *out,u_long sizeOut);
- u_long free ();
- u_long flush (char *out,u_long sizeOut);
- u_long getHeader (char *buffer,u_long buffersize);
+ u_long updateCRC (char* buffer,int size);
+ u_long getFooter (char *str,int size);
+ u_long initialize ();
+ u_long decompress (const char* in, u_long sizeIn,
+ char *out,u_long sizeOut);
+ u_long free ();
+ u_long flush (char *out,u_long sizeOut);
+ u_long getHeader (char *buffer,u_long buffersize);
static Filter* factory (const char* name);
- static u_long headerSize ();
- static u_long footerSize ();
+ static u_long headerSize ();
+ static u_long footerSize ();
/*! From Filter*/
virtual int getHeader (char* buffer, u_long len, u_long* nbw);
virtual int getFooter (char* buffer, u_long len, u_long* nbw);
virtual int read (char* buffer, u_long len, u_long*);
virtual int write (const char* buffer, u_long len, u_long*);
- virtual int flush (u_long*);
- virtual int modifyData ();
+ virtual int flush (u_long*);
+ virtual int modifyData ();
virtual const char* getName (char* name, u_long len);
private:
- int active;
- GzipData data;
+ int active;
+ GzipData data;
};
diff --git a/myserver/include/filter/memory_stream.h
b/myserver/include/filter/memory_stream.h
index a74e911..e38122e 100644
--- a/myserver/include/filter/memory_stream.h
+++ b/myserver/include/filter/memory_stream.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef MEMORY_STREAM_H
diff --git a/myserver/include/http_handler/cgi/cgi.h
b/myserver/include/http_handler/cgi/cgi.h
index 50b1b3b..1d15eed 100644
--- a/myserver/include/http_handler/cgi/cgi.h
+++ b/myserver/include/http_handler/cgi/cgi.h
@@ -32,7 +32,7 @@ class FiltersChain;
class Cgi : public HttpDataHandler
{
public:
- virtual int send (HttpThreadContext*, const char* scriptpath,
+ virtual int send (HttpThreadContext*, const char* scriptpath,
const char* exec = 0, bool execute = false,
bool onlyHeader = false);
private:
diff --git a/myserver/include/http_handler/fastcgi/fastcgi.h
b/myserver/include/http_handler/fastcgi/fastcgi.h
index 5504f35..6747f68 100644
--- a/myserver/include/http_handler/fastcgi/fastcgi.h
+++ b/myserver/include/http_handler/fastcgi/fastcgi.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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/>.
*/
#ifndef FASTCGI_H
@@ -38,14 +38,14 @@ using namespace std;
typedef struct
{
- unsigned char version;
- unsigned char type;
- unsigned char requestIdB1;
- unsigned char requestIdB0;
- unsigned char contentLengthB1;
- unsigned char contentLengthB0;
- unsigned char paddingLength;
- unsigned char reserved;
+ unsigned char version;
+ unsigned char type;
+ unsigned char requestIdB1;
+ unsigned char requestIdB0;
+ unsigned char contentLengthB1;
+ unsigned char contentLengthB0;
+ unsigned char paddingLength;
+ unsigned char reserved;
} FcgiHeader;
/*!
@@ -76,16 +76,16 @@ typedef struct
typedef struct
{
- unsigned char roleB1;
- unsigned char roleB0;
- unsigned char flags;
- unsigned char reserved[5];
+ unsigned char roleB1;
+ unsigned char roleB0;
+ unsigned char flags;
+ unsigned char reserved[5];
} FcgiBeginRequestBody;
typedef struct
{
- FcgiHeader header;
- FcgiBeginRequestBody body;
+ FcgiHeader header;
+ FcgiBeginRequestBody body;
} FcgiBeginRequestRecord;
/*!
@@ -102,18 +102,18 @@ typedef struct
typedef struct
{
- unsigned char appStatusB3;
- unsigned char appStatusB2;
- unsigned char appStatusB1;
- unsigned char appStatusB0;
- unsigned char protocolStatus;
- unsigned char reserved[3];
+ unsigned char appStatusB3;
+ unsigned char appStatusB2;
+ unsigned char appStatusB1;
+ unsigned char appStatusB0;
+ unsigned char protocolStatus;
+ unsigned char reserved[3];
} FcgiEndRequestBody;
typedef struct
{
- FcgiHeader header;
- FcgiEndRequestBody body;
+ FcgiHeader header;
+ FcgiEndRequestBody body;
} FcgiEndRequestRecord;
/*!
@@ -126,14 +126,14 @@ typedef struct
typedef struct
{
- unsigned char type;
- unsigned char reserved[7];
+ unsigned char type;
+ unsigned char reserved[7];
} FcgiUnknownTypeBody;
typedef struct
{
- FcgiHeader header;
- FcgiUnknownTypeBody body;
+ FcgiHeader header;
+ FcgiUnknownTypeBody body;
} FcgiUnknownTypeRecord;
diff --git a/myserver/include/http_handler/http_dir/http_dir.h
b/myserver/include/http_handler/http_dir/http_dir.h
index fae68b9..6446392 100644
--- a/myserver/include/http_handler/http_dir/http_dir.h
+++ b/myserver/include/http_handler/http_dir/http_dir.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2005, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2005, 2007, 2008, 2009 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/>.
*/
#ifndef HTTP_DIR_H
@@ -40,8 +40,8 @@ public:
virtual int load ();
virtual int unLoad ();
virtual int send (HttpThreadContext*,
- const char *filenamePath, const char* cgi,
- bool execute = false, bool OnlyHeader = false);
+ const char *filenamePath, const char* cgi,
+ bool execute = false, bool OnlyHeader = false);
HttpDir ();
virtual ~HttpDir ();
private:
diff --git a/myserver/include/http_handler/http_file/http_file.h
b/myserver/include/http_handler/http_file/http_file.h
index 5b0b0b0..6412aeb 100644
--- a/myserver/include/http_handler/http_file/http_file.h
+++ b/myserver/include/http_handler/http_file/http_file.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2005, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2005, 2008, 2009 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/>.
*/
#ifndef HTTP_FILE_H
@@ -30,8 +30,8 @@ public:
virtual int load ();
virtual int unLoad ();
virtual int send (HttpThreadContext* td,
- const char *filenamePath, const char* cgi,
- bool execute = false, bool OnlyHeader = false);
+ const char *filenamePath, const char* cgi,
+ bool execute = false, bool OnlyHeader = false);
HttpFile ();
virtual ~HttpFile ();
diff --git a/myserver/include/http_handler/isapi/isapi.h
b/myserver/include/http_handler/isapi/isapi.h
index bc4a36e..0b0e5b6 100644
--- a/myserver/include/http_handler/isapi/isapi.h
+++ b/myserver/include/http_handler/isapi/isapi.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2008, 2009 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/>.
*/
#ifndef ISAPI_H
@@ -136,17 +136,17 @@ public:
int Senduri (HttpThreadContext* td,ConnectionPtr a,char *URL);
int SendHeader (HttpThreadContext* td,ConnectionPtr a,char *URL);
static BOOL buildAllHttpHeaders (HttpThreadContext* td,ConnectionPtr a,
- LPVOID output, LPDWORD maxLen);
+ LPVOID output, LPDWORD maxLen);
static BOOL buildAllRawHeaders (HttpThreadContext* td,ConnectionPtr a,
- LPVOID output, LPDWORD maxLen);
+ LPVOID output, LPDWORD maxLen);
# endif
Isapi ();
static Mutex *isapiMutex;
virtual int load ();
virtual int unLoad ();
virtual int send (HttpThreadContext* td, const char* scriptpath,
- const char *cgipath = 0, bool execute = false,
- bool onlyHeader = false);
+ const char *cgipath = 0, bool execute = false,
+ bool onlyHeader = false);
private:
# ifdef WIN32
static int initialized;
@@ -157,11 +157,11 @@ private:
# ifdef WIN32
BOOL WINAPI ISAPI_ServerSupportFunctionExport (HCONN hConn, DWORD
dwHSERRequest,
- LPVOID lpvBuffer, LPDWORD
lpdwSize,
- LPDWORD lpdwDataType);
+ 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,
- DWORD dwReserved);
+ DWORD dwReserved);
BOOL WINAPI ISAPI_GetServerVariableExport (HCONN, LPSTR, LPVOID, LPDWORD);
# endif
diff --git a/myserver/include/http_handler/mscgi/mscgi.h
b/myserver/include/http_handler/mscgi/mscgi.h
index 783cbca..8ab21d4 100644
--- a/myserver/include/http_handler/mscgi/mscgi.h
+++ b/myserver/include/http_handler/mscgi/mscgi.h
@@ -34,17 +34,17 @@ class MsCgi;
struct MsCgiData
{
- char *envString;
- HttpThreadContext* td;
- int errorPage;
- bool headerSent;
- Server* server;
- MsCgi* mscgi;
- FiltersChain *filtersChain;
- bool keepAlive;
+ char *envString;
+ HttpThreadContext* td;
+ int errorPage;
+ bool headerSent;
+ Server* server;
+ MsCgi* mscgi;
+ FiltersChain *filtersChain;
+ bool keepAlive;
bool useChunks;
- bool onlyHeader;
- bool error;
+ bool onlyHeader;
+ bool error;
};
@@ -53,17 +53,17 @@ typedef int (*CGIMAIN)(const char*, MsCgiData*);
class MsCgi : public HttpDataHandler
{
public:
- virtual int load ();
- virtual int unLoad ();
- virtual int send (HttpThreadContext*, const char* exec,
- const char* cmdLine = 0, bool execute = false,
- bool onlyHeader = false);
+ virtual int load ();
+ virtual int unLoad ();
+ virtual int send (HttpThreadContext*, const char* exec,
+ const char* cmdLine = 0, bool execute = false,
+ bool onlyHeader = false);
- int write (const char*, u_long, MsCgiData*);
- int sendHeader (MsCgiData*);
+ int write (const char*, u_long, MsCgiData*);
+ int sendHeader (MsCgiData*);
private:
- static DynamicLibrary mscgiModule;
- MsCgiData data;
+ static DynamicLibrary mscgiModule;
+ MsCgiData data;
};
#endif
diff --git a/myserver/include/http_handler/mscgi/mscgi_manager.h
b/myserver/include/http_handler/mscgi/mscgi_manager.h
index 9d19eb9..0b53401 100644
--- a/myserver/include/http_handler/mscgi/mscgi_manager.h
+++ b/myserver/include/http_handler/mscgi/mscgi_manager.h
@@ -1,21 +1,21 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software
-Foundation, Inc.
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009 Free Software
+ Foundation, Inc.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
-This library 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
-Lesser General Public License for more details.
+ This library 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
+ Lesser General Public License for more details.
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
#ifndef CGI_MANAGER_H
# define CGI_MANAGER_H
@@ -41,28 +41,28 @@ class EXPORTABLE MscgiManager
class MscgiManager
# endif
{
-public:
- Server *getServer ();
- MsCgiData* getCgiData ();
- void setContentType (const char *);
- void addHeader (const char*, const char *);
- int setPageError (int);
- int raiseError (int);
- MscgiManager (MsCgiData* data);
- ~MscgiManager (void);
- int operator <<(const char*);
- char* operator >>(const char*);
- int start (MsCgiData* data);
- int clean ();
- void getenv (const char*, char*, u_long*);
- char* getParam (const char*);
- char* postParam (const char*);
- int write (const char*);
- int write (const void*, int);
-private:
- HttpThreadContext* td;
- MsCgiData* cgidata;
- char localbuffer[LOCAL_BUFFER_DIM];
+ public:
+ Server *getServer ();
+ MsCgiData* getCgiData ();
+ void setContentType (const char *);
+ void addHeader (const char*, const char *);
+ int setPageError (int);
+ int raiseError (int);
+ MscgiManager (MsCgiData* data);
+ ~MscgiManager (void);
+ int operator <<(const char*);
+ char* operator >>(const char*);
+ int start (MsCgiData* data);
+ int clean ();
+ void getenv (const char*, char*, u_long*);
+ char* getParam (const char*);
+ char* postParam (const char*);
+ int write (const char*);
+ int write (const void*, int);
+ private:
+ HttpThreadContext* td;
+ MsCgiData* cgidata;
+ char localbuffer[LOCAL_BUFFER_DIM];
};
#endif
diff --git a/myserver/include/http_handler/proxy/proxy.h
b/myserver/include/http_handler/proxy/proxy.h
index 536eb42..9ef1642 100644
--- a/myserver/include/http_handler/proxy/proxy.h
+++ b/myserver/include/http_handler/proxy/proxy.h
@@ -35,7 +35,7 @@ public:
static void setTimeout (int);
static int getTimeout ();
- virtual int send (HttpThreadContext*, const char* scriptpath,
+ virtual int send (HttpThreadContext*, const char* scriptpath,
const char* exec = 0, bool execute = false,
bool onlyHeader = false);
protected:
diff --git a/myserver/include/http_handler/scgi/scgi.h
b/myserver/include/http_handler/scgi/scgi.h
index 26be4a2..e6a4f7d 100644
--- a/myserver/include/http_handler/scgi/scgi.h
+++ b/myserver/include/http_handler/scgi/scgi.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SCGI_H
@@ -56,8 +56,8 @@ public:
virtual int load ();
virtual int unLoad ();
int send (HttpThreadContext* td, const char* scriptpath,
- const char *cgipath = 0, bool execute = false,
- bool onlyHeader = false);
+ const char *cgipath = 0, bool execute = false,
+ bool onlyHeader = false);
private:
static ProcessServerManager *processServerManager;
static int initialized;
diff --git a/myserver/include/http_handler/wincgi/wincgi.h
b/myserver/include/http_handler/wincgi/wincgi.h
index b5efdad..d6dad69 100644
--- a/myserver/include/http_handler/wincgi/wincgi.h
+++ b/myserver/include/http_handler/wincgi/wincgi.h
@@ -34,7 +34,7 @@ public:
~WinCgi ();
virtual int send (HttpThreadContext* td, const char* exec,
- const char* cmdLine = 0, bool execute = false,
- bool onlyHeader = false);
+ const char* cmdLine = 0, bool execute = false,
+ bool onlyHeader = false);
};
#endif
diff --git a/myserver/include/plugin/plugin.h b/myserver/include/plugin/plugin.h
index f69e6f7..3946b0e 100644
--- a/myserver/include/plugin/plugin.h
+++ b/myserver/include/plugin/plugin.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2007, 2008, 2009 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/>.
*/
#ifndef PLUGIN_H
@@ -32,16 +32,16 @@ class XmlParser;
class Plugin
{
public:
- Plugin ();
- virtual ~Plugin ();
- virtual int load (Server* server);
- virtual int preLoad (string& file, bool global);
- virtual int postLoad (Server* server);
- virtual int unLoad ();
- virtual const char* getName (char* buffer, u_long len);
- virtual void* getDirectMethod (char* name);
+ Plugin ();
+ virtual ~Plugin ();
+ virtual int load (Server* server);
+ virtual int preLoad (string& file, bool global);
+ virtual int postLoad (Server* server);
+ virtual int unLoad ();
+ virtual const char* getName (char* buffer, u_long len);
+ virtual void* getDirectMethod (char* name);
protected:
- DynamicLibrary hinstLib;
+ DynamicLibrary hinstLib;
};
#endif
diff --git a/myserver/include/plugin/plugin_info.h
b/myserver/include/plugin/plugin_info.h
index 67ac5a4..295b5ee 100644
--- a/myserver/include/plugin/plugin_info.h
+++ b/myserver/include/plugin/plugin_info.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2007, 2008, 2009 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/>.
*/
#ifndef PLUGIN_INFO_H
@@ -37,35 +37,35 @@ class PluginInfo
public:
PluginInfo (string& name, bool enabled = 1, bool global = 0);
- ~PluginInfo ();
+ ~PluginInfo ();
- bool isEnabled ();
- bool isGlobal ();
+ bool isEnabled ();
+ bool isGlobal ();
- void addDependence (string, int minVersion, int maxVersion);
+ 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);
+ 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 ();}
+ 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);
+ void setPlugin (Plugin* plugin);
+ Plugin* getPlugin ();
+ Plugin* removePlugin ();
+ void setEnabled (bool enabled);
+ pair<int,int>* getDependence (string name);
- static int convertVersion (string* s);
+ static int convertVersion (string* s);
private:
- string name;
- bool enabled;
+ string name;
+ bool enabled;
bool global;
int version;
int msMinVersion;
diff --git a/myserver/include/plugin/plugins_manager.h
b/myserver/include/plugin/plugins_manager.h
index 4842dfd..883a623 100644
--- a/myserver/include/plugin/plugins_manager.h
+++ b/myserver/include/plugin/plugins_manager.h
@@ -1,20 +1,20 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2007, 2009 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/>.
- */
+ MyServer
+ Copyright (C) 2007, 2009 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/>.
+*/
#ifndef PLUGINS_MANAGER_H
# define PLUGINS_MANAGER_H
diff --git a/myserver/include/protocol/control/control_header.h
b/myserver/include/protocol/control/control_header.h
index c23eb8a..0d6794d 100644
--- a/myserver/include/protocol/control/control_header.h
+++ b/myserver/include/protocol/control/control_header.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CONTROLHEADER_H
diff --git a/myserver/include/protocol/ftp/ftp.h
b/myserver/include/protocol/ftp/ftp.h
index e420bbf..9633bbd 100644
--- a/myserver/include/protocol/ftp/ftp.h
+++ b/myserver/include/protocol/ftp/ftp.h
@@ -128,7 +128,7 @@ public:
static int LAST_PASV_PORT;
int checkRights (const std::string & suser, const std::string & sPass,
- const std::string & sPath, int mask);
+ const std::string & sPath, int mask);
void waitDataConnection ();
int OpenDataConnection ();
diff --git a/myserver/include/protocol/ftp/ftp_common.h
b/myserver/include/protocol/ftp/ftp_common.h
index cec7339..cac3a16 100644
--- a/myserver/include/protocol/ftp/ftp_common.h
+++ b/myserver/include/protocol/ftp/ftp_common.h
@@ -24,12 +24,12 @@
# include <string>
-# define PARSER_STR_LEN 512
+# define PARSER_STR_LEN 512
struct FtpHost
{
- int h1, h2, h3, h4;
- int p1, p2;
+ int h1, h2, h3, h4;
+ int p1, p2;
};
void setFtpHost (FtpHost &out, const FtpHost &in);
diff --git a/myserver/include/protocol/ftp/ftp_lexer.h
b/myserver/include/protocol/ftp/ftp_lexer.h
index e85448f..5123dbf 100644
--- a/myserver/include/protocol/ftp/ftp_lexer.h
+++ b/myserver/include/protocol/ftp/ftp_lexer.h
@@ -97,15 +97,15 @@ typedef unsigned int flex_uint32_t;
/* The "const" storage-class-modifier is valid. */
#define YY_USE_CONST
-#else /* ! __cplusplus */
+#else /* ! __cplusplus */
/* C99 requires __STDC__ to be defined as 1. */
#if defined (__STDC__)
#define YY_USE_CONST
-#endif /* defined (__STDC__) */
-#endif /* ! __cplusplus */
+#endif /* defined (__STDC__) */
+#endif /* ! __cplusplus */
#ifdef YY_USE_CONST
#define yyconst const
@@ -156,52 +156,52 @@ typedef size_t yy_size_t;
#ifndef YY_STRUCT_YY_BUFFER_STATE
#define YY_STRUCT_YY_BUFFER_STATE
struct yy_buffer_state
- {
- FILE *yy_input_file;
-
- char *yy_ch_buf; /* input buffer */
- char *yy_buf_pos; /* current position in input buffer */
-
- /* Size of input buffer in bytes, not including room for EOB
- * characters.
- */
- yy_size_t yy_buf_size;
-
- /* Number of characters read into yy_ch_buf, not including EOB
- * characters.
- */
- int yy_n_chars;
-
- /* Whether we "own" the buffer - i.e., we know we created it,
- * and can realloc() it to grow it, and should free() it to
- * delete it.
- */
- int yy_is_our_buffer;
-
- /* Whether this is an "interactive" input source; if so, and
- * if we're using stdio for input, then we want to use getc()
- * instead of fread(), to make sure we stop fetching input after
- * each newline.
- */
- int yy_is_interactive;
-
- /* Whether we're considered to be at the beginning of a line.
- * If so, '^' rules will be active on the next match, otherwise
- * not.
- */
- int yy_at_bol;
-
- int yy_bs_lineno; /**< The line count. */
- int yy_bs_column; /**< The column count. */
+{
+ FILE *yy_input_file;
+
+ char *yy_ch_buf; /* input buffer */
+ char *yy_buf_pos; /* current position in input buffer */
+
+ /* Size of input buffer in bytes, not including room for EOB
+ * characters.
+ */
+ yy_size_t yy_buf_size;
+
+ /* Number of characters read into yy_ch_buf, not including EOB
+ * characters.
+ */
+ int yy_n_chars;
+
+ /* Whether we "own" the buffer - i.e., we know we created it,
+ * and can realloc() it to grow it, and should free() it to
+ * delete it.
+ */
+ int yy_is_our_buffer;
+
+ /* Whether this is an "interactive" input source; if so, and
+ * if we're using stdio for input, then we want to use getc()
+ * instead of fread(), to make sure we stop fetching input after
+ * each newline.
+ */
+ int yy_is_interactive;
+
+ /* Whether we're considered to be at the beginning of a line.
+ * If so, '^' rules will be active on the next match, otherwise
+ * not.
+ */
+ int yy_at_bol;
+
+ 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.
- */
- int yy_fill_buffer;
+ /* Whether to try to fill the input buffer when we reach the
+ * end of it.
+ */
+ int yy_fill_buffer;
- int yy_buffer_status;
+ int yy_buffer_status;
- };
+};
#endif /* !YY_STRUCT_YY_BUFFER_STATE */
void yyrestart (FILE *input_file ,yyscan_t yyscanner );
@@ -284,9 +284,9 @@ YYSTYPE * yyget_lval (yyscan_t yyscanner );
void yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
- YYLTYPE *yyget_lloc (yyscan_t yyscanner );
+YYLTYPE *yyget_lloc (yyscan_t yyscanner );
- void yyset_lloc (YYLTYPE * yylloc_param ,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.
@@ -334,10 +334,10 @@ static int yy_flex_strlen (yyconst char * ,yyscan_t
yyscanner);
#define YY_DECL_IS_OURS 1
extern int yylex \
- (YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t
yyscanner);
+(YYSTYPE * yylval_param,YYLTYPE * yylloc_param ,yyscan_t yyscanner);
-#define YY_DECL int yylex \
- (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t
yyscanner)
+#define YY_DECL int yylex \
+ (YYSTYPE * yylval_param, YYLTYPE * yylloc_param , yyscan_t yyscanner)
#endif /* !YY_DECL */
/* yy_get_previous_state - get the state just before the EOB char was reached
*/
diff --git a/myserver/include/protocol/ftp/ftp_parser.h
b/myserver/include/protocol/ftp/ftp_parser.h
index 3d0b19c..f041eb3 100644
--- a/myserver/include/protocol/ftp/ftp_parser.h
+++ b/myserver/include/protocol/ftp/ftp_parser.h
@@ -3,7 +3,7 @@
/* Skeleton interface for Bison's Yacc-like parsers in C
- Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+ 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
@@ -36,49 +36,49 @@
/* Tokens. */
#ifndef YYTOKENTYPE
# define YYTOKENTYPE
- /* Put the tokens into the symbol table, so that GDB and other debuggers
- know about them. */
- enum yytokentype {
- NUMBER_FTP_ARG = 258,
- STRING_FTP_ARG = 259,
- CHAR_FTP_ARG = 260,
- CRLF_FTP_SEP = 261,
- SPACE_FTP_SEP = 262,
- PUNCT_FTP_SEP = 263,
- USER_FTP_COMMAND = 264,
- PASS_FTP_COMMAND = 265,
- QUIT_FTP_COMMAND = 266,
- PORT_FTP_COMMAND = 267,
- PASV_FTP_COMMAND = 268,
- MODE_FTP_COMMAND = 269,
- TYPE_FTP_COMMAND = 270,
- STRU_FTP_COMMAND = 271,
- REST_FTP_COMMAND = 272,
- RETR_FTP_COMMAND = 273,
- LIST_FTP_COMMAND = 274,
- NLST_FTP_COMMAND = 275,
- ABOR_FTP_COMMAND = 276,
- CWD_FTP_COMMAND = 277,
- CDUP_FTP_COMMAND = 278,
- PWD_FTP_COMMAND = 279,
- ALLO_FTP_COMMAND = 280,
- STOR_FTP_COMMAND = 281,
- STOU_FTP_COMMAND = 282,
- DELE_FTP_COMMAND = 283,
- APPE_FTP_COMMAND = 284,
- MKD_FTP_COMMAND = 285,
- RMD_FTP_COMMAND = 286,
- RNFR_FTP_COMMAND = 287,
- RNTO_FTP_COMMAND = 288,
- HELP_FTP_COMMAND = 289,
- SYST_FTP_COMMAND = 290,
- STAT_FTP_COMMAND = 291,
- NOOP_FTP_COMMAND = 292,
- SITE_FTP_COMMAND = 293,
- CHMOD_FTP_COMMAND = 294,
- UTIME_FTP_COMMAND = 295,
- SIZE_FTP_COMMAND = 296
- };
+/* Put the tokens into the symbol table, so that GDB and other debuggers
+ know about them. */
+enum yytokentype {
+ NUMBER_FTP_ARG = 258,
+ STRING_FTP_ARG = 259,
+ CHAR_FTP_ARG = 260,
+ CRLF_FTP_SEP = 261,
+ SPACE_FTP_SEP = 262,
+ PUNCT_FTP_SEP = 263,
+ USER_FTP_COMMAND = 264,
+ PASS_FTP_COMMAND = 265,
+ QUIT_FTP_COMMAND = 266,
+ PORT_FTP_COMMAND = 267,
+ PASV_FTP_COMMAND = 268,
+ MODE_FTP_COMMAND = 269,
+ TYPE_FTP_COMMAND = 270,
+ STRU_FTP_COMMAND = 271,
+ REST_FTP_COMMAND = 272,
+ RETR_FTP_COMMAND = 273,
+ LIST_FTP_COMMAND = 274,
+ NLST_FTP_COMMAND = 275,
+ ABOR_FTP_COMMAND = 276,
+ CWD_FTP_COMMAND = 277,
+ CDUP_FTP_COMMAND = 278,
+ PWD_FTP_COMMAND = 279,
+ ALLO_FTP_COMMAND = 280,
+ STOR_FTP_COMMAND = 281,
+ STOU_FTP_COMMAND = 282,
+ DELE_FTP_COMMAND = 283,
+ APPE_FTP_COMMAND = 284,
+ MKD_FTP_COMMAND = 285,
+ RMD_FTP_COMMAND = 286,
+ RNFR_FTP_COMMAND = 287,
+ RNTO_FTP_COMMAND = 288,
+ HELP_FTP_COMMAND = 289,
+ SYST_FTP_COMMAND = 290,
+ STAT_FTP_COMMAND = 291,
+ NOOP_FTP_COMMAND = 292,
+ SITE_FTP_COMMAND = 293,
+ CHMOD_FTP_COMMAND = 294,
+ UTIME_FTP_COMMAND = 295,
+ SIZE_FTP_COMMAND = 296
+};
#endif
/* Tokens. */
#define NUMBER_FTP_ARG 258
@@ -128,17 +128,17 @@
typedef union YYSTYPE
{
-/* Line 1676 of yacc.c */
+ /* Line 1676 of yacc.c */
#line 15 "ftp_parser.ypp"
- int m_nInt;
- char m_nChar;
- char m_szStr[PARSER_STR_LEN];
- FtpHost m_host;
+ int m_nInt;
+ char m_nChar;
+ char m_szStr[PARSER_STR_LEN];
+ FtpHost m_host;
-/* Line 1676 of yacc.c */
+ /* Line 1676 of yacc.c */
#line 143 "../../../include/protocol/ftp/ftp_parser.h"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
diff --git a/myserver/include/protocol/gopher/engine.h
b/myserver/include/protocol/gopher/engine.h
index 5211078..a6a10a9 100644
--- a/myserver/include/protocol/gopher/engine.h
+++ b/myserver/include/protocol/gopher/engine.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002-2009 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.
+ MyServer
+ Copyright (C) 2002-2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef GOPHER_ENGINE_H
diff --git a/myserver/include/protocol/gopher/gopher.h
b/myserver/include/protocol/gopher/gopher.h
index e9905f0..bc11e52 100644
--- a/myserver/include/protocol/gopher/gopher.h
+++ b/myserver/include/protocol/gopher/gopher.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002-2009 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/>.
+ MyServer
+ Copyright (C) 2002-2009 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/>.
*/
#ifndef GOPHER_H
diff --git a/myserver/include/protocol/gopher/gopher_content.h
b/myserver/include/protocol/gopher/gopher_content.h
index 9802c95..2644c81 100644
--- a/myserver/include/protocol/gopher/gopher_content.h
+++ b/myserver/include/protocol/gopher/gopher_content.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002-2009 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/>.
+ MyServer
+ Copyright (C) 2002-2009 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/>.
*/
#ifndef GOPHER_CONTENT_H
@@ -55,7 +55,7 @@ protected:
class GopherItem: public GopherContent
{
- public:
+public:
GopherItem ();
GopherItem (char, const char[], const char[], const char[], const char[]);
@@ -74,7 +74,7 @@ class GopherItem: public GopherContent
void toProtocol (Socket *s);
- protected:
+protected:
char type;
string desc;
string rlocation;
@@ -249,7 +249,6 @@ private:
string buff;
};
-
class GopherFileContent: public GopherContent
{
public:
diff --git a/myserver/include/protocol/http/env/env.h
b/myserver/include/protocol/http/env/env.h
index 70aeed8..306433e 100644
--- a/myserver/include/protocol/http/env/env.h
+++ b/myserver/include/protocol/http/env/env.h
@@ -30,7 +30,7 @@
class Env
{
public:
- static void buildEnvironmentString (HttpThreadContext*, char*, int = 1);
+ static void buildEnvironmentString (HttpThreadContext*, char*, int = 1);
private:
static void buildProcessEnvString (MemBuf& memCgi);
static void buildHttpHeaderEnvString (MemBuf& memCgi, HttpRequestHeader &
req);
diff --git a/myserver/include/protocol/http/http_data_read.h
b/myserver/include/protocol/http/http_data_read.h
index bfcf3a0..eb82683 100644
--- a/myserver/include/protocol/http/http_data_read.h
+++ b/myserver/include/protocol/http/http_data_read.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002-2009 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.
+ MyServer
+ Copyright (C) 2002-2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef HTTP_DATA_READ_H
@@ -44,23 +44,23 @@ public:
static int readPostData (HttpThreadContext* td, int* ret);
static int readContiguousPrimitivePostData (const char* inBuffer,
- u_long *inBufferPos,
- u_long inBufferSize,
- Socket *inSocket,
- char* outBuffer,
- u_long outBufferSize,
- u_long* nbr,
- u_long timeout);
+ u_long *inBufferPos,
+ u_long inBufferSize,
+ Socket *inSocket,
+ char* outBuffer,
+ u_long outBufferSize,
+ u_long* nbr,
+ u_long timeout);
static int readChunkedPostData (const char* inBuffer,
- u_long *inBufferPos,
- u_long inBufferSize,
- Socket *inSocket,
- char* outBuffer,
- u_long outBufferSize,
- u_long* nbr,
- u_long timeout,
- Stream* out,
- long maxChunks);
+ u_long *inBufferPos,
+ u_long inBufferSize,
+ Socket *inSocket,
+ char* outBuffer,
+ u_long outBufferSize,
+ u_long* nbr,
+ u_long timeout,
+ Stream* out,
+ long maxChunks);
};
diff --git a/myserver/include/protocol/http/http_errors.h
b/myserver/include/protocol/http/http_errors.h
index 278b195..597ffb4 100644
--- a/myserver/include/protocol/http/http_errors.h
+++ b/myserver/include/protocol/http/http_errors.h
@@ -31,13 +31,13 @@ using namespace std;
class HttpErrors
{
public:
- static void getErrorPage (int statusCode, string& out);
- static void getErrorMessage (int statusCode, string& out);
- static void load ();
- static void unLoad ();
+ static void getErrorPage (int statusCode, string& out);
+ static void getErrorMessage (int statusCode, string& out);
+ static void load ();
+ static void unLoad ();
private:
static bool loaded;
- static void putMessage (int, const char*);
- static HashMap<int, const char*> messagesMap;
+ static void putMessage (int, const char*);
+ static HashMap<int, const char*> messagesMap;
};
#endif
diff --git a/myserver/include/protocol/http/http_header.h
b/myserver/include/protocol/http/http_header.h
index 48a5919..c9196f6 100644
--- a/myserver/include/protocol/http/http_header.h
+++ b/myserver/include/protocol/http/http_header.h
@@ -29,7 +29,7 @@ using namespace std;
struct HttpHeader
{
virtual string* getValue (const char* name, string* out) = 0;
- virtual string* setValue (const char* name, const char* in) = 0;
+ virtual string* setValue (const char* name, const char* in) = 0;
virtual ~HttpHeader (){}
};
diff --git a/myserver/include/protocol/http/http_req_security_domain.h
b/myserver/include/protocol/http/http_req_security_domain.h
index ca74fb7..65a80c3 100644
--- a/myserver/include/protocol/http/http_req_security_domain.h
+++ b/myserver/include/protocol/http/http_req_security_domain.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2008, 2009 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/>.
*/
#ifndef HTTP_REQ_SECURITY_DOMAIN_H
diff --git a/myserver/include/protocol/http/http_request.h
b/myserver/include/protocol/http/http_request.h
index b381573..79236e8 100644
--- a/myserver/include/protocol/http/http_request.h
+++ b/myserver/include/protocol/http/http_request.h
@@ -48,64 +48,64 @@ struct HttpRequestHeader : public HttpHeader
{
string *name;
string *value;
- Entry ()
- {
- name = new string ();
- value = new string ();
- }
+ Entry ()
+ {
+ name = new string ();
+ value = new string ();
+ }
- Entry (string& n, string& v)
- {
- name = new string ();
- value = new string ();
+ Entry (string& n, string& v)
+ {
+ name = new string ();
+ value = new string ();
- name->assign (n);
- value->assign (v);
- }
+ name->assign (n);
+ value->assign (v);
+ }
- ~Entry ()
- {
- delete name;
- delete value;
+ ~Entry ()
+ {
+ delete name;
+ delete value;
- }
+ }
};
- string cmd;
- string ver;
- string auth;
- string contentLength;
- string uri;
- 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 digestUsername[48+1];
- char digestResponse[48+1];
- char digestQop[16+1];
- char digestNc[10+1];
-
-
- HashMap<string, HttpRequestHeader::Entry*> other;
+ string cmd;
+ string ver;
+ string auth;
+ string contentLength;
+ string uri;
+ 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 digestUsername[48+1];
+ char digestResponse[48+1];
+ char digestQop[16+1];
+ char digestNc[10+1];
+
+
+ HashMap<string, HttpRequestHeader::Entry*> other;
virtual string* getValue (const char* name, string* out);
virtual string* setValue (const char* name, const char* in);
- HashMap<string, HttpRequestHeader::Entry*>::Iterator begin (){return
other.begin ();}
- HashMap<string, HttpRequestHeader::Entry*>::Iterator back (){return
other.back ();}
- HashMap<string, HttpRequestHeader::Entry*>::Iterator end (){return
other.end ();}
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator begin (){return
other.begin ();}
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator back (){return
other.back ();}
+ HashMap<string, HttpRequestHeader::Entry*>::Iterator end (){return other.end
();}
- bool isKeepAlive ();
+ bool isKeepAlive ();
HttpRequestHeader ();
~HttpRequestHeader ();
diff --git a/myserver/include/protocol/http/http_response.h
b/myserver/include/protocol/http/http_response.h
index 926f7ed..10ad784 100644
--- a/myserver/include/protocol/http/http_response.h
+++ b/myserver/include/protocol/http/http_response.h
@@ -47,33 +47,33 @@ struct HttpResponseHeader : public HttpHeader
{
string *name;
string *value;
- Entry ()
- {
- name = new string ();
- value = new string ();
- }
-
- Entry (string& n, string& v)
- {
- name = new string ();
- value = new string ();
-
- name->assign (n);
- value->assign (v);
- }
- ~Entry ()
- {
- delete name;
- delete value;
-
- }
+ Entry ()
+ {
+ name = new string ();
+ value = new string ();
+ }
+
+ Entry (string& n, string& v)
+ {
+ name = new string ();
+ value = new string ();
+
+ name->assign (n);
+ value->assign (v);
+ }
+ ~Entry ()
+ {
+ delete name;
+ delete value;
+
+ }
};
- int httpStatus;
- string ver;
- string contentLength;
- string errorType;
+ int httpStatus;
+ string ver;
+ string contentLength;
+ string errorType;
- HashMap<string,HttpResponseHeader::Entry*> other;
+ HashMap<string,HttpResponseHeader::Entry*> other;
HttpResponseHeader ();
~HttpResponseHeader ();
diff --git a/myserver/include/server/clients_thread.h
b/myserver/include/server/clients_thread.h
index 954115d..10c504f 100644
--- a/myserver/include/server/clients_thread.h
+++ b/myserver/include/server/clients_thread.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef CLIENTS_THREAD_H
@@ -33,26 +33,26 @@ class ClientsThread
public:
enum RETURN_CODE
- {
- /*!
- Delete the current connection from the connections pool.
- */
- DELETE_CONNECTION = 1,
- /*!
- Keep the connection in the connections pool waiting for new data.
- */
- KEEP_CONNECTION,
- /*!
- The request present in the connection buffer is not complete, keep
- data in the buffer and append to it.
- */
- INCOMPLETE_REQUEST,
- /*!
- The request present in the buffer is not complete, append to the buffer
- and check before new data is present.
- */
- INCOMPLETE_REQUEST_NO_WAIT
- };
+ {
+ /*!
+ Delete the current connection from the connections pool.
+ */
+ DELETE_CONNECTION = 1,
+ /*!
+ Keep the connection in the connections pool waiting for new data.
+ */
+ KEEP_CONNECTION,
+ /*!
+ The request present in the connection buffer is not complete, keep
+ data in the buffer and append to it.
+ */
+ INCOMPLETE_REQUEST,
+ /*!
+ The request present in the buffer is not complete, append to the buffer
+ and check before new data is present.
+ */
+ INCOMPLETE_REQUEST_NO_WAIT
+ };
MemBuf *getBuffer ();
MemBuf *getAuxiliaryBuffer ();
diff --git a/myserver/include/server/server.h b/myserver/include/server/server.h
index 518f79d..b4ca619 100644
--- a/myserver/include/server/server.h
+++ b/myserver/include/server/server.h
@@ -1,19 +1,19 @@
/* -*- mode: c++ -*- */
/*
-MyServer
-Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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/>.
+ MyServer
+ Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 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/>.
*/
#ifndef SERVER_H
@@ -120,7 +120,8 @@ public:
int getMaxLogFileSize ();
int mustUseLogonOption ();
void start (string &, string &, string &, string &,
- MainConfiguration* (*genMainConf) (Server *server, const char
*arg));
+ MainConfiguration* (*genMainConf) (Server *server,
+ const char *arg));
void stop ();
void finalCleanup ();
int terminate ();
-----------------------------------------------------------------------
Summary of changes:
myserver/include/base/base64/mime_utils.h | 26 +-
myserver/include/base/bitvec/bitvec.h | 24 +-
myserver/include/base/dynamic_lib/dynamiclib.h | 32 +-
myserver/include/base/file/file.h | 32 +-
myserver/include/base/file/files_utility.h | 46 ++--
.../include/base/files_cache/cached_file_buffer.h | 28 +-
.../include/base/files_cache/cached_file_factory.h | 28 +-
myserver/include/base/hash_map/hash_map.h | 368 ++++++++++----------
myserver/include/base/home_dir/home_dir.h | 44 ++--
myserver/include/base/multicast/multicast.h | 46 ++--
myserver/include/base/pipe/pipe.h | 24 +-
myserver/include/base/process/process.h | 64 ++--
.../include/base/process/process_server_manager.h | 136 ++++----
.../include/base/read_directory/read_directory.h | 24 +-
myserver/include/base/regex/myserver_regex.h | 36 +-
myserver/include/base/safetime/safetime.h | 28 +-
myserver/include/base/slab/slab.h | 28 +-
myserver/include/base/socket/socket.h | 28 +-
myserver/include/base/socket/ssl_socket.h | 66 ++--
myserver/include/base/ssl/ssl.h | 60 ++--
myserver/include/base/string/securestr.h | 28 +-
myserver/include/base/string/stringutils.h | 2 +-
myserver/include/base/sync/event.h | 54 ++--
myserver/include/base/sync/mutex.h | 46 ++--
myserver/include/base/sync/read_write_lock.h | 40 +-
myserver/include/base/sync/recursive_mutex.h | 32 +-
myserver/include/base/sync/semaphore.h | 40 +-
myserver/include/base/thread/thread.h | 42 ++--
myserver/include/base/unix_socket/unix_socket.h | 24 +-
myserver/include/base/utility.h | 28 +-
myserver/include/base/xml/xml_parser.h | 24 +-
myserver/include/conf/main/main_configuration.h | 28 +-
.../include/conf/main/xml_main_configuration.h | 24 +-
myserver/include/conf/security/auth_domain.h | 28 +-
myserver/include/conf/security/auth_method.h | 30 +-
.../include/conf/security/auth_method_factory.h | 30 +-
myserver/include/conf/security/security_cache.h | 10 +-
myserver/include/conf/security/security_domain.h | 28 +-
myserver/include/conf/security/security_manager.h | 62 ++--
myserver/include/conf/security/validator.h | 30 +-
myserver/include/conf/security/validator_factory.h | 26 +-
myserver/include/conf/vhost/ip.h | 2 +-
myserver/include/conf/xml_conf.h | 4 +-
.../connections_scheduler/connections_scheduler.h | 30 +-
.../include/connections_scheduler/listen_threads.h | 78 ++--
myserver/include/filter/filter.h | 28 +-
myserver/include/filter/filters_factory.h | 32 +-
myserver/include/filter/gzip/gzip.h | 4 +-
myserver/include/filter/gzip/gzip_decompress.h | 66 ++--
myserver/include/filter/memory_stream.h | 24 +-
myserver/include/http_handler/cgi/cgi.h | 2 +-
myserver/include/http_handler/fastcgi/fastcgi.h | 80 +++---
myserver/include/http_handler/http_dir/http_dir.h | 32 +-
.../include/http_handler/http_file/http_file.h | 32 +-
myserver/include/http_handler/isapi/isapi.h | 42 ++--
myserver/include/http_handler/mscgi/mscgi.h | 38 +-
.../include/http_handler/mscgi/mscgi_manager.h | 72 ++--
myserver/include/http_handler/proxy/proxy.h | 2 +-
myserver/include/http_handler/scgi/scgi.h | 28 +-
myserver/include/http_handler/wincgi/wincgi.h | 4 +-
myserver/include/plugin/plugin.h | 46 ++--
myserver/include/plugin/plugin_info.h | 70 ++--
myserver/include/plugin/plugins_manager.h | 26 +-
myserver/include/protocol/control/control_header.h | 24 +-
myserver/include/protocol/ftp/ftp.h | 2 +-
myserver/include/protocol/ftp/ftp_common.h | 6 +-
myserver/include/protocol/ftp/ftp_lexer.h | 102 +++---
myserver/include/protocol/ftp/ftp_parser.h | 100 +++---
myserver/include/protocol/gopher/engine.h | 28 +-
myserver/include/protocol/gopher/gopher.h | 28 +-
myserver/include/protocol/gopher/gopher_content.h | 33 +-
myserver/include/protocol/http/env/env.h | 2 +-
myserver/include/protocol/http/http_data_read.h | 56 ++--
myserver/include/protocol/http/http_errors.h | 12 +-
myserver/include/protocol/http/http_header.h | 2 +-
.../protocol/http/http_req_security_domain.h | 28 +-
myserver/include/protocol/http/http_request.h | 94 +++---
myserver/include/protocol/http/http_response.h | 50 ++--
myserver/include/server/clients_thread.h | 64 ++--
myserver/include/server/server.h | 31 +-
80 files changed, 1613 insertions(+), 1615 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9-397-gf4d8d8a,
Giuseppe Scrivano <=