In perl.git, the branch maint-5.24 has been updated <http://perl5.git.perl.org/perl.git/commitdiff/2dbfd8038a4f51cc8f462d440490e45c0ceaee48?hp=4ba46fe91f12bc0d66b74d85d91cb1889089cc29>
- Log ----------------------------------------------------------------- commit 2dbfd8038a4f51cc8f462d440490e45c0ceaee48 Author: Steve Hay <[email protected]> Date: Sun Jul 17 22:30:59 2016 +0100 perldelta - Update Acknowledgements M pod/perldelta.pod commit 33268ca2c9a8a80bfb001b16b2d1abe0a45a27ff Author: Steve Hay <[email protected]> Date: Sun Jul 17 22:28:32 2016 +0100 perldelta - Document previous commit M pod/perldelta.pod commit 5296cf986b8f91ec665736263bd5b9b819c07059 Author: Leon Timmermans <[email protected]> Date: Sun Jul 17 16:54:19 2016 +0200 Revert "Respect hashbangs containing perl6" This reverts commit d9fc04eebe29b8cf5f6f6bf31373b202eafa44d6. As discussed in http://www.nntp.perl.org/group/perl.perl5.porters/2016/05/msg236423.html, the current perl6-shebang code has rather sharp edge-cases. Hence a revert until we come up with a better solution seems wise. (cherry picked from commit f691e4455dd520eff11e7f070a9b034b0fa5ca1c) M toke.c ----------------------------------------------------------------------- Summary of changes: pod/perldelta.pod | 20 +++++++++++++++++--- toke.c | 2 -- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 9c822a0..4d06d45 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -86,21 +86,35 @@ B<-Di> switch is working correctly. =back +=head1 Selected Bug Fixes + +=over 4 + +=item * + +The change to hashbang redirection introduced in Perl 5.24.0, whereby perl +would redirect to another interpreter (Perl 6) if it found a hashbang path +which contains "perl" followed by "6", has been reverted because it broke in +cases such as C<#!/opt/perl64/bin/perl>. + +=back + =head1 Acknowledgements Perl 5.24.1 represents approximately 2 months of development since Perl 5.24.0 -and contains approximately 5,700 lines of changes across 45 files from 10 +and contains approximately 5,700 lines of changes across 46 files from 11 authors. Excluding auto-generated files, documentation and release tools, there were -approximately 590 lines of changes to 10 .pm, .t, .c and .h files. +approximately 590 lines of changes to 11 .pm, .t, .c and .h files. Perl continues to flourish into its third decade thanks to a vibrant community of users and developers. The following people are known to have contributed the improvements that became Perl 5.24.1: Alex Vandiver, Craig A. Berry, Father Chrysostomos, James E Keenan, Karen -Etheridge, Matthew Horsfall, Ricardo Signes, Sawyer X, Steve Hay, Tony Cook. +Etheridge, Leon Timmermans, Matthew Horsfall, Ricardo Signes, Sawyer X, Steve +Hay, Tony Cook. The list above is almost certainly incomplete as it is automatically generated from version control history. In particular, it does not include the names of diff --git a/toke.c b/toke.c index c95f6d2..b493401 100644 --- a/toke.c +++ b/toke.c @@ -5075,8 +5075,6 @@ Perl_yylex(pTHX) d = instr(s,"perl -"); if (!d) { d = instr(s,"perl"); - if (d && d[4] == '6') - d = NULL; #if defined(DOSISH) /* avoid getting into infinite loops when shebang * line contains "Perl" rather than "perl" */ -- Perl5 Master Repository
