You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/08/17 15:56:51 UTC
svn commit: r1158710 - in /subversion/branches/1.7.x-r1155160: ./
subversion/libsvn_ra_serf/ra_serf.h subversion/libsvn_ra_serf/util.c
Author: rhuijben
Date: Wed Aug 17 13:56:51 2011
New Revision: 1158710
URL: http://svn.apache.org/viewvc?rev=1158710&view=rev
Log:
On the 1.7.x-r1155160 branch: Merge r1155160 from trunk, resolving conflict.
Modified:
subversion/branches/1.7.x-r1155160/ (props changed)
subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c
Propchange: subversion/branches/1.7.x-r1155160/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 13:56:51 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,1154908,1155015,1155044,1155160,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-r1155160/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h?rev=1158710&r1=1158709&r2=1158710&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/ra_serf.h Wed Aug 17 13:56:51 2011
@@ -622,6 +622,11 @@ struct svn_ra_serf__xml_parser_t {
See libsvn_ra_serf/util.c */
struct svn_ra_serf__pending_t *pending;
+
+ /* Response restart support */
+ const void *headers_baton; /* Last pointer to headers */
+ apr_off_t skip_size; /* Number of bytes to skip */
+ apr_off_t read_size; /* Number of bytes read from response */
};
/*
Modified: subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c?rev=1158710&r1=1158709&r2=1158710&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/1.7.x-r1155160/subversion/libsvn_ra_serf/util.c Wed Aug 17 13:56:51 2011
@@ -1528,6 +1528,22 @@ svn_ra_serf__handle_xml_parser(serf_requ
return SVN_NO_ERROR;
}
+ if (ctx->headers_baton == NULL)
+ ctx->headers_baton = serf_bucket_response_get_headers(response);
+ else if (ctx->headers_baton != serf_bucket_response_get_headers(response))
+ {
+ /* We got a new response to an existing parser...
+ This tells us the connection has restarted and we should continue
+ where we stopped last time.
+ */
+
+ /* Is this a second attempt?? */
+ if (!ctx->skip_size)
+ ctx->skip_size = ctx->read_size;
+
+ ctx->read_size = 0; /* New request, nothing read */
+ }
+
if (!ctx->xmlp)
{
ctx->xmlp = XML_ParserCreate(NULL);
@@ -1563,6 +1579,35 @@ svn_ra_serf__handle_xml_parser(serf_requ
return svn_error_wrap_apr(status, NULL);
}
+ ctx->read_size += len;
+
+ if (ctx->skip_size)
+ {
+ /* Handle restarted requests correctly: Skip what we already read */
+ apr_size_t skip;
+
+ if (ctx->skip_size >= ctx->read_size)
+ {
+ /* Eek. What did the file shrink or something? */
+ if (APR_STATUS_IS_EOF(status))
+ {
+ SVN_ERR_MALFUNCTION();
+ }
+
+ /* Skip on to the next iteration of this loop. */
+ if (APR_STATUS_IS_EAGAIN(status))
+ {
+ return svn_error_wrap_apr(status, NULL);
+ }
+ continue;
+ }
+
+ skip = (apr_size_t)(len - (ctx->read_size - ctx->skip_size));
+ data += skip;
+ len -= skip;
+ ctx->skip_size = 0;
+ }
+
/* Note: once the callbacks invoked by inject_to_parser() sets the
PAUSED flag, then it will not be cleared. write_to_pending() will
only save the content. Logic outside of serf_context_run() will