Commit ddace02e authored by Guenter Knauf's avatar Guenter Knauf
Browse files

fixed segfault when compiled with MingW32 and cmd or command shell.

parent 1f4c8c4f

buildconf.bat

+0 −4
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ REM $Date$ 


REM create ca-bundle.h

echo /* This file is generated automatically */ >lib\ca-bundle.h

echo #ifndef CURL_CA_BUNDLE >>lib\ca-bundle.h

echo #define CURL_CA_BUNDLE getenv("CURL_CA_BUNDLE") >>lib\ca-bundle.h

echo #endif >>lib\ca-bundle.h





REM create hugehelp.c

copy src\hugehelp.c.cvs src\hugehelp.c

lib/Makefile.m32

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ ifdef SSL 
  INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"

  CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL -DHAVE_OPENSSL_ENGINE_H -DHAVE_OPENSSL_PKCS12_H \

            -DHAVE_ENGINE_LOAD_BUILTIN_ENGINES -DOPENSSL_NO_KRB5 \

            -DCURL_CA_BUNDLE='getenv("CURL_CA_BUNDLE")'

            -DCURL_WANTS_CA_BUNDLE_ENV

  DLL_LIBS += -L$(OPENSSL_PATH)/out -leay32 -lssl32

endif

ifdef ZLIB

lib/setup.h

+6 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *                            | (__| |_| |  _ <| |___

 *                             \___|\___/|_| \_\_____|

 *

 * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.

 * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.

 *

 * This software is licensed as described in the file COPYING, which

 * you should have received as part of this distribution. The terms
@@ -364,6 +364,11 @@ int fileno( FILE *stream); 
#define DEBUGF(x)

#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



/*

 * Include macros and defines that should only be processed once.

 */