Commit Graph

92957 Commits

Author SHA1 Message Date
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
Dmitry Stogov
e58682a2c4 Fixed incorrect type usage 2015-10-28 10:26:47 +03:00
Anatol Belski
524a468d5f Merge branch 'PHP-7.0'
* PHP-7.0:
  sync NEWS
  7.0.1 is next
2015-10-27 20:20:58 +01:00
Anatol Belski
5dd59cc90d sync NEWS 2015-10-27 20:10:06 +01:00
Anatol Belski
ac4601eadd 7.0.1 is next 2015-10-27 20:08:54 +01:00
Anatol Belski
24bae1614f Merge branch 'PHP-7.0'
* PHP-7.0:
  Fix frequent reallocations with many small strings
  correct snprintf usage
2015-10-27 17:08:51 +01:00
Dmitry Stogov
eb32da13cd Fix frequent reallocations with many small strings 2015-10-27 17:07:58 +01:00
Anatol Belski
0e50a4c008 correct snprintf usage 2015-10-27 17:07:51 +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
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
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
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
34fe8de8f7 Merge branch 'PHP-7.0'
* PHP-7.0:
  update NEWS
  Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
  unbreak coverage data: fix #line directives in phpdbg parser
  exclude datelib from coverage report as asked by Derick
2015-10-26 15:57:46 +01:00
Anatol Belski
fff11a1e07 Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  update NEWS
  Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
  unbreak coverage data: fix #line directives in phpdbg parser
  exclude datelib from coverage report as asked by Derick
2015-10-26 15:57:26 +01:00
Anatol Belski
2f7a8515ca update NEWS 2015-10-26 15:56:34 +01: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
Dmitry Stogov
4e161531f4 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build with --disable-gcc-global-regs).
2015-10-26 16:03:35 +03:00
Dmitry Stogov
0172f198e3 Fixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build with --disable-gcc-global-regs). 2015-10-26 16:01:20 +03:00
Xinchen Hui
2373e49872 Merge branch 'PHP-7.0' 2015-10-26 11:15:53 +08:00
Xinchen Hui
5767f2b648 Fixed bug #70785 (Infinite loop due to exception during identical comparison) 2015-10-26 11:15:17 +08: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
Bob Weinand
fa4e1f9f38 Merge branch 'PHP-7.0' 2015-10-25 18:48:18 +01:00
Bob Weinand
ac58d21aa3 Fix refcount reaching 2^32 - 1 for resources
Happens e.g. in proc_close() when nothing is referencing the file handles, e.g. they have refcount 0 when passed to zend_list_close() and then zend_list_delete() which decrements it to (uint32_t) -1
2015-10-25 18:47:50 +01:00
Nuno Lopes
36311ee4fd unbreak coverage data: fix #line directives in phpdbg parser 2015-10-24 18:12:24 -04:00
Nuno Lopes
a0665f3a18 unbreak coverage data: fix #line directives in phpdbg parser 2015-10-24 17:45:53 -04:00
Nuno Lopes
b5206970fb unbreak coverage data: fix #line directives in phpdbg parser 2015-10-24 17:45:31 -04:00
Nuno Lopes
0e069fa57d exclude datelib from coverage report as asked by Derick 2015-10-24 17:38:20 -04:00
Nuno Lopes
87498c5c39 exclude datelib from coverage report as asked by Derick 2015-10-24 17:37:00 -04:00
Nuno Lopes
3bbdfc62d2 exclude datelib from coverage report as asked by Derick 2015-10-24 17:36:23 -04:00
Nikita Popov
36cd300693 Merge branch 'PHP-7.0' 2015-10-24 23:19:36 +02:00
Nikita Popov
b9cc3176eb Fix bug #70782 2015-10-24 23:19:02 +02:00
Anatol Belski
5790725bc4 Merge branch 'PHP-7.0'
* PHP-7.0:
  Fix globals initialization in sapi/cgi
2015-10-23 13:59:41 +02:00
Anatol Belski
aae108c1ce Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
  Fix globals initialization in sapi/cgi
2015-10-23 13:59:27 +02:00
Anatol Belski
22af88274b Fix globals initialization in sapi/cgi
Basically backport 8430ec17
2015-10-23 13:56:40 +02:00
Anatol Belski
17eff65001 Merge branch 'PHP-7.0'
* PHP-7.0:
  rather use the supplied inttypes.h with vc14
  fix test redirection when run not from source root
2015-10-23 10:16:51 +02:00
Anatol Belski
448d1ce428 rather use the supplied inttypes.h with vc14 2015-10-23 09:47:00 +02:00
Anatol Belski
5ba763413b fix test redirection when run not from source root 2015-10-23 09:42:19 +02:00
Xinchen Hui
334deefa29 Merge branch 'fix-folding-marker' of https://github.com/ngsw/php-src 2015-10-23 11:28:22 +08:00
Xinchen Hui
40648d7fc8 Merge branch 'PHP-7.0' 2015-10-23 11:19:37 +08:00
Xinchen Hui
95446b4416 Indents 2015-10-23 11:19:30 +08:00
c9s
bbaf6daa9d Fix boolean conversion warnings
Summary:

The compiler complains and raised some warnings about boolean
conversion:

    warning: address of 'ce->constants_table' will always evaluate to
    'true' [-Wpointer-bool-conversion]

Since the address of 'HashTable' will always evaluate to true. the
condition should be removed. The scope is kept for local variables.

Platform:

    OS X 10.11

Compiler:

    Apple LLVM version 7.0.0 (clang-700.0.72)
    Target: x86_64-apple-darwin15.0.0
    Thread model: posix
2015-10-23 11:19:19 +08:00
Xinchen Hui
01558e4c88 Indents 2015-10-23 11:18:30 +08:00
Xinchen Hui
7854fb81ef Merge branch 'c9s/bugfix-boolean-conversion-warnings' of https://github.com/c9s/php-src 2015-10-23 10:13:16 +08:00
c9s
fdb1da9bed Fix boolean conversion warnings
Summary:

The compiler complains and raised some warnings about boolean
conversion:

    warning: address of 'ce->constants_table' will always evaluate to
    'true' [-Wpointer-bool-conversion]

Since the address of 'HashTable' will always evaluate to true. the
condition should be removed. The scope is kept for local variables.

Platform:

    OS X 10.11

Compiler:

    Apple LLVM version 7.0.0 (clang-700.0.72)
    Target: x86_64-apple-darwin15.0.0
    Thread model: posix
2015-10-22 23:56:30 +08:00