clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

- MFH: Make iconv filter accept '.' as the delimiter between encoding names as

Browse Source 
well as '/'. It's impossible to specify the filter in php://filter without
  this fix.

# I hope this to be merged to 5.2 as well. This doesn't break BC as there is
# no such encoding name that contains '.'. (Andif there were to be such one,
# the filter is failed in the first place since it also uses '.' for the
# delimiter between the filter name and the "from" encoding name.
This commit is contained in:
Moriyoshi Koizumi 2009-03-17 05:31:04 +00:00
parent 6f3f68311b
commit d8a22d0b05
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/iconv/iconv.c
View File

@ -2759,7 +2759,7 @@ static php_stream_filter *php_iconv_stream_filter_factory_create(const char *nam
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;