X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=d9b1a2198a06067823881907a09bbad592407856;hp=3aba703820fc8f0d6484f29d3f8ce83af12b269c;hb=ffc893b125c6cc9b385a68a357b08ba2cc4e91f6;hpb=61f165688d2cc39424678829a145c8cbab51d1af

diff --git a/http_request_api.c b/http_request_api.c
index 3aba703..d9b1a21 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -22,6 +22,15 @@
 
 #ifdef HTTP_HAVE_CURL
 
+#if defined(ZTS) && defined(HTTP_HAVE_SSL)
+#	if !defined(HAVE_OPENSSL_CRYPTO_H)
+#		error "libcurl was compiled with OpenSSL support, but we have no openssl/crypto.h"
+#	else
+#		define HTTP_NEED_SSL
+#		include <openssl/crypto.h>
+#	endif
+#endif
+
 #include "php_http.h"
 #include "php_http_std_defs.h"
 #include "php_http_api.h"
@@ -42,6 +51,39 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(http);
 
+#ifdef HTTP_NEED_SSL
+static inline zend_bool http_ssl_init(void);
+static inline void http_ssl_cleanup(void);
+#endif
+
+STATUS _http_request_global_init(INIT_FUNC_ARGS)
+{
+	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
+		return FAILURE;
+	}
+	
+#ifdef HTTP_NEED_SSL
+	http_ssl_init();
+#endif
+
+#if LIBCURL_VERSION_NUM >= 0x070a05
+	HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC);
+	HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
+	HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
+	HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY);
+#endif /* LIBCURL_VERSION_NUM */
+
+	return SUCCESS;
+}
+
+void _http_request_global_cleanup(TSRMLS_D)
+{
+	curl_global_cleanup();
+#ifdef HTTP_NEED_SSL
+	http_ssl_cleanup();
+#endif
+}
+
 #ifndef HAVE_CURL_EASY_STRERROR
 #	define curl_easy_strerror(code) HTTP_G(request).error
 #endif
@@ -103,19 +145,28 @@ ZEND_EXTERN_MODULE_GLOBALS(http);
 #define http_curl_getopt(o, k, t) _http_curl_getopt_ex((o), (k), sizeof(k), (t) TSRMLS_CC)
 #define http_curl_getopt_ex(o, k, l, t) _http_curl_getopt_ex((o), (k), (l), (t) TSRMLS_CC)
 static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t keylen, int type TSRMLS_DC);
+#define http_curl_defaults(ch) _http_curl_defaults((ch))
+static inline void _http_curl_defaults(CURL *ch);
 static size_t http_curl_read_callback(void *, size_t, size_t, void *);
 static int http_curl_progress_callback(void *, double, double, double, double);
 static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *);
 static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { return n*l; }
 
-#define HTTP_CURL_CALLBACK_DATA(from, type, var) \
-	http_curl_callback_ctx *__CTX = (http_curl_callback_ctx *) (from); \
-	TSRMLS_FETCH_FROM_CTX(__CTX->tsrm_ctx); \
-	type (var) = (type) (__CTX->data)
-
-#define http_curl_callback_data(data) _http_curl_callback_data((data) TSRMLS_CC)
-static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC);
-
+/* {{{ http_request_callback_ctx http_request_callback_data(void *) */
+http_request_callback_ctx *_http_request_callback_data_ex(void *data, zend_bool cpy TSRMLS_DC)
+{
+	http_request_callback_ctx *ctx = emalloc(sizeof(http_request_callback_ctx));
+	
+	TSRMLS_SET_CTX(ctx->tsrm_ctx);
+	ctx->data = data;
+	
+	if (cpy) {
+		return http_request_data_copy(COPY_CONTEXT, ctx);
+	} else {
+		return ctx;
+	}
+}
+/* }}} */
 
 /* {{{ void *http_request_data_copy(int, void *) */
 void *_http_request_data_copy(int type, void *data TSRMLS_DC)
@@ -169,17 +220,17 @@ void _http_request_data_free_slist(void *list)
 }
 /* }}} */
 
-/* {{{ _http_request_data_free_context(http_curl_callback_ctx **) */
+/* {{{ _http_request_data_free_context(http_request_callback_ctx **) */
 void _http_request_data_free_context(void *context)
 {
-	efree(*((http_curl_callback_ctx **) context));
+	efree(*((http_request_callback_ctx **) context));
 }
 /* }}} */
 
-/* {{{ _http_request_data_free_conv(http_curl_conv **) */
+/* {{{ _http_request_data_free_conv(http_request_conv **) */
 void _http_request_data_free_conv(void *conv)
 {
-	efree(*((http_curl_conv **) conv));
+	efree(*((http_request_conv **) conv));
 }
 /* }}} */
 
@@ -224,12 +275,14 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 
 		/* file data */
 		FOREACH_HASH_VAL(files, data) {
-			CURLcode err;
 			zval **file, **type, **name;
-			if (	SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) &&
-					SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) &&
-					SUCCESS == zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
-				err = curl_formadd(&http_post_data[0], &http_post_data[1],
+			
+			if (	SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "name", sizeof("name"), (void **) &name) ||
+					SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "type", sizeof("type"), (void **) &type) ||
+					SUCCESS != zend_hash_find(Z_ARRVAL_PP(data), "file", sizeof("file"), (void **) &file)) {
+				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
+			} else {
+				CURLcode err = curl_formadd(&http_post_data[0], &http_post_data[1],
 					CURLFORM_COPYNAME,		Z_STRVAL_PP(name),
 					CURLFORM_FILE,			Z_STRVAL_PP(file),
 					CURLFORM_CONTENTTYPE,	Z_STRVAL_PP(type),
@@ -240,8 +293,6 @@ PHP_HTTP_API STATUS _http_request_body_fill(http_request_body *body, HashTable *
 					curl_formfree(http_post_data[0]);
 					return FAILURE;
 				}
-			} else {
-				http_error(HE_NOTICE, HTTP_E_INVALID_PARAM, "Post file array entry misses either 'name', 'type' or 'file' entry");
 			}
 		}
 
@@ -308,9 +359,10 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	zend_bool range_req = 0;
 
 	/* reset CURL handle */
-#if LIBCURL_VERSION_NUM >= 0x070c01
+#ifdef HAVE_CURL_EASY_RESET
 	curl_easy_reset(ch);
 #endif
+	http_curl_defaults(ch);
 
 	/* set options */
 	if (url) {
@@ -339,9 +391,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	if (zoption = http_curl_getopt(options, "onprogress", 0)) {
 		HTTP_CURL_OPT(NOPROGRESS, 0);
 		HTTP_CURL_OPT(PROGRESSFUNCTION, http_curl_progress_callback);
-		HTTP_CURL_OPT(PROGRESSDATA,  http_curl_callback_data(zoption));
-	} else {
-		HTTP_CURL_OPT(NOPROGRESS, 1);
+		HTTP_CURL_OPT(PROGRESSDATA,  http_request_callback_data(zoption));
 	}
 
 	/* proxy */
@@ -386,8 +436,6 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	/* compress, empty string enables deflate and gzip */
 	if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
 		HTTP_CURL_OPT(ENCODING, "");
-	} else {
-		HTTP_CURL_OPT(ENCODING, 0);
 	}
 
 	/* redirects, defaults to 0 */
@@ -397,22 +445,16 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 		if (zoption = http_curl_getopt(options, "unrestrictedauth", IS_BOOL)) {
 			HTTP_CURL_OPT(UNRESTRICTED_AUTH, Z_LVAL_P(zoption));
 		}
-	} else {
-		HTTP_CURL_OPT(FOLLOWLOCATION, 0);
 	}
 
 	/* referer */
 	if (zoption = http_curl_getopt(options, "referer", IS_STRING)) {
 		HTTP_CURL_OPT(REFERER, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
-	} else {
-		HTTP_CURL_OPT(REFERER, NULL);
 	}
 
 	/* useragent, default "PECL::HTTP/version (PHP/version)" */
 	if (zoption = http_curl_getopt(options, "useragent", IS_STRING)) {
 		HTTP_CURL_OPT(USERAGENT, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
-	} else {
-		HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
 	}
 
 	/* additional headers, array('name' => 'value') */
@@ -438,8 +480,6 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 		if (headers) {
 			HTTP_CURL_OPT(HTTPHEADER, http_request_data_copy(COPY_SLIST, headers));
 		}
-	} else {
-		HTTP_CURL_OPT(HTTPHEADER, NULL);
 	}
 
 	/* cookies, array('name' => 'value') */
@@ -465,8 +505,6 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			HTTP_CURL_OPT(COOKIE, http_request_data_copy(COPY_STRING, qstr->data));
 		}
 		phpstr_free(&qstr);
-	} else {
-		HTTP_CURL_OPT(COOKIE, NULL);
 	}
 
 	/* session cookies */
@@ -478,54 +516,39 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			/* reset session cookies */
 			HTTP_CURL_OPT(COOKIESESSION, 1);
 		}
-	} else {
-		HTTP_CURL_OPT(COOKIEFILE, NULL);
 	}
 
 	/* cookiestore, read initial cookies from that file and store cookies back into that file */
 	if ((zoption = http_curl_getopt(options, "cookiestore", IS_STRING)) && Z_STRLEN_P(zoption)) {
 		HTTP_CURL_OPT(COOKIEFILE, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 		HTTP_CURL_OPT(COOKIEJAR, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
-	} else {
-		HTTP_CURL_OPT(COOKIEFILE, NULL);
-		HTTP_CURL_OPT(COOKIEJAR, NULL);
 	}
 
 	/* resume */
 	if ((zoption = http_curl_getopt(options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) != 0)) {
 		range_req = 1;
 		HTTP_CURL_OPT(RESUME_FROM, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(RESUME_FROM, 0);
 	}
 
 	/* maxfilesize */
 	if (zoption = http_curl_getopt(options, "maxfilesize", IS_LONG)) {
 		HTTP_CURL_OPT(MAXFILESIZE, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(MAXFILESIZE, 0);
 	}
 
 	/* lastmodified */
 	if (zoption = http_curl_getopt(options, "lastmodified", IS_LONG)) {
 		HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
 		HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(TIMEVALUE, 0);
 	}
 
 	/* timeout, defaults to 0 */
 	if (zoption = http_curl_getopt(options, "timeout", IS_LONG)) {
 		HTTP_CURL_OPT(TIMEOUT, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(TIMEOUT, 0);
 	}
 
 	/* connecttimeout, defaults to 3 */
 	if (zoption = http_curl_getopt(options, "connecttimeout", IS_LONG)) {
 		HTTP_CURL_OPT(CONNECTTIMEOUT, Z_LVAL_P(zoption));
-	} else {
-		HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
 	}
 
 	/* ssl */
@@ -565,10 +588,6 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 				key = NULL;
 			}
 		}
-	} else {
-		/* disable SSL verification by default */
-		HTTP_CURL_OPT(SSL_VERIFYPEER, 0);
-		HTTP_CURL_OPT(SSL_VERIFYHOST, 0);
 	}
 
 	/* request method */
@@ -614,7 +633,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 			break;
 
 			case HTTP_REQUEST_BODY_UPLOADFILE:
-				curl_easy_setopt(ch, CURLOPT_READDATA, http_curl_callback_data(body));
+				curl_easy_setopt(ch, CURLOPT_READDATA, http_request_callback_data(body));
 				curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
 			break;
 
@@ -633,11 +652,11 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 /* {{{ void http_request_conv(CURL *, phpstr *, phpstr *) */
 void _http_request_conv(CURL *ch, phpstr* response, phpstr *request TSRMLS_DC)
 {
-	http_curl_conv *conv = emalloc(sizeof(http_curl_conv));
+	http_request_conv *conv = emalloc(sizeof(http_request_conv));
 	conv->response = response;
 	conv->request = request;
 	conv->last_info = -1;
-	HTTP_CURL_OPT(DEBUGDATA, http_curl_callback_data(http_request_data_copy(COPY_CONV, conv)));
+	HTTP_CURL_OPT(DEBUGDATA, http_request_callback_data(http_request_data_copy(COPY_CONV, conv)));
 }
 /* }}} */
 
@@ -666,7 +685,7 @@ PHP_HTTP_API STATUS _http_request_exec(CURL *ch, HashTable *info, phpstr *respon
 PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
 {
 	zval array;
-	Z_ARRVAL(array) = info;
+	INIT_ZARR(array, info);
 
 	HTTP_CURL_INFO(EFFECTIVE_URL);
 #if LIBCURL_VERSION_NUM >= 0x070a07
@@ -742,7 +761,7 @@ PHP_HTTP_API STATUS _http_request_ex(CURL *ch, http_request_method meth, char *u
 /* {{{ static size_t http_curl_read_callback(void *, size_t, size_t, void *) */
 static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s)
 {
-	HTTP_CURL_CALLBACK_DATA(s, http_request_body *, body);
+	HTTP_REQUEST_CALLBACK_DATA(s, http_request_body *, body);
 
 	if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
 		return 0;
@@ -751,21 +770,11 @@ static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *s)
 }
 /* }}} */
 
-/* {{{ http_curl_callback_ctx http_curl_callback_data(void *) */
-static http_curl_callback_ctx *_http_curl_callback_data(void *data TSRMLS_DC)
-{
-	http_curl_callback_ctx *ctx = emalloc(sizeof(http_curl_callback_ctx));
-	TSRMLS_SET_CTX(ctx->tsrm_ctx);
-	ctx->data = data;
-	return http_request_data_copy(COPY_CONTEXT, ctx);
-}
-/* }}} */
-
 /* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */
 static int http_curl_progress_callback(void *data, double dltotal, double dlnow, double ultotal, double ulnow)
 {
 	zval *params_pass[4], params_local[4], retval;
-	HTTP_CURL_CALLBACK_DATA(data, zval *, func);
+	HTTP_REQUEST_CALLBACK_DATA(data, zval *, func);
 
 	params_pass[0] = &params_local[0];
 	params_pass[1] = &params_local[1];
@@ -788,7 +797,11 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 /* {{{ static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *) */
 static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx)
 {
-	HTTP_CURL_CALLBACK_DATA(ctx, http_curl_conv *, conv);
+	HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_conv *, conv);
+
+#if 0
+	fprintf(stderr, "DEBUG: %s\n", data);
+#endif
 
 	switch (type)
 	{
@@ -846,7 +859,121 @@ static inline zval *_http_curl_getopt_ex(HashTable *options, char *key, size_t k
 }
 /* }}} */
 
+#ifdef HTTP_NEED_SSL
+
+static MUTEX_T *http_ssl_mutex = NULL;
+
+static void http_ssl_lock(int mode, int n, const char * file, int line)
+{
+	if (mode & CRYPTO_LOCK) {
+		tsrm_mutex_lock(http_ssl_mutex[n]);
+	} else {
+		tsrm_mutex_unlock(http_ssl_mutex[n]);
+	}
+}
+
+static unsigned long http_ssl_id(void)
+{
+	return (unsigned long) tsrm_thread_id();
+}
+
+static inline zend_bool http_ssl_init(void)
+{
+	curl_version_info_data *cvid = curl_version_info(CURLVERSION_NOW);
+	
+	if (cvid && (cvid->features & CURL_VERSION_SSL)) {
+		int i, c = CRYPTO_num_locks();
+		
+		http_ssl_mutex = malloc(c * sizeof(MUTEX_T));
+		
+		for (i = 0; i < c; ++i) {
+			http_ssl_mutex[i] = tsrm_mutex_alloc();
+		}
+		
+		CRYPTO_set_id_callback(http_ssl_id);
+		CRYPTO_set_locking_callback(http_ssl_lock);
+		
+		return 1;
+	}
+	
+	return 0;
+}
+
+static inline void http_ssl_cleanup(void)
+{
+	if (http_ssl_mutex) {
+		int i, c = CRYPTO_num_locks();
+		
+		CRYPTO_set_id_callback(NULL);
+		CRYPTO_set_locking_callback(NULL);
+		
+		for (i = 0; i < c; ++i) {
+			tsrm_mutex_free(http_ssl_mutex[i]);
+		}
+		
+		free(http_ssl_mutex);
+		http_ssl_mutex = NULL;
+	}
+}
+#endif /* HTTP_NEED_SSL */
+
+static inline void _http_curl_defaults(CURL *ch)
+{
+	HTTP_CURL_OPT(URL, NULL);
+	HTTP_CURL_OPT(NOPROGRESS, 1);
+	HTTP_CURL_OPT(PROXY, NULL);
+	HTTP_CURL_OPT(PROXYPORT, 0);
+	HTTP_CURL_OPT(PROXYUSERPWD, NULL);
+#if LIBCURL_VERSION_NUM >= 0x070a07
+	HTTP_CURL_OPT(PROXYAUTH, 0);
+#endif
+	HTTP_CURL_OPT(INTERFACE, NULL);
+	HTTP_CURL_OPT(PORT, 0);
+	HTTP_CURL_OPT(USERPWD, NULL);
+#if LIBCURL_VERSION_NUM >= 0x070a06
+	HTTP_CURL_OPT(HTTPAUTH, 0);
+#endif
+	HTTP_CURL_OPT(ENCODING, 0);
+	HTTP_CURL_OPT(FOLLOWLOCATION, 0);
+	HTTP_CURL_OPT(UNRESTRICTED_AUTH, 0);
+	HTTP_CURL_OPT(REFERER, NULL);
+	HTTP_CURL_OPT(USERAGENT, "PECL::HTTP/" HTTP_PEXT_VERSION " (PHP/" PHP_VERSION ")");
+	HTTP_CURL_OPT(HTTPHEADER, NULL);
+	HTTP_CURL_OPT(COOKIE, NULL);
+	HTTP_CURL_OPT(COOKIEFILE, NULL);
+	HTTP_CURL_OPT(COOKIEJAR, NULL);
+	HTTP_CURL_OPT(RESUME_FROM, 0);
+	HTTP_CURL_OPT(MAXFILESIZE, 0);
+	HTTP_CURL_OPT(TIMEVALUE, 0);
+	HTTP_CURL_OPT(TIMEOUT, 0);
+	HTTP_CURL_OPT(CONNECTTIMEOUT, 3);
+	HTTP_CURL_OPT(SSLCERT, NULL);
+#if LIBCURL_VERSION_NUM >= 0x070903
+	HTTP_CURL_OPT(SSLCERTTYPE, NULL);
+#endif
+	HTTP_CURL_OPT(SSLCERTPASSWD, NULL);
+	HTTP_CURL_OPT(SSLKEY, NULL);
+	HTTP_CURL_OPT(SSLKEYTYPE, NULL);
+	HTTP_CURL_OPT(SSLKEYPASSWD, NULL);
+	HTTP_CURL_OPT(SSLENGINE, NULL);
+	HTTP_CURL_OPT(SSLVERSION, 0);
+	HTTP_CURL_OPT(SSL_VERIFYPEER, 0);
+	HTTP_CURL_OPT(SSL_VERIFYHOST, 0);
+	HTTP_CURL_OPT(SSL_CIPHER_LIST, NULL);
+	HTTP_CURL_OPT(CAINFO, NULL);
+#if LIBCURL_VERSION_NUM >= 0x070908
+	HTTP_CURL_OPT(CAPATH, NULL);
 #endif
+	HTTP_CURL_OPT(RANDOM_FILE, NULL);
+	HTTP_CURL_OPT(EGDSOCKET, NULL);
+	HTTP_CURL_OPT(POSTFIELDS, NULL);
+	HTTP_CURL_OPT(POSTFIELDSIZE, 0);
+	HTTP_CURL_OPT(HTTPPOST, NULL);
+	HTTP_CURL_OPT(READDATA, NULL);
+	HTTP_CURL_OPT(INFILESIZE, 0);
+}
+
+#endif /* HTTP_HAVE_CURL */
 
 /*
  * Local variables: