*** empty log message ***

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@1698 1a406e8e-add9-4483-a2c8-d8cac5b7c224

diff --git a/include/chxj_cookie.h b/include/chxj_cookie.h
index cbf9cc7..dc80053 100644 (file)
--- a/include/chxj_cookie.h
+++ b/include/chxj_cookie.h
@@ -23,6 +23,10 @@
 
 #define CHXJ_COOKIE_PARAM  "_chxj_cc"
 
+#define DEFAULT_COOKIE_DB_DIR "/tmp"
+#define COOKIE_DB_NAME        "cookie.db"
+#define COOKIE_DB_LOCK_NAME   "cookie.db.lock"
+
 
 typedef struct cookie_t cookie_t;
 

diff --git a/src/chxj_cookie.c b/src/chxj_cookie.c
index e1ce19e..1a96ac9 100644 (file)
--- a/src/chxj_cookie.c
+++ b/src/chxj_cookie.c
@@ -541,23 +541,24 @@ on_error0:
 
 }
 
+
 char*
 chxj_cookie_db_name_create(request_rec* r, const char* dir)
 {
   char* dst;
 
   if (!dir) {
-    dst = apr_pstrdup(r->pool, "/tmp");
+    dst = apr_pstrdup(r->pool, DEFAULT_COOKIE_DB_DIR);
   }
   else {
     dst = apr_pstrdup(r->pool, dir);
   }
 
   if (dst[strlen(dst)-1] != '/') {
-    dst = apr_pstrcat(r->pool, dst, "/", "cookie.db" , NULL);
+    dst = apr_pstrcat(r->pool, dst, "/", COOKIE_DB_NAME, NULL);
   }
   else {
-    dst = apr_pstrcat(r->pool, dst, "cookie.db" , NULL);
+    dst = apr_pstrcat(r->pool, dst, COOKIE_DB_NAME, NULL);
   }
 
   return dst;
@@ -570,16 +571,16 @@ chxj_cookie_db_lock_name_create(request_rec* r, const char* dir)
   char* dst;
 
   if (!dir) {
-    dst = apr_pstrdup(r->pool, "/tmp");
+    dst = apr_pstrdup(r->pool, DEFAULT_COOKIE_DB_DIR);
   }
   else {
     dst = apr_pstrdup(r->pool, dir);
   }
   if (dst[strlen(dst)-1] != '/') {
-    dst = apr_pstrcat(r->pool, dst, "/", "cookie.db.lock" , NULL);
+    dst = apr_pstrcat(r->pool, dst, "/", COOKIE_DB_LOCK_NAME, NULL);
   }
   else {
-    dst = apr_pstrcat(r->pool, dst, "cookie.db.lock" , NULL);
+    dst = apr_pstrcat(r->pool, dst, COOKIE_DB_LOCK_NAME, NULL);
   }
 
   return dst;