X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=ba1b93511b551885c801bcead58a0503532346d1;hp=dbceef3e73af296bcab462b4c71111364d898515;hb=4b017a75b134381e0f4dcef179fb3c63488a694e;hpb=5855b4ed57714dabea33a2c57d4b9cb1a03af70c

diff --git a/config9.m4 b/config9.m4
index dbceef3..ba1b935 100644
--- a/config9.m4
+++ b/config9.m4
@@ -100,7 +100,9 @@ dnl ----
 	PHP_CHECK_FUNC(gethostname, nsl)
 	PHP_CHECK_FUNC(getdomainname, nsl)
 	PHP_CHECK_FUNC(getservbyport, nsl)
+	PHP_CHECK_FUNC(getservbyport_r, nsl)
 	PHP_CHECK_FUNC(getservbyname, nsl)
+	PHP_CHECK_FUNC(getservbyname_r, nsl)
 
 dnl ----
 dnl ZLIB
@@ -129,40 +131,6 @@ dnl ----
 		fi
 	fi
 	
-dnl ----
-dnl SERF
-dnl ----
-dnl
-dnl	if test "$PHP_HTTP_LIBSERF_DIR" = "no"; then
-dnl		AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-dnl	else
-dnl		AC_MSG_CHECKING([for serf-?/serf.h])
-dnl		SERF_DIR=
-dnl		for i in "$PHP_HTTP_LIBSERF_DIR" /usr/local /usr /opt; do
-dnl			if test -f "$i/include/serf-0/serf.h"; then
-dnl				SERF_DIR=$i
-dnl				SERF_VER=0
-dnl				break
-dnl			elif test -f "$i/include/serf-1/serf.h"; then
-dnl				SERF_DIR=$i
-dnl				SERF_VER=1
-dnl			fi
-dnl		done
-
-dnl		if test "x$SERF_DIR" = "x"; then
-dnl			AC_MSG_RESULT([not found])
-dnl			AC_DEFINE([PHP_HTTP_HAVE_SERF], [0], [ ])
-dnl		else
-dnl			AC_MSG_RESULT([found in $SERF_DIR])
-
-dnl			PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERF_VER)
-dnl			PHP_ADD_LIBRARY_WITH_PATH(serf-$SERF_VER, $SERF_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-dnl			AC_DEFINE([PHP_HTTP_HAVE_SERF], [1], [Have libserf support])
-dnl			HTTP_HAVE_A_REQUEST_LIB=true
-dnl		fi
-dnl	fi
-dnl	
-
 dnl ----
 dnl CURL
 dnl ----
@@ -198,7 +166,11 @@ dnl ----
 				AC_MSG_RESULT([found: $CURL_CONFIG])
 			fi
 		
-			dnl Debian stable has currently 7.18.2
+			dnl RHEL6:         7.19.7
+			dnl SUSE11:        7.19.7
+			dnl Debian wheezy: 7.26.0
+			dnl Debian sqeeze: 7.21.0
+			dnl Debian ancient 7.18.2
 			AC_MSG_CHECKING([for curl version >= 7.18.2])
 			CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'`
 			AC_MSG_RESULT([$CURL_VERSION])
@@ -215,13 +187,13 @@ dnl ----
 			save_LIBS="$LIBS"
 			LIBS=
 			save_CFLAGS="$CFLAGS"
-			CFLAGS=`$CURL_CONFIG --cflags`
+			CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
 			save_LDFLAGS="$LDFLAGS"
-			LDFLAGS=`$CURL_CONFIG --libs`
-			LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+			LDFLAGS="$LDFLAGS `$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
 		
 			AC_MSG_CHECKING([for SSL support in libcurl])
 			CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
+			CURL_SSL_LIBS=()
 			if test "$CURL_SSL" = "SSL"; then
 				AC_MSG_RESULT([yes])
 				AC_DEFINE([PHP_HTTP_HAVE_SSL], [1], [ ])
@@ -240,9 +212,11 @@ dnl ----
 					}
 				], [
 					AC_MSG_RESULT([yes])
-					AC_CHECK_HEADER([openssl/crypto.h], [
-						AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
-						CURL_SSL="crypto"
+					AC_CHECK_HEADER([openssl/ssl.h], [
+						AC_CHECK_HEADER([openssl/crypto.h], [
+							AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
+							CURL_SSL_LIBS=(ssl crypto)
+						])
 					])
 				], [
 					AC_MSG_RESULT([no])
@@ -264,9 +238,11 @@ dnl ----
 					}
 				], [
 					AC_MSG_RESULT([yes])
-					AC_CHECK_HEADER([gcrypt.h], [
-						AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
-						CURL_SSL="gcrypt"
+					AC_CHECK_HEADER([gnutls.h], [
+						AC_CHECK_HEADER([gcrypt.h], [
+							AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
+							CURL_SSL_LIBS=(gnutls gcrypt)
+						])
 					])
 				], [
 					AC_MSG_RESULT([no])
@@ -276,17 +252,40 @@ dnl ----
 			else
 				AC_MSG_RESULT([no])
 			fi
+			
+			AC_MSG_CHECKING([for ares support in libcurl])
+			AC_TRY_RUN([
+				#include <curl/curl.h>
+				int main(int argc, char *argv[]) {
+					curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+					if (data && data->ares && data->ares_num0) {
+						return 0;
+					}
+					return 1;
+				}
+			], [
+				AC_MSG_RESULT([yes])
+				AC_DEFINE([PHP_HTTP_HAVE_ARES], [1], [ ])
+			], [
+				AC_MSG_RESULT([no])
+			], [
+				AC_MSG_RESULT([no])
+			])
 		
 			INCLUDES="$save_INCLUDES"
 			LIBS="$save_LIBS"
 			CFLAGS="$save_CFLAGS"
 			LDFLAGS="$save_LDFLAGS"
-		
+			
+			for CURL_SSL_LIB in "${CURL_SSL_LIBS[[@]]}"; do
+				PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL_LIB], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD)
+			done
+			
 			dnl end compile tests
 		
 			AC_MSG_CHECKING([for bundled SSL CA info])
 			CURL_CAINFO=
-			for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do
+			for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt" "/etc/ssl/certs/ca-bundle.crt"; do
 				if test -f "$i"; then
 					CURL_CAINFO="$i"
 					break
@@ -302,9 +301,6 @@ dnl ----
 			PHP_ADD_INCLUDE($CURL_DIR/include)
 			PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
 			PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD)
-			if test "x$CURL_SSL" != "x"; then
-				PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD)
-			fi
 			AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
 			HTTP_HAVE_A_REQUEST_LIB=true
 		fi
@@ -317,50 +313,45 @@ dnl ----
 	if test "$PHP_HTTP_LIBEVENT_DIR" = "no"; then
 		AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
 	else
-		HTTP_HAVE_PHP_EXT([event], [
-			AC_MSG_WARN([event support is incompatible with pecl/event; continuing without libevent support])
+		AC_MSG_CHECKING([for event2/event.h])
+		EVENT_DIR=
+		for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
+			if test -f "$i/include/event.h"; then
+				EVENT_DIR=$i
+				break
+			fi
+		done
+		if test "x$EVENT_DIR" = "x"; then
+			AC_MSG_RESULT([not found])
+			AC_MSG_WARN([continuing without libevent support])
 			AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
-		], [
-			AC_MSG_CHECKING([for event2/event.h])
-			EVENT_DIR=
-			for i in "$PHP_HTTP_LIBEVENT_DIR" /usr/local /usr /opt; do
-				if test -f "$i/include/event.h"; then
-					EVENT_DIR=$i
-					break
-				fi
-			done
-			if test "x$EVENT_DIR" = "x"; then
-				AC_MSG_RESULT([not found])
-				AC_MSG_WARN([continuing without libevent support])
-				AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
+		else
+			AC_MSG_RESULT([found in $EVENT_DIR])
+			
+			AC_MSG_CHECKING([for libevent version, roughly])
+			
+			if test -f "$EVENT_DIR/include/event2/event.h"; then
+				EVENT_VER="`$AWK '/_EVENT_VERSION/ {gsub(/\"/,\"\",$3); print $3}' < $EVENT_DIR/include/event2/event-config.h`"
+				AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
 			else
-				AC_MSG_RESULT([found in $EVENT_DIR])
-				
-				AC_MSG_CHECKING([for libevent version, roughly])
-				
-				if test -f "$EVENT_DIR/include/event2/event.h"; then
-					EVENT_VER="`$EGREP _EVENT_VERSION $EVENT_DIR/include/event2/event.h | $AWK '{print $3}'`"
-					AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [1], [ ])
-				else
-					AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
-					if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
-						if test -f "$EVENT_DIR/include/evrpc.h"; then
-							EVENT_VER="1.4 or greater"
-						else
-							EVENT_VER="1.2 or greater"
-						fi
+				AC_DEFINE([PHP_HTTP_HAVE_EVENT2], [0], [ ])
+				if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then
+					if test -f "$EVENT_DIR/include/evrpc.h"; then
+						EVENT_VER="1.4 or greater"
 					else
-						EVENT_VER="1.1b or lower"
+						EVENT_VER="1.2 or greater"
 					fi
+				else
+					EVENT_VER="1.1b or lower"
 				fi
-				AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
-				AC_MSG_RESULT([$EVENT_VER])
-				
-				PHP_ADD_INCLUDE($EVENT_DIR/include)
-				PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-				AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
 			fi
-		])
+			AC_DEFINE_UNQUOTED([PHP_HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ])
+			AC_MSG_RESULT([$EVENT_VER])
+			
+			PHP_ADD_INCLUDE($EVENT_DIR/include)
+			PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+			AC_DEFINE([PHP_HTTP_HAVE_EVENT], [1], [Have libevent support for cURL])
+		fi
 	fi
 
 dnl ----
@@ -387,6 +378,8 @@ dnl ----
 			AC_DEFINE([PHP_HTTP_HAVE_PHP_RAPHF_H], [1], [Have ext/raphf support])
 			PHP_ADD_INCLUDE([$HTTP_EXT_RAPHF_INCDIR])
 		fi
+	], [
+		AC_MSG_ERROR([Please install pecl/raphf])
 	])
 
 dnl ----
@@ -413,6 +406,8 @@ dnl ----
 			AC_DEFINE([PHP_HTTP_HAVE_PHP_PROPRO_H], [1], [Have ext/propro support])
 			PHP_ADD_INCLUDE([$HTTP_EXT_PROPRO_INCDIR])
 		fi
+	], [
+		AC_MSG_ERROR([Please install pecl/propro])
 	])
 
 PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
@@ -462,13 +457,7 @@ dnl ----
 		php_http_buffer.c \
 		php_http.c \
 		php_http_client.c \
-		php_http_curl_client.c \
-		php_http_client_datashare.c \
-		php_http_curl_client_datashare.c \
-		php_http_client_factory.c \
-		php_http_client_interface.c \
-		php_http_client_pool.c \
-		php_http_curl_client_pool.c \
+		php_http_client_curl.c \
 		php_http_client_request.c \
 		php_http_client_response.c \
 		php_http_cookie.c \
@@ -481,7 +470,7 @@ dnl ----
 		php_http_exception.c \
 		php_http_filter.c \
 		php_http_header_parser.c \
-		php_http_headers.c \
+		php_http_header.c \
 		php_http_info.c \
 		php_http_message_body.c \
 		php_http_message.c \
@@ -533,7 +522,7 @@ dnl ----
 		php_http_filter.h \
 		php_http.h \
 		php_http_header_parser.h \
-		php_http_headers.h \
+		php_http_header.h \
 		php_http_info.h \
 		php_http_message_body.h \
 		php_http_message.h \