-Made editor support SSL certs by default (embedded them)
-Made asset sharing support https -Many fixes to HTTPRequest -Added an asset installer dialog -Visual cleanups to asset sharing tab -Fixed some issues in ScrollContainer, hope it does not break things -Asset sharing tab is not visible (hidden on purpose) for now.
This commit is contained in:
parent
d85f06c42d
commit
8b1dcbfe4d
32 changed files with 6011 additions and 142 deletions
|
|
@ -4,12 +4,28 @@
|
|||
StreamPeerSSL* (*StreamPeerSSL::_create)()=NULL;
|
||||
|
||||
|
||||
|
||||
|
||||
StreamPeerSSL *StreamPeerSSL::create() {
|
||||
|
||||
return _create();
|
||||
}
|
||||
|
||||
|
||||
|
||||
StreamPeerSSL::LoadCertsFromMemory StreamPeerSSL::load_certs_func=NULL;
|
||||
bool StreamPeerSSL::available=false;
|
||||
bool StreamPeerSSL::initialize_certs=true;
|
||||
|
||||
void StreamPeerSSL::load_certs_from_memory(const ByteArray& p_memory) {
|
||||
if (load_certs_func)
|
||||
load_certs_func(p_memory);
|
||||
}
|
||||
|
||||
bool StreamPeerSSL::is_available() {
|
||||
return available;
|
||||
}
|
||||
|
||||
void StreamPeerSSL::_bind_methods() {
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -5,11 +5,23 @@
|
|||
|
||||
class StreamPeerSSL : public StreamPeer {
|
||||
OBJ_TYPE(StreamPeerSSL,StreamPeer);
|
||||
public:
|
||||
|
||||
typedef void (*LoadCertsFromMemory)(const ByteArray& p_certs);
|
||||
protected:
|
||||
static StreamPeerSSL* (*_create)();
|
||||
static void _bind_methods();
|
||||
|
||||
static LoadCertsFromMemory load_certs_func;
|
||||
static bool available;
|
||||
|
||||
|
||||
friend class Main;
|
||||
static bool initialize_certs;
|
||||
|
||||
public:
|
||||
|
||||
|
||||
enum Status {
|
||||
STATUS_DISCONNECTED,
|
||||
STATUS_CONNECTED,
|
||||
|
|
@ -25,6 +37,8 @@ public:
|
|||
|
||||
static StreamPeerSSL* create();
|
||||
|
||||
static void load_certs_from_memory(const ByteArray& p_memory);
|
||||
static bool is_available();
|
||||
|
||||
StreamPeerSSL();
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue