X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_int.h;h=ff220ca74b370c652f2ec462a2e5fce2f6573918;hp=5037bffec99a1e4f9b4115aac74a5ec3e87d741d;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=a8ac1f41f21043ec7fed928821255fb4ea5c2c62 diff --git a/php_http_request_int.h b/php_http_request_int.h index 5037bff..ff220ca 100644 --- a/php_http_request_int.h +++ b/php_http_request_int.h @@ -6,7 +6,7 @@ | modification, are permitted provided that the conditions mentioned | | in the accompanying LICENSE file are met. | +--------------------------------------------------------------------+ - | Copyright (c) 2004-2007, Michael Wallner | + | Copyright (c) 2004-2010, Michael Wallner | +--------------------------------------------------------------------+ */ @@ -41,11 +41,12 @@ } #define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \ if (!strcasecmp(key.str, keyname)) { \ - zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, zval_copy(IS_STRING, *param)); \ + zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, http_zsep(IS_STRING, *param)); \ if (obdc) { \ HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \ } \ HTTP_CURL_OPT(optname, Z_STRVAL_P(copy)); \ + zval_ptr_dtor(©); \ continue; \ } #define HTTP_CURL_OPT_LONG(OPTION, ldiff) \ @@ -55,9 +56,9 @@ } #define HTTP_CURL_OPT_LONG_EX(keyname, optname) \ if (!strcasecmp(key.str, keyname)) { \ - zval *copy = zval_copy(IS_LONG, *param); \ + zval *copy = http_zsep(IS_LONG, *param); \ HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \ - zval_free(©); \ + zval_ptr_dtor(©); \ continue; \ }