Merge branch 'uh/git-svn-serf-fix'

gitster · gitster · commit 70c87a9854d8 · 2013-09-18T11:46:06.000-07:00
"git-svn" used with SVN 1.8.0 when talking over https:// connection
dumped core due to a bug in the serf library that SVN uses.  Work
it around on our side, even though the SVN side is being fixed.

* uh/git-svn-serf-fix:
  git-svn: fix termination issues for remote svn connections
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
@@ -32,6 +32,14 @@ BEGIN {
 	}
 }
 
+# serf has a bug that leads to a coredump upon termination if the
+# remote access object is left around (not fixed yet in serf 1.3.1).
+# Explicitly free it to work around the issue.
+END {
+	$RA = undef;
+	$ra_invalid = 1;
+}
+
 sub _auth_providers () {
 	my @rv = (
 	  SVN::Client::get_simple_provider(),

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,14 @@ BEGIN {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
	`35`	`+# serf has a bug that leads to a coredump upon termination if the`
	`36`	`+# remote access object is left around (not fixed yet in serf 1.3.1).`
	`37`	`+# Explicitly free it to work around the issue.`
	`38`	`+END {`
	`39`	`+ $RA = undef;`
	`40`	`+ $ra_invalid = 1;`
	`41`	`+}`
	`42`	`+`
`35`	`43`	`sub _auth_providers () {`
`36`	`44`	`my @rv = (`
`37`	`45`	`SVN::Client::get_simple_provider(),`