]> granicus.if.org Git - php/log
php
8 years agoThe d_name member of struct dirent should be a pointer
Anatol Belski [Sun, 12 Feb 2017 21:13:21 +0000 (22:13 +0100)]
The d_name member of struct dirent should be a pointer

Rework for 60950702, so then any encoding is supported. The path
segment length is measured in wchar_t size, whereby the number
of wchar_t is 255+\0. This means, in the actual encoding, the path
segment size can become (255*<bytes per glyph>)+\0 bytes in worst
case. It is still valid, as all the FS API uses wide chars
internally.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sun, 12 Feb 2017 21:03:53 +0000 (22:03 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 12 Feb 2017 21:03:21 +0000 (22:03 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoRevert "Fixed bug #74035"
Nikita Popov [Sun, 12 Feb 2017 21:02:39 +0000 (22:02 +0100)]
Revert "Fixed bug #74035"

This reverts commit 9ffc6ca62f53431a4b32b30cdda8180142f47cdb.

8 years agoMerge branch 'PHP-7.1'
Derick Rethans [Sun, 12 Feb 2017 20:19:10 +0000 (20:19 +0000)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Derick Rethans [Sun, 12 Feb 2017 20:19:02 +0000 (20:19 +0000)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoUpgrade timelib to 2017.01
Derick Rethans [Sun, 12 Feb 2017 20:17:01 +0000 (20:17 +0000)]
Upgrade timelib to 2017.01

This fixes:

- Fixed bug #72719 (Relative datetime format ignores weekday on sundays only).
- Fixed bug #73294 (DateTime wrong when date string is negative).
- Fixed bug #73489 (wrong timestamp when call setTimeZone multi times with UTC
  offset).
- Fixed bug #73858 (first/last day of' flag is not being reset).
- Fixed bug #73942 ($date->modify('Friday this week') doesn't return a Friday
  if $date is a Sunday).
- Fixed bug #74057 (wrong day when using "this week" in strtotime).

8 years agoremove loop
Anatol Belski [Sun, 12 Feb 2017 18:25:23 +0000 (19:25 +0100)]
remove loop

The limit is big enough, and it's questionable such amount of
random data can ever make sense anyway.

8 years agofix loop
Anatol Belski [Sun, 12 Feb 2017 18:15:40 +0000 (19:15 +0100)]
fix loop

8 years agorefactor php_win32_get_random_bytes(), take 2
Anatol Belski [Sun, 12 Feb 2017 16:15:50 +0000 (17:15 +0100)]
refactor php_win32_get_random_bytes(), take 2

As in previous variant, locking is removed and the initialization
is done only once at process start. The CNG API turns out to be
faster, also the initialization is less resources hungry. The
initialization part could need to be improved, if too much startup
failures are sighted in the real world usage. Though that would mean
having locking back.

The usage of CNG was already pointed out and requested in several
reports, with the further refactoring it appears to make sense and
simplify things a backward compatible way.

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Sun, 12 Feb 2017 12:36:43 +0000 (20:36 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS
  Fixed bug #74084 (Out of bound read - zend_mm_alloc_small)

8 years agoUpdate NEWS
Xinchen Hui [Sun, 12 Feb 2017 12:36:32 +0000 (20:36 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Sun, 12 Feb 2017 12:36:18 +0000 (20:36 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74084 (Out of bound read - zend_mm_alloc_small)

Conflicts:
Zend/zend_operators.c

8 years agoFixed bug #74084 (Out of bound read - zend_mm_alloc_small)
Xinchen Hui [Sun, 12 Feb 2017 12:34:08 +0000 (20:34 +0800)]
Fixed bug #74084 (Out of bound read - zend_mm_alloc_small)

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sun, 12 Feb 2017 11:51:12 +0000 (12:51 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 12 Feb 2017 11:50:14 +0000 (12:50 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #74021
andrewnester [Wed, 1 Feb 2017 10:43:55 +0000 (13:43 +0300)]
Fixed bug #74021

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Sun, 12 Feb 2017 10:56:49 +0000 (18:56 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS
  Fixed #73496 (Invalid memory access in zend_inline_hash_func)

8 years agoUpdate NEWS
Xinchen Hui [Sun, 12 Feb 2017 10:56:36 +0000 (18:56 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Sun, 12 Feb 2017 10:56:11 +0000 (18:56 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed #73496 (Invalid memory access in zend_inline_hash_func)

8 years agoFixed #73496 (Invalid memory access in zend_inline_hash_func)
Xinchen Hui [Sun, 12 Feb 2017 10:55:19 +0000 (18:55 +0800)]
Fixed #73496 (Invalid memory access in zend_inline_hash_func)

no test script is added because it requre too much memory

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 11 Feb 2017 23:20:15 +0000 (00:20 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 11 Feb 2017 23:20:06 +0000 (00:20 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agorun-tests: Exit 1 on BORKED tests
Nikita Popov [Sat, 11 Feb 2017 23:19:17 +0000 (00:19 +0100)]
run-tests: Exit 1 on BORKED tests

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 11 Feb 2017 23:16:05 +0000 (00:16 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sat, 11 Feb 2017 23:15:46 +0000 (00:15 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFixed bug #73118
Adam Saponara [Sat, 11 Feb 2017 04:58:25 +0000 (23:58 -0500)]
Fixed bug #73118

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sat, 11 Feb 2017 23:06:47 +0000 (00:06 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFixed bug #69860
Denis Yeldandi [Thu, 9 Feb 2017 07:22:37 +0000 (10:22 +0300)]
Fixed bug #69860

8 years agoRevert "refactor php_win32_get_random_bytes()"
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.

8 years agorefactor php_win32_get_random_bytes()
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

8 years agoRevert "move winsock specific stuff into dllmain"
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

8 years agomove winsock specific stuff into dllmain
Anatol Belski [Sat, 11 Feb 2017 15:46:17 +0000 (16:46 +0100)]
move winsock specific stuff into dllmain

8 years agoMerge branch 'PHP-7.1'
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

8 years agoadd 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

8 years agoMerge branch 'PHP-7.1'
Derick Rethans [Sat, 11 Feb 2017 11:10:17 +0000 (11:10 +0000)]
Merge branch 'PHP-7.1'

8 years agoFixed bug #73837 ("new DateTime()" sometimes returns 1 second ago value).
Derick Rethans [Sat, 11 Feb 2017 11:10:01 +0000 (11:10 +0000)]
Fixed bug #73837 ("new DateTime()" sometimes returns 1 second ago value).

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 10 Feb 2017 16:02:07 +0000 (00:02 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed typo

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoFixed typo
Xinchen Hui [Fri, 10 Feb 2017 16:01:09 +0000 (00:01 +0800)]
Fixed typo

8 years agoFixed bug #74053 (Corrupted class entries on shutdown when a destructor spawns anothe...
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

8 years agoMerge branch 'PHP-7.1'
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)

8 years agoUpdate NEWs
Xinchen Hui [Fri, 10 Feb 2017 06:26:18 +0000 (14:26 +0800)]
Update NEWs

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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)

8 years agoFixed bug #74019 (Segfault with list)
Xinchen Hui [Fri, 10 Feb 2017 06:24:01 +0000 (14:24 +0800)]
Fixed bug #74019 (Segfault with list)

8 years agoAdded EG(flags) - executor global flags
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

8 years agonewly added zend_object_store.no_reuse is redefined as a global zend_object_store_no_...
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

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Wed, 8 Feb 2017 00:10:54 +0000 (01:10 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFixed bug #61471
Zheng SHAO [Wed, 18 Jan 2017 09:50:21 +0000 (18:50 +0900)]
Fixed bug #61471

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Wed, 8 Feb 2017 00:00:52 +0000 (01:00 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoAdd #ifndef restrict
dreamsxin [Tue, 7 Feb 2017 03:36:22 +0000 (11:36 +0800)]
Add #ifndef restrict

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Tue, 7 Feb 2017 23:54:27 +0000 (00:54 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFix detection of isnan and isinf
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.

8 years agoReflectionGenerator now sends ReflectionException as expected
Julien Pauli [Tue, 7 Feb 2017 16:47:08 +0000 (17:47 +0100)]
ReflectionGenerator now sends ReflectionException as expected

8 years agoAlignment fix, as per @nikic
Jim Zubov [Tue, 7 Feb 2017 15:51:09 +0000 (10:51 -0500)]
Alignment fix, as per @nikic

8 years agoThe test scripts bug64720.phpt and bug68652.phpt were relying on the buggy behavior,
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

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agouse 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

8 years agorework fd521a22 to simplify for master, see github #2356
Anatol Belski [Tue, 7 Feb 2017 11:40:10 +0000 (12:40 +0100)]
rework fd521a22 to simplify for master, see github #2356

8 years agoMerge branch 'PHP-7.1'
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

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
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

8 years agoswitch 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

8 years agoBug Fix:
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.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Mon, 6 Feb 2017 00:47:09 +0000 (01:47 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoRevert "Fix detection of isnan and isinf"
Nikita Popov [Mon, 6 Feb 2017 00:45:53 +0000 (01:45 +0100)]
Revert "Fix detection of isnan and isinf"

This reverts commit 9ea0949f43959ff0cf519e7a10ef9de7a538cde3.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sun, 5 Feb 2017 17:13:24 +0000 (18:13 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFix detection of isnan and isinf
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.

8 years agoMerge branch 'PHP-7.1'
Andrea Faulds [Sun, 5 Feb 2017 01:34:15 +0000 (01:34 +0000)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFix bug #73954
Andrea Faulds [Sun, 5 Feb 2017 01:30:20 +0000 (01:30 +0000)]
Fix bug #73954

8 years agoImplement Parameter Type Widening RFC
Niklas Keller [Sun, 1 Jan 2017 14:53:24 +0000 (15:53 +0100)]
Implement Parameter Type Widening RFC

8 years agoAdd UPGRADING notes for deprecations
Nikita Popov [Fri, 3 Feb 2017 18:00:26 +0000 (19:00 +0100)]
Add UPGRADING notes for deprecations

8 years agoDeprecate each()
Nikita Popov [Thu, 2 Feb 2017 22:07:25 +0000 (23:07 +0100)]
Deprecate each()

8 years agoDeprecate assert() with string argument
Nikita Popov [Thu, 2 Feb 2017 20:40:19 +0000 (21:40 +0100)]
Deprecate assert() with string argument

8 years agoDeprecate mbstring.func_overload
Nikita Popov [Thu, 2 Feb 2017 20:20:37 +0000 (21:20 +0100)]
Deprecate mbstring.func_overload

8 years agoDeprecate track_errors / $php_errormsg
Nikita Popov [Thu, 2 Feb 2017 20:15:36 +0000 (21:15 +0100)]
Deprecate track_errors / $php_errormsg

8 years agoDeprecate mb_parse_str() without second argument
Nikita Popov [Wed, 1 Feb 2017 23:44:18 +0000 (00:44 +0100)]
Deprecate mb_parse_str() without second argument

8 years agoDeprecate parse_str() without second argument
Nikita Popov [Wed, 1 Feb 2017 23:37:24 +0000 (00:37 +0100)]
Deprecate parse_str() without second argument

8 years agoDeprecate (unset)
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...

8 years agoDeprecate __autoload()
Nikita Popov [Mon, 30 Jan 2017 21:28:17 +0000 (22:28 +0100)]
Deprecate __autoload()

8 years agoDeprecate create_function()
Nikita Popov [Mon, 30 Jan 2017 21:09:32 +0000 (22:09 +0100)]
Deprecate create_function()

8 years agoDeprecate gmp_random()
Nikita Popov [Mon, 30 Jan 2017 20:42:36 +0000 (21:42 +0100)]
Deprecate gmp_random()

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Fri, 3 Feb 2017 17:42:33 +0000 (18:42 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoRevert "Merge branch 'pull-request/2344' into PHP-7.0"
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.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Fri, 3 Feb 2017 17:30:40 +0000 (18:30 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into 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

8 years agoFixed bug #74035
andrewnester [Fri, 3 Feb 2017 08:57:16 +0000 (11:57 +0300)]
Fixed bug #74035

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Fri, 3 Feb 2017 16:55:08 +0000 (17:55 +0100)]
Merge branch 'PHP-7.1'

8 years agoFixed bug #74041
Nikita Popov [Fri, 3 Feb 2017 16:54:39 +0000 (17:54 +0100)]
Fixed bug #74041

8 years agoReplace redundand checks with ZEND_ASSERT. We shouldn't get IS_OBJECTs without object...
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.

8 years agoMerge branch 'master' of git.php.net:php-src
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

8 years agoArguments array can't make cycles
Dmitry Stogov [Fri, 3 Feb 2017 14:38:03 +0000 (17:38 +0300)]
Arguments array can't make cycles