Unverified Commit 7c70a3b1 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

http: CURL_DISABLE_HTTP_AUTH

parent bf730396

lib/http.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -257,6 +257,7 @@ char *Curl_copy_header_value(const char *header) 
  return value;

  return value;

}

}





#ifndef CURL_DISABLE_HTTP_AUTH

/*

/*

 * http_output_basic() sets up an Authorization: header (or the proxy version)

 * http_output_basic() sets up an Authorization: header (or the proxy version)

 * for HTTP Basic authentication.

 * for HTTP Basic authentication.
@@ -338,6 +339,8 @@ static CURLcode http_output_bearer(struct connectdata *conn) 
  return result;

  return result;

}

}





#endif



/* pickoneauth() selects the most favourable authentication method from the

/* pickoneauth() selects the most favourable authentication method from the

 * ones available and the ones we want.

 * ones available and the ones we want.

 *

 *
@@ -611,6 +614,7 @@ CURLcode Curl_http_auth_act(struct connectdata *conn) 
  return result;

  return result;

}

}





#ifndef CURL_DISABLE_HTTP_AUTH

/*

/*

 * Output the correct authentication header depending on the auth type

 * Output the correct authentication header depending on the auth type

 * and whether or not it is to a proxy.

 * and whether or not it is to a proxy.
@@ -799,6 +803,22 @@ Curl_http_output_auth(struct connectdata *conn, 
  return result;

  return result;

}

}





#else

/* when disabled */

CURLcode

Curl_http_output_auth(struct connectdata *conn,

                      const char *request,

                      const char *path,

                      bool proxytunnel)

{

  (void)conn;

  (void)request;

  (void)path;

  (void)proxytunnel;

  return CURLE_OK;

}

#endif



/*

/*

 * Curl_http_input_auth() deals with Proxy-Authenticate: and WWW-Authenticate:

 * Curl_http_input_auth() deals with Proxy-Authenticate: and WWW-Authenticate:

 * headers. They are dealt with both in the transfer.c main loop and in the

 * headers. They are dealt with both in the transfer.c main loop and in the

lib/urldata.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1281,7 +1281,6 @@ struct UrlState { 




  struct auth authhost;  /* auth details for host */

  struct auth authhost;  /* auth details for host */

  struct auth authproxy; /* auth details for proxy */

  struct auth authproxy; /* auth details for proxy */



  void *resolver; /* resolver state, if it is used in the URL state -

  void *resolver; /* resolver state, if it is used in the URL state -

                     ares_channel f.e. */

                     ares_channel f.e. */