Xinchen Hui
e637ead6ed
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-24 13:45:32 +08:00
Xinchen Hui
e6b46dc2ff
Fixed bug #70960 (ReflectionFunction for array_unique returns wrong number of parameters)
2015-11-24 13:45:16 +08:00
Xinchen Hui
fd545f4f44
Also fixed 'r'
2015-11-24 11:48:03 +08:00
Xinchen Hui
3e0b2ba5d8
Indent (not sure why it was messed)
2015-11-24 11:08:30 +08:00
Xinchen Hui
31b4581c45
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
2015-11-24 11:05:56 +08:00
Xinchen Hui
91fb1edbbf
Fixed bug #70963 (Unserialize shows UNKNOW in result)
...
Thanks to ryat for reportinig
2015-11-24 11:04:42 +08:00
Côme Bernigaud
e6759644ec
Revert "Added back support for undocummented host:port syntax"
...
This reverts commit 15876e85e5
2015-11-24 03:45:21 +01:00
Côme Bernigaud
5a8bcf73ba
Revert "Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)"
...
This reverts commit 391087ed28
2015-11-24 03:45:17 +01:00
Xinchen Hui
7e9f416218
Fixed bug #70959 (ArrayObject unserialize does not restore protected fields)
2015-11-23 23:15:33 +08:00
Xinchen Hui
801e46d8c0
Add test for bug (count on symbol table)
...
I should have do this ....
2015-11-23 06:21:30 -08:00
Xinchen Hui
6313e16a04
Improved fix for bug (count on symbol table)
2015-11-23 06:12:03 -08:00
Xinchen Hui
8c51578c81
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-23 18:48:51 +08:00
Xinchen Hui
b9845e5006
Add bug #70957 and #70958 releated test in refection
2015-11-23 18:48:21 +08:00
Xinchen Hui
eada2aa91a
Fixed bug (count on symbol tables)
2015-11-21 20:58:29 -08:00
Xinchen Hui
519f9bc675
Fixed bug #70947 (INI parser segfault with INI_SCANNER_TYPED)
2015-11-20 06:37:38 -08:00
Xinchen Hui
64a90a6b98
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-20 15:36:26 +08:00
Xinchen Hui
b42eb16cf4
This seems better
2015-11-20 15:36:13 +08:00
Xinchen Hui
7e68d6e735
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-20 15:22:45 +08:00
Xinchen Hui
c8d6673b59
Fixed build error "undefined symbol gdJpegGetVersionString"
2015-11-20 15:22:05 +08:00
Christopher Jones
f66e25a82b
Fixed LOB implementation size_t/zend_long mismatch reported by gcov
2015-11-20 09:14:05 +11:00
Christopher Jones
8b32fe80ae
Stablize test on Windows
2015-11-20 09:13:47 +11:00
Remi Collet
6680c2b22e
Fixed bug #70940 Segfault in soep / type_to_string
2015-11-19 08:18:13 +01:00
Xinchen Hui
4f0a05ab3e
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-17 20:14:11 +08:00
Xinchen Hui
66c1f966f0
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-11-17 20:13:22 +08:00
Xinchen Hui
fba3985f23
Improve the test
2015-11-17 20:12:50 +08:00
Andrey Hristov
96406f0842
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-16 12:39:04 +01:00
Andrey Hristov
822400ef3b
News for fixed bug #68344
2015-11-16 12:38:25 +01:00
Xinchen Hui
9134f9e98f
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/mysql/php_mysql.c
2015-11-16 17:59:46 +08:00
Xinchen Hui
25439e939e
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
2015-11-16 17:00:16 +08:00
Xinchen Hui
be6fd4ba89
Fixed bug #68077 (LOAD DATA LOCAL INFILE / open_basedir restriction)
...
Actually, this only be fixed if php uses mysqlnd
2015-11-16 16:59:55 +08:00
Côme Bernigaud
15876e85e5
Added back support for undocummented host:port syntax
2015-11-16 04:50:12 +01:00
Christopher Jones
0dce4bef79
Fixed LOB mem leak reported on gcov. Also fixed unsigend comparison compile warning; and remove direct field access
2015-11-16 08:15:22 +11:00
Jakub Zelenka
3c32019989
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-15 19:13:49 +00:00
Jakub Zelenka
e5abc53701
Use the same CS for all json tests
2015-11-15 19:06:09 +00:00
Xinchen Hui
fce44a5a13
Fixed bug #70910 (extract() breaks variable references)
2015-11-13 19:39:59 -08:00
Yasuo Ohgaki
a03786f773
Use distinguishable error messages.
2015-11-13 21:25:10 +09:00
Dmitry Stogov
04526093e4
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:36:39 +03:00
Dmitry Stogov
f8bf9bd86b
Fixed bug #70900 (SoapClient systematic out of memory error)
2015-11-12 20:31:52 +03:00
Xinchen Hui
fc611a134b
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-12 14:20:03 +08:00
Côme Bernigaud
391087ed28
Using default port in ldap_connect when NULL is passed (this was the behavior prior to 5.6.11)
...
Note that passing 0 will also result in default port.
2015-11-12 07:06:05 +01:00
Xinchen Hui
82f503f587
Re-Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
...
Let's fixed this in the root instead
2015-11-11 12:32:46 +08:00
Xinchen Hui
c3260b66c9
Revert "Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)"
...
This reverts commit d6c527830e
2015-11-11 12:06:38 +08:00
Xinchen Hui
d6c527830e
Fixed bug #70249 (Segmentation fault while running PHPUnit tests on phpBB 3.2-dev)
...
Maybe we should introduce a new zend_hash_safe_apply which always reload
the ht->arData to make sure won't segfault the ht is grew?
2015-11-11 11:34:11 +08:00
Matteo Beccati
3cb3979de3
Split shmop/tests/002.phpt in two (all + non-root)
...
One of the conditions tested was expected to fail with "Permission denied",
but it doesn't when running as root. The memory segment was also leaked, hence
the split.
2015-11-10 09:10:10 +01:00
Matteo Beccati
6fa9b76342
Fix bug #70886 in shmop/tests/002.phpt
2015-11-10 09:10:10 +01:00
Jakub Zelenka
570cdc05d7
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-09 18:23:29 +00:00
Jakub Zelenka
1a12403002
Remove SNI test that trigger request to sni.velox.ch
...
This has been requested by Kaspar Brand who provides
sni.velox.ch. That site is only for interactive
testing and not for unit/integration/regression testing.
Although this test is run only in special cases (when
SNI_TESTS is defined) it should still be removed.
Also this test is not reliable as it depends on external
resources.
2015-11-09 18:11:18 +00:00
James Titcumb
bb55ac6279
Fixed typo in reflection phpt
2015-11-07 22:58:56 -08:00
Nikita Popov
bc3512c1d6
Fix various update_opN_const issues
2015-11-07 17:45:26 +01:00
Nikita Popov
9da456655c
Refactor update_op2_const
...
Combines both switches into one, to avoid having to maintain the same
opcode list twice. This also makes most of the bugs fixed by the next
commit pretty obvious.
No functional change here.
2015-11-07 17:31:09 +01:00
