Mercurial > hg > isophonics-drupal-site

diff vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php @ 13:5fb285c0d0e3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update Drupal core to 8.4.7 via Composer. Security update; I *think* we've been lucky to get away with this so far, as we don't support self-registration which seems to be used by the so-called "drupalgeddon 2" attack that 8.4.5 was vulnerable to.
author Chris Cannam
date Mon, 23 Apr 2018 09:33:26 +0100
parents 7a779792577d
children c2387f117808
line wrap: on
line diff
--- a/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php	Fri Feb 23 15:52:07 2018 +0000
+++ b/vendor/zendframework/zend-diactoros/src/ServerRequestFactory.php	Mon Apr 23 09:33:26 2018 +0100
@@ -244,9 +244,7 @@
         ) {
             $scheme = 'https';
         }
-        if (! empty($scheme)) {
-            $uri = $uri->withScheme($scheme);
-        }
+        $uri = $uri->withScheme($scheme);
 
         // Set the host
         $accumulator = (object) ['host' => '', 'port' => null];