diff --git a/git_cl/upload.py b/git_cl/upload.py
index f7a2bf5d97..ff7d3f33e7 100644
--- a/git_cl/upload.py
+++ b/git_cl/upload.py
@@ -90,9 +90,9 @@ VCS_UNKNOWN = "Unknown"
 
 # whitelist for non-binary filetypes which do not start with "text/"
 # .mm (Objective-C) shows up as application/x-freemind on my Linux box.
-TEXT_MIMETYPES = ['application/javascript', 'application/x-javascript',
-                  'application/xml', 'application/x-freemind', 
-                  'application/x-sh']
+TEXT_MIMETYPES = ['application/javascript', 'application/json',
+                  'application/x-javascript', 'application/xml',
+                  'application/x-freemind', 'application/x-sh']
 
 VCS_ABBREVIATIONS = {
   VCS_MERCURIAL.lower(): VCS_MERCURIAL,
@@ -416,6 +416,14 @@ class AbstractRpcServer(object):
             url = e.info()["location"]
           else:
             raise
+        except urllib2.URLError, e:
+          reason = getattr(e, 'reason', None)
+          if isinstance(reason, str) and reason.find("110") != -1:
+            # Connection timeout error.
+            if tries <= 3:
+              # Try again.
+              continue
+          raise
     finally:
       socket.setdefaulttimeout(old_timeout)
 
diff --git a/third_party/upload.py b/third_party/upload.py
index a49d533af2..ff7d3f33e7 100755
--- a/third_party/upload.py
+++ b/third_party/upload.py
@@ -90,9 +90,9 @@ VCS_UNKNOWN = "Unknown"
 
 # whitelist for non-binary filetypes which do not start with "text/"
 # .mm (Objective-C) shows up as application/x-freemind on my Linux box.
-TEXT_MIMETYPES = ['application/javascript', 'application/x-javascript',
-                  'application/xml', 'application/x-freemind', 
-                  'application/x-sh']
+TEXT_MIMETYPES = ['application/javascript', 'application/json',
+                  'application/x-javascript', 'application/xml',
+                  'application/x-freemind', 'application/x-sh']
 
 VCS_ABBREVIATIONS = {
   VCS_MERCURIAL.lower(): VCS_MERCURIAL,