8015daeddb
Merge branch 'PHP-7.1'
2017-03-16 12:57:43 +01:00
63e59c75a5
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-16 12:57:36 +01:00
98f4ce9363
Return FALSE if error_log fails to write all bytes
2017-03-16 12:56:36 +01:00
da223b9500
Merge branch 'PHP-7.1'
2017-03-16 12:34:36 +01:00
9331be7d6a
Use call_map to avoid linear call lookup
2017-03-16 12:33:57 +01:00
edfa87ebf5
Add comma to comment in php.ini
2017-03-16 12:23:55 +01:00
932c4b35dc
Remove more unnecessary checks on Zend's allocator functions
2017-03-16 12:23:55 +01:00
9d9defa29a
Remove dead code from BCMath extension
2017-03-16 12:23:55 +01:00
6ad0a6fb04
Merge branch 'PHP-7.1'
2017-03-15 19:50:26 +01:00
2bba4a0d7f
Fix bug #69676
2017-03-15 19:49:02 +01:00
38de261563
Use zend_test shared for tests
...
The snapshot build enables everything it could find. The test run will
load all the shared exts as well, until defined otherwise. So no needs
for an extra action.
2017-03-15 12:34:36 +01:00
c9472cbd16
fix shared compilation
2017-03-15 11:43:20 +01:00
8a7a1411b9
Merge branch 'PHP-7.1'
2017-03-15 00:09:59 +01:00
f3ab4c1a08
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-15 00:09:42 +01:00
7fba8bda4c
Fixed bug #74240 (deflate_add can allocate too much memory)
2017-03-15 00:08:32 +01:00
b6524f83e2
Merge branch 'PHP-7.1'
2017-03-14 22:17:23 +01:00
3d4e954518
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-14 22:17:10 +01:00
8be63ce0e2
Fix stream context changes leaking into copies of previous context
2017-03-14 22:15:41 +01:00
117d6a9a14
Merge branch 'PHP-7.1'
2017-03-14 18:47:51 +00:00
b4f0174e5c
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-14 18:46:29 +00:00
b9d3dbc84e
Merge branch 'bug72333' into PHP-7.0
2017-03-14 18:43:39 +00:00
960e5cde02
Replace NEWS entry for #74159 with #72333
...
The #74159 is duplicate
2017-03-14 18:41:23 +00:00
131fd3baa0
Remove unnecesary shadow of new_val
2017-03-14 11:29:22 -07:00
c74bc87c74
Minor optimizations to array_keys()/array_values()
...
array_values():
When the input is an empty array or a packed array with no gaps,
return the original array.
array_keys():
When the input is an empty array, return the original array.
When the input is a packed array with no holes
(and no search key specified), populate the return with
a simple range(0, count($input) - 1)
2017-03-14 11:23:02 -07:00
ba70478a21
Skip bug74159 test for OpenSSL lower than 1.0.1
2017-03-14 18:13:57 +00:00
8e5d080d54
Tidy up test for bug72333
2017-03-14 18:13:57 +00:00
f0e67d1a56
Speed up test for bug72333
...
It reliably fails without the xp_ssl.c so it is good with smaller usleep
2017-03-14 18:13:57 +00:00
411f4b1b6f
Fix indent and add comment
2017-03-14 18:13:57 +00:00
760ff21bf3
Tidy up setting of SSL_MODE_RELEASE_BUFFERS
2017-03-14 18:13:57 +00:00
53cc72ef86
Remove extra SSL mode settings
2017-03-14 18:13:57 +00:00
17e9fc9bfe
Fix bug #72333 (fwrite() on non-blocking SSL sockets does not work)
2017-03-14 18:13:57 +00:00
16ae9f82e8
Fix SKIPIF conditions
2017-03-14 12:06:58 +01:00
edcabf6d07
Drop unnecessary allocator return value checks
2017-03-13 22:07:15 +01:00
e8c85a854b
Merge branch 'PHP-7.1'
...
* PHP-7.1:
update binary sdk tools version for appveyor
2017-03-13 12:33:51 +01:00
7018a0502f
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
update binary sdk tools version for appveyor
2017-03-13 12:32:46 +01:00
8e45583006
update binary sdk tools version for appveyor
2017-03-13 12:31:31 +01:00
196ba4e194
Merge branch 'PHP-7.1'
...
* PHP-7.1:
rely on provided openssl.cnf to avoid possible failure with system defaults
2017-03-13 08:17:59 +01:00
1ffb1b9597
rely on provided openssl.cnf to avoid possible failure with system defaults
2017-03-13 08:17:42 +01:00
1e196110d3
Fix __sleep() returning undefined declared properties
2017-03-12 22:20:08 +01:00
ddc0dbf1a3
Clean up __sleep() related code
2017-03-12 22:20:07 +01:00
d2285e1613
Merge branch 'pull-request/2414'
...
* pull-request/2414:
zend-test extension to house code that is required for testing internal APIs, but that we would not want to expose for regular builds
2017-03-12 19:00:06 +00:00
b3ca0c2500
zend-test extension to house code that is required for testing internal APIs, but that we would not want to expose for regular builds
2017-03-12 18:58:50 +00:00
ea91c08232
Drop unnecessary checks of pemalloc() return value
2017-03-12 17:06:25 +01:00
e31342ef84
Merge branch 'PHP-7.1'
2017-03-12 17:04:02 +01:00
fbf0e0587f
Implement FR #74217 : deterministic sqlite functions
2017-03-12 17:03:00 +01:00
22e6b5ef22
Merge branch 'PHP-7.1'
2017-03-10 18:21:09 +01:00
280e8dafe4
Merge branch 'PHP-7.0' into PHP-7.1
2017-03-10 18:20:58 +01:00
29ee3e3c49
Fixed bug #73960
2017-03-10 18:20:32 +01:00
ec31924cd6
Constify to void build warning for C++ ext. [-Wwrite-strings]
...
Example (with v8js):
/builddir/build/BUILD/php-pecl-v8js-1.3.4/NTS/v8js_class.cc: In function 'void v8js_execute_script(zval*, v8js_script*, long int, long int, long int, zval**)':
/usr/include/php/Zend/zend.h:204:57: warning: ISO C++ forbids converting a string constant to 'char*' [-Wwrite-strings]
#define zend_bailout() _zend_bailout(__FILE__, __LINE__)
^
/builddir/build/BUILD/php-pecl-v8js-1.3.4/NTS/v8js_class.cc:633:3: note: in expansion of macro 'zend_bailout'
zend_bailout();
^~~~~~~~~~~~
2017-03-10 11:52:26 +01:00
9ad8e8f8ee
Merge branch 'PHP-7.1'
...
* PHP-7.1:
Fixed bug #74218 (ArrayIterator error message is confusing)
2017-03-10 15:17:29 +08:00
Nikita Popov