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
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
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
ngsw
90d1e9d178
Fix: fold-maker `fpm_event_pre_init()'
2015-10-22 23:21:46 +09:00
Xinchen Hui
49c7fe4bdd
This break the phpize API_NO detecting
2015-10-22 20:26:37 +08:00
Andrey Hristov
9f19635295
Merge branch 'PHP-7.0'
2015-10-22 12:20:20 +02:00
Andrey Hristov
3dc0bf7428
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-22 11:50:12 +02:00
Andrey Hristov
afd31489d0
Improve fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
2015-10-22 11:48:53 +02:00
Kalle Sommer Nielsen
76a6f28fd8
Zend Engine 3.1.0-dev for master
2015-10-22 04:01:59 +02:00
Kalle Sommer Nielsen
b26593628f
Fix build on Windows
2015-10-22 03:47:46 +02:00
Andrey Hristov
53895bdf49
Merge branch 'PHP-7.0'
2015-10-21 16:15:45 +02:00
Andrey Hristov
8f9b2b68ee
Merge branch 'PHP-5.6' into PHP-7.0
2015-10-21 15:52:38 +02:00
Andrey Hristov
8292260515
Fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
2015-10-21 15:10:24 +02:00
Andrey Hristov
efd2b3f5f2
Update the certificates needed for the mysqli tests
2015-10-21 10:42:51 +02:00
Bob Weinand
387b7c7905
Merge branch 'PHP-7.0'
2015-10-20 21:56:20 +02:00
Bob Weinand
2ef327caed
Exempt paging from -qrr mode
2015-10-20 21:56:00 +02:00
Anatol Belski
f13120e737
Merge branch 'PHP-7.0'
...
* PHP-7.0:
backport 262160e2d55e8c
2015-10-20 20:07:36 +02:00
Anatol Belski
1149833a58
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
backport 262160e2d55e8c
2015-10-20 20:07:14 +02:00
Anatol Belski
ccc95bf9df
backport 262160e and 2d55e8c into 5.6
2015-10-20 20:05:44 +02:00
Xinchen Hui
67b74b4f52
Merge branch 'PHP-7.0'
2015-10-20 08:14:08 -07:00
Xinchen Hui
6ad2c3eb33
Revert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler"
...
read: http://news.php.net/php.internals/88887
This reverts commit 808f62bb4d
2015-10-20 08:12:04 -07:00
Xinchen Hui
1146f4e848
Merge branch 'PHP-7.0'
2015-10-20 16:59:03 +08:00
Xinchen Hui
673ad62eed
Regenerate zend_ini_scanner.c
2015-10-20 16:58:30 +08:00
Xinchen Hui
e7ae998a42
Merge branch 'PHP-7.0'
2015-10-20 13:27:34 +08:00
Xinchen Hui
a5a5c3e09a
Update NEWS
2015-10-20 13:26:40 +08:00
Xinchen Hui
c7cb40353c
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
Zend/zend_ini_scanner.c
2015-10-20 13:26:02 +08:00
Xinchen Hui
d5f76caf6c
Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
2015-10-20 13:20:56 +08:00
Ferenc Kovacs
5832cba065
Merge branch 'PHP-7.0'
...
* PHP-7.0:
remove imap tests for now until I finish the sudoless dovecot config
2015-10-19 23:58:40 +02:00
Ferenc Kovacs
131a348d37
remove imap tests for now until I finish the sudoless dovecot config
2015-10-19 23:57:43 +02:00
Ferenc Kovacs
6e28639ea0
Merge branch 'PHP-7.0'
...
* PHP-7.0:
remove imap tests for now until I finish the sudoless dovecot config
2015-10-19 23:43:38 +02:00
