X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=c154ed05b690a441332f1977ee2635a496cfd0f5;hp=e1c4ab8831c87d703538695001a47cce06cd7ffe;hb=d886588e9d3193d182ee5ed82741aba45f028d52;hpb=fb5d0ef47f1f54dad0efa1f091324e3d7d18050b

diff --git a/config9.m4 b/config9.m4
index e1c4ab8..c154ed0 100644
--- a/config9.m4
+++ b/config9.m4
@@ -54,7 +54,7 @@ if test "$PHP_HTTP" != "no"; then
 		elif test "$haveext"; then
 			AC_MSG_RESULT([yes])
 			ifdef([PHP_ADD_EXTENSION_DEP], [
-				PHP_ADD_EXTENSION_DEP([http], $1, 0)
+				PHP_ADD_EXTENSION_DEP([http], $1, true)
 			])
 			$2
 		else
@@ -93,10 +93,14 @@ if test "$PHP_HTTP" != "no"; then
 		fi
 	])
 
-dnl -------
-dnl HEADERS
-dnl -------
+dnl ----
+dnl STDC
+dnl ----
 	AC_CHECK_HEADERS([netdb.h unistd.h])
+	PHP_CHECK_FUNC(gethostname, nsl)
+	PHP_CHECK_FUNC(getdomainname, nsl)
+	PHP_CHECK_FUNC(getservbyport, nsl)
+	PHP_CHECK_FUNC(getservbyname, nsl)
 
 dnl ----
 dnl ZLIB
@@ -112,7 +116,7 @@ dnl ----
 		done
 		if test -z "$ZLIB_DIR"; then
 			AC_MSG_RESULT([not found])
-			AC_MSG_WARN([could not find zlib.h])
+			AC_MSG_ERROR([could not find zlib.h])
 		else
 			AC_MSG_RESULT([found in $ZLIB_DIR])
 			AC_MSG_CHECKING([for zlib version >= 1.2.0.4])
@@ -166,7 +170,7 @@ dnl ----
 		AC_MSG_CHECKING([for curl version >= 7.12.3])
 		CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'`
 		AC_MSG_RESULT([$CURL_VERSION])
-		if test `echo $CURL_VERSION | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then
+		if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then
 			AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required])
 		fi
 		
@@ -181,19 +185,22 @@ dnl ----
 			AC_MSG_CHECKING([for SSL library used])
 			CURL_SSL_FLAVOUR=
 			for i in $CURL_LIBS; do
-				if test "$i" = "-lssl"; then
-					CURL_SSL_FLAVOUR="openssl"
-					AC_MSG_RESULT([openssl])
-					AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
-					AC_CHECK_HEADERS([openssl/crypto.h])
-					break
-				elif test "$i" = "-lgnutls"; then
-					CURL_SSL_FLAVOUR="gnutls"
-					AC_MSG_RESULT([gnutls])
-					AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
-					AC_CHECK_HEADERS([gcrypt.h])
-					break
-				fi
+				case $i in
+					-lssl* | -lyassl*)
+						CURL_SSL_FLAVOUR="openssl"
+						AC_MSG_RESULT([openssl])
+						AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
+						AC_CHECK_HEADERS([openssl/crypto.h])
+						break
+					;;
+					-lgnutls*)
+						CURL_SSL_FLAVOUR="gnutls"
+						AC_MSG_RESULT([gnutls])
+						AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
+						AC_CHECK_HEADERS([gcrypt.h])
+						break
+					;;
+				esac
 			done
 			if test -z "$CURL_SSL_FLAVOUR"; then
 				AC_MSG_RESULT([unknown!])
@@ -204,11 +211,30 @@ dnl ----
 			AC_MSG_RESULT([no])
 		fi
 		
+		AC_MSG_CHECKING([for bundled SSL CA info])
+		CURL_CAINFO=
+		for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
+			if test -f "$i"; then
+				CURL_CAINFO="$i"
+				break
+			fi
+		done
+		if test -z "$CURL_CAINFO"; then
+			AC_MSG_RESULT([not found])
+		else
+			AC_MSG_RESULT([$CURL_CAINFO])
+			AC_DEFINE_UNQUOTED([HTTP_CURL_CAINFO], ["$CURL_CAINFO"], [path to bundled SSL CA info])
+		fi
+		
 		PHP_ADD_INCLUDE($CURL_DIR/include)
 		PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
 		PHP_EVAL_LIBLINE($CURL_LIBS, HTTP_SHARED_LIBADD)
 		AC_DEFINE([HTTP_HAVE_CURL], [1], [Have cURL support])
 		
+		PHP_CHECK_LIBRARY(curl, curl_share_strerror, 
+			[AC_DEFINE([HAVE_CURL_SHARE_STRERROR], [1], [ ])], [ ],
+			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+		)
 		PHP_CHECK_LIBRARY(curl, curl_multi_strerror, 
 			[AC_DEFINE([HAVE_CURL_MULTI_STRERROR], [1], [ ])], [ ], 
 			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
@@ -226,6 +252,19 @@ dnl ----
 			[AC_DEFINE([HAVE_CURL_GETFORMDATA], [1], [ ])], [ ],
 			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
 		)
+		dnl New API function which obsoletes use of Curl_getFormData (>=7.15.5)
+		PHP_CHECK_LIBRARY(curl, curl_formget,
+			[AC_DEFINE([HAVE_CURL_FORMGET], [1], [ ])], [ ],
+			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+		)
+		PHP_CHECK_LIBRARY(curl, curl_multi_setopt, 
+			[AC_DEFINE([HAVE_CURL_MULTI_SETOPT], [1], [ ])], [ ], 
+			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+		)
+		PHP_CHECK_LIBRARY(curl, curl_multi_timeout, 
+			[AC_DEFINE([HAVE_CURL_MULTI_TIMEOUT], [1], [ ])], [ ],
+			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+		)
 	fi
 
 dnl ----
@@ -294,12 +333,12 @@ dnl ----
 	PHP_HTTP_SOURCES="missing.c http.c http_functions.c phpstr/phpstr.c \
 		http_util_object.c http_message_object.c http_request_object.c http_request_pool_api.c \
 		http_response_object.c http_exception_object.c http_requestpool_object.c \
-		http_api.c http_cache_api.c http_request_api.c http_date_api.c \
+		http_api.c http_cache_api.c http_request_api.c http_request_info.c http_date_api.c \
 		http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \
 		http_info_api.c http_request_method_api.c http_encoding_api.c \
 		http_filter_api.c http_request_body_api.c http_querystring_object.c \
 		http_deflatestream_object.c http_inflatestream_object.c http_cookie_api.c \
-		http_querystring_api.c"
+		http_querystring_api.c http_request_datashare_api.c http_requestdatashare_object.c"
 	
 	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
 	
@@ -318,7 +357,7 @@ dnl ----
 		php_http_exception_object.h php_http_message_object.h php_http_request_object.h \
 		php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h \
 		php_http_querystring_object.h php_http_deflatestream_object.h php_http_inflatestream_object.h \
-		php_http_cookie_api.h php_http_querystring_api.h"
+		php_http_cookie_api.h php_http_querystring_api.h php_http_request_datashare_api.h php_http_requestdatashare_object.h"
 	ifdef([PHP_INSTALL_HEADERS], [
 		PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
 	], [