[myserver-commit] [3052] Fixed Windows compiling issues.

[Giuseppe Scrivano]

Revision: 3052
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=3052
Author:   gscrivano
Date:     2009-04-13 14:34:44 +0000 (Mon, 13 Apr 2009)
Log Message:
-----------
Fixed Windows compiling issues.

Modified Paths:
--------------
    trunk/myserver/include/base/socket/socket.h
    trunk/myserver/include/base/socket_pair/socket_pair.h
    trunk/myserver/src/base/process/process.cpp
    trunk/myserver/src/base/process/process_server_manager.cpp
    trunk/myserver/src/base/socket_pair/socket_pair.cpp
    trunk/myserver/src/connections_scheduler/connections_scheduler.cpp
    trunk/myserver/src/filter/console.cpp
    trunk/myserver/src/http_handler/isapi/isapi.cpp
    trunk/myserver/src/http_handler/wincgi/wincgi.cpp

Modified: trunk/myserver/include/base/socket/socket.h
===================================================================
--- trunk/myserver/include/base/socket/socket.h 2009-04-12 20:43:00 UTC (rev 
3051)
+++ trunk/myserver/include/base/socket/socket.h 2009-04-13 14:34:44 UTC (rev 
3052)
@@ -82,6 +82,7 @@
   Socket();
   Socket(Socket*);
   Socket(FileHandle);
+
   Socket accept(MYSERVER_SOCKADDR*, int*);
   int setsockopt(int,int, const char*,int);
 

Modified: trunk/myserver/include/base/socket_pair/socket_pair.h
===================================================================
--- trunk/myserver/include/base/socket_pair/socket_pair.h       2009-04-12 
20:43:00 UTC (rev 3051)
+++ trunk/myserver/include/base/socket_pair/socket_pair.h       2009-04-13 
14:34:44 UTC (rev 3052)
@@ -32,8 +32,13 @@
 public:
        SocketPair ();
        int create ();
+#ifdef WIN32
+       SOCKET getFirstHandle ();
+       SOCKET getSecondHandle ();
+#else
        FileHandle getFirstHandle ();
        FileHandle getSecondHandle ();
+#endif
        void inverted (SocketPair&);
        virtual int close ();
        void closeFirstHandle ();
@@ -44,6 +49,10 @@
   int writeHandle (FileHandle);
 
 protected:
+#ifdef WIN32
+       SOCKET handles[2];
+#else
        FileHandle handles[2];
+#endif
 };
 #endif

Modified: trunk/myserver/src/base/process/process.cpp
===================================================================
--- trunk/myserver/src/base/process/process.cpp 2009-04-12 20:43:00 UTC (rev 
3051)
+++ trunk/myserver/src/base/process/process.cpp 2009-04-13 14:34:44 UTC (rev 
3052)
@@ -171,8 +171,8 @@
   cwd = spi->cwd.length() ? (char*)spi->cwd.c_str() : 0;
   ZeroMemory( &pi, sizeof(pi) );
 
-  ret = CreateProcess(NULL, (char*)spi->cmdLine.c_str(), NULL, NULL, TRUE,0,
-                      spi->envString, cwd, &si, &pi);
+  BOOL ret = CreateProcess(NULL, (char*)spi->cmdLine.c_str(), NULL, NULL, 
TRUE,0,
+                           spi->envString, cwd, &si, &pi);
 
   if (!ret)
     return (-1);

Modified: trunk/myserver/src/base/process/process_server_manager.cpp
===================================================================
--- trunk/myserver/src/base/process/process_server_manager.cpp  2009-04-12 
20:43:00 UTC (rev 3051)
+++ trunk/myserver/src/base/process/process_server_manager.cpp  2009-04-13 
14:34:44 UTC (rev 3052)
@@ -515,7 +515,7 @@
   socklen_t nLength = sizeof(MYSERVER_SOCKADDRIN);
   
   if (server->socket.getHandle())
-    getsockname(server->socket.getHandle(), (sockaddr *)&serverSock, &nLength);
+    server->socket.getsockname ((MYSERVER_SOCKADDR*)&serverSock, 
(int*)&nLength);
 
   if(!serverSock.ss_family || serverSock.ss_family == AF_INET || 
!server->isLocal)
   {

Modified: trunk/myserver/src/base/socket_pair/socket_pair.cpp
===================================================================
--- trunk/myserver/src/base/socket_pair/socket_pair.cpp 2009-04-12 20:43:00 UTC 
(rev 3051)
+++ trunk/myserver/src/base/socket_pair/socket_pair.cpp 2009-04-13 14:34:44 UTC 
(rev 3052)
@@ -98,40 +98,40 @@
   addr.sin_addr.s_addr = htonl (0x7f000001);
   addr.sin_port = 0;
 
-  e = bind(listener, (const struct sockaddr*) &addr, sizeof(addr));
+  e = ::bind(listener, (const struct sockaddr*) &addr, sizeof(addr));
   if (e == SOCKET_ERROR)
     {
-      close(listener);
+      closesocket (listener);
       return -1;
     }
   
-  e = getsockname(listener, (struct sockaddr*) &addr, &addrlen);
+  e = ::getsockname(listener, (struct sockaddr*) &addr, &addrlen);
   if (e == SOCKET_ERROR)
     {
-      close (listener);
+      closesocket (listener);
       return -1;
     }
   
   do
     {
-      if (listen (listener, 1) == SOCKET_ERROR)
+      if (::listen (listener, 1) == SOCKET_ERROR)
         break;
-      if ((handles[0] = socket (AF_INET, type, 0)) == INVALID_SOCKET)
+      if ((handles[0] = ::socket (AF_INET, type, 0)) == INVALID_SOCKET)
         break;
-      if (connect(handles[0], (const struct sockaddr*) &addr, sizeof (addr)) 
== SOCKET_ERROR)
+      if (::connect(handles[0], (const struct sockaddr*) &addr, sizeof (addr)) 
== SOCKET_ERROR)
         break;
-      if ((handles[1] = accept (listener, NULL, NULL)) == INVALID_SOCKET)
+      if ((handles[1] = ::accept (listener, NULL, NULL)) == INVALID_SOCKET)
         break;
     
       socketHandle = handles[0];
 
-      close (listener);
+      closesocket (listener);
       return 0;
     } while (0);
   
-  close (listener);
-  close (handles[0]);
-  close (handles[1]);
+  closesocket (listener);
+  closesocket (handles[0]);
+  closesocket (handles[1]);
   
   return -1;
 #endif
@@ -142,7 +142,11 @@
 /*!
  *Get the first handle used by the socket pair.
  */
+#ifdef WIN32
+SOCKET SocketPair::getFirstHandle ()
+#else
 FileHandle SocketPair::getFirstHandle ()
+#endif
 {
   return handles[0];
 }
@@ -150,7 +154,11 @@
 /*!
  *Get the second handle used by the socket pair.
  */
+#ifdef WIN32
+SOCKET SocketPair::getSecondHandle ()
+#else
 FileHandle SocketPair::getSecondHandle ()
+#endif
 {
   return handles[1];
 }
@@ -186,7 +194,7 @@
  */
 void SocketPair::closeFirstHandle ()
 {
-  Socket sock (handles[0]);
+  Socket sock ((FileHandle)handles[0]);
   sock.close ();
 }
 
@@ -195,7 +203,7 @@
  */
 void SocketPair::closeSecondHandle ()
 {
-  Socket sock (handles[1]);
+  Socket sock ((FileHandle)handles[1]);
   sock.close ();
 }
 
@@ -205,10 +213,10 @@
  */
 void SocketPair::setNonBlocking (bool notBlocking)
 {
-   Socket sock0 (handles[0]);
+  Socket sock0 ((FileHandle)handles[0]);
    sock0.setNonBlocking (notBlocking);
 
-   Socket sock1 (handles[1]);
+   Socket sock1 ((FileHandle)handles[1]);
    sock1.setNonBlocking (notBlocking);
 }
 

Modified: trunk/myserver/src/connections_scheduler/connections_scheduler.cpp
===================================================================
--- trunk/myserver/src/connections_scheduler/connections_scheduler.cpp  
2009-04-12 20:43:00 UTC (rev 3051)
+++ trunk/myserver/src/connections_scheduler/connections_scheduler.cpp  
2009-04-13 14:34:44 UTC (rev 3052)
@@ -408,7 +408,7 @@
   if(lock)
   {
     u_long nbw;
-    Socket sock (dispatcherArg.socketPair.getSecondHandle ());
+    Socket sock ((FileHandle)dispatcherArg.socketPair.getSecondHandle ());
 
     eventsSocketMutex.lock();
     sock.write("c", 1, &nbw);
@@ -482,8 +482,8 @@
     readySemaphore->unlock();
   }
 
-  Socket sockR (dispatcherArg.socketPair.getFirstHandle ());
-  Socket sockW (dispatcherArg.socketPair.getSecondHandle ());
+  Socket sockR ((FileHandle)dispatcherArg.socketPair.getFirstHandle ());
+  Socket sockW ((FileHandle)dispatcherArg.socketPair.getSecondHandle ());
 
   eventsSocketMutex.lock();
   sockW.write("r", 1, &nbw);

Modified: trunk/myserver/src/filter/console.cpp
===================================================================
--- trunk/myserver/src/filter/console.cpp       2009-04-12 20:43:00 UTC (rev 
3051)
+++ trunk/myserver/src/filter/console.cpp       2009-04-13 14:34:44 UTC (rev 
3052)
@@ -153,7 +153,7 @@
       nStdHandle = STD_ERROR_HANDLE;
     }
   h = GetStdHandle (nStdHandle);
-  SetConsoleTextAttribute (attrs, h);
+  SetConsoleTextAttribute (h, attrs);
 #else
   if (fg_colors.count (fg_color) && bg_colors.count (bg_color))
     {

Modified: trunk/myserver/src/http_handler/isapi/isapi.cpp
===================================================================
--- trunk/myserver/src/http_handler/isapi/isapi.cpp     2009-04-12 20:43:00 UTC 
(rev 3051)
+++ trunk/myserver/src/http_handler/isapi/isapi.cpp     2009-04-13 14:34:44 UTC 
(rev 3052)
@@ -715,7 +715,8 @@
 
   if(valLen + 30 < maxLen)
     valLen += sprintf(&ValStr[valLen], "SERVER_ADMIN:%s\n", 
-                      Server::getInstance()->getServerAdmin());
+                      td->securityToken.getHashedData ("server.admin", 
MYSERVER_VHOST_CONF |
+                                                       MYSERVER_SERVER_CONF, 
""));
   else if(valLen + 30 < maxLen) 
     return 0;
 

Modified: trunk/myserver/src/http_handler/wincgi/wincgi.cpp
===================================================================
--- trunk/myserver/src/http_handler/wincgi/wincgi.cpp   2009-04-12 20:43:00 UTC 
(rev 3051)
+++ trunk/myserver/src/http_handler/wincgi/wincgi.cpp   2009-04-13 14:34:44 UTC 
(rev 3052)
@@ -1,6 +1,6 @@
 /*
 MyServer
-Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc.
+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
@@ -159,7 +159,9 @@
   strcpy(buffer, "CGI Version=CGI/1.3a WIN\r\n");
   DataFileHandle.writeToFile(buffer,26,&nbr);
 
-  *td->secondaryBuffer << "Server Admin=" << 
Server::getInstance()->getServerAdmin() << "\r\n";
+  *td->secondaryBuffer << "Server Admin=" << 
+    td->securityToken.getHashedData ("server.admin", MYSERVER_VHOST_CONF |
+                                     MYSERVER_SERVER_CONF, "")<< "\r\n";
   DataFileHandle.writeToFile(buffer,td->secondaryBuffer->getLength(),&nbr);
 
   {
@@ -304,7 +306,7 @@
   spi.cmdLine.append(dataFilePath);
   spi.cwd.assign(pathname);
   spi.envString = 0;
-  if (proc.execAndWait (&spi, timeout))
+  if (proc.exec (&spi, true))
   {
     ostringstream msg;
     msg << "WinCGI: Error executing process " << scriptpath;