Changeset 31781 for main/trunk

Timestamp:

2017-07-07T20:11:43+12:00 (7 years ago)

Author:

ak19

Message:

Adding in patches to cpan perl code as required to get the remote greenstone server to still work with perl v 5.22.1. Not tested these changes with out usual perl 5.18. I'm not getting a newer version of these modules from CPAN since I'm not sure whether there may be some compatibility issues of the newer versions with our existing code. So I'm making the smallest number of changes that will keep our code still working.

Location:

main/trunk/greenstone2/perllib/cpan

Files:

• JSON/PP.pm (modified) (1 diff)
• URI/Escape.pm (modified) (1 diff)

main/trunk/greenstone2/perllib/cpan/JSON/PP.pm

@@ -1487 +1487 @@
     $self->{incr_p} = 0;
 
-    return $obj or '';
+    # To avoid syntax errors in newer versions of perl,
+    # putting the return in brackets as explained at
+    # https://rt.cpan.org/Public/Bug/Display.html?id=87302
+    # "returns binds stronger than or, so the expressions after or are ignored.
+    # See https://rt.perl.org/rt3/Public/Bug/Display.html?id=59802"
+    return ($obj or '');
 }
 

main/trunk/greenstone2/perllib/cpan/URI/Escape.pm

@@ -202 +202 @@
 }
 
+# https://rt.cpan.org/Public/Bug/Display.html?id=105109
+# https://github.com/libwww-perl/uri/commit/7e03cdd3e5d25df5556a36dbfcd5d6cbcd676afb
+# escape_char is buggy as it assigns meaning to the string's storage format.
 sub escape_char {
-    return join '', @URI::Escape::escapes{$_[0] =~ /(\C)/g};
+
+    # to fix new "\C is deprecated in regex" warning in 5.21.2 (RT#96941)
+    #return join '', @URI::Escape::escapes{$_[0] =~ /(\C)/g};
+    if (utf8::is_utf8($_[0])) {
+        my $s = $_[0];
+        utf8::encode($s);
+        unshift(@_, $s);
+    }
+    
+    return join '', @URI::Escape::escapes{$_[0] =~ /(.)/sg};
 }