You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by wr...@apache.org on 2001/09/10 06:21:40 UTC
cvs commit: httpd-2.0/modules/ssl mod_ssl.h
wrowe 01/09/09 21:21:40
Modified: modules/ssl mod_ssl.h
Log:
I don't seriously expect this solves the segfault ... but it does make
the code more legible, and protects particularly ugly unset values.
Revision Changes Path
1.33 +1 -1 httpd-2.0/modules/ssl/mod_ssl.h
Index: mod_ssl.h
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/ssl/mod_ssl.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- mod_ssl.h 2001/08/24 04:08:04 1.32
+++ mod_ssl.h 2001/09/10 04:21:40 1.33
@@ -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)