summaryrefslogtreecommitdiff
path: root/server/vendor/guzzlehttp/guzzle/src/Client.php
diff options
context:
space:
mode:
authormanzerbredes <loic.guegan_secondary@yahoo.fr>2016-03-28 12:17:43 +0200
committermanzerbredes <loic.guegan_secondary@yahoo.fr>2016-03-28 12:17:43 +0200
commit53f65de9d4163c9c095f2b8e87baca648c3645bd (patch)
tree37f167f38b25aa50bd7dd1429438c0245a280a28 /server/vendor/guzzlehttp/guzzle/src/Client.php
parent60cfe3ebc039df8d6a468a43a59e7fd8c2a16956 (diff)
parent804fa322d841d73ee7592885ec500dc94e91b9e6 (diff)
Test
Diffstat (limited to 'server/vendor/guzzlehttp/guzzle/src/Client.php')
-rwxr-xr-xserver/vendor/guzzlehttp/guzzle/src/Client.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/server/vendor/guzzlehttp/guzzle/src/Client.php b/server/vendor/guzzlehttp/guzzle/src/Client.php
index 2e86ece..9f7b0cf 100755
--- a/server/vendor/guzzlehttp/guzzle/src/Client.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Client.php
@@ -93,7 +93,7 @@ class Client implements ClientInterface
$options = $this->prepareDefaults($options);
return $this->transfer(
- $request->withUri($this->buildUri($request->getUri(), $options)),
+ $request->withUri($this->buildUri($request->getUri(), $options), $request->hasHeader('Host')),
$options
);
}
@@ -173,7 +173,7 @@ class Client implements ClientInterface
$cleanedNoProxy = str_replace(' ', '', $noProxy);
$defaults['proxy']['no'] = explode(',', $cleanedNoProxy);
}
-
+
$this->config = $config + $defaults;
if (!empty($config['cookies']) && $config['cookies'] === true) {
@@ -291,7 +291,7 @@ class Client implements ClientInterface
. 'x-www-form-urlencoded requests, and the multipart '
. 'option to send multipart/form-data requests.');
}
- $options['body'] = http_build_query($options['form_params'], null, '&');
+ $options['body'] = http_build_query($options['form_params'], '', '&');
unset($options['form_params']);
$options['_conditional']['Content-Type'] = 'application/x-www-form-urlencoded';
}
@@ -357,7 +357,8 @@ class Client implements ClientInterface
}
if (isset($options['json'])) {
- $modify['body'] = Psr7\stream_for(json_encode($options['json']));
+ $jsonStr = \GuzzleHttp\json_encode($options['json']);
+ $modify['body'] = Psr7\stream_for($jsonStr);
$options['_conditional']['Content-Type'] = 'application/json';
unset($options['json']);
}