apply patch from RT#96941 to fix new "\C is deprecated in regex" warn…

…ing in 5.21.2
libwww-perl · Jul 12, 2014 · 7e03cdd · 7e03cdd
1 parent 90e11b8
commit 7e03cdd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -7,6 +7,9 @@
       5.21.1)
     - remove all remaining uses of "use vars"
 
+  Eric Brine:
+    - fixed new "\C is deprecated in regex" warning in 5.21.2 (RT#96941)
+
 
 2014-07-01   Karen Etheridge <ether@cpan.org>
 

diff --git a/URI/Escape.pm b/URI/Escape.pm
@@ -202,8 +202,15 @@ sub uri_unescape {
     $str;
 }
 
+# XXX FIXME 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};
+    if (utf8::is_utf8($_[0])) {
+        my $s = $_[0];
+        utf8::encode($s);
+        unshift(@_, $s);
+    }
+
+    return join '', @URI::Escape::escapes{$_[0] =~ /(.)/sg};
 }
 
 1;