]> granicus.if.org Git - php/log
php
8 years agoadd scripts for AppVeyor integration
Anatol Belski [Fri, 16 Dec 2016 10:48:08 +0000 (11:48 +0100)]
add scripts for AppVeyor integration

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 16 Dec 2016 03:09:35 +0000 (11:09 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Add an assertion

8 years agoAdd an assertion
Xinchen Hui [Fri, 16 Dec 2016 03:09:22 +0000 (11:09 +0800)]
Add an assertion

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 16 Dec 2016 03:06:50 +0000 (11:06 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead)

8 years agoFixed bug #73746 (Method that returns string returns UNKNOWN:0 instead)
Xinchen Hui [Fri, 16 Dec 2016 03:06:27 +0000 (11:06 +0800)]
Fixed bug #73746 (Method that returns string returns UNKNOWN:0 instead)

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 15 Dec 2016 11:33:13 +0000 (12:33 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  make timing check more forgiving in these tests

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 15 Dec 2016 11:32:35 +0000 (12:32 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  make timing check more forgiving in these tests

8 years agomake timing check more forgiving in these tests
Anatol Belski [Thu, 15 Dec 2016 11:20:37 +0000 (12:20 +0100)]
make timing check more forgiving in these tests

Particularly on slower VMs, the sporadic fails can still happen.
The timing is kept in an uncritical range, but allows the tests
pass there. Mayby, it'd make sense to introduce a new group for
this kind of tests, so tests requiring exact time measurement
can be avoided on unsuitable environments.

8 years agoMerge branch 'PHP-7.1'
Matteo Beccati [Thu, 15 Dec 2016 08:32:26 +0000 (09:32 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Skip tests when secure_file_priv dir not writable
  Add missing UPGRADING entry. Manual is updated before 7.0 release.

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Matteo Beccati [Thu, 15 Dec 2016 08:32:04 +0000 (09:32 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Skip tests when secure_file_priv dir not writable
  Add missing UPGRADING entry. Manual is updated before 7.0 release.

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Matteo Beccati [Thu, 15 Dec 2016 08:31:54 +0000 (09:31 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Skip tests when secure_file_priv dir not writable

8 years agoSkip tests when secure_file_priv dir not writable
Matteo Beccati [Thu, 15 Dec 2016 08:31:00 +0000 (09:31 +0100)]
Skip tests when secure_file_priv dir not writable

8 years agoAdd missing UPGRADING entry. Manual is updated before 7.0 release.
Yasuo Ohgaki [Thu, 15 Dec 2016 07:16:45 +0000 (16:16 +0900)]
Add missing UPGRADING entry. Manual is updated before 7.0 release.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Wed, 14 Dec 2016 18:57:44 +0000 (19:57 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  extend skip section

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 14 Dec 2016 18:56:19 +0000 (19:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  extend skip section

8 years agoextend skip section
Anatol Belski [Wed, 14 Dec 2016 18:53:55 +0000 (19:53 +0100)]
extend skip section

The day light offset is calculated based on the system TZ, so with
an unsuitable one there's no way to workaround the false positives.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Wed, 14 Dec 2016 17:11:51 +0000 (18:11 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Wed, 14 Dec 2016 17:11:43 +0000 (18:11 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoPartially fix bug #70492
Nikita Popov [Wed, 14 Dec 2016 17:10:36 +0000 (18:10 +0100)]
Partially fix bug #70492

The libmagic portion is missing.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Wed, 14 Dec 2016 16:57:21 +0000 (17:57 +0100)]
Merge branch 'PHP-7.1'

8 years agoFixed bug #73727
Nikita Popov [Wed, 14 Dec 2016 16:56:31 +0000 (17:56 +0100)]
Fixed bug #73727

Error introduced when refactoring zend_alloc code into zend_bitset.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Wed, 14 Dec 2016 11:36:50 +0000 (12:36 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  cleanup temporary data

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 14 Dec 2016 11:34:14 +0000 (12:34 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  cleanup temporary data

8 years agocleanup temporary data
Anatol Belski [Wed, 14 Dec 2016 11:33:13 +0000 (12:33 +0100)]
cleanup temporary data

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Wed, 14 Dec 2016 02:12:46 +0000 (03:12 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Care about intput and output encoding, as per default encoding RFC

8 years agoCare about intput and output encoding, as per default encoding RFC
Anatol Belski [Wed, 14 Dec 2016 01:51:29 +0000 (02:51 +0100)]
Care about intput and output encoding, as per default encoding RFC

If PHP CLI is used with programs with no Unicode support, the default
PHP console codepage might cause backward incompatible behaviors. This
is solved with this patch by separating the handling of I/O codepage.
As per https://wiki.php.net/rfc/default_encoding input_encodnig and
output_encoding are centralized INI settings, so they're used for the
purpose of adjusting the codepage. This gives user the ability to use
UTF-8 internally, while letting the system API to convert the output
to a compatible codepage. This also might solve the font issues on
systems without good true type support.

Note, that there no change to the default behavior - if input and
output encoding are not set, which is the default case, the default
charset applies to both console input and output. The patch is just
a compilment to the backward compatibility, not more and not less.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Tue, 13 Dec 2016 16:57:37 +0000 (17:57 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Tue, 13 Dec 2016 16:57:14 +0000 (17:57 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMore fixes for bug #73089
Nikita Popov [Tue, 13 Dec 2016 16:54:30 +0000 (17:54 +0100)]
More fixes for bug #73089

Insert a lot more DEREFs. Some may not be necessary, but better
safe than sorry. I'm thinking the soap_hash_str_find_deref function
should become part of the zend_hash API -- we need this in many
places.

8 years agofix typo
Anatol Belski [Tue, 13 Dec 2016 12:39:07 +0000 (13:39 +0100)]
fix typo

8 years agocheck for header availability
Anatol Belski [Tue, 13 Dec 2016 12:22:09 +0000 (13:22 +0100)]
check for header availability

8 years agofix test portability
Anatol Belski [Tue, 13 Dec 2016 12:19:45 +0000 (13:19 +0100)]
fix test portability

Since there's no fatal error anymore, the execution continues. However,
removing the CWD is not always possible.

8 years agoUpdate NEWS/UPGRADING for mcrypt
Leigh [Tue, 13 Dec 2016 10:11:14 +0000 (10:11 +0000)]
Update NEWS/UPGRADING for mcrypt

8 years agoInclude strings.h for strncasecmp
Sara Golemon [Tue, 13 Dec 2016 07:19:31 +0000 (23:19 -0800)]
Include strings.h for strncasecmp

8 years agoSilence warning from unhandled enum
Sara Golemon [Tue, 13 Dec 2016 05:46:49 +0000 (21:46 -0800)]
Silence warning from unhandled enum

8 years agoInclude unistd.h for getpid()
Sara Golemon [Tue, 13 Dec 2016 05:44:07 +0000 (21:44 -0800)]
Include unistd.h for getpid()

8 years agoCompilation warning fix
Sara Golemon [Tue, 13 Dec 2016 05:35:05 +0000 (21:35 -0800)]
Compilation warning fix

u_strFromUTF8() argument dst_len should be int32_t, not uint32_t

8 years agoMerge branch 'PHP-7.1'
Andrey Hristov [Mon, 12 Dec 2016 20:00:30 +0000 (22:00 +0200)]
Merge branch 'PHP-7.1'

8 years agoOptimized memory handling of BIT fields. Less memory copies and less
Andrey Hristov [Mon, 12 Dec 2016 19:59:29 +0000 (21:59 +0200)]
Optimized memory handling of BIT fields. Less memory copies and less
memory usage.

8 years agoMerge branch 'PHP-7.1'
Andrey Hristov [Mon, 12 Dec 2016 19:53:05 +0000 (21:53 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Andrey Hristov [Mon, 12 Dec 2016 19:52:59 +0000 (21:52 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoAdd a bit more test cases (edge cases) to the BIT test case
Andrey Hristov [Mon, 12 Dec 2016 19:52:36 +0000 (21:52 +0200)]
Add a bit more test cases (edge cases) to the BIT test case

8 years agoMerge branch 'PHP-7.1'
Andrey Hristov [Mon, 12 Dec 2016 19:29:12 +0000 (21:29 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Andrey Hristov [Mon, 12 Dec 2016 19:29:06 +0000 (21:29 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoAdd a test case to test fetching of multiple rows with bit values.
Andrey Hristov [Mon, 12 Dec 2016 19:28:33 +0000 (21:28 +0200)]
Add a test case to test fetching of multiple rows with bit values.

8 years agoMerge branch 'PHP-7.1'
Andrey Hristov [Mon, 12 Dec 2016 19:17:25 +0000 (21:17 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Andrey Hristov [Mon, 12 Dec 2016 19:12:44 +0000 (21:12 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix off by 1 problem.
Andrey Hristov [Mon, 12 Dec 2016 19:11:02 +0000 (21:11 +0200)]
Fix off by 1 problem.

The problem was manifestated only with BIT columns and only when more than
one row was fetched. The problem was coming from the fact that in pre-7.0
times mysqlnd was using a no-copy optimization. This optimization kept the
strings (and also the BIT mask equivalents as strings) in the packet and the
zval referred to them. 7.0+ zvals cannot use no-copy and always copy. Because
of this the allocated memory for the packet was reduced by 1 by the person who
ported the driver, but the starting address of the bit area wasn't reduced.
Because of this the bit_area started at wrong address and the length decoded
wrong.

8 years agoMerge PR #2154 - Remove ext/mcrypt
Leigh [Mon, 12 Dec 2016 16:17:45 +0000 (16:17 +0000)]
Merge PR #2154 - Remove ext/mcrypt

8 years agoMinor fix macro value
Remi Collet [Mon, 12 Dec 2016 15:27:37 +0000 (16:27 +0100)]
Minor fix macro value

[] results in /**/ which can break some test
e.g. https://github.com/m6w6/ext-http/commit/d9ba7726f77858e626d67d758a87c9caa6f38d2b

8 years agoMerge branch 'master' of git.php.net:/php-src
Remi Collet [Mon, 12 Dec 2016 15:26:48 +0000 (16:26 +0100)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src: (165 commits)
  Add missing NEWS entry
  Increased number of reserved resources (from 4 to 6)
  Fixed compilation error
  Improved VM stack unwinding on exception. Now zend_throw_exception_hook() is going to be called only when exception is actually thrown and not going to be recalled for each unwinded finction.
  better way to get ACP
  adapt patch for 7.1
  fix datatype for zpp, yet a followup on bug #73679
  Update to SQLite 3.15.2
  update NEWS
  update NEWS
  improve fix for bug #73679 with new capabilities available
  Fixed bug #73679 DOTNET read access violation using invalid codepage
  Fix T_NUM_STRING negation
  fix leaking streams and memory mapped files
  extend errno mapping
  Fixed tests
  Update NEWS
  Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
  Revert "Refix bug #73686"
  Refix bug #73686
  ...

8 years agoMerge branch 'master' into remove-mcrypt
Leigh [Mon, 12 Dec 2016 12:23:50 +0000 (12:23 +0000)]
Merge branch 'master' into remove-mcrypt

8 years agoAdd missing NEWS entry
Christoph M. Becker [Mon, 12 Dec 2016 11:31:09 +0000 (12:31 +0100)]
Add missing NEWS entry

8 years agoIncreased number of reserved resources (from 4 to 6)
Dmitry Stogov [Mon, 12 Dec 2016 08:51:12 +0000 (11:51 +0300)]
Increased number of reserved resources (from 4 to 6)

8 years agoFixed compilation error
Dmitry Stogov [Mon, 12 Dec 2016 08:19:04 +0000 (11:19 +0300)]
Fixed compilation error

8 years agoImproved VM stack unwinding on exception.
Dmitry Stogov [Mon, 12 Dec 2016 07:55:32 +0000 (10:55 +0300)]
Improved VM stack unwinding on exception.
Now zend_throw_exception_hook() is going to be called only when exception is actually thrown and not going to be recalled for each unwinded finction.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 12 Dec 2016 00:57:31 +0000 (01:57 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  better way to get ACP

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 12 Dec 2016 00:56:44 +0000 (01:56 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  better way to get ACP

8 years agobetter way to get ACP
Anatol Belski [Mon, 12 Dec 2016 00:54:22 +0000 (01:54 +0100)]
better way to get ACP

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 12 Dec 2016 00:51:17 +0000 (01:51 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  adapt patch for 7.1

8 years agoadapt patch for 7.1
Anatol Belski [Mon, 12 Dec 2016 00:50:15 +0000 (01:50 +0100)]
adapt patch for 7.1

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Mon, 12 Dec 2016 00:29:59 +0000 (01:29 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix datatype for zpp, yet a followup on bug #73679

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Mon, 12 Dec 2016 00:29:23 +0000 (01:29 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix datatype for zpp, yet a followup on bug #73679

8 years agofix datatype for zpp, yet a followup on bug #73679
Anatol Belski [Mon, 12 Dec 2016 00:26:06 +0000 (01:26 +0100)]
fix datatype for zpp, yet a followup on bug #73679

8 years agoUpdate to SQLite 3.15.2
Christoph M. Becker [Sun, 11 Dec 2016 17:48:05 +0000 (18:48 +0100)]
Update to SQLite 3.15.2

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 11 Dec 2016 16:40:54 +0000 (17:40 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Sun, 11 Dec 2016 16:40:22 +0000 (17:40 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 11 Dec 2016 16:39:54 +0000 (17:39 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  update NEWS

8 years agoupdate NEWS
Anatol Belski [Sun, 11 Dec 2016 16:39:08 +0000 (17:39 +0100)]
update NEWS

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 11 Dec 2016 16:27:11 +0000 (17:27 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  improve fix for bug #73679 with new capabilities available

8 years agoimprove fix for bug #73679 with new capabilities available
Anatol Belski [Sun, 11 Dec 2016 16:25:48 +0000 (17:25 +0100)]
improve fix for bug #73679 with new capabilities available

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sun, 11 Dec 2016 16:09:04 +0000 (17:09 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73679 DOTNET read access violation using invalid codepage

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Sun, 11 Dec 2016 16:07:57 +0000 (17:07 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73679 DOTNET read access violation using invalid codepage

8 years agoFixed bug #73679 DOTNET read access violation using invalid codepage
Anatol Belski [Sun, 11 Dec 2016 16:06:55 +0000 (17:06 +0100)]
Fixed bug #73679 DOTNET read access violation using invalid codepage

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sun, 11 Dec 2016 12:34:28 +0000 (13:34 +0100)]
Merge branch 'PHP-7.1'

8 years agoFix T_NUM_STRING negation
Nikita Popov [Sun, 11 Dec 2016 12:31:37 +0000 (13:31 +0100)]
Fix T_NUM_STRING negation

T_NUM_STRING follows the rules of symtable numeric string
conversion. If the offset isn't an integer under those rules, it
is treated as a string. This should apply to negated T_NUM_STRINGs
as well.

8 years agofix leaking streams and memory mapped files
Anatol Belski [Sun, 11 Dec 2016 01:52:02 +0000 (02:52 +0100)]
fix leaking streams and memory mapped files

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Sat, 10 Dec 2016 10:18:34 +0000 (11:18 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  extend errno mapping

8 years agoextend errno mapping
Anatol Belski [Sat, 10 Dec 2016 10:17:07 +0000 (11:17 +0100)]
extend errno mapping

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Sat, 10 Dec 2016 08:43:38 +0000 (16:43 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed tests

8 years agoFixed tests
Xinchen Hui [Sat, 10 Dec 2016 08:43:17 +0000 (16:43 +0800)]
Fixed tests

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 9 Dec 2016 14:39:51 +0000 (22:39 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS

8 years agoUpdate NEWS
Xinchen Hui [Fri, 9 Dec 2016 14:39:42 +0000 (22:39 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 9 Dec 2016 14:30:41 +0000 (22:30 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
  Revert "Refix bug #73686"

8 years agoFix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
Xinchen Hui [Fri, 9 Dec 2016 14:30:24 +0000 (22:30 +0800)]
Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)

8 years agoRevert "Refix bug #73686"
Xinchen Hui [Fri, 9 Dec 2016 14:22:59 +0000 (22:22 +0800)]
Revert "Refix bug #73686"

This reverts commit 4589386026dbf15d980ba0c7c92dc587cead15e8.

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 9 Dec 2016 08:43:45 +0000 (16:43 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Refix bug #73686

8 years agoRefix bug #73686
Xinchen Hui [Fri, 9 Dec 2016 08:37:22 +0000 (16:37 +0800)]
Refix bug #73686

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 9 Dec 2016 07:56:41 +0000 (15:56 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73646 (mb_ereg_search_init null pointer dereference)

8 years agoFixed bug #73646 (mb_ereg_search_init null pointer dereference)
Xinchen Hui [Fri, 9 Dec 2016 07:55:07 +0000 (15:55 +0800)]
Fixed bug #73646 (mb_ereg_search_init null pointer dereference)

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 9 Dec 2016 03:42:11 +0000 (11:42 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references)

8 years agoMerge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
Xinchen Hui [Fri, 9 Dec 2016 03:41:26 +0000 (11:41 +0800)]
Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1

* 'PHP-7.1' of git.php.net:/php-src:
  fix uninitialized member

8 years agoFixed bug #73686 (Adding settype()ed values to ArrayObject results in references)
Xinchen Hui [Fri, 9 Dec 2016 03:41:08 +0000 (11:41 +0800)]
Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references)

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 8 Dec 2016 16:18:06 +0000 (17:18 +0100)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix uninitialized member

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 8 Dec 2016 16:16:48 +0000 (17:16 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix uninitialized member

8 years agofix uninitialized member
Anatol Belski [Thu, 8 Dec 2016 16:15:06 +0000 (17:15 +0100)]
fix uninitialized member

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Thu, 8 Dec 2016 14:05:17 +0000 (22:05 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed possible false assertion failure

8 years agoFixed possible false assertion failure
Xinchen Hui [Thu, 8 Dec 2016 14:04:43 +0000 (22:04 +0800)]
Fixed possible false assertion failure

8 years agoRegenerated zend_vm_execute.h (fixed white spaces)
Dmitry Stogov [Thu, 8 Dec 2016 10:37:57 +0000 (13:37 +0300)]
Regenerated zend_vm_execute.h (fixed white spaces)

8 years agoMerge branch 'PHP-7.1'
Ferenc Kovacs [Thu, 8 Dec 2016 06:12:07 +0000 (07:12 +0100)]
Merge branch 'PHP-7.1'