feat: updated godot version
This commit is contained in:
parent
0c508b0831
commit
42b028dbb5
4694 changed files with 236470 additions and 401376 deletions
|
|
@ -30,13 +30,7 @@
|
|||
|
||||
#include "http_request.h"
|
||||
|
||||
#include "core/io/dir_access.h"
|
||||
#include "core/io/file_access.h"
|
||||
#include "core/io/stream_peer_gzip.h"
|
||||
#include "core/object/callable_mp.h"
|
||||
#include "core/object/class_db.h"
|
||||
#include "core/os/os.h"
|
||||
#include "core/os/thread.h"
|
||||
#include "scene/main/timer.h"
|
||||
|
||||
Error HTTPRequest::_request() {
|
||||
|
|
@ -205,20 +199,13 @@ void HTTPRequest::cancel_request() {
|
|||
}
|
||||
}
|
||||
|
||||
if (file.is_valid()) {
|
||||
file.unref();
|
||||
if (!download_complete) {
|
||||
DirAccess::remove_absolute(download_to_file);
|
||||
}
|
||||
}
|
||||
|
||||
file.unref();
|
||||
decompressor.unref();
|
||||
client->close();
|
||||
body.clear();
|
||||
got_response = false;
|
||||
response_code = -1;
|
||||
request_sent = false;
|
||||
download_complete = false;
|
||||
requesting = false;
|
||||
}
|
||||
|
||||
|
|
@ -242,22 +229,6 @@ Error HTTPRequest::_get_redirect_headers(Vector<String> *r_headers) {
|
|||
return OK;
|
||||
}
|
||||
|
||||
bool HTTPRequest::_is_automatic_redirect() const {
|
||||
if (unlikely(method == HTTPClient::METHOD_CONNECT)) {
|
||||
// Never automatically redirect CONNECT requests.
|
||||
return false;
|
||||
} else if (response_code == 301 || response_code == 302 || response_code == 303 || response_code == 305) {
|
||||
// We change unsafe methods to GET for 301, 302, and 303, so these are always redirected.
|
||||
// 305 is deprecated and treated as equivalent to 302.
|
||||
return true;
|
||||
} else if ((response_code == 307 || response_code == 308) && _is_method_safe()) {
|
||||
// We only automatically redirect for safe methods on method-preserving status codes.
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool HTTPRequest::_handle_response(bool *ret_value) {
|
||||
if (!client->has_response()) {
|
||||
_defer_done(RESULT_NO_RESPONSE, 0, PackedStringArray(), PackedByteArray());
|
||||
|
|
@ -278,8 +249,8 @@ bool HTTPRequest::_handle_response(bool *ret_value) {
|
|||
response_headers.push_back(E);
|
||||
}
|
||||
|
||||
if (_is_automatic_redirect()) {
|
||||
// Follow redirect.
|
||||
if (response_code == 301 || response_code == 302) {
|
||||
// Handle redirect.
|
||||
|
||||
if (max_redirects >= 0 && redirections >= max_redirects) {
|
||||
_defer_done(RESULT_REDIRECT_LIMIT_REACHED, response_code, response_headers, PackedByteArray());
|
||||
|
|
@ -509,7 +480,6 @@ bool HTTPRequest::_update_connection() {
|
|||
|
||||
if (body_len >= 0) {
|
||||
if (downloaded.get() == body_len) {
|
||||
download_complete = true;
|
||||
_defer_done(RESULT_SUCCESS, response_code, response_headers, body);
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue