In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/c44e9413a2efb331e52675f5fae945cbd0e8dc5f?hp=94749a5ed2171bb6de72e384a78f5df552d812bb>
- Log ----------------------------------------------------------------- commit c44e9413a2efb331e52675f5fae945cbd0e8dc5f Author: Karl Williamson <[email protected]> Date: Sat Dec 24 10:31:10 2016 -0700 Fix win32 test failures Commit 607313a19740cb756ab98d5e58e6040ea8c125d4 introduced a bug in that it is looking for the string "mathoms.c" in __FILE__. But __FILE__ can be a path with mathoms.c merely a component of it. The easiest thing to do is to use instr() instead of strEQ. M utf8.c commit 3de20fbedc588d600cec734eeef024ef8ae86962 Author: Karl Williamson <[email protected]> Date: Sat Dec 24 10:51:38 2016 -0700 perldiag: Reinistate use of Z<> Commit 3d6c5fec8cb3579a30be60177e31058bc31285d7 removed this pod directive because of bugs in the pod handling code. This has been fixed now, so this reinstates it. Also, real links have been created to this entry. M pod/perldiag.pod ----------------------------------------------------------------------- Summary of changes: pod/perldiag.pod | 10 +++++----- utf8.c | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pod/perldiag.pod b/pod/perldiag.pod index 450aa3685a..fe5ff9bcc4 100644 --- a/pod/perldiag.pod +++ b/pod/perldiag.pod @@ -2011,7 +2011,7 @@ than to create a dangling reference. =item Did not produce a valid header -See Server error. +See L</500 Server error>. =item %s did not return a true value @@ -2044,7 +2044,7 @@ you called it with no args and C<$@> was empty. =item Document contains no data -See Server error. +See L</500 Server error>. =item %s does not define %s::VERSION--version check failed @@ -3490,7 +3490,7 @@ doesn't resolve to a valid subroutine. See L<overload>. =item Method %s not permitted -See Server error. +See L</500 Server error>. =item Might be a runaway multi-line %s string starting on line %d @@ -4974,7 +4974,7 @@ of "||". =item Premature end of script headers -See Server error. +See L</500 Server error>. =item printf() on closed filehandle %s @@ -5470,7 +5470,7 @@ in the regular expression the problem was discovered. (F) An C<(?R)> or C<(?0)> sequence in a regular expression was missing the final parenthesis. -=item Server error (a.k.a. "500 Server error") +=item Z<>500 Server error (A) This is the error message generally seen in a browser window when trying to run a CGI program (including SSI) over the web. The diff --git a/utf8.c b/utf8.c index cf7a690146..575e69d6f5 100644 --- a/utf8.c +++ b/utf8.c @@ -2541,7 +2541,7 @@ S_warn_on_first_deprecated_use(pTHX_ const char * const name, Perl_croak(aTHX_ "panic: hv_store() unexpectedly failed"); } - if (strEQ(file, "mathoms.c")) { + if (instr(file, "mathoms.c")) { Perl_warner(aTHX_ WARN_DEPRECATED, "In %s, line %d, starting in Perl v5.30, %s()" " will be removed. Avoid this message by" @@ -3052,27 +3052,27 @@ S_check_and_deprecate(pTHX_ const U8 *p, *e = p + UTF8SKIP(p); /* For mathoms.c calls, we use the function name we know is stored - * there */ + * there. It could be part of a larger path */ if (type == DEPRECATE_TO_UPPER) { - name = strEQ(file, "mathoms.c") + name = instr(file, "mathoms.c") ? "to_utf8_upper" : "toUPPER_utf8"; alternative = "toUPPER_utf8_safe"; } else if (type == DEPRECATE_TO_TITLE) { - name = strEQ(file, "mathoms.c") + name = instr(file, "mathoms.c") ? "to_utf8_title" : "toTITLE_utf8"; alternative = "toTITLE_utf8_safe"; } else if (type == DEPRECATE_TO_LOWER) { - name = strEQ(file, "mathoms.c") + name = instr(file, "mathoms.c") ? "to_utf8_lower" : "toLOWER_utf8"; alternative = "toLOWER_utf8_safe"; } else if (type == DEPRECATE_TO_FOLD) { - name = strEQ(file, "mathoms.c") + name = instr(file, "mathoms.c") ? "to_utf8_fold" : "toFOLD_utf8"; alternative = "toFOLD_utf8_safe"; -- Perl5 Master Repository
