X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=8d61558a73a3052799db5850f9ed23c5d3b40afd;hb=a23a141a7ff3a3d3163563eae67cc4839b5657c6;hp=c43aa1abfa3cd3a013a368359f4e369dcf573227;hpb=419ba9235752d56f15b393fc7969316978c6c721;p=m6w6%2Fext-http

diff --git a/http_request_api.c b/http_request_api.c
index c43aa1a..8d61558 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -86,12 +86,10 @@ PHP_MINIT_FUNCTION(http_request)
 		return FAILURE;
 	}
 	
-#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;
 }
@@ -106,7 +104,7 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
 }
 
 #ifndef HAVE_CURL_EASY_STRERROR
-#	define curl_easy_strerror(code) HTTP_G(request).error
+#	define curl_easy_strerror(dummy) "unkown error"
 #endif
 
 #define HTTP_CURL_INFO(I) HTTP_CURL_INFO_EX(I, I)
@@ -139,6 +137,21 @@ PHP_MSHUTDOWN_FUNCTION(http_request)
 			} \
 		} \
 		break; \
+\
+		case CURLINFO_SLIST: \
+		{ \
+			struct curl_slist *l, *p; \
+			if (CURLE_OK == curl_easy_getinfo(ch, CURLINFO_ ##I, &l)) { \
+				zval *subarray; \
+				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(http_request_data_copy(COPY_STRING, #X), sizeof(#X)-1, 0, 0), subarray); \
+				curl_slist_free_all(l); \
+			} \
+		} \
 	}
 
 #define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt(ch, CURLOPT_##OPTION, (p))
@@ -172,6 +185,7 @@ 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; }
+static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *);
 
 /* {{{ 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)
@@ -405,6 +419,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	HTTP_CURL_OPT(FILETIME, 1);
 	HTTP_CURL_OPT(AUTOREFERER, 1);
 	HTTP_CURL_OPT(READFUNCTION, http_curl_read_callback);
+	HTTP_CURL_OPT(IOCTLFUNCTION, http_curl_ioctl_callback);
 	/* we'll get all data through the debug function */
 	HTTP_CURL_OPT(WRITEFUNCTION, http_curl_dummy_callback);
 	HTTP_CURL_OPT(HEADERFUNCTION, NULL);
@@ -412,12 +427,9 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	HTTP_CURL_OPT(VERBOSE, 1);
 	HTTP_CURL_OPT(DEBUGFUNCTION, http_curl_raw_callback);
 
-#if defined(ZTS) && (LIBCURL_VERSION_NUM >= 0x070a00)
+#if defined(ZTS)
 	HTTP_CURL_OPT(NOSIGNAL, 1);
 #endif
-#if LIBCURL_VERSION_NUM < 0x070c00
-	HTTP_CURL_OPT(ERRORBUFFER, HTTP_G(request).error);
-#endif
 
 	/* progress callback */
 	if ((zoption = http_curl_getopt(options, "onprogress", 0))) {
@@ -437,12 +449,10 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 		if ((zoption = http_curl_getopt(options, "proxyauth", IS_STRING))) {
 			HTTP_CURL_OPT(PROXYUSERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 		}
-#if LIBCURL_VERSION_NUM >= 0x070a07
 		/* auth method */
 		if ((zoption = http_curl_getopt(options, "proxyauthtype", IS_LONG))) {
 			HTTP_CURL_OPT(PROXYAUTH, Z_LVAL_P(zoption));
 		}
-#endif
 	}
 
 	/* outgoing interface */
@@ -459,18 +469,16 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 	if ((zoption = http_curl_getopt(options, "httpauth", IS_STRING))) {
 		HTTP_CURL_OPT(USERPWD, http_request_data_copy(COPY_STRING, Z_STRVAL_P(zoption)));
 	}
-#if LIBCURL_VERSION_NUM >= 0x070a06
 	if ((zoption = http_curl_getopt(options, "httpauthtype", IS_LONG))) {
 		HTTP_CURL_OPT(HTTPAUTH, Z_LVAL_P(zoption));
 	}
-#endif
 
 	/* compress, empty string enables all supported if libcurl was build with zlib support */
 	if ((zoption = http_curl_getopt(options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) {
-#if defined(HTTP_HAVE_ZLIB) || defined(HAVE_ZLIB)
-		HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
-#else
+#ifdef HTTP_HAVE_CURL_ZLIB
 		HTTP_CURL_OPT(ENCODING, "");
+#else
+		HTTP_CURL_OPT(ENCODING, "gzip;q=1.0, deflate;q=0.5, *;q=0.1");
 #endif
 	}
 
@@ -607,9 +615,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 		FOREACH_KEYVAL(pos, zoption, key, idx, param) {
 			if (key) {
 				HTTP_CURL_OPT_SSL_STRING(CERT);
-#if LIBCURL_VERSION_NUM >= 0x070903
 				HTTP_CURL_OPT_SSL_STRING(CERTTYPE);
-#endif
 				HTTP_CURL_OPT_SSL_STRING(CERTPASSWD);
 
 				HTTP_CURL_OPT_SSL_STRING(KEY);
@@ -624,9 +630,7 @@ PHP_HTTP_API STATUS _http_request_init(CURL *ch, http_request_method meth, char
 				HTTP_CURL_OPT_SSL_STRING_(CIPHER_LIST);
 
 				HTTP_CURL_OPT_STRING(CAINFO);
-#if LIBCURL_VERSION_NUM >= 0x070908
 				HTTP_CURL_OPT_STRING(CAPATH);
-#endif
 				HTTP_CURL_OPT_STRING(RANDOM_FILE);
 				HTTP_CURL_OPT_STRING(EGDSOCKET);
 
@@ -679,6 +683,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_IOCTLDATA, http_request_callback_data(body));
 				curl_easy_setopt(ch, CURLOPT_READDATA, http_request_callback_data(body));
 				curl_easy_setopt(ch, CURLOPT_INFILESIZE, body->size);
 			break;
@@ -733,24 +738,16 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
 	INIT_ZARR(array, info);
 
 	HTTP_CURL_INFO(EFFECTIVE_URL);
-#if LIBCURL_VERSION_NUM >= 0x070a07
 	HTTP_CURL_INFO(RESPONSE_CODE);
-#else
-	HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE);
-#endif
-	HTTP_CURL_INFO(HTTP_CONNECTCODE);
-#if LIBCURL_VERSION_NUM >= 0x070500
+	HTTP_CURL_INFO_EX(HTTP_CONNECTCODE, connect_code);
 	HTTP_CURL_INFO(FILETIME);
-#endif
 	HTTP_CURL_INFO(TOTAL_TIME);
 	HTTP_CURL_INFO(NAMELOOKUP_TIME);
 	HTTP_CURL_INFO(CONNECT_TIME);
 	HTTP_CURL_INFO(PRETRANSFER_TIME);
 	HTTP_CURL_INFO(STARTTRANSFER_TIME);
-#if LIBCURL_VERSION_NUM >= 0x070907
 	HTTP_CURL_INFO(REDIRECT_TIME);
 	HTTP_CURL_INFO(REDIRECT_COUNT);
-#endif
 	HTTP_CURL_INFO(SIZE_UPLOAD);
 	HTTP_CURL_INFO(SIZE_DOWNLOAD);
 	HTTP_CURL_INFO(SPEED_DOWNLOAD);
@@ -758,24 +755,17 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC)
 	HTTP_CURL_INFO(HEADER_SIZE);
 	HTTP_CURL_INFO(REQUEST_SIZE);
 	HTTP_CURL_INFO(SSL_VERIFYRESULT);
-#if LIBCURL_VERSION_NUM >= 0x070c03
-	/*HTTP_CURL_INFO(SSL_ENGINES); todo: CURLINFO_SLIST */
-#endif
+	HTTP_CURL_INFO(SSL_ENGINES);
 	HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD);
 	HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD);
 	HTTP_CURL_INFO(CONTENT_TYPE);
-#if LIBCURL_VERSION_NUM >= 0x070a03
 	/*HTTP_CURL_INFO(PRIVATE);*/
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070a08
 	HTTP_CURL_INFO(HTTPAUTH_AVAIL);
 	HTTP_CURL_INFO(PROXYAUTH_AVAIL);
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070c02
 	/*HTTP_CURL_INFO(OS_ERRNO);*/
-#endif
-#if LIBCURL_VERSION_NUM >= 0x070c03
 	HTTP_CURL_INFO(NUM_CONNECTS);
+#if LIBCURL_VERSION_NUM >= 0x070e01
+	HTTP_CURL_INFO_EX(COOKIELIST, cookies);
 #endif
 }
 /* }}} */
@@ -834,6 +824,24 @@ static int http_curl_progress_callback(void *data, double dltotal, double dlnow,
 }
 /* }}} */
 
+/* {{{ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *) */
+static curlioerr http_curl_ioctl_callback(CURL *ch, curliocmd cmd, void *ctx)
+{
+	HTTP_REQUEST_CALLBACK_DATA(ctx, http_request_body *, body);
+	
+	if (cmd != CURLIOCMD_RESTARTREAD) {
+		return CURLIOE_UNKNOWNCMD;
+	}
+	if (body->type != HTTP_REQUEST_BODY_UPLOADFILE) {
+		return CURLIOE_FAILRESTART;
+	}
+	if (SUCCESS != php_stream_rewind((php_stream *) body->data)) {
+		return CURLIOE_FAILRESTART;
+	}
+	return CURLIOE_OK;
+}
+/* }}} */
+
 /* {{{ 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)
 {
@@ -1022,15 +1030,11 @@ static inline void _http_curl_defaults(CURL *ch)
 	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);
@@ -1047,9 +1051,7 @@ static inline void _http_curl_defaults(CURL *ch)
 	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);
@@ -1060,14 +1062,13 @@ static inline void _http_curl_defaults(CURL *ch)
 	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(IOCTLDATA, NULL);
 	HTTP_CURL_OPT(READDATA, NULL);
 	HTTP_CURL_OPT(INFILESIZE, 0);
 }