[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-479
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-479-g683d2be |
|
Date: |
Sat, 23 Apr 2011 18:00:50 +0000 |
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 683d2be1d20c202bbcdbe45b77cc37e831638906 (commit)
from 8af71c1b0231109176948f0316c0103304610937 (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 683d2be1d20c202bbcdbe45b77cc37e831638906
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Apr 23 19:56:27 2011 +0200
HttpDataHandler: Simplify completeHTTPResponse and beginHTTPResponse
diff --git a/myserver/include/protocol/http/http_data_handler.h
b/myserver/include/protocol/http/http_data_handler.h
index 242d996..729720e 100644
--- a/myserver/include/protocol/http/http_data_handler.h
+++ b/myserver/include/protocol/http/http_data_handler.h
@@ -69,13 +69,11 @@ public:
static size_t beginHTTPResponse (HttpThreadContext *td,
MemoryStream &memStream,
- FiltersChain &chain,
- bool useChunks);
+ FiltersChain &chain);
static size_t completeHTTPResponse (HttpThreadContext *td,
MemoryStream &memStream,
- FiltersChain &chain,
- bool useChunks);
+ FiltersChain &chain);
static size_t generateFiltersChain (HttpThreadContext *td,
FiltersFactory *factory,
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index 6e1c1dd..f171e0f 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -345,7 +345,7 @@ int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile,
FiltersChain& chain,
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain, td->useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain);
return HttpDataHandler::RET_OK;
}
diff --git a/myserver/src/http_handler/fastcgi/fastcgi.cpp
b/myserver/src/http_handler/fastcgi/fastcgi.cpp
index 2f0c780..ed67a2b 100644
--- a/myserver/src/http_handler/fastcgi/fastcgi.cpp
+++ b/myserver/src/http_handler/fastcgi/fastcgi.cpp
@@ -284,8 +284,7 @@ int FastCgi::send (HttpThreadContext* td, const char*
scriptpath,
while (! exit);
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain,
- con.td->useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain);
chain.clearAllFilters ();
con.sock.close ();
diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp
b/myserver/src/http_handler/http_dir/http_dir.cpp
index 7b59047..eba7db2 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -596,7 +596,7 @@ int HttpDir::send (HttpThreadContext* td,
*bufferloop = '/';
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain,
td->useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain);
}
catch (exception & e)
{
diff --git a/myserver/src/http_handler/http_file/http_file.cpp
b/myserver/src/http_handler/http_file/http_file.cpp
index 833e9c1..a857017 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -361,8 +361,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
file->seek (firstByte);
- td->sentData += HttpDataHandler::beginHTTPResponse (td, memStream, chain,
- td->useChunks);
+ td->sentData += HttpDataHandler::beginHTTPResponse (td, memStream, chain);
/* Flush the rest of the file. */
for (;;)
@@ -393,7 +392,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
}
}/* End for loop. */
- td->sentData += completeHTTPResponse (td, memStream, chain, td->useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain);
file->close ();
delete file;
diff --git a/myserver/src/http_handler/isapi/isapi.cpp
b/myserver/src/http_handler/isapi/isapi.cpp
index 4435b99..0f87005 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -825,8 +825,7 @@ int Isapi::send (HttpThreadContext* td,
MemoryStream memStream (td->auxiliaryBuffer);
td->sentData += completeHTTPResponse (td, memStream,
- connTable[connIndex].chain,
-
connTable[connIndex].td->useChunks);
+ connTable[connIndex].chain);
switch (ret)
{
diff --git a/myserver/src/http_handler/mscgi/mscgi.cpp
b/myserver/src/http_handler/mscgi/mscgi.cpp
index 885cbe3..223a08e 100644
--- a/myserver/src/http_handler/mscgi/mscgi.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi.cpp
@@ -132,7 +132,7 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain,
td->useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain);
if (!data.error)
return HttpDataHandler::RET_FAILURE;
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index f305c8f..126a19c 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -333,7 +333,7 @@ int Proxy::readPayLoad (HttpThreadContext* td,
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, *out, useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, *out);
return HttpDataHandler::RET_OK;
}
diff --git a/myserver/src/http_handler/scgi/scgi.cpp
b/myserver/src/http_handler/scgi/scgi.cpp
index 90569e8..2c0c60e 100644
--- a/myserver/src/http_handler/scgi/scgi.cpp
+++ b/myserver/src/http_handler/scgi/scgi.cpp
@@ -284,8 +284,7 @@ int Scgi::sendResponse (ScgiContext* ctx, bool onlyHeader,
FiltersChain* chain)
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, *chain,
- td->useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, *chain);
}
return HttpDataHandler::RET_OK;
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp
b/myserver/src/http_handler/wincgi/wincgi.cpp
index dc0eaef..e578f2b 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -332,7 +332,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain,
td->useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain);
chain.clearAllFilters ();
OutFileHandle.close ();
diff --git a/myserver/src/protocol/http/http_data_handler.cpp
b/myserver/src/protocol/http/http_data_handler.cpp
index b0e77d4..37e8dd0 100644
--- a/myserver/src/protocol/http/http_data_handler.cpp
+++ b/myserver/src/protocol/http/http_data_handler.cpp
@@ -181,8 +181,7 @@ HttpDataHandler::checkDataChunks (HttpThreadContext* td,
bool disableEncoding)
size_t
HttpDataHandler::beginHTTPResponse (HttpThreadContext *td,
MemoryStream &memStream,
- FiltersChain &chain,
- bool useChunks)
+ FiltersChain &chain)
{
size_t ret = 0;
/*
@@ -214,12 +213,11 @@ HttpDataHandler::beginHTTPResponse (HttpThreadContext *td,
size_t
HttpDataHandler::completeHTTPResponse (HttpThreadContext *td,
MemoryStream &memStream,
- FiltersChain &chain,
- bool useChunks)
+ FiltersChain &chain)
{
size_t ret = 0;
/* If we don't use chunks we can flush directly. */
- if (! useChunks)
+ if (! td->useChunks)
chain.flush (&ret);
else
{
diff --git a/myserver/src/protocol/http/webdav/webdav.cpp
b/myserver/src/protocol/http/webdav/webdav.cpp
index b0cbe91..303a4c0 100644
--- a/myserver/src/protocol/http/webdav/webdav.cpp
+++ b/myserver/src/protocol/http/webdav/webdav.cpp
@@ -340,7 +340,7 @@ int WebDAV::propfind (HttpThreadContext* td)
MemoryStream memStream (td->auxiliaryBuffer);
td->sentData += HttpDataHandler::completeHTTPResponse (td, memStream,
- chain,
td->useChunks);
+ chain);
return HttpDataHandler::RET_OK;
}
@@ -645,8 +645,7 @@ int WebDAV::lock (HttpThreadContext* td)
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += HttpDataHandler::completeHTTPResponse (td, memStream,
chain,
- td->useChunks);
+ td->sentData += HttpDataHandler::completeHTTPResponse (td, memStream,
chain);
return HttpDataHandler::RET_OK;
}
-----------------------------------------------------------------------
Summary of changes:
myserver/include/protocol/http/http_data_handler.h | 6 ++----
myserver/src/http_handler/cgi/cgi.cpp | 2 +-
myserver/src/http_handler/fastcgi/fastcgi.cpp | 3 +--
myserver/src/http_handler/http_dir/http_dir.cpp | 2 +-
myserver/src/http_handler/http_file/http_file.cpp | 5 ++---
myserver/src/http_handler/isapi/isapi.cpp | 3 +--
myserver/src/http_handler/mscgi/mscgi.cpp | 2 +-
myserver/src/http_handler/proxy/proxy.cpp | 2 +-
myserver/src/http_handler/scgi/scgi.cpp | 3 +--
myserver/src/http_handler/wincgi/wincgi.cpp | 2 +-
myserver/src/protocol/http/http_data_handler.cpp | 8 +++-----
myserver/src/protocol/http/webdav/webdav.cpp | 5 ++---
12 files changed, 17 insertions(+), 26 deletions(-)
hooks/post-receive
--
GNU MyServer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-479-g683d2be,
Giuseppe Scrivano <=