[mms] Use more efficient FNV1-32 hashing algorithm for internal hasht…

…able storage, if available.
horde · Feb 12, 2014 · 71f4745 · 71f4745
1 parent bd5f127
commit 71f4745
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -704,7 +704,10 @@ abstract protected function _noop();
     public function getNamespaces(array $additional = array())
     {
         $additional = array_map('strval', $additional);
-        $sig = hash('sha1', serialize($additional));
+        $sig = hash(
+            (PHP_MINOR_VERSION >= 4) ? 'fnv132' : 'sha1',
+            json_encode($additional)
+        );
 
         if (isset($this->_init['namespace'][$sig])) {
             return $this->_init['namespace'][$sig];
@@ -2709,7 +2712,10 @@ private function _fetchWrapper($mailbox, $query, $options)
                         if (!empty($val['cache']) && !empty($val['peek'])) {
                             $cache_array[$k] = $v;
                             ksort($val);
-                            $header_cache[$key] = hash('sha1', serialize($val));
+                            $header_cache[$key] = hash(
+                                (PHP_MINOR_VERSION >= 4) ? 'fnv132' : 'sha1',
+                                serialize($val)
+                            );
                         }
                     }
                     break;

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Query.php b/framework/Imap_Client/lib/Horde/Imap/Client/Fetch/Query.php
@@ -292,7 +292,10 @@ public function remove($criteria, $key)
      */
     public function hash()
     {
-        return hash('sha1', serialize($this));
+        return hash(
+            (PHP_MINOR_VERSION >= 4) ? 'fnv132' : 'sha1',
+            serialize($this)
+        );
     }
 
     /* ArrayAccess methods. */

diff --git a/framework/Imap_Client/package.xml b/framework/Imap_Client/package.xml
@@ -21,6 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
+* [mms] Use more efficient FNV1-32 hashing algorithm for internal hashtable storage, if available.
 * [jan] Make SQL cache backend compatible with Oracle.
 * [mms] Optimizations to IMAP tokenizer.
  </notes>
@@ -2166,6 +2167,7 @@
    <date>2014-02-11</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
+* [mms] Use more efficient FNV1-32 hashing algorithm for internal hashtable storage, if available.
 * [jan] Make SQL cache backend compatible with Oracle.
 * [mms] Optimizations to IMAP tokenizer.
    </notes>