X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config9.m4;h=9a0cda368d89d7458562fbddb496624eebf7a417;hp=14db91a19a978421de61a7994fa728456fe8a242;hb=4daf43ea22acd40a8cb0e7fc47047da8fae1270f;hpb=0eccfc06147e6b5559f871cd1a1332abf6a9b526

diff --git a/config9.m4 b/config9.m4
index 14db91a..9a0cda3 100644
--- a/config9.m4
+++ b/config9.m4
@@ -170,14 +170,14 @@ 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
 		
 		CURL_LIBS=`$CURL_CONFIG --libs`
 		
 		AC_MSG_CHECKING([for SSL support in libcurl])
-		CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
+		CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
 		if test "$CURL_SSL" = "SSL"; then
 			AC_MSG_RESULT([yes])
 			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
@@ -211,6 +211,21 @@ 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)
@@ -318,7 +333,7 @@ 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 \