generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-27 19:10:20 +01:00
Code Issues Projects Releases Wiki Activity

performance improvements from 1.3.4

Browse Source
This commit is contained in:
Guenter Obiltschnig
2009-02-18 13:25:01 +00:00
parent 64a7203a0d
commit 717dd9cf45
10 changed files with 423 additions and 426 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Net/include/Poco/Net/HTTPMessage.h
View File

@@ -1,7 +1,7 @@
// //
// HTTPMessage.h // HTTPMessage.h
// //
// $Id: //poco/svn/Net/include/Poco/Net/HTTPMessage.h#2 $ // $Id: //poco/Main/Net/include/Poco/Net/HTTPMessage.h#3 $
// //
// Library: Net // Library: Net
// Package: HTTP // Package: HTTP

291
Net/include/Poco/Net/HTTPServerRequestImpl.h
View File

@@ -1,145 +1,146 @@
// //
// HTTPServerRequestImpl.h // HTTPServerRequestImpl.h
// //
// $Id: //poco/svn/Net/include/Poco/Net/HTTPServerRequestImpl.h#2 $ // $Id: //poco/Main/Net/include/Poco/Net/HTTPServerRequestImpl.h#4 $
// //
// Library: Net // Library: Net
// Package: HTTPServer // Package: HTTPServer
// Module: HTTPServerRequestImpl // Module: HTTPServerRequestImpl
// //
// Definition of the HTTPServerRequestImpl class. // Definition of the HTTPServerRequestImpl class.
// //
// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
// and Contributors. // and Contributors.
// //
// Permission is hereby granted, free of charge, to any person or organization // Permission is hereby granted, free of charge, to any person or organization
// obtaining a copy of the software and accompanying documentation covered by // obtaining a copy of the software and accompanying documentation covered by
// this license (the "Software") to use, reproduce, display, distribute, // this license (the "Software") to use, reproduce, display, distribute,
// execute, and transmit the Software, and to prepare derivative works of the // execute, and transmit the Software, and to prepare derivative works of the
// Software, and to permit third-parties to whom the Software is furnished to // Software, and to permit third-parties to whom the Software is furnished to
// do so, all subject to the following: // do so, all subject to the following:
// //
// The copyright notices in the Software and this entire statement, including // The copyright notices in the Software and this entire statement, including
// the above license grant, this restriction and the following disclaimer, // the above license grant, this restriction and the following disclaimer,
// must be included in all copies of the Software, in whole or in part, and // must be included in all copies of the Software, in whole or in part, and
// all derivative works of the Software, unless such copies or derivative // all derivative works of the Software, unless such copies or derivative
// works are solely in the form of machine-executable object code generated by // works are solely in the form of machine-executable object code generated by
// a source language processor. // a source language processor.
// //
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT // FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE // SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, // FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// //
#ifndef Net_HTTPServerRequestImpl_INCLUDED #ifndef Net_HTTPServerRequestImpl_INCLUDED
#define Net_HTTPServerRequestImpl_INCLUDED #define Net_HTTPServerRequestImpl_INCLUDED
#include "Poco/Net/Net.h" #include "Poco/Net/Net.h"
#include "Poco/Net/HTTPServerRequest.h" #include "Poco/Net/HTTPServerRequest.h"
#include "Poco/Net/SocketAddress.h" #include "Poco/Net/SocketAddress.h"
#include <istream> #include "Poco/AutoPtr.h"
#include <istream>
namespace Poco {
namespace Net { namespace Poco {
namespace Net {
class HTTPServerSession;
class HTTPServerParams; class HTTPServerSession;
class HTTPServerParams;
class Net_API HTTPServerRequestImpl: public HTTPServerRequest
/// This subclass of HTTPServerRequest is used for class Net_API HTTPServerRequestImpl: public HTTPServerRequest
/// representing server-side HTTP requests. /// This subclass of HTTPServerRequest is used for
/// /// representing server-side HTTP requests.
/// A HTTPServerRequest is passed to the ///
/// handleRequest() method of HTTPRequestHandler. /// A HTTPServerRequest is passed to the
{ /// handleRequest() method of HTTPRequestHandler.
public: {
HTTPServerRequestImpl(HTTPServerResponse& response, HTTPServerSession& session, HTTPServerParams* pParams); public:
/// Creates the HTTPServerRequestImpl, using the HTTPServerRequestImpl(HTTPServerResponse& response, HTTPServerSession& session, HTTPServerParams* pParams);
/// given HTTPServerSession. /// Creates the HTTPServerRequestImpl, using the
/// given HTTPServerSession.
~HTTPServerRequestImpl();
/// Destroys the HTTPServerRequestImpl. ~HTTPServerRequestImpl();
/// Destroys the HTTPServerRequestImpl.
std::istream& stream();
/// Returns the input stream for reading std::istream& stream();
/// the request body. /// Returns the input stream for reading
/// /// the request body.
/// The stream is valid until the HTTPServerRequestImpl ///
/// object is destroyed. /// The stream is valid until the HTTPServerRequestImpl
/// object is destroyed.
bool expectContinue() const;
/// Returns true if the client expects a bool expectContinue() const;
/// 100 Continue response. /// Returns true if the client expects a
/// 100 Continue response.
const SocketAddress& clientAddress() const;
/// Returns the client's address. const SocketAddress& clientAddress() const;
/// Returns the client's address.
const SocketAddress& serverAddress() const;
/// Returns the server's address. const SocketAddress& serverAddress() const;
/// Returns the server's address.
const HTTPServerParams& serverParams() const;
/// Returns a reference to the server parameters. const HTTPServerParams& serverParams() const;
/// Returns a reference to the server parameters.
HTTPServerResponse& response() const;
/// Returns a reference to the associated response. HTTPServerResponse& response() const;
/// Returns a reference to the associated response.
protected:
static const std::string EXPECT; protected:
static const std::string EXPECT;
private:
HTTPServerResponse& _response; private:
std::istream* _pStream; HTTPServerResponse& _response;
HTTPServerParams* _pParams; std::istream* _pStream;
SocketAddress _clientAddress; Poco::AutoPtr<HTTPServerParams> _pParams;
SocketAddress _serverAddress; SocketAddress _clientAddress;
}; SocketAddress _serverAddress;
};
//
// inlines //
// // inlines
inline std::istream& HTTPServerRequestImpl::stream() //
{ inline std::istream& HTTPServerRequestImpl::stream()
poco_check_ptr (_pStream); {
poco_check_ptr (_pStream);
return *_pStream;
} return *_pStream;
}
inline const SocketAddress& HTTPServerRequestImpl::clientAddress() const
{ inline const SocketAddress& HTTPServerRequestImpl::clientAddress() const
return _clientAddress; {
} return _clientAddress;
}
inline const SocketAddress& HTTPServerRequestImpl::serverAddress() const
{ inline const SocketAddress& HTTPServerRequestImpl::serverAddress() const
return _serverAddress; {
} return _serverAddress;
}
inline const HTTPServerParams& HTTPServerRequestImpl::serverParams() const
{ inline const HTTPServerParams& HTTPServerRequestImpl::serverParams() const
return *_pParams; {
} return *_pParams;
}
inline HTTPServerResponse& HTTPServerRequestImpl::response() const
{ inline HTTPServerResponse& HTTPServerRequestImpl::response() const
return _response; {
} return _response;
}
} } // namespace Poco::Net
} } // namespace Poco::Net
#endif // Net_HTTPServerRequestImpl_INCLUDED
#endif // Net_HTTPServerRequestImpl_INCLUDED

2
Net/src/HTTPCookie.cpp
View File

@@ -1,7 +1,7 @@
// //
// HTTPCookie.cpp // HTTPCookie.cpp
// //
// $Id: //poco/1.3/Net/src/HTTPCookie.cpp#2 $ // $Id: //poco/Main/Net/src/HTTPCookie.cpp#8 $
// //
// Library: Net // Library: Net
// Package: HTTP // Package: HTTP

2
Net/src/HTTPMessage.cpp
View File

@@ -1,7 +1,7 @@
// //
// HTTPMessage.cpp // HTTPMessage.cpp
// //
// $Id: //poco/svn/Net/src/HTTPMessage.cpp#2 $ // $Id: //poco/Main/Net/src/HTTPMessage.cpp#8 $
// //
// Library: Net // Library: Net
// Package: HTTP // Package: HTTP

2
Net/src/HTTPRequest.cpp
View File

@@ -1,7 +1,7 @@
// //
// HTTPRequest.cpp // HTTPRequest.cpp
// //
// $Id: //poco/svn/Net/src/HTTPRequest.cpp#2 $ // $Id: //poco/Main/Net/src/HTTPRequest.cpp#13 $
// //
// Library: Net // Library: Net
// Package: HTTP // Package: HTTP

5
Net/src/HTTPServerConnection.cpp
View File

@@ -1,7 +1,7 @@
// //
// HTTPServerConnection.cpp // HTTPServerConnection.cpp
// //
// $Id: //poco/svn/Net/src/HTTPServerConnection.cpp#2 $ // $Id: //poco/Main/Net/src/HTTPServerConnection.cpp#11 $
// //
// Library: Net // Library: Net
// Package: HTTPServer // Package: HTTPServer
@@ -43,6 +43,7 @@
#include "Poco/Net/HTTPServerParams.h" #include "Poco/Net/HTTPServerParams.h"
#include "Poco/Net/NetException.h" #include "Poco/Net/NetException.h"
#include "Poco/NumberFormatter.h" #include "Poco/NumberFormatter.h"
#include "Poco/Timestamp.h"
#include <memory> #include <memory>
@@ -79,6 +80,8 @@ void HTTPServerConnection::run()
HTTPServerResponseImpl response(session); HTTPServerResponseImpl response(session);
HTTPServerRequestImpl request(response, session, _pParams); HTTPServerRequestImpl request(response, session, _pParams);
Poco::Timestamp now;
response.setDate(now);
response.setVersion(request.getVersion()); response.setVersion(request.getVersion());
response.setKeepAlive(_pParams->getKeepAlive() && request.getKeepAlive() && session.canKeepAlive()); response.setKeepAlive(_pParams->getKeepAlive() && request.getKeepAlive() && session.canKeepAlive());
if (!server.empty()) if (!server.empty())

191
Net/src/HTTPServerRequestImpl.cpp
View File

@@ -1,98 +1,93 @@
// //
// HTTPServerRequestImpl.cpp // HTTPServerRequestImpl.cpp
// //
// $Id: //poco/svn/Net/src/HTTPServerRequestImpl.cpp#2 $ // $Id: //poco/Main/Net/src/HTTPServerRequestImpl.cpp#4 $
// //
// Library: Net // Library: Net
// Package: HTTPServer // Package: HTTPServer
// Module: HTTPServerRequestImpl // Module: HTTPServerRequestImpl
// //
// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
// and Contributors. // and Contributors.
// //
// Permission is hereby granted, free of charge, to any person or organization // Permission is hereby granted, free of charge, to any person or organization
// obtaining a copy of the software and accompanying documentation covered by // obtaining a copy of the software and accompanying documentation covered by
// this license (the "Software") to use, reproduce, display, distribute, // this license (the "Software") to use, reproduce, display, distribute,
// execute, and transmit the Software, and to prepare derivative works of the // execute, and transmit the Software, and to prepare derivative works of the
// Software, and to permit third-parties to whom the Software is furnished to // Software, and to permit third-parties to whom the Software is furnished to
// do so, all subject to the following: // do so, all subject to the following:
// //
// The copyright notices in the Software and this entire statement, including // The copyright notices in the Software and this entire statement, including
// the above license grant, this restriction and the following disclaimer, // the above license grant, this restriction and the following disclaimer,
// must be included in all copies of the Software, in whole or in part, and // must be included in all copies of the Software, in whole or in part, and
// all derivative works of the Software, unless such copies or derivative // all derivative works of the Software, unless such copies or derivative
// works are solely in the form of machine-executable object code generated by // works are solely in the form of machine-executable object code generated by
// a source language processor. // a source language processor.
// //
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT // FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE // SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, // FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// //
#include "Poco/Net/HTTPServerRequestImpl.h" #include "Poco/Net/HTTPServerRequestImpl.h"
#include "Poco/Net/HTTPServerSession.h" #include "Poco/Net/HTTPServerSession.h"
#include "Poco/Net/HTTPHeaderStream.h" #include "Poco/Net/HTTPHeaderStream.h"
#include "Poco/Net/HTTPStream.h" #include "Poco/Net/HTTPStream.h"
#include "Poco/Net/HTTPFixedLengthStream.h" #include "Poco/Net/HTTPFixedLengthStream.h"
#include "Poco/Net/HTTPChunkedStream.h" #include "Poco/Net/HTTPChunkedStream.h"
#include "Poco/Net/HTTPServerParams.h" #include "Poco/Net/HTTPServerParams.h"
#include "Poco/String.h" #include "Poco/String.h"
using Poco::icompare; using Poco::icompare;
namespace Poco { namespace Poco {
namespace Net { namespace Net {
const std::string HTTPServerRequestImpl::EXPECT("Expect"); const std::string HTTPServerRequestImpl::EXPECT("Expect");
HTTPServerRequestImpl::HTTPServerRequestImpl(HTTPServerResponse& response, HTTPServerSession& session, HTTPServerParams* pParams): HTTPServerRequestImpl::HTTPServerRequestImpl(HTTPServerResponse& response, HTTPServerSession& session, HTTPServerParams* pParams):
_response(response), _response(response),
_pStream(0), _pStream(0),
_pParams(pParams) _pParams(pParams, true)
{ {
poco_check_ptr (_pParams); HTTPHeaderInputStream hs(session);
read(hs);
_pParams->duplicate();
// Now that we know socket is still connected, obtain addresses
HTTPHeaderInputStream hs(session); _clientAddress = session.clientAddress();
read(hs); _serverAddress = session.serverAddress();
// Now that we know socket is still connected, obtain addresses if (getChunkedTransferEncoding())
_clientAddress = session.clientAddress(); _pStream = new HTTPChunkedInputStream(session);
_serverAddress = session.serverAddress(); else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH)
_pStream = new HTTPFixedLengthInputStream(session, getContentLength());
if (getChunkedTransferEncoding()) else if (getMethod() == HTTPRequest::HTTP_GET || getMethod() == HTTPRequest::HTTP_HEAD)
_pStream = new HTTPChunkedInputStream(session); _pStream = new HTTPFixedLengthInputStream(session, 0);
else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH) else
_pStream = new HTTPFixedLengthInputStream(session, getContentLength()); _pStream = new HTTPInputStream(session);
else if (getMethod() == HTTPRequest::HTTP_GET || getMethod() == HTTPRequest::HTTP_HEAD) }
_pStream = new HTTPFixedLengthInputStream(session, 0);
else
_pStream = new HTTPInputStream(session); HTTPServerRequestImpl::~HTTPServerRequestImpl()
} {
delete _pStream;
}
HTTPServerRequestImpl::~HTTPServerRequestImpl()
{
_pParams->release(); bool HTTPServerRequestImpl::expectContinue() const
delete _pStream; {
} const std::string& expect = get(EXPECT, EMPTY);
return !expect.empty() && icompare(expect, "100-continue") == 0;
}
bool HTTPServerRequestImpl::expectContinue() const
{
const std::string& expect = get(EXPECT, EMPTY); } } // namespace Poco::Net
return !expect.empty() && icompare(expect, "100-continue") == 0;
}
} } // namespace Poco::Net

350
Net/src/HTTPServerResponseImpl.cpp
View File

@@ -1,176 +1,174 @@
// //
// HTTPServerResponseImpl.cpp // HTTPServerResponseImpl.cpp
// //
// $Id: //poco/svn/Net/src/HTTPServerResponseImpl.cpp#3 $ // $Id: //poco/Main/Net/src/HTTPServerResponseImpl.cpp#6 $
// //
// Library: Net // Library: Net
// Package: HTTPServer // Package: HTTPServer
// Module: HTTPServerResponseImpl // Module: HTTPServerResponseImpl
// //
// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH. // Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
// and Contributors. // and Contributors.
// //
// Permission is hereby granted, free of charge, to any person or organization // Permission is hereby granted, free of charge, to any person or organization
// obtaining a copy of the software and accompanying documentation covered by // obtaining a copy of the software and accompanying documentation covered by
// this license (the "Software") to use, reproduce, display, distribute, // this license (the "Software") to use, reproduce, display, distribute,
// execute, and transmit the Software, and to prepare derivative works of the // execute, and transmit the Software, and to prepare derivative works of the
// Software, and to permit third-parties to whom the Software is furnished to // Software, and to permit third-parties to whom the Software is furnished to
// do so, all subject to the following: // do so, all subject to the following:
// //
// The copyright notices in the Software and this entire statement, including // The copyright notices in the Software and this entire statement, including
// the above license grant, this restriction and the following disclaimer, // the above license grant, this restriction and the following disclaimer,
// must be included in all copies of the Software, in whole or in part, and // must be included in all copies of the Software, in whole or in part, and
// all derivative works of the Software, unless such copies or derivative // all derivative works of the Software, unless such copies or derivative
// works are solely in the form of machine-executable object code generated by // works are solely in the form of machine-executable object code generated by
// a source language processor. // a source language processor.
// //
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT // FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE // SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, // FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// //
#include "Poco/Net/HTTPServerResponseImpl.h" #include "Poco/Net/HTTPServerResponseImpl.h"
#include "Poco/Net/HTTPServerSession.h" #include "Poco/Net/HTTPServerSession.h"
#include "Poco/Net/HTTPHeaderStream.h" #include "Poco/Net/HTTPHeaderStream.h"
#include "Poco/Net/HTTPStream.h" #include "Poco/Net/HTTPStream.h"
#include "Poco/Net/HTTPFixedLengthStream.h" #include "Poco/Net/HTTPFixedLengthStream.h"
#include "Poco/Net/HTTPChunkedStream.h" #include "Poco/Net/HTTPChunkedStream.h"
#include "Poco/File.h" #include "Poco/File.h"
#include "Poco/Timestamp.h" #include "Poco/Timestamp.h"
#include "Poco/NumberFormatter.h" #include "Poco/NumberFormatter.h"
#include "Poco/StreamCopier.h" #include "Poco/StreamCopier.h"
#include "Poco/CountingStream.h" #include "Poco/CountingStream.h"
#include "Poco/Exception.h" #include "Poco/Exception.h"
#include "Poco/FileStream.h" #include "Poco/FileStream.h"
#include "Poco/DateTimeFormatter.h" #include "Poco/DateTimeFormatter.h"
#include "Poco/DateTimeFormat.h" #include "Poco/DateTimeFormat.h"
using Poco::File; using Poco::File;
using Poco::Timestamp; using Poco::Timestamp;
using Poco::NumberFormatter; using Poco::NumberFormatter;
using Poco::StreamCopier; using Poco::StreamCopier;
using Poco::OpenFileException; using Poco::OpenFileException;
using Poco::DateTimeFormatter; using Poco::DateTimeFormatter;
using Poco::DateTimeFormat; using Poco::DateTimeFormat;
namespace Poco { namespace Poco {
namespace Net { namespace Net {
HTTPServerResponseImpl::HTTPServerResponseImpl(HTTPServerSession& session): HTTPServerResponseImpl::HTTPServerResponseImpl(HTTPServerSession& session):
_session(session), _session(session),
_pStream(0) _pStream(0)
{ {
Timestamp now; }
setDate(now);
}
HTTPServerResponseImpl::~HTTPServerResponseImpl()
{
HTTPServerResponseImpl::~HTTPServerResponseImpl() delete _pStream;
{ }
delete _pStream;
}
void HTTPServerResponseImpl::sendContinue()
{
void HTTPServerResponseImpl::sendContinue() HTTPHeaderOutputStream hs(_session);
{ hs << getVersion() << " 100 Continue\r\n\r\n";
HTTPHeaderOutputStream hs(_session); }
hs << getVersion() << " 100 Continue\r\n\r\n";
}
std::ostream& HTTPServerResponseImpl::send()
{
std::ostream& HTTPServerResponseImpl::send() poco_assert (!_pStream);
{
poco_assert (!_pStream); if (getChunkedTransferEncoding())
{
if (getChunkedTransferEncoding()) HTTPHeaderOutputStream hs(_session);
{ write(hs);
HTTPHeaderOutputStream hs(_session); _pStream = new HTTPChunkedOutputStream(_session);
write(hs); }
_pStream = new HTTPChunkedOutputStream(_session); else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH)
} {
else if (getContentLength() != HTTPMessage::UNKNOWN_CONTENT_LENGTH) Poco::CountingOutputStream cs;
{ write(cs);
Poco::CountingOutputStream cs; _pStream = new HTTPFixedLengthOutputStream(_session, getContentLength() + cs.chars());
write(cs); write(*_pStream);
_pStream = new HTTPFixedLengthOutputStream(_session, getContentLength() + cs.chars()); }
write(*_pStream); else
} {
else _pStream = new HTTPOutputStream(_session);
{ setKeepAlive(false);
_pStream = new HTTPOutputStream(_session); write(*_pStream);
setKeepAlive(false); }
write(*_pStream); return *_pStream;
} }
return *_pStream;
}
void HTTPServerResponseImpl::sendFile(const std::string& path, const std::string& mediaType)
{
void HTTPServerResponseImpl::sendFile(const std::string& path, const std::string& mediaType) poco_assert (!_pStream);
{
poco_assert (!_pStream); File f(path);
Timestamp dateTime = f.getLastModified();
File f(path); File::FileSize length = f.getSize();
Timestamp dateTime = f.getLastModified(); set("Last-Modified", DateTimeFormatter::format(dateTime, DateTimeFormat::HTTP_FORMAT));
File::FileSize length = f.getSize(); setContentLength(static_cast<int>(length));
set("Last-Modified", DateTimeFormatter::format(dateTime, DateTimeFormat::HTTP_FORMAT)); setContentType(mediaType);
setContentLength(static_cast<int>(length)); setChunkedTransferEncoding(false);
setContentType(mediaType);
setChunkedTransferEncoding(false); Poco::FileInputStream istr(path);
if (istr.good())
Poco::FileInputStream istr(path); {
if (istr.good()) _pStream = new HTTPHeaderOutputStream(_session);
{ write(*_pStream);
_pStream = new HTTPOutputStream(_session); StreamCopier::copyStream(istr, *_pStream);
write(*_pStream); }
StreamCopier::copyStream(istr, *_pStream); else throw OpenFileException(path);
} }
else throw OpenFileException(path);
}
void HTTPServerResponseImpl::sendBuffer(const void* pBuffer, std::size_t length)
{
void HTTPServerResponseImpl::sendBuffer(const void* pBuffer, std::size_t length) poco_assert (!_pStream);
{
poco_assert (!_pStream); setContentLength(static_cast<int>(length));
setChunkedTransferEncoding(false);
setContentLength(static_cast<int>(length));
setChunkedTransferEncoding(false); _pStream = new HTTPHeaderOutputStream(_session);
write(*_pStream);
_pStream = new HTTPOutputStream(_session); _pStream->write(static_cast<const char*>(pBuffer), static_cast<std::streamsize>(length));
write(*_pStream); }
_pStream->write(static_cast<const char*>(pBuffer), static_cast<std::streamsize>(length));
}
void HTTPServerResponseImpl::redirect(const std::string& uri)
{
void HTTPServerResponseImpl::redirect(const std::string& uri) poco_assert (!_pStream);
{
poco_assert (!_pStream); setStatusAndReason(HTTPResponse::HTTP_FOUND);
set("Location", uri);
setStatusAndReason(HTTPResponse::HTTP_FOUND);
set("Location", uri); _pStream = new HTTPOutputStream(_session);
write(*_pStream);
_pStream = new HTTPOutputStream(_session); }
write(*_pStream);
}
void HTTPServerResponseImpl::requireAuthentication(const std::string& realm)
{
void HTTPServerResponseImpl::requireAuthentication(const std::string& realm) poco_assert (!_pStream);
{
poco_assert (!_pStream); setStatusAndReason(HTTPResponse::HTTP_UNAUTHORIZED);
std::string auth("Basic realm=\"");
setStatusAndReason(HTTPResponse::HTTP_UNAUTHORIZED); auth.append(realm);
std::string auth("Basic realm=\""); auth.append("\"");
auth.append(realm); set("WWW-Authenticate", auth);
auth.append("\""); }
set("WWW-Authenticate", auth);
}
} } // namespace Poco::Net
} } // namespace Poco::Net

2
Net/src/MessageHeader.cpp
View File

@@ -1,7 +1,7 @@
// //
// MessageHeader.cpp // MessageHeader.cpp
// //
// $Id: //poco/svn/Net/src/MessageHeader.cpp#2 $ // $Id: //poco/Main/Net/src/MessageHeader.cpp#13 $
// //
// Library: Net // Library: Net
// Package: Messages // Package: Messages

2
Net/src/NameValueCollection.cpp
View File

@@ -1,7 +1,7 @@
// //
// NameValueCollection.cpp // NameValueCollection.cpp
// //
// $Id: //poco/svn/Net/src/NameValueCollection.cpp#2 $ // $Id: //poco/Main/Net/src/NameValueCollection.cpp#8 $
// //
// Library: Net // Library: Net
// Package: Messages // Package: Messages