From: Jeff Trawick <trawick@apache.org>
Date: Fri, 10 May 2002 10:56:43 +0000 (+0000)
Subject: fix a build failure with some non-gcc compilers...
X-Git-Tag: 2.0.37~438
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20dd15e4d1e03654abef266b4690fe824f981bec;p=apache

fix a build failure with some non-gcc compilers...

an example message: "The ":" operator is not allowed between
"const char*" and "int"."


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

diff --git a/modules/metadata/mod_setenvif.c b/modules/metadata/mod_setenvif.c
index f10f94bd34..e810394612 100644
--- a/modules/metadata/mod_setenvif.c
+++ b/modules/metadata/mod_setenvif.c
@@ -564,7 +564,7 @@ static int match_headers(request_rec *r)
             val_len = 0;
         }
 
-        if (b->pattern ? apr_strmatch(b->pattern, val, val_len) :
+        if ((b->pattern && apr_strmatch(b->pattern, val, val_len)) ||
             !ap_regexec(b->preg, val, 0, NULL, 0)) {
 	    const apr_array_header_t *arr = apr_table_elts(b->features);
             elts = (const apr_table_entry_t *) arr->elts;