From 227295a4f1df63b8740aa2bdd8cdca61be738268 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 17 Jan 2006 12:18:53 +0000 Subject: Unicode stuff is changed according to decision maden on PDM. Now IS_BINRAY data type is removed and IS_STRING starts behave as IS_BINARY in unicode mode. IS_STRING is incompatible with IS_UNICODE, so ALL functions should be improved to support unicode mode. --- main/php_variables.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index fa25332b51..f59be9d86b 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -679,9 +679,7 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC) int i; for (i = 0; i < SG(request_info).argc; i++) { ALLOC_ZVAL(tmp); - Z_TYPE_P(tmp) = IS_STRING; - Z_STRLEN_P(tmp) = strlen(SG(request_info).argv[i]); - Z_STRVAL_P(tmp) = estrndup(SG(request_info).argv[i], Z_STRLEN_P(tmp)); + ZVAL_RT_STRING(tmp, SG(request_info).argv[i], 1); INIT_PZVAL(tmp); if (zend_hash_next_index_insert(Z_ARRVAL_P(arr), &tmp, sizeof(zval *), NULL) == FAILURE) { if (Z_TYPE_P(tmp) == IS_STRING) { -- cgit v1.2.1