php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Be overly picky: CURL->cURL

Browse Source
This commit is contained in:
Hannes Magnusson
2006-09-09 20:03:55 +00:00
parent 319a3dcb80
commit 8b427acfd0
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ext/curl/config.m4
View File

@@ -6,14 +6,14 @@ 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

6
ext/curl/config.w32
View File

@@ -1,7 +1,7 @@
// $Id$
// 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 @@ if (PHP_CURL != "no") {
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 {

16
ext/curl/interface.c
View File

@@ -330,8 +330,8 @@ ZEND_GET_MODULE (curl)
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 @@ static void alloc_curl_handle(php_curl **ch)
/* }}} */
/* {{{ proto resource curl_init([string url])
Initialize a CURL session */
Initialize a cURL session */
PHP_FUNCTION(curl_init)
{
zval **url;
@@ -1555,7 +1555,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu
}
/* {{{ 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 @@ PHP_FUNCTION(curl_setopt)
/* }}} */
/* {{{ 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 @@ void _php_curl_cleanup_handle(php_curl *ch)
/* }}} */
/* {{{ proto bool curl_exec(resource ch)
Perform a CURL session */
Perform a cURL session */
PHP_FUNCTION(curl_exec)
{
zval **zid;
@@ -1848,7 +1848,7 @@ PHP_FUNCTION(curl_errno)
/* }}} */
/* {{{ proto void curl_close(resource ch)
Close a CURL session */
Close a cURL session */
PHP_FUNCTION(curl_close)
{
zval **zid;
@@ -1861,7 +1861,7 @@ PHP_FUNCTION(curl_close)
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;
}