X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_int.h;h=ff220ca74b370c652f2ec462a2e5fce2f6573918;hp=5eecf9f3178fd8ffe52e04c030e5bf6c82a5a1db;hb=ad5f896b03adaa073134a00108a9cdf00720673a;hpb=9676c81efbb8f180fa189d71a7ecb50dde4f5646;ds=sidebyside

diff --git a/php_http_request_int.h b/php_http_request_int.h
index 5eecf9f..ff220ca 100644
--- a/php_http_request_int.h
+++ b/php_http_request_int.h
@@ -6,7 +6,7 @@
     | modification, are permitted provided that the conditions mentioned |
     | in the accompanying LICENSE file are met.                          |
     +--------------------------------------------------------------------+
-    | Copyright (c) 2004-2006, Michael Wallner <mike@php.net>            |
+    | Copyright (c) 2004-2010, Michael Wallner <mike@php.net>            |
     +--------------------------------------------------------------------+
 */
 
@@ -18,25 +18,11 @@
 #		include <openssl/crypto.h>
 #	else /* !PHP_WIN32 */
 #		if defined(HTTP_HAVE_OPENSSL)
-#			if defined(HAVE_OPENSSL_CRYPTO_H)
-#				define HTTP_NEED_OPENSSL_TSL
-#				include <openssl/crypto.h>
-#			else
-#				warning \
-					"libcurl was compiled with OpenSSL support, but configure could not find " \
-					"openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \
-					"cause random crashes on SSL requests"
-#			endif
+#			define HTTP_NEED_OPENSSL_TSL
+#			include <openssl/crypto.h>
 #		elif defined(HTTP_HAVE_GNUTLS)
-#			if defined(HAVE_GCRYPT_H)
-#				define HTTP_NEED_GNUTLS_TSL
-#				include <gcrypt.h>
-#			else
-#				warning \
-					"libcurl was compiled with GnuTLS support, but configure could not find " \
-					"gcrypt.h; thus no SSL crypto locking callbacks will be set, which may " \
-					"cause random crashes on SSL requests"
-#			endif
+#			define HTTP_NEED_GNUTLS_TSL
+#			include <gcrypt.h>
 #		else
 #			warning \
 				"libcurl was compiled with SSL support, but configure could not determine which" \
@@ -46,71 +32,7 @@
 #	endif /* PHP_WIN32 */
 #endif /* ZTS && HTTP_HAVE_SSL */
 
-#ifndef HAVE_CURL_EASY_STRERROR
-#	define curl_easy_strerror(dummy) "unknown error"
-#endif
-
-#define HTTP_CURL_INFO(I) \
-	{ \
-		char *N = #I; \
-		HTTP_CURL_INFO_EX(I, N+lenof("CURLINFO_")); \
-	}
-#define HTTP_CURL_INFO_EX(I, X) \
-	switch (I & ~CURLINFO_MASK) \
-	{ \
-		case CURLINFO_STRING: \
-		{ \
-			char *c; \
-			if (CURLE_OK == curl_easy_getinfo(request->ch, I, &c)) { \
-				char *key = estrndup(X, strlen(X)); \
-				add_assoc_string(&array, pretty_key(key, strlen(X), 0, 0), c ? c : "", 1); \
-				efree(key); \
-			} \
-		} \
-		break; \
-\
-		case CURLINFO_DOUBLE: \
-		{ \
-			double d; \
-			if (CURLE_OK == curl_easy_getinfo(request->ch, I, &d)) { \
-				char *key = estrndup(X, strlen(X)); \
-				add_assoc_double(&array, pretty_key(key, strlen(X), 0, 0), d); \
-				efree(key); \
-			} \
-		} \
-		break; \
-\
-		case CURLINFO_LONG: \
-		{ \
-			long l; \
-			if (CURLE_OK == curl_easy_getinfo(request->ch, I, &l)) { \
-				char *key = estrndup(X, strlen(X)); \
-				add_assoc_long(&array, pretty_key(key, strlen(X), 0, 0), l); \
-				efree(key); \
-			} \
-		} \
-		break; \
-\
-		case CURLINFO_SLIST: \
-		{ \
-			struct curl_slist *l, *p; \
-			if (CURLE_OK == curl_easy_getinfo(request->ch, I, &l)) { \
-				zval *subarray; \
-				char *key = estrndup(X, strlen(X)); \
-				MAKE_STD_ZVAL(subarray); \
-				array_init(subarray); \
-				for (p = l; p; p = p->next) { \
-					add_next_index_string(subarray, p->data, 1); \
-				} \
-				add_assoc_zval(&array, pretty_key(key, strlen(X), 0, 0), subarray); \
-				curl_slist_free_all(l); \
-				efree(key); \
-			} \
-		} \
-	}
-
-#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), OPTION, (p))
+#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt((request->ch), OPTION, (p))
 
 #define HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \
 	{ \
@@ -118,13 +40,13 @@
 		HTTP_CURL_OPT_STRING_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION, obdc); \
 	}
 #define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \
-	if (!strcasecmp(key, keyname)) { \
-		zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, zval_copy(IS_STRING, *param)); \
+	if (!strcasecmp(key.str, keyname)) { \
+		zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, http_zsep(IS_STRING, *param)); \
 		if (obdc) { \
 			HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \
 		} \
 		HTTP_CURL_OPT(optname, Z_STRVAL_P(copy)); \
-		key = NULL; \
+		zval_ptr_dtor(&copy); \
 		continue; \
 	}
 #define HTTP_CURL_OPT_LONG(OPTION, ldiff) \
@@ -133,11 +55,10 @@
 		HTTP_CURL_OPT_LONG_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION); \
 	}
 #define HTTP_CURL_OPT_LONG_EX(keyname, optname) \
-	if (!strcasecmp(key, keyname)) { \
-		zval *copy = zval_copy(IS_LONG, *param); \
+	if (!strcasecmp(key.str, keyname)) { \
+		zval *copy = http_zsep(IS_LONG, *param); \
 		HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \
-		key = NULL; \
-		zval_free(&copy); \
+		zval_ptr_dtor(&copy); \
 		continue; \
 	}