Re: [PATCH] git-svn: Fix termination issues for remote svn connections
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 6, 2013, 16:41 UTC
- Message-ID
- <xmqqa9jpzyvo.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <f2fe486a6ca0bf40be4489bfe888d517.squirrel@83.236.132.106>
"Uli Heller" <uli.heller@daemons-point.com> writes:
Show 12 quoted lines
> On Fri, September 6, 2013 2:44 pm, Kyle J. McKay wrote: > ... >> In any case, I can now reproduce the problem (serf 1.3.1 still breaks >> since it does not yet contain the fix and it is the most recent serf >> release available). >> >> And the Git/SVN/Ra.pm fix does eliminate the problem for me (both with >> bulk updates and with skelta updates -- the crash occurs with either). > > Great. So I don't have to run any more tests ;) > > What shall I do next? Add some inline comments to the patch?
Something like this?
-- >8 --
From: Uli Heller <uli.heller@daemons-point.com> Subject: [PATCH] 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> --- perl/Git/SVN/Ra.pm | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm index 75ecc42..78dd346 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(),
-- 1.8.4-431-g94f3a6b