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, "")
+[ --with-http-libidn-dir[=DIR] HTTP: where to find libidn], $PHP_HTTP_LIBCURL_DIR, "")
if test "$PHP_HTTP" != "no"; then
break;
fi
done
- if test "x$IDNA_DIR" = "x"; then
- AC_MSG_RESULT([not found])
- else
+ if test "x$IDNA_DIR" != "x"; then
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)
+ AC_MSG_CHECKING([for libidn version])
+ IDNA_VER=$(pkg-config --version libidn 2>/dev/null || echo unknown)
+ AC_MSG_RESULT([$IDNA_VER])
+ AC_DEFINE_UNQUOTED([PHP_HTTP_LIBIDN_VERSION], "$IDNA_VER", [ ])
+ else
+ AC_MSG_RESULT([not found])
+ AC_MSG_CHECKING([for idn2.h])
+ IDNA_DIR=
+ for i in "$PHP_HTTP_LIBIDN_DIR" "$IDN_DIR" /usr/local /usr /opt; do
+ if test -f "$i/include/idn2.h"; then
+ IDNA_DIR=$i
+ break;
+ fi
+ done
+ if test "x$IDNA_DIR" != "x"; then
+ AC_MSG_RESULT([found in $IDNA_DIR])
+ AC_DEFINE([PHP_HTTP_HAVE_IDN2], [1], [Have libidn2 support])
+ PHP_ADD_INCLUDE($IDNA_DIR/include)
+ PHP_ADD_LIBRARY_WITH_PATH(idn2, $IDNA_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+ AC_MSG_CHECKING([for libidn2 version])
+ IDNA_VER=`$EGREP "define IDN2_VERSION " $IDNA_DIR/include/idn2.h | $SED -e's/^.*VERSION //g' -e 's/[[^0-9\.]]//g'`
+ AC_MSG_RESULT([$IDNA_VER])
+ AC_DEFINE_UNQUOTED([PHP_HTTP_LIBIDN2_VERSION], "$IDNA_VER", [ ])
+ else
+ AC_MSG_RESULT([not found])
+ AC_CHECK_HEADERS([unicode/uidna.h])
+ case $host_os in
+ darwin*)
+ PHP_CHECK_FUNC(uidna_IDNToASCII, icucore);;
+ *)
+ AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
+ if test ! -x "$ICU_CONFIG"; then
+ ICU_CONFIG="icu-config"
+ fi
+ AC_MSG_CHECKING([for uidna_IDNToASCII])
+ if ! test -x "$ICU_CONFIG"; then
+ ICU_CONFIG=icu-config
+ fi
+ if $ICU_CONFIG --exists 2>/dev/null >&2; then
+ save_LIBS=$LIBS
+ LIBS=$($ICU_CONFIG --ldflags)
+ AC_TRY_RUN([
+ #include <unicode/uidna.h>
+ int main(int argc, char *argv[]) {
+ return uidna_IDNToASCII(0, 0, 0, 0, 0, 0, 0);
+ }
+ ], [
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_UIDNA_IDNTOASCII], [1], [ ])
+ LIBS=$save_LIBS
+ PHP_EVAL_LIBLINE(`$ICU_CONFIG --ldflags`, HTTP_SHARED_LIBADD)
+ ], [
+ LIBS=$save_LIBS
+ AC_MSG_RESULT([no])
+ ])
+ fi
+ ;;
+ esac
+ fi
fi
dnl ----
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
+
+ AC_MSG_CHECKING([for HTTP2 support in libcurl])
+ if $CURL_CONFIG --features | $EGREP -q HTTP2; then
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([PHP_HTTP_HAVE_HTTP2], [1], [ ])
+ else
+ AC_MSG_RESULT([no])
+ fi
dnl
dnl compile tests
save_INCLUDES="$INCLUDES"
INCLUDES=
save_LIBS="$LIBS"
- LIBS=
+ LIBS=-lcurl
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS `$CURL_CONFIG --cflags`"
save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS `$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
+ LDFLAGS="$ld_runpath_switch$CURL_DIR/$PHP_LIBDIR"
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
], [
AC_MSG_RESULT([no])
])
+
+ AC_MSG_CHECKING([whether CURLOPT_TLSAUTH_TYPE expects CURL_TLSAUTH_SRP or literal "SRP"])
+ AC_TRY_RUN([
+ #include <curl/curl.h>
+ int main(int argc, char *argv[]) {
+ CURL *ch = curl_easy_init();
+ return curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, CURL_TLSAUTH_SRP);
+ }
+ ], [
+ AC_MSG_RESULT([CURL_TLSAUTH_SRP])
+ AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_SRP], [CURL_TLSAUTH_SRP], [ ])
+ AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_DEF], [CURL_TLSAUTH_NONE], [ ])
+ ], [
+ AC_TRY_RUN([
+ #include <curl/curl.h>
+ int main(int argc, char *argv[]) {
+ CURL *ch = curl_easy_init();
+ return curl_easy_setopt(ch, CURLOPT_TLSAUTH_TYPE, "SRP");
+ }
+ ], [
+ AC_MSG_RESULT(["SRP"])
+ AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_SRP], ["SRP"], [ ])
+ AC_DEFINE([PHP_HTTP_CURL_TLSAUTH_DEF], [""], [ ])
+ ], [
+ AC_MSG_RESULT([neither])
+ ], [
+ AC_MSG_RESULT([neither])
+ ])
+ ], [
+ AC_MSG_RESULT([neither])
+ ])
INCLUDES="$save_INCLUDES"
LIBS="$save_LIBS"
fi
])
-dnl ----
-dnl JSON
-dnl ----
- HTTP_HAVE_PHP_EXT([json])
-
-
dnl ----
dnl ICONV
dnl ----
php_http_options.c \
php_http_params.c \
php_http_querystring.c \
- php_http_strlist.c \
php_http_url.c \
php_http_version.c \
"
dnl shared extension deps
HTTP_SHARED_DEP([hash])
HTTP_SHARED_DEP([iconv])
- HTTP_SHARED_DEP([json])
dnl extension deps
PHP_ADD_EXTENSION_DEP([http], [raphf], true)
- PHP_ADD_EXTENSION_DEP([http], [propo], true)
+ PHP_ADD_EXTENSION_DEP([http], [propro], true)
PHP_SUBST([HTTP_SHARED_LIBADD])
php_http_options.h \
php_http_params.h \
php_http_querystring.h \
- php_http_strlist.h \
+ php_http_response_codes.h \
php_http_url.h \
+ php_http_utf8.h \
php_http_version.h \
"
PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)