iliaa Wed Dec 6 18:40:55 2006 UTC
Modified files:
/php-src/ext/curl interface.c
Log:
Final set of unicode changes
http://cvs.php.net/viewvc.cgi/php-src/ext/curl/interface.c?r1=1.97&r2=1.98&diff_format=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.97 php-src/ext/curl/interface.c:1.98
--- php-src/ext/curl/interface.c:1.97 Wed Dec 6 17:52:11 2006
+++ php-src/ext/curl/interface.c Wed Dec 6 18:40:55 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.97 2006/12/06 17:52:11 iliaa Exp $ */
+/* $Id: interface.c,v 1.98 2006/12/06 18:40:55 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -957,14 +957,17 @@
error = call_user_function(EG(function_table), NULL, func, retval, 2,
argv TSRMLS_CC);
if (error == FAILURE) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Could not call the
CURLOPT_PASSWDFUNCTION");
- } else if (Z_TYPE_P(retval) == IS_STRING) {
+ } else if (Z_TYPE_P(retval) == IS_STRING || Z_TYPE_(retval) ==
IS_UNICODE) {
+ if (Z_TYPE_(retval) == IS_UNICODE) {
+ convert_to_string_ex(retval);
+ }
if (Z_STRLEN_P(retval) > buflen) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Returned
password is too long for libcurl to handle");
} else {
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 '%v'
did not return a string", func);
}
zval_ptr_dtor(&argv[0]);
@@ -1426,12 +1429,13 @@
struct HttpPost *first = NULL;
struct HttpPost *last = NULL;
char *postval;
- char *string_key = NULL;
- ulong num_key;
- uint string_key_len;
+ zstr string_key;
+ char *key;
+ ulong num_key;
+ uint string_key_len;
postfields = HASH_OF(*zvalue);
- if (! postfields) {
+ if (!postfields) {
php_error_docref(NULL TSRMLS_CC,
E_WARNING, "Couldn't get HashTable in CURLOPT_POSTFIELDS");
RETVAL_FALSE;
return 1;
@@ -1449,6 +1453,23 @@
postval = Z_STRVAL_PP(current);
+ switch
(zend_hash_get_current_key_ex(postfields, &string_key, &string_key_len,
&num_key, 0, NULL)) {
+ case HASH_KEY_IS_UNICODE:
+ key =
zend_unicode_to_ascii(string_key.u, string_key_len TSRMLS_CC);
+ if (!key) {
+
php_error_docref(NULL TSRMLS_CC, E_WARNING, "Binary or ASCII-Unicode string
expected, non-ASCII-Unicode string received");
+ continue;
+ }
+ break;
+ case HASH_KEY_IS_STRING:
+ key = string_key.s;
+ break;
+ case HASH_KEY_IS_LONG:
+ key = NULL;
+ string_key_len = 0;
+ break;
+ }
+
/* The arguments after _NAMELENGTH and
_CONTENTSLENGTH
* must be explicitly cast to long in
curl_formadd
* use since curl needs a long not an
int. */
@@ -1460,13 +1481,13 @@
return 1;
}
error = curl_formadd(&first,
&last,
-
CURLFORM_COPYNAME, string_key,
+
CURLFORM_COPYNAME, key,
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_FILE, postval,
CURLFORM_END);
} else {
error = curl_formadd(&first,
&last,
-
CURLFORM_COPYNAME, string_key,
+
CURLFORM_COPYNAME, key,
CURLFORM_NAMELENGTH, (long)string_key_len - 1,
CURLFORM_COPYCONTENTS, postval,
CURLFORM_CONTENTSLENGTH, (long)Z_STRLEN_PP(current),
@@ -1579,7 +1600,7 @@
}
}
-/* {{{ proto bool curl_setopt(resource ch, int option, mixed value)
+/* {{{ proto bool curl_setopt(resource ch, int option, mixed value) U
Set an option for a cURL transfer */
PHP_FUNCTION(curl_setopt)
{
@@ -1601,7 +1622,7 @@
}
/* }}} */
-/* {{{ proto bool curl_setopt_array(resource ch, array options)
+/* {{{ proto bool curl_setopt_array(resource ch, array options) U
Set an array of option for a cURL transfer */
PHP_FUNCTION(curl_setopt_array)
{
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
