From 2143db98f6f526936a3acdc86cc6e231c5530219 Mon Sep 17 00:00:00 2001
From: "bzrmirror%bugzilla.org"
 <bzrmirror%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 14 Feb 2014 23:30:51 +0000
Subject: [PATCH] Bug 970283: Bump URI version to 1.55 to correctly escape
 single quotes in URLs r=dkl a=justdave

git-svn-id: svn://10.0.0.236/trunk@265243 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev                     |  2 +-
 mozilla/webtools/bugzilla/Bugzilla/Bug.pm             |  2 --
 mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm          |  1 +
 .../bugzilla/Bugzilla/Install/Requirements.pm         | 11 ++---------
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 7efb3b222d1..5ceaa78b780 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-8918
\ No newline at end of file
+8919
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm b/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
index a96731949c0..128d2a4cd62 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Bug.pm
+++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
index df72d9cf788..39b985d290d 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
@@ -17,6 +17,7 @@ use Bugzilla::Error;
 use Bugzilla::Constants;
 use Bugzilla::Hook;
 
+use URI;
 use URI::QueryParam;
 
 ###############################
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
index e7212915318..74cbd82b472 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
+++ b/mozilla/webtools/bugzilla/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',