Merge r1842010 from trunk:

* dav_stream_response processes data that has been allocated from the propdb
  pool. Hence close the propdb *after* dav_stream_response which clears thei
  probdb pool.

Submitted by: rpluem
Reviewed by: jailletc36, icing, ylavic

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1855382 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/dav/main/mod_dav.c b/modules/dav/main/mod_dav.c
index b969465a98be2e6aa73f045ebd55fc42da0093c7..7e316cb13ba0e21eebebaeb6f765b320ac239eb3 100644 (file)
--- a/modules/dav/main/mod_dav.c
+++ b/modules/dav/main/mod_dav.c
@@ -2012,10 +2012,10 @@ static dav_error * dav_propfind_walker(dav_walk_resource *wres, int calltype)
                                  : DAV_PROP_INSERT_NAME;
         propstats = dav_get_allprops(propdb, what);
     }
-    dav_close_propdb(propdb);
-
     dav_stream_response(wres, 0, &propstats, ctx->scratchpool);
 
+    dav_close_propdb(propdb);
+
     /* at this point, ctx->scratchpool has been used to stream a
        single response.  this function fully controls the pool, and
        thus has the right to clear it for the next iteration of this