httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1209742 - in /httpd/httpd/branches/2.4.x: ./ modules/arch/win32/mod_isapi.c
Date Fri, 02 Dec 2011 22:24:20 GMT
Author: sf
Date: Fri Dec  2 22:24:19 2011
New Revision: 1209742

URL: http://svn.apache.org/viewvc?rev=1209742&view=rev
Log:
Merge r1209741:
Fix apr_status_t being passed as loglevel

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec  2 22:24:19 2011
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741

Modified: httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c?rev=1209742&r1=1209741&r2=1209742&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/arch/win32/mod_isapi.c Fri Dec  2 22:24:19 2011
@@ -1702,7 +1702,7 @@ static int isapi_pre_config(apr_pool_t *
     rv = apr_thread_mutex_create(&loaded.lock, APR_THREAD_MUTEX_DEFAULT,
                                  loaded.pool);
     if (rv != APR_SUCCESS) {
-        ap_log_error(APLOG_MARK, rv, 0, NULL,
+        ap_log_error(APLOG_MARK, APLOG_ERR, rv, NULL,
                      "Failed to create module cache lock");
         return rv;
     }



Mime
View raw message