summaryrefslogtreecommitdiff
path: root/server/vendor/guzzlehttp/psr7/src/Uri.php
diff options
context:
space:
mode:
authorjosselin <josselin@serverpc.home>2016-01-25 22:08:02 +0100
committerjosselin <josselin@serverpc.home>2016-01-25 22:08:02 +0100
commit81d5c2a6464771c9a180d0214706a2f65f0b1d18 (patch)
tree3bdc7cb4b721a870eb9bab9696326071b1388ce6 /server/vendor/guzzlehttp/psr7/src/Uri.php
parenteac860ce5092c301068725e5743561c598e924f0 (diff)
Added php-opencloud/openstack as SubModule
Diffstat (limited to 'server/vendor/guzzlehttp/psr7/src/Uri.php')
-rw-r--r--server/vendor/guzzlehttp/psr7/src/Uri.php17
1 files changed, 12 insertions, 5 deletions
diff --git a/server/vendor/guzzlehttp/psr7/src/Uri.php b/server/vendor/guzzlehttp/psr7/src/Uri.php
index d428f2e..23fa2a4 100644
--- a/server/vendor/guzzlehttp/psr7/src/Uri.php
+++ b/server/vendor/guzzlehttp/psr7/src/Uri.php
@@ -477,21 +477,28 @@ class Uri implements UriInterface
$uri = '';
if (!empty($scheme)) {
- $uri .= $scheme . '://';
+ $uri .= $scheme . ':';
}
+ $hierPart = '';
+
if (!empty($authority)) {
- $uri .= $authority;
+ if (!empty($scheme)) {
+ $hierPart .= '//';
+ }
+ $hierPart .= $authority;
}
if ($path != null) {
// Add a leading slash if necessary.
- if ($uri && substr($path, 0, 1) !== '/') {
- $uri .= '/';
+ if ($hierPart && substr($path, 0, 1) !== '/') {
+ $hierPart .= '/';
}
- $uri .= $path;
+ $hierPart .= $path;
}
+ $uri .= $hierPart;
+
if ($query != null) {
$uri .= '?' . $query;
}