diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-10-26 14:32:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-26 14:32:51 +0200 |
| commit | c67e3a485dedae96b82c3356d5f45ab0509d7759 (patch) | |
| tree | 748ab44c8ec645a8eee950991210bf6c620651d1 /core/io/http_client.cpp | |
| parent | c7f9d853e206c15981330af46cfd0a0fc43fc5ef (diff) | |
| parent | 80e911647c5df21c5b6a06876f1d48e21cd1f5fc (diff) | |
Merge pull request #6925 from godotengine/ipv6
Adding IPv6 support
Diffstat (limited to 'core/io/http_client.cpp')
| -rw-r--r-- | core/io/http_client.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index 2a831dd992..e3289b452c 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -29,8 +29,9 @@ #include "http_client.h" #include "io/stream_peer_ssl.h" +VARIANT_ENUM_CAST(IP_Address::AddrType); -Error HTTPClient::connect(const String &p_host, int p_port, bool p_ssl,bool p_verify_host){ +Error HTTPClient::connect(const String &p_host, int p_port, bool p_ssl,bool p_verify_host, IP_Address::AddrType p_addr_type){ close(); conn_port=p_port; @@ -62,7 +63,7 @@ Error HTTPClient::connect(const String &p_host, int p_port, bool p_ssl,bool p_ve status=STATUS_CONNECTING; } else { //is hostname - resolving=IP::get_singleton()->resolve_hostname_queue_item(conn_host); + resolving=IP::get_singleton()->resolve_hostname_queue_item(conn_host, p_addr_type); status=STATUS_RESOLVING; } @@ -635,7 +636,7 @@ Error HTTPClient::_get_http_data(uint8_t* p_buffer, int p_bytes,int &r_received) void HTTPClient::_bind_methods() { - ObjectTypeDB::bind_method(_MD("connect:Error","host","port","use_ssl","verify_host"),&HTTPClient::connect,DEFVAL(false),DEFVAL(true)); + ObjectTypeDB::bind_method(_MD("connect:Error","host","port","use_ssl","verify_host"),&HTTPClient::connect,DEFVAL(false),DEFVAL(true),DEFVAL(IP_Address::TYPE_ANY)); ObjectTypeDB::bind_method(_MD("set_connection","connection:StreamPeer"),&HTTPClient::set_connection); ObjectTypeDB::bind_method(_MD("get_connection:StreamPeer"),&HTTPClient::get_connection); ObjectTypeDB::bind_method(_MD("request_raw","method","url","headers","body"),&HTTPClient::request_raw); |