From 0db2a1d110f00a8fca73ff8eca375ffa308d68ea Mon Sep 17 00:00:00 2001
From: Samuel Clay <samuel@ofbrooklyn.com>
Date: Thu, 22 May 2014 15:09:08 -0700
Subject: [PATCH] Revert "Ripping out SNI/openssl/requests latest. Turns out
 pyOpenSSL barfs on a ton of pages."

This reverts commit 177b8aea09b52b22913413ca8169fc0e85b4eeee.
---
 apps/rss_feeds/page_importer.py | 2 +-
 config/requirements.txt         | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/rss_feeds/page_importer.py b/apps/rss_feeds/page_importer.py
index 6d58b14b7..519e5599f 100644
--- a/apps/rss_feeds/page_importer.py
+++ b/apps/rss_feeds/page_importer.py
@@ -50,7 +50,6 @@ class PageImporter(object):
                 's' if self.feed.num_subscribers != 1 else '',
                 self.feed.permalink,
             ),
-            'Connection': 'close',
         }
     
     @timelimit(15)
@@ -79,6 +78,7 @@ class PageImporter(object):
                 else:
                     try:
                         response = requests.get(feed_link, headers=self.headers)
+                        response.connection.close()
                     except requests.exceptions.TooManyRedirects:
                         response = requests.get(feed_link)
                     except (AttributeError, SocketError), e:
diff --git a/config/requirements.txt b/config/requirements.txt
index 4a06e579f..a96037a0a 100755
--- a/config/requirements.txt
+++ b/config/requirements.txt
@@ -37,9 +37,12 @@ raven==3.1.17
 readline==6.2.4.1
 redis==2.8.0
 hiredis==0.1.1
-requests==1.1.0
+requests==2.2.1
 seacucumber==1.5
 South==0.7.6
 stripe==1.12.2
 django-oauth-toolkit==0.5.0
 django-cors-headers==0.12
+pyOpenSSL==0.14
+pyasn1==0.1.7
+ndg-httpsclient==0.3.2