Merge remote-tracking branch 'origin/MAGETWO-95732' into 2.1.16-develop-pr59

Author: zakdma

nginx.conf.sample

@@ -43,6 +43,8 @@ location ~* ^/setup($|/) {
     root $MAGE_ROOT;
     location ~ ^/setup/index.php {
         fastcgi_pass   fastcgi_backend;
+        fastcgi_read_timeout 600s;
+        fastcgi_connect_timeout 600s;
         fastcgi_index  index.php;
         fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
         include        fastcgi_params;
@@ -64,6 +66,8 @@ location ~* ^/update($|/) {
     location ~ ^/update/index.php {
         fastcgi_split_path_info ^(/update/index.php)(/.+)$;
         fastcgi_pass   fastcgi_backend;
+        fastcgi_read_timeout 600s;
+        fastcgi_connect_timeout 600s;
         fastcgi_index  index.php;
         fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
         fastcgi_param  PATH_INFO        $fastcgi_path_info;