X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=php_http_request_int.h;h=7bf5db1927392c34e91bb17d3396984a4e8f4ded;hp=ae291865b07528e72f6ec9b130e1e23c2f9b9af8;hb=0e0def98a4ea4463bf8c21c6f161b2b37aa8c49d;hpb=aebfa7783e7b280bff4975649b20494e5eb932bc

diff --git a/php_http_request_int.h b/php_http_request_int.h
index ae29186..7bf5db1 100644
--- a/php_http_request_int.h
+++ b/php_http_request_int.h
@@ -50,8 +50,7 @@
 #	define curl_easy_strerror(dummy) "unknown error"
 #endif
 
-#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) \
 	{ \
@@ -59,13 +58,12 @@
 		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)) { \
+	if (!strcasecmp(key.str, keyname)) { \
 		zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, zval_copy(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; \
 		continue; \
 	}
 #define HTTP_CURL_OPT_LONG(OPTION, ldiff) \
@@ -74,10 +72,9 @@
 		HTTP_CURL_OPT_LONG_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION); \
 	}
 #define HTTP_CURL_OPT_LONG_EX(keyname, optname) \
-	if (!strcasecmp(key, keyname)) { \
+	if (!strcasecmp(key.str, keyname)) { \
 		zval *copy = zval_copy(IS_LONG, *param); \
 		HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \
-		key = NULL; \
 		zval_free(&copy); \
 		continue; \
 	}