porting rev.1998 from 1.4.4 (except ODBC, which will be done later, and SQLite, which was ported in rev.1999)

This commit is contained in:
Aleksandar Fabijanic
2012-09-05 02:43:06 +00:00
parent 86bafbb27e
commit a221b14522
17 changed files with 224 additions and 48 deletions

View File

@@ -90,7 +90,7 @@ std::ostream& HTTPServerResponseImpl::send()
{
poco_assert (!_pStream);
if (_pRequest && _pRequest->getMethod() == HTTPRequest::HTTP_HEAD ||
if ((_pRequest && _pRequest->getMethod() == HTTPRequest::HTTP_HEAD) ||
getStatus() < 200 ||
getStatus() == HTTPResponse::HTTP_NO_CONTENT ||
getStatus() == HTTPResponse::HTTP_NOT_MODIFIED)

View File

@@ -222,7 +222,7 @@ void WebSocketImpl::connect(const SocketAddress& address, const Poco::Timespan&
}
void WebSocketImpl::connectNB(const SocketAddress& address, const Poco::Timespan& timeout)
void WebSocketImpl::connectNB(const SocketAddress& address)
{
throw Poco::InvalidAccessException("Cannot connectNB() a WebSocketImpl");
}