Re: com php-src: Merge branch 'PHP-5.6': ext/json/json.c ext/mysqlnd/mysqlnd_result.c ext/pcre/pcrelib/ChangeLog ext/spl/php_spl.c ext/standard/url.c

On Sun, Aug 17, 2014 at 7:06 PM, Peter Cowburn <petercowburn@gmail.com> wrote: > > On 17 August 2014 13:53, Lior Kaplan <kaplan@php.net> wrote: > >> Commit: 543d5eb4957b055319277263fc5219051e297359 >> Author: Lior Kaplan <kaplanlior@gmail.com> Sun, 17 Aug 2014 >> 15:53:33 +0300 >> Parents: 87afa6bdc9b310ebafec5d965734c4e467e27c6d >> 56d02d564e946a03e397297d5d5ded112eefd928 >> Branches: master >> >> Link: >> >> http://git.php.net/?p=php-src.git;a=commitdiff;h=543d5eb4957b055319277263fc5219051e297359 >> >> Log: >> Merge branch 'PHP-5.6' >> >> * PHP-5.6: >> typofixes >> >> Conflicts: >> ext/spl/php_spl.c >> >> Changed paths: >> MM ext/json/json.c >> MM ext/mysqlnd/mysqlnd_result.c >> MM ext/pcre/pcrelib/ChangeLog >> MM ext/spl/php_spl.c >> MM ext/standard/url.c >> >> >> Diff: >> diff --cc ext/spl/php_spl.c >> index 62cf6ae,3e7106e..20911c8 >> --- a/ext/spl/php_spl.c >> +++ b/ext/spl/php_spl.c >> @@@ -315,24 -326,19 +315,24 @@@ PHP_FUNCTION(spl_autoload >> RETURN_FALSE; >> } >> >> - if (file_exts == NULL) { /* autoload_extensions is not intialzed, >> set to defaults */ >> + if (file_exts == NULL) { /* autoload_extensions is not >> initialized, set to defaults */ >> > > Nice try. :) > Thanks... Fixed (again). Kaplan