summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Uli Heller <uli.heller@daemons-point.com>2013-09-03 09:35:29 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-06 09:44:28 -0700
commit73ffac3b38e1a62b922a0eb462f41fced6a18ebf (patch)
tree1c803ab428df3948a7614581083e6d98caeb9045
parentGit.pm: revert _temp_cache use of temp_is_locked (diff)
downloadtgif-73ffac3b38e1a62b922a0eb462f41fced6a18ebf.tar.xz
git-svn: fix termination issues for remote svn connections
git-svn used in combination with serf to talk to svn repository served over HTTPS dumps core on termination. This is caused by a bug in serf, and the most recent serf release 1.3.1 still exhibits the problem; a fix for the bug exists (see https://code.google.com/p/serf/source/detail?r=2146). Until the bug is fixed, work around the issue within the git perl module Ra.pm by freeing the private copy of the remote access object on termination, which seems to be sufficient to prevent the error from happening. Note: Since subversion-1.8.0 and later do require serf-1.2.1 or later, this issue typically shows up when upgrading to a recent version of subversion. Credits go to Jonathan Lambrechts for proposing a fix to Ra.pm, Evgeny Kotkov and Ivan Zhakov for fixing the issue in serf and pointing me to that fix. Signed-off-by: Uli Heller <uli.heller@daemons-point.com> Tested-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--perl/Git/SVN/Ra.pm8
1 files changed, 8 insertions, 0 deletions
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 75ecc425b6..a7b0119ee5 100644
--- 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(),