You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2011/06/23 18:40:43 UTC

svn commit: r1138975 - in /subversion/trunk: get-deps.sh subversion/libsvn_subr/cache-inprocess.c subversion/svnserve/cyrus_auth.c

Author: danielsh
Date: Thu Jun 23 16:40:42 2011
New Revision: 1138975

URL: http://svn.apache.org/viewvc?rev=1138975&view=rev
Log:
* get-deps.sh: Warn against cases where 'mv $DEPENDENCY dependency' would
  not behave as expected.

Modified:
    subversion/trunk/get-deps.sh
    subversion/trunk/subversion/libsvn_subr/cache-inprocess.c
    subversion/trunk/subversion/svnserve/cyrus_auth.c

Modified: subversion/trunk/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/trunk/get-deps.sh?rev=1138975&r1=1138974&r2=1138975&view=diff
==============================================================================
--- subversion/trunk/get-deps.sh (original)
+++ subversion/trunk/get-deps.sh Thu Jun 23 16:40:42 2011
@@ -45,6 +45,12 @@ get_deps() {
     mkdir -p $TEMPDIR
     cd $TEMPDIR
 
+    for d in neon zlib serf sqlite-amalgamation apr apr-util; do
+      if [ -d $i ]; then
+        echo "Local directory '$i' already exists; the downloaded copy won't be used" >&2
+      fi
+    done
+
     wget -nc $APACHE_MIRROR/apr/$APR.tar.bz2
     wget -nc $APACHE_MIRROR/apr/$APR_UTIL.tar.bz2
     wget -nc http://webdav.org/neon/$NEON.tar.gz

Modified: subversion/trunk/subversion/libsvn_subr/cache-inprocess.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/cache-inprocess.c?rev=1138975&r1=1138974&r2=1138975&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/cache-inprocess.c (original)
+++ subversion/trunk/subversion/libsvn_subr/cache-inprocess.c Thu Jun 23 16:40:42 2011
@@ -31,6 +31,10 @@
 
 #include "cache.h"
 
+/* A per-process cache implementation.  See cache-membuffer.c for a newer,
+ * memcached-like per-process cache, that aims to solve latency and reliability
+ * issues with this implementation. */
+
 /* The (internal) cache object. */
 typedef struct inprocess_cache_t {
   /* A user-defined identifier for this cache instance. */

Modified: subversion/trunk/subversion/svnserve/cyrus_auth.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/cyrus_auth.c?rev=1138975&r1=1138974&r2=1138975&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/cyrus_auth.c (original)
+++ subversion/trunk/subversion/svnserve/cyrus_auth.c Thu Jun 23 16:40:42 2011
@@ -282,8 +282,8 @@ svn_error_t *cyrus_auth_request(svn_ra_s
     }
 
   /* Make sure the context is always destroyed. */
-  apr_pool_cleanup_register(b->pool, sasl_ctx, sasl_dispose_cb,
-                            apr_pool_cleanup_null);
+  apr_pool_pre_cleanup_register(b->pool, sasl_ctx, sasl_dispose_cb,
+                                apr_pool_cleanup_null);
 
   /* Initialize security properties. */
   svn_ra_svn__default_secprops(&secprops);