From 8445288a1ee4e1eaa4f2e45498ec2171187105ab Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Sat, 15 Feb 2014 00:21:24 +0100
Subject: Bug 970283: Bump URI version to 1.55 to correctly escape single
 quotes in URLs r=dkl a=justdave

---
 Bugzilla/Bug.pm                  |  2 --
 Bugzilla/BugUrl.pm               |  1 +
 Bugzilla/Install/Requirements.pm | 11 ++---------
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index a96731949..128d2a4cd 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 df72d9cf7..39b985d29 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 e72129153..74cbd82b4 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',
-- 
cgit v1.2.3-24-g4f1b