X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=http_request_api.c;h=320febcada3d2e5750f0fb87dbcaca7c74630c4b;hp=00f4b9d48d6fb7e1d28dc05b1a820efa72191605;hb=13dc652c45a4a0b4dc219e46065bb3310229cedc;hpb=08bec19979c75a45978c7c7a7c6d7926a9d5322e

diff --git a/http_request_api.c b/http_request_api.c
index 00f4b9d..320febc 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -12,10 +12,7 @@
 
 /* $Id$ */
 
-#ifdef HAVE_CONFIG_H
-#	include "config.h"
-#endif
-
+#define HTTP_WANT_SAPI
 #define HTTP_WANT_CURL
 #include "php_http.h"
 
@@ -32,13 +29,11 @@
 /* {{{ cruft for thread safe SSL crypto locks */
 #if defined(ZTS) && defined(HTTP_HAVE_SSL)
 #	ifdef PHP_WIN32
-#		define HTTP_NEED_SSL_TSL
 #		define HTTP_NEED_OPENSSL_TSL
 #		include <openssl/crypto.h>
 #	else /* !PHP_WIN32 */
 #		if defined(HTTP_HAVE_OPENSSL)
 #			if defined(HAVE_OPENSSL_CRYPTO_H)
-#				define HTTP_NEED_SSL_TSL
 #				define HTTP_NEED_OPENSSL_TSL
 #				include <openssl/crypto.h>
 #			else
@@ -49,7 +44,6 @@
 #			endif
 #		elif defined(HTTP_HAVE_GNUTLS)
 #			if defined(HAVE_GCRYPT_H)
-#				define HTTP_NEED_SSL_TSL
 #				define HTTP_NEED_GNUTLS_TSL
 #				include <gcrypt.h>
 #			else
@@ -67,17 +61,77 @@
 #	endif /* PHP_WIN32 */
 #endif /* ZTS && HTTP_HAVE_SSL */
 
-#ifdef HTTP_NEED_SSL_TSL
-static inline void http_ssl_init(void);
-static inline void http_ssl_cleanup(void);
+#ifdef HTTP_NEED_OPENSSL_TSL
+static MUTEX_T *http_openssl_tsl = NULL;
+
+static void http_openssl_thread_lock(int mode, int n, const char * file, int line)
+{
+	if (mode & CRYPTO_LOCK) {
+		tsrm_mutex_lock(http_openssl_tsl[n]);
+	} else {
+		tsrm_mutex_unlock(http_openssl_tsl[n]);
+	}
+}
+
+static ulong http_openssl_thread_id(void)
+{
+	return (ulong) tsrm_thread_id();
+}
+#endif
+#ifdef HTTP_NEED_GNUTLS_TSL
+static int http_gnutls_mutex_create(void **m)
+{
+	if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) {
+		return SUCCESS;
+	} else {
+		return FAILURE;
+	}
+}
+
+static int http_gnutls_mutex_destroy(void **m)
+{
+	tsrm_mutex_free(*((MUTEX_T *) m));
+	return SUCCESS;
+}
+
+static int http_gnutls_mutex_lock(void **m)
+{
+	return tsrm_mutex_lock(*((MUTEX_T *) m));
+}
+
+static int http_gnutls_mutex_unlock(void **m)
+{
+	return tsrm_mutex_unlock(*((MUTEX_T *) m));
+}
+
+static struct gcry_thread_cbs http_gnutls_tsl = {
+	GCRY_THREAD_OPTION_USER,
+	NULL,
+	http_gnutls_mutex_create,
+	http_gnutls_mutex_destroy,
+	http_gnutls_mutex_lock,
+	http_gnutls_mutex_unlock
+};
 #endif
 /* }}} */
 
 /* {{{ MINIT */
 PHP_MINIT_FUNCTION(http_request)
 {
-#ifdef HTTP_NEED_SSL_TSL
-	http_ssl_init();
+#ifdef HTTP_NEED_OPENSSL_TSL
+	int i, c = CRYPTO_num_locks();
+	
+	http_openssl_tsl = malloc(c * sizeof(MUTEX_T));
+	
+	for (i = 0; i < c; ++i) {
+		http_openssl_tsl[i] = tsrm_mutex_alloc();
+	}
+	
+	CRYPTO_set_id_callback(http_openssl_thread_id);
+	CRYPTO_set_locking_callback(http_openssl_thread_lock);
+#endif
+#ifdef HTTP_NED_GNUTLS_TSL
+	gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl);
 #endif
 
 	if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) {
@@ -88,6 +142,10 @@ PHP_MINIT_FUNCTION(http_request)
 	HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST);
 	HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM);
 	HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY);
+	
+	HTTP_LONG_CONSTANT("HTTP_VERSION_NONE", CURL_HTTP_VERSION_NONE);
+	HTTP_LONG_CONSTANT("HTTP_VERSION_1_0", CURL_HTTP_VERSION_1_0);
+	HTTP_LONG_CONSTANT("HTTP_VERSION_1_1", CURL_HTTP_VERSION_1_1);
 
 	return SUCCESS;
 }
@@ -96,9 +154,25 @@ PHP_MINIT_FUNCTION(http_request)
 /* {{{ MSHUTDOWN */
 PHP_MSHUTDOWN_FUNCTION(http_request)
 {
+#ifdef HTTP_NEED_OPENSSL_TSL
+	CRYPTO_set_id_callback(http_openssl_thread_id);
+	CRYPTO_set_locking_callback(http_openssl_thread_lock);
+#endif
 	curl_global_cleanup();
-#ifdef HTTP_NEED_SSL_TSL
-	http_ssl_cleanup();
+#ifdef HTTP_NEED_OPENSSL_TSL
+	if (http_openssl_tsl) {
+		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_openssl_tsl[i]);
+		}
+			
+		free(http_openssl_tsl);
+		http_openssl_tsl = NULL;
+	}
 #endif
 	return SUCCESS;
 }
@@ -164,7 +238,8 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
 		} \
 	}
 
-#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(request->ch, CURLOPT_##OPTION, (p))
+#define HTTP_CURL_OPT(OPTION, p) HTTP_CURL_OPT_EX(request->ch, OPTION, (p))
+#define HTTP_CURL_OPT_EX(ch, OPTION, p) curl_easy_setopt((ch), CURLOPT_##OPTION, (p))
 #define HTTP_CURL_OPT_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, keyname, obdc)
 #define HTTP_CURL_OPT_SSL_STRING(keyname, obdc) HTTP_CURL_OPT_STRING_EX(keyname, SSL##keyname, obdc)
 #define HTTP_CURL_OPT_SSL_STRING_(keyname,obdc ) HTTP_CURL_OPT_STRING_EX(keyname, SSL_##keyname, obdc)
@@ -205,6 +280,55 @@ static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { r
 static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 /* }}} */
 
+/* {{{ CURL *http_curl_init(http_request *) */
+PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request)
+{
+	if (ch || (ch = curl_easy_init())) {
+#if defined(ZTS)
+		HTTP_CURL_OPT_EX(ch, NOSIGNAL, 1);
+#endif
+		HTTP_CURL_OPT_EX(ch, HEADER, 0);
+		HTTP_CURL_OPT_EX(ch, FILETIME, 1);
+		HTTP_CURL_OPT_EX(ch, AUTOREFERER, 1);
+		HTTP_CURL_OPT_EX(ch, VERBOSE, 1);
+		HTTP_CURL_OPT_EX(ch, HEADERFUNCTION, NULL);
+		HTTP_CURL_OPT_EX(ch, DEBUGFUNCTION, http_curl_raw_callback);
+		HTTP_CURL_OPT_EX(ch, READFUNCTION, http_curl_read_callback);
+		HTTP_CURL_OPT_EX(ch, IOCTLFUNCTION, http_curl_ioctl_callback);
+		HTTP_CURL_OPT_EX(ch, WRITEFUNCTION, http_curl_dummy_callback);
+		
+		/* set context */
+		if (request) {
+			HTTP_CURL_OPT_EX(ch, PRIVATE, request);
+			HTTP_CURL_OPT_EX(ch, DEBUGDATA, request);
+			HTTP_CURL_OPT_EX(ch, ERRORBUFFER, request->_error);
+			
+			/* attach curl handle */
+			request->ch = ch;
+			/* set defaults (also in http_request_reset()) */
+			http_request_defaults(request);
+		}
+	}
+	
+	return ch;
+}
+/* }}} */
+
+/* {{{ void http_curl_free(CURL **) */
+PHP_HTTP_API void _http_curl_free(CURL **ch)
+{
+	if (*ch) {
+		/* avoid nasty segfaults with already cleaned up callbacks */
+		HTTP_CURL_OPT_EX(*ch, NOPROGRESS, 1);
+		HTTP_CURL_OPT_EX(*ch, PROGRESSFUNCTION, NULL);
+		HTTP_CURL_OPT_EX(*ch, VERBOSE, 0);
+		HTTP_CURL_OPT_EX(*ch, DEBUGFUNCTION, NULL);
+		curl_easy_cleanup(*ch);
+		*ch = NULL;
+	}
+}
+/* }}} */
+
 /* {{{ http_request *http_request_init(http_request *) */
 PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC)
 {
@@ -237,16 +361,7 @@ PHP_HTTP_API void _http_request_dtor(http_request *request)
 {
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
-	if (request->ch) {
-		/* avoid nasty segfaults with already cleaned up callbacks */
-		HTTP_CURL_OPT(NOPROGRESS, 1);
-		HTTP_CURL_OPT(PROGRESSFUNCTION, NULL);
-		HTTP_CURL_OPT(VERBOSE, 0);
-		HTTP_CURL_OPT(DEBUGFUNCTION, NULL);
-		curl_easy_cleanup(request->ch);
-		request->ch = NULL;
-	}
-	
+	http_curl_free(&request->ch);
 	http_request_reset(request);
 	
 	phpstr_dtor(&request->_cache.cookies);
@@ -284,6 +399,10 @@ PHP_HTTP_API void _http_request_reset(http_request *request)
 	phpstr_dtor(&request->conv.request);
 	phpstr_dtor(&request->conv.response);
 	http_request_body_dtor(request->body);
+	
+	if (request->ch) {
+		http_request_defaults(request);
+	}
 }
 /* }}} */
 
@@ -291,23 +410,6 @@ PHP_HTTP_API void _http_request_reset(http_request *request)
 PHP_HTTP_API void _http_request_defaults(http_request *request)
 {
 	if (request->ch) {
-#ifdef HAVE_CURL_EASY_RESET
-		curl_easy_reset(request->ch);
-#endif
-#if defined(ZTS)
-		HTTP_CURL_OPT(NOSIGNAL, 1);
-#endif
-		HTTP_CURL_OPT(PRIVATE, request);
-		HTTP_CURL_OPT(ERRORBUFFER, request->_error);
-		HTTP_CURL_OPT(HEADER, 0);
-		HTTP_CURL_OPT(FILETIME, 1);
-		HTTP_CURL_OPT(AUTOREFERER, 1);
-		HTTP_CURL_OPT(VERBOSE, 1);
-		HTTP_CURL_OPT(HEADERFUNCTION, NULL);
-		HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback);
-		HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback);
-		HTTP_CURL_OPT(IOCTLFUNCTION, http_curl_ioctl_callback);
-		HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback);
 		HTTP_CURL_OPT(PROGRESSFUNCTION, NULL);
 		HTTP_CURL_OPT(URL, NULL);
 		HTTP_CURL_OPT(NOPROGRESS, 1);
@@ -359,6 +461,11 @@ PHP_HTTP_API void _http_request_defaults(http_request *request)
 		HTTP_CURL_OPT(READDATA, NULL);
 		HTTP_CURL_OPT(INFILESIZE, 0);
 		HTTP_CURL_OPT(HTTP_VERSION, CURL_HTTP_VERSION_NONE);
+		HTTP_CURL_OPT(CUSTOMREQUEST, NULL);
+		HTTP_CURL_OPT(NOBODY, 0);
+		HTTP_CURL_OPT(POST, 0);
+		HTTP_CURL_OPT(UPLOAD, 0);
+		HTTP_CURL_OPT(HTTPGET, 1);
 	}
 }
 /* }}} */
@@ -390,12 +497,9 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
 	TSRMLS_FETCH_FROM_CTX(request->tsrm_ls);
 	
-	HTTP_CHECK_CURL_INIT(request->ch, curl_easy_init(), return FAILURE);
-	
-	http_request_defaults(request);
+	HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE);
 	
 	/* set options */
-	HTTP_CURL_OPT(DEBUGDATA, request);
 	HTTP_CURL_OPT(URL, request->url);
 
 	/* progress callback */
@@ -405,13 +509,16 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 
 	/* proxy */
 	if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) {
-		HTTP_CURL_OPT(PROXY, Z_STRVAL_P(zoption));
+		if (Z_STRLEN_P(zoption)) {
+			HTTP_CURL_OPT(PROXY, Z_STRVAL_P(zoption));
+		}
+
 		/* port */
 		if ((zoption = http_request_option(request, options, "proxyport", IS_LONG))) {
 			HTTP_CURL_OPT(PROXYPORT, Z_LVAL_P(zoption));
 		}
 		/* user:pass */
-		if ((zoption = http_request_option(request, options, "proxyauth", IS_STRING))) {
+		if ((zoption = http_request_option(request, options, "proxyauth", IS_STRING)) && Z_STRLEN_P(zoption)) {
 			HTTP_CURL_OPT(PROXYUSERPWD, Z_STRVAL_P(zoption));
 		}
 		/* auth method */
@@ -431,7 +538,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	}
 
 	/* auth */
-	if ((zoption = http_request_option(request, options, "httpauth", IS_STRING))) {
+	if ((zoption = http_request_option(request, options, "httpauth", IS_STRING)) && Z_STRLEN_P(zoption)) {
 		HTTP_CURL_OPT(USERPWD, Z_STRVAL_P(zoption));
 	}
 	if ((zoption = http_request_option(request, options, "httpauthtype", IS_LONG))) {
@@ -448,13 +555,18 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	}
 
 	/* referer */
-	if ((zoption = http_request_option(request, options, "referer", IS_STRING))) {
+	if ((zoption = http_request_option(request, options, "referer", IS_STRING)) && Z_STRLEN_P(zoption)) {
 		HTTP_CURL_OPT(REFERER, Z_STRVAL_P(zoption));
 	}
 
 	/* useragent, default "PECL::HTTP/version (PHP/version)" */
 	if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) {
-		HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption));
+		/* allow to send no user agent, not even default one */
+		if (Z_STRLEN_P(zoption)) {
+			HTTP_CURL_OPT(USERAGENT, Z_STRVAL_P(zoption));
+		} else {
+			HTTP_CURL_OPT(USERAGENT, NULL);
+		}
 	}
 
 	/* additional headers, array('name' => 'value') */
@@ -493,9 +605,11 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	/* cookies, array('name' => 'value') */
 	if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) {
 		phpstr_dtor(&request->_cache.cookies);
-		if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) {
-			phpstr_fix(&request->_cache.cookies);
-			HTTP_CURL_OPT(COOKIE, request->_cache.cookies.data);
+		if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) {
+			if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", sizeof("; ")-1, NULL, 0)) {
+				phpstr_fix(&request->_cache.cookies);
+				HTTP_CURL_OPT(COOKIE, request->_cache.cookies.data);
+			}
 		}
 	}
 
@@ -546,7 +660,7 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 			if (Z_LVAL_P(zoption) > 0) {
 				HTTP_CURL_OPT(TIMEVALUE, Z_LVAL_P(zoption));
 			} else {
-				HTTP_CURL_OPT(TIMEVALUE, time(NULL) + Z_LVAL_P(zoption));
+				HTTP_CURL_OPT(TIMEVALUE, HTTP_GET_REQUEST_TIME() + Z_LVAL_P(zoption));
 			}
 			HTTP_CURL_OPT(TIMECONDITION, range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE);
 		} else {
@@ -632,6 +746,10 @@ PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *opti
 	if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD) && (request->meth != HTTP_OPTIONS)) {
 		switch (request->body->type)
 		{
+			case HTTP_REQUEST_BODY_EMPTY:
+				/* nothing */
+			break;
+			
 			case HTTP_REQUEST_BODY_CSTRING:
 				HTTP_CURL_OPT(POSTFIELDS, request->body->data);
 				HTTP_CURL_OPT(POSTFIELDSIZE, request->body->size);
@@ -864,105 +982,6 @@ static inline zval *_http_request_option_cache_ex(http_request *r, char *key, si
 }
 /* }}} */
 
-#ifdef HTTP_NEED_OPENSSL_TSL
-/* {{{ */
-static MUTEX_T *http_openssl_tsl = NULL;
-
-static void http_ssl_lock(int mode, int n, const char * file, int line)
-{
-	if (mode & CRYPTO_LOCK) {
-		tsrm_mutex_lock(http_openssl_tsl[n]);
-	} else {
-		tsrm_mutex_unlock(http_openssl_tsl[n]);
-	}
-}
-
-static ulong http_ssl_id(void)
-{
-	return (ulong) tsrm_thread_id();
-}
-
-static inline void http_ssl_init(void)
-{
-	int i, c = CRYPTO_num_locks();
-	
-	http_openssl_tsl = malloc(c * sizeof(MUTEX_T));
-	
-	for (i = 0; i < c; ++i) {
-		http_openssl_tsl[i] = tsrm_mutex_alloc();
-	}
-	
-	CRYPTO_set_id_callback(http_ssl_id);
-	CRYPTO_set_locking_callback(http_ssl_lock);
-}
-
-static inline void http_ssl_cleanup(void)
-{
-	if (http_openssl_tsl) {
-		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_openssl_tsl[i]);
-		}
-		
-		free(http_openssl_tsl);
-		http_openssl_tsl = NULL;
-	}
-}
-#endif /* HTTP_NEED_OPENSSL_TSL */
-/* }}} */
-
-#ifdef HTTP_NEED_GNUTLS_TSL
-/* {{{ */
-static int http_ssl_mutex_create(void **m)
-{
-	if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) {
-		return SUCCESS;
-	} else {
-		return FAILURE;
-	}
-}
-
-static int http_ssl_mutex_destroy(void **m)
-{
-	tsrm_mutex_free(*((MUTEX_T *) m));
-	return SUCCESS;
-}
-
-static int http_ssl_mutex_lock(void **m)
-{
-	return tsrm_mutex_lock(*((MUTEX_T *) m));
-}
-
-static int http_ssl_mutex_unlock(void **m)
-{
-	return tsrm_mutex_unlock(*((MUTEX_T *) m));
-}
-
-static struct gcry_thread_cbs http_gnutls_tsl = {
-	GCRY_THREAD_OPTION_USER,
-	NULL,
-	http_ssl_mutex_create,
-	http_ssl_mutex_destroy,
-	http_ssl_mutex_lock,
-	http_ssl_mutex_unlock
-};
-
-static inline void http_ssl_init(void)
-{
-	gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl);
-}
-
-static inline void http_ssl_cleanup(void)
-{
-	return;
-}
-#endif /* HTTP_NEED_GNUTLS_TSL */
-/* }}} */
-
 #endif /* HTTP_HAVE_CURL */
 
 /*