MFH

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index e0ef2b388f461d1941ce32ec63b6f1de5ab70100..94baf6af226db1090f0d94acd89fd0882499fcc7 100644 (file)
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -36,7 +36,7 @@ if test "$PHP_CURL" != "no"; then
     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 @@ if test "$PHP_CURL" != "no"; then
   
   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])

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index fca56171ba2dbf367e99047800ffee914363f97f..2a3a796c6b817a4188266dae04e1140612dd3e6b 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -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 */
 /* }}} */