Fold in possible use of FNV if desired

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@998949 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index 30459a9f43086291c9a73bc5c603c160dcaaccac..95b3a85c04411901bb0aa48f9be037b62af50ebb 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -810,7 +810,7 @@ ap_proxy_buckets_lifetime_transform(request_rec *r, apr_bucket_brigade *from,
  * @return        hash as unsigned int
  */
 
-typedef enum { PROXY_HASHFUNC_PROXY, PROXY_HASHFUNC_APR } proxy_hash_t;
+typedef enum { PROXY_HASHFUNC_DEFAULT, PROXY_HASHFUNC_APR,  PROXY_HASHFUNC_FNV } proxy_hash_t;
 
 PROXY_DECLARE(unsigned int)
 ap_proxy_hashfunc(const char *str, proxy_hash_t method);

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index b4f977ee993c1ddb654c346c8a809a2a0c83a905..9bccc0ac3beb0b23b6008f2f90a1f4f9f211e8ec 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1481,7 +1481,7 @@ PROXY_DECLARE(const char *) ap_proxy_add_worker_wid(proxy_worker **worker,
     (*worker)->flush_packets = flush_off;
     (*worker)->flush_wait = PROXY_FLUSH_WAIT;
     (*worker)->smax = -1;
-    (*worker)->our_hash = ap_proxy_hashfunc((*worker)->name, PROXY_HASHFUNC_PROXY);
+    (*worker)->our_hash = ap_proxy_hashfunc((*worker)->name, PROXY_HASHFUNC_DEFAULT);
     (*worker)->apr_hash = ap_proxy_hashfunc((*worker)->name, PROXY_HASHFUNC_APR);
     (*worker)->cp = NULL;
     (*worker)->mutex = NULL;
@@ -2766,10 +2766,10 @@ ap_proxy_buckets_lifetime_transform(request_rec *r, apr_bucket_brigade *from,
 
 /*
  * Provide a string hashing function for the proxy.
- * We offer 2 method: one is the APR model but we
- * also provide our own, based on SDBM. The reason
- * is in case we want to use both to ensure no
- * collisions
+ * We offer 2 methods: one is the APR model but we
+ * also provide our own, based on either FNV or SDBM.
+ * The reason is in case we want to use both to ensure no
+ * collisions.
  */
 PROXY_DECLARE(unsigned int)
 ap_proxy_hashfunc(const char *str, proxy_hash_t method)
@@ -2777,13 +2777,21 @@ ap_proxy_hashfunc(const char *str, proxy_hash_t method)
     if (method == PROXY_HASHFUNC_APR) {
         apr_ssize_t slen = strlen(str);
         return apr_hashfunc_default(str, &slen);
-    } else {
+    } else if (method == PROXY_HASHFUNC_FNV) {
+        /* FNV model */
+        unsigned int hash;
+        const unsigned int fnv_prime = 0x811C9DC5;
+        for (hash = 0; *str; str++) {
+            hash *= fnv_prime;
+            hash ^= (*str);
+        }
+        return hash;
+    } else { /* method == PROXY_HASHFUNC_DEFAULT */
         /* SDBM model */
         unsigned int hash;
-        for(hash = 0; *str; str++) {
+        for (hash = 0; *str; str++) {
             hash = (*str) + (hash << 6) + (hash << 16) - hash;
         }
         return hash;
     }
-    
 }