From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 14 Feb 2014 23:21:24 +0000 (+0100)
Subject: Bug 970283: Bump URI version to 1.55 to correctly escape single quotes in URLs
X-Git-Tag: bugzilla-4.5.3~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8445288a1ee4e1eaa4f2e45498ec2171187105ab;p=thirdparty%2Fbugzilla.git

Bug 970283: Bump URI version to 1.55 to correctly escape single quotes in URLs
r=dkl a=justdave
---

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index a96731949c..128d2a4cd6 100644
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -32,8 +32,6 @@ use Bugzilla::BugUrl;
 use List::MoreUtils qw(firstidx uniq part);
 use List::Util qw(min max first);
 use Storable qw(dclone);
-use URI;
-use URI::QueryParam;
 use Scalar::Util qw(blessed);
 
 use parent qw(Bugzilla::Object Exporter);
diff --git a/Bugzilla/BugUrl.pm b/Bugzilla/BugUrl.pm
index df72d9cf78..39b985d290 100644
--- a/Bugzilla/BugUrl.pm
+++ b/Bugzilla/BugUrl.pm
@@ -17,6 +17,7 @@ use Bugzilla::Error;
 use Bugzilla::Constants;
 use Bugzilla::Hook;
 
+use URI;
 use URI::QueryParam;
 
 ###############################
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index e721291531..74cbd82b47 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -148,9 +148,8 @@ sub REQUIRED_MODULES {
     {
         package => 'URI',
         module  => 'URI',
-        # This version properly handles a semicolon as the delimiter
-        # in a URL query string.
-        version => '1.37',
+        # Follows RFC 3986 to escape characters in URI::Escape.
+        version => '1.55',
     },
     # 0.32 fixes several memory leaks in the XS version of some functions.
     {
@@ -396,12 +395,6 @@ sub OPTIONAL_MODULES {
     },
 
     # memcached
-    {
-        package => 'URI-Escape',
-        module  => 'URI::Escape',
-        version => 0,
-        feature => ['memcached'],
-    },
     {
         package => 'Cache-Memcached',
         module  => 'Cache::Memcached',