httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r728787 - in /httpd/httpd/trunk/modules/cache: mod_socache_dbm.c mod_socache_shmcb.c
Date Mon, 22 Dec 2008 21:34:59 GMT
Author: wrowe
Date: Mon Dec 22 13:34:59 2008
New Revision: 728787

URL: http://svn.apache.org/viewvc?rev=728787&view=rev
Log:
ditto hack from mpm_default.h

Modified:
    httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
    httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c

Modified: httpd/httpd/trunk/modules/cache/mod_socache_dbm.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_dbm.c?rev=728787&r1=728786&r2=728787&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_dbm.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_dbm.c Mon Dec 22 13:34:59 2008
@@ -53,7 +53,12 @@
  */
 #define SSL_DBM_FILE_MODE ( APR_UREAD | APR_UWRITE | APR_GREAD | APR_WREAD )
 
+/* Check for definition of DEFAULT_REL_RUNTIMEDIR */
+#ifndef DEFAULT_REL_RUNTIMEDIR
+#define DEFAULT_DBM_PREFIX "logs/socache-dbm-"
+#else
 #define DEFAULT_DBM_PREFIX DEFAULT_REL_RUNTIMEDIR "/socache-dbm-"
+#endif
 
 /* ### this should use apr_dbm_usednames. */
 #if !defined(SSL_DBM_FILE_SUFFIX_DIR) && !defined(SSL_DBM_FILE_SUFFIX_PAG)

Modified: httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c?rev=728787&r1=728786&r2=728787&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c (original)
+++ httpd/httpd/trunk/modules/cache/mod_socache_shmcb.c Mon Dec 22 13:34:59 2008
@@ -31,6 +31,16 @@
 
 #define SHMCB_MAX_SIZE (64 * 1024 * 1024)
 
+/* Check for definition of DEFAULT_REL_RUNTIMEDIR */
+#ifndef DEFAULT_REL_RUNTIMEDIR
+#define DEFAULT_SHMCB_PREFIX "logs/socache-shmcb-"
+#else
+#define DEFAULT_SHMCB_PREFIX DEFAULT_REL_RUNTIMEDIR "/socache-shmcb-"
+#endif
+
+#define DEFAULT_SHMCB_SUFFIX ".cache"
+
+
 /* 
  * This shared memory based SSL session cache implementation was
  * originally written by Geoff Thorpe <geoff geoffthorpe.net> for C2Net
@@ -307,9 +317,6 @@
     return NULL;
 }
 
-#define DEFAULT_SHMCB_PREFIX DEFAULT_REL_RUNTIMEDIR "/socache-shmcb-"
-#define DEFAULT_SHMCB_SUFFIX ".cache"
-
 static apr_status_t socache_shmcb_init(ap_socache_instance_t *ctx,
                                        const char *namespace, 
                                        const struct ap_socache_hints *hints,



Mime
View raw message