Merge r452212 from trunk:

* Fix precedence problem.

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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@452459 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ad25eee08629f1790c15dac39fb50f828738e0ba..ca72796f135873ee0660a10d0b92e6df07b791c3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.4
 
+  *) mod_mime_magic: Fix precedence problem in if statement. PR 40656.
+     [Larry Cipriani <lvc lucent.com>]
+
   *) The full server version information is now included in the error log at
      startup as well as server status reports, irrespective of the setting
      of the ServerTokens directive.  ap_get_server_version() is now 
@@ -30,7 +33,7 @@ Changes with Apache 2.2.3
      handling.  For some RewriteRules this could lead to a pointer being
      written out of bounds.  Reported by Mark Dowd of McAfee.
      [Mark Cox]
-  
+
   *) Win32: Minor fixes to build more cleanly under Visual Studio 2005
      with command line builds.  [William Rowe]
 

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;