Make use of save_path for mm file.

Patch by Henning Schmiedehausen <hps@intermeta.de>
Closes bug 14808

diff --git a/ext/session/mod_mm.c b/ext/session/mod_mm.c
index d6f217d9eb5d7e39bfedae8fdc16569d7a5a5f06..0cd684cf61d0f598a81bbbb30a6c366ed28d5d4b 100644 (file)
--- a/ext/session/mod_mm.c
+++ b/ext/session/mod_mm.c
@@ -35,7 +35,7 @@
 # error mm is not thread-safe
 #endif
 
-#define PS_MM_PATH "/tmp/session_mm"
+#define PS_MM_FILE "session_mm"
 
 /* For php_uint32 */
 #include "ext/standard/basic_functions.h"
@@ -247,8 +247,18 @@ static void ps_mm_destroy(ps_mm *data)
 
 PHP_MINIT_FUNCTION(ps_mm)
 {
+    char *ps_mm_path = calloc(strlen(PS(save_path))+1+strlen(PS_MM_FILE)+1, 1); /* Directory + '/' + File + \0 */
+
        ps_mm_instance = calloc(sizeof(*ps_mm_instance), 1);
-       if (ps_mm_initialize(ps_mm_instance, PS_MM_PATH) != SUCCESS) {
+
+    strcpy(ps_mm_path, PS(save_path));
+
+    if((strlen(ps_mm_path) > 0) && (ps_mm_path[strlen(ps_mm_path)-1] != '/'))
+        strcat(ps_mm_path, "/");  /* Fixme Windows */
+
+    strcat(ps_mm_path, PS_MM_FILE);
+
+       if (ps_mm_initialize(ps_mm_instance, ps_mm_path) != SUCCESS) {
                ps_mm_instance = NULL;
                return FAILURE;
        }