[ --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-libneon-dir], [],
-[ --with-http-libneon-dir[=DIR] HTTP: where to find libneon], $PHP_HTTP, $PHP_HTTP)
-PHP_ARG_WITH([http-libserf-dir], [],
-[ --with-http-libserf-dir[=DIR] HTTP: where to find libserf], $PHP_HTTP, $PHP_HTTP)
PHP_ARG_WITH([http-libevent-dir], [],
[ --with-http-libevent-dir[=DIR] HTTP: where to find libevent], $PHP_HTTP_LIBCURL_DIR, "")
fi
fi
-dnl ----
-dnl NEON
-dnl ----
-
- if test "$PHP_HTTP_LIBNEON_DIR" = "no"; then
- AC_DEFINE([PHP_HTTP_HAVE_NEON], [0], [ ])
- else
- AC_MSG_CHECKING([for neon/ne_session.h])
- NEON_DIR=
- for i in "$PHP_HTTP_LIBNEON_DIR" /usr/local /usr /opt; do
- if test -f "$i/include/neon/ne_session.h"; then
- NEON_DIR=$i
- break
- fi
- done
-
- if test "x$NEON_DIR" = "x"; then
- AC_MSG_RESULT([not found])
- AC_DEFINE([PHP_HTTP_HAVE_NEON], [0], [ ])
- else
- AC_MSG_RESULT([found in $NEON_DIR])
-
- AC_MSG_CHECKING([for neon-config])
- NEON_CONFIG=
- for i in "$NEON_DIR/bin/neon-config" "$NEON_DIR/neon-config" `which neon-config`; do
- if test -x "$i"; then
- NEON_CONFIG=$i
- break
- fi
- done
- if test "x$NEON_CONFIG" = "x"; then
- AC_MSG_RESULT([not found])
- AC_DEFINE([PHP_HTTP_HAVE_NEON], [0], [ ])
- else
- AC_MSG_RESULT([found: $NEON_CONFIG])
-
- AC_MSG_CHECKING([for libneon version])
- PHP_HTTP_NEON_VERSION=`$NEON_CONFIG --version | $SED -re 's/^neon ([[^ :]]+).*/\1/g'`
- if test "x$PHP_HTTP_NEON_VERSION" = "x"; then
- AC_MSG_RESULT([unknown])
- PHP_HTTP_NEON_VERSION="unknown"
- else
- AC_MSG_RESULT([$PHP_HTTP_NEON_VERSION])
- fi
- AC_DEFINE_UNQUOTED([PHP_HTTP_NEON_VERSION], ["$PHP_HTTP_NEON_VERSION"], [neon-config --version])
- PHP_ADD_INCLUDE($NEON_DIR/include)
- PHP_ADD_LIBRARY_WITH_PATH(neon, $NEON_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
- AC_DEFINE([PHP_HTTP_HAVE_NEON], [1], [Have libneon support])
- HTTP_HAVE_A_REQUEST_LIB=true
- fi
- fi
- fi
-
dnl ----
dnl SERF
dnl ----
else
AC_MSG_RESULT([found in $SERF_DIR])
- PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERV_VER)
+ PHP_ADD_INCLUDE($SERF_DIR/include/serf-$SERF_VER)
PHP_ADD_LIBRARY_WITH_PATH(serf-$SERF_VER, $SERF_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
AC_DEFINE([PHP_HTTP_HAVE_SERF], [1], [Have libserf support])
HTTP_HAVE_A_REQUEST_LIB=true
AC_MSG_RESULT([yes])
AC_CHECK_HEADER([openssl/crypto.h], [
AC_DEFINE([PHP_HTTP_HAVE_OPENSSL], [1], [ ])
+ CURL_SSL="crypto"
])
], [
AC_MSG_RESULT([no])
AC_MSG_RESULT([yes])
AC_CHECK_HEADER([gcrypt.h], [
AC_DEFINE([PHP_HTTP_HAVE_GNUTLS], [1], [ ])
+ CURL_SSL="gcrypt"
])
], [
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_CONFIG --libs`, HTTP_SHARED_LIBADD)
+ if test "x$CURL_SSL" != "x"; then
+ PHP_ADD_LIBRARY_WITH_PATH([$CURL_SSL], $CURL_DIR/$PHP_LIBDIR, PHP_HTTP_SHARED_LIBADD)
+ fi
AC_DEFINE([PHP_HTTP_HAVE_CURL], [1], [Have libcurl support])
HTTP_HAVE_A_REQUEST_LIB=true
fi
dnl DONE
dnl ----
PHP_HTTP_SOURCES="\
- php_http.c \
php_http_buffer.c \
+ php_http.c \
+ php_http_client.c \
+ php_http_curl_client.c \
+ php_http_client_datashare.c \
+ php_http_curl_client_datashare.c \
+ php_http_client_factory.c \
+ php_http_client_interface.c \
+ php_http_client_pool.c \
+ php_http_curl_client_pool.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_headers.c \
php_http_header_parser.c \
+ php_http_headers.c \
php_http_info.c \
php_http_message_body.c \
php_http_message.c \
php_http_negotiate.c \
php_http_object.c \
php_http_params.c \
- php_http_resource_factory.c \
php_http_persistent_handle.c \
php_http_property_proxy.c \
php_http_querystring.c \
- php_http_request.c \
- php_http_request_factory.c \
- php_http_curl.c \
- php_http_neon.c \
- php_http_request_pool.c \
- php_http_request_datashare.c \
- php_http_request_method.c \
+ php_http_resource_factory.c \
php_http_strlist.c \
php_http_url.c \
php_http_version.c \
PHP_SUBST([HTTP_SHARED_LIBADD])
PHP_HTTP_HEADERS="
- php_http.h \
+ 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_headers.h \
+ php_http.h \
php_http_header_parser.h \
+ php_http_headers.h \
php_http_info.h \
php_http_message_body.h \
php_http_message.h \
php_http_negotiate.h \
php_http_object.h \
php_http_params.h \
- php_http_resource_factory.h \
php_http_persistent_handle.h \
php_http_property_proxy.h \
php_http_querystring.h \
- php_http_request_datashare.h \
- php_http_request.h \
- php_http_request_factory.h \
- php_http_curl.h \
- php_http_neon.h \
- php_http_request_method.h \
- php_http_request_pool.h \
+ php_http_resource_factory.h \
php_http_strlist.h \
php_http_url.h \
php_http_version.h \
projects / m6w6 / ext-http / blobdiff