github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-09-09 03:24:59 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: HTTP chunked transfer fixed

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@9880 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2016-05-25 16:29:27 +00:00
parent 2482aa6578
commit 4556bd6352
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

26
uppsrc/Core/Http.cpp
View file

@ -65,6 +65,7 @@ void HttpRequest::Init()
poststream = NULL;
postlen = Null;
has_content_length = false;
chunked_encoding = false;
}
HttpRequest::HttpRequest()
@ -738,6 +739,7 @@ void HttpRequest::StartBody()
else
if(header["transfer-encoding"] == "chunked") {
count = 0;
chunked_encoding = true;
StartPhase(CHUNK_HEADER);
}
else
@ -769,10 +771,12 @@ void HttpRequest::Out(const void *ptr, int size)
WhenContent(ptr, size);
}
bool HttpRequest::ReadingBody()
{
LLOG("HTTP reading body " << count);
String s = TcpSocket::Get(has_content_length ? (int)min((int64)chunk, count) : chunk);
String s = TcpSocket::Get(has_content_length || chunked_encoding ? (int)min((int64)chunk, count)
: chunk);
if(s.GetCount()) {
#ifndef ENDZIP
if(gzip)
@ -787,6 +791,26 @@ bool HttpRequest::ReadingBody()
}
return !IsEof();
}
/*
bool HttpRequest::ReadingBody()
{
LLOG("HTTP reading body " << count);
String s = TcpSocket::Get((int)min((int64)chunk, count));
if(s.GetCount() == 0)
return !IsEof() && count;
#ifndef ENDZIP
if(gzip)
z.Put(~s, s.GetCount());
else
#endif
Out(~s, s.GetCount());
if(count > 0) {
count -= s.GetCount();
return !IsEof() && count > 0;
}
return !IsEof();
}
*/
void HttpRequest::CopyCookies()
{

1
uppsrc/Core/Inet.h
View file

@ -353,6 +353,7 @@ class HttpRequest : public TcpSocket {
String error;
String body;
bool has_content_length;
bool chunked_encoding;
enum {
DEFAULT_HTTP_PORT = 80,