Merge branch '9298fileGetContentTimeoutError' into 'master'

refs #9298 fix timeout of file_get_contents

See merge request !184

extension/Classes/Core/Helper/DownloadPage.php

@@ -52,19 +52,19 @@ class DownloadPage {
                 "verify_peer" => false,
                 "verify_peer_name" => false,
             ),
+            'http' => array(
+                'timeout' => 1200,
+            ),
         );
 
         if (isset($_COOKIE[SESSION_NAME])) {
-            $cookie = array(
+            $cookie_http = array(
                 // Copy cookie: to forward current QFQ user session
-                'http' => array(
-                    'method' => "GET",
-                    'header' => "Accept-language: en\r\n" .
-                        "Cookie: " . SESSION_NAME . "=" . $_COOKIE[SESSION_NAME] . "\r\n",
-                    'timeout' => 600,
-                ),
+                'method' => "GET",
+                'header' => "Accept-language: en\r\n" .
+                    "Cookie: " . SESSION_NAME . "=" . $_COOKIE[SESSION_NAME] . "\r\n",
             );
-            $ctx = array_merge($ctx,$cookie);
+            $ctx['http'] = array_merge($ctx['http'],$cookie_http);
         }
 
         // The current session needs to be closed, cause the SESSION needs to be opened again by processing get_file_contents()