Author: hwright
Date: Wed Aug 17 13:52:17 2011
New Revision: 1158705
URL: http://svn.apache.org/viewvc?rev=1158705&view=rev
Log:
Merge r1154717, r1154718 from trunk:
* r1154717, r1154718
Detect broken svndiff streams in serf (r1154717) and neon (r1154718), in
non-bulk updates before we even do the md5 checksum in the update editor.
Justification:
Some sanity checking doesn't hurt. Improves error details and avoids
storing invalid streams in the pristine store.
Votes:
+1: rhuijben, stsp, cmpilato
Modified:
subversion/branches/1.7.x/ (props changed)
subversion/branches/1.7.x/STATUS
subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 13:52:17 2011
@@ -56,4 +56,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,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
+/subversion/trunk:1146013,1146121,1146219,1146222,1146274,1146492,1146555,1146606,1146620,1146684,1146781,1146832,1146834,1146870,1146899,1146904,1147293,1147309,1147882,1148071,1148131,1148374,1148424,1148566,1148588,1148853,1148877,1148882,1148936,1149105,1149141,1149160,1149228,1149240,1149343,1149371-1149372,1149377,1149398,1149401,1149539,1149572,1149627,1149675,1149701,1149713,1150242,1150254,1150260-1150261,1150266,1150302,1150327,1150368,1150372,1150441,1150506,1150812,1150853,1151036,1151177,1151610,1151906,1151911,1152129,1152140,1152189-1152190,1152282,1152726,1153138,1153141,1153416,1153799,1153807,1153968,1154009,1154023,1154121,1154165,1154273,1154461,1154717-1154718,1154908,1155015,1155044,1155313,1155334,1156085,1156098,1156216,1156312,1156527,1156717,1156721,1156750,1156827,1156838,1157416,1158193-1158194,1158285,1158288,1158303,1158421,1158436,1158455
Modified: subversion/branches/1.7.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/STATUS?rev=1158705&r1=1158704&r2=1158705&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:52:17 2011
@@ -148,15 +148,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1154717, r1154718
- Detect broken svndiff streams in serf (r1154717) and neon (r1154718), in
- non-bulk updates before we even do the md5 checksum in the update editor.
- Justification:
- Some sanity checking doesn't hurt. Improves error details and avoids
- storing invalid streams in the pristine store.
- Votes:
- +1: rhuijben, stsp, cmpilato
-
* r1154733
Correctly position buffer pointer when resuming an aborted transfer in serf.
Justification:
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c?rev=1158705&r1=1158704&r2=1158705&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_neon/fetch.c Wed Aug 17
13:52:17 2011
@@ -528,7 +528,10 @@ static svn_error_t *simple_fetch_file(sv
TRUE, pool));
/* close the handler, since the file reading completed successfully. */
- return (*frc.handler)(NULL, frc.handler_baton);
+ if (frc.stream)
+ return svn_stream_close(frc.stream);
+ else
+ return (*frc.handler)(NULL, frc.handler_baton);
}
/* Helper for svn_ra_neon__get_file. This implements
Modified: subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c?rev=1158705&r1=1158704&r2=1158705&view=diff
==============================================================================
--- subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/1.7.x/subversion/libsvn_ra_serf/update.c Wed Aug 17
13:52:17 2011
@@ -983,7 +983,12 @@ handle_fetch(serf_request_t *request,
### end of this block, so it will work for now. */
apr_pool_t *scratch_pool = info->editor_pool;
- err = info->textdelta(NULL, info->textdelta_baton);
+ if (fetch_ctx->delta_stream)
+ err = svn_error_trace(svn_stream_close(fetch_ctx->delta_stream));
+ else
+ err = svn_error_trace(info->textdelta(NULL,
+ info->textdelta_baton));
+
if (err)
{
return error_fetch(request, fetch_ctx, err);
