diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-02-12 23:31:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-12 23:31:40 +0100 |
| commit | 70b9aa379d99c78f6db87344e3002808dac70bfa (patch) | |
| tree | 4f83bb38a0fe8b636640cb9b4eb0cd0b82a0b9c6 /core/io/http_client.cpp | |
| parent | 117a83fcb916cb02777dea73fb642216fd2e1d79 (diff) | |
| parent | 5dc7c920bf1c4bb160d39e13ad6136d80badd7ae (diff) | |
Merge pull request #7581 from Faless/v6_wild_bind
TCP/UDP listen bind to address and bugfixes
Diffstat (limited to 'core/io/http_client.cpp')
| -rw-r--r-- | core/io/http_client.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index fd06d27c1f..750c458dac 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -29,14 +29,9 @@ #include "http_client.h" #include "io/stream_peer_ssl.h" -void HTTPClient::set_ip_type(IP::Type p_type) { - ip_type = p_type; -} - Error HTTPClient::connect_to_host(const String &p_host, int p_port, bool p_ssl,bool p_verify_host){ close(); - tcp_connection->set_ip_type(ip_type); conn_port=p_port; conn_host=p_host; @@ -66,7 +61,7 @@ Error HTTPClient::connect_to_host(const String &p_host, int p_port, bool p_ssl,b status=STATUS_CONNECTING; } else { //is hostname - resolving=IP::get_singleton()->resolve_hostname_queue_item(conn_host, ip_type); + resolving=IP::get_singleton()->resolve_hostname_queue_item(conn_host); status=STATUS_RESOLVING; } @@ -641,7 +636,6 @@ Error HTTPClient::_get_http_data(uint8_t* p_buffer, int p_bytes,int &r_received) void HTTPClient::_bind_methods() { - ClassDB::bind_method(_MD("set_ip_type","ip_type"),&HTTPClient::set_ip_type); ClassDB::bind_method(_MD("connect_to_host:Error","host","port","use_ssl","verify_host"),&HTTPClient::connect_to_host,DEFVAL(false),DEFVAL(true)); ClassDB::bind_method(_MD("set_connection","connection:StreamPeer"),&HTTPClient::set_connection); ClassDB::bind_method(_MD("get_connection:StreamPeer"),&HTTPClient::get_connection); @@ -768,7 +762,6 @@ String HTTPClient::query_string_from_dict(const Dictionary& p_dict) { HTTPClient::HTTPClient(){ - ip_type = IP::TYPE_ANY; tcp_connection = StreamPeerTCP::create_ref(); resolving = IP::RESOLVER_INVALID_ID; status=STATUS_DISCONNECTED; |