cvs: php-src /ext/iconv iconv.c
| From: | Moriyoshi Koizumi | Date: | Tue, 17 Mar 2009 05:27:00 +0000 |
| Subject: | cvs: php-src /ext/iconv iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-56565@lists.php.net to get a copy of this message | ||
moriyoshi Tue Mar 17 05:27:00 2009 UTC
Modified files:
/php-src/ext/iconv iconv.c
Log:
- Make iconv filter accept '.' as the delimiter between encoding names as well
as '/'. It's impossible to specify the filter in php://filter without this
fix.
http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.172&r2=1.173&diff_format=u
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.172 php-src/ext/iconv/iconv.c:1.173
--- php-src/ext/iconv/iconv.c:1.172 Tue Mar 10 23:39:22 2009
+++ php-src/ext/iconv/iconv.c Tue Mar 17 05:27:00 2009
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.172 2009/03/10 23:39:22 helly Exp $ */
+/* $Id: iconv.c,v 1.173 2009/03/17 05:27:00 moriyoshi Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2850,7 +2850,7 @@
return NULL;
}
++from_charset;
- if ((to_charset = strchr(from_charset, '/')) == NULL) {
+ if ((to_charset = strpbrk(from_charset, "/.")) == NULL) {
return NULL;
}
from_charset_len = to_charset - from_charset;