[myserver-commit] [SCM] GNU MyServer branch, master, updated. 5b8d3e1e3625554a873b5aacd6aa587fb1bb8860

[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  5b8d3e1e3625554a873b5aacd6aa587fb1bb8860 (commit)
       via  82cfc3d5fbace45927f79de0a35333b387c478a7 (commit)
      from  01a174502a9a888210f32a33b10abc2d51b120d7 (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 5b8d3e1e3625554a873b5aacd6aa587fb1bb8860
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Sep 26 00:56:26 2009 +0200

    Remove some obsoleted macro definitions.

diff --git a/myserver/stdafx.h b/myserver/stdafx.h
index 187319d..b0b969e 100644
--- a/myserver/stdafx.h
+++ b/myserver/stdafx.h
@@ -56,20 +56,10 @@ extern "C"
 #endif
 }
 
-#ifndef MAX_PATH
-# ifdef PATH_MAX
-#  define MAX_PATH PATH_MAX
-# else
-#  define MAX_PATH 255
-# endif
-#endif
-
 #ifndef HOST_NAME_MAX
 # define HOST_NAME_MAX 255
 #endif
 
-#define USE_NEW
-
 typedef unsigned long DWORD;
 typedef unsigned int u_int;
 typedef unsigned long u_long;



commit 82cfc3d5fbace45927f79de0a35333b387c478a7
Author: Giuseppe Scrivano <address@hidden>
Date:   Sat Sep 26 00:45:26 2009 +0200

    `Vhost::accessesLogWrite' appends a newline character.

diff --git a/myserver/src/conf/vhost/vhost.cpp 
b/myserver/src/conf/vhost/vhost.cpp
index 83fb370..2444164 100644
--- a/myserver/src/conf/vhost/vhost.cpp
+++ b/myserver/src/conf/vhost/vhost.cpp
@@ -368,7 +368,7 @@ Vhost::accessesLogWrite (const char* fmt, ...)
   va_list argptr;
   va_start (argptr, fmt);
   int ret = logManager->log (this, accessLogType, MYSERVER_LOG_MSG_INFO, false,
-                             false, fmt, argptr);
+                             true, fmt, argptr);
   va_end (argptr);
   return ret;
 }
diff --git a/myserver/src/protocol/control/control_protocol.cpp 
b/myserver/src/protocol/control/control_protocol.cpp
index f90b6a1..51e2aa6 100644
--- a/myserver/src/protocol/control/control_protocol.cpp
+++ b/myserver/src/protocol/control/control_protocol.cpp
@@ -538,9 +538,9 @@ int ControlProtocol::addToLog (int retCode, ConnectionPtr 
con, char *b1,
 #else
   sprintf(b1,
 #endif
-  "%s [%s] %s:%s:%s - %s  - %i\r\n", con->getIpAddr (), time.c_str (),
-  header.getCommand (),  header.getVersion (), header.getOptions (),
-  header.getAuthLogin () , retCode);
+  "%s [%s] %s:%s:%s - %s - %i", con->getIpAddr (), time.c_str (),
+          header.getCommand (),  header.getVersion (), header.getOptions (),
+          header.getAuthLogin (), retCode);
   con->host->accessesLogWrite ("%s", b1);
   return 0;
 }
diff --git a/myserver/src/protocol/ftp/ftp.cpp 
b/myserver/src/protocol/ftp/ftp.cpp
index fa98a2c..ec6a914 100644
--- a/myserver/src/protocol/ftp/ftp.cpp
+++ b/myserver/src/protocol/ftp/ftp.cpp
@@ -450,13 +450,7 @@ void Ftp::logAccess (int nReplyCode, const std::string & 
sCustomText)
   td.secondaryBuffer->setLength (0);
   *td.secondaryBuffer << time
     << " " << td.pConnection->getIpAddr ()
-    << " " << msgCode << " " << sCustomText;
-
-#ifdef WIN32
-  *td.secondaryBuffer << "\r\n" << end_str;
-#else
-  *td.secondaryBuffer << "\n" << end_str;
-#endif
+    << " " << msgCode << " " << sCustomText << end_str;
 
   if (td.pConnection->host)
     td.pConnection->host->accessesLogWrite ("%s", 
td.secondaryBuffer->getBuffer ());
diff --git a/myserver/src/protocol/http/http.cpp 
b/myserver/src/protocol/http/http.cpp
index bb96053..7c8c164 100644
--- a/myserver/src/protocol/http/http.cpp
+++ b/myserver/src/protocol/http/http.cpp
@@ -750,11 +750,9 @@ int Http::logHTTPaccess ()
             *td->secondaryBuffer << " " << (referer ? referer->value->c_str () 
: "")
             << " " << (userAgent ? userAgent->value->c_str () : "");
         }
-#ifdef WIN32
-      *td->secondaryBuffer << "\r\n" << end_str;
-#else
-      *td->secondaryBuffer << "\n" << end_str;
-#endif
+
+      *td->secondaryBuffer << end_str;
+
       /*!
        * Request the access to the log file then append the message.
        */

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

Summary of changes:
 myserver/src/conf/vhost/vhost.cpp                  |    2 +-
 myserver/src/protocol/control/control_protocol.cpp |    6 +++---
 myserver/src/protocol/ftp/ftp.cpp                  |    8 +-------
 myserver/src/protocol/http/http.cpp                |    8 +++-----
 myserver/stdafx.h                                  |   10 ----------
 5 files changed, 8 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
GNU MyServer