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 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 initialzed, > set to defaults */ > Nice try. :) > - copy = pos1 = estrndup(SPL_DEFAULT_FILE_EXTENSIONS, > sizeof(SPL_DEFAULT_FILE_EXTENSIONS)-1); > + pos = SPL_DEFAULT_FILE_EXTENSIONS; > + pos_len = sizeof(SPL_DEFAULT_FILE_EXTENSIONS) - 1; > } else { > - copy = pos1 = estrndup(file_exts, file_exts_len); > - } > - lc_name = zend_str_tolower_dup(class_name, class_name_len); > - while(pos1 && *pos1 && !EG(exception)) { > - EG(return_value_ptr_ptr) = original_return_value; > - EG(opline_ptr) = original_opline_ptr; > - EG(active_op_array) = original_active_op_array; > - pos2 = strchr(pos1, ','); > - if (pos2) *pos2 = '\0'; > - if (spl_autoload(class_name, lc_name, class_name_len, pos1 > TSRMLS_CC)) { > + pos = file_exts->val; > + pos_len = file_exts->len; > + } > + > + lc_name = STR_ALLOC(class_name->len, 0); > + zend_str_tolower_copy(lc_name->val, class_name->val, > class_name->len); > + while (pos && *pos && !EG(exception)) { > + pos1 = strchr(pos, ','); > + if (pos1) { > + pos1_len = pos1 - pos; > + } else { > + pos1_len = pos_len; > + } > + if (spl_autoload(class_name, lc_name, pos, pos1_len > TSRMLS_CC)) { > found = 1; > break; /* loaded */ > } > > > -- > PHP CVS Mailing List (http://www.php.net/) > To unsubscribe, visit: http://www.php.net/unsub.php > >