Re: Re: cvs: php-src(PHP_5_3) /ext/iconv iconv.c

Ilia, do you still see any problem merging this to 5.2? Moriyoshi On Sat, Apr 11, 2009 at 6:16 PM, Hannes Magnusson <hannes.magnusson@gmail.com> wrote: > Ilia? > > I guess the chances of getting this merged Moriyoshi will increase by > 100% if you have a testcase.. > > -Hannes > > On Tue, Mar 17, 2009 at 07:31, Moriyoshi Koizumi <moriyoshi@php.net> wrote: >> moriyoshi               Tue Mar 17 05:31:04 2009 UTC >> >>  Modified files:              (Branch: PHP_5_3) >>    /php-src/ext/iconv  iconv.c >>  Log: >>  - MFH: 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. >> >>  # 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. >> >> >> >> >> http://cvs.php.net/viewvc.cgi/php-src/ext/iconv/iconv.c?r1=1.124.2.8.2..20.2.13&r2=1.124.2.8.2.20.2.14&diff_format=u >> Index: php-src/ext/iconv/iconv.c >> diff -u php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.13 >> php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.14 >> --- php-src/ext/iconv/iconv.c:1.124.2.8.2.20.2.13       Wed Dec 31 11:15:37 2008 >> +++ php-src/ext/iconv/iconv.c   Tue Mar 17 05:31:04 2009 >> @@ -18,7 +18,7 @@ >>    +----------------------------------------------------------------------+ >>  */ >> >> -/* $Id: iconv.c,v 1.124.2.8.2.20.2.13 2008/12/31 11:15:37 sebastian Exp $ */ >> +/* $Id: iconv.c,v 1.124.2.8.2.20.2.14 2009/03/17 05:31:04 moriyoshi Exp $ */ >> >>  #ifdef HAVE_CONFIG_H >>  #include "config.h" >> @@ -2759,7 +2759,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; >> >> >> >> -- >> PHP CVS Mailing List (http://www.php.net/) >> To unsubscribe, visit: http://www.php.net/unsub.php >> >> > > -- > PHP Internals - PHP Runtime Development Mailing List > To unsubscribe, visit: http://www.php.net/unsub.php > >