danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/danog/MadelineProto

Browse Source
This commit is contained in:
Daniil Gentili 2017-12-28 13:12:58 +01:00
commit 27eb6c1a29
No known key found for this signature in database
GPG Key ID: 259900308520B573
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/danog/MadelineProto/Connection.php
View File

@ -157,7 +157,9 @@ class Connection
case 'http': case 'http':
case 'https': case 'https':
$this->parsed = parse_url($ip); $this->parsed = parse_url($ip);
if ($this->parsed['host'][0] === '[') $this->parsed['host'] = substr($this->parsed['host'], 1, -1); if ($this->parsed['host'][0] === '[') {
$this->parsed['host'] = substr($this->parsed['host'], 1, -1);
}
$this->sock = new $proxy($ipv6 ? \AF_INET6 : \AF_INET, \SOCK_STREAM, getprotobyname($this->protocol === 'https' ? 'tls' : 'tcp')); $this->sock = new $proxy($ipv6 ? \AF_INET6 : \AF_INET, \SOCK_STREAM, getprotobyname($this->protocol === 'https' ? 'tls' : 'tcp'));
if ($has_proxy && $this->extra !== []) { if ($has_proxy && $this->extra !== []) {
$this->sock->setExtra($this->extra); $this->sock->setExtra($this->extra);

4
src/danog/MadelineProto/DataCenter.php
View File

@ -100,7 +100,9 @@ class DataCenter
} }
if ($this->settings[$dc_config_number]['protocol'] === 'http') { if ($this->settings[$dc_config_number]['protocol'] === 'http') {
if ($ipv6) $address = '['.$address.']'; if ($ipv6) {
$address = '['.$address.']';
}
$address = $this->settings[$dc_config_number]['protocol'].'://'.$address.'/api'; $address = $this->settings[$dc_config_number]['protocol'].'://'.$address.'/api';
} }
\danog\MadelineProto\Logger::log([sprintf(\danog\MadelineProto\Lang::$current_lang['dc_con_test_start'], $dc_number, $test, $ipv6, $this->settings[$dc_config_number]['protocol'])], \danog\MadelineProto\Logger::VERBOSE); \danog\MadelineProto\Logger::log([sprintf(\danog\MadelineProto\Lang::$current_lang['dc_con_test_start'], $dc_number, $test, $ipv6, $this->settings[$dc_config_number]['protocol'])], \danog\MadelineProto\Logger::VERBOSE);

7
src/danog/MadelineProto/MTProto.php
View File

@ -630,11 +630,14 @@ class MTProto
$socket->new_incoming = []; $socket->new_incoming = [];
} }
} }
public function is_http($datacenter) {
public function is_http($datacenter)
{
return in_array($this->datacenter->sockets[$datacenter]->protocol, ['http', 'https']); return in_array($this->datacenter->sockets[$datacenter]->protocol, ['http', 'https']);
} }
public function close_and_reopen($datacenter) { public function close_and_reopen($datacenter)
{
$this->datacenter->sockets[$datacenter]->close_and_reopen(); $this->datacenter->sockets[$datacenter]->close_and_reopen();
if ($this->is_http($datacenter)) { if ($this->is_http($datacenter)) {
$this->method_call('http_wait', ['max_wait' => 0, 'wait_after' => 0, 'max_delay' => 0], ['datacenter' => $datacenter]); $this->method_call('http_wait', ['max_wait' => 0, 'wait_after' => 0, 'max_delay' => 0], ['datacenter' => $datacenter]);

4
src/danog/MadelineProto/MTProtoTools/AuthKeyHandler.php
View File

@ -553,7 +553,9 @@ trait AuthKeyHandler
if ($res === true) { if ($res === true) {
\danog\MadelineProto\Logger::log(['Successfully binded temporary and permanent authorization keys, DC '.$datacenter], \danog\MadelineProto\Logger::NOTICE); \danog\MadelineProto\Logger::log(['Successfully binded temporary and permanent authorization keys, DC '.$datacenter], \danog\MadelineProto\Logger::NOTICE);
if ($this->is_http($datacenter)) $this->close_and_reopen($datacenter); if ($this->is_http($datacenter)) {
$this->close_and_reopen($datacenter);
}
return true; return true;
} }