noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

-OpenSSL Fixes

Browse Source
This commit is contained in:
Juan Linietsky
2014-05-01 09:53:37 -03:00
parent 5ab65f0ead
commit 4dc4e96c8a
132 changed files with 188 additions and 21391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/io/http_client.cpp
View File

@@ -34,7 +34,7 @@ Error HTTPClient::connect_url(const String& p_url) {
return OK;
}
Error HTTPClient::connect(const String &p_host, int p_port, bool p_ssl){
Error HTTPClient::connect(const String &p_host, int p_port, bool p_ssl,bool p_verify_host){
close();
conn_port=p_port;
@@ -50,6 +50,7 @@ Error HTTPClient::connect(const String &p_host, int p_port, bool p_ssl){
ssl=p_ssl;
ssl_verify_host=p_verify_host;
connection=tcp_connection;
@@ -239,7 +240,7 @@ Error HTTPClient::poll(){
case StreamPeerTCP::STATUS_CONNECTED: {
if (ssl) {
Ref<StreamPeerSSL> ssl = StreamPeerSSL::create();
Error err = ssl->connect(tcp_connection,true,conn_host);
Error err = ssl->connect(tcp_connection,true,ssl_verify_host?conn_host:String());
if (err!=OK) {
close();
status=STATUS_SSL_HANDSHAKE_ERROR;
@@ -553,7 +554,7 @@ bool HTTPClient::is_blocking_mode_enabled() const{
void HTTPClient::_bind_methods() {
ObjectTypeDB::bind_method(_MD("connect:Error","host","port","use_ssl"),&HTTPClient::connect,DEFVAL(false));
ObjectTypeDB::bind_method(_MD("connect:Error","host","port","use_ssl"),&HTTPClient::connect,DEFVAL(false),DEFVAL(true));
ObjectTypeDB::bind_method(_MD("set_connection","connection:StreamPeer"),&HTTPClient::set_connection);
ObjectTypeDB::bind_method(_MD("request","method","url","headers","body"),&HTTPClient::request,DEFVAL(String()));
ObjectTypeDB::bind_method(_MD("send_body_text","body"),&HTTPClient::send_body_text);

3
core/io/http_client.h
View File

@@ -137,6 +137,7 @@ private:
int conn_port;
String conn_host;
bool ssl;
bool ssl_verify_host;
bool blocking;
Vector<uint8_t> response_str;
@@ -161,7 +162,7 @@ public:
Error connect_url(const String& p_url); //connects to a full url and perform request
Error connect(const String &p_host,int p_port,bool p_ssl=false);
Error connect(const String &p_host,int p_port,bool p_ssl=false,bool p_verify_host=true);
void set_connection(const Ref<StreamPeer>& p_connection);