aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/http.c2
-rw-r--r--lib/transfer.c4
-rw-r--r--lib/url.c2
-rw-r--r--lib/urldata.h4
4 files changed, 5 insertions, 7 deletions
diff --git a/lib/http.c b/lib/http.c
index 32666d82b..3a1f89025 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -964,7 +964,7 @@ CURLcode Curl_ConnectHTTPProxyTunnel(struct connectdata *conn,
/* send the header to the callback */
writetype = CLIENTWRITE_HEADER;
- if(data->set.http_include_header)
+ if(data->set.include_header)
writetype |= CLIENTWRITE_BODY;
result = Curl_client_write(data, writetype, line_start, perline);
diff --git a/lib/transfer.c b/lib/transfer.c
index 4385b843d..977cb72d4 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -454,7 +454,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
/* now, only output this if the header AND body are requested:
*/
writetype = CLIENTWRITE_HEADER;
- if (data->set.http_include_header)
+ if (data->set.include_header)
writetype |= CLIENTWRITE_BODY;
headerlen = k->p - data->state.headerbuff;
@@ -868,7 +868,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
*/
writetype = CLIENTWRITE_HEADER;
- if (data->set.http_include_header)
+ if (data->set.include_header)
writetype |= CLIENTWRITE_BODY;
if(data->set.verbose)
diff --git a/lib/url.c b/lib/url.c
index 635a01924..d3ee36469 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -455,7 +455,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
/*
* Set to include the header in the general data output stream.
*/
- data->set.http_include_header = va_arg(param, long)?TRUE:FALSE;
+ data->set.include_header = va_arg(param, long)?TRUE:FALSE;
break;
case CURLOPT_NOPROGRESS:
/*
diff --git a/lib/urldata.h b/lib/urldata.h
index fb1150468..f138fc48c 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -868,9 +868,7 @@ struct UserDefined {
bool http_fail_on_error;
bool http_follow_location;
bool http_disable_hostname_check_before_authentication;
- bool include_header;
-#define http_include_header include_header /* former name */
-
+ bool include_header; /* include received protocol headers in data output */
bool http_set_referer;
bool http_auto_referer; /* set "correct" referer when following location: */
bool opt_no_body; /* as set with CURLOPT_NO_BODY */