1 --- php-5.4.0alpha2/configure.ac~ 2011-08-07 12:43:31.000000000 +0300
2 +++ php-5.4.0alpha2/configure.ac 2011-08-07 12:44:11.495394662 +0300
5 AC_DEFINE_UNQUOTED(PHP_OS,"$PHP_OS",[uname output])
7 +# shift so that extensions like xml are loaded first
8 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
10 PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
12 PHP_SUBST(PHP_FASTCGI_OBJS)
13 --- php-5.5.11/build/Makefile.global 2014-04-27 15:05:38.963814051 +0300
14 +++ php-5.5.11/build/Makefile.global 2014-04-27 15:09:54.438443707 +0300
19 -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
20 +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
21 +PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
22 PHP_TEST_SHARED_EXTENSIONS = ` \
23 + if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
24 + for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
25 + dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
26 + $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \
29 if test "x$(PHP_MODULES)" != "x"; then \
30 for i in $(PHP_MODULES)""; do \
31 . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \
33 TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
34 TEST_PHP_SRCDIR=$(top_srcdir) \
36 - $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
37 + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
38 + $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
39 + -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \
40 TEST_RESULT_EXIT_CODE=$$?; \
41 rm $(top_builddir)/tmp-php.ini; \
42 exit $$TEST_RESULT_EXIT_CODE; \