Change 35016 by [EMAIL PROTECTED] on 2008/12/05 01:23:27
Integrate:
[ 34071]
Make sure parser's filehandle is closed when finished
(It was mistakenly left open if there was no old_parser, which caused
t/comp/require.t to leave behind a 'bleah.pm' (from the test for
#49472) on Win32, where the deletion of an open file fails.)
Affected files ...
... //depot/maint-5.10/perl/toke.c#12 integrate
Differences ...
==== //depot/maint-5.10/perl/toke.c#12 (text) ====
Index: perl/toke.c
--- perl/toke.c#11~34715~ 2008-11-04 00:28:29.000000000 -0800
+++ perl/toke.c 2008-12-04 17:23:27.000000000 -0800
@@ -740,8 +740,8 @@
if (parser->rsfp == PerlIO_stdin())
PerlIO_clearerr(parser->rsfp);
- else if (parser->rsfp && parser->old_parser
- && parser->rsfp != parser->old_parser->rsfp)
+ else if (parser->rsfp && (!parser->old_parser ||
+ (parser->old_parser && parser->rsfp !=
parser->old_parser->rsfp)))
PerlIO_close(parser->rsfp);
SvREFCNT_dec(parser->rsfp_filters);
End of Patch.
