]>
granicus.if.org Git - php/log
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)
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'
Xinchen Hui [Mon, 2 Nov 2015 02:59:07 +0000 (10:59 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Mon, 2 Nov 2015 02:58:55 +0000 (10:58 +0800)]
Fixed test
Xinchen Hui [Mon, 2 Nov 2015 02:55:33 +0000 (10:55 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Mon, 2 Nov 2015 02:55:05 +0000 (10:55 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Mon, 2 Nov 2015 02:47:32 +0000 (10:47 +0800)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
Xinchen Hui [Mon, 2 Nov 2015 02:47:02 +0000 (10:47 +0800)]
Fixed bug #70828 (php-fpm 5.6 with opcache crashes when referencing a non-existent constant)
Jakub Zelenka [Thu, 29 Oct 2015 19:11:57 +0000 (19:11 +0000)]
Use standard title for new openssl tests
root [Thu, 29 Oct 2015 14:05:54 +0000 (12:05 -0200)]
new tests to openssl module, don't covered yet.
Andrey Hristov [Tue, 27 Oct 2015 11:59:09 +0000 (12:59 +0100)]
Another Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
Added the possibility to explicitly state that the peer certificate should not be checked.
Back to the default - checking the certificate.
Exported MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
Usage : mysqli_real_connect( , , , , , MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT)
If mysqli_ssl_set() is not called, but only MYSQLI_CLIENT_SSL is passed, without the (don't) very flag,
then no verification takes place.
Xinchen Hui [Tue, 27 Oct 2015 00:29:22 +0000 (17:29 -0700)]
Merge branch 'PHP-7.0'
Xinchen Hui [Tue, 27 Oct 2015 00:28:19 +0000 (17:28 -0700)]
Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)
Xinchen Hui [Tue, 27 Oct 2015 00:26:30 +0000 (17:26 -0700)]
Revert "Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)"
This reverts commit
3ef96c2cc6f3a1dddd8479e6c733f44e8dbcb5e9 .
Xinchen Hui [Tue, 27 Oct 2015 00:11:16 +0000 (17:11 -0700)]
Merge branch 'PHP-7.0'
Leigh [Fri, 30 Oct 2015 19:11:09 +0000 (19:11 +0000)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Use arc4random on OpenBSD 5.5+ and NetBSD 7+
Leigh [Fri, 30 Oct 2015 19:08:20 +0000 (19:08 +0000)]
Use arc4random on OpenBSD 5.5+ and NetBSD 7+
As discussed with @weltling, keeping arc4random on the condition that the OS has a solid implementation of it
Dmitry Stogov [Fri, 30 Oct 2015 11:53:53 +0000 (14:53 +0300)]
Changed ZEND_CLONE->extended_value meaning to relative offset (previously it was absolute opline number)
Reeze Xia [Fri, 30 Oct 2015 11:52:03 +0000 (19:52 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
This couldn't be false as it has been checked before
Use h parameter to avoid duplicate ht access of `array_combine()`
Reeze Xia [Fri, 30 Oct 2015 11:50:54 +0000 (19:50 +0800)]
This couldn't be false as it has been checked before
Reeze Xia [Fri, 30 Oct 2015 11:49:04 +0000 (19:49 +0800)]
Use h parameter to avoid duplicate ht access of `array_combine()`
Dmitry Stogov [Thu, 29 Oct 2015 19:50:45 +0000 (22:50 +0300)]
Argument type renaming (ADDR->JMP_ADDR, OPLINE->JMP_ABS, REL_OPLINE->JMP_REL)
Dmitry Stogov [Thu, 29 Oct 2015 06:15:37 +0000 (09:15 +0300)]
Fixed few issues:
- Added ZEND_VM_LAST_OPCODE macro
- Use better names LINE->OPLINE, REL_LINE->REL_OPLINE, FCALL->FAST_CALL, FRET->FAST_RET
- Added ISSET flag to extended value of ZEND_ISSET_ISEMPTY_VAR opcode
Dmitry Stogov [Wed, 28 Oct 2015 20:25:05 +0000 (23:25 +0300)]
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
Dmitry Stogov [Fri, 30 Oct 2015 04:16:31 +0000 (07:16 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed incomplete initialization.
Dmitry Stogov [Fri, 30 Oct 2015 04:15:56 +0000 (07:15 +0300)]
Fixed incomplete initialization.
Jakub Zelenka [Thu, 29 Oct 2015 19:15:57 +0000 (19:15 +0000)]
Merge branch 'PHP-7.0'
Jakub Zelenka [Thu, 29 Oct 2015 19:14:25 +0000 (19:14 +0000)]
Merge branch 'PHP-5.6' into PHP-7.0
Dmitry Stogov [Thu, 29 Oct 2015 17:07:37 +0000 (20:07 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed memory leak in php_stream_context_set_option()
Dmitry Stogov [Thu, 29 Oct 2015 17:06:55 +0000 (20:06 +0300)]
Fixed memory leak in php_stream_context_set_option()
Xinchen Hui [Thu, 29 Oct 2015 07:02:00 +0000 (15:02 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Thu, 29 Oct 2015 07:00:43 +0000 (15:00 +0800)]
Make these tests fail faster, Thanks to GFW
Xinchen Hui [Thu, 29 Oct 2015 06:35:31 +0000 (14:35 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Thu, 29 Oct 2015 06:35:07 +0000 (14:35 +0800)]
Merge branch 'PHP-7.0'
Xinchen Hui [Thu, 29 Oct 2015 06:33:58 +0000 (14:33 +0800)]
Fixed bug #70808 (array_merge_recursive corrupts memory of unset items)
I knew, this fix seems ugly
Dmitry Stogov [Thu, 29 Oct 2015 05:45:22 +0000 (08:45 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Don't remap .text segment if huge pages are not available.
Julien Pauli [Thu, 29 Oct 2015 05:44:19 +0000 (08:44 +0300)]
Don't remap .text segment if huge pages are not available.
Dmitry Stogov [Wed, 28 Oct 2015 20:10:33 +0000 (23:10 +0300)]
Fixed incorrect instruction cleanup
Dmitry Stogov [Wed, 28 Oct 2015 13:06:08 +0000 (16:06 +0300)]
fixed incorrect bitmask
Dmitry Stogov [Wed, 28 Oct 2015 05:42:55 +0000 (08:42 +0300)]
Removed incorrect "return" statement
Dmitry Stogov [Tue, 27 Oct 2015 12:47:58 +0000 (15:47 +0300)]
Speed up fetching of class entries for self:: parent:: and static::
This is generalized solution for Bob's idea of speed up self::method() calls without ZEND_FETCH_CLASS.
At first, it adds few new opcodes to separate class related behaviour:
FETCH_STATIC_PROP_R
FETCH_STATIC_PROP_W
FETCH_STATIC_PROP_RW
FETCH_STATIC_PROP_FUNC_ARG
FETCH_STATIC_PROP_UNSET
FETCH_STATIC_PROP_IS
UNSET_STATIC_PROP
ISSET_ISEMPTY_STATIC_PROP
FETCH_CLASS_CONSTANT
At seconds, it enables IS_UNUSED operand to fetch (self, parent or static without separate FETCH_CLASS) for new opcodes and the following ones:
INIT_STATIC_METHOD_CALL
NEW
END_INSTANCEOF
Finaly, opcache optimizer had to be fixed to support new opcodes.
Andrey Hristov [Wed, 28 Oct 2015 11:56:26 +0000 (12:56 +0100)]
Merge branch 'PHP-7.0'
Andrey Hristov [Wed, 28 Oct 2015 11:55:41 +0000 (12:55 +0100)]
Fix mysqli tests
Dmitry Stogov [Wed, 28 Oct 2015 07:26:47 +0000 (10:26 +0300)]
Fixed incorrect type usage
Anatol Belski [Tue, 27 Oct 2015 19:20:58 +0000 (20:20 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
sync NEWS
7.0.1 is next