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

fix sending trailer: HTTPOutputStream actually shuts down socket, so final \r\n would not be sent. May be related to #4180

Browse Source
This commit is contained in:
Günter Obiltschnig
2023-10-15 11:20:05 +02:00
parent 6385a3c86e
commit 53b57c36eb
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Net/src/HTTPChunkedStream.cpp
View File

@@ -13,7 +13,7 @@
#include "Poco/Net/HTTPChunkedStream.h"
#include "Poco/Net/HTTPStream.h"
#include "Poco/Net/HTTPHeaderStream.h"
#include "Poco/Net/HTTPSession.h"
#include "Poco/NumberFormatter.h"
#include "Poco/NumberParser.h"
@@ -53,13 +53,17 @@ void HTTPChunkedStreamBuf::close()
if (_mode & std::ios::out)
{
sync();
_session.write("0\r\n", 3);
if (_pTrailer && !_pTrailer->empty())
{
HTTPOutputStream hos(_session);
HTTPHeaderOutputStream hos(_session);
hos.write("0\r\n", 3);
_pTrailer->write(hos);
hos.write("\r\n", 2);
}
else
{
_session.write("0\r\n\r\n", 5); // If possible, send in one write
}
_session.write("\r\n", 2);
}
}
@@ -79,7 +83,7 @@ int HTTPChunkedStreamBuf::readFromDevice(char* buffer, std::streamsize length)
unsigned chunk;
if (NumberParser::tryParseHex(chunkLen, chunk))
{
_chunk = (std::streamsize) chunk;
_chunk = static_cast<std::streamsize>(chunk);
}
else
{
@@ -99,7 +103,7 @@ int HTTPChunkedStreamBuf::readFromDevice(char* buffer, std::streamsize length)
int ch = _session.peek();
if (ch != eof && ch != '\r' && ch != '\n')
{
HTTPInputStream his(_session);
HTTPHeaderInputStream his(_session);
if (_pTrailer)
{
_pTrailer->read(his);