[+]: use "Swift::strtolowerWithStaticCache()" for header-names e.g. "…

…Content-Disposition"
voku · May 28, 2016 · 0498721 · 0498721
1 parent 8011906
commit 0498721
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 17 deletions.
diff --git a/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -103,7 +103,8 @@ public function init()
      */
     public function getReaderFor($charset)
     {
-        $charset = trim(strtolower($charset));
+        $charset = Swift::strtolowerWithStaticCache(trim($charset));
+
         foreach (self::$_map as $pattern => $spec) {
             $re = '/^' . $pattern . '$/D';
             if (preg_match($re, $charset)) {

diff --git a/lib/classes/Swift/Message.php b/lib/classes/Swift/Message.php
@@ -244,7 +244,7 @@ protected function saveMessage()
     protected function saveHeaders(array $altered)
     {
         foreach ($altered as $head) {
-            $lc = strtolower($head);
+            $lc = Swift::strtolowerWithStaticCache($head);
 
             if (!isset($this->savedMessage['headers'][$lc])) {
                 $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);

diff --git a/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -135,7 +135,7 @@ public function createTextHeader($name, $value = null)
     public function createParameterizedHeader($name, $value = null, $params = array())
     {
         $parameterEncoding = null;
-        if (strtolower($name) === 'content-disposition') {
+        if (Swift::strtolowerWithStaticCache($name) === 'content-disposition') {
             $parameterEncoding = $this->_paramEncoder;
         }
 

diff --git a/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -304,7 +304,7 @@ private function _assertOk($response)
     private function _getHostString()
     {
         $host = $this->_host;
-        switch (strtolower($this->_crypto)) {
+        switch (Swift::strtolowerWithStaticCache($this->_crypto)) {
             case 'ssl':
                 $host = 'ssl://' . $host;
                 break;

diff --git a/lib/classes/Swift/Signers/DKIMSigner.php b/lib/classes/Swift/Signers/DKIMSigner.php
@@ -502,7 +502,7 @@ public function getAlteredHeaders()
      */
     public function ignoreHeader($header_name)
     {
-        $this->_ignoredHeaders[strtolower($header_name)] = true;
+        $this->_ignoredHeaders[Swift::strtolowerWithStaticCache($header_name)] = true;
 
         return $this;
     }
@@ -521,7 +521,7 @@ public function setHeaders(Swift_Mime_HeaderSet $headers)
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->_ignoredHeaders[Swift::strtolowerWithStaticCache($hName)])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {

diff --git a/lib/classes/Swift/Signers/DomainKeySigner.php b/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -375,7 +375,7 @@ public function getAlteredHeaders()
      */
     public function ignoreHeader($header_name)
     {
-        $this->_ignoredHeaders[strtolower($header_name)] = true;
+        $this->_ignoredHeaders[Swift::strtolowerWithStaticCache($header_name)] = true;
 
         return $this;
     }
@@ -395,7 +395,7 @@ public function setHeaders(Swift_Mime_HeaderSet $headers)
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->_ignoredHeaders[Swift::strtolowerWithStaticCache($hName)])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {

diff --git a/lib/classes/Swift/Signers/OpenDKIMSigner.php b/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -123,7 +123,7 @@ public function setHeaders(Swift_Mime_HeaderSet $headers)
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->_ignoredHeaders[Swift::strtolowerWithStaticCache($hName)])) {
                 $tmp = $headers->getAll($hName);
                 if ($headers->has($hName)) {
                     foreach ($tmp as $header) {

diff --git a/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -164,15 +164,17 @@ public function setKeywordParams(array $parameters)
      * Runs immediately after a EHLO has been issued.
      *
      * @param Swift_Transport_SmtpAgent $agent to read/write
+     *                                         
+     * @throws Swift_TransportException
      */
     public function afterEhlo(Swift_Transport_SmtpAgent $agent)
     {
         if ($this->_username) {
             $count = 0;
             foreach ($this->_getAuthenticatorsForAgent() as $authenticator) {
                 if (in_array(
-                    strtolower($authenticator->getAuthKeyword()),
-                    array_map('strtolower', $this->_esmtpParams),
+                    Swift::strtolowerWithStaticCache($authenticator->getAuthKeyword()),
+                    array_map(array('Swift', 'strtolowerWithStaticCache'), $this->_esmtpParams),
                     true
                 )) {
                     ++$count;
@@ -181,10 +183,11 @@ public function afterEhlo(Swift_Transport_SmtpAgent $agent)
                     }
                 }
             }
+
             throw new Swift_TransportException(
                 'Failed to authenticate on SMTP server with username "' .
                 $this->_username . '" using ' . $count . ' possible authenticators'
-                );
+            );
         }
     }
 
@@ -250,12 +253,12 @@ public function resetState()
      */
     protected function _getAuthenticatorsForAgent()
     {
-        if (!$mode = strtolower($this->_auth_mode)) {
+        if (!$mode = Swift::strtolowerWithStaticCache($this->_auth_mode)) {
             return $this->_authenticators;
         }
 
         foreach ($this->_authenticators as $authenticator) {
-            if (strtolower($authenticator->getAuthKeyword()) === $mode) {
+            if (Swift::strtolowerWithStaticCache($authenticator->getAuthKeyword()) === $mode) {
                 return array($authenticator);
             }
         }

diff --git a/lib/classes/Swift/Transport/EsmtpTransport.php b/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -140,7 +140,7 @@ public function getTimeout()
      */
     public function setEncryption($encryption)
     {
-        $encryption = strtolower($encryption);
+        $encryption = Swift::strtolowerWithStaticCache($encryption);
 
         if ('tls' === $encryption) {
             $this->_params['protocol'] = 'tcp';
@@ -286,8 +286,8 @@ public function __call($method, $args)
         foreach ($this->_handlers as $handler) {
 
             $inArray = in_array(
-                strtolower($method),
-                array_map('strtolower', (array)$handler->exposeMixinMethods()),
+                Swift::strtolowerWithStaticCache($method),
+                array_map(array('Swift', 'strtolowerWithStaticCache'), (array)$handler->exposeMixinMethods()),
                 true
             );