]>
Commit | Line | Data |
---|---|---|
71f4af01 ER |
1 | --- php-5.3.2/configure.in~ 2010-03-16 12:16:56.000000000 +0200 |
2 | +++ php-5.3.2/configure.in 2010-03-16 16:13:24.926435546 +0200 | |
3 | @@ -1224,6 +1224,11 @@ | |
4 | PHP_SUBST(PHP_CLI_OBJS) | |
5 | PHP_SUBST(PHP_GLOBAL_OBJS) | |
6 | ||
7 | +# shift so that pcre, spl, ... are loaded first | |
8 | +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,') | |
9 | +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,') | |
10 | +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,') | |
11 | + | |
12 | PHP_SUBST(PHP_MODULES) | |
13 | PHP_SUBST(PHP_ZEND_EX) | |
14 | ||
4e8b2de4 ER |
15 | --- php-5.3.4/Makefile.global~ 2010-12-12 23:08:32.000000000 +0200 |
16 | +++ php-5.3.4/Makefile.global 2010-12-12 23:09:31.246644108 +0200 | |
2cc4a4cc | 17 | @@ -77,7 +77,8 @@ |
71f4af01 ER |
18 | done; \ |
19 | fi | |
20 | ||
21 | -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' | |
22 | +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0' | |
2cc4a4cc | 23 | +PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre |
71f4af01 ER |
24 | PHP_TEST_SHARED_EXTENSIONS = ` \ |
25 | if test "x$(PHP_MODULES)" != "x"; then \ | |
26 | for i in $(PHP_MODULES)""; do \ | |
2cc4a4cc ER |
27 | @@ -88,6 +89,12 @@ |
28 | for i in $(PHP_ZEND_EX)""; do \ | |
29 | . $$i; $(top_srcdir)/build/shtool echo -n -- " -d $(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \ | |
30 | done; \ | |
31 | + fi; \ | |
32 | + if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \ | |
33 | + for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \ | |
34 | + dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \ | |
35 | + $(top_srcdir)/build/shtool echo -n -- " -d extension=$(EXTENSION_DIR)/$$dlname"; \ | |
36 | + done; \ | |
37 | fi` | |
38 | PHP_DEPRECATED_DIRECTIVES_REGEX = '^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*=' | |
39 | ||
4e8b2de4 | 40 | @@ -114,7 +114,10 @@ |
71f4af01 ER |
41 | TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ |
42 | TEST_PHP_SRCDIR=$(top_srcdir) \ | |
43 | CC="$(CC)" \ | |
44 | - $(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); \ | |
45 | + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \ | |
6c033b2c | 46 | + -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \ |
71f4af01 | 47 | + $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \ |
1291fa93 | 48 | + -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_SETTINGS) $(TESTS); \ |
4e8b2de4 | 49 | rm $(top_builddir)/tmp-php.ini; \ |
71f4af01 ER |
50 | else \ |
51 | echo "ERROR: Cannot run tests without CLI sapi."; \ | |
b1558782 ER |
52 | --- php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200 |
53 | +++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200 | |
54 | @@ -296,7 +296,7 @@ | |
55 | fi | |
56 | ||
57 | PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0' | |
58 | -PHP_TEST_SHARED_SYSTEM_EXTENSIONS = pcre | |
59 | +PHP_TEST_SHARED_SYSTEM_EXTENSIONS = | |
60 | PHP_TEST_SHARED_EXTENSIONS = ` \ | |
61 | if test "x$(PHP_MODULES)" != "x"; then \ | |
62 | for i in $(PHP_MODULES)""; do \ |