You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2017/12/12 09:11:41 UTC
svn commit: r1817894 - /httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
Author: icing
Date: Tue Dec 12 09:11:41 2017
New Revision: 1817894
URL: http://svn.apache.org/viewvc?rev=1817894&view=rev
Log:
On the trunk:
mod_ssl: fixed orphaned code path in ssl policy lookup after review by rainer
Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_config.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_config.c?rev=1817894&r1=1817893&r2=1817894&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_config.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_config.c Tue Dec 12 09:11:41 2017
@@ -636,13 +636,7 @@ static apr_array_header_t *get_policy_na
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)