bjori Sat Oct 13 11:35:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/curl interface.c
Log:
MFH: fix typo and remove dots in error message
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.62.2.14.2.28&r2=1.62.2.14.2.29&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.62.2.14.2.28
php-src/ext/curl/interface.c:1.62.2.14.2.29
--- php-src/ext/curl/interface.c:1.62.2.14.2.28 Wed Oct 3 20:34:48 2007
+++ php-src/ext/curl/interface.c Sat Oct 13 11:35:35 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.62.2.14.2.28 2007/10/03 20:34:48 mike Exp $ */
+/* $Id: interface.c,v 1.62.2.14.2.29 2007/10/13 11:35:35 bjori Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -174,7 +174,7 @@
}
\
\
if (!php_memnstr(str, tmp_url->path, strlen(tmp_url->path), str
+ len)) { \
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s'
contains unencoded control characters.", str); \
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "URL '%s'
contains unencoded control characters", str); \
php_url_free(tmp_url);
\
php_curl_ret(__ret);
\
}
\
@@ -980,7 +980,7 @@
strlcpy(buf, Z_STRVAL_P(retval), Z_STRLEN_P(retval));
}
} else {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s'
did not return a string.", Z_STRVAL_P(func));
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "User handler '%s'
did not return a string", Z_STRVAL_P(func));
}
zval_ptr_dtor(&argv[0]);
@@ -1645,7 +1645,7 @@
zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(arr), &pos);
while (zend_hash_get_current_data_ex(Z_ARRVAL_P(arr), (void **)&entry,
&pos) == SUCCESS) {
if (zend_hash_get_current_key_ex(Z_ARRVAL_P(arr), &string_key,
&str_key_len, &option, 0, &pos) == HASH_KEY_IS_STRING) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys
must be CURLOPT constants or equivalent interger values.");
+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Array keys
must be CURLOPT constants or equivalent integer values");
RETURN_FALSE;
}
if (_php_curl_setopt(ch, option, entry, return_value
TSRMLS_CC)) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
