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/08/17 15:58:17 UTC
svn commit: r1158712 - in /subversion/branches/1.7.x: ./ STATUS
subversion/libsvn_ra_serf/util.c
Author: hwright
Date: Wed Aug 17 13:58:17 2011
New Revision: 1158712
URL: http://svn.apache.org/viewvc?rev=1158712&view=rev
Log:
Merge r1155131 from trunk, resolving conflicts as appropriate:
* r1155131
Cleanup the xml parser in serf in unexpected conditions.
Justification:
Without this patch the xml parser is only freed when http responses are
read successfully.
Notes:
This patch requires r1148932 to be backported for a clean merge.
Currently accept theirs on conflict produces the right result.
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_serf/util.c
Propchange: subversion/branches/1.7.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 13:58: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,1154717-1154718,1154733,1154908,1154982,1155015,1155044,1155124,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,1154733,1154908,1154982,1155015,1155044,1155124,1155131,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=1158712&r1=1158711&r2=1158712&view=diff
==============================================================================
--- subversion/branches/1.7.x/STATUS (original)
+++ subversion/branches/1.7.x/STATUS Wed Aug 17 13:58:17 2011
@@ -148,17 +148,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1155131
- Cleanup the xml parser in serf in unexpected conditions.
- Justification:
- Without this patch the xml parser is only freed when http responses are
- read successfully.
- Notes:
- This patch requires r1148932 to be backported for a clean merge.
- Currently accept theirs on conflict produces the right result.
- Votes:
- +1: rhuijben, stsp, cmpilato
-
* r1155391, r1155404, r1156218
Fix issue 3983, import into foreign repository.
Justification:
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=1158712&r1=1158711&r2=1158712&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 Wed Aug 17 13:58:17 2011
@@ -1373,6 +1373,21 @@ inject_to_parser(svn_ra_serf__xml_parser
return SVN_NO_ERROR;
}
+/* Apr pool cleanup handler to release an XML_Parser in success and error
+ conditions */
+static apr_status_t
+xml_parser_cleanup(void *baton)
+{
+ XML_Parser *xmlp = baton;
+
+ if (*xmlp)
+ {
+ XML_ParserFree(*xmlp);
+ *xmlp = NULL;
+ }
+
+ return APR_SUCCESS;
+}
svn_error_t *
svn_ra_serf__process_pending(svn_ra_serf__xml_parser_t *parser,
@@ -1477,7 +1492,7 @@ svn_ra_serf__process_pending(svn_ra_serf
return status. We just don't care. */
(void) XML_Parse(parser->xmlp, NULL, 0, 1);
- XML_ParserFree(parser->xmlp);
+ apr_pool_cleanup_run(parser->pool, &parser->xmlp, xml_parser_cleanup);
add_done_item(parser);
}
return SVN_NO_ERROR;
@@ -1531,6 +1546,8 @@ svn_ra_serf__handle_xml_parser(serf_requ
if (!ctx->xmlp)
{
ctx->xmlp = XML_ParserCreate(NULL);
+ apr_pool_cleanup_register(ctx->pool, &ctx->xmlp, xml_parser_cleanup,
+ apr_pool_cleanup_null);
XML_SetUserData(ctx->xmlp, ctx);
XML_SetElementHandler(ctx->xmlp, start_xml, end_xml);
if (ctx->cdata)
@@ -1587,7 +1604,7 @@ svn_ra_serf__handle_xml_parser(serf_requ
}
if (err)
{
- XML_ParserFree(ctx->xmlp);
+ apr_pool_cleanup_run(ctx->pool, &ctx->xmlp, xml_parser_cleanup);
add_done_item(ctx);
return svn_error_trace(err);
}
@@ -1609,7 +1626,7 @@ svn_ra_serf__handle_xml_parser(serf_requ
/* Ignore the return status. We just don't care. */
(void) XML_Parse(ctx->xmlp, NULL, 0, 1);
- XML_ParserFree(ctx->xmlp);
+ apr_pool_cleanup_run(ctx->pool, &ctx->xmlp, xml_parser_cleanup);
add_done_item(ctx);
}