]>
granicus.if.org Git - php/log
Nikita Popov [Sat, 11 Feb 2017 23:06:47 +0000 (00:06 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sat, 11 Feb 2017 23:06:20 +0000 (00:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Denis Yeldandi [Thu, 9 Feb 2017 07:22:37 +0000 (10:22 +0300)]
Fixed bug #69860
Anatol Belski [Sat, 11 Feb 2017 20:47:09 +0000 (21:47 +0100)]
Revert "refactor php_win32_get_random_bytes()"
This reverts commit
23bd7bcde03c31e2678f23f12c72c96c24800c92 .
Looks like this change is unstable. If same CSP is use but multiple processers,
the initialization failures are possible. Thus, CryptAcquireContext in
every process, even if it won't be used at all, is not sensible. This
might actually motivate to look for better CSP APIs.
Anatol Belski [Sat, 11 Feb 2017 18:15:35 +0000 (19:15 +0100)]
refactor php_win32_get_random_bytes()
- avoid locking
- initialize only once
- the process will fail, if no init failed
Anatol Belski [Sat, 11 Feb 2017 17:55:32 +0000 (18:55 +0100)]
Revert "move winsock specific stuff into dllmain"
This reverts commit
d94c2c796a1b032d53b382681f8413cc3d02d2da .
WSA functions are documented explicitly as unsafe for dllmain
Anatol Belski [Sat, 11 Feb 2017 15:46:17 +0000 (16:46 +0100)]
move winsock specific stuff into dllmain
Anatol Belski [Sat, 11 Feb 2017 13:53:20 +0000 (14:53 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
add missing datatype as sync for
5113909
Anatol Belski [Sat, 11 Feb 2017 13:51:15 +0000 (14:51 +0100)]
add missing datatype as sync for
5113909
Derick Rethans [Sat, 11 Feb 2017 11:10:17 +0000 (11:10 +0000)]
Merge branch 'PHP-7.1'
Derick Rethans [Sat, 11 Feb 2017 11:10:01 +0000 (11:10 +0000)]
Fixed bug #73837 ("new DateTime()" sometimes returns 1 second ago value).
Xinchen Hui [Fri, 10 Feb 2017 16:02:07 +0000 (00:02 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed typo
Xinchen Hui [Fri, 10 Feb 2017 16:01:38 +0000 (00:01 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed typo
Xinchen Hui [Fri, 10 Feb 2017 16:01:09 +0000 (00:01 +0800)]
Fixed typo
Dmitry Stogov [Fri, 10 Feb 2017 07:31:43 +0000 (10:31 +0300)]
Fixed bug #74053 (Corrupted class entries on shutdown when a destructor spawns another object). (jim at commercebyte dot com)
Merge branch 'master' of github.com:commercebyte/php-src
* 'master' of github.com:commercebyte/php-src:
Added EG(flags) - executor global flags EG_FLAGS_IN_SHUTDOWN - is set when PHP is in shutdown state
newly added zend_object_store.no_reuse is redefined as a global zend_object_store_no_reuse, to avoid alignment issues
Alignment fix, as per @nikic
The test scripts bug64720.phpt and bug68652.phpt were relying on the buggy behavior, when PHP returns "Undefined static property" error due to class entry corruption. With my fix for bug 74053, both tests return no errors now, I corrected the EXPECTF accordingly
Bug Fix: Corrupted class entries on shutdown when a destructor spawns another object (C) 2017 CommerceByte Consulting
Xinchen Hui [Fri, 10 Feb 2017 06:26:35 +0000 (14:26 +0800)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Update NEWs
Fixed bug #74019 (Segfault with list)
Xinchen Hui [Fri, 10 Feb 2017 06:26:18 +0000 (14:26 +0800)]
Update NEWs
Xinchen Hui [Fri, 10 Feb 2017 06:24:44 +0000 (14:24 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74019 (Segfault with list)
Xinchen Hui [Fri, 10 Feb 2017 06:24:01 +0000 (14:24 +0800)]
Fixed bug #74019 (Segfault with list)
Jim Zubov [Thu, 9 Feb 2017 17:40:33 +0000 (12:40 -0500)]
Added EG(flags) - executor global flags
EG_FLAGS_IN_SHUTDOWN - is set when PHP is in shutdown state
Jim Zubov [Wed, 8 Feb 2017 02:13:39 +0000 (21:13 -0500)]
newly added zend_object_store.no_reuse is redefined as a global zend_object_store_no_reuse,
to avoid alignment issues
Nikita Popov [Wed, 8 Feb 2017 00:10:54 +0000 (01:10 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 8 Feb 2017 00:10:37 +0000 (01:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Zheng SHAO [Wed, 18 Jan 2017 09:50:21 +0000 (18:50 +0900)]
Fixed bug #61471
Nikita Popov [Wed, 8 Feb 2017 00:00:52 +0000 (01:00 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Wed, 8 Feb 2017 00:00:46 +0000 (01:00 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
dreamsxin [Tue, 7 Feb 2017 03:36:22 +0000 (11:36 +0800)]
Add #ifndef restrict
Nikita Popov [Tue, 7 Feb 2017 23:54:27 +0000 (00:54 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Tue, 7 Feb 2017 23:53:36 +0000 (00:53 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christian Schmidt [Thu, 2 Feb 2017 17:52:27 +0000 (18:52 +0100)]
Fix detection of isnan and isinf
The isnan() and isinf() are C99 macros not functions.
Also fix is_infinite(-INF) in case isinf is not defined.
Julien Pauli [Tue, 7 Feb 2017 16:47:08 +0000 (17:47 +0100)]
ReflectionGenerator now sends ReflectionException as expected
Jim Zubov [Tue, 7 Feb 2017 15:51:09 +0000 (10:51 -0500)]
Alignment fix, as per @nikic
Jim Zubov [Tue, 7 Feb 2017 14:19:16 +0000 (09:19 -0500)]
The test scripts bug64720.phpt and bug68652.phpt were relying on the buggy behavior,
when PHP returns "Undefined static property" error due to class entry corruption.
With my fix for bug 74053, both tests return no errors now, I corrected the EXPECTF accordingly
[Anybody please advice if I'm wrong?]
Also created bug74053.phpt, for the code I mentioned in the bug description
Anatol Belski [Tue, 7 Feb 2017 12:19:50 +0000 (13:19 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
use some dynamically generated NAN as well
Anatol Belski [Tue, 7 Feb 2017 12:18:38 +0000 (13:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
use some dynamically generated NAN as well
Anatol Belski [Tue, 7 Feb 2017 12:16:30 +0000 (13:16 +0100)]
use some dynamically generated NAN as well
Anatol Belski [Tue, 7 Feb 2017 11:40:10 +0000 (12:40 +0100)]
rework
fd521a22 to simplify for master, see github #2356
Anatol Belski [Tue, 7 Feb 2017 11:04:25 +0000 (12:04 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
switch to smart str conversion routine to hide exact NAN type
Anatol Belski [Tue, 7 Feb 2017 11:03:21 +0000 (12:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
switch to smart str conversion routine to hide exact NAN type
Anatol Belski [Tue, 7 Feb 2017 11:01:14 +0000 (12:01 +0100)]
switch to smart str conversion routine to hide exact NAN type
see https://github.com/php/php-src/pull/2356#issuecomment-
277564135
Jim Zubov [Mon, 6 Feb 2017 23:05:34 +0000 (18:05 -0500)]
Bug Fix:
Corrupted class entries on shutdown when a destructor spawns another object
(C) 2017 CommerceByte Consulting
When zend_objects_store_call_destructors() is called from the shutdown sequence -
it's calling the dtor's for remaining objects one by one in sequence of object handles.
If the dtor spawns one or more objects, and the new objects happen to reuse the old handles -
their dtor's are not called in this cycle.
The dtor's are called later on, when zend_deactivete() kicks in, and the static property lists in the class entries are freed.
This causes "Undefined static property" errors, and/or SIGSEGV.
Solution:
zend_object_store.no_reuse field is added
Set to 0 on initialization, set to 1 on the shutdown sequence.
zend_objects_store_put(zend_object *) checks the no_reuse flag, and never reuses the old handle slots if set.
This way, the dtor's for newly spawned objects are guaranteed to be called in the zend_objects_store_call_destructors() loop.
Nikita Popov [Mon, 6 Feb 2017 00:47:09 +0000 (01:47 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Mon, 6 Feb 2017 00:46:01 +0000 (01:46 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Mon, 6 Feb 2017 00:45:53 +0000 (01:45 +0100)]
Revert "Fix detection of isnan and isinf"
This reverts commit
9ea0949f43959ff0cf519e7a10ef9de7a538cde3 .
Nikita Popov [Sun, 5 Feb 2017 17:13:24 +0000 (18:13 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Sun, 5 Feb 2017 17:10:04 +0000 (18:10 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Christian Schmidt [Thu, 2 Feb 2017 17:52:27 +0000 (18:52 +0100)]
Fix detection of isnan and isinf
The isnan() and isinf() are C99 macros not functions.
Also fix is_infinite(-INF) in case isinf is not defined.
Andrea Faulds [Sun, 5 Feb 2017 01:34:15 +0000 (01:34 +0000)]
Merge branch 'PHP-7.1'
Andrea Faulds [Sun, 5 Feb 2017 01:31:42 +0000 (01:31 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
Andrea Faulds [Sun, 5 Feb 2017 01:30:20 +0000 (01:30 +0000)]
Fix bug #73954
Niklas Keller [Sun, 1 Jan 2017 14:53:24 +0000 (15:53 +0100)]
Implement Parameter Type Widening RFC
Nikita Popov [Fri, 3 Feb 2017 18:00:26 +0000 (19:00 +0100)]
Add UPGRADING notes for deprecations
Nikita Popov [Thu, 2 Feb 2017 22:07:25 +0000 (23:07 +0100)]
Deprecate each()
Nikita Popov [Thu, 2 Feb 2017 20:40:19 +0000 (21:40 +0100)]
Deprecate assert() with string argument
Nikita Popov [Thu, 2 Feb 2017 20:20:37 +0000 (21:20 +0100)]
Deprecate mbstring.func_overload
Nikita Popov [Thu, 2 Feb 2017 20:15:36 +0000 (21:15 +0100)]
Deprecate track_errors / $php_errormsg
Nikita Popov [Wed, 1 Feb 2017 23:44:18 +0000 (00:44 +0100)]
Deprecate mb_parse_str() without second argument
Nikita Popov [Wed, 1 Feb 2017 23:37:24 +0000 (00:37 +0100)]
Deprecate parse_str() without second argument
Nikita Popov [Wed, 1 Feb 2017 23:23:11 +0000 (00:23 +0100)]
Deprecate (unset)
Pecularily, there wasn't a single test for the (unset) cast...
Nikita Popov [Mon, 30 Jan 2017 21:28:17 +0000 (22:28 +0100)]
Deprecate __autoload()
Nikita Popov [Mon, 30 Jan 2017 21:09:32 +0000 (22:09 +0100)]
Deprecate create_function()
Nikita Popov [Mon, 30 Jan 2017 20:42:36 +0000 (21:42 +0100)]
Deprecate gmp_random()
Nikita Popov [Fri, 3 Feb 2017 17:42:33 +0000 (18:42 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 3 Feb 2017 17:42:19 +0000 (18:42 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Fri, 3 Feb 2017 17:41:36 +0000 (18:41 +0100)]
Revert "Merge branch 'pull-request/2344' into PHP-7.0"
This reverts commit
6988d070ea8c7d44452d8c98e594d65ea722a1d8 , reversing
changes made to
75ad2b301a047209e7b5a6b5912eb589cfbc773d .
Nikita Popov [Fri, 3 Feb 2017 17:30:40 +0000 (18:30 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 3 Feb 2017 17:29:58 +0000 (18:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
andrewnester [Fri, 3 Feb 2017 08:57:16 +0000 (11:57 +0300)]
Fixed bug #74035
Nikita Popov [Fri, 3 Feb 2017 16:55:08 +0000 (17:55 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Fri, 3 Feb 2017 16:54:39 +0000 (17:54 +0100)]
Fixed bug #74041
Dmitry Stogov [Fri, 3 Feb 2017 15:31:25 +0000 (18:31 +0300)]
Replace redundand checks with ZEND_ASSERT. We shouldn't get IS_OBJECTs without object_storage.
Dmitry Stogov [Fri, 3 Feb 2017 14:38:45 +0000 (17:38 +0300)]
Merge branch 'master' of git.php.net:php-src
* 'master' of git.php.net:php-src:
Remove unused variable
Dmitry Stogov [Fri, 3 Feb 2017 14:38:03 +0000 (17:38 +0300)]
Arguments array can't make cycles
Sara Golemon [Fri, 3 Feb 2017 03:23:17 +0000 (19:23 -0800)]
Remove unused variable
Joe Watkins [Fri, 3 Feb 2017 06:12:53 +0000 (06:12 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
Joe Watkins [Fri, 3 Feb 2017 06:12:20 +0000 (06:12 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
Joe Watkins [Fri, 3 Feb 2017 06:10:19 +0000 (06:10 +0000)]
Merge branch 'pull-request/2344' into PHP-7.0
* pull-request/2344:
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
somedaysummer [Fri, 27 Jan 2017 20:20:07 +0000 (15:20 -0500)]
Fixed bug #74004 LIBXML_NOWARNING (etc) ignored by DOMDocument::loadHTML
Joe Watkins [Fri, 3 Feb 2017 06:01:10 +0000 (06:01 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
increase wait time in timeout_variation_9.phpt by 1 second
Joe Watkins [Fri, 3 Feb 2017 06:00:53 +0000 (06:00 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase wait time in timeout_variation_9.phpt by 1 second
Joe Watkins [Fri, 3 Feb 2017 06:00:34 +0000 (06:00 +0000)]
Merge branch 'pull-request/2359' into PHP-7.0
* pull-request/2359:
increase wait time in timeout_variation_9.phpt by 1 second
Rodrigo Prado [Wed, 1 Feb 2017 23:12:05 +0000 (21:12 -0200)]
increase wait time in timeout_variation_9.phpt by 1 second
Joe Watkins [Fri, 3 Feb 2017 05:55:29 +0000 (05:55 +0000)]
Merge branch 'PHP-7.1'
* PHP-7.1:
increase wait time in timeout_variation_10.phpt by 1 second
Joe Watkins [Fri, 3 Feb 2017 05:55:16 +0000 (05:55 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
increase wait time in timeout_variation_10.phpt by 1 second
Joe Watkins [Fri, 3 Feb 2017 05:54:50 +0000 (05:54 +0000)]
Merge branch 'pull-request/2360' into PHP-7.0
* pull-request/2360:
increase wait time in timeout_variation_10.phpt by 1 second
Rodrigo Prado [Wed, 1 Feb 2017 23:22:35 +0000 (15:22 -0800)]
increase wait time in timeout_variation_10.phpt by 1 second
Nikita Popov [Thu, 2 Feb 2017 17:35:35 +0000 (18:35 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 2 Feb 2017 17:33:26 +0000 (18:33 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Mitch Hagstrand [Tue, 31 Jan 2017 17:25:05 +0000 (09:25 -0800)]
BUG #73998: Numeric properties are not accessible from get_object_vars
Nikita Popov [Thu, 2 Feb 2017 17:15:11 +0000 (18:15 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 2 Feb 2017 17:14:50 +0000 (18:14 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Matěj Humpál [Thu, 2 Feb 2017 09:24:00 +0000 (10:24 +0100)]
Fix bug #74031
Fix incorrect parameter count for imagepng function
Nikita Popov [Thu, 2 Feb 2017 17:07:27 +0000 (18:07 +0100)]
Merge branch 'PHP-7.1'
Nikita Popov [Thu, 2 Feb 2017 17:06:47 +0000 (18:06 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 2 Feb 2017 15:04:02 +0000 (16:04 +0100)]
Fix bug #73807
Anatol Belski [Thu, 2 Feb 2017 13:22:43 +0000 (14:22 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
[ci skip] update NEWS
[ci skip] update NEWS
Anatol Belski [Thu, 2 Feb 2017 13:21:31 +0000 (14:21 +0100)]
[ci skip] update NEWS
Anatol Belski [Thu, 2 Feb 2017 13:20:53 +0000 (14:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
[ci skip] update NEWS
Anatol Belski [Thu, 2 Feb 2017 13:19:35 +0000 (14:19 +0100)]
[ci skip] update NEWS
Anatol Belski [Thu, 2 Feb 2017 12:07:48 +0000 (13:07 +0100)]
Merge branch 'PHP-7.1'
* PHP-7.1:
Fixed #74022 PHP Fast CGI crashes when reading from a pfx file.