]>
granicus.if.org Git - php/log
Jakub Zelenka [Mon, 9 Nov 2015 18:25:07 +0000 (18:25 +0000)]
Merge branch 'PHP-7.0'
Jakub Zelenka [Mon, 9 Nov 2015 18:23:29 +0000 (18:23 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0
Jakub Zelenka [Mon, 9 Nov 2015 18:11:18 +0000 (18:11 +0000)]
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.
Xinchen Hui [Mon, 9 Nov 2015 09:15:05 +0000 (17:15 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 9 Nov 2015 09:14:15 +0000 (17:14 +0800)]
Fixed bug #70323 (Regression in zend_fetch_debug_backtrace() can cause segfaults)
Xinchen Hui [Mon, 9 Nov 2015 04:22:01 +0000 (12:22 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 9 Nov 2015 04:21:45 +0000 (12:21 +0800)]
Fixed bug #70624 opcache.huge_code_pages
Xinchen Hui [Mon, 9 Nov 2015 04:02:43 +0000 (12:02 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 9 Nov 2015 04:02:27 +0000 (12:02 +0800)]
Update NEWS
Xinchen Hui [Mon, 9 Nov 2015 03:58:51 +0000 (11:58 +0800)]
Merge branch 'PHP-7.0'
Caleb Champlin [Mon, 2 Nov 2015 21:58:04 +0000 (21:58 +0000)]
Make sure context is set to null to prevent use after free
Xinchen Hui [Mon, 9 Nov 2015 03:57:32 +0000 (11:57 +0800)]
Merge branch '70842-streams-segfault' of https://github.com/cchamplin/php-src
Xinchen Hui [Sun, 8 Nov 2015 07:06:47 +0000 (23:06 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 8 Nov 2015 07:06:41 +0000 (23:06 -0800)]
Merge branch 'patch-1' of https://github.com/colinodell/php-src into PHP-7.0
Xinchen Hui [Sun, 8 Nov 2015 07:03:39 +0000 (23:03 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sun, 8 Nov 2015 07:03:25 +0000 (23:03 -0800)]
manually apply the typo fix in master
Xinchen Hui [Sun, 8 Nov 2015 07:02:19 +0000 (23:02 -0800)]
Merge branch 'patch-3' of https://github.com/staabm/php-src
Xinchen Hui [Sun, 8 Nov 2015 07:01:29 +0000 (23:01 -0800)]
Merge branch 'PHP-7.0'
Lynn [Wed, 28 Oct 2015 03:21:15 +0000 (11:21 +0800)]
rm duplicate include
Xinchen Hui [Sun, 8 Nov 2015 07:01:09 +0000 (23:01 -0800)]
Merge branch 'c9n-patch-1' of https://github.com/c9n/php-src
Xinchen Hui [Sun, 8 Nov 2015 06:59:05 +0000 (22:59 -0800)]
Merge branch 'PHP-7.0'
James Titcumb [Tue, 27 Oct 2015 13:18:50 +0000 (13:18 +0000)]
Fixed typo in reflection phpt
Xinchen Hui [Sun, 8 Nov 2015 06:58:30 +0000 (22:58 -0800)]
Merge branch 'patch-1' of https://github.com/asgrim/php-src
Colin O'Dell [Sat, 7 Nov 2015 22:48:02 +0000 (17:48 -0500)]
Fix description of a BC break
Nikita Popov [Sat, 7 Nov 2015 16:50:39 +0000 (17:50 +0100)]
Merge branch 'PHP-7.0'
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
Nikita Popov [Sat, 7 Nov 2015 16:45:26 +0000 (17:45 +0100)]
Fix various update_opN_const issues
Nikita Popov [Sat, 7 Nov 2015 16:27:12 +0000 (17:27 +0100)]
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.
Xinchen Hui [Sat, 7 Nov 2015 15:43:29 +0000 (07:43 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 7 Nov 2015 15:43:18 +0000 (07:43 -0800)]
Use defined macro
Xinchen Hui [Sat, 7 Nov 2015 15:30:42 +0000 (07:30 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 7 Nov 2015 15:30:31 +0000 (07:30 -0800)]
Fixed bug #70876 (Segmentation fault when regenerating session id with strict mode)
Xinchen Hui [Sat, 7 Nov 2015 15:17:43 +0000 (07:17 -0800)]
Revert "Fixed bug #70876 Segmentation fault when regenerating session id with strict mode"
This reverts commit
0bf3ebb4ba77f38261d9cb21a205a7d31b7f85cf .
Xinchen Hui [Sat, 7 Nov 2015 14:50:43 +0000 (06:50 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Sat, 7 Nov 2015 14:50:24 +0000 (06:50 -0800)]
Fixed bug #70873 (Regression on private static properties access)
Reeze Xia [Sat, 7 Nov 2015 14:17:10 +0000 (22:17 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
C99 complain fix
Update NEWS
Fixed bug #70876 Segmentation fault when regenerating session id with strict mode
Reeze Xia [Sat, 7 Nov 2015 14:15:19 +0000 (22:15 +0800)]
C99 complain fix
Reeze Xia [Sat, 7 Nov 2015 14:10:56 +0000 (22:10 +0800)]
Update NEWS
Reeze Xia [Sat, 7 Nov 2015 13:46:21 +0000 (21:46 +0800)]
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
Nikita Popov [Sat, 7 Nov 2015 11:09:20 +0000 (12:09 +0100)]
Merge branch 'PHP-7.0'
Conflicts:
ext/opcache/Optimizer/zend_optimizer.c
Nikita Popov [Sat, 7 Nov 2015 10:48:21 +0000 (11:48 +0100)]
Don't propagate into ops that error on non-string
To properly support this make update_opN_const fallible -- they
are not always called through replace_with_const.
Nikita Popov [Sat, 7 Nov 2015 09:59:18 +0000 (10:59 +0100)]
Strip leading backslash in update_opN_const
Nikita Popov [Fri, 6 Nov 2015 22:00:39 +0000 (23:00 +0100)]
Fix update_opX_const lowercasing
It was lowering in-place.
Matteo Beccati [Sat, 7 Nov 2015 10:06:10 +0000 (11:06 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
Always remember NEWS....
Fix compile warnings about comparison of unsigned expression always being true
Bump OCI8 version
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
Matteo Beccati [Sat, 7 Nov 2015 10:05:36 +0000 (11:05 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
Matteo Beccati [Sat, 7 Nov 2015 09:35:45 +0000 (10:35 +0100)]
Fix bug #70875 Segmentation fault if wsdl has no targetNamespace attribute
Matteo Beccati [Sat, 7 Nov 2015 09:46:17 +0000 (10:46 +0100)]
Merge remote-tracking branch 'origin/PHP-5.6' into PHP-7.0
* origin/PHP-5.6:
Always remember NEWS....
Fix compile warnings about comparison of unsigned expression always being true
Bump OCI8 version
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
Anatol Belski [Fri, 6 Nov 2015 22:10:40 +0000 (23:10 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
fix decrement_function regarding bug #70863
Fixed bug #70863 Incorect logic to increment_function for proxy objects
no more dev ZEND_VERSION
Add support for IPV6_V6ONLY on sockets
Conflicts:
Zend/zend.h
Anatol Belski [Fri, 6 Nov 2015 22:08:18 +0000 (23:08 +0100)]
update NEWS
Anatol Belski [Fri, 6 Nov 2015 22:05:35 +0000 (23:05 +0100)]
fix decrement_function regarding bug #70863
Anatol Belski [Fri, 6 Nov 2015 22:03:15 +0000 (23:03 +0100)]
Fixed bug #70863 Incorect logic to increment_function for proxy objects
Anatol Belski [Fri, 6 Nov 2015 14:31:01 +0000 (15:31 +0100)]
no more dev ZEND_VERSION
Bob Weinand [Fri, 6 Nov 2015 20:41:51 +0000 (21:41 +0100)]
Add support for IPV6_V6ONLY on sockets
Christopher Jones [Fri, 6 Nov 2015 15:25:18 +0000 (02:25 +1100)]
Merge branch 'PHP-7.0'
Christopher Jones [Fri, 6 Nov 2015 15:24:17 +0000 (02:24 +1100)]
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
Christopher Jones [Fri, 6 Nov 2015 15:15:24 +0000 (02:15 +1100)]
Always remember NEWS....
Christopher Jones [Fri, 6 Nov 2015 15:14:18 +0000 (02:14 +1100)]
Fix compile warnings about comparison of unsigned expression always being true
Christopher Jones [Fri, 6 Nov 2015 15:10:57 +0000 (02:10 +1100)]
Bump OCI8 version
Christopher Jones [Fri, 6 Nov 2015 14:56:50 +0000 (01:56 +1100)]
Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)
Xinchen Hui [Fri, 6 Nov 2015 03:38:59 +0000 (11:38 +0800)]
Merge branch 'PHP-7.0'
Conflicts:
NEWS
Xinchen Hui [Fri, 6 Nov 2015 03:37:17 +0000 (11:37 +0800)]
Fixed bug #70868 (PCRE JIT and pattern reuse segfault)
Márcio Almada [Fri, 6 Nov 2015 01:20:49 +0000 (22:20 -0300)]
add failing test for bug #70868
Anatol Belski [Thu, 5 Nov 2015 21:51:43 +0000 (22:51 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Anatol Belski [Thu, 5 Nov 2015 21:51:25 +0000 (22:51 +0100)]
update NEWS
Anatol Belski [Thu, 5 Nov 2015 21:44:38 +0000 (22:44 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
use Z* macro name
Anatol Belski [Thu, 5 Nov 2015 21:39:10 +0000 (22:39 +0100)]
use Z* macro name
Anatol Belski [Thu, 5 Nov 2015 21:25:56 +0000 (22:25 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix NULL deref in mbstring post handler
fix NULL deref in pdo_firebird
Anatol Belski [Thu, 5 Nov 2015 21:24:47 +0000 (22:24 +0100)]
fix NULL deref in mbstring post handler
Anatol Belski [Thu, 5 Nov 2015 21:11:00 +0000 (22:11 +0100)]
fix NULL deref in pdo_firebird
ref #70862
Anatol Belski [Thu, 5 Nov 2015 21:06:59 +0000 (22:06 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix pdo_sqlite crash with empty bound stream
fix leak
Anatol Belski [Thu, 5 Nov 2015 20:50:34 +0000 (21:50 +0100)]
fix pdo_sqlite crash with empty bound stream
Anatol Belski [Thu, 5 Nov 2015 20:49:21 +0000 (21:49 +0100)]
fix leak
Anatol Belski [Thu, 5 Nov 2015 20:34:12 +0000 (21:34 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix pdo_mysql crash with empty bound stream param
Anatol Belski [Thu, 5 Nov 2015 20:32:31 +0000 (21:32 +0100)]
fix pdo_mysql crash with empty bound stream param
rel #70862
Anatol Belski [Thu, 5 Nov 2015 18:51:18 +0000 (19:51 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
add test for bug #70861
Fix setting of empty string resource.
fix possible NULL deref in image functions
Anatol Belski [Thu, 5 Nov 2015 18:48:08 +0000 (19:48 +0100)]
add test for bug #70861
Fabian Franz [Thu, 5 Nov 2015 18:21:45 +0000 (18:21 +0000)]
Fix setting of empty string resource.
Anatol Belski [Thu, 5 Nov 2015 17:16:32 +0000 (18:16 +0100)]
fix possible NULL deref in image functions
Anatol Belski [Thu, 5 Nov 2015 17:10:14 +0000 (18:10 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix crash in sqlite when executing with bound stream param
Anatol Belski [Thu, 5 Nov 2015 17:08:08 +0000 (18:08 +0100)]
fix crash in sqlite when executing with bound stream param
rel #70862
Anatol Belski [Thu, 5 Nov 2015 13:49:25 +0000 (14:49 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
re-update NEWS
update the actual sql parser file for #70861
Fix bug #70861 Segmentation fault in pdo_parse_params() during Drupal 8 test suite
don't get invalid chmod mode through
zero cwd buffer before passing to chmod
Anatol Belski [Thu, 5 Nov 2015 13:48:30 +0000 (14:48 +0100)]
re-update NEWS
Anatol Belski [Thu, 5 Nov 2015 13:45:09 +0000 (14:45 +0100)]
update the actual sql parser file for #70861
Anatol Belski [Thu, 5 Nov 2015 13:35:41 +0000 (14:35 +0100)]
Fix bug #70861 Segmentation fault in pdo_parse_params() during Drupal 8 test suite
Anatol Belski [Thu, 5 Nov 2015 10:58:44 +0000 (11:58 +0100)]
don't get invalid chmod mode through
Anatol Belski [Wed, 4 Nov 2015 21:29:27 +0000 (22:29 +0100)]
zero cwd buffer before passing to chmod
Reeze Xia [Thu, 5 Nov 2015 06:30:20 +0000 (14:30 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Make test for bug #70852 to cover all cases
Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.
Reeze Xia [Thu, 5 Nov 2015 06:28:49 +0000 (14:28 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Make test for bug #70852 to cover all cases
Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.
Reeze Xia [Thu, 5 Nov 2015 06:09:24 +0000 (14:09 +0800)]
Make test for bug #70852 to cover all cases
Reeze Xia [Thu, 5 Nov 2015 05:46:03 +0000 (13:46 +0800)]
Fixed bug #70852 Segfault getting NULL offset of an ArrayObject.
Xinchen Hui [Wed, 4 Nov 2015 14:44:48 +0000 (06:44 -0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 4 Nov 2015 14:44:29 +0000 (06:44 -0800)]
Fixed bug #70853 (SplFixedArray throws exception when using ref variable as index)
Xinchen Hui [Wed, 4 Nov 2015 11:01:31 +0000 (19:01 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Wed, 4 Nov 2015 10:59:30 +0000 (18:59 +0800)]
Fixed bug #70843 (Segmentation fault on MacOSX with opcache.file_cache_only=1)
Xinchen Hui [Wed, 4 Nov 2015 01:56:05 +0000 (17:56 -0800)]
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_vm_execute.h
Xinchen Hui [Wed, 4 Nov 2015 01:53:56 +0000 (17:53 -0800)]
Fixed bug #70805 (Segmentation faults whilst running Drupal 8 test suite)
Caleb Champlin [Mon, 2 Nov 2015 21:58:04 +0000 (21:58 +0000)]
Make sure context is set to null to prevent use after free
Xinchen Hui [Mon, 2 Nov 2015 08:43:52 +0000 (16:43 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 2 Nov 2015 08:43:28 +0000 (16:43 +0800)]
Fixed bug #70540 (sapi/fpm/tests/008.phpt and 016.phpt should be skipped on some platforms)
Xinchen Hui [Mon, 2 Nov 2015 08:35:54 +0000 (16:35 +0800)]
Add test_fpm_conf to skip some tests ranth than mark --xfail--
Xinchen Hui [Mon, 2 Nov 2015 02:59:11 +0000 (10:59 +0800)]
Merge branch 'PHP-7.0'