Merge remote-tracking branch 'upstream/develop' into 4.4

Author: kenjis

system/HTTP/DownloadResponse.php

@@ -227,9 +227,8 @@ public function setContentType(string $mime, string $charset = 'UTF-8')
      */
     public function noCache(): self
     {
-        $this->removeHeader('Cache-control');
-
-        $this->setHeader('Cache-control', ['private', 'no-transform', 'no-store', 'must-revalidate']);
+        $this->removeHeader('Cache-Control');
+        $this->setHeader('Cache-Control', ['private', 'no-transform', 'no-store', 'must-revalidate']);
 
         return $this;
     }

system/HTTP/ResponseTrait.php

@@ -345,8 +345,8 @@ protected function formatBody($body, string $format)
      */
     public function noCache()
     {
-        $this->removeHeader('Cache-control');
-        $this->setHeader('Cache-control', ['no-store', 'max-age=0', 'no-cache']);
+        $this->removeHeader('Cache-Control');
+        $this->setHeader('Cache-Control', ['no-store', 'max-age=0', 'no-cache']);
 
         return $this;
     }
@@ -399,7 +399,7 @@ public function setCache(array $options = [])
             unset($options['last-modified']);
         }
 
-        $this->setHeader('Cache-control', $options);
+        $this->setHeader('Cache-Control', $options);
 
         return $this;
     }

tests/system/HTTP/CURLRequestDoNotShareOptionsTest.php

@@ -759,14 +759,14 @@ public function testSendContinuedWithManyHeaders()
 Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/
 Content-Type: application/xml; charset=utf-8
 Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Update success! config</title>";
-
         $request->setOutput($output);
+
         $response = $request->get('answer');
 
         $this->assertSame('<title>Update success! config</title>', $response->getBody());
 
         $responseHeaderKeys = [
-            'Cache-control',
+            'Cache-Control',
             'Content-Type',
             'Server',
             'Connection',

tests/system/HTTP/CURLRequestTest.php

@@ -742,14 +742,14 @@ public function testSendContinuedWithManyHeaders()
 Set-Cookie: PHPSESSID=80pd3hlg38mvjnelpvokp9lad0; path=/
 Content-Type: application/xml; charset=utf-8
 Transfer-Encoding: chunked\x0d\x0a\x0d\x0a<title>Update success! config</title>";
-
         $request->setOutput($output);
+
         $response = $request->get('answer');
 
         $this->assertSame('<title>Update success! config</title>', $response->getBody());
 
         $responseHeaderKeys = [
-            'Cache-control',
+            'Cache-Control',
             'Content-Type',
             'Server',
             'Connection',