Unverified Commit edafd52b authored Jun 18, 2017 by Marcel Raad

http_proxy: fix build with http and proxy

After deff7de0, the build without
CURL_DISABLE_PROXY and CURL_DISABLE_HTTP was failing because of missing
includes.

parent deff7de0

lib/http_proxy.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,6 @@

	#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)		#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)

	#include "urldata.h"
	#include <curl/curl.h>		#include <curl/curl.h>
	#include "sendf.h"		#include "sendf.h"
	#include "http.h"		#include "http.h"

lib/http_proxy.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,9 @@
	*		*
	***************************************************************************/		***************************************************************************/

			#include "curl_setup.h"
			#include "urldata.h"

	#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)		#if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP)
	/* ftp can use this as well */		/* ftp can use this as well */
	CURLcode Curl_proxyCONNECT(struct connectdata *conn,		CURLcode Curl_proxyCONNECT(struct connectdata *conn,