commit ce70ba20c925e2b641798d791a3e6b9b2727c89c
author Josip Sokcevic <jsokcevic@thumbtack.com> Thu Sep 20 11:35:22 2018 -0700
committer James E. King III <jking@apache.org> Fri Sep 21 13:27:15 2018 -0400
tree f141ee0237e0aa390428a32bd06484d06a7639bf
parent cbcfb2573f924cb051b7678b5cb4f7ef7138be49

THRIFT-4641: Check HTTP Status Code in TCurlClient

lib/php/lib/Transport/TCurlClient.php

diff --git a/lib/php/lib/Transport/TCurlClient.php b/lib/php/lib/Transport/TCurlClient.php
index f51fa88..2ca4f65 100644
--- a/lib/php/lib/Transport/TCurlClient.php
+++ b/lib/php/lib/Transport/TCurlClient.php
@@ -220,12 +220,18 @@
         curl_setopt(self::$curlHandle, CURLOPT_URL, $fullUrl);
         $this->response_ = curl_exec(self::$curlHandle);
 
-        // Connect failed?
-        if (!$this->response_) {
+        $code = curl_getinfo(self::$curlHandle, CURLINFO_HTTP_CODE);
+
+        // Handle non 200 status code / connect failure
+        if (!$this->response_ || $code !== 200) {
             curl_close(self::$curlHandle);
             self::$curlHandle = null;
+            $this->response_ = null;
             $error = 'TCurlClient: Could not connect to ' . $fullUrl;
-            throw new TTransportException($error, TTransportException::NOT_OPEN);
+            if ($code) {
+                $error .= ', HTTP status code: ' . $code;
+            }
+            throw new TTransportException($error, TTransportException::UNKNOWN);
         }
     }