From 95e601e2b142063642923f4ab2bb5cb32960520e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 25 Feb 2002 07:40:49 +0000 Subject: "Yet Another Geek" made %{content_type} work in the -w/--writeout option. --- docs/curl.1 | 5 ++++- src/writeout.c | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/curl.1 b/docs/curl.1 index fb717b488..574db94c2 100644 --- a/docs/curl.1 +++ b/docs/curl.1 @@ -2,7 +2,7 @@ .\" nroff -man curl.1 .\" Written by Daniel Stenberg .\" -.TH curl 1 "30 Nov 2001" "Curl 7.9.2" "Curl Manual" +.TH curl 1 "25 Feb 2002" "Curl 7.9.5" "Curl Manual" .SH NAME curl \- transfer a URL .SH SYNOPSIS @@ -594,6 +594,9 @@ The average download speed that curl measured for the complete download. .TP .B speed_upload The average upload speed that curl measured for the complete upload. +.TP +.B content_type +The Content-Type of the requested document, if there was any. (Added in 7.9.5) .RE If this option is used several times, the last one will be used. diff --git a/src/writeout.c b/src/writeout.c index a786d2d07..70457929c 100644 --- a/src/writeout.c +++ b/src/writeout.c @@ -46,6 +46,7 @@ typedef enum { VAR_HEADER_SIZE, VAR_REQUEST_SIZE, VAR_EFFECTIVE_URL, + VAR_CONTENT_TYPE, VAR_NUM_OF_VARS /* must be the last */ } replaceid; @@ -69,6 +70,7 @@ static struct variable replacements[]={ {"size_upload", VAR_SIZE_UPLOAD}, {"speed_download", VAR_SPEED_DOWNLOAD}, {"speed_upload", VAR_SPEED_UPLOAD}, + {"content_type", VAR_CONTENT_TYPE}, {NULL, 0} }; @@ -165,6 +167,11 @@ void ourWriteOut(CURL *curl, char *writeinfo) curl_easy_getinfo(curl, CURLINFO_SPEED_UPLOAD, &doubleinfo)) fprintf(stream, "%.3f", doubleinfo); break; + case VAR_CONTENT_TYPE: + if(CURLE_OK == + curl_easy_getinfo(curl, CURLINFO_CONTENT_TYPE, &stringp)) + fputs(stringp, stream); + break; default: break; } -- cgit v1.2.3