moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

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

Browse Source 
Also, fixed Curl_proxyCONNECT() stub with HTTP disabled.
This commit is contained in:
Dan Fandrich 2011-04-05 22:28:26 -07:00
parent 5b716b7c91
commit 6eb484942b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure.ac
View File

@ -2938,9 +2938,11 @@ fi
if test "x$USE_WINDOWS_SSPI" = "x1"; then if test "x$USE_WINDOWS_SSPI" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES SSPI" SUPPORT_FEATURES="$SUPPORT_FEATURES SSPI"
fi fi
if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \ if test "x$CURL_DISABLE_HTTP" != "x1"; then
-o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1"; then if test "x$USE_SSLEAY" = "x1" -o "x$USE_WINDOWS_SSPI" = "x1" \
SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM" -o "x$GNUTLS_ENABLED" = "x1" -o "x$NSS_ENABLED" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES NTLM"
fi
fi fi
if test "x$USE_TLS_SRP" = "x1"; then if test "x$USE_TLS_SRP" = "x1"; then
SUPPORT_FEATURES="$SUPPORT_FEATURES TLS-SRP" SUPPORT_FEATURES="$SUPPORT_FEATURES TLS-SRP"

2
lib/http_proxy.h
View File

@ -29,5 +29,5 @@ CURLcode Curl_proxyCONNECT(struct connectdata *conn,
#define PROXY_TIMEOUT (3600*1000) #define PROXY_TIMEOUT (3600*1000)
#else #else
#define Curl_proxyCONNECT(x,y,x,w) CURLE_NOT_BUILT_IN #define Curl_proxyCONNECT(x,y,z,w) CURLE_NOT_BUILT_IN
#endif #endif