Revert "Remove caTools dependency"

This reverts commit e4239c924b.

I totally forgot the problems this causes with R 2.15 and thus
glimmer/spark. httpuv 1.2.2 requires Rcpp 0.11 which requires
R 3.0. So existing installs (like glimmer/spark) that are
running just fine with httpuv 1.2.0 will be forced to upgrade,
which is hard to do when you don't know the provenance of
all the packages installed by your users.

DESCRIPTION

@@ -16,7 +16,8 @@ Depends:
 Imports:
     tools,
     utils,
-    httpuv (>= 1.2.2),
+    httpuv (>= 1.2.0),
+    caTools,
     RJSONIO,
     xtable,
     digest,

NAMESPACE

@@ -181,6 +181,7 @@ export(wellPanel)
 export(withMathJax)
 export(withReactiveDomain)
 export(withTags)
+import(caTools)
 import(digest)
 import(htmltools)
 import(httpuv)

R/shiny.R

@@ -15,7 +15,7 @@ NULL
 #' @name shiny-package
 #' @aliases shiny
 #' @docType package
-#' @import htmltools httpuv xtable digest methods
+#' @import htmltools httpuv caTools xtable digest methods
 #' @importFrom RJSONIO fromJSON
 NULL
 
@@ -671,7 +671,7 @@ ShinySession <- setRefClass(
       fileData <- readBin(file, 'raw', n=bytes)
 
       if (isTRUE(.clientData$.values$allowDataUriScheme)) {
-        b64 <- rawToBase64(fileData)
+        b64 <- base64encode(fileData)
         return(paste('data:', contentType, ';base64,', b64, sep=''))
       } else {
         return(saveFileUrl(name, fileData, contentType))