Author: svn-role
Date: Mon Sep 9 04:00:15 2019
New Revision: 1866645
URL: http://svn.apache.org/viewvc?rev=1866645&view=rev
Log:
Merge r1865266 from trunk:
* r1865266
mod_dav_svn: Always install cleanup handler for FS warning logging.
Justification:
FS warning logging cleanup handler was only installed in the presence
of an R->USER request field, which is unrelated.
Votes:
+1: stsp, rhuijben, brane
Modified:
subversion/branches/1.12.x/ (props changed)
subversion/branches/1.12.x/STATUS
subversion/branches/1.12.x/subversion/mod_dav_svn/repos.c
Propchange: subversion/branches/1.12.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 9 04:00:15 2019
@@ -102,4 +102,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1855419,1856397,1857367,1857391,1859732,1859734,1860175,1860186-1860188,1860936,1860951,1860958,1863262,1863987,1863990,1864025
+/subversion/trunk:1855419,1856397,1857367,1857391,1859732,1859734,1860175,1860186-1860188,1860936,1860951,1860958,1863262,1863987,1863990,1864025,1865266
Modified: subversion/branches/1.12.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.12.x/STATUS?rev=1866645&r1=1866644&r2=1866645&view=diff
==============================================================================
--- subversion/branches/1.12.x/STATUS (original)
+++ subversion/branches/1.12.x/STATUS Mon Sep 9 04:00:15 2019
@@ -35,11 +35,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1865266
- mod_dav_svn: Always install cleanup handler for FS warning logging.
- Justification:
- FS warning logging cleanup handler was only installed in the presence
- of an R->USER request field, which is unrelated.
- Votes:
- +1: stsp, rhuijben, brane
Modified: subversion/branches/1.12.x/subversion/mod_dav_svn/repos.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.12.x/subversion/mod_dav_svn/repos.c?rev=1866645&r1=1866644&r2=1866645&view=diff
==============================================================================
--- subversion/branches/1.12.x/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.12.x/subversion/mod_dav_svn/repos.c Mon Sep 9
04:00:15 2019
@@ -2514,6 +2514,14 @@ get_resource(request_rec *r,
/* capture warnings during cleanup of the FS */
svn_fs_set_warning_func(repos->fs, log_warning_req, r);
+ /* We must degrade the logging context when the request is freed. */
+ cleanup_req_logging_baton =
+ apr_pcalloc(r->pool, sizeof(*cleanup_req_logging_baton));
+ cleanup_req_logging_baton->fs = repos->fs;
+ cleanup_req_logging_baton->connection = r->connection;
+ apr_pool_pre_cleanup_register(r->pool, cleanup_req_logging_baton,
+ cleanup_req_logging);
+
/* if an authenticated username is present, attach it to the FS */
if (r->user)
{
@@ -2529,14 +2537,6 @@ get_resource(request_rec *r,
apr_pool_cleanup_register(r->pool, cleanup_baton, cleanup_fs_access,
apr_pool_cleanup_null);
- /* We must degrade the logging context when the request is freed. */
- cleanup_req_logging_baton =
- apr_pcalloc(r->pool, sizeof(*cleanup_req_logging_baton));
- cleanup_req_logging_baton->fs = repos->fs;
- cleanup_req_logging_baton->connection = r->connection;
- apr_pool_pre_cleanup_register(r->pool, cleanup_req_logging_baton,
- cleanup_req_logging);
-
/* Create an access context based on the authenticated username. */
serr = svn_fs_create_access(&access_ctx, r->user, r->pool);
if (serr)
