From 66ab8a7cd7dd37a42d5685a0b9de86adc73bf340 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Sun, 11 Dec 2005 11:26:08 +0000 Subject: [PATCH 1/1] - implement CURLINFO_SLIST - enable ssl_engines and cookies info --- http_request_api.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/http_request_api.c b/http_request_api.c index 372304c..5c5d67c 100644 --- a/http_request_api.c +++ b/http_request_api.c @@ -137,6 +137,24 @@ 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) { \ + zval *entry; \ + MAKE_STD_ZVAL(entry); \ + ZVAL_STRING(entry, p->data, 1); \ + add_next_index_zval(subarray, entry); \ + } \ + 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)) @@ -721,8 +739,7 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC) HTTP_CURL_INFO(EFFECTIVE_URL); HTTP_CURL_INFO(RESPONSE_CODE); - HTTP_CURL_INFO_EX(HTTP_CODE, RESPONSE_CODE); - HTTP_CURL_INFO(HTTP_CONNECTCODE); + HTTP_CURL_INFO_EX(HTTP_CONNECTCODE, connect_code); HTTP_CURL_INFO(FILETIME); HTTP_CURL_INFO(TOTAL_TIME); HTTP_CURL_INFO(NAMELOOKUP_TIME); @@ -738,7 +755,7 @@ 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); - /*HTTP_CURL_INFO(SSL_ENGINES); todo: CURLINFO_SLIST */ + HTTP_CURL_INFO(SSL_ENGINES); HTTP_CURL_INFO(CONTENT_LENGTH_DOWNLOAD); HTTP_CURL_INFO(CONTENT_LENGTH_UPLOAD); HTTP_CURL_INFO(CONTENT_TYPE); @@ -747,6 +764,9 @@ PHP_HTTP_API void _http_request_info(CURL *ch, HashTable *info TSRMLS_DC) HTTP_CURL_INFO(PROXYAUTH_AVAIL); /*HTTP_CURL_INFO(OS_ERRNO);*/ HTTP_CURL_INFO(NUM_CONNECTS); +#if LIBCURL_VERSION_NUM >= 0x070e01 + HTTP_CURL_INFO_EX(COOKIELIST, cookies); +#endif } /* }}} */ -- 2.30.2