[GNUnet-SVN] [gnurl] 11/208: lib/curl_setup.h: remove CURL_WANTS_CA_BUNDLE_ENV

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit c2aeb1b3ba09af8b2e555eafa94dd9c534426bfb
Author: Daniel Stenberg <address@hidden>
AuthorDate: Thu Jun 15 11:11:15 2017 +0200

    lib/curl_setup.h: remove CURL_WANTS_CA_BUNDLE_ENV
    
    When this define was set, libcurl would check the environment variable
    named CURL_CA_BUNDLE at run-time and use that CA cert bundle. This
    feature was only defined by the watcom and m32 makefiles and caused
    inconsistent behaviours among libcurls built on different platforms.
    
    The curl tool does already feature its own similar logic and the library
    does not really need it, and it isn't documented libcurl behavior. So
    this change removes it.
    
    Ref: #1538
---
 lib/Makefile.Watcom | 2 +-
 lib/Makefile.m32    | 3 +--
 lib/curl_setup.h    | 5 -----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 2130c276b..77e5a6e0a 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -81,7 +81,7 @@ RD = rmdir /q /s 2>NUL
 SYS_INCL = -I"$(%watcom)/h/nt" -I"$(%watcom)/h"
 
 CFLAGS = -3r -mf -hc -zff -zgf -zq -zm -zc -s -fr=con -w2 -fpi -oilrtfm &
-         -wcd=201 -bt=nt -d+ -dWIN32 -dCURL_WANTS_CA_BUNDLE_ENV         &
+         -wcd=201 -bt=nt -d+ -dWIN32 &
          -dBUILDING_LIBCURL -I. -I"../include" $(SYS_INCL)
 
 !ifdef %debug
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 8895dfd8a..93bc18824 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -250,8 +250,7 @@ ifdef SSL
   endif
   INCLUDES += -I"$(OPENSSL_INCLUDE)"
   CFLAGS += -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \
-            -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \
-            -DCURL_WANTS_CA_BUNDLE_ENV
+            -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5
   DLL_LIBS += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS)
   ifdef SRP
     ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" 
"$(OPENSSL_INCLUDE)/openssl/srp.h"
diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 6391dd6c8..369b953d2 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -640,11 +640,6 @@ int netware_init(void);
 #endif
 #endif
 
-/* non-configure builds may define CURL_WANTS_CA_BUNDLE_ENV */
-#if defined(CURL_WANTS_CA_BUNDLE_ENV) && !defined(CURL_CA_BUNDLE)
-#define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE")
-#endif
-
 /*
  * Provide a mechanism to silence picky compilers, such as gcc 4.6+.
  * Parameters should of course normally not be unused, but for example when

-- 
To stop receiving notification emails like this one, please contact
address@hidden