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.32&r2=1.33&diff_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.4&r2=1.5&diff_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.88&r2=1.89&diff_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.c Sat 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 TSRMLS_CC, E_WARNING, "Attempt to close cURL handle from a callback"); return; }