projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag 'RELEASE_1_5_3'.
[m6w6/ext-http]
/
config9.m4
diff --git
a/config9.m4
b/config9.m4
index c154ed05b690a441332f1977ee2635a496cfd0f5..3edb363ce939389562056783826aad24d7ebc6b4 100644
(file)
--- a/
config9.m4
+++ b/
config9.m4
@@
-4,6
+4,10
@@
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_ENABLE([http], [whether to enable extended HTTP support],
[ --enable-http Enable extended HTTP support])
+PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
+[ --with-http-shared-deps
+ HTTP: disable to not depend on extensions like hash,
+ iconv and session (when built shared)], $PHP_HTTP, $PHP_HTTP)
PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support],
[ --with-http-curl-requests[=LIBCURLDIR]
HTTP: with cURL request support], $PHP_HTTP, $PHP_HTTP)
PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support],
[ --with-http-curl-requests[=LIBCURLDIR]
HTTP: with cURL request support], $PHP_HTTP, $PHP_HTTP)
@@
-13,9
+17,6
@@
PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support]
PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
[ --with-http-magic-mime[=LIBMAGICDIR]
HTTP: with magic mime response content type guessing], "no", "no")
PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
[ --with-http-magic-mime[=LIBMAGICDIR]
HTTP: with magic mime response content type guessing], "no", "no")
-PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared],
-[ --with-http-shared-deps HTTP: disable to not depend on extensions like hash,
- iconv and session (when built shared)], $PHP_HTTP, $PHP_HTTP)
if test "$PHP_HTTP" != "no"; then
if test "$PHP_HTTP" != "no"; then
@@
-177,7
+178,7
@@
dnl ----
CURL_LIBS=`$CURL_CONFIG --libs`
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_LIBS=`$CURL_CONFIG --libs`
AC_MSG_CHECKING([for SSL support in libcurl])
- CURL_SSL=`$CURL_CONFIG --feature
s
| $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], [ ])
if test "$CURL_SSL" = "SSL"; then
AC_MSG_RESULT([yes])
AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
@@
-265,6
+266,7
@@
dnl ----
[AC_DEFINE([HAVE_CURL_MULTI_TIMEOUT], [1], [ ])], [ ],
[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
)
[AC_DEFINE([HAVE_CURL_MULTI_TIMEOUT], [1], [ ])], [ ],
[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
)
+
fi
dnl ----
fi
dnl ----
@@
-338,7
+340,8
@@
dnl ----
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_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_request_datashare_api.c http_requestdatashare_object.c"
+ http_querystring_api.c http_request_datashare_api.c http_requestdatashare_object.c \
+ http_persistent_handle_api.c"
PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
@@
-357,7
+360,8
@@
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_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_request_datashare_api.h php_http_requestdatashare_object.h"
+ php_http_cookie_api.h php_http_querystring_api.h php_http_request_datashare_api.h php_http_requestdatashare_object.h \
+ php_http_persistent_handle_api.h"
ifdef([PHP_INSTALL_HEADERS], [
PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
], [
ifdef([PHP_INSTALL_HEADERS], [
PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
], [