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 /core/io/http_client.h | |
| 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 '')
| -rw-r--r-- | core/io/http_client.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/core/io/http_client.h b/core/io/http_client.h index 43d6dc721..ac2bd7417 100644 --- a/core/io/http_client.h +++ b/core/io/http_client.h @@ -130,7 +130,6 @@ public: }; private: - IP::Type ip_type; Status status; IP::ResolverID resolving; int conn_port; @@ -161,7 +160,6 @@ private: Error _get_http_data(uint8_t *p_buffer, int p_bytes, int &r_received); public: - void set_ip_type(IP::Type p_type); //Error connect_and_get(const String& p_url,bool p_verify_host=true); //connects to a full url and perform request Error connect(const String &p_host, int p_port, bool p_ssl = false, bool p_verify_host = true); |