diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-03-30 20:44:48 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2019-03-30 20:44:48 +0000 |
| commit | 345960f298e6f4003d76b0c78d0ea258a3154881 (patch) | |
| tree | 5e0fb26dfed4ec21bc1c31bd9ac4800db1c559f2 /ftp | |
| parent | 7ac7e9962b2a240169cfaf900c454c1560a62ab5 (diff) | |
| download | ports-345960f298e6f4003d76b0c78d0ea258a3154881.tar.gz ports-345960f298e6f4003d76b0c78d0ea258a3154881.zip | |
Fix undefined Curl_get_line when ALTSVC enabled and COOKIES disabled
ALTSVC requires Curl_get_line which is defined in lib/cookie.c inside a #if
check of HTTP and COOKIES. That makes Curl_get_line undefined if COOKIES is
disabled. This is a workaround to define Curl_get_line unconditionally.
PR: 236885, 236890
Notes
Notes:
svn path=/head/; revision=497348
Diffstat (limited to 'ftp')
| -rw-r--r-- | ftp/curl/files/patch-lib-cookie.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/ftp/curl/files/patch-lib-cookie.c b/ftp/curl/files/patch-lib-cookie.c new file mode 100644 index 000000000000..a854fd95fe31 --- /dev/null +++ b/ftp/curl/files/patch-lib-cookie.c @@ -0,0 +1,19 @@ +--- lib/cookie.c.orig 2019-03-25 08:42:50 UTC ++++ lib/cookie.c +@@ -1085,6 +1085,8 @@ Curl_cookie_add(struct Curl_easy *data, + return co; + } + ++#endif /* CURL_DISABLE_HTTP || CURL_DISABLE_COOKIES */ ++ + /* + * get_line() makes sure to only return complete whole lines that fit in 'len' + * bytes and end with a newline. +@@ -1112,6 +1114,7 @@ char *Curl_get_line(char *buf, int len, + return NULL; + } + ++#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES) + + /***************************************************************************** + * |