dmitry Wed Jul 11 15:17:59 2007 UTC Modified files: /php-src/main/streams memory.c Log: Unicode support http://cvs.php.net/viewvc.cgi/php-src/main/streams/memory.c?r1=1.34&r2=1.35&diff_format=u Index: php-src/main/streams/memory.c diff -u php-src/main/streams/memory.c:1.34 php-src/main/streams/memory.c:1.35 --- php-src/main/streams/memory.c:1.34 Thu Feb 22 23:25:36 2007 +++ php-src/main/streams/memory.c Wed Jul 11 15:17:59 2007 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: memory.c,v 1.34 2007/02/22 23:25:36 helly Exp $ */ +/* $Id: memory.c,v 1.35 2007/07/11 15:17:59 dmitry Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -640,11 +640,11 @@ MAKE_STD_ZVAL(meta); array_init(meta); if (!semi) { /* there is only a mime type */ - add_ascii_assoc_stringl(meta, "mediatype", path, mlen, 1); + add_ascii_assoc_ascii_stringl(meta, "mediatype", path, mlen, 1); mlen = 0; } else if (sep && sep < semi) { /* there is a mime type */ plen = semi - path; - add_ascii_assoc_stringl(meta, "mediatype", path, plen, 1); + add_ascii_assoc_ascii_stringl(meta, "mediatype", path, plen, 1); mlen -= plen; path += plen; } else if (semi != path || mlen != sizeof(";base64")-1 || memcmp(path, ";base64", sizeof(";base64")-1)) { /* must be error since parameters are only allowed after mediatype */ @@ -674,7 +674,7 @@ plen = sep - path; vlen = (semi ? semi - sep : mlen - plen) - 1 /* '=' */; key = estrndup(path, plen); - add_rt_assoc_stringl_ex(meta, key, plen + 1, sep + 1, vlen, 1); + add_rt_assoc_rt_stringl_ex(meta, key, plen + 1, sep + 1, vlen, 1); efree(key); plen += vlen + 1; mlen -= plen;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php