[myserver-commit] [SCM] GNU MyServer branch, master, updated. 21e0a612e723e213010fccbbb29b794a5c55f8f0

[Giuseppe Scrivano]

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

The branch, master has been updated
       via  21e0a612e723e213010fccbbb29b794a5c55f8f0 (commit)
      from  0d6db12ec98f18e5e7b9621b8f5e25280d8ad734 (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 21e0a612e723e213010fccbbb29b794a5c55f8f0
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Aug 20 00:30:32 2009 +0200

    Update plugins to use the simpler interface to `PluginsManager'

diff --git a/plugins/src/php/php.cpp b/plugins/src/php/php.cpp
index c425c85..621f64f 100644
--- a/plugins/src/php/php.cpp
+++ b/plugins/src/php/php.cpp
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2007 The Free Software Foundation Inc.
+Copyright (C) 2007, 2009 The 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
@@ -25,9 +25,8 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 #include <main/php.h>
 #include <main/SAPI.h>
 
-
 #ifdef ZTS
-#include <TSRM.h>
+# include <TSRM.h>
 #endif
 
 static Server* server;
@@ -290,7 +289,7 @@ static sapi_module_struct myphp_module =
        STANDARD_SAPI_MODULE_PROPERTIES
 };
 
-int load(void* server,void* parser)
+int load(void* server)
 {
        ::server = (Server*)server;
        const char *data;
@@ -315,7 +314,7 @@ int load(void* server,void* parser)
 
 /*! Postload phase for the plugin.  */
 extern "C"
-int postLoad(void* server,void* parser)
+int postLoad(void* server)
 {
        const char *data;
        data = ::server->getHashedData("PHP_NO_REBOOT");
@@ -361,7 +360,7 @@ int unLoad(void* p)
 /*!
  *Default constructor.
  */
-PhpManager::PhpManager() 
+PhpManager::PhpManager()
 {
 
 }
diff --git a/plugins/src/python/python.cpp b/plugins/src/python/python.cpp
index c8374c5..fa3976b 100644
--- a/plugins/src/python/python.cpp
+++ b/plugins/src/python/python.cpp
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2007, 2008 The MyServer Team
+Copyright (C) 2007, 2008, 2009 The MyServer Team
 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
@@ -53,7 +53,7 @@ void PythonData::clear ()
 
 
 
-int load (void* server, void* parser)
+int load (void* server)
 {
        serverInstance = (Server*)server;
        const char* pathData = serverInstance->getHashedData("PYTHON_PATH");
diff --git a/plugins/src/python_http_handler/python_http_handler.cpp 
b/plugins/src/python_http_handler/python_http_handler.cpp
index 2850d48..c6b1134 100644
--- a/plugins/src/python_http_handler/python_http_handler.cpp
+++ b/plugins/src/python_http_handler/python_http_handler.cpp
@@ -26,9 +26,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 
 static Server* serverInstance;
 
-
-
-
 #ifdef WIN32
 #define EXPORTABLE(x) x _declspec(dllexport)
 #else
@@ -346,7 +343,7 @@ class HttpObserver : public Multicast<string, void*, int>
        };
 public:
 
-       virtual int updateMulticast(MulticastRegistry<string, void*, int>* reg, 
string& msg, void* arg)
+       virtual int updateMulticast (MulticastRegistry<string, void*, int>* 
reg, string& msg, void* arg)
        {
                HttpThreadContext *td = (HttpThreadContext*)arg;
                ThreadID tid = Thread::threadID();
@@ -376,7 +373,7 @@ public:
                return threadData.getRet();
        }
 
-       void addRule(const char* rule, bool file)
+       void addRule (const char* rule, bool file)
        {
                Item it;
                it.data.assign(rule);
@@ -384,7 +381,7 @@ public:
                rules.push_back(it);
        }
 
-       void setPythonExecutor(Plugin* python){this->python = python;}
+       void setPythonExecutor (Plugin* python){this->python = python;}
 
 private:
        list<Item> rules;
@@ -394,7 +391,7 @@ private:
 static HttpObserver observer;
 
 
-EXPORTABLE(char*) name(char* name, u_long len)
+EXPORTABLE(char*) name (char* name, u_long len)
 {
        char* str = (char*)"python_http_handler";
        if(name)
@@ -402,7 +399,7 @@ EXPORTABLE(char*) name(char* name, u_long len)
        return str;
 }
 
-EXPORTABLE(int) load(void* server,void* parser)
+EXPORTABLE(int) load (void* server)
 {
        serverInstance = (Server*)server;
        HttpStaticData* staticData =(HttpStaticData*) 
serverInstance->getGlobalData("http-static");
@@ -474,12 +471,14 @@ EXPORTABLE(int) load(void* server,void* parser)
 
        return 0;
 }
-EXPORTABLE(int) postLoad(void* server,void* parser)
+
+EXPORTABLE(int) postLoad (void* server)
 {
   return 0;
 }
-EXPORTABLE(int) unLoad(void* parser)
+
+EXPORTABLE(int) unLoad ()
 {
-  mutex.destroy();
+  mutex.destroy ();
   return 0;
 }
diff --git a/plugins/src/rules_checker/rules_checker.cpp 
b/plugins/src/rules_checker/rules_checker.cpp
index a5a9d45..a5d7f05 100644
--- a/plugins/src/rules_checker/rules_checker.cpp
+++ b/plugins/src/rules_checker/rules_checker.cpp
@@ -85,7 +85,7 @@ private:
 static RulesCheckerObserver observer;
 
 
-EXPORTABLE(char*) name(char* name, u_long len)
+EXPORTABLE(char*) name (char* name, u_long len)
 {
   char* str = (char*)"rules_checker";
   if(name)
@@ -93,7 +93,7 @@ EXPORTABLE(char*) name(char* name, u_long len)
   return str;
 }
 
-EXPORTABLE(int) load(void* server,void* parser)
+EXPORTABLE(int) load (void* server)
 {
   Server* serverInstance = (Server*)server;
   HttpStaticData* staticData =(HttpStaticData*) 
serverInstance->getGlobalData("http-static");
@@ -135,11 +135,12 @@ EXPORTABLE(int) load(void* server,void* parser)
   return 0;
 }
 
-EXPORTABLE(int) postLoad(void* server,void* parser)
+EXPORTABLE(int) postLoad (void* server)
 {
   return 0;
 }
-EXPORTABLE(int) unLoad(void* parser)
+
+EXPORTABLE(int) unLoad ()
 {
   return 0;
 }

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

Summary of changes:
 plugins/src/php/php.cpp                            |   11 ++++-----
 plugins/src/python/python.cpp                      |    4 +-
 .../python_http_handler/python_http_handler.cpp    |   21 +++++++++----------
 plugins/src/rules_checker/rules_checker.cpp        |    9 ++++---
 4 files changed, 22 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
GNU MyServer