Author: svn-role
Date: Fri Nov 24 04:00:12 2017
New Revision: 1816207
URL: http://svn.apache.org/viewvc?rev=1816207&view=rev
Log:
Merge the 1.8.x-issue4707 branch:
* r1816069,1816106
Issue #4707: svnrdump dump: 2GB limit on content-length header.
Justification:
Large file support is broken in svnrdump <= 1.8.
Notes:
Only <= 1.8.x was broken; 1.9.x uses refactored code without the bug.
Ideally we'd add a regression test; I'll leave that decision to reviewers.
Branch:
1.8.x-issue4707
Votes:
+1: julianfoad, luke1410, rhuijben
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/subversion/ (props changed)
subversion/branches/1.8.x/subversion/svnrdump/dump_editor.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 24 04:00:12 2017
@@ -15,6 +15,7 @@
/subversion/branches/1.8.x-issue4554-v2:1678055-1740290
/subversion/branches/1.8.x-issue4557:1719351-1770605
/subversion/branches/1.8.x-issue4658:1766593-1770612
+/subversion/branches/1.8.x-issue4707:1816068-1816206
/subversion/branches/1.8.x-javahl-exception-crash:1586424-1588151
/subversion/branches/1.8.x-libsvnjavahl-version:1483910-1485054
/subversion/branches/1.8.x-memory-fragmentation:1669948-1701344
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1816207&r1=1816206&r2=1816207&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Fri Nov 24 04:00:12 2017
@@ -48,15 +48,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1816069,1816106
- Issue #4707: svnrdump dump: 2GB limit on content-length header.
- Justification:
- Large file support is broken in svnrdump <= 1.8.
- Notes:
- Only <= 1.8.x was broken; 1.9.x uses refactored code without the bug.
- Ideally we'd add a regression test; I'll leave that decision to reviewers.
- Branch:
- 1.8.x-issue4707
- Votes:
- +1: julianfoad, luke1410, rhuijben
Propchange: subversion/branches/1.8.x/subversion/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 24 04:00:12 2017
@@ -14,6 +14,7 @@
/subversion/branches/1.8.x-issue4554-v2/subversion:1678055-1740290
/subversion/branches/1.8.x-issue4557/subversion:1719351-1770605
/subversion/branches/1.8.x-issue4658/subversion:1766593-1770612
+/subversion/branches/1.8.x-issue4707/subversion:1816068-1816206
/subversion/branches/1.8.x-javahl-exception-crash/subversion:1586424-1588151
/subversion/branches/1.8.x-libsvnjavahl-version/subversion:1483910-1485054
/subversion/branches/1.8.x-memory-fragmentation/subversion:1669948-1701344
Modified: subversion/branches/1.8.x/subversion/svnrdump/dump_editor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/svnrdump/dump_editor.c?rev=1816207&r1=1816206&r2=1816207&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/svnrdump/dump_editor.c (original)
+++ subversion/branches/1.8.x/subversion/svnrdump/dump_editor.c Fri Nov 24
04:00:12 2017
@@ -1040,8 +1040,8 @@ close_file(void *file_baton,
/* Text-content-length: 39 */
SVN_ERR(svn_stream_printf(eb->stream, pool,
SVN_REPOS_DUMPFILE_TEXT_CONTENT_LENGTH
- ": %lu\n",
- (unsigned long)info->size));
+ ": %" APR_OFF_T_FMT "\n",
+ info->size));
/* Text-content-md5: 82705804337e04dcd0e586bfa2389a7f */
SVN_ERR(svn_stream_printf(eb->stream, pool,
@@ -1055,13 +1055,13 @@ close_file(void *file_baton,
if (fb->dump_props)
SVN_ERR(svn_stream_printf(eb->stream, pool,
SVN_REPOS_DUMPFILE_CONTENT_LENGTH
- ": %ld\n\n",
- (unsigned long)info->size + propstring->len));
+ ": %" APR_OFF_T_FMT "\n\n",
+ info->size + propstring->len));
else if (fb->dump_text)
SVN_ERR(svn_stream_printf(eb->stream, pool,
SVN_REPOS_DUMPFILE_CONTENT_LENGTH
- ": %ld\n\n",
- (unsigned long)info->size));
+ ": %" APR_OFF_T_FMT "\n\n",
+ info->size));
/* Dump the props now */
if (fb->dump_props)
