X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=http_request_api.c;h=f62881b1bf6b20a739595548370e87790485656c;hb=2c0c193bdcfaa2e3c6b336da078f371e96fcec52;hp=9697f6d18893b53cca0c6ae1215cd99c597bce38;hpb=82e177a071d35372367f9f5255b3e2c553c8bffd;p=m6w6%2Fext-http

diff --git a/http_request_api.c b/http_request_api.c
index 9697f6d..f62881b 100644
--- a/http_request_api.c
+++ b/http_request_api.c
@@ -171,23 +171,23 @@ 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, CURLOPT_NOSIGNAL, 1L);
+		curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L);
 #endif
-		HTTP_CURL_OPT_EX(ch, CURLOPT_HEADER, 0L);
-		HTTP_CURL_OPT_EX(ch, CURLOPT_FILETIME, 1L);
-		HTTP_CURL_OPT_EX(ch, CURLOPT_AUTOREFERER, 1L);
-		HTTP_CURL_OPT_EX(ch, CURLOPT_VERBOSE, 1L);
-		HTTP_CURL_OPT_EX(ch, CURLOPT_HEADERFUNCTION, NULL);
-		HTTP_CURL_OPT_EX(ch, CURLOPT_DEBUGFUNCTION, http_curl_raw_callback);
-		HTTP_CURL_OPT_EX(ch, CURLOPT_READFUNCTION, http_curl_read_callback);
-		HTTP_CURL_OPT_EX(ch, CURLOPT_IOCTLFUNCTION, http_curl_ioctl_callback);
-		HTTP_CURL_OPT_EX(ch, CURLOPT_WRITEFUNCTION, http_curl_dummy_callback);
+		curl_easy_setopt(ch, CURLOPT_HEADER, 0L);
+		curl_easy_setopt(ch, CURLOPT_FILETIME, 1L);
+		curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1L);
+		curl_easy_setopt(ch, CURLOPT_VERBOSE, 1L);
+		curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, NULL);
+		curl_easy_setopt(ch, CURLOPT_DEBUGFUNCTION, http_curl_raw_callback);
+		curl_easy_setopt(ch, CURLOPT_READFUNCTION, http_curl_read_callback);
+		curl_easy_setopt(ch, CURLOPT_IOCTLFUNCTION, http_curl_ioctl_callback);
+		curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_dummy_callback);
 		
 		/* set context */
 		if (request) {
-			HTTP_CURL_OPT_EX(ch, CURLOPT_PRIVATE, request);
-			HTTP_CURL_OPT_EX(ch, CURLOPT_DEBUGDATA, request);
-			HTTP_CURL_OPT_EX(ch, CURLOPT_ERRORBUFFER, request->_error);
+			curl_easy_setopt(ch, CURLOPT_PRIVATE, request);
+			curl_easy_setopt(ch, CURLOPT_DEBUGDATA, request);
+			curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, request->_error);
 			
 			/* attach curl handle */
 			request->ch = ch;
@@ -205,10 +205,10 @@ PHP_HTTP_API void _http_curl_free(CURL **ch)
 {
 	if (*ch) {
 		/* avoid nasty segfaults with already cleaned up callbacks */
-		HTTP_CURL_OPT_EX(*ch, CURLOPT_NOPROGRESS, 1L);
-		HTTP_CURL_OPT_EX(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
-		HTTP_CURL_OPT_EX(*ch, CURLOPT_VERBOSE, 0L);
-		HTTP_CURL_OPT_EX(*ch, CURLOPT_DEBUGFUNCTION, NULL);
+		curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L);
+		curl_easy_setopt(*ch, CURLOPT_PROGRESSFUNCTION, NULL);
+		curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L);
+		curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL);
 		curl_easy_cleanup(*ch);
 		*ch = NULL;
 	}
@@ -856,45 +856,6 @@ PHP_HTTP_API void _http_request_exec(http_request *request)
 }
 /* }}} */
 
-/* {{{ void http_request_info(http_request *, HashTable *) */
-PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info)
-{
-	zval array;
-	INIT_ZARR(array, info);
-
-	HTTP_CURL_INFO(CURLINFO_EFFECTIVE_URL);
-	HTTP_CURL_INFO(CURLINFO_RESPONSE_CODE);
-	HTTP_CURL_INFO_EX(CURLINFO_HTTP_CONNECTCODE, "connect_code");
-	HTTP_CURL_INFO(CURLINFO_FILETIME);
-	HTTP_CURL_INFO(CURLINFO_TOTAL_TIME);
-	HTTP_CURL_INFO(CURLINFO_NAMELOOKUP_TIME);
-	HTTP_CURL_INFO(CURLINFO_CONNECT_TIME);
-	HTTP_CURL_INFO(CURLINFO_PRETRANSFER_TIME);
-	HTTP_CURL_INFO(CURLINFO_STARTTRANSFER_TIME);
-	HTTP_CURL_INFO(CURLINFO_REDIRECT_TIME);
-	HTTP_CURL_INFO(CURLINFO_REDIRECT_COUNT);
-	HTTP_CURL_INFO(CURLINFO_SIZE_UPLOAD);
-	HTTP_CURL_INFO(CURLINFO_SIZE_DOWNLOAD);
-	HTTP_CURL_INFO(CURLINFO_SPEED_DOWNLOAD);
-	HTTP_CURL_INFO(CURLINFO_SPEED_UPLOAD);
-	HTTP_CURL_INFO(CURLINFO_HEADER_SIZE);
-	HTTP_CURL_INFO(CURLINFO_REQUEST_SIZE);
-	HTTP_CURL_INFO(CURLINFO_SSL_VERIFYRESULT);
-	HTTP_CURL_INFO(CURLINFO_SSL_ENGINES);
-	HTTP_CURL_INFO(CURLINFO_CONTENT_LENGTH_DOWNLOAD);
-	HTTP_CURL_INFO(CURLINFO_CONTENT_LENGTH_UPLOAD);
-	HTTP_CURL_INFO(CURLINFO_CONTENT_TYPE);
-	HTTP_CURL_INFO(CURLINFO_HTTPAUTH_AVAIL);
-	HTTP_CURL_INFO(CURLINFO_PROXYAUTH_AVAIL);
-	HTTP_CURL_INFO(CURLINFO_NUM_CONNECTS);
-#if HTTP_CURL_VERSION(7,14,1)
-	HTTP_CURL_INFO_EX(CURLINFO_COOKIELIST, "cookies");
-#endif
-	HTTP_CURL_INFO(CURLINFO_OS_ERRNO);
-	add_assoc_string(&array, "error", request->_error, 1);
-}
-/* }}} */
-
 /* {{{ 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 *ctx)
 {