godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Fix HTTPClient keep alive with chunked encoding.

Browse Source 
We need to consume the trailer part and final CRLF after last chunk
as per RFC 7230 section 4.1:

```
chunked-body   = *chunk
                 last-chunk
                 trailer-part
                 CRLF
```

We do not return the trailer part, just consume it allowing following
requests to work as expected when using keep alive.
This commit is contained in:
Fabio Alessandrelli
2019-02-20 04:33:31 +01:00
parent 10e4821260
commit 0e5655694c
2 changed files with 29 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/io/http_client.cpp
View File

@@ -278,6 +278,7 @@ void HTTPClient::close() {
body_size = -1; body_size = -1;
body_left = 0; body_left = 0;
chunk_left = 0; chunk_left = 0;
chunk_trailer_part = 0;
read_until_eof = false; read_until_eof = false;
response_num = 0; response_num = 0;
handshaking = false; handshaking = false;
@@ -421,6 +422,7 @@ Error HTTPClient::poll() {
chunked = false; chunked = false;
body_left = 0; body_left = 0;
chunk_left = 0; chunk_left = 0;
chunk_trailer_part = false;
read_until_eof = false; read_until_eof = false;
response_str.clear(); response_str.clear();
response_headers.clear(); response_headers.clear();
@@ -511,7 +513,30 @@ PoolByteArray HTTPClient::read_response_body_chunk() {
while (true) { while (true) {
if (chunk_left == 0) { if (chunk_trailer_part) {
// We need to consume the trailer part too or keep-alive will break
uint8_t b;
int rec = 0;
err = _get_http_data(&b, 1, rec);
if (rec == 0)
break;
chunk.push_back(b);
int cs = chunk.size();
if ((cs >= 2 && chunk[cs - 2] == '\r' && chunk[cs - 1] == '\n')) {
if (cs == 2) {
// Finally over
chunk_trailer_part = false;
status = STATUS_CONNECTED;
chunk.clear();
break;
} else {
// We do not process nor return the trailer data
chunk.clear();
}
}
} else if (chunk_left == 0) {
// Reading length // Reading length
uint8_t b; uint8_t b;
int rec = 0; int rec = 0;
@@ -556,7 +581,7 @@ PoolByteArray HTTPClient::read_response_body_chunk() {
if (len == 0) { if (len == 0) {
// End reached! // End reached!
status = STATUS_CONNECTED; chunk_trailer_part = true;
chunk.clear(); chunk.clear();
break; break;
} }
@@ -695,6 +720,7 @@ HTTPClient::HTTPClient() {
body_left = 0; body_left = 0;
read_until_eof = false; read_until_eof = false;
chunk_left = 0; chunk_left = 0;
chunk_trailer_part = false;
response_num = 0; response_num = 0;
ssl = false; ssl = false;
blocking = false; blocking = false;

1
core/io/http_client.h
View File

@@ -172,6 +172,7 @@ private:
bool chunked; bool chunked;
Vector<uint8_t> chunk; Vector<uint8_t> chunk;
int chunk_left; int chunk_left;
bool chunk_trailer_part;
int body_size; int body_size;
int body_left; int body_left;
bool read_until_eof; bool read_until_eof;