[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[myserver-commit] [2894] Code refactoring: `File::read()' used instead o
|
From: |
Giuseppe Scrivano |
|
Subject: |
[myserver-commit] [2894] Code refactoring: `File::read()' used instead of `File::readFromFile ()', `buffer2' renamed to `secondaryBuffer'. |
|
Date: |
Sun, 19 Oct 2008 18:50:27 +0000 |
Revision: 2894
http://svn.sv.gnu.org/viewvc/?view=rev&root=myserver&revision=2894
Author: gscrivano
Date: 2008-10-19 18:50:26 +0000 (Sun, 19 Oct 2008)
Log Message:
-----------
Code refactoring: `File::read()' used instead of `File::readFromFile()',
`buffer2' renamed to `secondaryBuffer'.
Modified Paths:
--------------
trunk/myserver/control/myserver-configure.cpp
trunk/myserver/include/base/file/file.h
trunk/myserver/include/base/files_cache/cached_file.h
trunk/myserver/include/protocol/ftp/ftp.h
trunk/myserver/include/protocol/http/http_thread_context.h
trunk/myserver/include/server/clients_thread.h
trunk/myserver/include/server/server.h
trunk/myserver/src/base/file/file.cpp
trunk/myserver/src/base/file/files_utility.cpp
trunk/myserver/src/base/files_cache/cached_file.cpp
trunk/myserver/src/http_handler/cgi/cgi.cpp
trunk/myserver/src/http_handler/fastcgi/fastcgi.cpp
trunk/myserver/src/http_handler/http_dir/http_dir.cpp
trunk/myserver/src/http_handler/http_file/http_file.cpp
trunk/myserver/src/http_handler/isapi/isapi.cpp
trunk/myserver/src/http_handler/mscgi/mscgi.cpp
trunk/myserver/src/http_handler/mscgi/mscgi_manager.cpp
trunk/myserver/src/http_handler/scgi/scgi.cpp
trunk/myserver/src/http_handler/wincgi/wincgi.cpp
trunk/myserver/src/log/stream/file_stream.cpp
trunk/myserver/src/protocol/control/control_protocol.cpp
trunk/myserver/src/protocol/ftp/ftp.cpp
trunk/myserver/src/protocol/http/env/env.cpp
trunk/myserver/src/protocol/http/http.cpp
trunk/myserver/src/protocol/http/http_data_read.cpp
trunk/myserver/src/protocol/http/http_headers.cpp
trunk/myserver/src/server/clients_thread.cpp
trunk/myserver/src/server/server.cpp
trunk/myserver/tests/test_cached_file.cpp
Modified: trunk/myserver/control/myserver-configure.cpp
===================================================================
--- trunk/myserver/control/myserver-configure.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/control/myserver-configure.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -165,7 +165,7 @@
outputF.openFile("myserver.xml",
File::MYSERVER_OPEN_WRITE|File::MYSERVER_OPEN_ALWAYS);
for(;;)
{
- inputF.readFromFile(buffer, 512, &nbr );
+ inputF.read(buffer, 512, &nbr );
if(nbr==0)
break;
outputF.writeToFile(buffer, nbr, &nbw);
@@ -181,7 +181,7 @@
outputF.openFile("MIMEtypes.xml",
File::MYSERVER_OPEN_WRITE|File::MYSERVER_OPEN_ALWAYS);
for(;;)
{
- inputF.readFromFile(buffer, 512, &nbr );
+ inputF.read(buffer, 512, &nbr );
if(nbr==0)
break;
outputF.writeToFile(buffer, nbr, &nbw);
@@ -200,7 +200,7 @@
File::MYSERVER_OPEN_ALWAYS);
for(;;)
{
- inputF.readFromFile(buffer, 512, &nbr );
+ inputF.read(buffer, 512, &nbr );
if(nbr==0)
break;
outputF.writeToFile(buffer, nbr, &nbw);
Modified: trunk/myserver/include/base/file/file.h
===================================================================
--- trunk/myserver/include/base/file/file.h 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/include/base/file/file.h 2008-10-19 18:50:26 UTC (rev
2894)
@@ -1,7 +1,7 @@
/* -*- mode: c++ -*- */
/*
MyServer
-Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2008 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
@@ -27,9 +27,6 @@
class File : public Stream
{
-protected:
- FileHandle handle;
- string filename;
public:
static const u_long MYSERVER_OPEN_READ;
static const u_long MYSERVER_OPEN_WRITE;
@@ -45,7 +42,6 @@
File(char *,int);
virtual FileHandle getHandle();
virtual int setHandle(FileHandle);
- virtual int readFromFile(char* ,u_long ,u_long* );
virtual int writeToFile(const char* ,u_long ,u_long* );
virtual int createTemporaryFile(const char* );
@@ -70,6 +66,8 @@
/*! Inherithed from Stream. */
virtual int read(char* buffer, u_long len, u_long *nbr);
virtual int write(const char* buffer, u_long len, u_long *nbw);
-
+protected:
+ FileHandle handle;
+ string filename;
};
#endif
Modified: trunk/myserver/include/base/files_cache/cached_file.h
===================================================================
--- trunk/myserver/include/base/files_cache/cached_file.h 2008-10-19
17:59:24 UTC (rev 2893)
+++ trunk/myserver/include/base/files_cache/cached_file.h 2008-10-19
18:50:26 UTC (rev 2894)
@@ -30,12 +30,12 @@
class CachedFile : public File
{
public:
- CachedFile(CachedFileBuffer* buffer);
- virtual FileHandle getHandle();
- virtual int setHandle(FileHandle);
- virtual int readFromFile(char* ,u_long ,u_long* );
- virtual int writeToFile(const char* ,u_long ,u_long* );
- virtual int createTemporaryFile(const char* );
+ CachedFile (CachedFileBuffer* buffer);
+ virtual FileHandle getHandle ();
+ virtual int setHandle (FileHandle);
+ virtual int read (char* ,u_long ,u_long* );
+ virtual int writeToFile (const char* ,u_long ,u_long* );
+ virtual int createTemporaryFile (const char* );
virtual int openFile(const char*, u_long );
virtual int openFile(string const &file, u_long opt)
Modified: trunk/myserver/include/protocol/ftp/ftp.h
===================================================================
--- trunk/myserver/include/protocol/ftp/ftp.h 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/include/protocol/ftp/ftp.h 2008-10-19 18:50:26 UTC (rev
2894)
@@ -89,9 +89,9 @@
FtpThreadContext();
ConnectionPtr pConnection;
MemBuf *buffer;
- MemBuf *buffer2;
+ MemBuf *secondaryBuffer;
u_long buffersize;
- u_long buffersize2;
+ u_long secondaryBufferSize;
u_long m_nParseLength;
u_long nBytesToRead;
Ftp *pProtocolInterpreter;
Modified: trunk/myserver/include/protocol/http/http_thread_context.h
===================================================================
--- trunk/myserver/include/protocol/http/http_thread_context.h 2008-10-19
17:59:24 UTC (rev 2893)
+++ trunk/myserver/include/protocol/http/http_thread_context.h 2008-10-19
18:50:26 UTC (rev 2894)
@@ -55,9 +55,9 @@
int onlyHeader;/*! Is the client asking only for the header? */
ConnectionPtr connection;
MemBuf *buffer;
- MemBuf *buffer2;
+ MemBuf *secondaryBuffer;
u_long buffersize;
- u_long buffersize2;
+ u_long secondaryBufferSize;
u_long id;
u_long nBytesToRead;
u_long nHeaderChars;
Modified: trunk/myserver/include/server/clients_thread.h
===================================================================
--- trunk/myserver/include/server/clients_thread.h 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/include/server/clients_thread.h 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -64,7 +64,7 @@
INCOMPLETE_REQUEST_NO_WAIT = 3
};
MemBuf *getBuffer();
- MemBuf *getBuffer2();
+ MemBuf *getSecondaryBuffer();
ClientsThread(Server* server);
~ClientsThread();
void stop();
@@ -92,7 +92,7 @@
int threadIsStopped;
int threadIsRunning;
u_long buffersize;
- u_long buffersize2;
+ u_long secondaryBufferSize;
int isRunning();
int isStopped();
FtpProtocol *ftpParser;
@@ -100,7 +100,7 @@
HttpsProtocol* httpsParser;
ControlProtocol *controlProtocolParser;
MemBuf buffer;
- MemBuf buffer2;
+ MemBuf secondaryBuffer;
int controlConnections();
u_long nBytesToRead;
};
Modified: trunk/myserver/include/server/server.h
===================================================================
--- trunk/myserver/include/server/server.h 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/include/server/server.h 2008-10-19 18:50:26 UTC (rev
2894)
@@ -219,7 +219,7 @@
u_long verbosity;
u_long throttlingRate;
u_long buffersize;
- u_long buffersize2;
+ u_long secondaryBufferSize;
/*! Buffer that contains all the local machine IP values. */
string *ipAddresses;
char serverName[HOST_NAME_MAX + 1];
Modified: trunk/myserver/src/base/file/file.cpp
===================================================================
--- trunk/myserver/src/base/file/file.cpp 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/src/base/file/file.cpp 2008-10-19 18:50:26 UTC (rev
2894)
@@ -317,27 +317,6 @@
}
/*!
- *Read data from a file to a buffer.
- *Return 1 on errors.
- *Return 0 on success.
- *\param buffer The buffer where write.
- *\param buffersize The length of the buffer in bytes.
- *\param nbr How many bytes were read to the buffer.
- */
-int File::readFromFile(char* buffer,u_long buffersize,u_long* nbr)
-{
-#ifdef WIN32
- int ret = ReadFile((HANDLE)handle, buffer, buffersize, nbr, NULL);
- return (!ret);
-#endif
-#ifdef NOT_WIN
- int ret = ::read((long)handle, buffer, buffersize);
- *nbr = (u_long)ret;
- return (ret == -1) ;
-#endif
-}
-
-/*!
*Create a temporary file.
*\param filename The new temporary file name.
*/
@@ -446,21 +425,31 @@
/*!
*Inherited from Stream.
*/
-int File::read(char* buffer, u_long len, u_long *nbr)
+int File::write(const char* buffer, u_long len, u_long *nbw)
{
- int ret = readFromFile(buffer, len, nbr );
+ int ret = writeToFile(buffer, len, nbw );
if(ret != 0)
return -1;
return 0;
}
/*!
- *Inherited from Stream.
+ *Read data from a file to a buffer.
+ *Return 1 on errors.
+ *Return 0 on success.
+ *\param buffer The buffer where write.
+ *\param buffersize The length of the buffer in bytes.
+ *\param nbr How many bytes were read to the buffer.
*/
-int File::write(const char* buffer, u_long len, u_long *nbw)
+int File::read(char* buffer,u_long buffersize,u_long* nbr)
{
- int ret = writeToFile(buffer, len, nbw );
- if(ret != 0)
- return -1;
- return 0;
+#ifdef WIN32
+ int ret = ReadFile((HANDLE)handle, buffer, buffersize, nbr, NULL);
+ return (!ret);
+#endif
+#ifdef NOT_WIN
+ int ret = ::read((long)handle, buffer, buffersize);
+ *nbr = (u_long)ret;
+ return (ret == -1) ;
+#endif
}
Modified: trunk/myserver/src/base/file/files_utility.cpp
===================================================================
--- trunk/myserver/src/base/file/files_utility.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/base/file/files_utility.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -221,7 +221,7 @@
for (;;)
{
- ret = src.readFromFile(buffer, 512, &nbr);
+ ret = src.read(buffer, 512, &nbr);
if (ret)
return -1;
Modified: trunk/myserver/src/base/files_cache/cached_file.cpp
===================================================================
--- trunk/myserver/src/base/files_cache/cached_file.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/base/files_cache/cached_file.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -128,7 +128,7 @@
*\param buffersize The length of the buffer in bytes.
*\param nbr How many bytes were read to the buffer.
*/
-int CachedFile::readFromFile(char* buffer, u_long buffersize, u_long* nbr)
+int CachedFile::read(char* buffer, u_long buffersize, u_long* nbr)
{
u_long toRead = std::min(buffersize, this->buffer->getFileSize() - fseek);
const char* src = &(this->buffer->getBuffer()[fseek]);
Modified: trunk/myserver/src/http_handler/cgi/cgi.cpp
===================================================================
--- trunk/myserver/src/http_handler/cgi/cgi.cpp 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/src/http_handler/cgi/cgi.cpp 2008-10-19 18:50:26 UTC (rev
2894)
@@ -251,10 +251,10 @@
/*
*Build the environment string used by the CGI process.
- *Use the td->buffer2 to build the environment string.
+ *Use the td->secondaryBuffer to build the environment string.
*/
- (td->buffer2->getBuffer())[0] = '\0';
- Env::buildEnvironmentString(td, td->buffer2->getBuffer());
+ (td->secondaryBuffer->getBuffer())[0] = '\0';
+ Env::buildEnvironmentString(td, td->secondaryBuffer->getBuffer());
spi.cmdLine = cmdLine.str();
spi.cwd.assign(td->scriptDir);
@@ -262,7 +262,7 @@
spi.stdError = (FileHandle) stdOutFile.getWriteHandle();
spi.stdIn = (FileHandle) stdInFile.getHandle();
spi.stdOut = (FileHandle) stdOutFile.getWriteHandle();
- spi.envString = td->buffer2->getBuffer();
+ spi.envString = td->secondaryBuffer->getBuffer();
if(spi.stdError == (FileHandle)-1 ||
spi.stdIn == (FileHandle)-1 ||
@@ -322,8 +322,8 @@
bool keepalive = false;
int ret = 0;
- /* Reset the buffer2 length counter. */
- td->buffer2->setLength(0);
+ /* Reset the secondaryBuffer length counter. */
+ td->secondaryBuffer->setLength(0);
procStartTime = getTicks();
@@ -372,8 +372,8 @@
aliveProcess = !(stdOutFile.pipeTerminated ());
/* Read data from the process standard output file. */
- if (stdOutFile.read(td->buffer2->getBuffer (),
- td->buffer2->getRealLength (),
+ if (stdOutFile.read(td->secondaryBuffer->getBuffer (),
+ td->secondaryBuffer->getRealLength (),
&nBytesRead))
{
return 0;
@@ -384,7 +384,7 @@
if (nBytesRead &&
HttpDataHandler::appendDataToHTTPChannel (td,
- td->buffer2->getBuffer(),
+
td->secondaryBuffer->getBuffer(),
nBytesRead,
&(td->outputData),
&chain,
@@ -432,7 +432,7 @@
nBytesRead = 0;
/* Do not try to read using a small buffer as this has some
bad influence on the performances. */
- if(td->buffer2->getRealLength() - headerOffset - 1 < 512)
+ if(td->secondaryBuffer->getRealLength() - headerOffset - 1 < 512)
break;
term = stdOutFile.pipeTerminated();
@@ -445,8 +445,8 @@
break;
}
- if (stdOutFile.read (td->buffer2->getBuffer() + headerOffset,
- td->buffer2->getRealLength() - headerOffset - 1,
+ if (stdOutFile.read (td->secondaryBuffer->getBuffer() + headerOffset,
+ td->secondaryBuffer->getRealLength() - headerOffset -
1,
&nBytesRead))
{
*ret = td->http->raiseHTTPError(500);
@@ -461,8 +461,8 @@
headerOffset += nBytesRead;
- if(headerOffset > td->buffersize2 - 5)
- (td->buffer2->getBuffer())[headerOffset] = '\0';
+ if(headerOffset > td->secondaryBufferSize - 5)
+ (td->secondaryBuffer->getBuffer())[headerOffset] = '\0';
if(headerOffset == 0)
{
@@ -473,7 +473,7 @@
for(u_long i = std::max(0, (int)headerOffset - (int)nBytesRead - 10);
i < headerOffset; i++)
{
- char *buff = td->buffer2->getBuffer();
+ char *buff = td->secondaryBuffer->getBuffer();
if( (buff[i] == '\r') && (buff[i+1] == '\n')
&& (buff[i+2] == '\r') && (buff[i+3] == '\n') )
{
@@ -506,7 +506,7 @@
/* Send the header. */
if(headerSize)
- HttpHeaders::buildHTTPResponseHeaderStruct(td->buffer2->getBuffer(),
+
HttpHeaders::buildHTTPResponseHeaderStruct(td->secondaryBuffer->getBuffer(),
&td->response,
&(td->nBytesToRead));
/*
@@ -545,7 +545,7 @@
{
/* Flush the buffer. Data from the header parsing can be present. */
if(HttpDataHandler::appendDataToHTTPChannel(td,
- td->buffer2->getBuffer() +
headerSize,
+
td->secondaryBuffer->getBuffer() + headerSize,
headerOffset - headerSize,
&(td->outputData),
&chain,
Modified: trunk/myserver/src/http_handler/fastcgi/fastcgi.cpp
===================================================================
--- trunk/myserver/src/http_handler/fastcgi/fastcgi.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/http_handler/fastcgi/fastcgi.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -109,7 +109,7 @@
}
td->buffer->setLength (0);
- td->buffer2->getAt (0) = '\0';
+ td->secondaryBuffer->getAt (0) = '\0';
{
@@ -566,7 +566,7 @@
Env::buildEnvironmentString(td, td->buffer->getBuffer());
sizeEnvString = buildFASTCGIEnvironmentString(td,td->buffer->getBuffer(),
- td->buffer2->getBuffer());
+
td->secondaryBuffer->getBuffer());
if(sizeEnvString == -1)
{
td->buffer->setLength(0);
@@ -595,7 +595,7 @@
return 1;
}
- if(sendFcgiBody(con, td->buffer2->getBuffer(), sizeEnvString,
+ if(sendFcgiBody(con, td->secondaryBuffer->getBuffer(), sizeEnvString,
FCGIPARAMS, id))
{
td->buffer->setLength(0);
@@ -633,7 +633,7 @@
/*! Send the STDIN data. */
do
{
- if(td->inputData.readFromFile(td->buffer->getBuffer(),
+ if(td->inputData.read(td->buffer->getBuffer(),
maxStdinChunk, &nbr))
{
td->buffer->setLength(0);
@@ -788,11 +788,11 @@
return 0;
}
- HttpHeaders::buildHTTPResponseHeader(con->td->buffer2->getBuffer(),
+ HttpHeaders::buildHTTPResponseHeader(con->td->secondaryBuffer->getBuffer(),
&con->td->response);
- if(con->td->connection->socket->send(con->td->buffer2->getBuffer(),
-
static_cast<int>(strlen(con->td->buffer2->getBuffer())),
+ if(con->td->connection->socket->send(con->td->secondaryBuffer->getBuffer(),
+
static_cast<int>(strlen(con->td->secondaryBuffer->getBuffer())),
0) == SOCKET_ERROR )
{
*responseCompleted = true;
Modified: trunk/myserver/src/http_handler/http_dir/http_dir.cpp
===================================================================
--- trunk/myserver/src/http_handler/http_dir/http_dir.cpp 2008-10-19
17:59:24 UTC (rev 2893)
+++ trunk/myserver/src/http_handler/http_dir/http_dir.cpp 2008-10-19
18:50:26 UTC (rev 2894)
@@ -259,14 +259,14 @@
browseDirCSSpath = td->http->getBrowseDirCSSFile();
- td->buffer2->setLength(0);
- *td->buffer2 << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
"<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\"\r\n"
"\"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\";>\r\n"
"<html xmlns=\"http://www.w3.org/1999/xhtml\"; xml:lang=\"en\">"
"\r\n<head>\r\n<title>" ;
- *td->buffer2 << td->request.uri.c_str() ;
- *td->buffer2 << "</title>\r\n";
+ *td->secondaryBuffer << td->request.uri.c_str() ;
+ *td->secondaryBuffer << "</title>\r\n";
/*
*If it is defined a CSS file for the graphic layout of
@@ -274,16 +274,16 @@
*/
if(browseDirCSSpath != 0)
{
- *td->buffer2 << "<link rel=\"stylesheet\" href=\""
+ *td->secondaryBuffer << "<link rel=\"stylesheet\" href=\""
<< browseDirCSSpath
<< "\" type=\"text/css\" media=\"all\"/>\r\n";
}
- *td->buffer2 << "</head>\r\n";
+ *td->secondaryBuffer << "</head>\r\n";
- ret = appendDataToHTTPChannel(td, td->buffer2->getBuffer(),
- td->buffer2->getLength(),
+ ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getLength(),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
if(ret)
@@ -294,18 +294,18 @@
return td->http->raiseHTTPError(500);
}
- sentData = td->buffer2->getLength();
+ sentData = td->secondaryBuffer->getLength();
browseDirCSSpath = td->http->getBrowseDirCSSFile();
filename = directory;
- td->buffer2->setLength(0);
- *td->buffer2 << "<body>\r\n<h1>Contents of directory ";
- *td->buffer2 << &td->request.uri[lastSlash] ;
- *td->buffer2 << "</h1>\r\n<hr />\r\n";
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "<body>\r\n<h1>Contents of directory ";
+ *td->secondaryBuffer << &td->request.uri[lastSlash] ;
+ *td->secondaryBuffer << "</h1>\r\n<hr />\r\n";
- ret = appendDataToHTTPChannel(td, td->buffer2->getBuffer(),
- td->buffer2->getLength(),
+ ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getLength(),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
@@ -315,7 +315,7 @@
/* Return an internal server error. */
return td->http->raiseHTTPError(500);
}
- sentData += td->buffer2->getLength();
+ sentData += td->secondaryBuffer->getLength();
ret = fd.findfirst(filename.c_str());
@@ -329,26 +329,26 @@
*With the current code we build the HTML TABLE to indicize the
*files in the directory.
*/
- td->buffer2->setLength(0);
- *td->buffer2 << "<table width=\"100%\">\r\n<tr>\r\n" ;
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "<table width=\"100%\">\r\n<tr>\r\n" ;
if(sortType == 'f' && !sortReverse)
- *td->buffer2 << "<th><a href=\"?sort=fI\">File</a></th>\r\n";
+ *td->secondaryBuffer << "<th><a href=\"?sort=fI\">File</a></th>\r\n";
else
- *td->buffer2 << "<th><a href=\"?sort=f\">File</a></th>\r\n";
+ *td->secondaryBuffer << "<th><a href=\"?sort=f\">File</a></th>\r\n";
if(sortType == 't' && !sortReverse)
- *td->buffer2 << "<th><a href=\"?sort=tI\">Last Modified</a></th>\r\n";
+ *td->secondaryBuffer << "<th><a href=\"?sort=tI\">Last
Modified</a></th>\r\n";
else
- *td->buffer2 << "<th><a href=\"?sort=t\">Last Modified</a></th>\r\n";
+ *td->secondaryBuffer << "<th><a href=\"?sort=t\">Last
Modified</a></th>\r\n";
if(sortType == 's' && !sortReverse)
- *td->buffer2 << "<th><a href=\"?sort=sI\">Size</a></th>\r\n</tr>\r\n";
+ *td->secondaryBuffer << "<th><a
href=\"?sort=sI\">Size</a></th>\r\n</tr>\r\n";
else
- *td->buffer2 << "<th><a href=\"?sort=s\">Size</a></th>\r\n</tr>\r\n";
+ *td->secondaryBuffer << "<th><a
href=\"?sort=s\">Size</a></th>\r\n</tr>\r\n";
- ret = appendDataToHTTPChannel(td, td->buffer2->getBuffer(),
- td->buffer2->getLength(),
+ ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getLength(),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
@@ -360,9 +360,9 @@
return td->http->raiseHTTPError(500);
}
- sentData += td->buffer2->getLength();
+ sentData += td->secondaryBuffer->getLength();
- td->buffer2->setLength(0);
+ td->secondaryBuffer->setLength(0);
if(FilesUtility::getPathRecursionLevel(td->request.uri) >= 1)
{
@@ -370,14 +370,14 @@
file.assign(td->request.uri);
file.append("/../");
- *td->buffer2 << "<tr>\r\n<td colspan=\"2\">"
+ *td->secondaryBuffer << "<tr>\r\n<td colspan=\"2\">"
<< "<a href=\""
<< (td->request.uriEndsWithSlash ? ".." : ".")
<< "\">[ .. ]</a></td>\n"
<< "<td>[directory]</td></tr>\r\n";
- ret = appendDataToHTTPChannel(td, td->buffer2->getBuffer(),
- td->buffer2->getLength(),
+ ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getLength(),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
if(ret)
@@ -388,7 +388,7 @@
/* Return an internal server error. */
return td->http->raiseHTTPError(500);
}
- sentData += td->buffer2->getLength();
+ sentData += td->secondaryBuffer->getLength();
}
/* Put all files in a vector. */
@@ -432,42 +432,42 @@
FileStruct& file = *it;
- td->buffer2->setLength(0);
+ td->secondaryBuffer->setLength(0);
- *td->buffer2 << "<tr>\r\n<td><a href=\"";
+ *td->secondaryBuffer << "<tr>\r\n<td><a href=\"";
if(!td->request.uriEndsWithSlash)
{
- *td->buffer2 << &td->request.uri[lastSlash];
- *td->buffer2 << "/" ;
+ *td->secondaryBuffer << &td->request.uri[lastSlash];
+ *td->secondaryBuffer << "/" ;
}
formattedName.assign(file.name);
formatHtml(file.name, formattedName);
- *td->buffer2 << formattedName ;
- *td->buffer2 << "\">" ;
- *td->buffer2 << formattedName;
- *td->buffer2 << "</a></td>\r\n<td>";
+ *td->secondaryBuffer << formattedName ;
+ *td->secondaryBuffer << "\">" ;
+ *td->secondaryBuffer << formattedName;
+ *td->secondaryBuffer << "</a></td>\r\n<td>";
getRFC822GMTTime(file.time_write, fileTime, 32);
- *td->buffer2 << fileTime ;
- *td->buffer2 << "</td>\r\n<td>";
+ *td->secondaryBuffer << fileTime ;
+ *td->secondaryBuffer << "</td>\r\n<td>";
if(file.attrib & FILE_ATTRIBUTE_DIRECTORY)
{
- *td->buffer2 << "[directory]";
+ *td->secondaryBuffer << "[directory]";
}
else
{
string out;
getFormattedSize(file.size, out);
- *td->buffer2 << out;
+ *td->secondaryBuffer << out;
}
- *td->buffer2 << "</td>\r\n</tr>\r\n";
- ret = appendDataToHTTPChannel(td, td->buffer2->getBuffer(),
- td->buffer2->getLength(),
+ *td->secondaryBuffer << "</td>\r\n</tr>\r\n";
+ ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getLength(),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
if(ret)
@@ -478,31 +478,31 @@
return td->http->raiseHTTPError(500);
}
- sentData += td->buffer2->getLength();
+ sentData += td->secondaryBuffer->getLength();
}
- td->buffer2->setLength(0);
- *td->buffer2 << "</table>\r\n<hr />\r\n<address>"
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "</table>\r\n<hr />\r\n<address>"
<< MYSERVER_VERSION;
if(host && host->value->length())
{
ostringstream portBuff;
size_t portSeparator = host->value->find(':');
- *td->buffer2 << " on ";
+ *td->secondaryBuffer << " on ";
if(portSeparator != string::npos)
- *td->buffer2 << host->value->substr(0, portSeparator).c_str() ;
+ *td->secondaryBuffer << host->value->substr(0, portSeparator).c_str() ;
else
- *td->buffer2 << host->value->c_str() ;
+ *td->secondaryBuffer << host->value->c_str() ;
- *td->buffer2 << " Port ";
+ *td->secondaryBuffer << " Port ";
portBuff << td->connection->getLocalPort();
- *td->buffer2 << portBuff.str();
+ *td->secondaryBuffer << portBuff.str();
}
- *td->buffer2 << "</address>\r\n</body>\r\n</html>\r\n";
- ret = appendDataToHTTPChannel(td, td->buffer2->getBuffer(),
- td->buffer2->getLength(),
+ *td->secondaryBuffer << "</address>\r\n</body>\r\n</html>\r\n";
+ ret = appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getLength(),
&(td->outputData), &chain,
td->appendOutputs, useChunks);
@@ -512,11 +512,11 @@
/* Return an internal server error. */
return td->http->raiseHTTPError(500);
}
- sentData += td->buffer2->getLength();
+ sentData += td->secondaryBuffer->getLength();
- *td->buffer2 << end_str;
+ *td->secondaryBuffer << end_str;
/* Changes the \ character in the / character. */
- bufferloop = td->buffer2->getBuffer();
+ bufferloop = td->secondaryBuffer->getBuffer();
while(*bufferloop++)
if(*bufferloop == '\\')
*bufferloop = '/';
Modified: trunk/myserver/src/http_handler/http_file/http_file.cpp
===================================================================
--- trunk/myserver/src/http_handler/http_file/http_file.cpp 2008-10-19
17:59:24 UTC (rev 2893)
+++ trunk/myserver/src/http_handler/http_file/http_file.cpp 2008-10-19
18:50:26 UTC (rev 2894)
@@ -79,7 +79,7 @@
bool keepalive = false;
bool useChunks = false;
bool useModifiers = false;
- MemoryStream memStream(td->buffer2);
+ MemoryStream memStream(td->secondaryBuffer);
FiltersChain chain;
u_long nbw;
u_long nbr;
@@ -411,7 +411,7 @@
if(bytesToSend)
{
/* Read from the file the bytes to send. */
- ret = file->readFromFile(td->buffer->getBuffer(),
+ ret = file->read(td->buffer->getBuffer(),
std::min(static_cast<u_long>(bytesToSend),
static_cast<u_long>(td->buffer->getRealLength()/2)),
&nbr);
Modified: trunk/myserver/src/http_handler/isapi/isapi.cpp
===================================================================
--- trunk/myserver/src/http_handler/isapi/isapi.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/http_handler/isapi/isapi.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -299,11 +299,11 @@
ConnInfo->td->response.connection.assign("Close");
HttpHeaders::buildHTTPResponseHeader(
-
(char*)ConnInfo->td->buffer2->getBuffer(),&(ConnInfo->td->response));
+
(char*)ConnInfo->td->secondaryBuffer->getBuffer(),&(ConnInfo->td->response));
if(ConnInfo->connection->socket->send(
- (char*)ConnInfo->td->buffer2->getBuffer(),
- (int)strlen((char*)ConnInfo->td->buffer2->getBuffer()),
0)==-1)
+ (char*)ConnInfo->td->secondaryBuffer->getBuffer(),
+
(int)strlen((char*)ConnInfo->td->secondaryBuffer->getBuffer()), 0)==-1)
return 0;
}
/*! Save the headerSent status. */
@@ -415,7 +415,7 @@
return 0;
}
- ConnInfo->td->inputData.readFromFile((char*)lpvBuffer, *lpdwSize, &NumRead);
+ ConnInfo->td->inputData.read((char*)lpvBuffer, *lpdwSize, &NumRead);
if (NumRead == -1)
{
@@ -916,9 +916,9 @@
return td->http->raiseHTTPError(500);
}
/*!
- *Store the environment string in the buffer2.
+ *Store the environment string in the secondaryBuffer.
*/
- connTable[connIndex].envString=td->buffer2->getBuffer();
+ connTable[connIndex].envString=td->secondaryBuffer->getBuffer();
/*!
*Build the environment string.
Modified: trunk/myserver/src/http_handler/mscgi/mscgi.cpp
===================================================================
--- trunk/myserver/src/http_handler/mscgi/mscgi.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/http_handler/mscgi/mscgi.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -118,7 +118,7 @@
if (!ret)
{
- td->buffer2->getAt(0) = '\0';
+ td->secondaryBuffer->getAt(0) = '\0';
ProcMain = (CGIMAIN) hinstLib.getProc( "myserver_main");
@@ -214,7 +214,7 @@
if(!mcd->td->appendOutputs)
{
HttpThreadContext* td = mcd->td;
- char *buffer = td->buffer2->getBuffer();
+ char *buffer = td->secondaryBuffer->getBuffer();
ConnectionPtr s = td->connection;
HttpHeaders::buildHTTPResponseHeader(buffer, &(td->response));
Modified: trunk/myserver/src/http_handler/mscgi/mscgi_manager.cpp
===================================================================
--- trunk/myserver/src/http_handler/mscgi/mscgi_manager.cpp 2008-10-19
17:59:24 UTC (rev 2893)
+++ trunk/myserver/src/http_handler/mscgi/mscgi_manager.cpp 2008-10-19
18:50:26 UTC (rev 2894)
@@ -156,7 +156,7 @@
return 0;
do
{
- cgidata->td->inputData.readFromFile(&c, 1, &nbr);
+ cgidata->td->inputData.read(&c, 1, &nbr);
if(nbr == 0)
break;
if((c == '&') |(toRead == 1))
Modified: trunk/myserver/src/http_handler/scgi/scgi.cpp
===================================================================
--- trunk/myserver/src/http_handler/scgi/scgi.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/http_handler/scgi/scgi.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -88,7 +88,7 @@
}
td->buffer->setLength(0);
- td->buffer2->getAt(0) = '\0';
+ td->secondaryBuffer->getAt(0) = '\0';
{
@@ -168,7 +168,7 @@
Env::buildEnvironmentString(td, td->buffer->getBuffer());
sizeEnvString = buildScgiEnvironmentString(td,td->buffer->getBuffer(),
- td->buffer2->getBuffer());
+ td->secondaryBuffer->getBuffer());
if(sizeEnvString == -1)
{
td->buffer->setLength(0);
@@ -209,7 +209,7 @@
chain.clearAllFilters();
return td->http->raiseHTTPError(500);
}
- ret = sendNetString(&con, td->buffer2->getBuffer(), sizeEnvString);
+ ret = sendNetString(&con, td->secondaryBuffer->getBuffer(), sizeEnvString);
if(td->request.contentLength.size() &&
!td->request.contentLength.compare("0"))
@@ -261,8 +261,8 @@
if(!ctx->sock.bytesToRead())
return -1;
- nbr = ctx->sock.recv(td->buffer2->getBuffer() + read,
- td->buffer2->getRealLength() - read,
+ nbr = ctx->sock.recv(td->secondaryBuffer->getBuffer() + read,
+ td->secondaryBuffer->getRealLength() - read,
static_cast<u_long>(timeout));
read += nbr;
@@ -271,10 +271,10 @@
for(tmpHeaderSize = (tmpHeaderSize > 3)
? tmpHeaderSize - 4 : tmpHeaderSize;
tmpHeaderSize < read - 4; tmpHeaderSize++)
- if((td->buffer2->getBuffer()[tmpHeaderSize] == '\r') &&
- (td->buffer2->getBuffer()[tmpHeaderSize + 1] == '\n') &&
- (td->buffer2->getBuffer()[tmpHeaderSize + 2] == '\r') &&
- (td->buffer2->getBuffer()[tmpHeaderSize + 3] == '\n'))
+ if((td->secondaryBuffer->getBuffer()[tmpHeaderSize] == '\r') &&
+ (td->secondaryBuffer->getBuffer()[tmpHeaderSize + 1] == '\n') &&
+ (td->secondaryBuffer->getBuffer()[tmpHeaderSize + 2] == '\r') &&
+ (td->secondaryBuffer->getBuffer()[tmpHeaderSize + 3] == '\n'))
{
headerSize = tmpHeaderSize + 4;
break;
@@ -288,7 +288,7 @@
{
if(headerSize)
{
- HttpHeaders::buildHTTPResponseHeaderStruct(td->buffer2->getBuffer(),
+
HttpHeaders::buildHTTPResponseHeaderStruct(td->secondaryBuffer->getBuffer(),
&td->response,
&(td->nBytesToRead));
}
@@ -301,7 +301,7 @@
}
if(read - headerSize)
- if(appendDataToHTTPChannel(td, td->buffer2->getBuffer() + headerSize,
+ if(appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer() +
headerSize,
read - headerSize,
&(td->outputData),
chain,
@@ -315,14 +315,14 @@
{
for(;;)
{
- nbr = ctx->sock.recv(td->buffer2->getBuffer(),
- td->buffer2->getRealLength(),
+ nbr = ctx->sock.recv(td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getRealLength(),
0);
if(!nbr || (nbr == (u_long)-1))
break;
- if(appendDataToHTTPChannel(td, td->buffer2->getBuffer(),
+ if(appendDataToHTTPChannel(td, td->secondaryBuffer->getBuffer(),
nbr,
&(td->outputData),
chain,
@@ -373,14 +373,14 @@
u_long nbr;
do
{
- if(ctx->td->inputData.readFromFile(ctx->td->buffer2->getBuffer(),
- ctx->td->buffer2->getRealLength(),
+ if(ctx->td->inputData.read(ctx->td->secondaryBuffer->getBuffer(),
+
ctx->td->secondaryBuffer->getRealLength(),
&nbr))
{
return -1;
}
- if(nbr && (ctx->sock.send(ctx->td->buffer2->getBuffer(), nbr, 0) == -1))
+ if(nbr && (ctx->sock.send(ctx->td->secondaryBuffer->getBuffer(), nbr, 0)
== -1))
{
return -1;
}
Modified: trunk/myserver/src/http_handler/wincgi/wincgi.cpp
===================================================================
--- trunk/myserver/src/http_handler/wincgi/wincgi.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/http_handler/wincgi/wincgi.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -151,8 +151,8 @@
return td->http->raiseHTTPError(500);
}
- td->buffer2->setLength(0);
- buffer=td->buffer2->getBuffer();
+ td->secondaryBuffer->setLength(0);
+ buffer=td->secondaryBuffer->getBuffer();
strcpy(buffer, "[CGI]\r\n");
DataFileHandle.writeToFile(buffer,7,&nbr);
@@ -160,8 +160,8 @@
strcpy(buffer, "CGI Version=CGI/1.3a WIN\r\n");
DataFileHandle.writeToFile(buffer,26,&nbr);
- *td->buffer2 << "Server Admin=" << Server::getInstance()->getServerAdmin()
<< "\r\n";
- DataFileHandle.writeToFile(buffer,td->buffer2->getLength(),&nbr);
+ *td->secondaryBuffer << "Server Admin=" <<
Server::getInstance()->getServerAdmin() << "\r\n";
+ DataFileHandle.writeToFile(buffer,td->secondaryBuffer->getLength(),&nbr);
{
if(td->request.isKeepAlive())
@@ -176,17 +176,17 @@
}
}
- td->buffer2->setLength(0);
- *td->buffer2 << "Request Method=" << td->request.cmd << "\r\n";
- DataFileHandle.writeToFile(buffer, td->buffer2->getLength(), &nbr);
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "Request Method=" << td->request.cmd << "\r\n";
+ DataFileHandle.writeToFile(buffer, td->secondaryBuffer->getLength(), &nbr);
- td->buffer2->setLength(0);
- *td->buffer2 << "Request Protocol=HTTP/" << td->request.ver << "\r\n";
- DataFileHandle.writeToFile(buffer, td->buffer2->getLength(), &nbr);
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "Request Protocol=HTTP/" << td->request.ver <<
"\r\n";
+ DataFileHandle.writeToFile(buffer, td->secondaryBuffer->getLength(), &nbr);
- td->buffer2->setLength(0);
- *td->buffer2 << "Executable Path=" << execname << "\r\n";
- DataFileHandle.writeToFile(buffer,td->buffer2->getLength(),&nbr);
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "Executable Path=" << execname << "\r\n";
+ DataFileHandle.writeToFile(buffer,td->secondaryBuffer->getLength(),&nbr);
if(td->request.uriOpts[0])
{
@@ -332,7 +332,7 @@
chain.clearAllFilters();
return td->http->raiseHTTPError(500);
}
- OutFileHandle.readFromFile(buffer,td->buffer2->getRealLength(),&nBytesRead);
+ OutFileHandle.read(buffer,td->secondaryBuffer->getRealLength(),&nBytesRead);
if(!nBytesRead)
{
ostringstream msg;
@@ -428,7 +428,7 @@
/* Flush the rest of the file. */
do
{
- OutFileHandle.readFromFile(buffer, td->buffer2->getLength(),
+ OutFileHandle.read(buffer, td->secondaryBuffer->getLength(),
&nBytesRead);
if(nBytesRead)
{
Modified: trunk/myserver/src/log/stream/file_stream.cpp
===================================================================
--- trunk/myserver/src/log/stream/file_stream.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/log/stream/file_stream.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -40,7 +40,7 @@
FileStream::streamCycle ()
{
char *buffer = 0;
- char *buffer2 = 0;
+ char *secondaryBuffer = 0;
const u_long bufferSize = MYSERVER_KB (64);
try
{
@@ -54,7 +54,7 @@
{
return 1;
}
- buffer2 = new char[bufferSize];
+ secondaryBuffer = new char[bufferSize];
if (buffer == 0)
{
delete [] buffer;
@@ -68,13 +68,13 @@
{
cerr << "could not open " << newFileName << endl;
delete [] buffer;
- delete [] buffer2;
+ delete [] secondaryBuffer;
return 1;
}
if (currentFile->setFilePointer (0))
{
delete [] buffer;
- delete [] buffer2;
+ delete [] secondaryBuffer;
newFile.close ();
return 1;
}
@@ -82,10 +82,10 @@
{
u_long nbr;
u_long nbw;
- if(currentFile->readFromFile (buffer, bufferSize, &nbr))
+ if(currentFile->read (buffer, bufferSize, &nbr))
{
delete [] buffer;
- delete [] buffer2;
+ delete [] secondaryBuffer;
newFile.close ();
return 1;
}
@@ -94,7 +94,7 @@
if (newFile.writeToFile (buffer, nbr, &nbw))
{
delete [] buffer;
- delete [] buffer2;
+ delete [] secondaryBuffer;
newFile.close ();
return 1;
}
@@ -105,19 +105,19 @@
if (currentFile->openFile (filepath.c_str(), defaultFileMask))
{
delete [] buffer;
- delete [] buffer2;
+ delete [] secondaryBuffer;
return 1;
}
delete [] buffer;
- delete [] buffer2;
+ delete [] secondaryBuffer;
return 0;
}
catch (...)
{
if (buffer)
delete [] buffer;
- if (buffer2)
- delete [] buffer2;
+ if (secondaryBuffer)
+ delete [] secondaryBuffer;
throw;
};
}
Modified: trunk/myserver/src/protocol/control/control_protocol.cpp
===================================================================
--- trunk/myserver/src/protocol/control/control_protocol.cpp 2008-10-19
17:59:24 UTC (rev 2893)
+++ trunk/myserver/src/protocol/control/control_protocol.cpp 2008-10-19
18:50:26 UTC (rev 2894)
@@ -700,7 +700,7 @@
u_long nbr;
for( ; ; )
{
- err = outFile->readFromFile(buffer, min(dataToSend, buffersize), &nbr);
+ err = outFile->read(buffer, min(dataToSend, buffersize), &nbr);
if(err)
{
strcpy(buffer,"Control: Error reading from temporary file");
@@ -899,7 +899,7 @@
}
for(;;)
{
- ret = localfile.readFromFile(b1, bs1, &nbr);
+ ret = localfile.read(b1, bs1, &nbr);
if(ret)
{
string msg;
@@ -993,7 +993,7 @@
}
for(;;)
{
- ret = in->readFromFile(b1, bs1, &nbr);
+ ret = in->read(b1, bs1, &nbr);
if(ret)
{
string msg;
Modified: trunk/myserver/src/protocol/ftp/ftp.cpp
===================================================================
--- trunk/myserver/src/protocol/ftp/ftp.cpp 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/src/protocol/ftp/ftp.cpp 2008-10-19 18:50:26 UTC (rev
2894)
@@ -184,9 +184,9 @@
{
pConnection = NULL;
buffer = NULL;
- buffer2 = NULL;
+ secondaryBuffer = NULL;
buffersize = 0;
- buffersize2 = 0;
+ secondaryBufferSize = 0;
m_nParseLength = 0;
pProtocolInterpreter = NULL;
}
@@ -352,9 +352,9 @@
//switch context
td.pConnection = pConnection;
td.buffer = pConnection->getActiveThread()->getBuffer();
- td.buffer2 = pConnection->getActiveThread()->getBuffer2();
+ td.secondaryBuffer = pConnection->getActiveThread()->getSecondaryBuffer();
td.buffersize = bs1;
- td.buffersize2 = bs2;
+ td.secondaryBufferSize = bs2;
td.nBytesToRead = nbtr;
td.pProtocolInterpreter = this;
td.m_nParseLength = 0;
@@ -764,13 +764,13 @@
char *pLine = NULL;
int nLineLength = 0;
std::string sLine;
- MemBuf buffer, buffer2;
+ MemBuf buffer, secondaryBuffer;
buffer.setLength(1024);
while ( filesize != 0 )
{
memset(buffer.getBuffer(), 0, buffer.getRealLength());
nBufferSize = std::min(static_cast<u_long>(filesize),
static_cast<u_long>(buffer.getRealLength()/2));
- if ( file->readFromFile(buffer.getBuffer(), nBufferSize, &nbr) )
+ if ( file->read(buffer.getBuffer(), nBufferSize, &nbr) )
{
ftp_reply(pConnection, 451);
file->close();
@@ -787,7 +787,7 @@
filesize -= nbr;
pFtpUserData->m_nBytesSent += nbr;
- buffer2.setLength(0);
+ secondaryBuffer.setLength(0);
pLine = buffer.getBuffer();
if ( pLine == NULL )
{
@@ -810,13 +810,13 @@
{
sLine.assign(pLine, strlen(pLine));
if ( !sLine.empty() )
- buffer2 << sLine;
+ secondaryBuffer << sLine;
pLine += strlen(pLine);
}
else
{
sLine.assign(pLine, nLineLength);
- buffer2 << sLine << "\r\n";
+ secondaryBuffer << sLine << "\r\n";
if ( *(pLine + nLineLength) == '\r' )
nLineLength++;
if ( *(pLine + nLineLength) == '\n' )
@@ -824,8 +824,8 @@
pLine += nLineLength;
}
}
- if (
pFtpUserData->m_pDataConnection->socket->send(buffer2.getBuffer(),
- (u_long)buffer2.getLength(), 0) == SOCKET_ERROR )
+ if (
pFtpUserData->m_pDataConnection->socket->send(secondaryBuffer.getBuffer(),
+ (u_long)secondaryBuffer.getLength(), 0) == SOCKET_ERROR )
{
ftp_reply(pConnection, 451);
file->close();
@@ -998,13 +998,13 @@
pFtpUserData->m_sCurrentFileName = pWt->m_sFilePath;
pFtpUserData->m_nFileSize = filesize;
- MemBuf buffer2;
- buffer2.setLength(1024);
+ MemBuf secondaryBuffer;
+ secondaryBuffer.setLength(1024);
while ( filesize != 0 )
{
- nBufferSize = std::min(static_cast<u_long>(filesize),
static_cast<u_long>(buffer2.getRealLength()/2));
- if ( file->readFromFile(buffer2.getBuffer(), nBufferSize, &nbr) ||
- pFtpUserData->m_pDataConnection->socket->send(buffer2.getBuffer(),
+ nBufferSize = std::min(static_cast<u_long>(filesize),
static_cast<u_long>(secondaryBuffer.getRealLength()/2));
+ if ( file->read(secondaryBuffer.getBuffer(), nBufferSize, &nbr) ||
+
pFtpUserData->m_pDataConnection->socket->send(secondaryBuffer.getBuffer(),
(u_long)nBufferSize, 0) == SOCKET_ERROR )
{
ftp_reply(pConnection, 451);
@@ -1172,7 +1172,7 @@
#endif
}
- MemBuf buffer, buffer2;
+ MemBuf buffer, secondaryBuffer;
buffer.setLength(1024);
memset(buffer.getBuffer(), 0, buffer.getRealLength());
char *pLine = NULL;
@@ -1182,8 +1182,8 @@
while ( pFtpUserData->m_pDataConnection->socket->read(buffer.getBuffer(),
(u_long)buffer.getRealLength()-1, &nbr) != SOCKET_ERROR && nbr != 0 )
{
- memset(buffer2.getBuffer(), 0, buffer2.getRealLength());
- buffer2.setLength(0);
+ memset(secondaryBuffer.getBuffer(), 0, secondaryBuffer.getRealLength());
+ secondaryBuffer.setLength(0);
pLine = buffer.getBuffer();
if ( pLine == NULL )
{
@@ -1205,16 +1205,16 @@
{
sLine.assign(pLine, strlen(pLine));
if ( !sLine.empty() )
- buffer2 << sLine;
+ secondaryBuffer << sLine;
pLine += strlen(pLine);
}
else
{
sLine.assign(pLine, nLineLength);
#ifdef WIN32
- buffer2 << sLine << "\r\n";
+ secondaryBuffer << sLine << "\r\n";
#else
- buffer2 << sLine << "\n";
+ secondaryBuffer << sLine << "\n";
#endif
if ( *(pLine + nLineLength) == '\r' )
nLineLength++;
@@ -1223,7 +1223,7 @@
pLine += nLineLength;
}
}
- file.write(buffer2.getBuffer(), (u_long)buffer2.getLength(), &nbr);
+ file.write(secondaryBuffer.getBuffer(),
(u_long)secondaryBuffer.getLength(), &nbr);
if ( pFtpUserData->m_bBreakDataConnection )
{
@@ -1706,8 +1706,8 @@
time_t now;
time(&now);
- MemBuf &buffer2 = *td.buffer2;
- buffer2.setLength(0);
+ MemBuf &secondaryBuffer = *td.secondaryBuffer;
+ secondaryBuffer.setLength(0);
char perm[11];
if ( FilesUtility::isDirectory(sPath) )
{
@@ -1795,7 +1795,7 @@
char fdSizeStr[12];
sprintf(fdSizeStr, "%li", fd.size);
- buffer2 << (const char *)perm << " " << nlinkStr << " "
+ secondaryBuffer << (const char *)perm << " " << nlinkStr << " "
<< username << " " << username << " " << fdSizeStr
<< " " << (const char *)dateFtpFormat << " "
<< fd.name << "\r\n";
@@ -1892,7 +1892,7 @@
char fdSizeStr[12];
sprintf(fdSizeStr, "%li", fd.size);
- buffer2 << (const char *)perm << " " << nlinkStr << " "
+ secondaryBuffer << (const char *)perm << " " << nlinkStr << " "
<< username << " " << username << " " << fdSizeStr
<< " " << (const char *)dateFtpFormat << " "
<< fd.name << "\r\n";
@@ -1900,8 +1900,8 @@
while (!fd.findnext());
fd.findclose();
}
- if( pFtpUserData->m_pDataConnection->socket->send(td.buffer2->getBuffer(),
- (u_long)td.buffer2->getLength(), 0) == SOCKET_ERROR)
+ if(
pFtpUserData->m_pDataConnection->socket->send(td.secondaryBuffer->getBuffer(),
+ (u_long)td.secondaryBuffer->getLength(), 0) == SOCKET_ERROR)
{
ftp_reply(451);
}
@@ -1947,20 +1947,20 @@
return;
}
- MemBuf &buffer2 = *td.buffer2;
- buffer2.setLength(0);
+ MemBuf &secondaryBuffer = *td.secondaryBuffer;
+ secondaryBuffer.setLength(0);
do
{
if(fd.name[0] == '.' || !strcmpi(fd.name, "security") )
continue;
if ( !sParam.empty() )
- buffer2 << sParam << "/";
- buffer2 << fd.name << "\r\n";
+ secondaryBuffer << sParam << "/";
+ secondaryBuffer << fd.name << "\r\n";
} while (!fd.findnext());
fd.findclose();
- if( pFtpUserData->m_pDataConnection->socket->send(td.buffer2->getBuffer(),
- (u_long)td.buffer2->getLength(), 0) == SOCKET_ERROR)
+ if(
pFtpUserData->m_pDataConnection->socket->send(td.secondaryBuffer->getBuffer(),
+ (u_long)td.secondaryBuffer->getLength(), 0) == SOCKET_ERROR)
{
ftp_reply(451);
}
Modified: trunk/myserver/src/protocol/http/env/env.cpp
===================================================================
--- trunk/myserver/src/protocol/http/env/env.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/protocol/http/env/env.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -52,7 +52,7 @@
char strTmp[32];
HttpRequestHeader::Entry* reqEntry = NULL;
- memCgi.setExternalBuffer(cgiEnv, td->buffer2->getRealLength());
+ memCgi.setExternalBuffer(cgiEnv, td->secondaryBuffer->getRealLength());
memCgi << "SERVER_SOFTWARE=GNU MyServer " << MYSERVER_VERSION;
#ifdef WIN32
Modified: trunk/myserver/src/protocol/http/http.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http.cpp 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/src/protocol/http/http.cpp 2008-10-19 18:50:26 UTC (rev
2894)
@@ -100,26 +100,26 @@
return raiseHTTPError (ret);
getRFC822GMTTime(time, HTTP_RESPONSE_DATE_DIM);
- td->buffer2->setLength(0);
- *td->buffer2 << "HTTP/1.1 200 OK\r\n";
- *td->buffer2 << "Date: " << time ;
- *td->buffer2 << "\r\nServer: "<< MYSERVER_VERSION;
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "HTTP/1.1 200 OK\r\n";
+ *td->secondaryBuffer << "Date: " << time ;
+ *td->secondaryBuffer << "\r\nServer: "<< MYSERVER_VERSION;
if(connection && connection->value->length())
- *td->buffer2 << "\r\nConnection:" << connection->value->c_str() <<
"\r\n";
- *td->buffer2 <<"Content-Length: 0\r\nAccept-Ranges: bytes\r\n";
- *td->buffer2 << "Allow: " << methods << "\r\n";
+ *td->secondaryBuffer << "\r\nConnection:" << connection->value->c_str()
<< "\r\n";
+ *td->secondaryBuffer <<"Content-Length: 0\r\nAccept-Ranges: bytes\r\n";
+ *td->secondaryBuffer << "Allow: " << methods << "\r\n";
/*!
*Check if the TRACE command is allowed on the virtual host.
*/
if (allowHTTPTRACE ())
- *td->buffer2 << ", TRACE\r\n";
+ *td->secondaryBuffer << ", TRACE\r\n";
- *td->buffer2 << "r\n";
+ *td->secondaryBuffer << "r\n";
/*! Send the HTTP header. */
- ret = td->connection->socket->send(td->buffer2->getBuffer(),
- (u_long)td->buffer2->getLength(), 0);
+ ret = td->connection->socket->send(td->secondaryBuffer->getBuffer(),
+
(u_long)td->secondaryBuffer->getLength(), 0);
if( ret == SOCKET_ERROR )
{
return 0;
@@ -158,20 +158,20 @@
if (!allowHTTPTRACE ())
return raiseHTTPError (401);
- td->buffer2->setLength(0);
- *td->buffer2 << "HTTP/1.1 200 OK\r\n";
- *td->buffer2 << "Date: " << time << "\r\n";
- *td->buffer2 << "Server: " << MYSERVER_VERSION << "\r\n";
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "HTTP/1.1 200 OK\r\n";
+ *td->secondaryBuffer << "Date: " << time << "\r\n";
+ *td->secondaryBuffer << "Server: " << MYSERVER_VERSION << "\r\n";
connection = td->request.other.get("Connection");
if(connection && connection->value->length())
- *td->buffer2 << "Connection:" << connection->value->c_str() << "\r\n";
- *td->buffer2 <<"Content-Length:" << tmp << "\r\n"
+ *td->secondaryBuffer << "Connection:" << connection->value->c_str() <<
"\r\n";
+ *td->secondaryBuffer <<"Content-Length:" << tmp << "\r\n"
<< "Content-Type: message/http\r\n"
<< "Accept-Ranges: bytes\r\n\r\n";
/*! Send our HTTP header. */
- ret = td->connection->socket->send(td->buffer2->getBuffer(),
- (u_long)td->buffer2->getLength(), 0);
+ ret = td->connection->socket->send(td->secondaryBuffer->getBuffer(),
+
(u_long)td->secondaryBuffer->getLength(), 0);
if( ret == SOCKET_ERROR )
{
return 0;
@@ -258,7 +258,7 @@
for(;;)
{
u_long nbr = 0, nbw = 0;
- if(td->inputData.readFromFile(td->buffer->getBuffer(),
+ if(td->inputData.read(td->buffer->getBuffer(),
td->buffer->getRealLength(), &nbr))
{
file.close();
@@ -305,7 +305,7 @@
for(;;)
{
u_long nbr = 0, nbw = 0;
- if(td->inputData.readFromFile(td->buffer->getBuffer(),
+ if(td->inputData.read(td->buffer->getBuffer(),
td->buffer->getRealLength(), &nbr))
{
file.close();
@@ -679,12 +679,12 @@
((HttpUserData*)td->connection->protocolBuffer)->nc++;
md5.init();
- td->buffer2->setLength(0);
- *td->buffer2 << td->request.digestUsername << ":" << td->request.digestRealm
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << td->request.digestUsername << ":" <<
td->request.digestRealm
<< ":" << securityToken.getNeededPassword();
- md5.update((unsigned char const*)td->buffer2->getBuffer(),
- (unsigned int)td->buffer2->getLength());
+ md5.update((unsigned char const*)td->secondaryBuffer->getBuffer(),
+ (unsigned int)td->secondaryBuffer->getLength());
md5.end(A1);
md5.init();
@@ -694,20 +694,20 @@
else
uri = (char*)td->request.uriOpts.c_str();
- td->buffer2->setLength(0);
- *td->buffer2 << td->request.cmd.c_str() << ":" << uri;
- md5.update((unsigned char const*)td->buffer2->getBuffer(),
- (unsigned int)td->buffer2->getLength());
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << td->request.cmd.c_str() << ":" << uri;
+ md5.update((unsigned char const*)td->secondaryBuffer->getBuffer(),
+ (unsigned int)td->secondaryBuffer->getLength());
md5.end( A2);
md5.init();
- td->buffer2->setLength(0);
- *td->buffer2 << A1 << ":"
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << A1 << ":"
<< ((HttpUserData*)td->connection->protocolBuffer)->nonce << ":"
<< td->request.digestNc << ":" << td->request.digestCnonce <<
":"
<< td->request.digestQop << ":" << A2;
- md5.update((unsigned char const*)td->buffer2->getBuffer(),
- (unsigned int)td->buffer2->getLength());
+ md5.update((unsigned char const*)td->secondaryBuffer->getBuffer(),
+ (unsigned int)td->secondaryBuffer->getLength());
md5.end(response);
if(!strcmp(response, td->request.digestResponse))
@@ -1140,7 +1140,7 @@
return sendHTTPhardError500();
}
- if(h.readFromFile(linkpath, linkpathSize, &nbr))
+ if(h.read(linkpath, linkpathSize, &nbr))
{
h.close();
delete [] linkpath;
@@ -1265,52 +1265,52 @@
try
{
- td->buffer2->setLength(0);
- *td->buffer2 << td->connection->getIpAddr();
- *td->buffer2<< " ";
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << td->connection->getIpAddr();
+ *td->secondaryBuffer<< " ";
if(td->connection->getLogin()[0])
- *td->buffer2 << td->connection->getLogin();
+ *td->secondaryBuffer << td->connection->getLogin();
else
- *td->buffer2 << "-";
+ *td->secondaryBuffer << "-";
- *td->buffer2<< " ";
+ *td->secondaryBuffer<< " ";
if(td->connection->getLogin()[0])
- *td->buffer2 << td->connection->getLogin();
+ *td->secondaryBuffer << td->connection->getLogin();
else
- *td->buffer2 << "-";
+ *td->secondaryBuffer << "-";
- *td->buffer2 << " [";
+ *td->secondaryBuffer << " [";
getLocalLogFormatDate(time, HTTP_RESPONSE_DATE_DIM);
- *td->buffer2 << time << "] \"";
+ *td->secondaryBuffer << time << "] \"";
if(td->request.cmd.length())
- *td->buffer2 << td->request.cmd.c_str() << "";
+ *td->secondaryBuffer << td->request.cmd.c_str() << "";
if(td->request.cmd.length() || td->request.uri.length())
- *td->buffer2 << " ";
+ *td->secondaryBuffer << " ";
if(td->request.uri.length() == '\0')
- *td->buffer2 << "/";
+ *td->secondaryBuffer << "/";
else
- *td->buffer2 << td->request.uri.c_str();
+ *td->secondaryBuffer << td->request.uri.c_str();
if(td->request.uriOpts.length())
- *td->buffer2 << "?" << td->request.uriOpts.c_str();
+ *td->secondaryBuffer << "?" << td->request.uriOpts.c_str();
sprintf(tmpStrInt, "%u ", td->response.httpStatus);
if(td->request.ver.length())
- *td->buffer2 << " " << td->request.ver.c_str() ;
+ *td->secondaryBuffer << " " << td->request.ver.c_str() ;
- *td->buffer2<< "\" " << tmpStrInt << " ";
+ *td->secondaryBuffer<< "\" " << tmpStrInt << " ";
sprintf(tmpStrInt, "%u", td->sentData);
- *td->buffer2 << tmpStrInt;
+ *td->secondaryBuffer << tmpStrInt;
if(td->connection->host)
{
@@ -1318,22 +1318,22 @@
HttpRequestHeader::Entry *referer = td->request.other.get("Refer");
if(strstr((td->connection->host)->getAccessLogOpt(), "type=combined"))
- *td->buffer2 << " " << (referer ? referer->value->c_str() : "")
+ *td->secondaryBuffer << " " << (referer ? referer->value->c_str() :
"")
<< " " << (userAgent ? userAgent->value->c_str() : "");
}
#ifdef WIN32
- *td->buffer2 << "\r\n" << end_str;
+ *td->secondaryBuffer << "\r\n" << end_str;
#else
- *td->buffer2 << "\n" << end_str;
+ *td->secondaryBuffer << "\n" << end_str;
#endif
/*!
*Request the access to the log file then append the message.
*/
if(td->connection->host)
{
- td->connection->host->accessesLogWrite(td->buffer2->getBuffer());
+
td->connection->host->accessesLogWrite(td->secondaryBuffer->getBuffer());
}
- td->buffer2->setLength(0);
+ td->secondaryBuffer->setLength(0);
}
catch(...)
{
@@ -1360,9 +1360,9 @@
try
{
td->buffer = a->getActiveThread()->getBuffer();
- td->buffer2 = a->getActiveThread()->getBuffer2();
+ td->secondaryBuffer = a->getActiveThread()->getSecondaryBuffer();
td->buffersize = bs1;
- td->buffersize2 = bs2;
+ td->secondaryBufferSize = bs2;
td->nBytesToRead = nbtr;
td->connection = a;
td->id = id;
@@ -1838,18 +1838,18 @@
HttpRequestHeader::Entry *connection = td->request.other.get("Connection");
HttpRequestHeader::Entry *host = td->request.other.get("Host");
td->response.httpStatus = 401;
- td->buffer2->setLength(0);
- *td->buffer2 << "HTTP/1.1 401 Unauthorized\r\n"
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "HTTP/1.1 401 Unauthorized\r\n"
<< "Accept-Ranges: bytes\r\n";
- *td->buffer2 << "Server: " << MYSERVER_VERSION << "\r\n";
- *td->buffer2 << "Content-Type: text/html\r\n"
+ *td->secondaryBuffer << "Server: " << MYSERVER_VERSION << "\r\n";
+ *td->secondaryBuffer << "Content-Type: text/html\r\n"
<< "Connection: ";
- *td->buffer2 << (connection ? connection->value->c_str() : "");
- *td->buffer2 << "\r\nContent-Length: 0\r\n";
+ *td->secondaryBuffer << (connection ? connection->value->c_str() : "");
+ *td->secondaryBuffer << "\r\nContent-Length: 0\r\n";
if(td->authScheme == HTTP_AUTH_SCHEME_BASIC)
{
- *td->buffer2 << "WWW-Authenticate: Basic realm=\""
+ *td->secondaryBuffer << "WWW-Authenticate: Basic realm=\""
<< (host ? host->value->c_str() : "") << "\"\r\n";
}
else if(td->authScheme == HTTP_AUTH_SCHEME_DIGEST)
@@ -1890,7 +1890,7 @@
((HttpUserData*)td->connection->protocolBuffer)->nc = 0;
}
- *td->buffer2 << "WWW-Authenticate: digest "
+ *td->secondaryBuffer << "WWW-Authenticate: digest "
<< " qop=\"auth\", algorithm =\"MD5\", realm =\""
<< ((HttpUserData*)td->connection->protocolBuffer)->realm
<< "\", opaque =\""
@@ -1901,11 +1901,11 @@
if(((HttpUserData*)td->connection->protocolBuffer)->cnonce[0])
{
- *td->buffer2 << ", cnonce =\""
+ *td->secondaryBuffer << ", cnonce =\""
<<((HttpUserData*)td->connection->protocolBuffer)->cnonce
<<"\" ";
}
- *td->buffer2 << "\r\n";
+ *td->secondaryBuffer << "\r\n";
}
else
{
@@ -1914,12 +1914,12 @@
*/
return raiseHTTPError(501);
}
- *td->buffer2 << "Date: ";
+ *td->secondaryBuffer << "Date: ";
getRFC822GMTTime(time, HTTP_RESPONSE_DATE_DIM);
- *td->buffer2 << time
+ *td->secondaryBuffer << time
<< "\r\n\r\n";
- if(td->connection->socket->send(td->buffer2->getBuffer(),
- td->buffer2->getLength(), 0) == -1)
+ if(td->connection->socket->send(td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getLength(), 0) == -1)
{
return 0;
}
@@ -2112,20 +2112,20 @@
*td->buffer << " from: " ;
*td->buffer << td->connection->getIpAddr() ;
*td->buffer << "\r\n";
- td->buffer2->setLength(0);
- *td->buffer2 << "HTTP/1.1 500 System Error\r\n";
- *td->buffer2 << "Server: " << MYSERVER_VERSION << "\r\n";
- *td->buffer2 <<" Content-Type: text/html\r\nContent-Length: ";
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "HTTP/1.1 500 System Error\r\n";
+ *td->secondaryBuffer << "Server: " << MYSERVER_VERSION << "\r\n";
+ *td->secondaryBuffer <<" Content-Type: text/html\r\nContent-Length: ";
tmp.intToStr((int)strlen(hardHTML), tmpStr, 12);
- *td->buffer2 << tmp;
- *td->buffer2 << "\r\n";
- *td->buffer2 <<"Date: ";
+ *td->secondaryBuffer << tmp;
+ *td->secondaryBuffer << "\r\n";
+ *td->secondaryBuffer <<"Date: ";
getRFC822GMTTime(time, HTTP_RESPONSE_DATE_DIM);
- *td->buffer2 << time;
- *td->buffer2 << "\r\n\r\n";
+ *td->secondaryBuffer << time;
+ *td->secondaryBuffer << "\r\n\r\n";
/*! Send the header. */
- if(td->connection->socket->send(td->buffer2->getBuffer(),
- (u_long)td->buffer2->getLength(), 0) != -1)
+ if(td->connection->socket->send(td->secondaryBuffer->getBuffer(),
+ (u_long)td->secondaryBuffer->getLength(), 0)
!= -1)
{
/*! Send the body. */
if(!td->onlyHeader)
@@ -2242,24 +2242,24 @@
HttpRequestHeader::Entry *connection = td->request.other.get("Connection");
td->response.httpStatus = 302;
- td->buffer2->setLength(0);
- *td->buffer2 << "HTTP/1.1 302 Moved\r\nAccept-Ranges: bytes\r\n"
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "HTTP/1.1 302 Moved\r\nAccept-Ranges: bytes\r\n"
<< "Server: " << MYSERVER_VERSION << "\r\n"
<< "Content-Type: text/html\r\n"
<< "Location: " << newURL << "\r\n"
<< "Content-Length: 0\r\n";
if(connection && !stringcmpi(connection->value->c_str(), "keep-alive"))
- *td->buffer2 << "Connection: keep-alive\r\n";
+ *td->secondaryBuffer << "Connection: keep-alive\r\n";
else
- *td->buffer2 << "Connection: close\r\n";
+ *td->secondaryBuffer << "Connection: close\r\n";
- *td->buffer2<< "Date: ";
+ *td->secondaryBuffer<< "Date: ";
getRFC822GMTTime(time, HTTP_RESPONSE_DATE_DIM);
- *td->buffer2 << time
+ *td->secondaryBuffer << time
<< "\r\n\r\n";
- if(td->connection->socket->send(td->buffer2->getBuffer(),
- (int)td->buffer2->getLength(), 0) == -1)
+ if(td->connection->socket->send(td->secondaryBuffer->getBuffer(),
+ (int)td->secondaryBuffer->getLength(), 0) ==
-1)
return 0;
return 1;
@@ -2274,21 +2274,21 @@
HttpRequestHeader::Entry *connection = td->request.other.get("Connection");
td->response.httpStatus = 304;
- td->buffer2->setLength(0);
- *td->buffer2 << "HTTP/1.1 304 Not Modified\r\nAccept-Ranges: bytes\r\n"
+ td->secondaryBuffer->setLength(0);
+ *td->secondaryBuffer << "HTTP/1.1 304 Not Modified\r\nAccept-Ranges:
bytes\r\n"
<< "Server: " << MYSERVER_VERSION << "\r\n";
if(connection && !stringcmpi(connection->value->c_str(), "keep-alive"))
- *td->buffer2 << "Connection: keep-alive\r\n";
+ *td->secondaryBuffer << "Connection: keep-alive\r\n";
else
- *td->buffer2 << "Connection: close\r\n";
+ *td->secondaryBuffer << "Connection: close\r\n";
getRFC822GMTTime(time, HTTP_RESPONSE_DATE_DIM);
- *td->buffer2 << "Date: " << time << "\r\n\r\n";
+ *td->secondaryBuffer << "Date: " << time << "\r\n\r\n";
- if(td->connection->socket->send(td->buffer2->getBuffer(),
- (int)td->buffer2->getLength(), 0) == -1)
+ if(td->connection->socket->send(td->secondaryBuffer->getBuffer(),
+ (int)td->secondaryBuffer->getLength(), 0) ==
-1)
return 0;
return 1;
}
Modified: trunk/myserver/src/protocol/http/http_data_read.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http_data_read.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/protocol/http/http_data_read.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -334,8 +334,8 @@
&inPos,
bufferDataSize,
td->connection->socket,
- td->buffer2->getBuffer(),
- td->buffer2->getRealLength() - 1,
+ td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getRealLength() - 1,
&nbr,
timeout,
&(td->inputData));
@@ -368,8 +368,8 @@
&inPos,
bufferDataSize,
td->connection->socket,
- td->buffer2->getBuffer(),
- td->buffer2->getRealLength() - 1,
+ td->secondaryBuffer->getBuffer(),
+ td->secondaryBuffer->getRealLength() -
1,
&nbr,
timeout))
{
@@ -389,9 +389,9 @@
return 1;
}
- td->buffer2->getBuffer()[nbr] = '\0';
+ td->secondaryBuffer->getBuffer()[nbr] = '\0';
- if(nbr && td->inputData.writeToFile(td->buffer2->getBuffer(), nbr, &nbw))
+ if(nbr && td->inputData.writeToFile(td->secondaryBuffer->getBuffer(), nbr,
&nbw))
{
td->inputDataPath.assign("");
td->outputDataPath.assign("");
Modified: trunk/myserver/src/protocol/http/http_headers.cpp
===================================================================
--- trunk/myserver/src/protocol/http/http_headers.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/protocol/http/http_headers.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -671,8 +671,8 @@
const char *base64 = &token[strlen("Basic ")];
int len = getEndLine(base64, 64);
const char *tmp = base64 + len - 1;
- const char* lbuffer2;
- const char* keep_lbuffer2;
+ const char* lsecondaryBuffer;
+ const char* keep_lsecondaryBuffer;
char login[32];
char password[32];
@@ -688,24 +688,24 @@
}
if (len <= 1)
return 400;
- lbuffer2 = base64Utils.Decode(base64,&len);
- keep_lbuffer2 = lbuffer2;
+ lsecondaryBuffer = base64Utils.Decode(base64,&len);
+ keep_lsecondaryBuffer = lsecondaryBuffer;
- for(i = 0; (*lbuffer2 != ':') && (i < 32);i++)
+ for(i = 0; (*lsecondaryBuffer != ':') && (i < 32);i++)
{
- login[i] = *lbuffer2++;
+ login[i] = *lsecondaryBuffer++;
login[i+1] = '\0';
}
- lbuffer2++;
- for(i = 0; (*lbuffer2) && (i < 31); i++)
+ lsecondaryBuffer++;
+ for(i = 0; (*lsecondaryBuffer) && (i < 31); i++)
{
- password[i] = *lbuffer2++;
+ password[i] = *lsecondaryBuffer++;
password[i+1] = '\0';
}
connection->setLogin(login);
connection->setPassword(password);
tokenOff = getEndLine(token, 100);
- delete keep_lbuffer2;
+ delete keep_lsecondaryBuffer;
}
else if(!request->auth.compare("Digest"))
{
Modified: trunk/myserver/src/server/clients_thread.cpp
===================================================================
--- trunk/myserver/src/server/clients_thread.cpp 2008-10-19 17:59:24 UTC
(rev 2893)
+++ trunk/myserver/src/server/clients_thread.cpp 2008-10-19 18:50:26 UTC
(rev 2894)
@@ -92,7 +92,7 @@
controlProtocolParser = 0;
buffer.free();
- buffer2.free();
+ secondaryBuffer.free();
}
/*!
@@ -151,12 +151,12 @@
ct->threadIsRunning = 1;
ct->threadIsStopped = 0;
ct->buffersize = ct->server->getBuffersize();
- ct->buffersize2 = ct->server->getBuffersize2();
+ ct->secondaryBufferSize = ct->server->getBuffersize2();
ct->buffer.setLength(ct->buffersize);
ct->buffer.m_nSizeLimit = ct->buffersize;
- ct->buffer2.setLength(ct->buffersize2);
- ct->buffer2.m_nSizeLimit = ct->buffersize2;
+ ct->secondaryBuffer.setLength(ct->secondaryBufferSize);
+ ct->secondaryBuffer.m_nSizeLimit = ct->secondaryBufferSize;
/* Built-in protocols will be initialized at the first use. */
ct->httpParser = 0;
@@ -355,9 +355,9 @@
{
retcode = c->getContinuation()(c,
(char*)buffer.getBuffer(),
- (char*)buffer2.getBuffer(),
+ (char*)secondaryBuffer.getBuffer(),
buffer.getRealLength(),
- buffer2.getRealLength(),
+ secondaryBuffer.getRealLength(),
nBytesToRead,
id);
c->setContinuation(NULL);
@@ -369,9 +369,9 @@
{
retcode = protocol->controlConnection(c,
(char*)buffer.getBuffer(),
- (char*)buffer2.getBuffer(),
+
(char*)secondaryBuffer.getBuffer(),
buffer.getRealLength(),
- buffer2.getRealLength(),
+ secondaryBuffer.getRealLength(),
nBytesToRead,
id);
}
@@ -457,11 +457,11 @@
return &buffer;
}
/*!
- *Get a pointer to the buffer2.
+ *Get a pointer to the secondaryBuffer.
*/
-MemBuf *ClientsThread::getBuffer2()
+MemBuf *ClientsThread::getSecondaryBuffer()
{
- return &buffer2;
+ return &secondaryBuffer;
}
/*!
Modified: trunk/myserver/src/server/server.cpp
===================================================================
--- trunk/myserver/src/server/server.cpp 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/src/server/server.cpp 2008-10-19 18:50:26 UTC (rev
2894)
@@ -1048,7 +1048,7 @@
data = configurationFileManager.getValue("BUFFER_SIZE");
if(data)
{
- buffersize=buffersize2= (atol(data) > 81920) ? atol(data) : 81920 ;
+ buffersize=secondaryBufferSize= (atol(data) > 81920) ? atol(data) :
81920 ;
}
data = configurationFileManager.getValue("CONNECTION_TIMEOUT");
if(data)
@@ -2056,7 +2056,7 @@
*/
u_long Server::getBuffersize2()
{
- return buffersize2;
+ return secondaryBufferSize;
}
/*!
Modified: trunk/myserver/tests/test_cached_file.cpp
===================================================================
--- trunk/myserver/tests/test_cached_file.cpp 2008-10-19 17:59:24 UTC (rev
2893)
+++ trunk/myserver/tests/test_cached_file.cpp 2008-10-19 18:50:26 UTC (rev
2894)
@@ -96,7 +96,7 @@
char *buffer =new char[size];
- int ret = cf->readFromFile(buffer, size, &nbr);
+ int ret = cf->read(buffer, size, &nbr);
CPPUNIT_ASSERT_EQUAL(ret, 0);
CPPUNIT_ASSERT(nbr > 0);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [myserver-commit] [2894] Code refactoring: `File::read()' used instead of `File::readFromFile ()', `buffer2' renamed to `secondaryBuffer'.,
Giuseppe Scrivano <=