Xinchen Hui
fc611a134b
Merge branch 'PHP-5.6' into PHP-7.0
2015-11-12 14:20:03 +08:00
Xinchen Hui
e4e54f33ce
Fixed bug #70898 (SIGBUS/GPF zend_mm_alloc_small (zend_alloc.c:1291))
...
Include tail \0
2015-11-12 14:18:02 +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
Anatol Belski
a1e8b74827
update NEWS
2015-11-12 01:41:59 +01:00
Anatol Belski
93240102e0
refix bug #70895
...
move this code to where it belongs, no behavior change to actual
throwing function, thus retaining compat with old ZPP
2015-11-12 01:39:02 +01:00
Anatol Belski
8eef11d317
Fixed bug Bug #70895 null ptr deref and segfault
2015-11-12 00:52:36 +01:00
Anatol Belski
a2e59e72bc
fix format macro names in UPGRADING.INTERNALS
2015-11-11 16:33:34 +01:00
Ferenc Kovacs
2777d0a1d9
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
Ensure the test fails
2015-11-11 14:59:31 +01:00
Xinchen Hui
f72c7edfa4
Ensure the test fails
2015-11-11 14:55:33 +01:00
Xinchen Hui
88fb6d90c4
Ensure the test fails
2015-11-11 19:51:33 +08:00
Anatol Belski
3517f85e47
update NEWS, patch for #70249 pulled into RC7
2015-11-11 12:20:18 +01:00
Anatol Belski
b89f451694
adjust test expectation
2015-11-11 09:47:29 +01:00
Anatol Belski
3cdc438e53
fix test filename and title
2015-11-11 09:47:24 +01:00
Ferenc Kovacs
1f39665083
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
propare for 5.6.16RC1
2015-11-11 09:21:32 +01:00
Ferenc Kovacs
b22636c838
propare for 5.6.16RC1
2015-11-11 09:20:16 +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
Bob Weinand
ccf8b54b89
Use --vex-iropt-precise-memory-exns=yes for valgrind < 3.8.0
2015-11-10 09:27:49 +01: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
Xinchen Hui
4803914ae6
Unused var
2015-11-10 15:54:32 +08:00
Dmitry Stogov
d66d1b97aa
Fixed incorrect order of free/finally on exception
2015-11-10 10:10:39 +03:00
Anatol Belski
795af791b0
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
2015-11-10 00:41:40 +01:00
Andrea Faulds
37b64de20f
Merge branch 'use_ZEND_STRL_for_builtin_types' into PHP-7.0
2015-11-09 23:40:49 +00:00
Anatol Belski
a3f1154b3d
additional catch to bug #70863
2015-11-10 00:38:11 +01:00
Anatol Belski
2e38918ba4
add test for eb32da13
2015-11-09 22:45:22 +01:00
Dmitry Stogov
c9eacb181c
Added tests
2015-11-09 23:54:09 +03:00
Anatol Belski
e029a86aad
prepare news for next
2015-11-09 19:39:02 +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
Andrea Faulds
dae37661d9
Use ZEND_STRL macro for builtin_types
2015-11-09 11:15:58 +00:00
Xinchen Hui
d70aa14f2c
Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause segfaults)
2015-11-09 17:14:15 +08:00
Xinchen Hui
0a1e199682
Fixed bug #70624 opcache.huge_code_pages
2015-11-09 12:21:45 +08:00
Xinchen Hui
12f1cfa86a
Update NEWS
2015-11-09 12:02:27 +08:00
Caleb Champlin
6ff014b31c
Make sure context is set to null to prevent use after free
2015-11-09 11:58:34 +08:00
Xinchen Hui
fe12492480
Merge branch 'patch-1' of https://github.com/colinodell/php-src into PHP-7.0
2015-11-07 23:06:41 -08:00
Xinchen Hui
83de5364b7
manually apply the typo fix in master
2015-11-07 23:03:25 -08:00
Lynn
269674f79d
rm duplicate include
2015-11-07 23:01:23 -08:00
James Titcumb
bb55ac6279
Fixed typo in reflection phpt
2015-11-07 22:58:56 -08:00
Colin O'Dell
55abf6dfb2
Fix description of a BC break
2015-11-07 17:48:02 -05: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
Xinchen Hui
de8bfb32bd
Use defined macro
2015-11-07 07:43:18 -08:00
Xinchen Hui
e9fd8ad446
Fixed bug #70876 (Segmentation fault when regenerating session id with strict mode)
2015-11-07 07:30:31 -08:00
Xinchen Hui
148bb622fa
Revert "Fixed bug #70876 Segmentation fault when regenerating session id with strict mode"
...
This reverts commit 0bf3ebb4ba
2015-11-07 07:17:43 -08:00
Xinchen Hui
2d8d97cee2
Fixed bug #70873 (Regression on private static properties access)
2015-11-07 06:50:36 -08:00
Reeze Xia
c524f43e4f
C99 complain fix
2015-11-07 22:15:19 +08:00
Reeze Xia
e4c1e90536
Update NEWS
2015-11-07 22:10:56 +08:00
Reeze Xia
0bf3ebb4ba
Fixed bug #70876 Segmentation fault when regenerating session id with strict mode
...
The comment *mod_data always be non-NULL is not true.
The same as this FIXME: https://github.com/php/php-src/blob/master/ext/session/mod_files.c#L676
2015-11-07 21:46:21 +08:00
