You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/07/21 15:20:57 UTC
svn commit: r1149167 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_serf/util.c
Author: hwright
Date: Thu Jul 21 13:20:55 2011
New Revision: 1149167
URL: http://svn.apache.org/viewvc?rev=1149167&view=rev
Log:
Reintegrate the 1.7.x-issue3888 branch:
* 1.7.x-issue3888 branch
Fix issue 3888 for 1.7.x
Justification:
For very large checkouts/updates/switches, ra_serf may consume
unbounded memory. That is not good.
Votes:
+1: gstein, jerenkrantz, lgo
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 21 13:20:55 2011
@@ -1,4 +1,5 @@
/subversion/branches/1.5.x-r30215:870312
+/subversion/branches/1.7.x-issue3888:1148937-1149162
/subversion/branches/atomic-revprop:965046-1000689
/subversion/branches/bdb-reverse-deltas:872050-872529
/subversion/branches/diff-callbacks3:870059-870761
@@ -53,4 +54,4 @@
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
/subversion/branches/uris-as-urls:1060426-1064427
-/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1148071,1148374,1148566,1148588,1148853
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1148071,1148374,1148566,1148588,1148853,1148936
Modified: subversion/branches/1.7.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1149167&r1=1149166&r2=1149167&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Thu Jul 21 13:20:55 2011
@@ -119,11 +119,3 @@ Approved changes:
Avoid calling into a library incompatible with the one compiled against.
Votes:
+1: danielsh, gstein, arfrever
-
- * 1.7.x-issue3888 branch
- Fix issue 3888 for 1.7.x
- Justification:
- For very large checkouts/updates/switches, ra_serf may consume
- unbounded memory. That is not good.
- Votes:
- +1: gstein, jerenkrantz, lgo
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c?rev=1149167&r1=1149166&r2=1149167&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/util.c Thu Jul 21 13:20:55 2011
@@ -1383,8 +1383,8 @@ svn_ra_serf__process_pending(svn_ra_serf
svn_error_t *err;
apr_off_t output_unused;
- /* Fast path exit: already paused, or nothing to do. */
- if (parser->paused || parser->pending == NULL)
+ /* Fast path exit: already paused, nothing to do, or already done. */
+ if (parser->paused || parser->pending == NULL || *parser->done)
return SVN_NO_ERROR;
/* ### it is possible that the XML parsing of the pending content is
@@ -1573,13 +1573,11 @@ svn_ra_serf__handle_xml_parser(serf_requ
We want to save arriving content into the PENDING structures if
the parser has been paused, or we already have data in there (so
the arriving data is appended, rather than injected out of order) */
-#ifdef DISABLE_THIS_FOR_NOW
if (ctx->paused || HAS_PENDING_DATA(ctx->pending))
{
err = write_to_pending(ctx, data, len, pool);
}
else
-#endif
{
err = inject_to_parser(ctx, data, len, &sl);
if (err)