From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Tue, 17 Mar 2009 05:27:00 +0000 (+0000)
Subject: - Make iconv filter accept '.' as the delimiter between encoding names as well
X-Git-Tag: php-5.4.0alpha1~191^2~4131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8938555fd56fa97d9370020325706aad2e57bee8;p=php

- 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.
---

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index f2c6b79181..cc501824b1 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -2850,7 +2850,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;