|
@@ -951,9 +951,9 @@ |
|
|
block discarded – undo |
|
951
|
951
|
} |
|
952
|
952
|
|
|
953
|
953
|
protected function prepareCurlHandle($req, $server, $port, $timeout = 0, $username = '', $password = '', |
|
954
|
|
- $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
|
955
|
|
- $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '', |
|
956
|
|
- $keyPass = '', $sslVersion = 0) |
|
|
954
|
+ $authType = 1, $cert = '', $certPass = '', $caCert = '', $caCertDir = '', $proxyHost = '', $proxyPort = 0, |
|
|
955
|
+ $proxyUsername = '', $proxyPassword = '', $proxyAuthType = 1, $method = 'https', $keepAlive = false, $key = '', |
|
|
956
|
+ $keyPass = '', $sslVersion = 0) |
|
957
|
957
|
{ |
|
958
|
958
|
if ($port == 0) { |
|
959
|
959
|
if (in_array($method, array('http', 'http10', 'http11', 'h2c'))) { |
Please login to merge, or discard this patch.