[myserver-commit] [SCM] GNU MyServer branch, master, updated. 0_9_2-60-gbb5cf60

[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  bb5cf6002034761e10707b923a85d487856ac4b2 (commit)
       via  b9d8f443e6028ad74bc81c54af1c239f2e85d226 (commit)
       via  7d1ac8c2d2ba621f15717578ba749b0bb1d4e457 (commit)
       via  3b4f3854c84f51ab0e7fc59f56b16bb45ad6e8cc (commit)
       via  30706a3c51df12e1151add446b431698a6b61fc9 (commit)
      from  6ac1124610bc2e0a3fae72e6d085d008adbdebd2 (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 bb5cf6002034761e10707b923a85d487856ac4b2
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Feb 28 00:55:14 2010 +0100

    Rename VhostManagerHandler::getVHostByNumber to 
VhostManagerHandler::getVHost

diff --git a/myserver/include/conf/vhost/vhost_manager.h 
b/myserver/include/conf/vhost/vhost_manager.h
index e138994..79f2d71 100644
--- a/myserver/include/conf/vhost/vhost_manager.h
+++ b/myserver/include/conf/vhost/vhost_manager.h
@@ -29,7 +29,7 @@ public:
   VhostManagerHandler ();
   virtual ~VhostManagerHandler ();
   virtual Vhost* getVHost (const char*, const char*, u_short);
-  virtual Vhost* getVHostByNumber (int n);
+  virtual Vhost* getVHost (int n);
   virtual int load (const char *resource){return 0;}
 };
 
@@ -47,7 +47,7 @@ public:
 
   /*! Get a pointer to a vhost.  */
   Vhost* getVHost (const char*,const char*, u_short);
-  Vhost* getVHostByNumber (int n);
+  Vhost* getVHost (int n);
   void registerBuilder (const string &name, MAKE_HANDLER builder);
   VhostManagerHandler *buildHandler (const string &name, ListenThreads *lt,
                                      LogManager *lm);
diff --git a/myserver/include/conf/vhost/xml_vhost_handler.h 
b/myserver/include/conf/vhost/xml_vhost_handler.h
index 446a1fd..883c397 100644
--- a/myserver/include/conf/vhost/xml_vhost_handler.h
+++ b/myserver/include/conf/vhost/xml_vhost_handler.h
@@ -28,7 +28,7 @@ public:
   XmlVhostHandler (ListenThreads* lt, LogManager* lm);
   ~XmlVhostHandler ();
   int getHostsNumber ();
-  Vhost* getVHostByNumber (int n);
+  Vhost* getVHost (int n);
   void clean ();
   int removeVHost (int n);
   int switchVhosts (int n1,int n2);
diff --git a/myserver/src/conf/vhost/vhost_manager.cpp 
b/myserver/src/conf/vhost/vhost_manager.cpp
index 7c1e82f..da6db7c 100644
--- a/myserver/src/conf/vhost/vhost_manager.cpp
+++ b/myserver/src/conf/vhost/vhost_manager.cpp
@@ -39,7 +39,7 @@ Vhost* VhostManagerHandler::getVHost (const char*, const 
char*, u_short)
   return NULL;
 }
 
-Vhost* VhostManagerHandler::getVHostByNumber (int n)
+Vhost* VhostManagerHandler::getVHost (int n)
 {
   return 0;
 }
@@ -83,10 +83,10 @@ Vhost* VhostManager::getVHost (const char *host, const char 
*ip, u_short port)
  *Zero based list.
  *\param n The virtual host id.
  */
-Vhost* VhostManager::getVHostByNumber (int n)
+Vhost* VhostManager::getVHost (int n)
 {
   if (handler)
-    return handler->getVHostByNumber (n);
+    return handler->getVHost (n);
 
   return NULL;
 }
diff --git a/myserver/src/conf/vhost/xml_vhost_handler.cpp 
b/myserver/src/conf/vhost/xml_vhost_handler.cpp
index a2b4f88..545eadd 100644
--- a/myserver/src/conf/vhost/xml_vhost_handler.cpp
+++ b/myserver/src/conf/vhost/xml_vhost_handler.cpp
@@ -559,9 +559,9 @@ int XmlVhostHandler::load (const char *filename)
 }
 
 /*!
- *\see VhostManager#getVHostByNumber
+ *\see VhostManager#getVHost
  */
-Vhost* XmlVhostHandler::getVHostByNumber (int n)
+Vhost* XmlVhostHandler::getVHost (int n)
 {
   Vhost* ret = 0;
   mutex.lock ();
diff --git a/plugins/src/guile_conf/guile_conf.cpp 
b/plugins/src/guile_conf/guile_conf.cpp
index 5e5c9e7..868f51f 100644
--- a/plugins/src/guile_conf/guile_conf.cpp
+++ b/plugins/src/guile_conf/guile_conf.cpp
@@ -170,7 +170,7 @@ public:
         };
     }
 
-  virtual Vhost* getVHostByNumber (int n)
+  virtual Vhost* getVHost (int n)
   {
     return vhosts[n];
   }



commit b9d8f443e6028ad74bc81c54af1c239f2e85d226
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Feb 28 00:45:06 2010 +0100

    Use the plugin.h file EXPORTABLE definition.

diff --git a/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp 
b/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
index 2dfb49a..4416867 100644
--- a/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
+++ b/myserver/binaries/web/cgi-src/math_sum/math_sum.cpp
@@ -14,11 +14,7 @@ int isNumber(char* s)
 
 const char *program_name;
 
-#ifdef WIN32
-extern "C" int EXPORTABLE myserver_main (char *cmd, MsCgiData* data)
-#else
-extern "C" int myserver_main (char *cmd, MsCgiData* data)
-#endif
+EXPORTABLE(int) myserver_main (char *cmd, MsCgiData* data)
 {
        MscgiManager cm(data);
   program_name = cmd;
diff --git a/myserver/binaries/web/cgi-src/post/post.cpp 
b/myserver/binaries/web/cgi-src/post/post.cpp
index 75ba383..0f9203f 100644
--- a/myserver/binaries/web/cgi-src/post/post.cpp
+++ b/myserver/binaries/web/cgi-src/post/post.cpp
@@ -3,11 +3,7 @@
 
 const char *program_name;
 
-#ifdef WIN32
-extern "C" int EXPORTABLE myserver_main (char *cmd,MsCgiData* data)
-#else
-extern "C" int myserver_main (char *cmd,MsCgiData* data)
-#endif
+EXPORTABLE(int) myserver_main (char *cmd, MsCgiData* data)
 {
   MscgiManager cm(data);
 
diff --git a/myserver/include/http_handler/mscgi/mscgi_manager.h 
b/myserver/include/http_handler/mscgi/mscgi_manager.h
index 936d60a..661c7f4 100644
--- a/myserver/include/http_handler/mscgi/mscgi_manager.h
+++ b/myserver/include/http_handler/mscgi/mscgi_manager.h
@@ -20,10 +20,6 @@
 #ifndef CGI_MANAGER_H
 # define CGI_MANAGER_H
 
-# ifdef WIN32
-#  define EXPORTABLE _declspec (dllexport)
-# endif
-
 # include "myserver.h"
 
 # include <include/server/server.h>
@@ -33,13 +29,11 @@
 # include <include/protocol/http/http_request.h>
 # include <include/protocol/http/http_response.h>
 # include <include/base/string/stringutils.h>
+# include <include/plugin/plugin.h>
+
 # define LOCAL_BUFFER_DIM 150
 
-# ifdef WIN32
-class EXPORTABLE MscgiManager
-# else
 class MscgiManager
-# endif
 {
  public:
   Server *getServer ();



commit 7d1ac8c2d2ba621f15717578ba749b0bb1d4e457
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Feb 28 00:44:47 2010 +0100

    Fix build under Windows.

diff --git a/myserver/src/myserver.cpp b/myserver/src/myserver.cpp
index bc8d5ab..009123d 100644
--- a/myserver/src/myserver.cpp
+++ b/myserver/src/myserver.cpp
@@ -637,7 +637,7 @@ void  __stdcall myServerMainNT (u_long, LPTSTR*)
 
       loadConfFilesLocation (mainConf, mimeConf, vhostConf, externPath, NULL);
       Server::getInstance ()->start (mainConf, mimeConf, vhostConf, externPath,
-                                     &genMainConf);
+                                     genMainConf);
 
       MyServiceStatus.dwCurrentState = SERVICE_STOP_PENDING;
       SetServiceStatus (MyServiceStatusHandle, &MyServiceStatus);



commit 3b4f3854c84f51ab0e7fc59f56b16bb45ad6e8cc
Author: Giuseppe Scrivano <address@hidden>
Date:   Sun Feb 28 00:44:20 2010 +0100

    Use gnulib include's to compile myserver.cpp, not system include's.

diff --git a/myserver/src/Makefile.am b/myserver/src/Makefile.am
index 65e64bd..2353991 100644
--- a/myserver/src/Makefile.am
+++ b/myserver/src/Makefile.am
@@ -14,10 +14,10 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
-AM_CXXFLAGS="-I$(top_srcdir)/lib"
 SUBDIRS = base conf connection connections_scheduler filter http_handler \
        log plugin protocol server GUI
-AM_CPPFLAGS = $(all_includes)
+AM_CPPFLAGS = $(all_includes) -I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_CXXFLAGS="-I$(top_srcdir)/lib"
 bin_PROGRAMS = myserver
 myserver_SOURCES = myserver.cpp
 myserver_CXXFLAGS = $(CXXFLAGS) -DHOST_STR=\"$(build)\" -DPREFIX=\"$(prefix)\"



commit 30706a3c51df12e1151add446b431698a6b61fc9
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Feb 27 23:39:11 2010 +0100

    Use LIBS instead of LDFLAGS to specify Windows libraries.

diff --git a/myserver/configure.ac b/myserver/configure.ac
index e400a3a..572c3f9 100644
--- a/myserver/configure.ac
+++ b/myserver/configure.ac
@@ -96,7 +96,7 @@ AC_CHECK_FUNCS(regcomp setgroups localtime_r posix_fallocate \
 
 case "${host}" in
     *-*-mingw32*)
-     LDFLAGS="-lwsock32 -lws2_32 -lgdi32 -lole32  -luuid -luserenv $LDFLAGS"
+     LIBS="$LIBS -lwsock32 -lws2_32 -lgdi32 -lole32  -luuid -luserenv"
      MAKE_MSCGI=yes
      LTCFLAGS=""
      ;;

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

Summary of changes:
 .../binaries/web/cgi-src/math_sum/math_sum.cpp     |    6 +-----
 myserver/binaries/web/cgi-src/post/post.cpp        |    6 +-----
 myserver/configure.ac                              |    2 +-
 myserver/include/conf/vhost/vhost_manager.h        |    4 ++--
 myserver/include/conf/vhost/xml_vhost_handler.h    |    2 +-
 .../include/http_handler/mscgi/mscgi_manager.h     |   10 ++--------
 myserver/src/Makefile.am                           |    4 ++--
 myserver/src/conf/vhost/vhost_manager.cpp          |    6 +++---
 myserver/src/conf/vhost/xml_vhost_handler.cpp      |    4 ++--
 myserver/src/myserver.cpp                          |    2 +-
 plugins/src/guile_conf/guile_conf.cpp              |    2 +-
 11 files changed, 17 insertions(+), 31 deletions(-)


hooks/post-receive
-- 
GNU MyServer