cvs: php4 /ext/iconv iconv.c
| From: | Moriyoshi Koizumi | Date: | Fri, 03 Jan 2003 05:38:51 +0000 |
| Subject: | cvs: php4 /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-17552@lists.php.net to get a copy of this message | ||
moriyoshi Fri Jan 3 00:38:51 2003 EDT
Modified files:
/php4/ext/iconv iconv.c
Log:
Fixed iconv_mime_decode() so it would give more awareness to stateful codesets
Index: php4/ext/iconv/iconv.c
diff -u php4/ext/iconv/iconv.c:1.73 php4/ext/iconv/iconv.c:1.74
--- php4/ext/iconv/iconv.c:1.73 Fri Jan 3 00:34:05 2003
+++ php4/ext/iconv/iconv.c Fri Jan 3 00:38:50 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.73 2003/01/03 05:34:05 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.74 2003/01/03 05:38:50 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1438,6 +1438,11 @@
}
}
+ if (cd != (iconv_t)(-1)) {
+ if ((err = _php_iconv_appendl(pretval, NULL, 0, cd)) != PHP_ICONV_ERR_SUCCESS) {
+ goto out;
+ }
+ }
smart_str_0(pretval);
out:
if (cd != (iconv_t)(-1)) {