From: Hannes Magnusson <bjori@php.net>
Date: Sat, 9 Sep 2006 20:04:50 +0000 (+0000)
Subject: CURL->cURL
X-Git-Tag: php-5.2.0RC4~59
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef4ff6fe9e72006cf0926855e3f0f26a288ab282;p=php

CURL->cURL
---

diff --git a/ext/curl/config.m4 b/ext/curl/config.m4
index fdea836c92..c93c118d1b 100644
--- a/ext/curl/config.m4
+++ b/ext/curl/config.m4
@@ -2,18 +2,18 @@ dnl
 dnl $Id$ 
 dnl
 
-PHP_ARG_WITH(curl, for CURL support,
-[  --with-curl[=DIR]       Include CURL support])
+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,
-[  --with-curlwrappers     Use CURL for url streams], no, no)
+PHP_ARG_WITH(curlwrappers, if we should use cURL for url streams,
+[  --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
     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
diff --git a/ext/curl/config.w32 b/ext/curl/config.w32
index b4444190c8..ce84041390 100644
--- a/ext/curl/config.w32
+++ b/ext/curl/config.w32
@@ -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 {
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index dccba1ae49..008f8ad1e6 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -332,8 +332,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();
 }
 /* }}} */
@@ -1054,7 +1054,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;
@@ -1557,7 +1557,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;
@@ -1580,7 +1580,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;
@@ -1629,7 +1629,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;
@@ -1850,7 +1850,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;
@@ -1863,7 +1863,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;
 	}