Commit ee7d1d07 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

remove an long time #defined struct member and use the actual "real" name 

instead to make it easier to find/read
parent 4e3aa250

lib/http.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

lib/transfer.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

lib/url.c

+1 −1
Original line number Diff line number Diff line
@@ -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:

    /*

lib/urldata.h

+1 −3
Original line number Diff line number Diff line
@@ -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 */