Merge pull request #557 from magento-extensibility/redis-session-adapter-3

[Extensibility] Port Redis session adapter to Magento 2.0.6

Author: monkeysee

.htaccess

@@ -4,6 +4,12 @@
 
 #   SetEnv MAGE_MODE developer
 
+############################################
+## overrides default umask value to allow using different
+## file permissions
+
+#   SetEnv MAGE_UMASK 022
+
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name

.htaccess.sample

@@ -3,6 +3,12 @@
 
 #   SetEnv MAGE_MODE developer
 
+############################################
+## overrides default umask value to allow using different
+## file permissions
+
+#   SetEnv MAGE_UMASK 022
+
 ############################################
 ## uncomment these lines for CGI mode
 ## make sure to specify the correct cgi php binary file name

app/bootstrap.php

@@ -9,7 +9,10 @@
  */
 error_reporting(E_ALL);
 #ini_set('display_errors', 1);
-umask(0);
+
+/* Custom umask value may be provided in MAGE_UMASK environment variable */
+$mask = isset($_SERVER['MAGE_UMASK']) ? octdec($_SERVER['MAGE_UMASK']) : 002;
+umask($mask);
 
 /* PHP version validation */
 if (version_compare(phpversion(), '5.5.0', '<') === true) {

app/code/Magento/Backend/Model/Session/AdminConfig.php

@@ -14,8 +14,6 @@
 
 /**
  * Magento Backend session configuration
- *
- * @method Config setSaveHandler()
  */
 class AdminConfig extends Config
 {

app/code/Magento/Backup/Model/Fs/Collection.php

@@ -91,7 +91,6 @@ protected function _hideBackupsForApache()
         $filename = '.htaccess';
         if (!$this->_varDirectory->isFile($filename)) {
             $this->_varDirectory->writeFile($filename, 'deny from all');
-            $this->_varDirectory->changePermissions($filename, 0640);
         }
     }
 

app/code/Magento/Captcha/Helper/Data.php

@@ -150,8 +150,6 @@ public function getImgDir($website = null)
         $mediaDir = $this->_filesystem->getDirectoryWrite(DirectoryList::MEDIA);
         $captchaDir = '/captcha/' . $this->_getWebsiteCode($website);
         $mediaDir->create($captchaDir);
-        $mediaDir->changePermissions($captchaDir, DriverInterface::WRITEABLE_DIRECTORY_MODE);
-
         return $mediaDir->getAbsolutePath($captchaDir) . '/';
     }
 

app/code/Magento/Catalog/Model/Product/Attribute/Backend/AbstractMedia.php

@@ -170,9 +170,7 @@ public function addImage(
                 $storageHelper->saveFile($this->mediaConfig->getTmpMediaShortUrl($fileName));
             } else {
                 $this->mediaDirectory->copyFile($file, $destinationFile);
-
                 $storageHelper->saveFile($this->mediaConfig->getTmpMediaShortUrl($fileName));
-                $this->mediaDirectory->changePermissions($destinationFile, DriverInterface::WRITEABLE_FILE_MODE);
             }
         } catch (\Exception $e) {
             throw new LocalizedException(__('We couldn\'t move this file: %1.', $e->getMessage()));

app/code/Magento/Deploy/Model/Filesystem.php

@@ -18,11 +18,15 @@ class Filesystem
 {
     /**
      * File access permissions
+     *
+     * @deprecated
      */
     const PERMISSIONS_FILE = 0640;
 
     /**
      * Directory access permissions
+     *
+     * @deprecated
      */
     const PERMISSIONS_DIR = 0750;
 
@@ -107,19 +111,11 @@ public function regenerateStatic(
                 DirectoryList::TMP_MATERIALIZATION_DIR
             ]
         );
-        $this->changePermissions(
-            [
-                DirectoryList::STATIC_VIEW
-            ],
-            self::PERMISSIONS_DIR,
-            self::PERMISSIONS_DIR
-        );
 
         // Trigger static assets compilation and deployment
         $this->deployStaticContent($output);
         // Trigger code generation
         $this->compile($output);
-        $this->lockStaticResources();
     }
 
     /**
@@ -215,6 +211,8 @@ public function cleanupFilesystem($directoryCodeList)
      * @param int $dirPermissions
      * @param int $filePermissions
      * @return void
+     *
+     * @deprecated
      */
     protected function changePermissions($directoryCodeList, $dirPermissions, $filePermissions)
     {
@@ -233,6 +231,8 @@ protected function changePermissions($directoryCodeList, $dirPermissions, $fileP
      * Chenge permissions on static resources
      *
      * @return void
+     *
+     * @deprecated
      */
     public function lockStaticResources()
     {

app/code/Magento/Deploy/Model/Mode.php

@@ -92,7 +92,6 @@ public function enableProductionMode()
      */
     public function enableProductionModeMinimal()
     {
-        $this->filesystem->lockStaticResources();
         $this->setStoreMode(State::MODE_PRODUCTION);
     }
 

app/code/Magento/PageCache/Model/Cache/Server.php

@@ -5,16 +5,17 @@
  */
 namespace Magento\PageCache\Model\Cache;
 
-use Zend\Uri\Uri;
+use Magento\Framework\UrlInterface;
 use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants;
 use Magento\Framework\App\RequestInterface;
+use Zend\Uri\Uri;
 use Zend\Uri\UriFactory;
 
 class Server
 {
     /**
-     * @var \Magento\Framework\UrlInterface
+     * @var UrlInterface
      */
     protected $urlBuilder;
 
@@ -33,12 +34,12 @@ class Server
     /**
      * Constructor
      *
-     * @param \Magento\Framework\UrlInterface $urlBuilder
+     * @param UrlInterface $urlBuilder
      * @param DeploymentConfig $config
      * @param RequestInterface $request
      */
     public function __construct(
-        \Magento\Framework\UrlInterface $urlBuilder,
+        UrlInterface $urlBuilder,
         DeploymentConfig $config,
         RequestInterface $request
     ) {
@@ -56,21 +57,25 @@ public function getUris()
     {
         $servers = [];
         $configuredHosts = $this->config->get(ConfigOptionsListConstants::CONFIG_PATH_CACHE_HOSTS);
-        if (null == $configuredHosts) {
-            $httpHost = $this->request->getHttpHost();
-            $servers[] = $httpHost ?
-                UriFactory::factory('')->setHost($httpHost)->setPort(self::DEFAULT_PORT)->setScheme('http') :
-                UriFactory::factory($this->urlBuilder->getUrl('*', ['_nosid' => true])) // Don't use SID in building URL
-                    ->setScheme('http')
-                    ->setPath(null)
-                    ->setQuery(null);
 
-        } else {
+        if (is_array($configuredHosts)) {
             foreach ($configuredHosts as $host) {
-                $servers[] = UriFactory::factory('')->setHost($host['host'])
-                    ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT)
-                    ->setScheme('http');
+                $servers[] = UriFactory::factory('')
+                    ->setHost($host['host'])
+                    ->setPort(isset($host['port']) ? $host['port'] : self::DEFAULT_PORT);
             }
+        } elseif ($this->request->getHttpHost()) {
+            $servers[] = UriFactory::factory('')
+                ->setHost($this->request->getHttpHost())
+                ->setPort(self::DEFAULT_PORT);
+        } else {
+            $servers[] = UriFactory::factory($this->urlBuilder->getUrl('*', ['_nosid' => true]));
+        }
+
+        foreach (array_keys($servers) as $key) {
+            $servers[$key]->setScheme('http')
+                ->setPath('/')
+                ->setQuery(null);
         }
         return $servers;
     }