projects
/
m6w6
/
ext-http
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
- fix build on Debian systems where access to Curl_* functions is prohibited
[m6w6/ext-http]
/
config.m4
diff --git
a/config.m4
b/config.m4
index 0afce19355300457f472b613a18e99c9d47de18f..0339acc3e74177b5cd3f6f71e0a8197cf69b9271 100644
(file)
--- a/
config.m4
+++ b/
config.m4
@@
-6,13
+6,13
@@
PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
[ --enable-http Enable extended HTTP support])
PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support],
[ --with-http-curl-requests[=LIBCURLDIR]
[ --enable-http Enable extended HTTP support])
PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support],
[ --with-http-curl-requests[=LIBCURLDIR]
- HTTP: with cURL request support],
"yes"
)
+ HTTP: with cURL request support],
$PHP_HTTP, $PHP_HTTP
)
PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support],
[ --with-http-zlib-compression[=LIBZDIR]
PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support],
[ --with-http-zlib-compression[=LIBZDIR]
- HTTP: with zlib encodings support])
+ HTTP: with zlib encodings support]
, $PHP_HTTP, $PHP_HTTP
)
PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
[ --with-http-magic-mime[=LIBMAGICDIR]
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])
+ HTTP: with magic mime response content type guessing]
, "no", "no"
)
if test "$PHP_HTTP" != "no"; then
if test "$PHP_HTTP" != "no"; then
@@
-32,17
+32,17
@@
if test "$PHP_HTTP" != "no"; then
])
dnl -------
])
dnl -------
-dnl
NETDB.H
+dnl
HEADERS
dnl -------
dnl -------
- AC_CHECK_HEADERS([netdb.h])
+ AC_CHECK_HEADERS([netdb.h
unistd.h
])
dnl ----
dnl ZLIB
dnl ----
dnl ----
dnl ZLIB
dnl ----
- if test "$PHP_HTTP_ZLIB_
ENCODINGS
" != "no"; then
+ if test "$PHP_HTTP_ZLIB_
COMPRESSION
" != "no"; then
AC_MSG_CHECKING([for zlib.h])
ZLIB_DIR=
AC_MSG_CHECKING([for zlib.h])
ZLIB_DIR=
- for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /us
e
r/local /usr /opt; do
+ for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do
if test -f "$i/include/zlib.h"; then
ZLIB_DIR=$i
break;
if test -f "$i/include/zlib.h"; then
ZLIB_DIR=$i
break;
@@
-159,6
+159,11
@@
dnl ----
[AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ],
[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
)
[AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ],
[$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
)
+ dnl Debian suddenly (>=7.14.1-2) hides all symbols not starting with "curl"
+ PHP_CHECK_LIBRARY(curl, Curl_getFormData,
+ [AC_DEFINE([HAVE_CURL_GETFORMDATA], [1], [ ])], [ ],
+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+ )
fi
dnl ----
fi
dnl ----
@@
-231,8
+236,9
@@
dnl ----
http_api.c http_cache_api.c http_request_api.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_api.c http_cache_api.c http_request_api.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_deflatestream_object.c http_inflatestream_object.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"
PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
PHP_SUBST([HTTP_SHARED_LIBADD])
PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
PHP_SUBST([HTTP_SHARED_LIBADD])
@@
-243,7
+249,8
@@
dnl ----
php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.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_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.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_deflatestream_object.h php_http_inflatestream_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"
ifdef([PHP_INSTALL_HEADERS], [
PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
], [
ifdef([PHP_INSTALL_HEADERS], [
PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
], [