From: Pierre Joye <pajoye@php.net>
Date: Mon, 18 May 2009 12:03:05 +0000 (+0000)
Subject: - sync with 5.3
X-Git-Tag: php-5.4.0alpha1~191^2~3627
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da4f049b2b2e6b538df14362fd81ff22a404abff;p=php

- sync with 5.3
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index e845ee3b47..4460037592 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1298,8 +1298,7 @@ PHP_FUNCTION(curl_version)
 		array_init(protocol_list);
 
 		while (*p != NULL) {
-			add_next_index_ascii_string(protocol_list, *p, 1);
-			*p++;
+			add_next_index_ascii_string(protocol_list, *p++, 1);
 		}
 		CAAZ("protocols", protocol_list);
 	}
@@ -1411,7 +1410,7 @@ PHP_FUNCTION(curl_copy_handle)
 	php_curl	*ch, *dupch;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &zid) == FAILURE) {
-		RETURN_FALSE;
+		return;
 	}
 
 	ZEND_FETCH_RESOURCE(ch, php_curl *, &zid, -1, le_curl_name, le_curl);