From 948c4284cb23f2a80d41a4c6aca553c4edf2dc46 Mon Sep 17 00:00:00 2001
From: Doug MacEachern <dougm@apache.org>
Date: Tue, 26 Mar 2002 15:42:21 +0000
Subject: [PATCH] performance enhancement: mod_ssl config directives that can
 have both a per-server and per-dir context were configuring the per-dir
 context for per-server commands.  this triggered ssl_hook_Access to always
 compare the per-server context against per-dir configs that were exactly the
 same.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94176 13f79535-47bb-0310-9956-ffa450edef68
---
 modules/ssl/ssl_engine_config.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/ssl/ssl_engine_config.c b/modules/ssl/ssl_engine_config.c
index 86ac10b8e2..d7b3ac6092 100644
--- a/modules/ssl/ssl_engine_config.c
+++ b/modules/ssl/ssl_engine_config.c
@@ -525,11 +525,11 @@ const char *ssl_cmd_SSLCipherSuite(cmd_parms *cmd, void *ctx,
     SSLSrvConfigRec *sc = mySrvConfig(cmd->server);
     SSLDirConfigRec *dc = (SSLDirConfigRec *)ctx;
 
-    if (!(cmd->path || dc)) {
-        sc->szCipherSuite = arg;
+    if (cmd->path) {
+        dc->szCipherSuite = (char *)arg;
     }
     else {
-        dc->szCipherSuite = (char *)arg;
+        sc->szCipherSuite = arg;
     }
 
     return NULL;
@@ -676,11 +676,11 @@ const char *ssl_cmd_SSLCACertificatePath(cmd_parms *cmd, void *ctx,
     }
 
 #ifdef SSL_EXPERIMENTAL_PERDIRCA
-    if (!(cmd->path || dc)) {
-        sc->szCACertificatePath = arg;
+    if (cmd->path) {
+        dc->szCACertificatePath = arg;
     }
     else {
-        dc->szCACertificatePath = arg;
+        sc->szCACertificatePath = arg;
     }
 #else
     sc->szCACertificatePath = arg;
@@ -703,11 +703,11 @@ const char *ssl_cmd_SSLCACertificateFile(cmd_parms *cmd, void *ctx,
     }
 
 #ifdef SSL_EXPERIMENTAL_PERDIRCA
-    if (!(cmd->path || dc)) {
-        sc->szCACertificateFile = arg;
+    if (cmd->path) {
+        dc->szCACertificateFile = arg;
     }
     else {
-        dc->szCACertificateFile = arg;
+        sc->szCACertificateFile = arg;
     }
 #else
     sc->szCACertificateFile = arg;
@@ -783,11 +783,11 @@ const char *ssl_cmd_SSLVerifyClient(cmd_parms *cmd, void *ctx,
         return err;
     }
     
-    if (!(cmd->path || dc)) {
-        sc->nVerifyClient = id;
+    if (cmd->path) {
+        dc->nVerifyClient = id;
     }
     else {
-        dc->nVerifyClient = id;
+        sc->nVerifyClient = id;
     }
 
     return NULL;
@@ -818,11 +818,11 @@ const char *ssl_cmd_SSLVerifyDepth(cmd_parms *cmd, void *ctx,
         return err;
     }
 
-    if (!(cmd->path || dc)) {
-        sc->nVerifyDepth = depth;
+    if (cmd->path) {
+        dc->nVerifyDepth = depth;
     }
     else {
-        dc->nVerifyDepth = depth;
+        sc->nVerifyDepth = depth;
     }
 
     return NULL;
-- 
2.40.0