Dmitry Stogov
f9927a6c97
Merge mainstream 'master' branch into refactoring
...
During merge I had to revert:
Nikita's patch for php_splice() (it probably needs to be applyed again)
Bob Weinand's patches related to constant expression handling (we need to review them carefully)
I also reverted all our attempts to support sapi/phpdbg (we didn't test it anyway)
Conflicts:
Zend/zend.h
Zend/zend_API.c
Zend/zend_ast.c
Zend/zend_compile.c
Zend/zend_compile.h
Zend/zend_constants.c
Zend/zend_exceptions.c
Zend/zend_execute.c
Zend/zend_execute.h
Zend/zend_execute_API.c
Zend/zend_hash.c
Zend/zend_highlight.c
Zend/zend_language_parser.y
Zend/zend_language_scanner.c
Zend/zend_language_scanner_defs.h
Zend/zend_variables.c
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/date/php_date.c
ext/dom/documenttype.c
ext/hash/hash.c
ext/iconv/iconv.c
ext/mbstring/tests/zend_multibyte-10.phpt
ext/mbstring/tests/zend_multibyte-11.phpt
ext/mbstring/tests/zend_multibyte-12.phpt
ext/mysql/php_mysql.c
ext/mysqli/mysqli.c
ext/mysqlnd/mysqlnd_reverse_api.c
ext/mysqlnd/php_mysqlnd.c
ext/opcache/ZendAccelerator.c
ext/opcache/zend_accelerator_util_funcs.c
ext/opcache/zend_persist.c
ext/opcache/zend_persist_calc.c
ext/pcre/php_pcre.c
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c
ext/pdo_pgsql/pgsql_driver.c
ext/pgsql/pgsql.c
ext/reflection/php_reflection.c
ext/session/session.c
ext/spl/spl_array.c
ext/spl/spl_observer.c
ext/standard/array.c
ext/standard/basic_functions.c
ext/standard/html.c
ext/standard/mail.c
ext/standard/php_array.h
ext/standard/proc_open.c
ext/standard/streamsfuncs.c
ext/standard/user_filters.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_variables.c
sapi/phpdbg/phpdbg.c
sapi/phpdbg/phpdbg_bp.c
sapi/phpdbg/phpdbg_frame.c
sapi/phpdbg/phpdbg_help.c
sapi/phpdbg/phpdbg_list.c
sapi/phpdbg/phpdbg_print.c
sapi/phpdbg/phpdbg_prompt.c
2014-04-26 00:32:51 +04:00
Dmitry Stogov
d0ed1212a4
Enable PCRE JIT compiler
2014-04-25 08:33:37 +04:00
Dmitry Stogov
affc7ab6c5
Fixed test (order of variables doesn't mater)
2014-04-11 23:04:47 +04:00
Kalle Sommer Nielsen
91aa9fbb47
Remove call_user_method() and call_user_method_array() from master, long time deprecated in favour of call_user_func*().
2014-04-05 06:43:41 +02:00
Dmitry Stogov
e82f112468
Fixed test (scalar values don't have reference counters...)
2014-03-26 00:01:33 +04:00
Dmitry Stogov
dbc68b9b88
Fixed tests (scalar don't have reference counter, other values may get different counter values)
2014-03-18 01:16:12 +04:00
Eric Stenson
50377b5bf2
Fix tests expecting specific resource IDs
...
When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself. As a
result, these tests become false positives.
On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently. This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines. Also, added a test to exercise
the 'more_entropy' variant of uniqid().
2013-12-13 10:42:32 -08:00
Jeff Welch
b4210efe76
Fixed tests that fail with non-default serialize_precision
configurations.
...
See:
* https://bugs.php.net/bug.php?id=64760
* 4dc4302
2013-11-20 06:14:32 +09:00
Xinchen Hui
de79c51555
Merge branch 'PHP-5.4' into PHP-5.5
2013-11-17 17:05:04 +08:00
Xinchen Hui
823e330c75
Fixed Bug #66094 (unregister_tick_function tries to cast a Closure to a string)
2013-11-17 17:04:37 +08:00
Ferenc Kovacs
91108818e1
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/spl/tests/SplFileObject_rewind_error001.phpt
2013-11-06 10:46:34 +01:00
ptarjan
9c1e1bbc05
fix many parallel test issues
...
While running these on HHVM I've run into a lot of parallelism issues.
I'm backporting all the fixes I had to do in
https://github.com/facebook/hiphop-php/blob/master/hphp/tools/import_zend_test.py#L650
to php core.
Most of these changes were just filenames that were shared between
tests, but I did more surgery on the fixed ports. I can apreciate port
31337 as much as the next nerd, but random ports are better for tests.
2013-11-06 10:31:47 +01:00
Yasuo Ohgaki
d04bcb8969
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:28:35 +09:00
Yasuo Ohgaki
4dc4302a30
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
2013-10-29 17:24:23 +09:00
Anatol Belski
f37ac6f591
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
added sapi check for dl() test
2013-07-16 15:43:37 +02:00
Anatol Belski
135f81c5ae
added sapi check for dl() test
2013-07-16 15:42:38 +02:00
Veres Lajos
2c73ce4363
revert false fix
2013-07-15 00:23:17 -07:00
Veres Lajos
e9a95d78ef
typo fixes
2013-07-15 00:23:03 -07:00
Veres Lajos
f23a5fbc8e
revert false fix
2013-07-15 00:19:07 -07:00
Veres Lajos
72085b0e5f
typo fixes
2013-07-15 00:18:57 -07:00
Nikita Popov
dcf0b71c98
Fix tests after addition of ^ (xor) operator to ini
2013-03-28 18:35:46 +01:00
Xinchen Hui
e081c55fb5
Merge branch 'PHP-5.3' into PHP-5.4
2012-10-10 10:31:31 +08:00
Xinchen Hui
610c7fbe7b
Remove executable permission on phpt
2012-10-10 10:27:49 +08:00
Xinchen Hui
4b152e5470
Merge branch 'PHP-5.4'
2012-10-10 10:32:38 +08:00
Xinchen Hui
8a930c93dd
Merge branch 'PHP-5.4'
2012-09-24 19:47:47 +08:00
Xinchen Hui
8cdd6bc1e7
Merge branch 'PHP-5.3' into PHP-5.4
2012-09-24 19:47:28 +08:00
Xinchen Hui
2cbc4053ae
Correct the test summary
2012-09-24 19:46:40 +08:00
Xinchen Hui
518fa8c4cf
Merge branch 'PHP-5.4'
2012-09-24 11:01:24 +08:00
Xinchen Hui
d9ad532050
Merge branch 'PHP-5.3' into PHP-5.4
...
Conflicts:
ext/standard/tests/general_functions/bug60723.phpt
2012-09-24 11:00:58 +08:00
Xinchen Hui
923511d364
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
...
Cherry pick to 5.3
2012-09-24 10:59:06 +08:00
Xinchen Hui
8fcb4f1107
Merge branch 'PHP-5.4'
2012-09-23 23:00:15 +08:00
Xinchen Hui
395d77c540
Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
2012-09-23 22:59:31 +08:00
Stanislav Malyshev
13763c76db
Merge branch 'PHP-5.4'
...
* PHP-5.4:
var_export outputs an E_WARNING when recursion is detected
2012-08-05 20:58:46 -07:00
Lonny Kapelushnik
45f3322905
var_export outputs an E_WARNING when recursion is detected
2012-08-05 20:56:06 -07:00
Xinchen Hui
ead076bac6
Fix test failed
2012-07-21 23:27:09 +08:00
Xinchen Hui
2ed4026518
Merge branch 'PHP-5.4'
...
* PHP-5.4:
skip for ZTS
2012-07-18 19:48:27 +08:00
Xinchen Hui
11d0558928
skip for ZTS
2012-07-18 19:47:54 +08:00
Xinchen Hui
44462955f8
Merge branch 'PHP-5.4'
...
* PHP-5.4:
fix test (dos2unix, typo)
2012-07-18 19:25:56 +08:00
Xinchen Hui
282a6659aa
fix test (dos2unix, typo)
2012-07-18 19:25:22 +08:00
Gustavo André dos Santos Lopes
08302e3d03
Merge branch '5.4'
...
* 5.4:
NEWS for b47d6b32
Fix test fails: ext/standard/tests/general_functions/bug27678.phpt
2012-07-17 23:13:43 +02:00
Reeze Xia
b47d6b32ba
Fix test fails: ext/standard/tests/general_functions/bug27678.phpt
...
After commit 3e62aae1
, number_format() returns string with length,
but _php_math_number_format_ex_len() didn't set string length
on nan and inf. This cause segfault when destruct the return value.
2012-07-17 23:08:11 +02:00
Jille Timmermans
74b4ef5036
Implement boolval() with a test
2012-06-06 22:34:51 +02:00
Anatoliy Belsky
b43d6c8522
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
2012-05-10 17:32:21 +02:00
Anatoliy Belsky
266578f584
Fix bug #61992 ext\standard\tests\general_functions\bug44295.phpt fails
...
Exception text differ on windows
2012-05-10 17:07:38 +02:00
Xinchen Hui
a601605f14
merge test from PHP-5.4
2012-04-30 12:33:55 +08:00
Xinchen Hui
d80a3d9668
Revert "Merge branch 'fix-pro_nice-test' of https://github.com/reeze/php-src into PHP-5.3"
...
After pushed, I found the test script in 5.4 is already fixed this, so
revert this change, and be consistent with 5.4's test
This reverts commit 24d85e4bd8
, reversing
changes made to bae56a87f8
.
2012-04-30 12:31:33 +08:00
reeze
e52be10b30
Fix test for proc_nice: bsd ps command didn't support option -o "%p %n"
2012-04-30 00:59:54 +08:00
Gustavo André dos Santos Lopes
ca58cd01fc
Cherry-pick 4cc74767
...
Headers: forbid \r and \n also after \0, allow CRLF followed by HT or SP and forbid \0. See bug #60227 .
Conflicts:
ext/standard/tests/general_functions/bug60227.phpt
ext/standard/tests/general_functions/bug60227_1.phpt
ext/standard/tests/general_functions/bug60227_2.phpt
main/SAPI.c
2012-04-04 09:59:51 +01:00
Anatoliy Belsky
2a8866ba5e
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
2012-04-03 13:24:31 +02:00
Anatoliy Belsky
14e74aeb57
Fix bug #61454 ext\standard\tests\general_functions\bug49847.phpt fails
2012-04-03 13:23:06 +02:00