Mercurial > hg > nginx-tests

changeset 624:1dd0e909fe94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Tests: compatibility with perl <= 5.12 in config_dump.t. Older perl versions do not have the tr 'r' option.
author Sergey Kandaurov <pluknet@nginx.com>
date Tue, 07 Jul 2015 17:42:58 +0300
parents b70df6924290
children 0016fe31be13
files config_dump.t
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/config_dump.t
+++ b/config_dump.t
@@ -100,5 +100,7 @@ sub getconf {
 	my $prefix = "# configuration file $d/$conf:\n";
 	my $offset = index($string, $prefix) + length($prefix);
 	my $len = length($t->read_file($conf));
-	return substr($string, $offset, $len) =~ tr/\r//rd;
+	my $s = substr($string, $offset, $len);
+	$s =~ tr/\r//d;
+	return $s;
 }