From: Rasmus Lerdorf <rasmus@php.net>
Date: Sun, 26 Jul 2009 02:12:38 +0000 (+0000)
Subject: The test for bug #46739 doesn't actually need the remote
X-Git-Tag: php-5.4.0alpha1~191^2~2970
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66e97ac0bd779e555f68f77487a9680d5283a07f;p=php

The test for bug #46739 doesn't actually need the remote
responder, so get rid of the skipif in PHP 5, and it was
broken in PHP 6 because the keys in the curl_info array
were not unicode.  All internally-generated arrays should
have unicode keys.
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index bfb73c73ea..7a9e909579 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -152,10 +152,10 @@ static void _php_curl_close(zend_rsrc_list_entry *rsrc TSRMLS_DC);
 
 #define SAVE_CURL_ERROR(__handle, __err) (__handle)->err.no = (int) __err;
 
-#define CAAL(s, v) add_assoc_long_ex(return_value, s, sizeof(s), (long) v);
-#define CAAD(s, v) add_assoc_double_ex(return_value, s, sizeof(s), (double) v);
+#define CAAL(s, v) add_ascii_assoc_long_ex(return_value, s, sizeof(s), (long) v);
+#define CAAD(s, v) add_ascii_assoc_double_ex(return_value, s, sizeof(s), (double) v);
 #define CAAS(s, v) add_ascii_assoc_string(return_value, s, (v ? v : ""), 1);
-#define CAAZ(s, v) add_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
+#define CAAZ(s, v) add_ascii_assoc_zval_ex(return_value, s, sizeof(s), (zval *) v);
 
 #if defined(PHP_WIN32) || defined(__GNUC__)
 # define php_curl_ret(__ret) RETVAL_FALSE; return __ret;