Closed curl handles and refined endpoint check

magicdude4eva · May 30, 2016 · 0a8eaf8 · 0a8eaf8
1 parent 8b4ec2b
commit 0a8eaf8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/providers/bounce-provider-interspire.php b/providers/bounce-provider-interspire.php
@@ -115,6 +115,7 @@ function Interspire_getLists() {
 	curl_setopt($ch, CURLOPT_TIMEOUT, ENDPOINT_TIMEOUT);
 	curl_setopt($ch, CURLOPT_POSTFIELDS, $xml);
 	$result = curl_exec($ch);
+	curl_close ($ch);
 
 	if ($result === false || is_null($result) || empty($result)) {
 		$log->lwrite('  Interspire: Can not access Interspire to get Interspire Lists!');
@@ -144,6 +145,7 @@ function Interspire_postXMLData($xml) {
 	curl_setopt($ch, CURLOPT_TIMEOUT, ENDPOINT_TIMEOUT);
 	curl_setopt($ch, CURLOPT_POSTFIELDS, $xml);
 	$result = curl_exec($ch);
+	curl_close ($ch);
 
 	if ($result === false || is_null($result) || empty($result))
     	return null;
@@ -179,6 +181,8 @@ function Interspire_getAllListsForEmailAddress($email) {
     curl_setopt($ch, CURLOPT_TIMEOUT, ENDPOINT_TIMEOUT);
     curl_setopt($ch, CURLOPT_POSTFIELDS, $xml);
     $result = curl_exec($ch);
+    curl_close ($ch);
+
     if ($result === false || is_null($result) || empty($result))
     	return null;
 

diff --git a/setup.php b/setup.php
@@ -163,7 +163,7 @@ public static function testEndpointURL($endpointURL) {
 
 	$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
 
-	if ($httpCode != 200) {
+	if ($httpCode != 200 && $httpCode != 301 && $httpCode != 302) {
 		$log->lwrite('   Failed connecting to ' . $endpointURL . ', error=' . $httpCode);
 		return false;
 	}