[mapserver-commits] r12992 - trunk/mapserver/mapcache/apache

[svn at osgeo.org]

Author: aboudreault
Date: 2012-01-17 13:20:19 -0800 (Tue, 17 Jan 2012)
New Revision: 12992

Modified:
   trunk/mapserver/mapcache/apache/mod_mapcache.c
Log:
Fixed Windows crash in mapcache apache module

Modified: trunk/mapserver/mapcache/apache/mod_mapcache.c
===================================================================
--- trunk/mapserver/mapcache/apache/mod_mapcache.c	2012-01-17 15:02:31 UTC (rev 12991)
+++ trunk/mapserver/mapcache/apache/mod_mapcache.c	2012-01-17 21:20:19 UTC (rev 12992)
@@ -111,11 +111,13 @@
    ap_log_error(APLOG_MARK, ap_log_level, 0, ctx->server,"%s",msg);
 }
 
-void apache_context_request_log(mapcache_context *c, mapcache_log_level level, char *message, ...) {
+void apache_context_request_log(mapcache_context *c, mapcache_log_level level, char *message, ...) {   
    mapcache_context_apache_request *ctx = (mapcache_context_apache_request*)c;
    va_list args;
+   char *res;
    int ap_log_level;
    va_start(args,message);
+   res = apr_pvsprintf(c->pool, message, args);
    va_end(args);
    switch(level) {
       case MAPCACHE_DEBUG:
@@ -145,7 +147,7 @@
       default:
          ap_log_level = APLOG_WARNING;
    }
-   ap_log_rerror(APLOG_MARK, ap_log_level, 0, ctx->request, "%s", apr_pvsprintf(c->pool,message,args));
+   ap_log_rerror(APLOG_MARK, ap_log_level, 0, ctx->request, "%s", res);
 }
 
 mapcache_context *mapcache_context_request_clone(mapcache_context *ctx) {