asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix HTTPRequest status checks.

Browse source 
HTTPRequest used to have its own `status` variable but it would never be
updated since the status of the client would be used instead.
This caused potential crashes in some edge cases.
The `status` variable is now removed, and the client status is used in
checks instead.
This commit is contained in:
Fabio Alessandrelli 2019-07-01 09:15:35 +02:00
parent 89d537767e
commit 2eac1a64f7
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scene/main/http_request.cpp
View file

@ -425,7 +425,7 @@ void HTTPRequest::_notification(int p_what) {
void HTTPRequest::set_use_threads(bool p_use) { void HTTPRequest::set_use_threads(bool p_use) {
ERR_FAIL_COND(status != HTTPClient::STATUS_DISCONNECTED); ERR_FAIL_COND(get_http_client_status() != HTTPClient::STATUS_DISCONNECTED);
use_threads = p_use; use_threads = p_use;
} }
@ -436,7 +436,7 @@ bool HTTPRequest::is_using_threads() const {
void HTTPRequest::set_body_size_limit(int p_bytes) { void HTTPRequest::set_body_size_limit(int p_bytes) {
ERR_FAIL_COND(status != HTTPClient::STATUS_DISCONNECTED); ERR_FAIL_COND(get_http_client_status() != HTTPClient::STATUS_DISCONNECTED);
body_size_limit = p_bytes; body_size_limit = p_bytes;
} }
@ -448,7 +448,7 @@ int HTTPRequest::get_body_size_limit() const {
void HTTPRequest::set_download_file(const String &p_file) { void HTTPRequest::set_download_file(const String &p_file) {
ERR_FAIL_COND(status != HTTPClient::STATUS_DISCONNECTED); ERR_FAIL_COND(get_http_client_status() != HTTPClient::STATUS_DISCONNECTED);
download_to_file = p_file; download_to_file = p_file;
} }
@ -546,7 +546,6 @@ HTTPRequest::HTTPRequest() {
downloaded = 0; downloaded = 0;
body_size_limit = -1; body_size_limit = -1;
file = NULL; file = NULL;
status = HTTPClient::STATUS_DISCONNECTED;
} }
HTTPRequest::~HTTPRequest() { HTTPRequest::~HTTPRequest() {

2
scene/main/http_request.h
View file

@ -88,8 +88,6 @@ private:
int redirections; int redirections;
HTTPClient::Status status;
bool _update_connection(); bool _update_connection();
int max_redirects; int max_redirects;