summaryrefslogtreecommitdiffstats
path: root/Bugzilla/Util.pm
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2012-08-31 12:31:04 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2012-08-31 12:31:04 +0200
commit3088b1d2724d7959ea87e84cab98963e2d2c3e72 (patch)
tree1e2d34957160e9375539f8e03a025e984455f7ab /Bugzilla/Util.pm
parentab612efff307c445c25d010ac8a2eaba6fd93228 (diff)
downloadbugzilla-3088b1d2724d7959ea87e84cab98963e2d2c3e72.tar.gz
bugzilla-3088b1d2724d7959ea87e84cab98963e2d2c3e72.tar.xz
Bug 655477: Bugzilla now requires Perl 5.10.1
r=mkanat a=LpSolit
Diffstat (limited to 'Bugzilla/Util.pm')
-rw-r--r--Bugzilla/Util.pm21
1 files changed, 2 insertions, 19 deletions
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index 810c6972f..78ef21e1d 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -8,6 +8,7 @@
package Bugzilla::Util;
use strict;
+use feature ':5.10';
use base qw(Exporter);
@Bugzilla::Util::EXPORT = qw(trick_taint detaint_natural detaint_signed
@@ -404,13 +405,6 @@ sub diff_arrays {
return (\@removed, \@added);
}
-# XXX - This is a temporary subroutine till we require Perl 5.10.1.
-# This will happen before Bugzilla 5.0rc1.
-sub say (@) {
- print @_;
- print "\n";
-}
-
sub trim {
my ($str) = @_;
if ($str) {
@@ -437,11 +431,6 @@ sub wrap_comment {
$wrappedcomment .= ($line . "\n");
}
else {
- # Due to a segfault in Text::Tabs::expand() when processing tabs with
- # Unicode (see http://rt.perl.org/rt3/Public/Bug/Display.html?id=52104),
- # we have to remove tabs before processing the comment. This restriction
- # can go away when we require Perl 5.8.9 or newer.
- $line =~ s/\t/ /g;
$wrappedcomment .= (wrap('', '', $line) . "\n");
}
}
@@ -590,15 +579,9 @@ sub bz_crypt {
if (Bugzilla->params->{'utf8'}) {
utf8::encode($password) if utf8::is_utf8($password);
}
-
+
# Crypt the password.
$crypted_password = crypt($password, $salt);
-
- # HACK: Perl has bug where returned crypted password is considered
- # tainted. See http://rt.perl.org/rt3/Public/Bug/Display.html?id=59998
- unless(tainted($password) || tainted($salt)) {
- trick_taint($crypted_password);
- }
}
else {
my $hasher = Digest->new($algorithm);