From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 10 Sep 2001 04:21:40 +0000 (+0000)
Subject:   I don't seriously expect this solves the segfault ... but it does make
X-Git-Tag: 2.0.26~279
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cf6e24fb023834ae402a3789a109015bc6b39fd;p=apache

  I don't seriously expect this solves the segfault ... but it does make
  the code more legible, and protects particularly ugly unset values.


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

diff --git a/modules/ssl/mod_ssl.h b/modules/ssl/mod_ssl.h
index 4bdeb65942..4ec3286e1b 100644
--- a/modules/ssl/mod_ssl.h
+++ b/modules/ssl/mod_ssl.h
@@ -188,7 +188,7 @@
 
 #define strIsEmpty(s)    (s == NULL || s[0] == NUL)
 
-#define cfgMerge(el,unset)  new->el = add->el == unset ? base->el : add->el
+#define cfgMerge(el,unset)  new->el = (add->el == (unset)) ? base->el : add->el
 #define cfgMergeArray(el)   new->el = apr_array_append(p, add->el, base->el)
 #define cfgMergeTable(el)   new->el = apr_table_overlay(p, add->el, base->el)
 #define cfgMergeCtx(el)     new->el = apr_table_overlay(p, add->el, base->el)