Commit Graph

39974 Commits

Author SHA1 Message Date
Anatol Belski
d756da8e72 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
2015-11-05 14:49:25 +01:00
Anatol Belski
a80545992b update the actual sql parser file for #70861 2015-11-05 14:46:40 +01:00
Anatol Belski
5c96a91d77 Fix bug #70861 Segmentation fault in pdo_parse_params() during Drupal 8 test suite 2015-11-05 14:46:28 +01:00
Reeze Xia
f2d39b5738 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.
2015-11-05 14:30:20 +08:00
Reeze Xia
435565a54f 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.
2015-11-05 14:28:49 +08:00
Reeze Xia
1c0622a472 Make test for bug #70852 to cover all cases 2015-11-05 14:09:24 +08:00
Reeze Xia
51218b3b9d Fixed bug #70852 Segfault getting NULL offset of an ArrayObject. 2015-11-05 13:46:03 +08:00
Xinchen Hui
d598e1bc6c Merge branch 'PHP-7.0' 2015-11-04 06:44:48 -08:00
Xinchen Hui
e4ac4e75b5 Fixed bug #70853 (SplFixedArray throws exception when using ref variable as index) 2015-11-04 06:44:29 -08:00
Xinchen Hui
5385478844 Merge branch 'PHP-7.0' 2015-11-04 19:01:31 +08:00
Xinchen Hui
fe0af271c6 Fixed bug #70843 (Segmentation fault on MacOSX with opcache.file_cache_only=1) 2015-11-04 18:59:30 +08:00
Jakub Zelenka
e62db72111 Use standard title for new openssl tests 2015-10-29 19:11:57 +00:00
root
06c6b51e7d new tests to openssl module, don't covered yet. 2015-10-29 19:06:40 +00:00
Andrey Hristov
6d51b7b2e3 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.
2015-10-27 12:59:09 +01:00
Xinchen Hui
1af0118ff8 Merge branch 'PHP-7.0' 2015-10-26 17:29:22 -07:00
Xinchen Hui
008d8b6789 Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use) 2015-10-26 17:28:19 -07:00
Xinchen Hui
31553f07f2 Revert "Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use)"
This reverts commit 3ef96c2cc6.
2015-10-26 17:26:30 -07:00
Xinchen Hui
0771b46099 Merge branch 'PHP-7.0' 2015-10-26 17:11:16 -07:00
Leigh
54ff923ff5 Merge branch 'PHP-7.0'
* PHP-7.0:
  Use arc4random on OpenBSD 5.5+ and NetBSD 7+
2015-10-30 19:11:09 +00:00
Leigh
faf835be2b 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
2015-10-30 19:08:20 +00:00
Dmitry Stogov
3e89c883bb Changed ZEND_CLONE->extended_value meaning to relative offset (previously it was absolute opline number) 2015-10-30 14:53:53 +03:00
Reeze Xia
880965b95e 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()`
2015-10-30 19:52:03 +08:00
Reeze Xia
c4297a5a29 This couldn't be false as it has been checked before 2015-10-30 19:50:54 +08:00
Reeze Xia
68b431e37d Use h parameter to avoid duplicate ht access of array_combine() 2015-10-30 19:49:04 +08:00
Jakub Zelenka
24ab2bb694 Merge branch 'PHP-7.0' 2015-10-29 19:15:57 +00:00
Jakub Zelenka
41de89f61b Merge branch 'PHP-5.6' into PHP-7.0 2015-10-29 19:14:25 +00:00
Dmitry Stogov
cb85f570c8 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed memory leak in php_stream_context_set_option()
2015-10-29 20:07:37 +03:00
Dmitry Stogov
c67fc6bb09 Fixed memory leak in php_stream_context_set_option() 2015-10-29 20:06:55 +03:00
Xinchen Hui
f596c8a3e1 Merge branch 'PHP-7.0' 2015-10-29 15:02:00 +08:00
Xinchen Hui
241e340f78 Make these tests fail faster, Thanks to GFW 2015-10-29 15:01:43 +08:00
Xinchen Hui
661798ad34 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2015-10-29 14:35:31 +08:00
Xinchen Hui
494bf962a6 Merge branch 'PHP-7.0' 2015-10-29 14:35:07 +08:00
Xinchen Hui
179fba3f38 Fixed bug #70808 (array_merge_recursive corrupts memory of unset items)
I knew, this fix seems ugly
2015-10-29 14:33:58 +08:00
Dmitry Stogov
4d702c21d0 Merge branch 'PHP-7.0'
* PHP-7.0:
  Don't remap .text segment if huge pages are not available.
2015-10-29 08:45:22 +03:00
Julien Pauli
eb59dd7d81 Don't remap .text segment if huge pages are not available. 2015-10-29 08:44:19 +03:00
Dmitry Stogov
da8e6ec4a5 Fixed incorrect instruction cleanup 2015-10-28 23:10:33 +03:00
Dmitry Stogov
3b44e40277 fixed incorrect bitmask 2015-10-28 21:26:52 +03:00
Dmitry Stogov
eb7be5379d 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.
2015-10-28 21:26:52 +03:00
Andrey Hristov
ff0ec06562 Merge branch 'PHP-7.0' 2015-10-28 12:56:26 +01:00
Andrey Hristov
2b23ba97f3 Fix mysqli tests 2015-10-28 12:56:12 +01:00
Andrey Hristov
c484bf9439 Merge branch 'PHP-7.0' 2015-10-27 13:33:05 +01:00
Andrey Hristov
c133515811 Merge branch 'PHP-5.6' into PHP-7.0 2015-10-27 13:32:45 +01:00
Xinchen Hui
9c1d0946f4 It should not be const 2015-10-27 10:08:27 +08:00
Xinchen Hui
69beb29e15 Fixed Bug #70797 (Error while making PHP7)
error: ‘for’ loop initial declarations are only allowed in C99 mode
2015-10-27 10:06:22 +08:00
Xinchen Hui
3ef96c2cc6 Fixed bug #70656 (require() statement broken after opcache_reset() or a few hours of use) 2015-10-26 17:09:42 -07:00
Leigh
a685c53d34 Merge branch 'PHP-7.0'
* PHP-7.0:
  Remove arc4random
2015-10-26 20:58:10 +00:00
Leigh
a53510239f Remove arc4random
There has been a lot of discussion around whether arc4random should be included. Given how many different impementations of it are in the wild, we can't guarantee a secure implementation on all platforms.
2015-10-26 20:40:28 +00:00
Anatol Belski
83bfefeccb Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64 2015-10-26 15:54:29 +01:00
Jakub Zelenka
187c21979a Merge branch 'PHP-7.0' 2015-10-25 17:57:15 +00:00
Jakub Zelenka
2ee99f8954 Check EVP_SealFinal return code
This can be done since we no longer support OpenSSL 0.9.6
2015-10-25 17:53:39 +00:00