diff options
| author | Rémi Verschelde | 2017-03-23 08:29:08 +0100 |
|---|---|---|
| committer | GitHub | 2017-03-23 08:29:08 +0100 |
| commit | aaf4e3ab9f8ffca22b34b63aaaf8cc87ead22e48 (patch) | |
| tree | ed6abd04f1d1ef9bf3bfb92761ed8a58b137a476 /scene/main | |
| parent | a14ad02d155da315b247c03337d98e151b504c61 (diff) | |
| parent | 15ecdb5f00da2f19974d70ddd8f2658d9f2f4903 (diff) | |
| download | godot-aaf4e3ab9f8ffca22b34b63aaaf8cc87ead22e48.tar.gz godot-aaf4e3ab9f8ffca22b34b63aaaf8cc87ead22e48.tar.zst godot-aaf4e3ab9f8ffca22b34b63aaaf8cc87ead22e48.zip | |
Merge pull request #8108 from Faless/2.1-v6fix-cherry
Cherry pick #7510 and #7581 to 2.1
Diffstat (limited to 'scene/main')
| -rw-r--r-- | scene/main/http_request.cpp | 5 | ||||
| -rw-r--r-- | scene/main/http_request.h | 1 |
2 files changed, 0 insertions, 6 deletions
diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index d977548d6..97832521c 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -28,10 +28,6 @@ /*************************************************************************/ #include "http_request.h" -void HTTPRequest::set_ip_type(IP::Type p_type) { - client->set_ip_type(p_type); -} - void HTTPRequest::_redirect_request(const String &p_new_url) { } @@ -519,7 +515,6 @@ int HTTPRequest::get_body_size() const { void HTTPRequest::_bind_methods() { - ObjectTypeDB::bind_method(_MD("set_ip_type", "ip_type"), &HTTPRequest::set_ip_type); ObjectTypeDB::bind_method(_MD("request", "url", "custom_headers", "ssl_validate_domain", "method", "request_data"), &HTTPRequest::request, DEFVAL(StringArray()), DEFVAL(true), DEFVAL(HTTPClient::METHOD_GET), DEFVAL(String())); ObjectTypeDB::bind_method(_MD("cancel_request"), &HTTPRequest::cancel_request); diff --git a/scene/main/http_request.h b/scene/main/http_request.h index 6a63fa66a..e7da0e1e3 100644 --- a/scene/main/http_request.h +++ b/scene/main/http_request.h @@ -113,7 +113,6 @@ protected: static void _bind_methods(); public: - void set_ip_type(IP::Type p_type); Error request(const String &p_url, const Vector<String> &p_custom_headers = Vector<String>(), bool p_ssl_validate_domain = true, HTTPClient::Method p_method = HTTPClient::METHOD_GET, const String &p_request_data = ""); //connects to a full url and perform request void cancel_request(); HTTPClient::Status get_http_client_status() const; |