X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=3b1f7015554d1683469836e9548efd85b2eb0a08;hp=cb7db94400ea5ed2dfb46b9b2b25d4b131786807;hb=refs%2Fheads%2Fv2.2.x;hpb=82e177a071d35372367f9f5255b3e2c553c8bffd

diff --git a/config9.m4 b/config9.m4
index cb7db94..3b1f701 100644
--- a/config9.m4
+++ b/config9.m4
@@ -1,24 +1,22 @@
 dnl config.m4 for pecl/http
-dnl $Id$
-dnl vim: noet ts=1 sw=1
+dnl $Id: config9.m4 242664 2007-09-18 19:13:37Z mike $
+dnl vim: noet ts=4 sw=4
 
-PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
-[  --enable-http           Enable extended HTTP support])
-PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support],
-[  --with-http-curl-requests[=LIBCURLDIR]
-                           HTTP: with cURL request support], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support],
-[  --with-http-zlib-compression[=LIBZDIR]
-                           HTTP: with zlib encodings support], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
-[  --with-http-magic-mime[=LIBMAGICDIR]
-                           HTTP: with magic mime response content type guessing], "no", "no")
-PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
-[  --with-http-shared-deps  HTTP: disable to not depend on extensions like hash,
-                                 iconv and session (when built shared)], $PHP_HTTP, $PHP_HTTP)
+PHP_ARG_WITH([http], [whether to enable extended HTTP support],
+[  --with-http             Enable extended HTTP support])
+PHP_ARG_WITH([http-zlib-dir], [],
+[  --with-http-zlib-dir[=DIR]     HTTP: where to find zlib], $PHP_HTTP, $PHP_HTTP)
+PHP_ARG_WITH([http-libcurl-dir], [],
+[  --with-http-libcurl-dir[=DIR]  HTTP: where to find libcurl], $PHP_HTTP, $PHP_HTTP)
+PHP_ARG_WITH([http-libevent-dir], [],
+[  --with-http-libevent-dir[=DIR] HTTP: where to find libevent], $PHP_HTTP_LIBCURL_DIR, "")
+PHP_ARG_WITH([http-libidn-dir], [],
+[  --with-http-libidn-dir=[=DIR]  HTTP: where to find libidn], $PHP_HTTP_LIBCURL_DIR, "")
 
 if test "$PHP_HTTP" != "no"; then
 
+	HTTP_HAVE_A_REQUEST_LIB=false
+
 	ifdef([AC_PROG_EGREP], [
 		AC_PROG_EGREP
 	], [
@@ -34,10 +32,12 @@ if test "$PHP_HTTP" != "no"; then
 		])
 	])
 	
+	AC_PROG_CPP
+	
 	if test "$PHP_HTTP_SHARED_DEPS" != "no"; then
-		AC_DEFINE([HTTP_SHARED_DEPS], [1], [ ])
+		AC_DEFINE([PHP_HTTP_SHARED_DEPS], [1], [ ])
 	else
-		AC_DEFINE([HTTP_SHARED_DEPS], [0], [ ])
+		AC_DEFINE([PHP_HTTP_SHARED_DEPS], [0], [ ])
 	fi
 	
 	dnl
@@ -45,7 +45,7 @@ if test "$PHP_HTTP" != "no"; then
 	dnl
 	AC_DEFUN([HTTP_SHARED_DEP], [
 		extname=$1
-		haveext=$[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)
+		haveext=$[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)
 		
 		AC_MSG_CHECKING([whether to add a dependency on ext/$extname])
 		if test "$PHP_HTTP_SHARED_DEPS" = "no"; then
@@ -53,6 +53,7 @@ if test "$PHP_HTTP" != "no"; then
 			$3
 		elif test "$haveext"; then
 			AC_MSG_RESULT([yes])
+			AC_DEFINE([PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__), [1], [ ])
 			ifdef([PHP_ADD_EXTENSION_DEP], [
 				PHP_ADD_EXTENSION_DEP([http], $1, true)
 			])
@@ -69,210 +70,377 @@ if test "$PHP_HTTP" != "no"; then
 	AC_DEFUN([HTTP_HAVE_PHP_EXT], [
 		extname=$1
 		haveext=$[PHP_]translit($1,a-z_-,A-Z__)
-		ishared=$[PHP_]translit($1,a-z_-,A-Z__)_SHARED
-		
 		AC_MSG_CHECKING([for ext/$extname support])
 		if test -x "$PHP_EXECUTABLE"; then
-			if test "`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`" = "$extname"; then
-				[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
+			grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$`
+			if test "$grepext" = "$extname"; then
+				[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
 				AC_MSG_RESULT([yes])
 				$2
 			else
-				[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
+				[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
 				AC_MSG_RESULT([no])
 				$3
 			fi
 		elif test "$haveext" != "no" && test "x$haveext" != "x"; then
-			[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
+			[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1
 			AC_MSG_RESULT([yes])
 			$2
 		else
-			[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
+			[PHP_HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=
 			AC_MSG_RESULT([no])
 			$3
 		fi
 	])
+	
 
 dnl ----
 dnl STDC
 dnl ----
-	AC_CHECK_HEADERS([netdb.h unistd.h])
+	AC_TYPE_OFF_T
+	AC_TYPE_MBSTATE_T
+	dnl getdomainname() is declared in netdb.h on some platforms: AIX, OSF
+	AC_CHECK_HEADERS([netdb.h unistd.h wchar.h wctype.h arpa/inet.h])
 	PHP_CHECK_FUNC(gethostname, nsl)
 	PHP_CHECK_FUNC(getdomainname, nsl)
-	PHP_CHECK_FUNC(getservbyport, nsl)
-	PHP_CHECK_FUNC(getservbyname, nsl)
+	PHP_CHECK_FUNC(mbrtowc)
+	PHP_CHECK_FUNC(mbtowc)
+	PHP_CHECK_FUNC(iswalnum)
+	PHP_CHECK_FUNC(inet_pton)
+
+dnl ----
+dnl IDN
+dnl ----
+
+	AC_MSG_CHECKING([for idna.h])
+	IDNA_DIR=
+	for i in "$PHP_HTTP_LIBIDN_DIR" "$IDN_DIR" /usr/local /usr /opt; do
+		if test -f "$i/include/idna.h"; then
+			IDNA_DIR=$i
+			break;
+		fi
+	done
+	if test "x$IDNA_DIR" = "x"; then
+		AC_MSG_RESULT([not found])
+	else
+		AC_MSG_RESULT([found in $IDNA_DIR])
+		AC_DEFINE([PHP_HTTP_HAVE_IDN], [1], [Have libidn support])
+		PHP_ADD_INCLUDE($IDNA_DIR/include)
+		PHP_ADD_LIBRARY_WITH_PATH(idn, $IDNA_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+	fi
 
 dnl ----
 dnl ZLIB
 dnl ----
-	if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then
-		AC_MSG_CHECKING([for zlib.h])
-		ZLIB_DIR=
-		for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do
-			if test -f "$i/include/zlib.h"; then
-				ZLIB_DIR=$i
-				break;
-			fi
-		done
-		if test -z "$ZLIB_DIR"; then
-			AC_MSG_RESULT([not found])
-			AC_MSG_ERROR([could not find zlib.h])
+	AC_MSG_CHECKING([for zlib.h])
+	ZLIB_DIR=
+	for i in "$PHP_HTTP_ZLIB_DIR" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do
+		if test -f "$i/include/zlib.h"; then
+			ZLIB_DIR=$i
+			break;
+		fi
+	done
+	if test "x$ZLIB_DIR" = "x"; then
+		AC_MSG_RESULT([not found])
+		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])
+		ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'`
+		AC_MSG_RESULT([$ZLIB_VERSION])
+		if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then
+			AC_MSG_ERROR([zlib version greater or equal to 1.2.0.4 required])
 		else
-			AC_MSG_RESULT([found in $ZLIB_DIR])
-			AC_MSG_CHECKING([for zlib version >= 1.2.0.4])
-			ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'`
-			AC_MSG_RESULT([$ZLIB_VERSION])
-			if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then
-				AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required])
-			else
-				PHP_ADD_INCLUDE($ZLIB_DIR/include)
-				PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-				AC_DEFINE([HTTP_HAVE_ZLIB], [1], [Have zlib support])
-			fi
+			PHP_ADD_INCLUDE($ZLIB_DIR/include)
+			PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
 		fi
 	fi
 	
 dnl ----
 dnl CURL
 dnl ----
-	if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then
+
+	if test "$PHP_HTTP_LIBCURL_DIR" = "no"; then
+		AC_DEFINE([PHP_HTTP_HAVE_CURL], [0], [ ])
+	else
 		AC_MSG_CHECKING([for curl/curl.h])
 		CURL_DIR=
-		for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
+		for i in "$PHP_HTTP_LIBCURL_DIR" /usr/local /usr /opt; do
 			if test -f "$i/include/curl/curl.h"; then
 				CURL_DIR=$i
 				break
 			fi
 		done
-		if test -z "$CURL_DIR"; then
+		if test "x$CURL_DIR" = "x"; then
 			AC_MSG_RESULT([not found])
-			AC_MSG_ERROR([could not find curl/curl.h])
 		else
 			AC_MSG_RESULT([found in $CURL_DIR])
-		fi
 		
-		AC_MSG_CHECKING([for curl-config])
-		CURL_CONFIG=
-		for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do
-			if test -x "$i"; then
-				CURL_CONFIG=$i
-				break
+			AC_MSG_CHECKING([for curl-config])
+			CURL_CONFIG=
+			for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do
+				if test -x "$i"; then
+					CURL_CONFIG=$i
+					break
+				fi
+			done
+			if test "x$CURL_CONFIG" = "x"; then
+				AC_MSG_RESULT([not found])
+				AC_MSG_ERROR([could not find curl-config])
+			else
+				AC_MSG_RESULT([found: $CURL_CONFIG])
 			fi
-		done
-		if test -z "$CURL_CONFIG"; then
-			AC_MSG_RESULT([not found])
-			AC_MSG_ERROR([could not find curl-config])
-		else
-			AC_MSG_RESULT([found: $CURL_CONFIG])
-		fi
 		
-		dnl Debian stable has currently 7.13.2 (this is not a typo)
-		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
-			AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required])
-		fi
+			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])
+			if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71802; then
+				AC_MSG_ERROR([libcurl version greater or equal to 7.18.2 required])
+			fi
 		
-		CURL_LIBS=`$CURL_CONFIG --libs`
+			dnl
+			dnl compile tests
+			dnl
 		
-		AC_MSG_CHECKING([for SSL support in libcurl])
-		CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
-		if test "$CURL_SSL" = "SSL"; then
-			AC_MSG_RESULT([yes])
-			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
+			save_INCLUDES="$INCLUDES"
+			INCLUDES=
+			save_LIBS="$LIBS"
+			LIBS=
+			save_CFLAGS="$CFLAGS"
+			CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
+			save_LDFLAGS="$LDFLAGS"
+			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], [ ])
 			
-			AC_MSG_CHECKING([for SSL library used])
-			CURL_SSL_FLAVOUR=
-			for i in $CURL_LIBS; do
-				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!])
-				AC_MSG_WARN([Could not determine the type of SSL library used!])
-				AC_MSG_WARN([Building will fail in ZTS mode!])
+				AC_MSG_CHECKING([for openssl 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->ssl_version && *data->ssl_version) {
+							const char *ptr = data->ssl_version;
+							while(*ptr == ' ') ++ptr;
+							return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1);
+						}
+						return 1;
+					}
+				], [
+					AC_MSG_RESULT([yes])
+					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])
+				], [
+					AC_MSG_RESULT([no])
+				])
+			
+				AC_MSG_CHECKING([for gnutls 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->ssl_version && *data->ssl_version) {
+							const char *ptr = data->ssl_version;
+							while(*ptr == ' ') ++ptr;
+							return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1);
+						}
+						return 1;
+					}
+				], [
+					AC_MSG_RESULT([yes])
+					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])
+				], [
+					AC_MSG_RESULT([no])
+				])
+			else
+				AC_MSG_RESULT([no])
 			fi
-		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])
+			])
 		
-		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])
+			INCLUDES="$save_INCLUDES"
+			LIBS="$save_LIBS"
+			CFLAGS="$save_CFLAGS"
+			LDFLAGS="$save_LDFLAGS"
+			
+			if test -n "$CURL_SSL_LIBS"; then
+				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
+			fi
+			
+			dnl end compile tests
 		
-		PHP_CHECK_LIBRARY(curl, curl_multi_strerror, 
-			[AC_DEFINE([HAVE_CURL_MULTI_STRERROR], [1], [ ])], [ ], 
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		PHP_CHECK_LIBRARY(curl, curl_easy_strerror,
-			[AC_DEFINE([HAVE_CURL_EASY_STRERROR], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		PHP_CHECK_LIBRARY(curl, curl_easy_reset,
-			[AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ],
-			[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
-		)
-		dnl Debian suddenly (>=7.14.1-2) hides all symbols not starting with "curl"
-		PHP_CHECK_LIBRARY(curl, Curl_getFormData,
-			[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]
-		)
+			AC_MSG_CHECKING([for bundled SSL CA info])
+			CURL_CAINFO=
+			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
+				fi
+			done
+			if test "x$CURL_CAINFO" = "x"; then
+				AC_MSG_RESULT([not found])
+			else
+				AC_MSG_RESULT([$CURL_CAINFO])
+				AC_DEFINE_UNQUOTED([PHP_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_CONFIG --libs`, HTTP_SHARED_LIBADD)
+			AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
+			HTTP_HAVE_A_REQUEST_LIB=true
+		fi
 	fi
 
 dnl ----
-dnl MAGIC
+dnl EVENT
 dnl ----
-	if test "$PHP_HTTP_MAGIC_MIME" != "no"; then
-		AC_MSG_CHECKING([for magic.h])
-		MAGIC_DIR=
-		for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do
-			if test -f "$i/include/magic.h"; then
-				MAGIC_DIR=$i
+
+	if test "$PHP_HTTP_LIBEVENT_DIR" = "no"; then
+		AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
+	else
+		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 -z "$MAGIC_DIR"; then
+		if test "x$EVENT_DIR" = "x"; then
 			AC_MSG_RESULT([not found])
-			AC_MSG_ERROR([could not find magic.h])
+			AC_MSG_WARN([continuing without libevent support])
+			AC_DEFINE([PHP_HTTP_HAVE_EVENT], [0], [ ])
 		else
-			AC_MSG_RESULT([found in $MAGIC_DIR])
+			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_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
+				else
+					EVENT_VER="1.1b or lower"
+				fi
+			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
-		
-		PHP_ADD_INCLUDE($MAGIC_DIR/include)
-		PHP_ADD_LIBRARY_WITH_PATH(magic, $MAGIC_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-		AC_DEFINE([HTTP_HAVE_MAGIC], [1], [Have magic mime support])
 	fi
 
 dnl ----
+dnl RAPHF
+dnl ----
+	HTTP_HAVE_PHP_EXT([raphf], [
+		AC_MSG_CHECKING([for php_raphf.h])
+		HTTP_EXT_RAPHF_INCDIR=
+		for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../raphf; do
+			if test -d $i; then
+				if test -f $i/php_raphf.h; then
+					HTTP_EXT_RAPHF_INCDIR=$i
+					break
+				elif test -f $i/ext/raphf/php_raphf.h; then
+					HTTP_EXT_RAPHF_INCDIR=$i/ext/raphf
+					break
+				fi
+			fi
+		done
+		if test "x$HTTP_EXT_RAPHF_INCDIR" = "x"; then
+			AC_MSG_ERROR([not found])
+		else
+			AC_MSG_RESULT([$HTTP_EXT_RAPHF_INCDIR])
+			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 and activate extension=raphf.$SHLIB_DL_SUFFIX_NAME in your php.ini])
+	])
+
+dnl ----
+dnl PROPRO
+dnl ----
+	HTTP_HAVE_PHP_EXT([propro], [
+		AC_MSG_CHECKING([for php_propro.h])
+		HTTP_EXT_PROPRO_INCDIR=
+		for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../propro; do
+			if test -d $i; then
+				if test -f $i/php_propro.h; then
+					HTTP_EXT_PROPRO_INCDIR=$i
+					break
+				elif test -f $i/ext/propro/php_propro.h; then
+					HTTP_EXT_PROPRO_INCDIR=$i/ext/propro
+					break
+				fi
+			fi
+		done
+		if test "x$HTTP_EXT_PROPRO_INCDIR" = "x"; then
+			AC_MSG_ERROR([not found])
+		else
+			AC_MSG_RESULT([$HTTP_EXT_PROPRO_INCDIR])
+			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 and activate extension=propro.$SHLIB_DL_SUFFIX_NAME in your php.ini])
+	])
+
+PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
+[  --without-http-shared-deps   HTTP: do not depend on extensions like hash
+                                     and iconv (when they are built shared)], $PHP_HTTP, $PHP_HTTP)
+dnl ----
 dnl HASH
 dnl ----
 	HTTP_HAVE_PHP_EXT([hash], [
@@ -289,62 +457,114 @@ dnl ----
 				fi
 			fi
 		done
-		if test -z "$HTTP_EXT_HASH_INCDIR"; then
+		if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then
 			AC_MSG_RESULT([not found])
 		else
 			AC_MSG_RESULT([$HTTP_EXT_HASH_INCDIR])
-			AC_DEFINE([HTTP_HAVE_PHP_HASH_H], [1], [Have ext/hash support])
+			AC_DEFINE([PHP_HTTP_HAVE_PHP_HASH_H], [1], [Have ext/hash support])
 			PHP_ADD_INCLUDE([$HTTP_EXT_HASH_INCDIR])
 		fi
 	])
 
 dnl ----
-dnl ICONV
+dnl JSON
 dnl ----
-	HTTP_HAVE_PHP_EXT([iconv])
+	HTTP_HAVE_PHP_EXT([json])
+
 
 dnl ----
-dnl SESSION
+dnl ICONV
 dnl ----
-	HTTP_HAVE_PHP_EXT([session])
+	HTTP_HAVE_PHP_EXT([iconv])
 
 dnl ----
 dnl DONE
 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_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"
-	
+	PHP_HTTP_SOURCES="\
+		php_http_buffer.c \
+		php_http.c \
+		php_http_client.c \
+		php_http_client_curl.c \
+		php_http_client_request.c \
+		php_http_client_response.c \
+		php_http_cookie.c \
+		php_http_curl.c \
+		php_http_encoding.c \
+		php_http_env.c \
+		php_http_env_request.c \
+		php_http_env_response.c \
+		php_http_etag.c \
+		php_http_exception.c \
+		php_http_filter.c \
+		php_http_header_parser.c \
+		php_http_header.c \
+		php_http_info.c \
+		php_http_message_body.c \
+		php_http_message.c \
+		php_http_message_parser.c \
+		php_http_misc.c \
+		php_http_negotiate.c \
+		php_http_object.c \
+		php_http_options.c \
+		php_http_params.c \
+		php_http_querystring.c \
+		php_http_strlist.c \
+		php_http_url.c \
+		php_http_version.c \
+	"
 	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
 	
 	dnl shared extension deps
 	HTTP_SHARED_DEP([hash])
 	HTTP_SHARED_DEP([iconv])
-	HTTP_SHARED_DEP([session])
+	HTTP_SHARED_DEP([json])
+	
+	dnl extension deps
+	PHP_ADD_EXTENSION_DEP([http], [raphf], true)
+	PHP_ADD_EXTENSION_DEP([http], [propo], true)
 	
-	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
 
-	PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
-		php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \
-		php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \
-		php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h \
-		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"
-	ifdef([PHP_INSTALL_HEADERS], [
-		PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
-	], [
-		PHP_SUBST([PHP_HTTP_HEADERS])
-		PHP_ADD_MAKEFILE_FRAGMENT
-	])
+	PHP_HTTP_HEADERS="
+		php_http_api.h \
+		php_http_buffer.h \
+		php_http_curl_client.h \
+		php_http_curl_client_datashare.h \
+		php_http_client_datashare.h \
+		php_http_client_factory.h \
+		php_http_client.h \
+		php_http_client_interface.h \
+		php_http_curl_client_pool.h \
+		php_http_client_pool.h \
+		php_http_client_request.h \
+		php_http_client_response.h \
+		php_http_cookie.h \
+		php_http_curl.h \
+		php_http_encoding.h \
+		php_http_env.h \
+		php_http_env_request.h \
+		php_http_env_response.h \
+		php_http_etag.h \
+		php_http_exception.h \
+		php_http_filter.h \
+		php_http.h \
+		php_http_header_parser.h \
+		php_http_header.h \
+		php_http_info.h \
+		php_http_message_body.h \
+		php_http_message.h \
+		php_http_message_parser.h \
+		php_http_misc.h \
+		php_http_negotiate.h \
+		php_http_object.h \
+		php_http_options.h \
+		php_http_params.h \
+		php_http_querystring.h \
+		php_http_strlist.h \
+		php_http_url.h \
+		php_http_version.h \
+	"
+	PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
 
 	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi