pollita Fri Jan 5 17:29:31 2007 UTC
Modified files:
/php-src/ext/session mod_files.c
Log:
Don't bother with conversion when the converter is already UTF8
http://cvs.php.net/viewvc.cgi/php-src/ext/session/mod_files.c?r1=1.110&r2=1.111&diff_format=u
Index: php-src/ext/session/mod_files.c
diff -u php-src/ext/session/mod_files.c:1.110
php-src/ext/session/mod_files.c:1.111
--- php-src/ext/session/mod_files.c:1.110 Fri Jan 5 14:53:30 2007
+++ php-src/ext/session/mod_files.c Fri Jan 5 17:29:30 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mod_files.c,v 1.110 2007/01/05 14:53:30 sebastian Exp $ */
+/* $Id: mod_files.c,v 1.111 2007/01/05 17:29:30 pollita Exp $ */
#include "php.h"
@@ -121,8 +121,8 @@
n += key_len;
buf[n] = '\0';
- if (UG(unicode) && UG(filesystem_encoding_conv)) {
- /* If there's a cheap way to see if filesystem_encoding_conv
happens to be utf8, we should skip this reconversion */
+ if (UG(unicode) && UG(filesystem_encoding_conv) &&
+ ucnv_getType(UG(filesystem_encoding_conv)) != UCNV_UTF8) {
char *newbuf = NULL;
int newlen;
UErrorCode status = U_ZERO_ERROR;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
