Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@subversion.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1715256 -
 /subversion/trunk/subversion/mod_dav_svn/version.c
Date: Thu, 19 Nov 2015 19:57:15 -0000
To: commits@subversion.apache.org
From: rhuijben@apache.org
Message-Id: <20151119195715.A1FE43A00E5@svn01-us-west.apache.org>

Author: rhuijben
Date: Thu Nov 19 19:57:14 2015
New Revision: 1715256

URL: http://svn.apache.org/viewvc?rev=1715256&view=rev
Log:
* subversion/mod_dav_svn/version.c
  (get_option): Store generated header values in the request pool instead
    of the resource pool. Not that there is really a difference, but this
    is the pool that contains the headers table itself.

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

Modified: subversion/trunk/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/mod_dav_svn/version.c?rev=1715256&r1=1715255&r2=1715256&view=diff
==============================================================================
--- subversion/trunk/subversion/mod_dav_svn/version.c (original)
+++ subversion/trunk/subversion/mod_dav_svn/version.c Thu Nov 19 19:57:14 2015
@@ -304,25 +304,25 @@ get_option(const dav_resource *resource,
          addressable resources. */
       apr_table_set(r->headers_out, SVN_DAV_ROOT_URI_HEADER, repos_root_uri);
       apr_table_set(r->headers_out, SVN_DAV_ME_RESOURCE_HEADER,
-                    apr_pstrcat(resource->pool, repos_root_uri, "/",
+                    apr_pstrcat(r->pool, repos_root_uri, "/",
                                 dav_svn__get_me_resource_uri(r), SVN_VA_NULL));
       apr_table_set(r->headers_out, SVN_DAV_REV_ROOT_STUB_HEADER,
-                    apr_pstrcat(resource->pool, repos_root_uri, "/",
+                    apr_pstrcat(r->pool, repos_root_uri, "/",
                                 dav_svn__get_rev_root_stub(r), SVN_VA_NULL));
       apr_table_set(r->headers_out, SVN_DAV_REV_STUB_HEADER,
-                    apr_pstrcat(resource->pool, repos_root_uri, "/",
+                    apr_pstrcat(r->pool, repos_root_uri, "/",
                                 dav_svn__get_rev_stub(r), SVN_VA_NULL));
       apr_table_set(r->headers_out, SVN_DAV_TXN_ROOT_STUB_HEADER,
-                    apr_pstrcat(resource->pool, repos_root_uri, "/",
+                    apr_pstrcat(r->pool, repos_root_uri, "/",
                                 dav_svn__get_txn_root_stub(r), SVN_VA_NULL));
       apr_table_set(r->headers_out, SVN_DAV_TXN_STUB_HEADER,
-                    apr_pstrcat(resource->pool, repos_root_uri, "/",
+                    apr_pstrcat(r->pool, repos_root_uri, "/",
                                 dav_svn__get_txn_stub(r), SVN_VA_NULL));
       apr_table_set(r->headers_out, SVN_DAV_VTXN_ROOT_STUB_HEADER,
-                    apr_pstrcat(resource->pool, repos_root_uri, "/",
+                    apr_pstrcat(r->pool, repos_root_uri, "/",
                                 dav_svn__get_vtxn_root_stub(r), SVN_VA_NULL));
       apr_table_set(r->headers_out, SVN_DAV_VTXN_STUB_HEADER,
-                    apr_pstrcat(resource->pool, repos_root_uri, "/",
+                    apr_pstrcat(r->pool, repos_root_uri, "/",
                                 dav_svn__get_vtxn_stub(r), SVN_VA_NULL));
       apr_table_set(r->headers_out, SVN_DAV_ALLOW_BULK_UPDATES,
                     bulk_upd_conf == CONF_BULKUPD_ON ? "On" :
@@ -342,7 +342,7 @@ get_option(const dav_resource *resource,
             continue;
 
           apr_table_addn(r->headers_out, SVN_DAV_SUPPORTED_POSTS_HEADER,
-                         apr_pstrdup(resource->pool, posts_versions[i].post_name));
+                         apr_pstrdup(r->pool, posts_versions[i].post_name));
         }
     }