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

fixed #468: HTTPClientSession/HTTPResponse not forwarding exceptions

Browse Source
This commit is contained in:
Guenter Obiltschnig 2014-11-19 21:56:42 +01:00
parent 88b203f483
commit bd9d051e46
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Net/src/HTTPClientSession.cpp
View File

@ -267,17 +267,13 @@ std::istream& HTTPClientSession::receiveResponse(HTTPResponse& response)
{ {
response.read(his); response.read(his);
} }
catch (MessageException&) catch (Exception&)
{ {
close(); close();
if (networkException()) if (networkException())
networkException()->rethrow(); networkException()->rethrow();
else else
throw; throw;
}
catch (Exception&)
{
close();
throw; throw;
} }
} }

1
Net/src/HTTPRequest.cpp
View File

@ -209,7 +209,6 @@ void HTTPRequest::read(std::istream& istr)
uri.reserve(64); uri.reserve(64);
version.reserve(16); version.reserve(16);
int ch = istr.get(); int ch = istr.get();
if (istr.bad()) throw NetException("Network failure while reading HTTP request header");
if (istr.bad()) throw NetException("Error reading HTTP request header"); if (istr.bad()) throw NetException("Error reading HTTP request header");
if (ch == eof) throw NoMessageException(); if (ch == eof) throw NoMessageException();
while (Poco::Ascii::isSpace(ch)) ch = istr.get(); while (Poco::Ascii::isSpace(ch)) ch = istr.get();

1
Net/src/HTTPResponse.cpp
View File

@ -208,6 +208,7 @@ void HTTPResponse::read(std::istream& istr)
std::string reason; std::string reason;
int ch = istr.get(); int ch = istr.get();
if (istr.bad()) throw NetException("Error reading HTTP response header");
if (ch == eof) throw NoMessageException(); if (ch == eof) throw NoMessageException();
while (Poco::Ascii::isSpace(ch)) ch = istr.get(); while (Poco::Ascii::isSpace(ch)) ch = istr.get();
if (ch == eof) throw MessageException("No HTTP response header"); if (ch == eof) throw MessageException("No HTTP response header");