Rename 'content_type' to just 'type'

Because 'content_type' may result in partial matching when people try or get the 'content'. Fixes #169
jeroen · Jan 9, 2019 · 594e59a · 594e59a
1 parent c670b04
commit 594e59a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -6,7 +6,7 @@
  - Tweak some unit tests to give less false positives
  - curl_echo() has been changed to return better structured output
  - Added curl_fetch_echo() as a wrapper for curl_echo()
- - Response for curl_fetch_memory() gains a 'content_type' property
+ - Response for curl_fetch_memory() gains a 'type' field with the content-type
  - Fix a unit test for OpenSSL 1.1.1
  - Better default progress function if no progresfun or xferinfofun is set
  - Skip unit tests if no internet is available

diff --git a/src/handle.c b/src/handle.c
@@ -408,7 +408,7 @@ SEXP make_namesvec(){
   SEXP names = PROTECT(allocVector(STRSXP, 7));
   SET_STRING_ELT(names, 0, mkChar("url"));
   SET_STRING_ELT(names, 1, mkChar("status_code"));
-  SET_STRING_ELT(names, 2, mkChar("content_type"));
+  SET_STRING_ELT(names, 2, mkChar("type"));
   SET_STRING_ELT(names, 3, mkChar("headers"));
   SET_STRING_ELT(names, 4, mkChar("modified"));
   SET_STRING_ELT(names, 5, mkChar("times"));