httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1371684 - in /httpd/httpd/trunk: CHANGES docs/manual/mod/mod_ldap.xml modules/ldap/util_ldap.c
Date Fri, 10 Aug 2012 12:23:42 GMT
Author: trawick
Date: Fri Aug 10 12:23:41 2012
New Revision: 1371684

URL: http://svn.apache.org/viewvc?rev=1371684&view=rev
Log:
make LDAPSharedCacheFile relative to DefaultRuntimeDir

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml
    httpd/httpd/trunk/modules/ldap/util_ldap.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1371684&r1=1371683&r2=1371684&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Aug 10 12:23:41 2012
@@ -29,6 +29,7 @@ Changes with Apache 2.5.0
        mutexes (Mutex)
      - mod_auth_digest: shared memory file
      - mod_lbmethod_heartbeat, mod_heartmonitor: heartbeat storage file
+     - mod_ldap: shared memory cache
      - mod_socache_shmcb, mod_socache_dbm: shared memory or dbm for cache
      [Jeff Trawick]
 

Modified: httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml?rev=1371684&r1=1371683&r2=1371684&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml (original)
+++ httpd/httpd/trunk/docs/manual/mod/mod_ldap.xml Fri Aug 10 12:23:41 2012
@@ -418,13 +418,16 @@ LDAPTrustedGlobalCert CA_BASE64 /certs/c
 <directivesynopsis>
 <name>LDAPSharedCacheFile</name>
 <description>Sets the shared memory cache file</description>
-<syntax>LDAPSharedCacheFile <var>directory-path/filename</var></syntax>
+<syntax>LDAPSharedCacheFile <var>file-path</var></syntax>
 <contextlist><context>server config</context></contextlist>
 
 <usage>
-    <p>Specifies the directory path and file name of the shared memory
-    cache file. If not set, anonymous shared memory will be used if the
-    platform supports it.</p>
+    <p>Specifies the path of the shared memory cache file. If not set, 
+    anonymous shared memory will be used if the platform supports it.</p>
+
+    <p>If <var>file-path</var> is not an absolute path, the location specified
+    will be relative to the value of 
+    <directive module="core">DefaultRuntimeDir</directive>.</p>
 </usage>
 </directivesynopsis>
 

Modified: httpd/httpd/trunk/modules/ldap/util_ldap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap.c?rev=1371684&r1=1371683&r2=1371684&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap.c Fri Aug 10 12:23:41 2012
@@ -2103,7 +2103,7 @@ static const char *util_ldap_set_cache_f
     }
 
     if (file) {
-        st->cache_file = ap_server_root_relative(st->pool, file);
+        st->cache_file = ap_runtime_dir_relative(st->pool, file);
     }
     else {
         st->cache_file = NULL;



Mime
View raw message