* Fix precedence problem.

PR: 40656
Submitted by: Larry Cipriani <lvc lucent.com>
Reviewed by: rpluem

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

diff --git a/CHANGES b/CHANGES
index 51848538b20536d92e8f94d183187e315e3c7726..3d487026ee83206e8b80353680d569def48cee82 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_mime_magic: Fix precedence problem in if statement. PR 40656.
+     [Larry Cipriani <lvc lucent.com>]
+
   *) mod_cache: Eliminate a bogus error in the log when a filter returns
      AP_FILTER_ERROR. [Niklas Edmundsson <nikke acc.umu.se>]
 

diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c
index edb62e577fd9d050f12b5db56c2969fa44b1c450..cd6279112a620cf4974e478c7372e2b83a7e3d2f 100644 (file)
--- a/modules/metadata/mod_mime_magic.c
+++ b/modules/metadata/mod_mime_magic.c
@@ -935,7 +935,7 @@ static int apprentice(server_rec *s, apr_pool_t *p)
         return -1;
     }
     if ((result = apr_file_open(&f, fname, APR_READ | APR_BUFFERED,
-                                APR_OS_DEFAULT, p) != APR_SUCCESS)) {
+                                APR_OS_DEFAULT, p)) != APR_SUCCESS) {
         ap_log_error(APLOG_MARK, APLOG_ERR, result, s,
                      MODNAME ": can't read magic file %s", fname);
         return -1;