From: Sterling Hughes <sterling@php.net>
Date: Thu, 4 Apr 2002 00:04:25 +0000 (+0000)
Subject: MFH
X-Git-Tag: php-4.2.0RC3~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20c3de56d5d9e20f599d76144073047eea643c9f;p=php

MFH
---

diff --git a/ext/curl/curl.c b/ext/curl/curl.c
index b381ebfdf6..55971e5c3c 100644
--- a/ext/curl/curl.c
+++ b/ext/curl/curl.c
@@ -790,8 +790,8 @@ PHP_FUNCTION(curl_setopt)
 				}
 			}
 
+			SAVE_CURL_ERROR(ch, error);
 			if (error != CURLE_OK) {
-				SAVE_CURL_ERROR(ch, error);
 				RETURN_FALSE;
 			}
 
@@ -849,9 +849,9 @@ PHP_FUNCTION(curl_setopt)
 		break;
 	}
 	}
-	
+
+	SAVE_CURL_ERROR(ch, error);
 	if (error != CURLE_OK) {
-		SAVE_CURL_ERROR(ch, error);
 		RETURN_FALSE;
 	} else {
 		RETURN_TRUE;
@@ -874,10 +874,10 @@ PHP_FUNCTION(curl_exec)
 	ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
 
 	error = curl_easy_perform(ch->cp);
+	SAVE_CURL_ERROR(ch, error);
 	if (error != CURLE_OK) {
 		if (ch->handlers->write->buf.len > 0)
 			smart_str_free(&ch->handlers->write->buf);
-		SAVE_CURL_ERROR(ch, error);
 		RETURN_FALSE;
 	}