From 47c902777297ce895aa915c13efdb00881af3669 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 3 Jan 2014 11:06:16 +0800 Subject: Bump year --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index c45ed80fc2..e02a890b0b 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | PHP Version 5 | +----------------------------------------------------------------------+ - | 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 | -- cgit v1.2.1 From 488e64dbe4052eafd8b8bb5dd07b0c9ea6fa97f3 Mon Sep 17 00:00:00 2001 From: datibbaw Date: Mon, 18 Nov 2013 12:06:27 +0800 Subject: Allow NULL as value for CURLOPT_CUSTOMREQUEST option. Added test case. Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE. Removed unused error variable. Indentation fix. Removed the ugly goto. --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index e02a890b0b..96edb9ae03 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -198,7 +198,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; -- cgit v1.2.1 From c5e63f8a63b03b52cae35906625497bd17592c4e Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 9 May 2014 12:17:09 +0800 Subject: Refactoring ext/curl (only compilable now) --- ext/curl/php_curl.h | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 96edb9ae03..018add502b 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -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; @@ -178,18 +178,18 @@ typedef struct { void ***thread_ctx; CURL *cp; php_curl_handlers *handlers; - long id; + zend_resource *res; zend_bool in_callback; - zval *clone; + zval 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 { -- cgit v1.2.1 From 2d9bc88db8caebd44d81cbdfbcb109cf3bdfbca8 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 9 May 2014 14:00:47 +0800 Subject: Fixed clone refcount --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 018add502b..3994ca9dc1 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -180,7 +180,7 @@ typedef struct { php_curl_handlers *handlers; zend_resource *res; zend_bool in_callback; - zval clone; + zend_uint clone; zend_bool safe_upload; } php_curl; -- cgit v1.2.1 From 763cee63abbb316132de40082eb151fce7bd504d Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Fri, 9 May 2014 14:14:09 +0800 Subject: Use zend_string for better performance --- ext/curl/php_curl.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 3994ca9dc1..e82fd3f38b 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -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 { -- cgit v1.2.1 From 6f9f0bf2056f0dc17d9bcc6dd3b7d28ac878c6fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 25 Aug 2014 19:28:33 +0200 Subject: master renames phase 2 --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index e82fd3f38b..c75d7f80d1 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -179,7 +179,7 @@ typedef struct { php_curl_handlers *handlers; zend_resource *res; zend_bool in_callback; - zend_uint clone; + uint32_t clone; zend_bool safe_upload; } php_curl; -- cgit v1.2.1 From d0cb715373c3fbe9dc095378ec5ed8c71f799f67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Schl=C3=BCter?= Date: Fri, 19 Sep 2014 18:33:14 +0200 Subject: s/PHP 5/PHP 7/ --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index c75d7f80d1..cc96a410f3 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -1,6 +1,6 @@ /* +----------------------------------------------------------------------+ - | PHP Version 5 | + | PHP Version 7 | +----------------------------------------------------------------------+ | Copyright (c) 1997-2014 The PHP Group | +----------------------------------------------------------------------+ -- cgit v1.2.1 From e33f3d3b7c9a69fe069484045a27d282aa98b00e Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sat, 20 Sep 2014 22:42:02 +0200 Subject: Move smart_str implementation into Zend/ So we can use it there as well... For now I've retained the zend_smart_str_public.h header, though it would probably be better to just move that one struct into zend_types.h. --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index cc96a410f3..665682c23a 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -23,7 +23,7 @@ #define _PHP_CURL_H #include "php.h" -#include "ext/standard/php_smart_str.h" +#include "zend_smart_str_public.h" #ifdef COMPILE_DL_CURL #undef HAVE_CURL -- cgit v1.2.1 From a770d29df74515197c76efdf1a64d9794c27b4af Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Sun, 21 Sep 2014 20:47:07 +0200 Subject: Add smart_str_append for appending zend_strings Also replaces usages in Zend/ and ext/standard --- ext/curl/php_curl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ext/curl/php_curl.h') diff --git a/ext/curl/php_curl.h b/ext/curl/php_curl.h index 665682c23a..ad44ae7b96 100644 --- a/ext/curl/php_curl.h +++ b/ext/curl/php_curl.h @@ -23,7 +23,7 @@ #define _PHP_CURL_H #include "php.h" -#include "zend_smart_str_public.h" +#include "zend_smart_str.h" #ifdef COMPILE_DL_CURL #undef HAVE_CURL -- cgit v1.2.1