diff options
| author | Christian Grothoff <christian@grothoff.org> | 2015-01-08 19:38:57 +0100 |
|---|---|---|
| committer | ng0 <ng0@infotropique.org> | 2017-08-20 18:40:22 +0000 |
| commit | 83c97b19e714790ceebc107dd8e6d4b349409d1c (patch) | |
| tree | f6f9ff2babb15ab1ad8e0ab84f43527f3c8356f7 /lib | |
| parent | 8839c05fba1f8415eec17eff8ac60cc3a50eb51e (diff) | |
| download | gnurl-7_55_1.tar.gz gnurl-7_55_1.tar.bz2 gnurl-7_55_1.zip | |
Patchset for gnURL microfork:gnurl-7.55.1gnurl-7_55_1
* Patches to rename libcurl to libgnurl by Christian
* Updated for latest curl using git cherry-pick by Jeff, Florian, ng0
* Patches to fix the testsuite (deleted tests/data/test1139, renamed
reference from libcurl.* to libgnurl.*) by ng0
* Added guix-gnurl.scm which can be used to build this with guix prior
to installing it. (author: ng0)
* Further adjustments by ng0
* 7.55.0: Manual addition of a7bbbb7c368c6096802007f61f19a02e9d75285b and f864bd8c880d5a916379aa4f26f1c45fe370b282 from upstream master.
* 7.55.1: Renamed include/curl to include/gnurl, a partial fix of https://gnunet.org/bugs/view.php?id=5122
Signed-off-by: ng0 <ng0@infotropique.org>
Diffstat (limited to 'lib')
93 files changed, 116 insertions, 116 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 176bf3342..2aa1bb030 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -25,14 +25,14 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake EXTRA_DIST = Makefile.b32 Makefile.m32 config-win32.h \ config-win32ce.h config-riscos.h config-mac.h curl_config.h.in \ - makefile.dj config-dos.h libcurl.plist libcurl.rc config-amigaos.h \ + makefile.dj config-dos.h libgnurl.plist libcurl.rc config-amigaos.h \ makefile.amiga Makefile.netware nwlib.c nwos.c config-win32ce.h \ config-os400.h setup-os400.h config-symbian.h Makefile.Watcom \ config-tpf.h mk-ca-bundle.pl mk-ca-bundle.vbs $(CMAKE_DIST) \ firefox-db2pem.sh config-vxworks.h Makefile.vxworks checksrc.pl \ objnames-test08.sh objnames-test10.sh objnames.inc -lib_LTLIBRARIES = libcurl.la +lib_LTLIBRARIES = libgnurl.la if BUILD_UNITTESTS noinst_LTLIBRARIES = libcurlu.la @@ -98,42 +98,42 @@ AM_CPPFLAGS += -DBUILDING_LIBCURL AM_LDFLAGS = AM_CFLAGS = -libcurl_la_CPPFLAGS_EXTRA = -libcurl_la_LDFLAGS_EXTRA = -libcurl_la_CFLAGS_EXTRA = +libgnurl_la_CPPFLAGS_EXTRA = +libgnurl_la_LDFLAGS_EXTRA = +libgnurl_la_CFLAGS_EXTRA = @CODE_COVERAGE_RULES@ -libcurl_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS) -libcurl_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS) +libgnurl_la_LDFLAGS_EXTRA += $(CODE_COVERAGE_LDFLAGS) +libgnurl_la_CFLAGS_EXTRA += $(CODE_COVERAGE_CFLAGS) if CURL_LT_SHLIB_USE_VERSION_INFO -libcurl_la_LDFLAGS_EXTRA += $(VERSIONINFO) +libgnurl_la_LDFLAGS_EXTRA += $(VERSIONINFO) endif if CURL_LT_SHLIB_USE_NO_UNDEFINED -libcurl_la_LDFLAGS_EXTRA += -no-undefined +libgnurl_la_LDFLAGS_EXTRA += -no-undefined endif if CURL_LT_SHLIB_USE_MIMPURE_TEXT -libcurl_la_LDFLAGS_EXTRA += -mimpure-text +libgnurl_la_LDFLAGS_EXTRA += -mimpure-text endif if CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS -libcurl_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers +libgnurl_la_LDFLAGS_EXTRA += -Wl,--version-script=libcurl.vers endif if USE_CPPFLAG_CURL_STATICLIB -libcurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB +libgnurl_la_CPPFLAGS_EXTRA += -DCURL_STATICLIB endif if DOING_CURL_SYMBOL_HIDING -libcurl_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS -libcurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) +libgnurl_la_CPPFLAGS_EXTRA += -DCURL_HIDDEN_SYMBOLS +libgnurl_la_CFLAGS_EXTRA += $(CFLAG_CURL_SYMBOL_HIDING) endif -libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA) -libcurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) -libcurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA) +libgnurl_la_CPPFLAGS = $(AM_CPPFLAGS) $(libcurl_la_CPPFLAGS_EXTRA) +libgnurl_la_LDFLAGS = $(AM_LDFLAGS) $(libcurl_la_LDFLAGS_EXTRA) $(LDFLAGS) $(LIBCURL_LIBS) +libgnurl_la_CFLAGS = $(AM_CFLAGS) $(libcurl_la_CFLAGS_EXTRA) libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_STATICLIB -DUNITTESTS libcurlu_la_LDFLAGS = $(AM_LDFLAGS) -static $(LIBCURL_LIBS) @@ -142,7 +142,7 @@ libcurlu_la_CFLAGS = $(AM_CFLAGS) # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc -libcurl_la_SOURCES = $(CSOURCES) $(HHEADERS) +libgnurl_la_SOURCES = $(CSOURCES) $(HHEADERS) libcurlu_la_SOURCES = $(CSOURCES) $(HHEADERS) checksrc: diff --git a/lib/Makefile.netware b/lib/Makefile.netware index a4ec4c8f3..e36e6515f 100644 --- a/lib/Makefile.netware +++ b/lib/Makefile.netware @@ -365,7 +365,7 @@ $(OBJDIR)/%.o: %.c # @echo Compiling $< $(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/version.inc: $(CURL_INC)/curl/curlver.h $(OBJDIR) +$(OBJDIR)/version.inc: $(CURL_INC)/gnurl/curlver.h $(OBJDIR) @echo Creating $@ @$(AWK) -f ../packages/NetWare/get_ver.awk $< > $@ @@ -702,7 +702,7 @@ else @echo $(DL)#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")$(DL) >> $@ endif -$(EXPORTF): $(CURL_INC)/curl/curl.h $(CURL_INC)/curl/easy.h $(CURL_INC)/curl/multi.h $(CURL_INC)/curl/mprintf.h +$(EXPORTF): $(CURL_INC)/gnurl/curl.h $(CURL_INC)/gnurl/easy.h $(CURL_INC)/gnurl/multi.h $(CURL_INC)/gnurl/mprintf.h @echo Creating $@ @$(AWK) -f ../packages/NetWare/get_exp.awk $^ > $@ diff --git a/lib/conncache.c b/lib/conncache.c index c79d22764..ad5ac41a8 100644 --- a/lib/conncache.c +++ b/lib/conncache.c @@ -23,7 +23,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "url.h" diff --git a/lib/content_encoding.c b/lib/content_encoding.c index 652ed9764..cfec87c57 100644 --- a/lib/content_encoding.c +++ b/lib/content_encoding.c @@ -25,7 +25,7 @@ #ifdef HAVE_LIBZ #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "sendf.h" #include "content_encoding.h" #include "strdup.h" diff --git a/lib/cookie.h b/lib/cookie.h index a9a45785c..41c315a82 100644 --- a/lib/cookie.h +++ b/lib/cookie.h @@ -23,7 +23,7 @@ ***************************************************************************/ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> struct Cookie { struct Cookie *next; /* next in the chain */ diff --git a/lib/curl_addrinfo.c b/lib/curl_addrinfo.c index 1adf3198a..3da23fda9 100644 --- a/lib/curl_addrinfo.c +++ b/lib/curl_addrinfo.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> diff --git a/lib/curl_fnmatch.c b/lib/curl_fnmatch.c index 46d3ada1e..e9224ada5 100644 --- a/lib/curl_fnmatch.c +++ b/lib/curl_fnmatch.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_fnmatch.h" #include "curl_memory.h" diff --git a/lib/curl_memory.h b/lib/curl_memory.h index fccf46879..6d024a743 100644 --- a/lib/curl_memory.h +++ b/lib/curl_memory.h @@ -86,8 +86,8 @@ #ifndef CURL_DID_MEMORY_FUNC_TYPEDEFS /* only if not already done */ /* * The following memory function replacement typedef's are COPIED from - * curl/curl.h and MUST match the originals. We copy them to avoid having to - * include curl/curl.h here. We avoid that include since it includes stdio.h + * gnurl/curl.h and MUST match the originals. We copy them to avoid having to + * include gnurl/curl.h here. We avoid that include since it includes stdio.h * and other headers that may get messed up with defines done here. */ typedef void *(*curl_malloc_callback)(size_t size); diff --git a/lib/curl_memrchr.c b/lib/curl_memrchr.c index c521497b2..629f327ae 100644 --- a/lib/curl_memrchr.c +++ b/lib/curl_memrchr.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_memrchr.h" #include "curl_memory.h" diff --git a/lib/curl_multibyte.c b/lib/curl_multibyte.c index e78bb5002..3ebd472e0 100644 --- a/lib/curl_multibyte.c +++ b/lib/curl_multibyte.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #if defined(USE_WIN32_IDN) || ((defined(USE_WINDOWS_SSPI) || \ defined(USE_WIN32_LDAP)) && defined(UNICODE)) diff --git a/lib/curl_printf.h b/lib/curl_printf.h index 49857cdb0..c35c0dd84 100644 --- a/lib/curl_printf.h +++ b/lib/curl_printf.h @@ -27,7 +27,7 @@ * *rintf() functions. */ -#include <curl/mprintf.h> +#include <gnurl/mprintf.h> # undef printf # undef fprintf diff --git a/lib/curl_rtmp.c b/lib/curl_rtmp.c index 97430647b..6df8e7276 100644 --- a/lib/curl_rtmp.c +++ b/lib/curl_rtmp.c @@ -31,7 +31,7 @@ #include "progress.h" /* for Curl_pgrsSetUploadSize */ #include "transfer.h" #include "warnless.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include <librtmp/rtmp.h> #include "curl_memory.h" /* The last #include file should be: */ diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c index bd574b5e2..bd3b2be9e 100644 --- a/lib/curl_sasl.c +++ b/lib/curl_sasl.c @@ -31,7 +31,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "curl_base64.h" diff --git a/lib/curl_sasl.h b/lib/curl_sasl.h index 7647a48be..9b780f5d9 100644 --- a/lib/curl_sasl.h +++ b/lib/curl_sasl.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> struct Curl_easy; struct connectdata; diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 4a3b85c45..faaac8649 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -139,7 +139,7 @@ /* please, do it beyond the point further indicated in this file. */ /* ================================================================ */ -#include <curl/curl.h> +#include <gnurl/curl.h> /* * Ensure that no one is using the old SIZEOF_CURL_OFF_T macro diff --git a/lib/curl_sspi.c b/lib/curl_sspi.c index 11a7120a9..d4a50d927 100644 --- a/lib/curl_sspi.c +++ b/lib/curl_sspi.c @@ -24,7 +24,7 @@ #ifdef USE_WINDOWS_SSPI -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_sspi.h" #include "curl_multibyte.h" #include "system_win32.h" diff --git a/lib/curl_sspi.h b/lib/curl_sspi.h index 2bbf9477b..694289900 100644 --- a/lib/curl_sspi.h +++ b/lib/curl_sspi.h @@ -26,7 +26,7 @@ #ifdef USE_WINDOWS_SSPI -#include <curl/curl.h> +#include <gnurl/curl.h> /* * When including the following three headers, it is mandatory to define either diff --git a/lib/curl_threads.c b/lib/curl_threads.c index c1624a913..9259c3f4d 100644 --- a/lib/curl_threads.c +++ b/lib/curl_threads.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #if defined(USE_THREADS_POSIX) # ifdef HAVE_PTHREAD_H diff --git a/lib/curlx.h b/lib/curlx.h index 6168dc119..a261e71f4 100644 --- a/lib/curlx.h +++ b/lib/curlx.h @@ -29,7 +29,7 @@ * be. */ -#include <curl/mprintf.h> +#include <gnurl/mprintf.h> /* this is still a public header file that provides the curl_mprintf() functions while they still are offered publicly. They will be made library- private one day */ diff --git a/lib/dict.c b/lib/dict.c index 81d89fc48..af0954855 100644 --- a/lib/dict.c +++ b/lib/dict.c @@ -49,7 +49,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "escape.h" diff --git a/lib/dotdot.c b/lib/dotdot.c index 20603bcab..818061d9f 100644 --- a/lib/dotdot.c +++ b/lib/dotdot.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "dotdot.h" #include "curl_memory.h" diff --git a/lib/easy.c b/lib/easy.c index 66ec38a5e..a1fd22b0d 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -51,7 +51,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "vtls/vtls.h" #include "url.h" @@ -1002,7 +1002,7 @@ void curl_easy_reset(struct Curl_easy *data) * NOTE: if you have the receiving paused and you call this function to remove * the pausing, you may get your write callback called at this point. * - * Action is a bitmask consisting of CURLPAUSE_* bits in curl/curl.h + * Action is a bitmask consisting of CURLPAUSE_* bits in gnurl/curl.h */ CURLcode curl_easy_pause(struct Curl_easy *data, int action) { diff --git a/lib/escape.c b/lib/escape.c index 973aeb6ea..0b8b5317f 100644 --- a/lib/escape.c +++ b/lib/escape.c @@ -25,7 +25,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "warnless.h" diff --git a/lib/file.c b/lib/file.c index 666cbe75b..acca6ec08 100644 --- a/lib/file.c +++ b/lib/file.c @@ -50,7 +50,7 @@ #include "strtoofft.h" #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "progress.h" #include "sendf.h" #include "escape.h" diff --git a/lib/fileinfo.h b/lib/fileinfo.h index c5d0ee5b6..a5ead4685 100644 --- a/lib/fileinfo.h +++ b/lib/fileinfo.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> #include "llist.h" struct fileinfo { diff --git a/lib/formdata.c b/lib/formdata.c index e48a6276c..2d7b6b627 100644 --- a/lib/formdata.c +++ b/lib/formdata.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #ifndef CURL_DISABLE_HTTP @@ -46,7 +46,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "if2ip.h" diff --git a/lib/ftplistparser.c b/lib/ftplistparser.c index 2acce31d8..6063cee6e 100644 --- a/lib/ftplistparser.c +++ b/lib/ftplistparser.c @@ -39,7 +39,7 @@ #ifndef CURL_DISABLE_FTP -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "fileinfo.h" diff --git a/lib/getenv.c b/lib/getenv.c index 89d181de3..6acf70760 100644 --- a/lib/getenv.c +++ b/lib/getenv.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_memory.h" #include "memdebug.h" diff --git a/lib/getinfo.c b/lib/getinfo.c index dc3a107e9..99ba587af 100644 --- a/lib/getinfo.c +++ b/lib/getinfo.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "getinfo.h" diff --git a/lib/gopher.c b/lib/gopher.c index 836f72550..19b6d36e2 100644 --- a/lib/gopher.c +++ b/lib/gopher.c @@ -25,7 +25,7 @@ #ifndef CURL_DISABLE_GOPHER #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "progress.h" diff --git a/lib/hash.c b/lib/hash.c index 6afeaa12c..552022443 100644 --- a/lib/hash.c +++ b/lib/hash.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "hash.h" #include "llist.h" diff --git a/lib/hmac.c b/lib/hmac.c index dae95054b..d7e495e16 100644 --- a/lib/hmac.c +++ b/lib/hmac.c @@ -26,7 +26,7 @@ #ifndef CURL_DISABLE_CRYPTO_AUTH -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_hmac.h" #include "curl_memory.h" diff --git a/lib/hostcheck.h b/lib/hostcheck.h index 86e3b96a9..93fe0d049 100644 --- a/lib/hostcheck.h +++ b/lib/hostcheck.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> #define CURL_HOST_NOMATCH 0 #define CURL_HOST_MATCH 1 diff --git a/lib/http.c b/lib/http.c index d66b8482f..741098e84 100644 --- a/lib/http.c +++ b/lib/http.c @@ -46,7 +46,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "formdata.h" diff --git a/lib/http.h b/lib/http.h index a845f564d..c5c7a125d 100644 --- a/lib/http.h +++ b/lib/http.h @@ -96,7 +96,7 @@ CURLcode Curl_http_perhapsrewind(struct connectdata *conn); /* If only the PICKNONE bit is set, there has been a round-trip and we selected to use no auth at all. Ie, we actively select no auth, as opposed to not having one selected. The other CURLAUTH_* defines are present in the - public curl/curl.h header. */ + public gnurl/curl.h header. */ #define CURLAUTH_PICKNONE (1<<30) /* don't use auth */ /* MAX_INITIAL_POST_SIZE indicates the number of bytes that will make the POST diff --git a/lib/http2.c b/lib/http2.c index 0e5580133..6b52171f6 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -2267,7 +2267,7 @@ void Curl_http2_cleanup_dependencies(struct Curl_easy *data) /* Satisfy external references even if http2 is not compiled in. */ #define CURL_DISABLE_TYPECHECK -#include <curl/curl.h> +#include <gnurl/curl.h> char *curl_pushheader_bynum(struct curl_pushheaders *h, size_t num) { diff --git a/lib/http_proxy.c b/lib/http_proxy.c index 36567d36f..834733960 100644 --- a/lib/http_proxy.c +++ b/lib/http_proxy.c @@ -26,7 +26,7 @@ #if !defined(CURL_DISABLE_PROXY) && !defined(CURL_DISABLE_HTTP) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "sendf.h" #include "http.h" #include "url.h" diff --git a/lib/imap.c b/lib/imap.c index 48af2902a..8fa598f88 100644 --- a/lib/imap.c +++ b/lib/imap.c @@ -58,7 +58,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/ldap.c b/lib/ldap.c index 435b990ab..9b85a4815 100644 --- a/lib/ldap.c +++ b/lib/ldap.c @@ -64,7 +64,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "sendf.h" #include "escape.h" #include "progress.h" diff --git a/lib/libcurl.rc b/lib/libcurl.rc index 3316fba19..0afccd819 100644 --- a/lib/libcurl.rc +++ b/lib/libcurl.rc @@ -20,7 +20,7 @@ * ***************************************************************************/ #include <winver.h> -#include "../include/curl/curlver.h" +#include "../include/gnurl/curlver.h" LANGUAGE 0x09,0x01 diff --git a/lib/libcurl.plist b/lib/libgnurl.plist index 622f66cfb..33c2fdefa 100644 --- a/lib/libcurl.plist +++ b/lib/libgnurl.plist @@ -9,7 +9,7 @@ <string>English</string> <key>CFBundleExecutable</key> - <string>curl</string> + <string>gnurl</string> <key>CFBundleIdentifier</key> <string>se.haxx.curl.libcurl</string> @@ -18,7 +18,7 @@ <string>7.12.3</string> <key>CFBundleName</key> - <string>libcurl</string> + <string>libgnurl</string> <key>CFBundlePackageType</key> <string>FMWK</string> @@ -30,6 +30,6 @@ <string>libcurl 7.12.3</string> <key>CFBundleGetInfoString</key> - <string>libcurl.plist 7.12.3</string> + <string>libgnurl.plist 7.12.3</string> </dict> </plist> diff --git a/lib/llist.c b/lib/llist.c index 4bb0a51b8..7fd6637d4 100644 --- a/lib/llist.c +++ b/lib/llist.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "llist.h" #include "curl_memory.h" @@ -24,7 +24,7 @@ #ifndef CURL_DISABLE_CRYPTO_AUTH -#include <curl/curl.h> +#include <gnurl/curl.h> #include "curl_md5.h" #include "curl_hmac.h" diff --git a/lib/memdebug.c b/lib/memdebug.c index 8c9fe9502..65b20e5d0 100644 --- a/lib/memdebug.c +++ b/lib/memdebug.c @@ -24,7 +24,7 @@ #ifdef CURLDEBUG -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" diff --git a/lib/mprintf.c b/lib/mprintf.c index eb7ee0c6b..68545bfac 100644 --- a/lib/mprintf.c +++ b/lib/mprintf.c @@ -36,7 +36,7 @@ */ #include "curl_setup.h" -#include <curl/mprintf.h> +#include <gnurl/mprintf.h> #include "curl_memory.h" /* The last #include file should be: */ diff --git a/lib/multi.c b/lib/multi.c index d5bc532ea..1f8dfc5ce 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "transfer.h" diff --git a/lib/netrc.c b/lib/netrc.c index 6e4858b3f..e7afdbd44 100644 --- a/lib/netrc.c +++ b/lib/netrc.c @@ -26,7 +26,7 @@ #include <pwd.h> #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "netrc.h" #include "strtok.h" #include "strcase.h" diff --git a/lib/non-ascii.c b/lib/non-ascii.c index ae0097036..8fd0437dc 100644 --- a/lib/non-ascii.c +++ b/lib/non-ascii.c @@ -24,7 +24,7 @@ #ifdef CURL_DOES_CONVERSIONS -#include <curl/curl.h> +#include <gnurl/curl.h> #include "non-ascii.h" #include "formdata.h" diff --git a/lib/nonblock.h b/lib/nonblock.h index 98cdc25ab..3445752b9 100644 --- a/lib/nonblock.h +++ b/lib/nonblock.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> /* for curl_socket_t */ +#include <gnurl/curl.h> /* for curl_socket_t */ int curlx_nonblock(curl_socket_t sockfd, /* operate on this */ int nonblock /* TRUE or FALSE */); diff --git a/lib/openldap.c b/lib/openldap.c index 369309cf5..1b32d1f22 100644 --- a/lib/openldap.c +++ b/lib/openldap.c @@ -39,7 +39,7 @@ #include <ldap.h> #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "sendf.h" #include "vtls/vtls.h" #include "transfer.h" diff --git a/lib/parsedate.c b/lib/parsedate.c index 609fd5363..c39add846 100644 --- a/lib/parsedate.c +++ b/lib/parsedate.c @@ -79,7 +79,7 @@ #include <limits.h> #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "strcase.h" #include "warnless.h" #include "parsedate.h" diff --git a/lib/pipeline.c b/lib/pipeline.c index 4d41b0413..c0917c79f 100644 --- a/lib/pipeline.c +++ b/lib/pipeline.c @@ -23,7 +23,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "url.h" diff --git a/lib/pop3.c b/lib/pop3.c index 5792a4a6f..c1ba15908 100644 --- a/lib/pop3.c +++ b/lib/pop3.c @@ -60,7 +60,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/rand.c b/lib/rand.c index 2713a0aa3..69a8576dd 100644 --- a/lib/rand.c +++ b/lib/rand.c @@ -26,7 +26,7 @@ #include <fcntl.h> #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vtls/vtls.h" #include "sendf.h" #include "rand.h" diff --git a/lib/rtsp.c b/lib/rtsp.c index 9bd935fd5..8b895ed64 100644 --- a/lib/rtsp.c +++ b/lib/rtsp.c @@ -25,7 +25,7 @@ #ifndef CURL_DISABLE_RTSP #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "multiif.h" diff --git a/lib/select.c b/lib/select.c index f6fecaf51..dd2a2c284 100644 --- a/lib/select.c +++ b/lib/select.c @@ -43,7 +43,7 @@ #include <strings.h> /* bzero() in FD_SET */ #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "connect.h" diff --git a/lib/sendf.c b/lib/sendf.c index 595c36177..6a472fb47 100644 --- a/lib/sendf.c +++ b/lib/sendf.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" diff --git a/lib/share.c b/lib/share.c index 5b3957fcf..3b2f7fdfc 100644 --- a/lib/share.c +++ b/lib/share.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "share.h" #include "vtls/vtls.h" diff --git a/lib/share.h b/lib/share.h index c039a16cb..59a4a14f0 100644 --- a/lib/share.h +++ b/lib/share.h @@ -23,7 +23,7 @@ ***************************************************************************/ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "cookie.h" #include "urldata.h" diff --git a/lib/slist.c b/lib/slist.c index e5adc0e71..9e5df832b 100644 --- a/lib/slist.c +++ b/lib/slist.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "slist.h" diff --git a/lib/smtp.c b/lib/smtp.c index 4e2c3361e..9f9bd1485 100644 --- a/lib/smtp.c +++ b/lib/smtp.c @@ -59,7 +59,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/speedcheck.c b/lib/speedcheck.c index fe669f11a..4d9eb12e9 100644 --- a/lib/speedcheck.c +++ b/lib/speedcheck.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "multiif.h" @@ -59,7 +59,7 @@ #define in_addr_t unsigned long #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "hostip.h" diff --git a/lib/strcase.c b/lib/strcase.c index a74a4be57..c4a06bedb 100644 --- a/lib/strcase.c +++ b/lib/strcase.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "strcase.h" diff --git a/lib/strcase.h b/lib/strcase.h index ea2abc8b6..64615d8fd 100644 --- a/lib/strcase.h +++ b/lib/strcase.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> /* * Only "raw" case insensitive strings. This is meant to be locale independent diff --git a/lib/strdup.c b/lib/strdup.c index 136b69377..8d6258e81 100644 --- a/lib/strdup.c +++ b/lib/strdup.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "strdup.h" #include "curl_memory.h" diff --git a/lib/strerror.c b/lib/strerror.c index 83a96dda1..42e22ee4e 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -33,7 +33,7 @@ # endif #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #ifdef USE_LIBIDN2 #include <idn2.h> diff --git a/lib/system_win32.c b/lib/system_win32.c index cfbbf3279..d292bd6e1 100644 --- a/lib/system_win32.c +++ b/lib/system_win32.c @@ -24,7 +24,7 @@ #if defined(WIN32) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "system_win32.h" /* The last #include files should be: */ diff --git a/lib/telnet.c b/lib/telnet.c index 3dec95907..8ef121fec 100644 --- a/lib/telnet.c +++ b/lib/telnet.c @@ -45,7 +45,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "telnet.h" diff --git a/lib/tftp.c b/lib/tftp.c index f6f4bce5b..51642c9b9 100644 --- a/lib/tftp.c +++ b/lib/tftp.c @@ -45,7 +45,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "transfer.h" #include "sendf.h" #include "tftp.h" diff --git a/lib/transfer.c b/lib/transfer.c index 3537b58c6..f09985def 100644 --- a/lib/transfer.c +++ b/lib/transfer.c @@ -55,7 +55,7 @@ #endif #include "urldata.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "netrc.h" #include "content_encoding.h" @@ -929,7 +929,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option, case CURLOPT_TIMECONDITION: /* * Set HTTP time condition. This must be one of the defines in the - * curl/curl.h header file. + * gnurl/curl.h header file. */ data->set.timecondition = (curl_TimeCond)va_arg(param, long); break; @@ -1343,7 +1343,7 @@ CURLcode Curl_setopt(struct Curl_easy *data, CURLoption option, case CURLOPT_HTTP_VERSION: /* * This sets a requested HTTP version to be used. The value is one of - * the listed enums in curl/curl.h. + * the listed enums in gnurl/curl.h. */ arg = va_arg(param, long); #ifndef USE_NGHTTP2 diff --git a/lib/urldata.h b/lib/urldata.h index b4f18e7da..5f61dde33 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -165,7 +165,7 @@ #endif #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "http_chunks.h" /* for the structs and enum stuff */ #include "hostip.h" diff --git a/lib/vauth/cleartext.c b/lib/vauth/cleartext.c index a761ae784..25364579e 100644 --- a/lib/vauth/cleartext.c +++ b/lib/vauth/cleartext.c @@ -25,7 +25,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "vauth/vauth.h" diff --git a/lib/vauth/cram.c b/lib/vauth/cram.c index 3074a163a..5d6126cfa 100644 --- a/lib/vauth/cram.c +++ b/lib/vauth/cram.c @@ -26,7 +26,7 @@ #if !defined(CURL_DISABLE_CRYPTO_AUTH) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "vauth/vauth.h" diff --git a/lib/vauth/digest.c b/lib/vauth/digest.c index 185098ed6..0ae736c83 100644 --- a/lib/vauth/digest.c +++ b/lib/vauth/digest.c @@ -26,7 +26,7 @@ #if !defined(CURL_DISABLE_CRYPTO_AUTH) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "vauth/digest.h" diff --git a/lib/vauth/digest.h b/lib/vauth/digest.h index 5722dcece..d0ea27778 100644 --- a/lib/vauth/digest.h +++ b/lib/vauth/digest.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> #if !defined(CURL_DISABLE_CRYPTO_AUTH) diff --git a/lib/vauth/digest_sspi.c b/lib/vauth/digest_sspi.c index f5d619c99..3d583e417 100644 --- a/lib/vauth/digest_sspi.c +++ b/lib/vauth/digest_sspi.c @@ -27,7 +27,7 @@ #if defined(USE_WINDOWS_SSPI) && !defined(CURL_DISABLE_CRYPTO_AUTH) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "vauth/digest.h" diff --git a/lib/vauth/krb5_gssapi.c b/lib/vauth/krb5_gssapi.c index 560ecc5bc..bb9a94a4d 100644 --- a/lib/vauth/krb5_gssapi.c +++ b/lib/vauth/krb5_gssapi.c @@ -27,7 +27,7 @@ #if defined(HAVE_GSSAPI) && defined(USE_KERBEROS5) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "curl_sasl.h" diff --git a/lib/vauth/krb5_sspi.c b/lib/vauth/krb5_sspi.c index 1b4cef486..afff1dae9 100644 --- a/lib/vauth/krb5_sspi.c +++ b/lib/vauth/krb5_sspi.c @@ -26,7 +26,7 @@ #if defined(USE_WINDOWS_SSPI) && defined(USE_KERBEROS5) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "urldata.h" diff --git a/lib/vauth/ntlm_sspi.c b/lib/vauth/ntlm_sspi.c index c3305176d..227d6de50 100644 --- a/lib/vauth/ntlm_sspi.c +++ b/lib/vauth/ntlm_sspi.c @@ -24,7 +24,7 @@ #if defined(USE_WINDOWS_SSPI) && defined(USE_NTLM) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "urldata.h" diff --git a/lib/vauth/oauth2.c b/lib/vauth/oauth2.c index 6288f89a3..28f64e105 100644 --- a/lib/vauth/oauth2.c +++ b/lib/vauth/oauth2.c @@ -24,7 +24,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "vauth/vauth.h" diff --git a/lib/vauth/spnego_gssapi.c b/lib/vauth/spnego_gssapi.c index 5196c2704..04d238b9a 100644 --- a/lib/vauth/spnego_gssapi.c +++ b/lib/vauth/spnego_gssapi.c @@ -26,7 +26,7 @@ #if defined(HAVE_GSSAPI) && defined(USE_SPNEGO) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "urldata.h" diff --git a/lib/vauth/spnego_sspi.c b/lib/vauth/spnego_sspi.c index a6797cdaf..b1b04aadf 100644 --- a/lib/vauth/spnego_sspi.c +++ b/lib/vauth/spnego_sspi.c @@ -26,7 +26,7 @@ #if defined(USE_WINDOWS_SSPI) && defined(USE_SPNEGO) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth/vauth.h" #include "urldata.h" diff --git a/lib/vauth/vauth.c b/lib/vauth/vauth.c index b995f34e2..9d17ae8c2 100644 --- a/lib/vauth/vauth.c +++ b/lib/vauth/vauth.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "vauth.h" #include "curl_multibyte.h" diff --git a/lib/vauth/vauth.h b/lib/vauth/vauth.h index 9d61228c3..24b7d24d8 100644 --- a/lib/vauth/vauth.h +++ b/lib/vauth/vauth.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> struct Curl_easy; diff --git a/lib/version.c b/lib/version.c index 3d1776813..9207c3384 100644 --- a/lib/version.c +++ b/lib/version.c @@ -22,7 +22,7 @@ #include "curl_setup.h" -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "vtls/vtls.h" #include "http2.h" diff --git a/lib/vtls/axtls.h b/lib/vtls/axtls.h index 53797eadb..4e5994666 100644 --- a/lib/vtls/axtls.h +++ b/lib/vtls/axtls.h @@ -24,7 +24,7 @@ ***************************************************************************/ #ifdef USE_AXTLS -#include "curl/curl.h" +#include "gnurl/curl.h" #include "urldata.h" int Curl_axtls_init(void); diff --git a/lib/vtls/gskit.c b/lib/vtls/gskit.c index bf75bddc2..565f10f07 100644 --- a/lib/vtls/gskit.c +++ b/lib/vtls/gskit.c @@ -65,7 +65,7 @@ # include <limits.h> #endif -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "sendf.h" #include "gskit.h" diff --git a/lib/warnless.h b/lib/warnless.h index ab6d29998..5905cb7e3 100644 --- a/lib/warnless.h +++ b/lib/warnless.h @@ -23,7 +23,7 @@ ***************************************************************************/ #ifdef USE_WINSOCK -#include <curl/curl.h> /* for curl_socket_t */ +#include <gnurl/curl.h> /* for curl_socket_t */ #endif unsigned short curlx_ultous(unsigned long ulnum); diff --git a/lib/wildcard.h b/lib/wildcard.h index 8a5e4b769..89d965ccf 100644 --- a/lib/wildcard.h +++ b/lib/wildcard.h @@ -22,7 +22,7 @@ * ***************************************************************************/ -#include <curl/curl.h> +#include <gnurl/curl.h> #include "llist.h" diff --git a/lib/x509asn1.c b/lib/x509asn1.c index bba20233f..aabf6e8c7 100644 --- a/lib/x509asn1.c +++ b/lib/x509asn1.c @@ -25,7 +25,7 @@ #if defined(USE_GSKIT) || defined(USE_NSS) || defined(USE_GNUTLS) || \ defined(USE_CYASSL) || defined(USE_SCHANNEL) -#include <curl/curl.h> +#include <gnurl/curl.h> #include "urldata.h" #include "strcase.h" #include "hostcheck.h" |