diff options
Diffstat (limited to 'ext/curl/curl_file.c')
| -rw-r--r-- | ext/curl/curl_file.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ext/curl/curl_file.c b/ext/curl/curl_file.c index 91dfd275b5..6b0e5462a1 100644 --- a/ext/curl/curl_file.c +++ b/ext/curl/curl_file.c @@ -1,8 +1,8 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ - | Copyright (c) 1997-2013 The PHP Group | + | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ | This source file is subject to version 3.01 of the PHP license, | | that is bundled with this package in the file LICENSE, and is | @@ -32,7 +32,7 @@ PHP_CURL_API zend_class_entry *curl_CURLFile_class; static void curlfile_ctor(INTERNAL_FUNCTION_PARAMETERS) { char *fname = NULL, *mime = NULL, *postname = NULL; - int fname_len, mime_len, postname_len; + size_t fname_len, mime_len, postname_len; zval *cf = return_value; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ss", &fname, &fname_len, &mime, &mime_len, &postname, &postname_len) == FAILURE) { @@ -77,15 +77,13 @@ static void curlfile_get_property(char *name, INTERNAL_FUNCTION_PARAMETERS) return; } res = zend_read_property(curl_CURLFile_class, getThis(), name, strlen(name), 1 TSRMLS_CC); - *return_value = *res; - zval_copy_ctor(return_value); - INIT_PZVAL(return_value); + RETURN_ZVAL(res, 1, 0); } static void curlfile_set_property(char *name, INTERNAL_FUNCTION_PARAMETERS) { char *arg = NULL; - int arg_len; + size_t arg_len; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &arg, &arg_len) == FAILURE) { return; |