[myserver-commit] [2766] Fixed windows compiling issue

[Giuseppe Scrivano]

Revision: 2766
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2766
Author:   gscrivano
Date:     2008-08-29 16:38:48 +0000 (Fri, 29 Aug 2008)

Log Message:
-----------
Fixed windows compiling issue

Modified Paths:
--------------
    trunk/myserver/myserver.dev
    trunk/myserver/src/Makefile.am
    trunk/myserver/src/env.cpp
    trunk/myserver/src/server.cpp

Removed Paths:
-------------
    trunk/myserver/src/Dev-C++.cpp

Modified: trunk/myserver/myserver.dev
===================================================================
--- trunk/myserver/myserver.dev 2008-08-26 20:44:26 UTC (rev 2765)
+++ trunk/myserver/myserver.dev 2008-08-29 16:38:48 UTC (rev 2766)
@@ -1,7 +1,7 @@
 [Project]
 FileName=myserver.dev
 Name=myserver
-UnitCount=95
+UnitCount=94
 Type=1
 Ver=1
 ObjFiles=
@@ -46,6 +46,7 @@
 ProductName=MyServer
 ProductVersion=0.9.0
 AutoIncBuildNr=0
+
 [Unit1]
 FileName=stdafx.cpp
 CompileCpp=1
@@ -956,8 +957,8 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit92]
-FileName=src\Dev-C++.cpp
+[Unit93]
+FileName=src\protocols_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -966,8 +967,8 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit93]
-FileName=src\dyn_http_manager.cpp
+[Unit94]
+FileName=src\plugins_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -976,8 +977,8 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit94]
-FileName=src\protocols_manager.cpp
+[Unit95]
+FileName=src\plugins_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1
@@ -986,8 +987,8 @@
 OverrideBuildCmd=0
 BuildCmd=
 
-[Unit95]
-FileName=src\plugins_manager.cpp
+[Unit92]
+FileName=src\dyn_http_manager.cpp
 CompileCpp=1
 Folder=myserver
 Compile=1

Deleted: trunk/myserver/src/Dev-C++.cpp
===================================================================
--- trunk/myserver/src/Dev-C++.cpp      2008-08-26 20:44:26 UTC (rev 2765)
+++ trunk/myserver/src/Dev-C++.cpp      2008-08-29 16:38:48 UTC (rev 2766)
@@ -1,9 +0,0 @@
-// Bloodshed Dev-C++ Helper
-
-#include <stdlib.h>
-
-void * _alloca(size_t size)
-{
-  return malloc(size);
-}
-

Modified: trunk/myserver/src/Makefile.am
===================================================================
--- trunk/myserver/src/Makefile.am      2008-08-26 20:44:26 UTC (rev 2765)
+++ trunk/myserver/src/Makefile.am      2008-08-29 16:38:48 UTC (rev 2766)
@@ -3,7 +3,7 @@
 #BUILT_SOURCES = ../include/ftp_lexer.h ../include/ftp_parser.h
 #AM_YFLAGS = --defines=../include/ftp_parser.h
 bin_PROGRAMS = myserver
-myserver_SOURCES = cached_file_buffer.cpp cached_file.cpp 
cached_file_factory.cpp cgi.cpp clients_thread.cpp connection.cpp 
connections_scheduler.cpp control_header.cpp control_protocol.cpp Dev-C++.cpp 
dynamic_executor.cpp dynamiclib.cpp dynamic_protocol.cpp 
dyn_executor_manager.cpp dyn_filter.cpp dyn_filter_file.cpp 
dyn_filters_manager.cpp dyn_http_command.cpp dyn_http_command_manager.cpp 
dyn_http_manager.cpp dyn_http_manager_list.cpp env.cpp event.cpp fastcgi.cpp 
file.cpp files_utility.cpp filter.cpp filters_chain.cpp filters_factory.cpp 
generic_plugins_manager.cpp gzip.cpp gzip_decompress.cpp hash_map.cpp 
home_dir.cpp http.cpp http_data_handler.cpp http_data_read.cpp http_dir.cpp 
http_errors.cpp http_file.cpp http_header_checker.cpp http_headers.cpp 
http_request.cpp http_response.cpp https.cpp http_thread_context.cpp isapi.cpp 
find_data.cpp listen_threads.cpp log_manager.cpp md5.cpp mem_buff.cpp 
memory_stream.cpp mime_manager.cpp mime_utils.cpp mscgi_manager.cpp mscgi.cpp 
multicast.cpp mutex.cpp myserver.cpp myserver_regex.cpp pipe.cpp plugin.cpp 
plugins_manager.cpp plugins_namespace.cpp plugins_namespace_manager.cpp 
process.cpp process_server_manager.cpp protocol_buffer.cpp protocol.cpp 
protocols_manager.cpp read_write_lock.cpp recursive_mutex.cpp safetime.cpp 
scgi.cpp securestr.cpp security_cache.cpp security.cpp semaphore.cpp server.cpp 
socket.cpp ssl.cpp ssl_socket.cpp stream.cpp stringutils.cpp thread.cpp 
utility.cpp vhost_manager.cpp vhost.cpp wincgi.cpp xml_parser.cpp ftp_lexer.cpp 
ftp_parser.cpp ftp.cpp
+myserver_SOURCES = cached_file_buffer.cpp cached_file.cpp 
cached_file_factory.cpp cgi.cpp clients_thread.cpp connection.cpp 
connections_scheduler.cpp control_header.cpp control_protocol.cpp 
dynamic_executor.cpp dynamiclib.cpp dynamic_protocol.cpp 
dyn_executor_manager.cpp dyn_filter.cpp dyn_filter_file.cpp 
dyn_filters_manager.cpp dyn_http_command.cpp dyn_http_command_manager.cpp 
dyn_http_manager.cpp dyn_http_manager_list.cpp env.cpp event.cpp fastcgi.cpp 
file.cpp files_utility.cpp filter.cpp filters_chain.cpp filters_factory.cpp 
generic_plugins_manager.cpp gzip.cpp gzip_decompress.cpp hash_map.cpp 
home_dir.cpp http.cpp http_data_handler.cpp http_data_read.cpp http_dir.cpp 
http_errors.cpp http_file.cpp http_header_checker.cpp http_headers.cpp 
http_request.cpp http_response.cpp https.cpp http_thread_context.cpp isapi.cpp 
find_data.cpp listen_threads.cpp log_manager.cpp md5.cpp mem_buff.cpp 
memory_stream.cpp mime_manager.cpp mime_utils.cpp mscgi_manager.cpp mscgi.cpp 
multicast.cpp mutex.cpp myserver.cpp myserver_regex.cpp pipe.cpp plugin.cpp 
plugins_manager.cpp plugins_namespace.cpp plugins_namespace_manager.cpp 
process.cpp process_server_manager.cpp protocol_buffer.cpp protocol.cpp 
protocols_manager.cpp read_write_lock.cpp recursive_mutex.cpp safetime.cpp 
scgi.cpp securestr.cpp security_cache.cpp security.cpp semaphore.cpp server.cpp 
socket.cpp ssl.cpp ssl_socket.cpp stream.cpp stringutils.cpp thread.cpp 
utility.cpp vhost_manager.cpp vhost.cpp wincgi.cpp xml_parser.cpp ftp_lexer.cpp 
ftp_parser.cpp ftp.cpp
 
 INCLUDES = $(all_includes)
 

Modified: trunk/myserver/src/env.cpp
===================================================================
--- trunk/myserver/src/env.cpp  2008-08-26 20:44:26 UTC (rev 2765)
+++ trunk/myserver/src/env.cpp  2008-08-29 16:38:48 UTC (rev 2766)
@@ -212,7 +212,8 @@
 
   buildHttpHeaderEnvString(memCgi, td->request);
 
-  buildProcessEnvString(memCgi);
+  if(processEnv)
+    buildProcessEnvString(memCgi);
 
 
   memCgi << end_str << end_str  << end_str  << end_str  << end_str  ;
@@ -247,22 +248,19 @@
 void Env::buildProcessEnvString(MemBuf& memCgi)
 {
 #ifdef WIN32
-  if(processEnv)
-  {
-    LPTSTR lpszVariable; 
-    LPVOID lpvEnv; 
-    lpvEnv = Server::getInstance()->getEnvString();
-    memCgi << end_str;
-    if (lpvEnv)
-      for (lpszVariable = (LPTSTR) lpvEnv; *lpszVariable; lpszVariable++) 
-      { 
-        if(((char*)lpszVariable)[0]  != '=' )
-        {
-          memCgi << (char*)lpszVariable << end_str;
-        }
-        while(*lpszVariable)
-          *lpszVariable++;
+  LPTSTR lpszVariable; 
+  LPVOID lpvEnv; 
+  lpvEnv = Server::getInstance()->getEnvString();
+  memCgi << end_str;
+  if (lpvEnv)
+    for (lpszVariable = (LPTSTR) lpvEnv; *lpszVariable; lpszVariable++) 
+    { 
+      if(((char*)lpszVariable)[0]  != '=' )
+      {
+        memCgi << (char*)lpszVariable << end_str;
       }
-  }
+      while(*lpszVariable)
+        *lpszVariable++;
+    }
 #endif
 }

Modified: trunk/myserver/src/server.cpp
===================================================================
--- trunk/myserver/src/server.cpp       2008-08-26 20:44:26 UTC (rev 2765)
+++ trunk/myserver/src/server.cpp       2008-08-29 16:38:48 UTC (rev 2766)
@@ -159,7 +159,7 @@
     try
     {
       string softwareSignature;
-      softwareSignature.assign("************MyServer ");
+      softwareSignature.assign("************GNU MyServer ");
       softwareSignature.append(versionOfSoftware);
       softwareSignature.append("************");