[PHP-CVS] cvs: php-src /ext/curl config.m4
janiSat May 2 19:53:33 2009 UTC
Modified files:
/php-src/ext/curl config.m4
Log:
- Fixed bug #48132 (configure fails to test curl ssl support if
--disable-rpath is set)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.40r2=1.41diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.40 php-src/ext/curl/config.m4:1.41
--- php-src/ext/curl/config.m4:1.40 Fri Nov 7 21:11:26 2008
+++ php-src/ext/curl/config.m4 Sat May 2 19:53:33 2009
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.40 2008/11/07 21:11:26 felipe Exp $
+dnl $Id: config.m4,v 1.41 2009/05/02 19:53:33 jani Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -7,7 +7,7 @@
dnl Temporary option while we develop this aspect of the extension
PHP_ARG_WITH(curlwrappers, if we should use cURL for url streams,
-[ --with-curlwrappers cURL: Use cURL for url streams], no, no)
+[ --with-curlwrappers Use cURL for url streams], no, no)
if test $PHP_CURL != no; then
if test -r $PHP_CURL/include/curl/easy.h; then
@@ -48,75 +48,80 @@
else
AC_MSG_ERROR(cURL version 7.10.5 or later is required to compile php with
cURL support)
fi
+
+ PHP_ADD_INCLUDE($CURL_DIR/include)
+ PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
+ PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
if test $CURL_SSL = SSL; then
- AC_MSG_RESULT([yes])
- AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
+AC_MSG_RESULT([yes])
+AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
- save_CFLAGS=$CFLAGS
- CFLAGS=`$CURL_CONFIG --cflags`
- save_LDFLAGS=$LDFLAGS
- LDFLAGS=`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR
+save_CFLAGS=$CFLAGS
+CFLAGS=`$CURL_CONFIG --cflags`
- AC_PROG_CPP
- AC_MSG_CHECKING([for openssl support in libcurl])
- AC_TRY_RUN([
-#include curl/curl.h
-int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
- }
- return 1;
-}
- ],[
-AC_MSG_RESULT([yes])
-AC_CHECK_HEADERS([openssl/crypto.h], [
- AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
+AC_PROG_CPP
+AC_MSG_CHECKING([for openssl support in libcurl])
+AC_TRY_RUN([
+#include curl/curl.h
+
+int main(int argc, char *argv[])
+{
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+
+ if (data data-ssl_version *data-ssl_version) {
+const char *ptr = data-ssl_version;
+
+while(*ptr == ' ') ++ptr;
+return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
+ }
+ return 1;
+}
+],[
+ AC_MSG_RESULT([yes])
+ AC_CHECK_HEADERS([openssl/crypto.h], [
+AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
+ ])
+], [
+ AC_MSG_RESULT([no])
+], [
+ AC_MSG_RESULT([no])
])
- ], [
-AC_MSG_RESULT([no])
- ], [
-AC_MSG_RESULT([no])
- ])
- AC_MSG_CHECKING([for gnutls support in libcurl])
- AC_TRY_RUN([
-#include curl/curl.h
-int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
- }
- return 1;
-}
- ], [
-AC_MSG_RESULT([yes])
-AC_CHECK_HEADER([gcrypt.h], [
- AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
+AC_MSG_CHECKING([for gnutls support in libcurl])
+AC_TRY_RUN([
+#include curl/curl.h
+
+int main(int argc, char *argv[])
+{
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+
+ if (data data-ssl_version *data-ssl_version) {
+const char *ptr = data-ssl_version;
+
+while(*ptr == ' ') ++ptr;
+return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
+ }
+ return 1;
+}
+], [
+ AC_MSG_RESULT([yes])
+ AC_CHECK_HEADER([gcrypt.h], [
+AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
+ ])
+], [
+ AC_MSG_RESULT([no])
+], [
+ AC_MSG_RESULT([no])
])
- ], [
-AC_MSG_RESULT([no])
- ], [
-AC_MSG_RESULT([no])
- ])
- CFLAGS=$save_CFLAGS
- LDFLAGS=$save_LDFLAGS
+CFLAGS=$save_CFLAGS
else
- AC_MSG_RESULT([no])
+AC_MSG_RESULT([no])
fi
- PHP_ADD_INCLUDE($CURL_DIR/include)
- PHP_EVAL_LIBLINE($CURL_LIBS, CURL_SHARED_LIBADD)
- PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, CURL_SHARED_LIBADD)
-
PHP_CHECK_LIBRARY(curl,curl_easy_perform,
[
AC_DEFINE(HAVE_CURL,1,[ ])
[PHP-CVS] cvs: php-src /ext/curl config.m4
felipe Fri Nov 7 21:11:26 2008 UTC Modified files: /php-src/ext/curl config.m4 Log: - Fixed bug #46521 (Curl ZTS OpenSSL, error in config.m4 fragment) Noticed by: jd at cpanel dot net http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.39r2=1.40diff_format=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.39 php-src/ext/curl/config.m4:1.40 --- php-src/ext/curl/config.m4:1.39 Fri May 25 12:48:39 2007 +++ php-src/ext/curl/config.m4 Fri Nov 7 21:11:26 2008 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.39 2007/05/25 12:48:39 mike Exp $ +dnl $Id: config.m4,v 1.40 2008/11/07 21:11:26 felipe Exp $ dnl PHP_ARG_WITH(curl, for cURL support, @@ -75,7 +75,7 @@ } ],[ AC_MSG_RESULT([yes]) -AC_CHECK_HEADER([openssl/crypto.h], [ +AC_CHECK_HEADERS([openssl/crypto.h], [ AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support]) ]) ], [ -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4
mikeFri May 25 12:48:39 2007 UTC Modified files: /php-src/ext/curl config.m4 Log: - fix typo http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.38r2=1.39diff_format=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.38 php-src/ext/curl/config.m4:1.39 --- php-src/ext/curl/config.m4:1.38 Mon May 21 13:34:39 2007 +++ php-src/ext/curl/config.m4 Fri May 25 12:48:39 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.38 2007/05/21 13:34:39 mike Exp $ +dnl $Id: config.m4,v 1.39 2007/05/25 12:48:39 mike Exp $ dnl PHP_ARG_WITH(curl, for cURL support, @@ -57,7 +57,7 @@ save_CFLAGS=$CFLAGS CFLAGS=`$CURL_CONFIG --cflags` - save_LDFLAGS=$LDFALGS + save_LDFLAGS=$LDFLAGS LDFLAGS=`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR AC_PROG_CPP -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4
mikeMon May 21 13:34:39 2007 UTC
Modified files:
/php-src/ext/curl config.m4
Log:
MFB: first check the SSL lib string in libcurl and then the header
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.37r2=1.38diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.37 php-src/ext/curl/config.m4:1.38
--- php-src/ext/curl/config.m4:1.37 Sat May 19 19:36:35 2007
+++ php-src/ext/curl/config.m4 Mon May 21 13:34:39 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.37 2007/05/19 19:36:35 mike Exp $
+dnl $Id: config.m4,v 1.38 2007/05/21 13:34:39 mike Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -60,50 +60,51 @@
save_LDFLAGS=$LDFALGS
LDFLAGS=`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR
- AC_CHECK_HEADER([openssl/crypto.h], [
-AC_MSG_CHECKING([for openssl support in libcurl])
-AC_TRY_RUN([
- #include curl/curl.h
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
- }
- return 1;
+ AC_PROG_CPP
+ AC_MSG_CHECKING([for openssl support in libcurl])
+ AC_TRY_RUN([
+#include curl/curl.h
+int main(int argc, char *argv[]) {
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+ if (data data-ssl_version *data-ssl_version) {
+ const char *ptr = data-ssl_version;
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
}
-],[
- AC_MSG_RESULT([yes])
+ return 1;
+}
+ ],[
+AC_MSG_RESULT([yes])
+AC_CHECK_HEADER([openssl/crypto.h], [
AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
-], [
- AC_MSG_RESULT([no])
-], [
- AC_MSG_RESULT([no])
])
+ ], [
+AC_MSG_RESULT([no])
+ ], [
+AC_MSG_RESULT([no])
])
- AC_CHECK_HEADER([gcrypt.h], [
-AC_MSG_CHECKING([for gnutls support in libcurl])
-AC_TRY_RUN([
- #include curl/curl.h
- int main(int argc, char *argv[]) {
- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
- if (data data-ssl_version *data-ssl_version) {
- const char *ptr = data-ssl_version;
- while(*ptr == ' ') ++ptr;
- return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
- }
- return 1;
+ AC_MSG_CHECKING([for gnutls support in libcurl])
+ AC_TRY_RUN([
+#include curl/curl.h
+int main(int argc, char *argv[]) {
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+ if (data data-ssl_version *data-ssl_version) {
+ const char *ptr = data-ssl_version;
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
}
-], [
- AC_MSG_RESULT([yes])
+ return 1;
+}
+ ], [
+AC_MSG_RESULT([yes])
+AC_CHECK_HEADER([gcrypt.h], [
AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
-], [
- AC_MSG_RESULT([no])
-], [
- AC_MSG_RESULT([no])
])
+ ], [
+AC_MSG_RESULT([no])
+ ], [
+AC_MSG_RESULT([no])
])
CFLAGS=$save_CFLAGS
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4
mikeSat May 19 19:36:35 2007 UTC Modified files: /php-src/ext/curl config.m4 Log: - fix compiler/linker agnostic runpath switch http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.36r2=1.37diff_format=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.36 php-src/ext/curl/config.m4:1.37 --- php-src/ext/curl/config.m4:1.36 Wed May 16 21:19:53 2007 +++ php-src/ext/curl/config.m4 Sat May 19 19:36:35 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.36 2007/05/16 21:19:53 mike Exp $ +dnl $Id: config.m4,v 1.37 2007/05/19 19:36:35 mike Exp $ dnl PHP_ARG_WITH(curl, for cURL support, @@ -58,7 +58,7 @@ save_CFLAGS=$CFLAGS CFLAGS=`$CURL_CONFIG --cflags` save_LDFLAGS=$LDFALGS - LDFLAGS=`$CURL_CONFIG --libs` -Wl,--rpath -Wl,$CURL_DIR/$PHP_LIBDIR + LDFLAGS=`$CURL_CONFIG --libs` $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR AC_CHECK_HEADER([openssl/crypto.h], [ AC_MSG_CHECKING([for openssl support in libcurl]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4
mikeWed May 16 21:19:53 2007 UTC
Modified files:
/php-src/ext/curl config.m4
Log:
MFB: r1.28.2.3.2.4
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.35r2=1.36diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.35 php-src/ext/curl/config.m4:1.36
--- php-src/ext/curl/config.m4:1.35 Fri Sep 15 15:42:39 2006
+++ php-src/ext/curl/config.m4 Wed May 16 21:19:53 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.35 2006/09/15 15:42:39 tony2001 Exp $
+dnl $Id: config.m4,v 1.36 2007/05/16 21:19:53 mike Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -52,33 +52,64 @@
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
if test $CURL_SSL = SSL; then
-AC_MSG_RESULT([yes])
-AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
-
-AC_MSG_CHECKING([for SSL library used])
-CURL_SSL_FLAVOUR=
-for i in $CURL_LIBS; do
- if test $i = -lssl; then
-CURL_SSL_FLAVOUR=openssl
-AC_MSG_RESULT([openssl])
-AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
-AC_CHECK_HEADERS([openssl/crypto.h])
-break
- elif test $i = -lgnutls; then
-CURL_SSL_FLAVOUR=gnutls
-AC_MSG_RESULT([gnutls])
-AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
-AC_CHECK_HEADERS([gcrypt.h])
-break
- fi
-done
-if test -z $CURL_SSL_FLAVOUR; then
- AC_MSG_RESULT([unknown!])
- AC_MSG_WARN([Could not determine the type of SSL library used!])
- AC_MSG_WARN([Building will fail in ZTS mode!])
-fi
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
+
+ save_CFLAGS=$CFLAGS
+ CFLAGS=`$CURL_CONFIG --cflags`
+ save_LDFLAGS=$LDFALGS
+ LDFLAGS=`$CURL_CONFIG --libs` -Wl,--rpath -Wl,$CURL_DIR/$PHP_LIBDIR
+
+ AC_CHECK_HEADER([openssl/crypto.h], [
+AC_MSG_CHECKING([for openssl support in libcurl])
+AC_TRY_RUN([
+ #include curl/curl.h
+ int main(int argc, char *argv[]) {
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+ if (data data-ssl_version *data-ssl_version) {
+ const char *ptr = data-ssl_version;
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, OpenSSL, sizeof(OpenSSL)-1);
+ }
+ return 1;
+ }
+],[
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
+], [
+ AC_MSG_RESULT([no])
+], [
+ AC_MSG_RESULT([no])
+])
+ ])
+
+ AC_CHECK_HEADER([gcrypt.h], [
+AC_MSG_CHECKING([for gnutls support in libcurl])
+AC_TRY_RUN([
+ #include curl/curl.h
+ int main(int argc, char *argv[]) {
+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW);
+ if (data data-ssl_version *data-ssl_version) {
+ const char *ptr = data-ssl_version;
+ while(*ptr == ' ') ++ptr;
+ return strncasecmp(ptr, GnuTLS, sizeof(GnuTLS)-1);
+ }
+ return 1;
+ }
+], [
+ AC_MSG_RESULT([yes])
+ AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
+], [
+ AC_MSG_RESULT([no])
+], [
+ AC_MSG_RESULT([no])
+])
+ ])
+
+ CFLAGS=$save_CFLAGS
+ LDFLAGS=$save_LDFLAGS
else
-AC_MSG_RESULT([no])
+ AC_MSG_RESULT([no])
fi
PHP_ADD_INCLUDE($CURL_DIR/include)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4 streams.c
tony2001Fri Sep 15 13:43:55 2006 UTC
Modified files:
/php-src/ext/curl streams.c config.m4
Log:
fix #38844 (curl_easy_strerror() is defined only since cURL 7.12.0)
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.22r2=1.23diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.22 php-src/ext/curl/streams.c:1.23
--- php-src/ext/curl/streams.c:1.22 Wed Aug 30 18:21:27 2006
+++ php-src/ext/curl/streams.c Fri Sep 15 13:43:55 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: streams.c,v 1.22 2006/08/30 18:21:27 iliaa Exp $ */
+/* $Id: streams.c,v 1.23 2006/09/15 13:43:55 tony2001 Exp $ */
/* This file implements cURL based wrappers.
* NOTE: If you are implementing your own streams that are intended to
@@ -445,7 +445,9 @@
if (msg-data.result == CURLE_OK) {
continue;
} else {
+#if HAVE_CURL_EASY_STRERROR
php_error_docref(NULL TSRMLS_CC, E_WARNING,
%s, curl_easy_strerror(msg-data.result));
+#endif
msg_found++;
}
}
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.33r2=1.34diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.33 php-src/ext/curl/config.m4:1.34
--- php-src/ext/curl/config.m4:1.33 Sat Sep 9 20:03:55 2006
+++ php-src/ext/curl/config.m4 Fri Sep 15 13:43:55 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.33 2006/09/09 20:03:55 bjori Exp $
+dnl $Id: config.m4,v 1.34 2006/09/15 13:43:55 tony2001 Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -101,6 +101,14 @@
$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
])
+ PHP_CHECK_LIBRARY(curl,curl_easy_strerror,
+ [
+AC_DEFINE(HAVE_CURL_EASY_STRERROR,1,[ ])
+ ],[],[
+$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR
+ ])
+
+
if test $PHP_CURLWRAPPERS != no ; then
AC_DEFINE(PHP_CURL_URL_WRAPPERS,1,[ ])
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4 streams.c
tony2001Fri Sep 15 15:42:39 2006 UTC
Modified files:
/php-src/ext/curl streams.c config.m4
Log:
missing part of the fix for #38844
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.24r2=1.25diff_format=u
Index: php-src/ext/curl/streams.c
diff -u php-src/ext/curl/streams.c:1.24 php-src/ext/curl/streams.c:1.25
--- php-src/ext/curl/streams.c:1.24 Fri Sep 15 15:33:30 2006
+++ php-src/ext/curl/streams.c Fri Sep 15 15:42:39 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: streams.c,v 1.24 2006/09/15 15:33:30 tony2001 Exp $ */
+/* $Id: streams.c,v 1.25 2006/09/15 15:42:39 tony2001 Exp $ */
/* This file implements cURL based wrappers.
* NOTE: If you are implementing your own streams that are intended to
@@ -434,7 +434,11 @@
}
if (m != CURLM_OK) {
+#if HAVE_CURL_MULTI_STRERROR
php_error_docref(NULL TSRMLS_CC, E_WARNING, %s,
curl_multi_strerror(m));
+#else
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, There was
an error mcode=%d, m);
+#endif
php_stream_close(stream);
return NULL;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.34r2=1.35diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.34 php-src/ext/curl/config.m4:1.35
--- php-src/ext/curl/config.m4:1.34 Fri Sep 15 13:43:55 2006
+++ php-src/ext/curl/config.m4 Fri Sep 15 15:42:39 2006
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.34 2006/09/15 13:43:55 tony2001 Exp $
+dnl $Id: config.m4,v 1.35 2006/09/15 15:42:39 tony2001 Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
@@ -108,6 +108,12 @@
$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
+ ])
if test $PHP_CURLWRAPPERS != no ; then
AC_DEFINE(PHP_CURL_URL_WRAPPERS,1,[ ])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4 config.w32 interface.c
bjori Sat Sep 9 20:03:55 2006 UTC
Modified files:
/php-src/ext/curl config.m4 config.w32 interface.c
Log:
Be overly picky: CURL-cURL
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.m4?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.32 php-src/ext/curl/config.m4:1.33
--- php-src/ext/curl/config.m4:1.32 Tue Nov 22 22:54:22 2005
+++ php-src/ext/curl/config.m4 Sat Sep 9 20:03:55 2006
@@ -1,19 +1,19 @@
dnl
-dnl $Id: config.m4,v 1.32 2005/11/22 22:54:22 tony2001 Exp $
+dnl $Id: config.m4,v 1.33 2006/09/09 20:03:55 bjori Exp $
dnl
PHP_ARG_WITH(curl, for cURL support,
[ --with-curl[=DIR] Include cURL support])
dnl Temporary option while we develop this aspect of the extension
-PHP_ARG_WITH(curlwrappers, if we should use CURL for url streams,
+PHP_ARG_WITH(curlwrappers, if we should use cURL for url streams,
[ --with-curlwrappers cURL: Use cURL for url streams], no, no)
if test $PHP_CURL != no; then
if test -r $PHP_CURL/include/curl/easy.h; then
CURL_DIR=$PHP_CURL
else
-AC_MSG_CHECKING(for CURL in default path)
+AC_MSG_CHECKING(for cURL in default path)
for i in /usr/local /usr; do
if test -r $i/include/curl/easy.h; then
CURL_DIR=$i
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/config.w32?r1=1.4r2=1.5diff_format=u
Index: php-src/ext/curl/config.w32
diff -u php-src/ext/curl/config.w32:1.4 php-src/ext/curl/config.w32:1.5
--- php-src/ext/curl/config.w32:1.4 Tue Oct 25 14:29:07 2005
+++ php-src/ext/curl/config.w32 Sat Sep 9 20:03:55 2006
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.4 2005/10/25 14:29:07 mike Exp $
+// $Id: config.w32,v 1.5 2006/09/09 20:03:55 bjori Exp $
// vim:ft=javascript
-ARG_WITH(curl, CURL support, no);
+ARG_WITH(curl, cURL support, no);
if (PHP_CURL != no) {
if (CHECK_LIB(libcurl.lib, curl, PHP_CURL)
@@ -11,8 +11,8 @@
CHECK_LIB(zlib.lib, curl, PHP_CURL)
CHECK_LIB(winmm.lib, curl, PHP_CURL)) {
EXTENSION(curl, interface.c multi.c streams.c);
- AC_DEFINE('HAVE_CURL', 1, 'Have CURL library');
- AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in CURL');
+ AC_DEFINE('HAVE_CURL', 1, 'Have cURL library');
+ AC_DEFINE('HAVE_CURL_SSL', 1, 'Have SSL suppurt in cURL');
// TODO: check for curl_version_info
// AC_DEFINE('PHP_CURL_URL_WRAPPERS', 0, 'Use curl for URL
wrappers [experimental]');
} else {
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.88r2=1.89diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.88 php-src/ext/curl/interface.c:1.89
--- php-src/ext/curl/interface.c:1.88 Tue Aug 29 17:10:52 2006
+++ php-src/ext/curl/interface.cSat Sep 9 20:03:55 2006
@@ -16,7 +16,7 @@
+--+
*/
-/* $Id: interface.c,v 1.88 2006/08/29 17:10:52 iliaa Exp $ */
+/* $Id: interface.c,v 1.89 2006/09/09 20:03:55 bjori Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -330,8 +330,8 @@
PHP_MINFO_FUNCTION(curl)
{
php_info_print_table_start();
- php_info_print_table_row(2, CURL support,enabled);
- php_info_print_table_row(2, CURL Information, curl_version());
+ php_info_print_table_row(2, cURL support,enabled);
+ php_info_print_table_row(2, cURL Information, curl_version());
php_info_print_table_end();
}
/* }}} */
@@ -1052,7 +1052,7 @@
/* }}} */
/* {{{ proto resource curl_init([string url])
- Initialize a CURL session */
+ Initialize a cURL session */
PHP_FUNCTION(curl_init)
{
zval **url;
@@ -1555,7 +1555,7 @@
}
/* {{{ proto bool curl_setopt(resource ch, int option, mixed value)
- Set an option for a CURL transfer */
+ Set an option for a cURL transfer */
PHP_FUNCTION(curl_setopt)
{
zval **zid, **zoption, **zvalue;
@@ -1578,7 +1578,7 @@
/* }}} */
/* {{{ proto bool curl_setopt_array(resource ch, array options)
- Set an array of option for a CURL transfer */
+ Set an array of option for a cURL transfer */
PHP_FUNCTION(curl_setopt_array)
{
zval*zid, *arr, **entry;
@@ -1627,7 +1627,7 @@
/* }}} */
/* {{{ proto bool curl_exec(resource ch)
- Perform a CURL session */
+ Perform a cURL session */
PHP_FUNCTION(curl_exec)
{
zval **zid;
@@ -1848,7 +1848,7 @@
/* }}} */
/* {{{ proto void curl_close(resource ch)
- Close a CURL session */
+ Close a cURL session */
PHP_FUNCTION(curl_close)
{
zval **zid;
@@ -1861,7 +1861,7 @@
ZEND_FETCH_RESOURCE(ch, php_curl *, zid, -1, le_curl_name, le_curl);
if (ch-in_callback) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, Attempt to close
CURL handle from a callback);
+ php_error_docref(NULL
[PHP-CVS] cvs: php-src /ext/curl config.m4
tony2001Tue Nov 22 17:54:22 2005 EDT Modified files: /php-src/ext/curl config.m4 Log: MF51: fix #35341 (Fix for bug #33760 breaks build with older curl) http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.31r2=1.32ty=u Index: php-src/ext/curl/config.m4 diff -u php-src/ext/curl/config.m4:1.31 php-src/ext/curl/config.m4:1.32 --- php-src/ext/curl/config.m4:1.31 Thu Nov 10 03:04:57 2005 +++ php-src/ext/curl/config.m4 Tue Nov 22 17:54:22 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.31 2005/11/10 08:04:57 sniper Exp $ +dnl $Id: config.m4,v 1.32 2005/11/22 22:54:22 tony2001 Exp $ dnl PHP_ARG_WITH(curl, for cURL support, @@ -50,7 +50,7 @@ fi 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([HAVE_CURL_SSL], [1], [Have cURL with SSL support]) -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4
sniper Wed Oct 26 07:33:17 2005 EDT
Modified files:
/php-src/ext/curl config.m4
Log:
Fix configure
http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.29r2=1.30ty=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.29 php-src/ext/curl/config.m4:1.30
--- php-src/ext/curl/config.m4:1.29 Tue Oct 25 10:29:07 2005
+++ php-src/ext/curl/config.m4 Wed Oct 26 07:33:17 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.29 2005/10/25 14:29:07 mike Exp $
+dnl $Id: config.m4,v 1.30 2005/10/26 11:33:17 sniper Exp $
dnl
PHP_ARG_WITH(curl, for CURL support,
@@ -36,7 +36,7 @@
CURL_CONFIG=${CURL_DIR}/bin/curl-config
else
if ${CURL_DIR}/curl-config --libs /dev/null 21; then
- CURL_CONFIG=${CURL_DIR}/curl-config
+ CURL_CONFIG=${CURL_DIR}/curl-config
fi
fi
@@ -51,20 +51,20 @@
AC_MSG_CHECKING([for SSL support in libcurl])
CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
- if test $CURL_SSL == SSL; then
+ if test $CURL_SSL = SSL; then
AC_MSG_RESULT([yes])
AC_DEFINE([HAVE_CURL_SSL], [1], [Have cURL with SSL support])
AC_MSG_CHECKING([for SSL library used])
CURL_SSL_FLAVOUR=
for i in $CURL_LIBS; do
- if test $i == -lssl; then
+ if test $i = -lssl; then
CURL_SSL_FLAVOUR=openssl
AC_MSG_RESULT([openssl])
AC_DEFINE([HAVE_CURL_OPENSSL], [1], [Have cURL with OpenSSL support])
AC_CHECK_HEADERS([openssl/crypto.h])
break
- elif test $i == -lgnutls; then
+ elif test $i = -lgnutls; then
CURL_SSL_FLAVOUR=gnutls
AC_MSG_RESULT([gnutls])
AC_DEFINE([HAVE_CURL_GNUTLS], [1], [Have cURL with GnuTLS support])
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] cvs: php-src /ext/curl config.m4
rasmus Wed Feb 9 11:22:49 2005 EDT
Modified files:
/php-src/ext/curl config.m4
Log:
Fix for bug #31901
http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.26r2=1.27ty=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.26 php-src/ext/curl/config.m4:1.27
--- php-src/ext/curl/config.m4:1.26 Wed Nov 3 09:32:49 2004
+++ php-src/ext/curl/config.m4 Wed Feb 9 11:22:48 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.26 2004/11/03 14:32:49 jorton Exp $
+dnl $Id: config.m4,v 1.27 2005/02/09 16:22:48 rasmus Exp $
dnl
PHP_ARG_WITH(curl, for CURL support,
@@ -32,10 +32,10 @@
CURL_CONFIG=curl-config
AC_MSG_CHECKING(for cURL 7.10.5 or greater)
- if ${CURL_DIR}/bin/curl-config --libs print /dev/null 21; then
+ if ${CURL_DIR}/bin/curl-config --libs /dev/null 21; then
CURL_CONFIG=${CURL_DIR}/bin/curl-config
else
-if ${CURL_DIR}/curl-config --libs print /dev/null 21; then
+if ${CURL_DIR}/curl-config --libs /dev/null 21; then
CURL_CONFIG=${CURL_DIR}/curl-config
fi
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
