X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=0afce19355300457f472b613a18e99c9d47de18f;hp=a99a32dba7d2396b368ce805c72a680676c1a218;hb=45abbc6fd229be01e963e9642a03118d3c99131c;hpb=22ef1d84f0722d4a2d67c827eb3fb24d50134fb4

diff --git a/config.m4 b/config.m4
index a99a32d..0afce19 100644
--- a/config.m4
+++ b/config.m4
@@ -4,18 +4,33 @@ dnl vim: noet ts=1 sw=1
 
 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 requests],
-[  --with-http-curl-requests[=CURLDIR]
-                           With cURL HTTP request support])
+PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support],
+[  --with-http-curl-requests[=LIBCURLDIR]
+                           HTTP: with cURL request support], "yes")
+PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support],
+[  --with-http-zlib-compression[=LIBZDIR]
+                           HTTP: with zlib encodings support])
 PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
-[  --with-http-magic-mime[=MAGICDIR]
-                           With magic mime response content type guessing])
-PHP_ARG_WITH([http-zlib-compression], [whether to enable support for gzencoded/deflated message bodies],
-[  --with-http-zlib-compression[=ZLIBDIR]
-                           With zlib gzdecode and inflate support])
+[  --with-http-magic-mime[=LIBMAGICDIR]
+                           HTTP: with magic mime response content type guessing])
 
 if test "$PHP_HTTP" != "no"; then
 
+	ifdef([AC_PROG_EGREP], [
+		AC_PROG_EGREP
+	], [
+		AC_CHECK_PROG(EGREP, egrep, egrep)
+	])
+	ifdef([AC_PROG_SED], [
+		AC_PROG_SED
+	], [
+		ifdef([LT_AC_PROG_SED], [
+			LT_AC_PROG_SED
+		], [
+			AC_CHECK_PROG(SED, sed, sed)
+		])
+	])
+
 dnl -------
 dnl NETDB.H
 dnl -------
@@ -24,29 +39,37 @@ dnl -------
 dnl ----
 dnl ZLIB
 dnl ----
-	AC_MSG_CHECKING([for zlib.h])
-	ZLIB_DIR=
-	for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/local /usr /opt; do
-		if test -f "$i/include/zlib.h"; then
-			ZLIB_DIR=$i
-			break;
+	if test "$PHP_HTTP_ZLIB_ENCODINGS" != "no"; then
+		AC_MSG_CHECKING([for zlib.h])
+		ZLIB_DIR=
+		for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/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_WARN([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([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
 		fi
-	done
-	if test -z "$ZLIB_DIR"; then
-		AC_MSG_RESULT([not found])
-		AC_MSG_WARN([gzip support not enabled; zlib.h not found])
-	else
-		AC_MSG_RESULT([found in $ZLIB_DIR])
-		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
 	
 dnl ----
 dnl CURL
 dnl ----
 	if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then
-	
 		AC_MSG_CHECKING([for curl/curl.h])
 		CURL_DIR=
 		for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
@@ -77,13 +100,16 @@ dnl ----
 			AC_MSG_RESULT([found: $CURL_CONFIG])
 		fi
 		
-		CURL_LIBS=`$CURL_CONFIG --libs`
-		
-		CURL_ZLIB=`$CURL_CONFIG --features | $EGREP libz`
-		if test "$CURL_ZLIB" = "libz"; then
-			AC_DEFINE([HTTP_HAVE_CURL_ZLIB], [1], [ ])
+		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
 		
+		CURL_LIBS=`$CURL_CONFIG --libs`
+		
 		AC_MSG_CHECKING([for SSL support in libcurl])
 		CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
 		if test "$CURL_SSL" = "SSL"; then
@@ -139,7 +165,6 @@ dnl ----
 dnl MAGIC
 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
@@ -163,7 +188,6 @@ dnl ----
 dnl ----
 dnl HASH
 dnl ----
-
 	AC_MSG_CHECKING(for ext/hash support)
 	if test -x "$PHP_EXECUTABLE"; then
 		if test "`$PHP_EXECUTABLE -m | $EGREP '^hash$'`" = "hash"; then
@@ -179,8 +203,8 @@ dnl ----
 				AC_CHECK_HEADER([hash/php_hash.h], [
 					AC_DEFINE([HTTP_HAVE_HASH_EXT_HASH], [1], [Have ext/hash support])
 				], [ 
-  			AC_CHECK_HEADER([php_hash.h], [
-  				AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
+					AC_CHECK_HEADER([php_hash.h], [
+						AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
 					])
 				])
 			])
@@ -207,7 +231,8 @@ dnl ----
 		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_filter_api.c http_request_body_api.c \
+		http_deflatestream_object.c http_inflatestream_object.c"
 	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
@@ -215,8 +240,10 @@ dnl ----
 	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_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_deflatestream_object.h php_http_inflatestream_object.h"
 	ifdef([PHP_INSTALL_HEADERS], [
 		PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
 	], [