subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1241047 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
Date Mon, 06 Feb 2012 15:36:24 GMT
Author: stsp
Date: Mon Feb  6 15:36:24 2012
New Revision: 1241047

URL: http://svn.apache.org/viewvc?rev=1241047&view=rev
Log:
Fix a pool lifetime problem with mod_dav_svn's hooks environment.

* subversion/mod_dav_svn/mod_dav_svn.c
  (merge_dir_config): Do not merge parent and child hashes, just copy
   the pointer. The pool passed to this function does not seem to provide
   sufficient lifetime for the merged hash. Merging the hashes might lead
   to confusing configuration errors anyway.

Modified:
    subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

Modified: subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c?rev=1241047&r1=1241046&r2=1241047&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c Mon Feb  6 15:36:24 2012
@@ -225,9 +225,7 @@ merge_dir_config(apr_pool_t *p, void *ba
   newconf->txdelta_cache = INHERIT_VALUE(parent, child, txdelta_cache);
   newconf->fulltext_cache = INHERIT_VALUE(parent, child, fulltext_cache);
   newconf->root_dir = INHERIT_VALUE(parent, child, root_dir);
-  newconf->hooks_env = apr_hash_merge(p, child->hooks_env, parent->hooks_env,
-                                      NULL /* child overrides parent */,
-                                      NULL /* unused data baton */);
+  newconf->hooks_env = INHERIT_VALUE(parent, child, hooks_env);
 
   if (parent->fs_path)
     ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL,



Mime
View raw message