diff options
| author | Stefan Eissing <icing@apache.org> | 2017-12-12 10:11:41 +0100 |
|---|---|---|
| committer | Stefan Eissing <icing@apache.org> | 2017-12-12 10:11:41 +0100 |
| commit | a7318563b9124ed2d530fea4f685d00020a5f604 (patch) | |
| tree | 968b931673e358d9826524c79e2db5551bbf9b70 /modules/ssl/ssl_engine_config.c | |
| parent | documentation rebuild (diff) | |
| download | apache2-a7318563b9124ed2d530fea4f685d00020a5f604.tar.xz apache2-a7318563b9124ed2d530fea4f685d00020a5f604.zip | |
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
Diffstat (limited to 'modules/ssl/ssl_engine_config.c')
| -rw-r--r-- | modules/ssl/ssl_engine_config.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c index 12f8d2bcc7..66bb74aeec 100644 --- 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) |