Author: rpluem
Date: Tue Oct 3 05:47:35 2006
New Revision: 452459
URL: http://svn.apache.org/viewvc?view=rev&rev=452459
Log:
Merge r452212 from trunk:
* Fix precedence problem.
PR: 40656
Submitted by: Larry Cipriani <lvc lucent.com>
Reviewed by: rpluem, niq, trawick
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?view=diff&rev=452459&r1=452458&r2=452459
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Oct 3 05:47:35 2006
@@ -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 @@
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]
Modified: httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c?view=diff&rev=452459&r1=452458&r2=452459
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c (original)
+++ httpd/httpd/branches/2.2.x/modules/metadata/mod_mime_magic.c Tue Oct 3 05:47:35 2006
@@ -935,7 +935,7 @@
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;
|