ENH: Update Curl to 7.12.1

1 files changed, 124 insertions, 64 deletions

diff --git a/Source/CTest/Curl/CMakeLists.txt b/Source/CTest/Curl/CMakeLists.txt
index 7a54f72..61a174d 100644
--- a/Source/CTest/Curl/CMakeLists.txt
+++ b/Source/CTest/Curl/CMakeLists.txt
@@ -1,17 +1,18 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 1.5)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.0)
 PROJECT(LIBCURL C)
 
 INCLUDE_REGULAR_EXPRESSION("^.*\\.h$")
 
 # Setup package meta-data
 SET(PACKAGE "curl")
-SET(VERSION "7.10.3")
-SET(PACKAGE_TARNAME " ")
+SET(VERSION "7.12.1")
+SET(PACKAGE_TARNAME "curl")
 SET(PACKAGE_BUGREPORT " ")
-SET(PACKAGE_NAME " ")
-SET(PACKAGE_VERSION " ")
-SET(PACKAGE_STRING " ")
-SET(OPERATING_SYSTEM ${CMAKE_SYSTEM_NAME})
+SET(PACKAGE_NAME "curl")
+SET(PACKAGE_VERSION "-")
+SET(PACKAGE_STRING "curl-")
+SET(PACKAGE_BUGREPORT "a suitable curl mailing list => http://curl.haxx.se/mail/")
+SET(OPERATING_SYSTEM "${CMAKE_SYSTEM_NAME}")
 
 # We need ansi c-flags, especially on HP
 SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
@@ -23,60 +24,79 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES AIX)
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES AIX)
 
 # Include all the necessary files for macros
-INCLUDE (${CMAKE_ROOT}/Modules/CheckFunctionExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFiles.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckLibraryExists.cmake)
-INCLUDE (${LIBCURL_SOURCE_DIR}/CMake/CheckSymbolExists.cmake)
-INCLUDE (${CMAKE_ROOT}/Modules/CheckTypeSize.cmake)
+SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
+INCLUDE (CheckFunctionExists)
+INCLUDE (CheckIncludeFile)
+INCLUDE (CheckIncludeFiles)
+INCLUDE (CheckLibraryExists)
+INCLUDE (CheckSymbolExists)
+INCLUDE (CheckTypeSize)
 
 SET(libCurl_SRCS
-  file.c
-  timeval.c
   base64.c
-  hostip.c
-  progress.c
-  formdata.c
+  connect.c
+  content_encoding.c
   cookie.c
-  http.c
-  sendf.c
-  ftp.c
-  url.c
   dict.c
-  if2ip.c
-  speedcheck.c
+  easy.c
+  escape.c
+  file.c
+  formdata.c
+  ftp.c
   getdate.c
-  ldap.c
-  ssluse.c
-  version.c
   getenv.c
-  escape.c
-  mprintf.c
-  telnet.c
-  getpass.c
-  netrc.c
   getinfo.c
-  transfer.c
-  strequal.c
-  easy.c
+  hash.c
+  hostares.c
+  hostasyn.c
+  hostip.c
+  hostip4.c
+  hostip6.c
+  hostsyn.c
+  hostthre.c
+  http.c
   http_chunks.c
-  connect.c
+  http_digest.c
+  http_negotiate.c
+  http_ntlm.c
+  if2ip.c
+  inet_ntop.c
+  inet_pton.c
+  krb4.c
+  ldap.c
   llist.c
-  hash.c
+  md5.c
+  memdebug.c
+  mprintf.c
   multi.c
+  netrc.c
+  progress.c
+  security.c
+  sendf.c
+  share.c
+  speedcheck.c
+  ssluse.c
+  strequal.c
+  strerror.c
+  strtok.c
+  strtoofft.c
+  telnet.c
+  timeval.c
+  transfer.c
+  url.c
+  version.c
   )
 
-
-
 # if we have Kerberos 4, right now this is never on
-IF(KRB4)
+#OPTION(CURL_KRB4 "Use Kerberos 4" OFF)
+IF(CURL_KRB4)
   SET(libCurl_SRCS ${libCurl_SRCS}
     krb4.c
     security.c
     )
-ENDIF(KRB4)
+ENDIF(CURL_KRB4)
 
-OPTION(CURL_MALLOC_DEBUG "Debug mallocs in Curl" OFF)
+#OPTION(CURL_MALLOC_DEBUG "Debug mallocs in Curl" OFF)
 MARK_AS_ADVANCED(CURL_MALLOC_DEBUG)
 IF(CURL_MALLOC_DEBUG)
   SET(libCurl_SRCS ${libCurl_SRCS}
@@ -84,7 +104,6 @@ IF(CURL_MALLOC_DEBUG)
     )
 ENDIF(CURL_MALLOC_DEBUG)
 
-
 # On windows preload settings
 IF(WIN32)
   INCLUDE(${LIBCURL_SOURCE_DIR}/Platforms/WindowsCache.cmake)
@@ -114,9 +133,11 @@ ENDIF(NOT NOT_NEED_LIBNSL)
 CHECK_LIBRARY_EXISTS_CONCAT("ws2_32" getch        HAVE_LIBWS2_32)
 CHECK_LIBRARY_EXISTS_CONCAT("winmm"  getch        HAVE_LIBWINMM)
 CHECK_LIBRARY_EXISTS_CONCAT("z"      inflateEnd   HAVE_LIBZ)
-CHECK_LIBRARY_EXISTS_CONCAT("crypto" CRYPTO_lock  HAVE_LIBCRYPTO)
 
+#OPTION(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" OFF)
+MARK_AS_ADVANCED(CMAKE_USE_OPENSSL)
 IF(CMAKE_USE_OPENSSL)
+  CHECK_LIBRARY_EXISTS_CONCAT("crypto" CRYPTO_lock  HAVE_LIBCRYPTO)
   CHECK_LIBRARY_EXISTS_CONCAT("ssl"    SSL_connect  HAVE_LIBSSL)
 ENDIF(CMAKE_USE_OPENSSL)
 
@@ -155,6 +176,8 @@ MACRO(CHECK_INCLUDE_FILE_CONCAT FILE VARIABLE)
 ENDMACRO(CHECK_INCLUDE_FILE_CONCAT)
 
 # Check for header files
+CHECK_INCLUDE_FILE_CONCAT("stdio.h"          HAVE_STDIO_H)
+CHECK_INCLUDE_FILE_CONCAT("stddef.h"         HAVE_STDDEF_H)
 CHECK_INCLUDE_FILE_CONCAT("sys/types.h"      HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE_CONCAT("inttypes.h"       HAVE_INTTYPES_H)
 CHECK_INCLUDE_FILE_CONCAT("alloca.h"         HAVE_ALLOCA_H)
@@ -164,8 +187,9 @@ CHECK_INCLUDE_FILE_CONCAT("fcntl.h"          HAVE_FCNTL_H)
 CHECK_INCLUDE_FILE_CONCAT("malloc.h"         HAVE_MALLOC_H)
 CHECK_INCLUDE_FILE_CONCAT("memory.h"         HAVE_MEMORY_H)
 CHECK_INCLUDE_FILE_CONCAT("netdb.h"          HAVE_NETDB_H)
-CHECK_INCLUDE_FILE_CONCAT("zlib.h"           HAVE_ZLIB_H)
 CHECK_INCLUDE_FILE_CONCAT("sys/poll.h"       HAVE_SYS_POLL_H)
+CHECK_INCLUDE_FILE_CONCAT("assert.h"         HAVE_ASSERT_H)
+CHECK_INCLUDE_FILE_CONCAT("limits.h"         HAVE_LIMITS_H)
 
 IF(CMAKE_USE_OPENSSL)
   CHECK_INCLUDE_FILE_CONCAT("openssl/x509.h"   HAVE_OPENSSL_X509_H)
@@ -175,13 +199,17 @@ IF(CMAKE_USE_OPENSSL)
   CHECK_INCLUDE_FILE_CONCAT("openssl/pem.h"    HAVE_OPENSSL_PEM_H)
   CHECK_INCLUDE_FILE_CONCAT("openssl/ssl.h"    HAVE_OPENSSL_SSL_H)
   CHECK_INCLUDE_FILE_CONCAT("openssl/err.h"    HAVE_OPENSSL_ERR_H)
+  CHECK_INCLUDE_FILE_CONCAT("openssl/rand.h"   HAVE_OPENSSL_RAND_H)
 ENDIF(CMAKE_USE_OPENSSL)
 
+CHECK_INCLUDE_FILE_CONCAT("zlib.h"           HAVE_ZLIB_H)
 CHECK_INCLUDE_FILE_CONCAT("sys/socket.h"     HAVE_SYS_SOCKET_H)
 CHECK_INCLUDE_FILE_CONCAT("netinet/in.h"     HAVE_NETINET_IN_H)
 CHECK_INCLUDE_FILE_CONCAT("net/if.h"         HAVE_NET_IF_H)
 CHECK_INCLUDE_FILE_CONCAT("netinet/if_ether.h" 
   HAVE_NETINET_IF_ETHER_H)
+CHECK_INCLUDE_FILE_CONCAT("netinet/tcp.h" 
+  HAVE_NETINET_TCP_H)
 CHECK_INCLUDE_FILE_CONCAT("sys/select.h"    HAVE_SYS_SELECT_H)
 CHECK_INCLUDE_FILE_CONCAT("utime.h"         HAVE_UTIME_H)
 CHECK_INCLUDE_FILE_CONCAT("netinet/in.h"    HAVE_NETINET_IN_H)
@@ -206,12 +234,19 @@ CHECK_INCLUDE_FILE_CONCAT("sys/sockio.h"    HAVE_SYS_SOCKIO_H)
 CHECK_INCLUDE_FILE_CONCAT("x509.h"          HAVE_X509_H)
 CHECK_INCLUDE_FILE_CONCAT("setjmp.h"        HAVE_SETJMP_H)
 CHECK_INCLUDE_FILE_CONCAT("signal.h"        HAVE_SIGNAL_H)
+CHECK_INCLUDE_FILE_CONCAT("sys/ioctl.h"     HAVE_SYS_IOCTL_H)
+CHECK_INCLUDE_FILE_CONCAT("sys/utsname.h"   HAVE_SYS_UTSNAME_H)
 
+CHECK_TYPE_SIZE(size_t  SIZEOF_SIZE_T)
 CHECK_TYPE_SIZE(ssize_t  SIZEOF_SSIZE_T)
+CHECK_TYPE_SIZE("long long"  SIZEOF_LONG_LONG)
 CHECK_TYPE_SIZE("long double"  SIZEOF_LONG_DOUBLE)
 IF(NOT HAVE_SIZEOF_SSIZE_T)
   SET(ssize_t int)
 ENDIF(NOT HAVE_SIZEOF_SSIZE_T)
+IF(HAVE_SIZEOF_LONG_LONG)
+  SET(HAVE_LONGLONG 1)
+ENDIF(HAVE_SIZEOF_LONG_LONG)
 
 FIND_FILE(RANDOM_FILE urandom /dev)
 MARK_AS_ADVANCED(RANDOM_FILE)
@@ -231,6 +266,7 @@ CHECK_SYMBOL_EXISTS(strcmpi       "${CURL_INCLUDES}" HAVE_STRCMPI)
 CHECK_SYMBOL_EXISTS(gethostbyaddr "${CURL_INCLUDES}" HAVE_GETHOSTBYADDR)
 CHECK_SYMBOL_EXISTS(gettimeofday  "${CURL_INCLUDES}" HAVE_GETTIMEOFDAY)
 CHECK_SYMBOL_EXISTS(inet_addr     "${CURL_INCLUDES}" HAVE_INET_ADDR)
+CHECK_SYMBOL_EXISTS(inet_pton     "${CURL_INCLUDES}" HAVE_INET_PTON)
 CHECK_SYMBOL_EXISTS(inet_ntoa     "${CURL_INCLUDES}" HAVE_INET_NTOA)
 CHECK_SYMBOL_EXISTS(inet_ntoa_r   "${CURL_INCLUDES}" HAVE_INET_NTOA_R)
 CHECK_SYMBOL_EXISTS(tcsetattr     "${CURL_INCLUDES}" HAVE_TCSETATTR)
@@ -244,20 +280,30 @@ CHECK_SYMBOL_EXISTS(strlcat       "${CURL_INCLUDES}" HAVE_STRLCAT)
 CHECK_SYMBOL_EXISTS(getpwuid      "${CURL_INCLUDES}" HAVE_GETPWUID)
 CHECK_SYMBOL_EXISTS(geteuid       "${CURL_INCLUDES}" HAVE_GETEUID)
 CHECK_SYMBOL_EXISTS(utime         "${CURL_INCLUDES}" HAVE_UTIME)
-CHECK_SYMBOL_EXISTS(RAND_status   "${CURL_INCLUDES}" HAVE_RAND_STATUS)
-CHECK_SYMBOL_EXISTS(RAND_screen   "${CURL_INCLUDES}" HAVE_RAND_SCREEN)
-CHECK_SYMBOL_EXISTS(RAND_egd      "${CURL_INCLUDES}" HAVE_RAND_EGD)
+IF(CMAKE_USE_OPENSSL)
+  CHECK_SYMBOL_EXISTS(RAND_status   "${CURL_INCLUDES}" HAVE_RAND_STATUS)
+  CHECK_SYMBOL_EXISTS(RAND_screen   "${CURL_INCLUDES}" HAVE_RAND_SCREEN)
+  CHECK_SYMBOL_EXISTS(RAND_egd      "${CURL_INCLUDES}" HAVE_RAND_EGD)
+  CHECK_SYMBOL_EXISTS(CRYPTO_cleanup_all_ex_data "${CURL_INCLUDES}" 
+    HAVE_CRYPTO_CLEANUP_ALL_EX_DATA)
+ENDIF(CMAKE_USE_OPENSSL)
 CHECK_SYMBOL_EXISTS(gmtime_r      "${CURL_INCLUDES}" HAVE_GMTIME_R)
 CHECK_SYMBOL_EXISTS(localtime_r   "${CURL_INCLUDES}" HAVE_LOCALTIME_R)
 
-CHECK_SYMBOL_EXISTS(gethostbyname_r "${CURL_INCLUDES};netdb.h" HAVE_GETHOSTBYNAME_R)
-CHECK_SYMBOL_EXISTS(gethostbyaddr_r "${CURL_INCLUDES};netdb.h" HAVE_GETHOSTBYADDR_R)
+CHECK_SYMBOL_EXISTS(gethostbyname   "${CURL_INCLUDES}" HAVE_GETHOSTBYNAME)
+CHECK_SYMBOL_EXISTS(gethostbyname_r "${CURL_INCLUDES}" HAVE_GETHOSTBYNAME_R)
+CHECK_SYMBOL_EXISTS(gethostbyaddr_r "${CURL_INCLUDES}" HAVE_GETHOSTBYADDR_R)
 
 CHECK_SYMBOL_EXISTS(signal        "${CURL_INCLUDES}" HAVE_SIGNAL_FUNC)
 CHECK_SYMBOL_EXISTS(SIGALRM       "${CURL_INCLUDES}" HAVE_SIGNAL_MACRO)
 IF(HAVE_SIGNAL_FUNC AND HAVE_SIGNAL_MACRO)
   SET(HAVE_SIGNAL 1)
 ENDIF(HAVE_SIGNAL_FUNC AND HAVE_SIGNAL_MACRO)
+CHECK_SYMBOL_EXISTS(uname         "${CURL_INCLUDES}" HAVE_UNAME)
+CHECK_SYMBOL_EXISTS(strtoll       "${CURL_INCLUDES}" HAVE_STRTOLL)
+CHECK_SYMBOL_EXISTS(strerror_r    "${CURL_INCLUDES}" HAVE_STRERROR_R)
+CHECK_SYMBOL_EXISTS(siginterrupt  "${CURL_INCLUDES}" HAVE_SIGINTERRUPT)
+CHECK_SYMBOL_EXISTS(perror        "${CURL_INCLUDES}" HAVE_PERROR)
 
 # only build compat strtok if we need to
 IF (NOT HAVE_STRTOK_R)
@@ -334,6 +380,7 @@ FOREACH(CURL_TEST
     HAVE_INET_NTOA_R_DECL
     HAVE_INET_NTOA_R_DECL_REENTRANT
     HAVE_GETADDRINFO
+    _FILE_OFFSET_BITS
     )
   CURL_INTERNAL_TEST(${CURL_TEST})
 ENDFOREACH(CURL_TEST)
@@ -398,21 +445,34 @@ IF(HAVE_LIBZ)
   SET(libCurl_SRCS ${libCurl_SRCS} content_encoding.c)
 ENDIF(HAVE_LIBZ)
 
-# Check for nonblocking
+IF(_FILE_OFFSET_BITS)
+  SET(_FILE_OFFSET_BITS 64)
+ENDIF(_FILE_OFFSET_BITS)
+SET(CMAKE_REQUIRED_FLAGS "-D_FILE_OFFSET_BITS=64")
+SET(CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/curl/curl.h")
+CHECK_TYPE_SIZE("curl_off_t" SIZEOF_CURL_OFF_T)
+SET(CMAKE_EXTRA_INCLUDE_FILES)
+SET(CMAKE_REQUIRED_FLAGS)
 
-SET(HAVE_SOME_NONBLOCK 0)
-FOREACH(CURL_TEST
-    HAVE_FIONBIO
-    HAVE_IOCTLSOCKET
-    HAVE_IOCTLSOCKET_CASE
-    HAVE_O_NONBLOCK)
-  IF(${CURL_TEST})
-    SET(HAVE_SOME_NONBLOCK 1)
-  ENDIF(${CURL_TEST})
-ENDFOREACH(CURL_TEST)
-IF(NOT HAVE_SOME_NONBLOCK)
-  SET(HAVE_DISABLED_NONBLOCKING 1)
-ENDIF(NOT HAVE_SOME_NONBLOCK)
+
+# Check for nonblocking
+#OPTION(CURL_HAVE_DISABLED_NONBLOCKING "Disable non-blocking socket detection" OFF)
+SET(HAVE_DISABLED_NONBLOCKING)
+IF(CURL_HAVE_DISABLED_NONBLOCKING)
+  SET(HAVE_SOME_NONBLOCK 0)
+  FOREACH(CURL_TEST
+      HAVE_FIONBIO
+      HAVE_IOCTLSOCKET
+      HAVE_IOCTLSOCKET_CASE
+      HAVE_O_NONBLOCK)
+    IF(${CURL_TEST})
+      SET(HAVE_SOME_NONBLOCK 1)
+    ENDIF(${CURL_TEST})
+  ENDFOREACH(CURL_TEST)
+  IF(NOT HAVE_SOME_NONBLOCK)
+    SET(HAVE_DISABLED_NONBLOCKING 1)
+  ENDIF(NOT HAVE_SOME_NONBLOCK)
+ENDIF(CURL_HAVE_DISABLED_NONBLOCKING)
 
 IF(RETSIGTYPE_TEST)
   SET(RETSIGTYPE void)