[myserver-commit] [2876] Fixed Server signature environment variable value.

[Giuseppe Scrivano]

Revision: 2876
          http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2876
Author:   gscrivano
Date:     2008-10-09 21:24:47 +0000 (Thu, 09 Oct 2008)

Log Message:
-----------
Fixed Server signature environment variable value.

Modified Paths:
--------------
    trunk/myserver/src/base/process/process.cpp
    trunk/myserver/src/http_handler/cgi/cgi.cpp
    trunk/myserver/src/protocol/http/env/env.cpp

Modified: trunk/myserver/src/base/process/process.cpp
===================================================================
--- trunk/myserver/src/base/process/process.cpp 2008-10-09 15:41:04 UTC (rev 
2875)
+++ trunk/myserver/src/base/process/process.cpp 2008-10-09 21:24:47 UTC (rev 
2876)
@@ -214,7 +214,7 @@
     //close(2); // close stderr
     //dup2((int)spi->stdError, 2);
     // Run the script
-    ret = execve((const char*)(spi->cmd.c_str()),
+    ret = execve((const char*)args[0], 
                  (char* const*)args, (char* const*) envp);
     exit(0);
 
@@ -390,7 +390,7 @@
           {
             args[count++] = (const char*)&(spi->arg.c_str())[start];
             spi->arg[i] = '\0';
-
+            
             while((spi->arg[i] == ' ') && (i < len))
               i++;
 
@@ -427,6 +427,7 @@
       // change to working dir
     if(spi->cwd.length())
       chdir((const char*)(spi->cwd.c_str()));
+
     // If stdOut is -1, pipe to /dev/null
     if((long)spi->stdOut == -1)
       spi->stdOut = (FileHandle)open("/dev/null",O_WRONLY);
@@ -453,10 +454,9 @@
     //dup2((int)spi->stdError, 2);
     // Run the script
 
-    ret = execve((const char*)(spi->cmd.c_str()),
-                 (char* const*)args,(char* const*) envp);
+    ret = execve ((const char*) args[0],
+                 (char* const*)args, (char* const*) envp);
 
-
     exit(1);
   } // end else if(pid == 0)
   else

Modified: trunk/myserver/src/http_handler/cgi/cgi.cpp
===================================================================
--- trunk/myserver/src/http_handler/cgi/cgi.cpp 2008-10-09 15:41:04 UTC (rev 
2875)
+++ trunk/myserver/src/http_handler/cgi/cgi.cpp 2008-10-09 21:24:47 UTC (rev 
2876)
@@ -137,7 +137,6 @@
     
   tmpScriptPath.assign(scriptpath);
   FilesUtility::splitPath(tmpScriptPath, td->scriptDir, td->scriptFile);
-  
 
   chain.setProtocol(td->http);
   chain.setProtocolData(td);
@@ -261,7 +260,7 @@
   if(stdInFile.openFile(td->inputDataPath, 
                         File::MYSERVER_OPEN_READ | File::MYSERVER_OPEN_ALWAYS))
   {
-    td->connection->host->warningsLogWrite("Cgi: Cannot open CGI stdin file");
+    td->connection->host->warningsLogWrite("Cgi: Cannot open CGI stdin file.");
     stdOutFile.close();
     chain.clearAllFilters(); 
     return td->http->raiseHTTPError(500);
@@ -292,7 +291,7 @@
        spi.stdIn == (FileHandle)-1 || 
        spi.stdOut == (FileHandle)-1)
   {
-    td->connection->host->warningsLogWrite("Cgi: Invalid 
base/file/file.handler");
+    td->connection->host->warningsLogWrite("Cgi: Invalid file handler.");
     stdOutFile.close();
     chain.clearAllFilters(); 
     return td->http->raiseHTTPError(500);

Modified: trunk/myserver/src/protocol/http/env/env.cpp
===================================================================
--- trunk/myserver/src/protocol/http/env/env.cpp        2008-10-09 15:41:04 UTC 
(rev 2875)
+++ trunk/myserver/src/protocol/http/env/env.cpp        2008-10-09 21:24:47 UTC 
(rev 2876)
@@ -53,7 +53,7 @@
   HttpRequestHeader::Entry* reqEntry = NULL;
 
   memCgi.setExternalBuffer(cgiEnv, td->buffer2->getRealLength());
-  memCgi << "SERVER_SOFTWARE=" << MYSERVER_VERSION;
+  memCgi << "SERVER_SOFTWARE=GNU MyServer " << MYSERVER_VERSION;
 
 #ifdef WIN32
   memCgi << " (WIN32)";
@@ -71,7 +71,7 @@
   memCgi << Server::getInstance()->getServerName();
   
   memCgi << end_str << "SERVER_SIGNATURE=";
-  memCgi << "<address>" << MYSERVER_VERSION << "</address>";
+  memCgi << "<address>GNU MyServer " << MYSERVER_VERSION << "</address>";
   
   memCgi << end_str << "SERVER_PROTOCOL=";
   memCgi << td->request.ver.c_str();