diff options
Diffstat (limited to 'ext/curl/php_curl.h')
| -rw-r--r-- | ext/curl/php_curl.h | 69 |
1 files changed, 34 insertions, 35 deletions
diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index c45ed80fc2..ad44ae7b96 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -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 | @@ -23,7 +23,7 @@ #define _PHP_CURL_H #include "php.h" -#include "ext/standard/php_smart_str.h" +#include "zend_smart_str.h" #ifdef COMPILE_DL_CURL #undef HAVE_CURL @@ -114,44 +114,44 @@ PHP_FUNCTION(curl_pause); PHP_FUNCTION(curl_file_create); -void _php_curl_multi_close(zend_rsrc_list_entry * TSRMLS_DC); -void _php_curl_share_close(zend_rsrc_list_entry * TSRMLS_DC); +void _php_curl_multi_close(zend_resource * TSRMLS_DC); +void _php_curl_share_close(zend_resource * TSRMLS_DC); typedef struct { - zval *func_name; - zend_fcall_info_cache fci_cache; - FILE *fp; - smart_str buf; - int method; - zval *stream; + zval func_name; + zend_fcall_info_cache fci_cache; + FILE *fp; + smart_str buf; + int method; + zval stream; } php_curl_write; typedef struct { - zval *func_name; - zend_fcall_info_cache fci_cache; - FILE *fp; - long fd; - int method; - zval *stream; + zval func_name; + zend_fcall_info_cache fci_cache; + FILE *fp; + zend_resource *res; + int method; + zval stream; } php_curl_read; typedef struct { - zval *func_name; - zend_fcall_info_cache fci_cache; - int method; + zval func_name; + zend_fcall_info_cache fci_cache; + int method; } php_curl_progress, php_curl_fnmatch; typedef struct { - php_curl_write *write; - php_curl_write *write_header; - php_curl_read *read; + php_curl_write *write; + php_curl_write *write_header; + php_curl_read *read; #if CURLOPT_PASSWDFUNCTION != 0 - zval *passwd; + zval passwd; #endif - zval *std_err; - php_curl_progress *progress; + zval std_err; + php_curl_progress *progress; #if LIBCURL_VERSION_NUM >= 0x071500 /* Available since 7.21.0 */ - php_curl_fnmatch *fnmatch; + php_curl_fnmatch *fnmatch; #endif } php_curl_handlers; @@ -161,8 +161,7 @@ struct _php_curl_error { }; struct _php_curl_send_headers { - char *str; - size_t str_len; + zend_string *str; }; struct _php_curl_free { @@ -178,18 +177,18 @@ typedef struct { void ***thread_ctx; CURL *cp; php_curl_handlers *handlers; - long id; + zend_resource *res; zend_bool in_callback; - zval *clone; + uint32_t clone; zend_bool safe_upload; } php_curl; #define CURLOPT_SAFE_UPLOAD -1 typedef struct { - int still_running; - CURLM *multi; - zend_llist easyh; + int still_running; + CURLM *multi; + zend_llist easyh; } php_curlm; typedef struct { @@ -198,7 +197,7 @@ typedef struct { void _php_curl_cleanup_handle(php_curl *); void _php_curl_multi_cleanup_list(void *data); -int _php_curl_verify_handlers(php_curl *ch, int reporterror TSRMLS_DC); +void _php_curl_verify_handlers(php_curl *ch, int reporterror TSRMLS_DC); void curlfile_register_class(TSRMLS_D); PHP_CURL_API extern zend_class_entry *curl_CURLFile_class; |