]> granicus.if.org Git - php/commitdiff
- sync with 5.3
authorPierre Joye <pajoye@php.net>
Mon, 18 May 2009 12:03:05 +0000 (12:03 +0000)
committerPierre Joye <pajoye@php.net>
Mon, 18 May 2009 12:03:05 +0000 (12:03 +0000)
ext/curl/interface.c

index e845ee3b47add47df3af6ec3cd6881f6e26c81fe..4460037592c78bc2961ad353ed2a5595f0ae8d66 100644 (file)
@@ -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);