create thread mutex even on prefork mpm (MapServer#67)

closes MapServer#67
jmckenna · May 13, 2013 · 7a5d877 · 7a5d877
1 parent 826e5e5
commit 7a5d877
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/apache/mod_mapcache.c b/apache/mod_mapcache.c
@@ -38,7 +38,6 @@
 #include <http_request.h>
 #include <apr_strings.h>
 #include <apr_time.h>
-#include <ap_mpm.h>
 #include <http_log.h>
 #include "mapcache.h"
 #ifdef APR_HAS_THREADS
@@ -252,13 +251,9 @@ static int write_http_response(mapcache_context_apache_request *ctx, mapcache_ht
 
 static void mod_mapcache_child_init(apr_pool_t *pool, server_rec *s)
 {
-  int threaded;
   pchild = pool;
 #ifdef APR_HAS_THREADS
-  ap_mpm_query(AP_MPMQ_IS_THREADED,&threaded);
-  if(threaded) {
-    apr_thread_mutex_create(&thread_mutex,APR_THREAD_MUTEX_DEFAULT,pool);
-  }
+  apr_thread_mutex_create(&thread_mutex,APR_THREAD_MUTEX_DEFAULT,pool);
 #endif
 }
 

diff --git a/lib/core.c b/lib/core.c
@@ -598,7 +598,7 @@ mapcache_http_response* mapcache_core_respond_to_error(mapcache_context *ctx)
 
   msg = ctx->_errmsg;
   if(!msg) {
-    msg = "an unspecified error has occured";
+    msg = apr_pstrdup(ctx->pool,"an unspecified error has occured");
   }
   ctx->log(ctx,MAPCACHE_ERROR,msg);