Commit 6eb48494 authored by Dan Fandrich's avatar Dan Fandrich
Browse files

Don't list NTLM in curl-config when HTTP is disabled 

Also, fixed Curl_proxyCONNECT() stub with HTTP disabled.
parent 5b716b7c

configure.ac

+5 −3
Original line number Diff line number Diff line
@@ -2938,10 +2938,12 @@ fi 
if test "x$USE_WINDOWS_SSPI" = "x1"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES SSPI"

fi

if test "x$CURL_DISABLE_HTTP" != "x1"; then

  if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \

      -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1"; then

    SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM"

  fi

fi

if test "x$USE_TLS_SRP" = "x1"; then

  SUPPORT_FEATURES="$SUPPORT_FEATURES TLS-SRP"

fi

lib/http_proxy.h

+1 −1
Original line number Diff line number Diff line
@@ -29,5 +29,5 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn, 
#define PROXY_TIMEOUT (3600*1000)



#else

#define Curl_proxyCONNECT(x,y,x,w) CURLE_NOT_BUILT_IN

#define Curl_proxyCONNECT(x,y,z,w) CURLE_NOT_BUILT_IN

#endif