[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-460-g61d1323

[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  61d1323797634e78122daeb2535f05a432468aaf (commit)
      from  7e5d49f284419bf46882f76976ee6018b0597e43 (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 61d1323797634e78122daeb2535f05a432468aaf
Author: Giuseppe Scrivano <address@hidden>
Date:   Thu Apr 21 13:24:25 2011 +0200

    Mscgi: send data correctly.

diff --git a/myserver/include/http_handler/mscgi/mscgi.h 
b/myserver/include/http_handler/mscgi/mscgi.h
index 4b97db7..1e9f601 100644
--- a/myserver/include/http_handler/mscgi/mscgi.h
+++ b/myserver/include/http_handler/mscgi/mscgi.h
@@ -60,7 +60,7 @@ public:
                     const char* cmdLine = 0, bool execute = false,
                     bool onlyHeader = false);
 
-  int write (const char*, u_long, MsCgiData*);
+  int write (const char*, size_t, MsCgiData*);
   int sendHeader (MsCgiData*);
 
 private:
diff --git a/myserver/include/http_handler/mscgi/mscgi_manager.h 
b/myserver/include/http_handler/mscgi/mscgi_manager.h
index 52241c7..aedcbf5 100644
--- a/myserver/include/http_handler/mscgi/mscgi_manager.h
+++ b/myserver/include/http_handler/mscgi/mscgi_manager.h
@@ -51,8 +51,8 @@ class MscgiManager
   void getenv (const char*, char*, u_long*);
   char* getParam (const char*);
   char* postParam (const char*);
-  int write (const char*);
-  int write (const void*, int);
+  int write (const char *);
+  int write (const void *, size_t);
  private:
   HttpThreadContext* td;
   MsCgiData* cgidata;
diff --git a/myserver/src/http_handler/mscgi/mscgi.cpp 
b/myserver/src/http_handler/mscgi/mscgi.cpp
index dcca885..d721b9a 100644
--- a/myserver/src/http_handler/mscgi/mscgi.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi.cpp
@@ -70,7 +70,7 @@ int MsCgi::send (HttpThreadContext* td, const char* exec, 
const char* cmdLine,
   data.server = Server::getInstance ();
   data.mscgi = this;
   data.useChunks = false;
-  data.onlyHeader = onlyHeader ? true : false;
+  data.onlyHeader = onlyHeader;
   data.error = false;
   data.filtersChain = &chain;
   data.headerSent = false;
@@ -156,7 +156,7 @@ int MsCgi::send (HttpThreadContext* td, const char* exec, 
const char* cmdLine,
 /*!
   Send a chunk of data to the client.
  */
-int MsCgi::write (const char* data, u_long len, MsCgiData* mcd)
+int MsCgi::write (const char* data, size_t len, MsCgiData* mcd)
 {
   if (mcd->error)
     return 1;
@@ -169,8 +169,7 @@ int MsCgi::write (const char* data, u_long len, MsCgiData* 
mcd)
 
   mcd->td->sentData +=
     HttpDataHandler::appendDataToHTTPChannel (mcd->td,
-                                              
mcd->td->auxiliaryBuffer->getBuffer (),
-                                              
mcd->td->auxiliaryBuffer->getLength (),
+                                              (char *) data, len,
                                               &(mcd->td->outputData),
                                               mcd->filtersChain,
                                               mcd->td->appendOutputs,
diff --git a/myserver/src/http_handler/mscgi/mscgi_manager.cpp 
b/myserver/src/http_handler/mscgi/mscgi_manager.cpp
index 67db9aa..106d5b7 100644
--- a/myserver/src/http_handler/mscgi/mscgi_manager.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi_manager.cpp
@@ -39,7 +39,7 @@ int MscgiManager::write (const char* str)
 /*!
   Write binary to the stdout.
  */
-int MscgiManager::write (const void* data, int len)
+int MscgiManager::write (const void* data, size_t len)
 {
   return cgidata->mscgi->write ((const char*) data, len, cgidata);
 }

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

Summary of changes:
 myserver/include/http_handler/mscgi/mscgi.h        |    2 +-
 .../include/http_handler/mscgi/mscgi_manager.h     |    4 ++--
 myserver/src/http_handler/mscgi/mscgi.cpp          |    7 +++----
 myserver/src/http_handler/mscgi/mscgi_manager.cpp  |    2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
GNU MyServer