cvs: php-src(PHP_5_1) /ext/curl config.m4 interface.c

From: Date: Wed, 26 Oct 2005 11:33:25 +0000
Subject: cvs: php-src(PHP_5_1) /ext/curl config.m4 interface.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-34796@lists.php.net to get a copy of this message
sniper Wed Oct 26 07:33:25 2005 EDT Modified files: (Branch: PHP_5_1) /php-src/ext/curl config.m4 interface.c Log: MFH http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.28.2.1&r2=1.28.2.2&ty=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.28.2.1 php-src/ext/curl/config.m4:1.28.2.2 --- php-src/ext/curl/config.m4:1.28.2.1 Tue Oct 25 10:32:33 2005 +++ php-src/ext/curl/config.m4 Wed Oct 26 07:33:25 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.28.2.1 2005/10/25 14:32:33 mike Exp $ +dnl $Id: config.m4,v 1.28.2.2 2005/10/26 11:33:25 sniper Exp $ dnl PHP_ARG_WITH(curl, for CURL support, @@ -36,7 +36,7 @@ CURL_CONFIG=${CURL_DIR}/bin/curl-config else if ${CURL_DIR}/curl-config --libs > /dev/null 2>&1; then - CURL_CONFIG=${CURL_DIR}/curl-config + CURL_CONFIG=${CURL_DIR}/curl-config fi fi @@ -51,20 +51,20 @@ AC_MSG_CHECKING([for SSL support in libcurl]) CURL_SSL=$CURL_CONFIG --features | $EGREP SSL - if test "$CURL_SSL" == "SSL"; then + if test "$CURL_SSL" = "SSL"; then AC_MSG_RESULT([yes]) AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) AC_MSG_CHECKING([for SSL library used]) CURL_SSL_FLAVOUR= for i in $CURL_LIBS; do - if test "$i" == "-lssl"; then + if test "$i" = "-lssl"; then CURL_SSL_FLAVOUR="openssl" AC_MSG_RESULT([openssl]) AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support]) AC_CHECK_HEADERS([openssl/crypto.h]) break - elif test "$i" == "-lgnutls"; then + elif test "$i" = "-lgnutls"; then CURL_SSL_FLAVOUR="gnutls" AC_MSG_RESULT([gnutls]) AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support]) http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.62.2.4&r2=1.62.2.5&ty=u Index: php-src/ext/curl/interface.c diff -u php-src/ext/curl/interface.c:1.62.2.4 php-src/ext/curl/interface.c:1.62.2.5 --- php-src/ext/curl/interface.c:1.62.2.4 Tue Oct 25 10:32:33 2005 +++ php-src/ext/curl/interface.c Wed Oct 26 07:33:25 2005 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: interface.c,v 1.62.2.4 2005/10/25 14:32:33 mike Exp $ */ +/* $Id: interface.c,v 1.62.2.5 2005/10/26 11:33:25 sniper Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -46,40 +46,40 @@ /* {{{ cruft for thread safe SSL crypto locks */ #if defined(ZTS) && defined(HAVE_CURL_SSL) -# ifdef PHP_WIN32 -# define PHP_CURL_NEED_SSL_TSL -# define PHP_CURL_NEED_OPENSSL_TSL -# include <openssl/crypto.h> -# else /* !PHP_WIN32 */ -# if defined(HAVE_CURL_OPENSSL) -# if defined(HAVE_OPENSSL_CRYPTO_H) -# define PHP_CURL_NEED_SSL_TSL -# define PHP_CURL_NEED_OPENSSL_TSL -# include <openssl/crypto.h> -# else -# warning \ - "libcurl was compiled with OpenSSL support, but configure could not find " \ - "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \ - "cause random crashes on SSL requests" -# endif -# elif defined(HAVE_CURL_GNUTLS) -# if defined(HAVE_GCRYPT_H) -# define PHP_CURL_NEED_SSL_TSL -# define PHP_CURL_NEED_GNUTLS_TSL -# include <gcrypt.h> -# else -# warning \ - "libcurl was compiled with GnuTLS support, but configure could not find " \ - "gcrypt.h; thus no SSL crypto locking callbacks will be set, which may " \ - "cause random crashes on SSL requests" -# endif -# else -# warning \ - "libcurl was compiled with SSL support, but configure could not determine which" \ - "library was used; thus no SSL crypto locking callbacks will be set, which may " \ - "cause random crashes on SSL requests" -# endif /* HAVE_CURL_OPENSSL || HAVE_CURL_GNUTLS */ -# endif /* PHP_WIN32 */ +# ifdef PHP_WIN32 +# define PHP_CURL_NEED_SSL_TSL +# define PHP_CURL_NEED_OPENSSL_TSL +# include <openssl/crypto.h> +# else /* !PHP_WIN32 */ +# if defined(HAVE_CURL_OPENSSL) +# if defined(HAVE_OPENSSL_CRYPTO_H) +# define PHP_CURL_NEED_SSL_TSL +# define PHP_CURL_NEED_OPENSSL_TSL +# include <openssl/crypto.h> +# else +# warning \ + "libcurl was compiled with OpenSSL support, but configure could not find " \ + "openssl/crypto.h; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif +# elif defined(HAVE_CURL_GNUTLS) +# if defined(HAVE_GCRYPT_H) +# define PHP_CURL_NEED_SSL_TSL +# define PHP_CURL_NEED_GNUTLS_TSL +# include <gcrypt.h> +# else +# warning \ + "libcurl was compiled with GnuTLS support, but configure could not find " \ + "gcrypt.h; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif +# else +# warning \ + "libcurl was compiled with SSL support, but configure could not determine which" \ + "library was used; thus no SSL crypto locking callbacks will be set, which may " \ + "cause random crashes on SSL requests" +# endif /* HAVE_CURL_OPENSSL || HAVE_CURL_GNUTLS */ +# endif /* PHP_WIN32 */ #endif /* ZTS && HAVE_CURL_SSL */ /* }}} */

« previous php.cvs (#34796) next »