bitinflow/expose
1
0
Fork 0
mirror of https://github.com/bitinflow/expose.git synced 2026-03-13 21:45:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix http/s protocol headers

Browse Source 
Improve request ids
This commit is contained in:
René Preuß
2021-01-01 16:06:59 +01:00
parent f6d04777e1
commit 6f72d719bf
5 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/Client/Client.php
View File

@@ -45,7 +45,7 @@ class Client
$sharedUrl = $this->prepareSharedUrl($sharedUrl);
foreach ($subdomains as $subdomain) {
$this->connectToServer($sharedUrl, $subdomain, $this->configuration->auth());
$this->connectToServerAndShareHttp($sharedUrl, $subdomain, $this->configuration->auth());
}
}
@@ -61,18 +61,13 @@ class Client
}
$url = Arr::get($parsedUrl, 'host', Arr::get($parsedUrl, 'path'));
$scheme = Arr::get($parsedUrl, 'scheme');
$port = Arr::get($parsedUrl, 'port', $scheme === 'https' ? 443 : 80);
if (Arr::get($parsedUrl, 'scheme') === 'https') {
$url .= ':443';
}
if (! is_null($port = Arr::get($parsedUrl, 'port'))) {
$url .= ":{$port}";
}
return $url;
return sprintf('%s:%s:%s', $scheme, $url, $port);
}
public function connectToServer(string $sharedUrl, $subdomain, $authToken = ''): PromiseInterface
public function connectToServerAndShareHttp(string $sharedUrl, $subdomain, $authToken = ''): PromiseInterface
{
$deferred = new Deferred();
$promise = $deferred->promise();
@@ -93,7 +88,7 @@ class Client
$this->logger->error('Connection to server closed.');
$this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $authToken) {
$this->connectToServer($sharedUrl, $subdomain, $authToken);
$this->connectToServerAndShareHttp($sharedUrl, $subdomain, $authToken);
});
});
@@ -126,7 +121,7 @@ class Client
}, function (\Exception $e) use ($deferred, $sharedUrl, $subdomain, $authToken) {
if ($this->connectionRetries > 0) {
$this->retryConnectionOrExit(function () use ($sharedUrl, $subdomain, $authToken) {
$this->connectToServer($sharedUrl, $subdomain, $authToken);
$this->connectToServerAndShareHttp($sharedUrl, $subdomain, $authToken);
});
return;