[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-478
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [SCM] GNU MyServer branch, master, updated. v0.9.2-478-g8af71c1 |
|
Date: |
Sat, 23 Apr 2011 10:00:46 +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 8af71c1b0231109176948f0316c0103304610937 (commit)
via a90a48d661f75a63619d8e64637cc0af3f0dc94e (commit)
via 8ea8f246c29f869dd7055e1fc854838f73b43fd2 (commit)
from 93f9942d7e8750eb195d1f2aba9a4a14434de87d (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 8af71c1b0231109176948f0316c0103304610937
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Apr 23 12:00:16 2011 +0200
Simplify HttpDataHandler::appendDataToHTTPChannel.
diff --git a/myserver/include/protocol/http/http_data_handler.h
b/myserver/include/protocol/http/http_data_handler.h
index b91adc9..242d996 100644
--- a/myserver/include/protocol/http/http_data_handler.h
+++ b/myserver/include/protocol/http/http_data_handler.h
@@ -59,15 +59,13 @@ public:
const char *buffer,
size_t size,
FiltersChain &chain,
- bool useChunks,
size_t realBufferSize,
MemoryStream &tmpStream);
static size_t appendDataToHTTPChannel (HttpThreadContext* td,
const char *buffer,
size_t size,
- FiltersChain &chain,
- bool useChunks);
+ FiltersChain &chain);
static size_t beginHTTPResponse (HttpThreadContext *td,
MemoryStream &memStream,
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index a86ca88..6e1c1dd 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -341,8 +341,7 @@ int Cgi::sendData (HttpThreadContext* td, Pipe &stdOutFile,
FiltersChain& chain,
td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
nBytesRead,
- chain,
- td->useChunks);
+ chain);
}
MemoryStream memStream (td->auxiliaryBuffer);
@@ -464,8 +463,7 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe
&stdOutFile,
td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer () + headerSize,
headerOffset - headerSize,
- chain,
- td->useChunks);
+ chain);
}
return 0;
diff --git a/myserver/src/http_handler/fastcgi/fastcgi.cpp
b/myserver/src/http_handler/fastcgi/fastcgi.cpp
index 9db2c31..2f0c780 100644
--- a/myserver/src/http_handler/fastcgi/fastcgi.cpp
+++ b/myserver/src/http_handler/fastcgi/fastcgi.cpp
@@ -620,7 +620,7 @@ int FastCgi::sendData (FcgiContext* con, u_long dim, u_long
timeout,
HttpDataHandler::appendDataToHTTPChannel (con->td,
con->td->buffer->getBuffer (),
con->td->buffer->getLength (),
- *chain, con->td->useChunks);
+ *chain);
return 0;
}
@@ -706,8 +706,7 @@ int FastCgi::handleHeader (FcgiContext* con, FiltersChain*
chain, bool* response
size_t nbw = HttpDataHandler::appendDataToHTTPChannel (con->td,
con->td->buffer->getBuffer ()
+ headerSize,
size - headerSize,
- *chain,
- con->td->useChunks);
+ *chain);
con->td->sentData += nbw;
}
diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp
b/myserver/src/http_handler/http_dir/http_dir.cpp
index f8eb42e..7b59047 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -435,7 +435,7 @@ int HttpDir::send (HttpThreadContext* td,
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
- chain, td->useChunks);
+ chain);
filename = directory;
td->auxiliaryBuffer->setLength (0);
@@ -450,7 +450,7 @@ int HttpDir::send (HttpThreadContext* td,
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
- chain, td->useChunks);
+ chain);
fd.findfirst (filename.c_str ());
@@ -465,7 +465,7 @@ int HttpDir::send (HttpThreadContext* td,
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength
(),
- chain, td->useChunks);
+ chain);
td->auxiliaryBuffer->setLength (0);
if (FilesUtility::getPathRecursionLevel (td->request.uri) >= 1)
@@ -501,7 +501,7 @@ int HttpDir::send (HttpThreadContext* td,
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
- chain, td->useChunks);
+ chain);
}
/* Put all files in a vector. */
@@ -562,7 +562,7 @@ int HttpDir::send (HttpThreadContext* td,
generateElement (*td->auxiliaryBuffer, file, linkPrefix,
formatString);
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
- chain, td->useChunks);
+ chain);
}
td->auxiliaryBuffer->setLength (0);
@@ -586,7 +586,7 @@ int HttpDir::send (HttpThreadContext* td,
*td->auxiliaryBuffer << "</address>\r\n</body>\r\n</html>\r\n";
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength
(),
- chain, td->useChunks);
+ chain);
*td->auxiliaryBuffer << end_str;
/* Changes the \ character in the / character. */
diff --git a/myserver/src/http_handler/http_file/http_file.cpp
b/myserver/src/http_handler/http_file/http_file.cpp
index 5055e4a..833e9c1 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -387,7 +387,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
bytesToSend -= nbr;
td->sentData += appendDataToHTTPChannel (td, td->buffer->getBuffer
(),
- nbr, chain, td->useChunks,
+ nbr, chain,
td->buffer->getRealLength
(),
memStream);
}
diff --git a/myserver/src/http_handler/isapi/isapi.cpp
b/myserver/src/http_handler/isapi/isapi.cpp
index c33b8c5..4435b99 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -292,8 +292,7 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByt
HttpDataHandler::appendDataToHTTPChannel (ConnInfo->td,
buffer + headerSize,
len,
- ConnInfo->chain,
-
ConnInfo->td->useChunks);
+ ConnInfo->chain);
ConnInfo->td->sentData += written;
*lpdwBytes = written;
@@ -305,8 +304,7 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByt
HttpDataHandler::appendDataToHTTPChannel (ConnInfo->td,
(const char *) Buffer,
*lpdwBytes,
- ConnInfo->chain,
- ConnInfo->td->useChunks);
+ ConnInfo->chain);
ConnInfo->td->sentData += written;
*lpdwBytes = written;
}
diff --git a/myserver/src/http_handler/mscgi/mscgi.cpp
b/myserver/src/http_handler/mscgi/mscgi.cpp
index 84e211c..885cbe3 100644
--- a/myserver/src/http_handler/mscgi/mscgi.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi.cpp
@@ -167,8 +167,7 @@ int MsCgi::write (const char* data, size_t len, MsCgiData*
mcd)
mcd->td->sentData +=
HttpDataHandler::appendDataToHTTPChannel (mcd->td,
data, len,
- *mcd->filtersChain,
- mcd->td->useChunks);
+ *mcd->filtersChain);
return 0;
}
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index 3104283..f305c8f 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -296,7 +296,7 @@ int Proxy::readPayLoad (HttpThreadContext* td,
td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer
(),
- nbr, *out, useChunks);
+ nbr, *out);
}
}
}
@@ -326,7 +326,7 @@ int Proxy::readPayLoad (HttpThreadContext* td,
length -= nbr;
td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
- nbr, *out, useChunks);
+ nbr, *out);
if (timedOut || contentLength && length == 0)
break;
}
diff --git a/myserver/src/http_handler/scgi/scgi.cpp
b/myserver/src/http_handler/scgi/scgi.cpp
index 5359acd..90569e8 100644
--- a/myserver/src/http_handler/scgi/scgi.cpp
+++ b/myserver/src/http_handler/scgi/scgi.cpp
@@ -265,7 +265,7 @@ int Scgi::sendResponse (ScgiContext* ctx, bool onlyHeader,
FiltersChain* chain)
if (read - headerSize)
td->sentData +=
appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer () +
headerSize,
- read - headerSize, *chain, td->useChunks);
+ read - headerSize, *chain);
if (td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
{
@@ -280,7 +280,7 @@ int Scgi::sendResponse (ScgiContext* ctx, bool onlyHeader,
FiltersChain* chain)
td->sentData +=
appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- nbr, *chain, td->useChunks);
+ nbr, *chain);
}
MemoryStream memStream (td->auxiliaryBuffer);
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp
b/myserver/src/http_handler/wincgi/wincgi.cpp
index e8b977e..dc0eaef 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -309,7 +309,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
buffer +
headerSize,
nBytesRead -
headerSize,
- chain,
td->useChunks);
+ chain);
if (td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
@@ -324,8 +324,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
td->sentData +=
HttpDataHandler::appendDataToHTTPChannel (td, buffer,
- nBytesRead, chain,
- td->useChunks);
+ nBytesRead, chain);
td->sentData += nbw;
}
diff --git a/myserver/src/protocol/http/http_data_handler.cpp
b/myserver/src/protocol/http/http_data_handler.cpp
index dc2ced9..b0e77d4 100644
--- a/myserver/src/protocol/http/http_data_handler.cpp
+++ b/myserver/src/protocol/http/http_data_handler.cpp
@@ -68,7 +68,6 @@ int HttpDataHandler::unLoad ()
\param buffer Data to send.
\param size Size of the buffer.
\param chain Where send data if not append.
- \param useChunks Can we use HTTP chunks to send data?
\param realBufferSize The real dimension of the buffer that can be
used by this method.
\param tmpStream A support on memory read/write stream used
@@ -78,7 +77,6 @@ size_t HttpDataHandler::appendDataToHTTPChannel
(HttpThreadContext *td,
const char *buffer,
size_t size,
FiltersChain &chain,
- bool useChunks,
size_t realBufferSize,
MemoryStream &tmpStream)
{
@@ -87,7 +85,7 @@ size_t HttpDataHandler::appendDataToHTTPChannel
(HttpThreadContext *td,
Stream *oldStream = chain.getStream ();
if (! chain.hasModifiersFilters () || size == 0)
- return appendDataToHTTPChannel (td, buffer, size, chain, useChunks);
+ return appendDataToHTTPChannel (td, buffer, size, chain);
/*
This function can't append directly to the chain because we can't
@@ -111,8 +109,7 @@ size_t HttpDataHandler::appendDataToHTTPChannel
(HttpThreadContext *td,
tmpStream.read (tmpBuf, BUFSIZ, &nbr);
if (nbr)
- totalNbw += appendDataToHTTPChannel (td, tmpBuf, nbr, directStream,
- useChunks);
+ totalNbw += appendDataToHTTPChannel (td, tmpBuf, nbr,
directStream);
}
while (size - written || nbr);
tmpStream.refresh ();
@@ -133,18 +130,16 @@ size_t HttpDataHandler::appendDataToHTTPChannel
(HttpThreadContext *td,
\param buffer Data to send.
\param size Size of the buffer.
\param chain Where send data if not append.
- \param useChunks Can we use HTTP chunks to send data?
*/
size_t
HttpDataHandler::appendDataToHTTPChannel (HttpThreadContext *td,
const char *buffer,
size_t size,
- FiltersChain &chain,
- bool useChunks)
+ FiltersChain &chain)
{
size_t tmp, nbw = 0;
- if (useChunks)
+ if (td->useChunks)
{
ostringstream chunkHeader;
chunkHeader << hex << size << "\r\n";
@@ -155,7 +150,7 @@ HttpDataHandler::appendDataToHTTPChannel (HttpThreadContext
*td,
if (size)
chain.write (buffer, size, &nbw);
- if (useChunks)
+ if (td->useChunks)
chain.getStream ()->write ("\r\n", 2, &tmp);
return nbw;
@@ -206,7 +201,7 @@ HttpDataHandler::beginHTTPResponse (HttpThreadContext *td,
{
FiltersChain directChain (chain.getStream ());
ret += appendDataToHTTPChannel (td, td->buffer->getBuffer (), nbr,
- directChain, useChunks);
+ directChain);
}
}
@@ -245,7 +240,7 @@ HttpDataHandler::completeHTTPResponse (HttpThreadContext
*td,
td->buffer->getRealLength (), &nbr);
ret += appendDataToHTTPChannel (td, td->buffer->getBuffer (),
- nbr, directChain, useChunks);
+ nbr, directChain);
chain.getStream ()->write ("0\r\n\r\n", 5, &nbw);
}
diff --git a/myserver/src/protocol/http/webdav/webdav.cpp
b/myserver/src/protocol/http/webdav/webdav.cpp
index 6dc18dc..b0cbe91 100644
--- a/myserver/src/protocol/http/webdav/webdav.cpp
+++ b/myserver/src/protocol/http/webdav/webdav.cpp
@@ -333,7 +333,7 @@ int WebDAV::propfind (HttpThreadContext* td)
td->sentData +=
HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
- nbr, chain,
td->useChunks);
+ nbr, chain);
if (nbr != td->buffer->getRealLength ())
break;
}
@@ -641,7 +641,7 @@ int WebDAV::lock (HttpThreadContext* td)
td->sentData +=
HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
- nbr, chain,
td->useChunks);
+ nbr, chain);
}
MemoryStream memStream (td->auxiliaryBuffer);
commit a90a48d661f75a63619d8e64637cc0af3f0dc94e
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Apr 23 11:47:34 2011 +0200
Http: move useChunks and keepalive to HttpThreadContext
diff --git a/myserver/include/http_handler/fastcgi/fastcgi.h
b/myserver/include/http_handler/fastcgi/fastcgi.h
index 882746e..e8801b5 100644
--- a/myserver/include/http_handler/fastcgi/fastcgi.h
+++ b/myserver/include/http_handler/fastcgi/fastcgi.h
@@ -142,12 +142,9 @@ typedef ProcessServerManager::Server FastCgiServer;
struct FcgiContext
{
- HttpThreadContext* td;
- FastCgiServer* server;
+ HttpThreadContext *td;
+ FastCgiServer *server;
Socket sock;
-
- bool useChunks;
- bool keepalive;
bool headerSent;
};
diff --git a/myserver/include/http_handler/isapi/isapi.h
b/myserver/include/http_handler/isapi/isapi.h
index a8ba3c6..efd1c48 100644
--- a/myserver/include/http_handler/isapi/isapi.h
+++ b/myserver/include/http_handler/isapi/isapi.h
@@ -111,8 +111,6 @@ typedef struct _EXTENSION_CONTROL_BLOCK
struct ConnTableRecord
{
- bool keepalive;
- bool useChunks;
FiltersChain chain;
BOOL Allocated;
bool onlyHeader;
diff --git a/myserver/include/http_handler/mscgi/mscgi.h
b/myserver/include/http_handler/mscgi/mscgi.h
index 1e9f601..dc14423 100644
--- a/myserver/include/http_handler/mscgi/mscgi.h
+++ b/myserver/include/http_handler/mscgi/mscgi.h
@@ -42,8 +42,6 @@ struct MsCgiData
Server* server;
MsCgi* mscgi;
FiltersChain *filtersChain;
- bool keepAlive;
- bool useChunks;
bool onlyHeader;
bool error;
diff --git a/myserver/include/protocol/http/http_data_handler.h
b/myserver/include/protocol/http/http_data_handler.h
index 74c694c..b91adc9 100644
--- a/myserver/include/protocol/http/http_data_handler.h
+++ b/myserver/include/protocol/http/http_data_handler.h
@@ -52,8 +52,8 @@ public:
HttpDataHandler ();
virtual ~HttpDataHandler ();
- static void checkDataChunks (HttpThreadContext* td, bool* keepalive,
- bool* useChunks, bool disableEncoding = false);
+ static void checkDataChunks (HttpThreadContext* td,
+ bool disableEncoding = false);
static size_t appendDataToHTTPChannel (HttpThreadContext* td,
const char *buffer,
diff --git a/myserver/include/protocol/http/http_thread_context.h
b/myserver/include/protocol/http/http_thread_context.h
index 1a87cf9..51e2cc4 100644
--- a/myserver/include/protocol/http/http_thread_context.h
+++ b/myserver/include/protocol/http/http_thread_context.h
@@ -62,6 +62,10 @@ struct HttpThreadContext
/*! Size of the request header in `buffer'. */
size_t headerSize;
+ bool useChunks;
+
+ bool keepalive;
+
ConnectionPtr connection;
MemBuf *buffer;
MemBuf *auxiliaryBuffer;
diff --git a/myserver/src/http_handler/cgi/cgi.cpp
b/myserver/src/http_handler/cgi/cgi.cpp
index 2f4c7ad..a86ca88 100644
--- a/myserver/src/http_handler/cgi/cgi.cpp
+++ b/myserver/src/http_handler/cgi/cgi.cpp
@@ -291,14 +291,13 @@ int Cgi::sendData (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chain,
size_t nBytesRead = 0;
u_long procStartTime;
int ret = 0;
- bool useChunks;
/* Reset the auxiliaryBuffer length counter. */
td->auxiliaryBuffer->setLength (0);
procStartTime = getTicks ();
if (sendHeader (td, stdOutFile, chain, cgiProc, onlyHeader, nph,
- procStartTime, &useChunks, &ret))
+ procStartTime, &td->useChunks, &ret))
return ret;
if (!nph && onlyHeader)
@@ -343,11 +342,11 @@ int Cgi::sendData (HttpThreadContext* td, Pipe
&stdOutFile, FiltersChain& chain,
td->auxiliaryBuffer->getBuffer (),
nBytesRead,
chain,
- useChunks);
+ td->useChunks);
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain, useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain, td->useChunks);
return HttpDataHandler::RET_OK;
}
@@ -443,8 +442,6 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe
&stdOutFile,
&td->response,
&(td->nBytesToRead));
{
- bool keepalive = false;
-
string* location = td->response.getValue ("Location", NULL);
/* If it is present "Location: foo" in the header then send a
redirect
@@ -455,7 +452,7 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe
&stdOutFile,
return 1;
}
- checkDataChunks (td, &keepalive, useChunks);
+ checkDataChunks (td);
HttpHeaders::sendHeader (td->response, *chain.getStream (),
*td->buffer, td);
}
@@ -468,7 +465,7 @@ int Cgi::sendHeader (HttpThreadContext *td, Pipe
&stdOutFile,
td->auxiliaryBuffer->getBuffer () + headerSize,
headerOffset - headerSize,
chain,
- useChunks);
+ td->useChunks);
}
return 0;
diff --git a/myserver/src/http_handler/fastcgi/fastcgi.cpp
b/myserver/src/http_handler/fastcgi/fastcgi.cpp
index 1d3d109..9db2c31 100644
--- a/myserver/src/http_handler/fastcgi/fastcgi.cpp
+++ b/myserver/src/http_handler/fastcgi/fastcgi.cpp
@@ -284,7 +284,8 @@ int FastCgi::send (HttpThreadContext* td, const char*
scriptpath,
while (! exit);
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain,
con.useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain,
+ con.td->useChunks);
chain.clearAllFilters ();
con.sock.close ();
@@ -615,12 +616,11 @@ int FastCgi::sendData (FcgiContext* con, u_long dim,
u_long timeout,
if (onlyHeader)
return 1;
- size_t nbw = HttpDataHandler::appendDataToHTTPChannel (con->td,
- con->td->buffer->getBuffer (),
- con->td->buffer->getLength (),
- *chain, con->useChunks);
-
- con->td->sentData += nbw;
+ con->td->sentData +=
+ HttpDataHandler::appendDataToHTTPChannel (con->td,
+ con->td->buffer->getBuffer (),
+ con->td->buffer->getLength (),
+ *chain, con->td->useChunks);
return 0;
}
@@ -690,7 +690,7 @@ int FastCgi::handleHeader (FcgiContext* con, FiltersChain*
chain, bool* response
}
}
- checkDataChunks (con->td, &con->keepalive, &con->useChunks);
+ checkDataChunks (con->td);
if (HttpHeaders::sendHeader (con->td->response, *con->td->connection->socket,
*con->td->auxiliaryBuffer, con->td))
{
@@ -707,7 +707,7 @@ int FastCgi::handleHeader (FcgiContext* con, FiltersChain*
chain, bool* response
con->td->buffer->getBuffer ()
+ headerSize,
size - headerSize,
*chain,
- con->useChunks);
+ con->td->useChunks);
con->td->sentData += nbw;
}
diff --git a/myserver/src/http_handler/http_dir/http_dir.cpp
b/myserver/src/http_handler/http_dir/http_dir.cpp
index 8aa34f7..f8eb42e 100644
--- a/myserver/src/http_handler/http_dir/http_dir.cpp
+++ b/myserver/src/http_handler/http_dir/http_dir.cpp
@@ -380,9 +380,7 @@ int HttpDir::send (HttpThreadContext* td,
}
}
- bool keepalive = false;
- bool useChunks = false;
- checkDataChunks (td, &keepalive, &useChunks);
+ checkDataChunks (td);
HttpHeaders::sendHeader (td->response, *td->connection->socket,
*td->buffer, td);
@@ -437,7 +435,7 @@ int HttpDir::send (HttpThreadContext* td,
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
- chain, useChunks);
+ chain, td->useChunks);
filename = directory;
td->auxiliaryBuffer->setLength (0);
@@ -452,7 +450,7 @@ int HttpDir::send (HttpThreadContext* td,
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
- chain, useChunks);
+ chain, td->useChunks);
fd.findfirst (filename.c_str ());
@@ -467,7 +465,7 @@ int HttpDir::send (HttpThreadContext* td,
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength
(),
- chain, useChunks);
+ chain, td->useChunks);
td->auxiliaryBuffer->setLength (0);
if (FilesUtility::getPathRecursionLevel (td->request.uri) >= 1)
@@ -503,7 +501,7 @@ int HttpDir::send (HttpThreadContext* td,
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
- chain, useChunks);
+ chain, td->useChunks);
}
/* Put all files in a vector. */
@@ -564,7 +562,7 @@ int HttpDir::send (HttpThreadContext* td,
generateElement (*td->auxiliaryBuffer, file, linkPrefix,
formatString);
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength (),
- chain, useChunks);
+ chain, td->useChunks);
}
td->auxiliaryBuffer->setLength (0);
@@ -588,7 +586,7 @@ int HttpDir::send (HttpThreadContext* td,
*td->auxiliaryBuffer << "</address>\r\n</body>\r\n</html>\r\n";
td->sentData += appendDataToHTTPChannel (td,
td->auxiliaryBuffer->getBuffer (),
td->auxiliaryBuffer->getLength
(),
- chain, useChunks);
+ chain, td->useChunks);
*td->auxiliaryBuffer << end_str;
/* Changes the \ character in the / character. */
@@ -598,7 +596,7 @@ int HttpDir::send (HttpThreadContext* td,
*bufferloop = '/';
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain, useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain,
td->useChunks);
}
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 df22552..5055e4a 100644
--- a/myserver/src/http_handler/http_file/http_file.cpp
+++ b/myserver/src/http_handler/http_file/http_file.cpp
@@ -202,8 +202,6 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
off_t firstByte = td->request.rangeByteBegin;
off_t lastByte = td->request.rangeByteEnd;
bool fastCopyAllowed;
- bool keepalive;
- bool useChunks = false;
MemoryStream memStream (td->auxiliaryBuffer);
FiltersChain chain;
size_t nbr;
@@ -325,7 +323,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
td->response.contentLength.assign (buffer.str ());
}
- checkDataChunks (td, &keepalive, &useChunks, fastCopyAllowed);
+ checkDataChunks (td, fastCopyAllowed);
HttpHeaders::sendHeader (td->response, *td->connection->socket,
*td->buffer, td);
@@ -364,7 +362,7 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
file->seek (firstByte);
td->sentData += HttpDataHandler::beginHTTPResponse (td, memStream, chain,
- useChunks);
+ td->useChunks);
/* Flush the rest of the file. */
for (;;)
@@ -389,13 +387,13 @@ int HttpFile::send (HttpThreadContext* td, const char
*filenamePath,
bytesToSend -= nbr;
td->sentData += appendDataToHTTPChannel (td, td->buffer->getBuffer
(),
- nbr, chain, useChunks,
+ nbr, chain, td->useChunks,
td->buffer->getRealLength
(),
memStream);
}
}/* End for loop. */
- td->sentData += completeHTTPResponse (td, memStream, chain, useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain, td->useChunks);
file->close ();
delete file;
diff --git a/myserver/src/http_handler/isapi/isapi.cpp
b/myserver/src/http_handler/isapi/isapi.cpp
index cd0ec98..c33b8c5 100644
--- a/myserver/src/http_handler/isapi/isapi.cpp
+++ b/myserver/src/http_handler/isapi/isapi.cpp
@@ -270,8 +270,7 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByt
(ConnInfo->td->buffer->getBuffer (), &ConnInfo->td->response,
&(ConnInfo->td->nBytesToRead));
- HttpDataHandler::checkDataChunks (ConnInfo->td, &ConnInfo->keepalive,
- &ConnInfo->useChunks);
+ HttpDataHandler::checkDataChunks (ConnInfo->td);
if (HttpHeaders::sendHeader (ConnInfo->td->response,
*ConnInfo->td->connection->socket,
*ConnInfo->td->auxiliaryBuffer,
@@ -294,7 +293,7 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByt
buffer + headerSize,
len,
ConnInfo->chain,
- ConnInfo->useChunks);
+
ConnInfo->td->useChunks);
ConnInfo->td->sentData += written;
*lpdwBytes = written;
@@ -307,7 +306,7 @@ BOOL WINAPI ISAPI_WriteClientExport (HCONN hConn, LPVOID
Buffer, LPDWORD lpdwByt
(const char *) Buffer,
*lpdwBytes,
ConnInfo->chain,
- ConnInfo->useChunks);
+ ConnInfo->td->useChunks);
ConnInfo->td->sentData += written;
*lpdwBytes = written;
}
@@ -829,7 +828,7 @@ int Isapi::send (HttpThreadContext* td,
MemoryStream memStream (td->auxiliaryBuffer);
td->sentData += completeHTTPResponse (td, memStream,
connTable[connIndex].chain,
- connTable[connIndex].useChunks);
+
connTable[connIndex].td->useChunks);
switch (ret)
{
diff --git a/myserver/src/http_handler/mscgi/mscgi.cpp
b/myserver/src/http_handler/mscgi/mscgi.cpp
index 7680dc5..84e211c 100644
--- a/myserver/src/http_handler/mscgi/mscgi.cpp
+++ b/myserver/src/http_handler/mscgi/mscgi.cpp
@@ -69,7 +69,6 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
data.errorPage = 0;
data.server = Server::getInstance ();
data.mscgi = this;
- data.useChunks = false;
data.onlyHeader = onlyHeader;
data.error = false;
data.filtersChain = &chain;
@@ -133,7 +132,7 @@ int MsCgi::send (HttpThreadContext* td, const char* exec,
const char* cmdLine,
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain,
data.useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain,
td->useChunks);
if (!data.error)
return HttpDataHandler::RET_FAILURE;
@@ -158,7 +157,7 @@ int MsCgi::write (const char* data, size_t len, MsCgiData*
mcd)
if (mcd->error)
return 1;
- checkDataChunks (mcd->td, &mcd->keepAlive, &mcd->useChunks);
+ checkDataChunks (mcd->td);
if (!mcd->headerSent && sendHeader (mcd))
return 1;
@@ -169,7 +168,7 @@ int MsCgi::write (const char* data, size_t len, MsCgiData*
mcd)
HttpDataHandler::appendDataToHTTPChannel (mcd->td,
data, len,
*mcd->filtersChain,
- mcd->useChunks);
+ mcd->td->useChunks);
return 0;
}
diff --git a/myserver/src/http_handler/proxy/proxy.cpp
b/myserver/src/http_handler/proxy/proxy.cpp
index f32e489..3104283 100644
--- a/myserver/src/http_handler/proxy/proxy.cpp
+++ b/myserver/src/http_handler/proxy/proxy.cpp
@@ -166,8 +166,6 @@ int Proxy::flushToClient (HttpThreadContext* td, Socket&
client,
size_t headerLength;
int ret;
size_t nbw;
- bool useChunks = false;
- bool keepalive = false;
td->response.free ();
do
@@ -216,8 +214,7 @@ int Proxy::flushToClient (HttpThreadContext* td, Socket&
client,
/* At this point we can modify the response struct before send it to the
client. */
- checkDataChunks (td, &keepalive, &useChunks,
- td->response.contentLength.length ());
+ checkDataChunks (td, td->response.contentLength.length ());
HttpHeaders::sendHeader (td->response, *out.getStream (), *td->buffer, td);
if (onlyHeader)
@@ -226,7 +223,7 @@ int Proxy::flushToClient (HttpThreadContext* td, Socket&
client,
readPayLoad (td, &td->response, &out, &client,
td->auxiliaryBuffer->getBuffer () + headerLength,
read - headerLength, td->http->getTimeout (),
- useChunks, keepalive,
+ td->useChunks, td->keepalive,
hasTransferEncoding ? &transferEncoding : NULL);
td->sentData += ret;
diff --git a/myserver/src/http_handler/scgi/scgi.cpp
b/myserver/src/http_handler/scgi/scgi.cpp
index 009d006..5359acd 100644
--- a/myserver/src/http_handler/scgi/scgi.cpp
+++ b/myserver/src/http_handler/scgi/scgi.cpp
@@ -210,8 +210,6 @@ int Scgi::send (HttpThreadContext* td, const char*
scriptpath,
int Scgi::sendResponse (ScgiContext* ctx, bool onlyHeader, FiltersChain* chain)
{
clock_t initialTicks = getTicks ();
- bool useChunks = false;
- bool keepalive = false;
u_long read = 0;
u_long headerSize = 0;
u_long tmpHeaderSize = 0;
@@ -257,7 +255,7 @@ int Scgi::sendResponse (ScgiContext* ctx, bool onlyHeader,
FiltersChain* chain)
&td->response,
&(td->nBytesToRead));
- checkDataChunks (td, &keepalive, &useChunks);
+ checkDataChunks (td);
HttpHeaders::sendHeader (td->response, *td->connection->socket,
*td->auxiliaryBuffer, td);
@@ -267,7 +265,7 @@ int Scgi::sendResponse (ScgiContext* ctx, bool onlyHeader,
FiltersChain* chain)
if (read - headerSize)
td->sentData +=
appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer () +
headerSize,
- read - headerSize, *chain, useChunks);
+ read - headerSize, *chain, td->useChunks);
if (td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
{
@@ -282,11 +280,12 @@ int Scgi::sendResponse (ScgiContext* ctx, bool
onlyHeader, FiltersChain* chain)
td->sentData +=
appendDataToHTTPChannel (td, td->auxiliaryBuffer->getBuffer (),
- nbr, *chain, useChunks);
+ nbr, *chain, td->useChunks);
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, *chain, useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, *chain,
+ td->useChunks);
}
return HttpDataHandler::RET_OK;
diff --git a/myserver/src/http_handler/wincgi/wincgi.cpp
b/myserver/src/http_handler/wincgi/wincgi.cpp
index 00da485..e8b977e 100644
--- a/myserver/src/http_handler/wincgi/wincgi.cpp
+++ b/myserver/src/http_handler/wincgi/wincgi.cpp
@@ -65,7 +65,6 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
const char *cgipath, bool /*execute*/, bool onlyHeader)
{
#ifdef WIN32
- bool keepalive, useChunks;
FiltersChain chain;
Process proc;
size_t nbr;
@@ -292,12 +291,9 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
}
}
- if (td->request.isKeepAlive ())
- td->response.setValue ("connection", "keep-alive");
-
HttpHeaders::buildHTTPResponseHeaderStruct (buffer, &td->response,
&(td->nBytesToRead));
- checkDataChunks (td, &keepalive, &useChunks);
+ checkDataChunks (td);
HttpHeaders::sendHeader (td->response, *chain.getStream (),
*td->buffer, td);
@@ -313,7 +309,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
td->sentData += HttpDataHandler::appendDataToHTTPChannel (td,
buffer +
headerSize,
nBytesRead -
headerSize,
- chain,
useChunks);
+ chain,
td->useChunks);
if (td->response.getStatusType () == HttpResponseHeader::SUCCESSFUL)
@@ -329,7 +325,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
td->sentData +=
HttpDataHandler::appendDataToHTTPChannel (td, buffer,
nBytesRead, chain,
- useChunks);
+ td->useChunks);
td->sentData += nbw;
}
@@ -337,7 +333,7 @@ int WinCgi::send (HttpThreadContext* td, const char*
scriptpath,
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain, useChunks);
+ td->sentData += completeHTTPResponse (td, memStream, chain,
td->useChunks);
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 cd6cb70..dc2ced9 100644
--- a/myserver/src/protocol/http/http_data_handler.cpp
+++ b/myserver/src/protocol/http/http_data_handler.cpp
@@ -166,28 +166,17 @@ HttpDataHandler::appendDataToHTTPChannel
(HttpThreadContext *td,
supports keep-alive connections.
*/
void
-HttpDataHandler::checkDataChunks (HttpThreadContext* td, bool* keepalive,
- bool* useChunks, bool disableEncoding)
+HttpDataHandler::checkDataChunks (HttpThreadContext* td, bool disableEncoding)
{
- *keepalive = td->request.isKeepAlive ();
- *useChunks = false;
+ td->keepalive = td->request.isKeepAlive ();
+ td->useChunks = false;
- *keepalive &= !td->request.ver.compare ("HTTP/1.1");
+ td->keepalive &= !td->request.ver.compare ("HTTP/1.1");
- if (!disableEncoding && *keepalive)
+ if (!disableEncoding && td->keepalive)
{
- HttpResponseHeader::Entry *e;
- e = td->response.other.get ("transfer-encoding");
- if (e)
- e->value.assign ("chunked");
- else
- {
- e = new HttpResponseHeader::Entry ();
- e->name.assign ("transfer-encoding");
- e->value.assign ("chunked");
- td->response.other.put (e->name, e);
- }
- *useChunks = true;
+ td->response.setValue ("transfer-encoding", "chunked");
+ td->useChunks = true;
}
}
diff --git a/myserver/src/protocol/http/webdav/webdav.cpp
b/myserver/src/protocol/http/webdav/webdav.cpp
index 60a27bc..6dc18dc 100644
--- a/myserver/src/protocol/http/webdav/webdav.cpp
+++ b/myserver/src/protocol/http/webdav/webdav.cpp
@@ -285,7 +285,6 @@ int WebDAV::propfind (HttpThreadContext* td)
try
{
- bool keepalive, useChunks;
size_t nbw, nbw2;
FiltersChain chain;
list<string> filters;
@@ -304,7 +303,7 @@ int WebDAV::propfind (HttpThreadContext* td)
td->response.httpStatus = 207;
- HttpDataHandler::checkDataChunks (td, &keepalive, &useChunks);
+ HttpDataHandler::checkDataChunks (td);
HttpHeaders::sendHeader (td->response, *chain.getStream (), *td->buffer,
td);
/* Determine the Depth. */
@@ -334,14 +333,14 @@ int WebDAV::propfind (HttpThreadContext* td)
td->sentData +=
HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
- nbr, chain, useChunks);
+ nbr, chain,
td->useChunks);
if (nbr != td->buffer->getRealLength ())
break;
}
MemoryStream memStream (td->auxiliaryBuffer);
td->sentData += HttpDataHandler::completeHTTPResponse (td, memStream,
- chain, useChunks);
+ chain,
td->useChunks);
return HttpDataHandler::RET_OK;
}
@@ -577,7 +576,6 @@ int WebDAV::lock (HttpThreadContext* td)
{
Sha1 sha1;
vector <const char*> propReq;
- bool keepalive, useChunks;
size_t nbw, nbw2;
FiltersChain chain;
list<string> filters;
@@ -619,7 +617,7 @@ int WebDAV::lock (HttpThreadContext* td)
td->response.httpStatus = 201;
- HttpDataHandler::checkDataChunks (td, &keepalive, &useChunks);
+ HttpDataHandler::checkDataChunks (td);
HttpHeaders::sendHeader (td->response, *chain.getStream (), *td->buffer,
td);
string lc = "http://"; + *td->request.getValue ("Host", NULL) +
td->request.uri;
@@ -643,11 +641,12 @@ int WebDAV::lock (HttpThreadContext* td)
td->sentData +=
HttpDataHandler::appendDataToHTTPChannel (td,
td->buffer->getBuffer (),
- nbr, chain, useChunks);
+ nbr, chain,
td->useChunks);
}
MemoryStream memStream (td->auxiliaryBuffer);
- td->sentData += completeHTTPResponse (td, memStream, chain, useChunks);
+ td->sentData += HttpDataHandler::completeHTTPResponse (td, memStream,
chain,
+ td->useChunks);
return HttpDataHandler::RET_OK;
}
commit 8ea8f246c29f869dd7055e1fc854838f73b43fd2
Author: Giuseppe Scrivano <address@hidden>
Date: Sat Apr 23 11:13:25 2011 +0200
WebDav: use completeHTTPResponse.
diff --git a/myserver/src/protocol/http/webdav/webdav.cpp
b/myserver/src/protocol/http/webdav/webdav.cpp
index cd1d422..60a27bc 100644
--- a/myserver/src/protocol/http/webdav/webdav.cpp
+++ b/myserver/src/protocol/http/webdav/webdav.cpp
@@ -646,8 +646,8 @@ int WebDAV::lock (HttpThreadContext* td)
nbr, chain, useChunks);
}
- if (useChunks && chain.getStream ()->write ("0\r\n\r\n", 5, &nbw2))
- return HttpDataHandler::RET_FAILURE;
+ MemoryStream memStream (td->auxiliaryBuffer);
+ td->sentData += completeHTTPResponse (td, memStream, chain, useChunks);
return HttpDataHandler::RET_OK;
}
-----------------------------------------------------------------------
Summary of changes:
myserver/include/http_handler/fastcgi/fastcgi.h | 7 +--
myserver/include/http_handler/isapi/isapi.h | 2 -
myserver/include/http_handler/mscgi/mscgi.h | 2 -
myserver/include/protocol/http/http_data_handler.h | 8 +--
.../include/protocol/http/http_thread_context.h | 4 ++
myserver/src/http_handler/cgi/cgi.cpp | 15 ++----
myserver/src/http_handler/fastcgi/fastcgi.cpp | 19 ++++----
myserver/src/http_handler/http_dir/http_dir.cpp | 18 ++++----
myserver/src/http_handler/http_file/http_file.cpp | 10 ++---
myserver/src/http_handler/isapi/isapi.cpp | 11 ++---
myserver/src/http_handler/mscgi/mscgi.cpp | 8 +--
myserver/src/http_handler/proxy/proxy.cpp | 11 ++---
myserver/src/http_handler/scgi/scgi.cpp | 11 ++---
myserver/src/http_handler/wincgi/wincgi.cpp | 13 ++----
myserver/src/protocol/http/http_data_handler.cpp | 44 ++++++-------------
myserver/src/protocol/http/webdav/webdav.cpp | 17 ++++----
16 files changed, 77 insertions(+), 123 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-478-g8af71c1,
Giuseppe Scrivano <=