Patch curl_share.diff for cURL related Bug #55540

Patch version 2011-11-23 07:11 UTC

• 2011-11-23 07:11 UTC [diff to current]

Developer: pierrick@php.net

diff --git a/config.m4 b/config.m4
index 1f4c3b6..8eab305 100644
--- a/config.m4
+++ b/config.m4
@@ -156,6 +156,6 @@ int main(int argc, char *argv[])
     AC_DEFINE(PHP_CURL_URL_WRAPPERS,1,[ ])
   fi
 
-  PHP_NEW_EXTENSION(curl, interface.c multi.c streams.c, $ext_shared)
+  PHP_NEW_EXTENSION(curl, interface.c multi.c share.c streams.c, $ext_shared)
   PHP_SUBST(CURL_SHARED_LIBADD)
 fi
diff --git a/config.w32 b/config.w32
index 035473c..05dcfdb 100644
--- a/config.w32
+++ b/config.w32
@@ -13,7 +13,7 @@ if (PHP_CURL != "no") {
 		&& (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib;zlib.lib", "curl", PHP_CURL))) || 
 			(PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "curl", PHP_CURL)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))
 		) {
-		EXTENSION("curl", "interface.c multi.c streams.c", true);
+		EXTENSION("curl", "interface.c multi.c share.c streams.c", true);
 		AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
 		AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
 		AC_DEFINE('HAVE_CURL_EASY_STRERROR', 1, 'Have curl_easy_strerror in cURL');
diff --git a/curl.dsp b/curl.dsp
index 81d8231..6524fce 100644
--- a/curl.dsp
+++ b/curl.dsp
@@ -166,6 +166,10 @@ SOURCE=.\multi.c
 # End Source File
 
 # Begin Source File
+SOURCE=.\share.c
+# End Source File
+
+# Begin Source File
 SOURCE=.\streams.c
 # End Source File
 
diff --git a/interface.c b/interface.c
index 3a89f6b..a75b290 100644
--- a/interface.c
+++ b/interface.c
@@ -90,6 +90,7 @@
 
 int  le_curl;
 int  le_curl_multi_handle;
+int  le_curl_share_handle;
 
 #ifdef PHP_CURL_NEED_OPENSSL_TSL /* {{{ */
 static MUTEX_T *php_curl_openssl_tsl = NULL;
@@ -348,6 +349,19 @@ ZEND_END_ARG_INFO()
 ZEND_BEGIN_ARG_INFO(arginfo_curl_multi_close, 0)
 	ZEND_ARG_INFO(0, mh)
 ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_curl_share_init, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_curl_share_close, 0)
+	ZEND_ARG_INFO(0, sh)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO(arginfo_curl_share_setopt, 0)
+	ZEND_ARG_INFO(0, sh)
+	ZEND_ARG_INFO(0, option)
+	ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
 /* }}} */
 
 /* {{{ curl_functions[]
@@ -371,6 +385,9 @@ const zend_function_entry curl_functions[] = {
 	PHP_FE(curl_multi_getcontent,    arginfo_curl_multi_getcontent)
 	PHP_FE(curl_multi_info_read,     arginfo_curl_multi_info_read)
 	PHP_FE(curl_multi_close,         arginfo_curl_multi_close)
+	PHP_FE(curl_share_init,          arginfo_curl_share_init)
+	PHP_FE(curl_share_close,         arginfo_curl_share_close)
+	PHP_FE(curl_share_setopt,        arginfo_curl_share_setopt)
 	PHP_FE_END
 };
 /* }}} */
@@ -527,6 +544,7 @@ PHP_MINIT_FUNCTION(curl)
 {
 	le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number);
 	le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl_multi", module_number);
+	le_curl_share_handle = zend_register_list_destructors_ex(_php_curl_share_close, NULL, "curl_share", module_number);
 
 	REGISTER_INI_ENTRIES();
 
@@ -988,6 +1006,16 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLFTPMETHOD_SINGLECWD);
 #endif
 
+	/* Constant for curl_share_setopt */
+	REGISTER_CURL_CONSTANT(CURLOPT_SHARE);
+	REGISTER_CURL_CONSTANT(CURLSHOPT_SHARE);
+	REGISTER_CURL_CONSTANT(CURLSHOPT_UNSHARE);
+	REGISTER_CURL_CONSTANT(CURL_LOCK_DATA_COOKIE);
+	REGISTER_CURL_CONSTANT(CURL_LOCK_DATA_DNS);
+	REGISTER_CURL_CONSTANT(CURL_LOCK_DATA_SSL_SESSION);
+	REGISTER_CURL_CONSTANT(CURLSHOPT_LOCKFUNC);
+	REGISTER_CURL_CONSTANT(CURLSHOPT_UNLOCKFUNC);
+
 #ifdef PHP_CURL_NEED_OPENSSL_TSL
 	if (!CRYPTO_get_id_callback()) {
 		int i, c = CRYPTO_num_locks();
@@ -2414,6 +2442,15 @@ string_copy:
 				curl_easy_setopt(ch->cp, CURLOPT_VERBOSE, 0);
 			}
 			break;
+		case CURLOPT_SHARE:
+			{
+				php_curlsh *sh = NULL;
+			    ZEND_FETCH_RESOURCE(sh, php_curlsh *, zvalue, -1, le_curl_share_handle_name, le_curl_share_handle);
+				if (sh) {
+					curl_easy_setopt(ch->cp, CURLOPT_SHARE, sh->share);
+				}
+			}
+
 	}
 
 	SAVE_CURL_ERROR(ch, error);
diff --git a/package.xml b/package.xml
index 85cb634..c143217 100644
--- a/package.xml
+++ b/package.xml
@@ -39,6 +39,7 @@ package.xml added to support installation using pear installer
    <file role="src" name="curl.dsp"/>
    <file role="src" name="interface.c"/>
    <file role="src" name="multi.c"/>
+   <file role="src" name="share.c"/>
    <file role="src" name="streams.c"/>
    <file role="src" name="php_curl.h"/>
   </filelist>
diff --git a/php_curl.h b/php_curl.h
index fbfcc7c..b0451a5 100644
--- a/php_curl.h
+++ b/php_curl.h
@@ -53,6 +53,8 @@ extern int  le_curl;
 #define le_curl_name "cURL handle"
 extern int  le_curl_multi_handle;
 #define le_curl_multi_handle_name "cURL Multi Handle"
+extern int  le_curl_share_handle;
+#define le_curl_share_handle_name "cURL Share Handle"
 
 PHP_MINIT_FUNCTION(curl);
 PHP_MSHUTDOWN_FUNCTION(curl);
@@ -75,7 +77,12 @@ PHP_FUNCTION(curl_multi_exec);
 PHP_FUNCTION(curl_multi_getcontent);
 PHP_FUNCTION(curl_multi_info_read);
 PHP_FUNCTION(curl_multi_close);
+PHP_FUNCTION(curl_share_init);
+PHP_FUNCTION(curl_share_close);
+PHP_FUNCTION(curl_share_setopt);
+
 void _php_curl_multi_close(zend_rsrc_list_entry * TSRMLS_DC);
+void _php_curl_share_close(zend_rsrc_list_entry * TSRMLS_DC);
 
 typedef struct {
 	zval            *func_name;
@@ -145,6 +152,11 @@ typedef struct {
 	zend_llist easyh;
 } php_curlm;
 
+typedef struct {
+	CURLSH                   *share;
+	MUTEX_T                  locks[CURL_LOCK_DATA_LAST];
+} php_curlsh;
+
 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);
diff --git a/share.c b/share.c
new file mode 100644
index 0000000..2603249
--- /dev/null
+++ b/share.c
@@ -0,0 +1,151 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 5                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) 1997-2011 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        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Author: Pierrick Charron <pierrick@php.net>                          |
+   +----------------------------------------------------------------------+
+*/
+
+/* $Id$ */
+
+#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+
+#if HAVE_CURL
+
+#include "php_curl.h"
+
+#include <curl/curl.h>
+
+static void _php_curl_share_lock(CURL *handle, curl_lock_data data, curl_lock_access laccess, void *ctx) {
+	php_curlsh *sh     = (php_curlsh *) ctx;
+	tsrm_mutex_lock(&sh->locks[data]);
+}
+
+static void _php_curl_share_unlock(CURL *handle, curl_lock_data data, void *ctx) {
+	php_curlsh *sh     = (php_curlsh *) ctx;
+	tsrm_mutex_unlock(&sh->locks[data]);
+}
+
+
+/* {{{ proto void curl_share_init() 
+   Initialize a share curl handle */
+PHP_FUNCTION(curl_share_init)
+{
+	php_curlsh *sh;
+	
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	sh = ecalloc(1, sizeof(php_curlsh));
+
+	sh->share = curl_share_init();
+
+	curl_share_setopt(sh->share, CURLSHOPT_LOCKFUNC, _php_curl_share_lock);
+	curl_share_setopt(sh->share, CURLSHOPT_UNLOCKFUNC, _php_curl_share_unlock);
+	curl_share_setopt(sh->share, CURLSHOPT_USERDATA, sh);
+
+	ZEND_REGISTER_RESOURCE(return_value, sh, le_curl_share_handle);
+}
+/* }}} */
+
+/* {{{ proto void curl_share_close(resource sh)
+   Close a set of cURL handles */
+PHP_FUNCTION(curl_share_close)
+{
+	zval *z_sh;
+	php_curlsh *sh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &z_sh) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(sh, php_curlsh *, &z_sh, -1, le_curl_share_handle_name, le_curl_share_handle);
+	zend_list_delete(Z_LVAL_P(z_sh));
+}
+/* }}} */
+
+static int _php_curl_share_setopt(php_curlsh *sh, long option, zval **zvalue, zval *return_value TSRMLS_DC) /* {{{ */
+{
+	CURLSHcode error = CURLSHE_OK;
+
+	switch (option) {
+		case CURLSHOPT_SHARE:
+		case CURLSHOPT_UNSHARE:
+			convert_to_long_ex(zvalue);
+			error = curl_share_setopt(sh->share, option, Z_LVAL_PP(zvalue));
+			break;
+	}
+
+	if (error != CURLE_OK) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+
+/* {{{ proto bool curl_share_setopt(resource sh, int option, mixed value)
+      Set an option for a cURL transfer */
+PHP_FUNCTION(curl_share_setopt)
+{
+	zval       *zid, **zvalue;
+	long        options;
+	php_curlsh *sh;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlZ", &zid, &options, &zvalue) == FAILURE) {
+		return;
+	}
+
+	ZEND_FETCH_RESOURCE(sh, php_curlsh *, &zid, -1, le_curl_share_handle_name, le_curl_share_handle);
+
+	if (options <= 0) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid curl share configuration option");
+		RETURN_FALSE;
+	}
+
+	if (!_php_curl_share_setopt(sh, options, zvalue, return_value TSRMLS_CC)) {
+		RETURN_TRUE;
+	} else {
+		RETURN_FALSE;
+	}
+}
+/* }}} */
+
+void _php_curl_share_close(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
+{
+	php_curlsh *sh = (php_curlsh *) rsrc->ptr;
+	if (sh) {
+		curl_share_cleanup(sh->share);
+		efree(sh);
+		rsrc->ptr = NULL;
+	}
+}
+/* }}} */
+
+#endif
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * End:
+ * vim600: noet sw=4 ts=4 fdm=marker
+ * vim<600: noet sw=4 ts=4
+ */