Merge branch 'master' into Eole

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;
         }