On the trunk:

mod_ssl: fixed orphaned code path in ssl policy lookup after review by rpluem

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

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 12f8d2bcc7884b0be6e3ae090e70ea027e328af7..66bb74aeec818d9223df9c351218cf02044f96ce 100644 (file)
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -636,13 +636,7 @@ static apr_array_header_t *get_policy_names(apr_pool_t *p, int create)
 SSLPolicyRec *ssl_policy_lookup(apr_pool_t *pool, const char *name)
 {
     apr_hash_t *policies = get_policies(pool, 1);
-    if (policies) {
-        return apr_hash_get(policies, name, APR_HASH_KEY_STRING);
-    }
-    else if ((pool = apr_pool_parent_get(pool))) {
-        return ssl_policy_lookup(pool, name);
-    }
-    return NULL;
+    return apr_hash_get(policies, name, APR_HASH_KEY_STRING);
 }
 
 static void ssl_policy_set(apr_pool_t *pool, SSLPolicyRec *policy)