Skip to content

Commit 99436ca

Browse files
authored
Merge pull request #114 from hhxsv5/master
support custom HTTP configuration
2 parents 947cf9d + c767a5f commit 99436ca

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/Api.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ abstract class Api
1616
/**
1717
* @var string SDK Version
1818
*/
19-
const VERSION = '1.1.22';
19+
const VERSION = '1.1.23';
2020

2121
/**
2222
* @var string SDK update date
2323
*/
24-
const UPDATE_DATE = '2021.08.02';
24+
const UPDATE_DATE = '2021.10.25';
2525

2626
/**
2727
* @var string

src/Http/GuzzleHttp.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public function request(Request $request, $timeout = 30)
4242
}
4343

4444
$config = [
45-
'base_uri' => $request->getBaseUri(),
46-
'timeout' => $timeout,
47-
'connect_timeout' => 30,
48-
'http_errors' => false,
49-
'verify' => empty($this->config['skipVerifyTls']),
50-
];
45+
'base_uri' => $request->getBaseUri(),
46+
'timeout' => $timeout,
47+
'connect_timeout' => 30,
48+
'http_errors' => false,
49+
'verify' => isset($this->config['verify']) ? $this->config['verify'] : empty($this->config['skipVerifyTls']),
50+
] + $this->config;
5151
$client = static::getClient($config);
5252
$options = [
5353
'headers' => $request->getHeaders(),

src/Http/SwooleHttp.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ public function request(Request $request, $timeout = 30)
5151
}
5252

5353
$config = [
54-
'base_uri' => $request->getBaseUri(),
55-
'timeout' => $timeout,
56-
'use_pool' => true,
57-
'ssl_verify_peer' => empty($this->config['skipVerifyTls']),
58-
];
54+
'base_uri' => $request->getBaseUri(),
55+
'timeout' => $timeout,
56+
'use_pool' => true,
57+
'ssl_verify_peer' => isset($this->config['ssl_verify_peer']) ? $this->config['ssl_verify_peer'] : empty($this->config['skipVerifyTls']),
58+
] + $this->config;
5959
$client = static::getClient($config);
6060
$options['headers'] = $request->getHeaders();
6161

0 commit comments

Comments
 (0)