svn commit: r497348 - head/ftp/curl/files

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Sat Mar 30 20:44:48 2019
New Revision: 497348
URL: https://svnweb.freebsd.org/changeset/ports/497348

Log:
  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

Added:
  head/ftp/curl/files/patch-lib-cookie.c   (contents, props changed)

Added: head/ftp/curl/files/patch-lib-cookie.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ftp/curl/files/patch-lib-cookie.c	Sat Mar 30 20:44:48 2019	(r497348)
@@ -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)
+ 
+ /*****************************************************************************
+  *