Fix for validate_cart

agschwender · Jun 11, 2014 · a78db24 · a78db24
1 parent 095b4ea
commit a78db24
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -29,3 +29,4 @@
   * 0.9.16: Added validate cert to configuration
   * 0.9.17: Added support for GIF format
   * 0.9.18: Fix for travis builds on python 2.6 and 3.3
+  * 0.9.19: Validate cert fix
diff --git a/README.rst b/README.rst
@@ -498,6 +498,7 @@ Changelog
 -  0.9.16: Added validate cert to configuration
 -  0.9.17: Added support for GIF format
 -  0.9.18: Fix for travis builds on python 2.6 and 3.3
+-  0.9.19: Validate cert fix
 
 TODO
 ====

diff --git a/pilbox/__init__.py b/pilbox/__init__.py
@@ -50,13 +50,14 @@
   * 0.9.16: Added validate cert to configuration
   * 0.9.17: Added support for GIF format
   * 0.9.18: Fix for travis builds on python 2.6 and 3.3
+  * 0.9.19: Validate cert fix
 """
 
 # human-readable version number
-version = "0.9.18"
+version = "0.9.19"
 
 # The first three numbers are the components of the version number.
 # The fourth is zero for an official release, positive for a development
 # branch, or negative for a release candidate or beta (after the base version
 # number has been incremented)
-version_info = (0, 9, 18, 0)
+version_info = (0, 9, 19, 0)
diff --git a/pilbox/app.py b/pilbox/app.py
@@ -113,11 +113,12 @@ def get(self):
             url = urljoin(self.settings.get("implicit_base_url"), url)
 
         client = tornado.httpclient.AsyncHTTPClient(
-            max_clients=self.settings.get("max_requests"),
-            validate_cert=self.settings.get("validate_cert"))
+            max_clients=self.settings.get("max_requests"))
         try:
             resp = yield client.fetch(
-                url, request_timeout=self.settings.get("timeout"))
+                url,
+                request_timeout=self.settings.get("timeout"),
+                validate_cert=self.settings.get("validate_cert"))
         except (socket.gaierror, tornado.httpclient.HTTPError) as e:
             logger.warn("Fetch error for %s: %s"
                         % (self.get_argument("url"), str(e)))

diff --git a/setup.py b/setup.py
@@ -21,7 +21,7 @@ def run(self):
 
 
 setup(name='pilbox',
-      version='0.9.18',
+      version='0.9.19',
       description='Pilbox is an image resizing application server built on the Tornado web framework using the Pillow Imaging Library',
       long_description=readme,
       classifiers=[