Commit 942931ca authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

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
parent 5962e984

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                        -*- 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 


































modules/metadata/mod_mime_magic.c



+1
−1



























Changes for modules/metadata/mod_mime_magic.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -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;