- fix segvs with incompletely initialiezed HttpMessages

[m6w6/ext-http] / config9.m4

diff --git a/config9.m4 b/config9.m4
index 7bbb2c2b587184b49719f4f20300ed6b24091fe4..9a0cda368d89d7458562fbddb496624eebf7a417 100644 (file)
--- 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
@@ -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,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]
@@ -238,6 +257,14 @@ dnl ----
                        [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 ----
@@ -306,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)
        
@@ -330,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)
        ], [