Maj Library

5 files changed, 16 insertions, 3 deletions

diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
index e8d9388..1091899 100644
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php
@@ -265,6 +265,9 @@ class CurlFactory implements CurlFactoryInterface
                 $this->removeHeader('Content-Length', $conf);
             }
             $body = $request->getBody();
+            if ($body->isSeekable()) {
+                $body->rewind();
+            }
             $conf[CURLOPT_READFUNCTION] = function ($ch, $fd, $length) use ($body) {
                 return $body->read($length);
             };
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
index 417850b..945d06e 100644
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/CurlMultiHandler.php
@@ -192,6 +192,6 @@ class CurlMultiHandler
             }
         }
 
-        return max(0, $currentTime - $nextTime);
+        return max(0, $nextTime - $currentTime) * 1000000;
     }
 }
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php b/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
index c4b927e..7754e91 100644
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/EasyHandle.php
@@ -56,8 +56,13 @@ final class EasyHandle
         if (!empty($this->options['decode_content'])
             && isset($normalizedKeys['content-encoding'])
         ) {
+            $headers['x-encoded-content-encoding']
+                = $headers[$normalizedKeys['content-encoding']];
             unset($headers[$normalizedKeys['content-encoding']]);
             if (isset($normalizedKeys['content-length'])) {
+                $headers['x-encoded-content-length']
+                    = $headers[$normalizedKeys['content-length']];
+
                 $bodyLength = (int) $this->sink->getSize();
                 if ($bodyLength) {
                     $headers[$normalizedKeys['content-length']] = $bodyLength;
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
index cd7898f..0658769 100644
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/MockHandler.php
@@ -74,7 +74,7 @@ class MockHandler implements \Countable
         $response = array_shift($this->queue);
 
         if (is_callable($response)) {
-            $response = $response($request, $options);
+            $response = call_user_func($response, $request, $options);
         }
 
         $response = $response instanceof \Exception
diff --git a/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php b/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
index c835dc7..9f9c05f 100644
--- a/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
+++ b/server/vendor/guzzlehttp/guzzle/src/Handler/StreamHandler.php
@@ -138,7 +138,7 @@ class StreamHandler
             : fopen('php://temp', 'r+');
 
         return is_string($sink)
-            ? new Psr7\Stream(Psr7\try_fopen($sink, 'r+'))
+            ? new Psr7\LazyOpenStream($sink, 'w+')
             : Psr7\stream_for($sink);
     }
 
@@ -153,10 +153,15 @@ class StreamHandler
                     $stream = new Psr7\InflateStream(
                         Psr7\stream_for($stream)
                     );
+                    $headers['x-encoded-content-encoding']
+                        = $headers[$normalizedKeys['content-encoding']];
                     // Remove content-encoding header
                     unset($headers[$normalizedKeys['content-encoding']]);
                     // Fix content-length header
                     if (isset($normalizedKeys['content-length'])) {
+                        $headers['x-encoded-content-length']
+                            = $headers[$normalizedKeys['content-length']];
+
                         $length = (int) $stream->getSize();
                         if ($length == 0) {
                             unset($headers[$normalizedKeys['content-length']]);