diff options
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pcre/config0.m4 | 64 | ||||
| -rw-r--r-- | ext/standard/array.c | 18 |
2 files changed, 12 insertions, 70 deletions
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 deleted file mode 100644 index 729e99e52d..0000000000 --- a/ext/pcre/config0.m4 +++ /dev/null @@ -1,64 +0,0 @@ -dnl $Id$ -dnl config.m4 for extension pcre - -dnl By default we'll compile and link against the bundled PCRE library -dnl if DIR is supplied, we'll use that for linking - -AC_MSG_CHECKING(whether to include PCRE support) -AC_ARG_WITH(pcre-regex, -[ --without-pcre-regex Do not include Perl Compatible Regular Expressions - support. Use --with-pcre-regex=DIR to specify DIR - where PCRE's include and library files are located, - if not using bundled library.], -[ - case "$withval" in - no) - AC_MSG_RESULT(no) - ;; - yes) - EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" - PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) - PHP_OUTPUT(ext/pcre/pcrelib/Makefile) - ;; - *) - if test -f $withval/pcre.h ; then - changequote({,}) - pcre_major=`grep PCRE_MAJOR $withval/pcre.h | sed -e 's/[^0-9]//g'` - pcre_minor=`grep PCRE_MINOR $withval/pcre.h | sed -e 's/[^0-9]//g'` - changequote([,]) - pcre_version=$pcre_major$pcre_minor - if test "$pcre_version" -ge 208; then - AC_ADD_INCLUDE($withval) - else - AC_MSG_ERROR(PCRE extension requires PCRE library version >= 2.08) - fi - else - AC_MSG_ERROR(Could not find pcre.h in $withval) - fi - - if test -f $withval/libpcre.a ; then - AC_ADD_LIBRARY_WITH_PATH(pcre, $withval) - else - AC_MSG_ERROR(Could not find libpcre.a in $withval) - fi - - AC_DEFINE(HAVE_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) - ;; - esac -],[ - PCRE_LIBADD=pcrelib/libpcre.la - PCRE_SUBDIRS=pcrelib - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) - PHP_OUTPUT(ext/pcre/pcrelib/Makefile) -]) -AC_SUBST(PCRE_LIBADD) -AC_SUBST(PCRE_SUBDIRS) - -AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)]) diff --git a/ext/standard/array.c b/ext/standard/array.c index cf8114a2b6..a802aeb0e3 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -57,7 +57,6 @@ function_entry array_functions[] = { PHP_FE(uksort, first_arg_force_ref) PHP_FE(shuffle, first_arg_force_ref) PHP_FE(array_walk, first_arg_force_ref) - PHP_FALIAS(sizeof, count, first_arg_allow_ref) PHP_FE(count, first_arg_allow_ref) PHP_FE(end, first_arg_force_ref) PHP_FE(prev, first_arg_force_ref) @@ -65,7 +64,6 @@ function_entry array_functions[] = { PHP_FE(reset, first_arg_force_ref) PHP_FE(current, first_arg_force_ref) PHP_FE(key, first_arg_force_ref) - PHP_FALIAS(pos, current, first_arg_force_ref) PHP_FE(min, NULL) PHP_FE(max, NULL) PHP_FE(in_array, NULL) @@ -85,6 +83,10 @@ function_entry array_functions[] = { PHP_FE(array_count_values, NULL) PHP_FE(array_reverse, NULL) PHP_FE(array_pad, NULL) + + /* Aliases */ + PHP_FALIAS(pos, current, first_arg_force_ref) + PHP_FALIAS(sizeof, count, first_arg_allow_ref) {NULL, NULL, NULL} }; @@ -102,6 +104,8 @@ zend_module_entry array_module_entry = { PHP_MINIT_FUNCTION(array) { + ELS_FETCH(); + REGISTER_LONG_CONSTANT("EXTR_OVERWRITE", EXTR_OVERWRITE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("EXTR_SKIP", EXTR_SKIP, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("EXTR_PREFIX_SAME", EXTR_PREFIX_SAME, CONST_CS | CONST_PERSISTENT); @@ -574,10 +578,12 @@ PHP_FUNCTION(reset) if (zend_hash_get_current_data(target_hash, (void **) &entry) == FAILURE) { return; } - - *return_value = **entry; - pval_copy_constructor(return_value); - INIT_PZVAL(return_value); /* XXX is this needed? */ + + if (return_value_used) { + *return_value = **entry; + pval_copy_constructor(return_value); + /* INIT_PZVAL(return_value); XXX is this needed? - No! :) */ + } } PHP_FUNCTION(current) |