Date: Sat, 25 Apr 2015 07:45:18 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384716 - head/ftp/curl/files Message-ID: <201504250745.t3P7jISx045052@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sat Apr 25 07:45:17 2015 New Revision: 384716 URL: https://svnweb.freebsd.org/changeset/ports/384716 Log: - Fix build without NTLM Reference: https://github.com/bagder/curl/commit/fd9d3a1ef1f7b1cb5812d04bad07818efc6f3b3a Modified: head/ftp/curl/files/patch-lib-url.c Modified: head/ftp/curl/files/patch-lib-url.c ============================================================================== --- head/ftp/curl/files/patch-lib-url.c Sat Apr 25 07:42:36 2015 (r384715) +++ head/ftp/curl/files/patch-lib-url.c Sat Apr 25 07:45:17 2015 (r384716) @@ -1,11 +1,15 @@ +[1] Description: Different handling of signals and threads. Forwarded: not-needed Author: Peter Pentchev <roam@FreeBSD.org> Last-Update: 2010-12-18 ---- lib/url.c.orig 2012-01-23 23:31:30.000000000 +0800 -+++ lib/url.c 2012-02-26 17:52:21.937920303 +0800 -@@ -797,6 +797,10 @@ +[2] +Reference: https://github.com/bagder/curl/commit/fd9d3a1ef1f7b1cb5812d04bad07818efc6f3b3a.patch + +--- lib/url.c.orig 2015-04-22 05:55:54 UTC ++++ lib/url.c +@@ -658,6 +658,10 @@ CURLcode Curl_open(struct SessionHandle data->progress.flags |= PGRS_HIDE; data->state.current_speed = -1; /* init to negative == impossible */ @@ -16,3 +20,35 @@ Last-Update: 2010-12-18 data->wildcard.state = CURLWC_INIT; data->wildcard.filelist = NULL; data->set.fnmatch = ZERO_NULL; +@@ -3069,9 +3073,11 @@ ConnectionExists(struct SessionHandle *d + struct connectdata *check; + struct connectdata *chosen = 0; + bool canPipeline = IsPipeliningPossible(data, needle); ++#ifdef USE_NTLM + bool wantNTLMhttp = ((data->state.authhost.want & CURLAUTH_NTLM) || + (data->state.authhost.want & CURLAUTH_NTLM_WB)) && + (needle->handler->protocol & PROTO_FAMILY_HTTP) ? TRUE : FALSE; ++#endif + struct connectbundle *bundle; + + *force_reuse = FALSE; +@@ -3208,6 +3214,7 @@ ConnectionExists(struct SessionHandle *d + continue; + } + ++#if defined(USE_NTLM) + if((!(needle->handler->flags & PROTOPT_CREDSPERREQUEST)) || + (wantNTLMhttp || check->ntlm.state != NTLMSTATE_NONE)) { + /* This protocol requires credentials per connection or is HTTP+NTLM, +@@ -3217,10 +3224,9 @@ ConnectionExists(struct SessionHandle *d + /* one of them was different */ + continue; + } +-#if defined(USE_NTLM) + credentialsMatch = TRUE; +-#endif + } ++#endif + + if(!needle->bits.httpproxy || needle->handler->flags&PROTOPT_SSL || + (needle->bits.httpproxy && check->bits.httpproxy &&
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504250745.t3P7jISx045052>