]> granicus.if.org Git - php/log
php
9 years agoMerge branch 'PHP-7.0'
Julien Pauli [Mon, 21 Mar 2016 14:40:50 +0000 (15:40 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Updated NEWS
  Updated NEWS
  Reworked Fix bug #52098
  Fix bug #52098

9 years agoUpdated NEWS
Julien Pauli [Mon, 21 Mar 2016 14:40:01 +0000 (15:40 +0100)]
Updated NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Julien Pauli [Mon, 21 Mar 2016 14:32:52 +0000 (15:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Updated NEWS
  Reworked Fix bug #52098
  Fix bug #52098

Conflicts:
ext/pdo/pdo_dbh.c
ext/pdo/pdo_stmt.c

9 years agoUpdated NEWS
Julien Pauli [Mon, 21 Mar 2016 14:26:21 +0000 (15:26 +0100)]
Updated NEWS

9 years agoReworked Fix bug #52098
Julien Pauli [Mon, 21 Mar 2016 14:23:18 +0000 (15:23 +0100)]
Reworked Fix bug #52098

9 years agoFix bug #52098
Daniel Persson [Sat, 26 Sep 2015 10:43:40 +0000 (12:43 +0200)]
Fix bug #52098

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 21 Mar 2016 11:20:11 +0000 (19:20 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  array_dup should not copy the nApplyCount
  Also protects object to array cast

9 years agoarray_dup should not copy the nApplyCount
Xinchen Hui [Mon, 21 Mar 2016 11:19:05 +0000 (19:19 +0800)]
array_dup should not copy the nApplyCount

9 years agoAlso protects object to array cast
Xinchen Hui [Mon, 21 Mar 2016 11:12:50 +0000 (19:12 +0800)]
Also protects object to array cast

9 years agoAvoid data bypass delays between integer and floating point execution units on x86...
Dmitry Stogov [Mon, 21 Mar 2016 10:03:30 +0000 (13:03 +0300)]
Avoid data bypass delays between integer and floating point execution units on x86 CPUs.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 21 Mar 2016 08:44:42 +0000 (16:44 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Update NEWS
  Update NEWS for efacdc3
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string

9 years agoUpdate NEWS
Xinchen Hui [Mon, 21 Mar 2016 08:44:30 +0000 (16:44 +0800)]
Update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Mon, 21 Mar 2016 08:43:55 +0000 (16:43 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update NEWS for efacdc3
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string

9 years agoUpdate NEWS for efacdc3
Xinchen Hui [Mon, 21 Mar 2016 08:43:30 +0000 (16:43 +0800)]
Update NEWS for efacdc3

9 years agoMerge branch 'PHP-5.6' of https://github.com/msierks/php-src into PHP-5.6
Xinchen Hui [Mon, 21 Mar 2016 08:39:22 +0000 (16:39 +0800)]
Merge branch 'PHP-5.6' of https://github.com/msierks/php-src into PHP-5.6

* 'PHP-5.6' of https://github.com/msierks/php-src:
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 21 Mar 2016 08:22:02 +0000 (16:22 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)

9 years agoMerge branch 'bug71835' of https://github.com/bukka/php-src into PHP-7.0
Xinchen Hui [Mon, 21 Mar 2016 08:03:16 +0000 (16:03 +0800)]
Merge branch 'bug71835' of https://github.com/bukka/php-src into PHP-7.0

* 'bug71835' of https://github.com/bukka/php-src:
  Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)

9 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Mon, 21 Mar 2016 05:51:12 +0000 (22:51 -0700)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fix bug #71750: use zend_string_safe_alloc for calculated allocations
  Fix bug #71735: Double-free in SplDoublyLinkedList::offsetSet

9 years agoFix bug #71750: use zend_string_safe_alloc for calculated allocations
Stanislav Malyshev [Mon, 21 Mar 2016 05:39:17 +0000 (22:39 -0700)]
Fix bug #71750: use zend_string_safe_alloc for calculated allocations

9 years agoFix bug #71735: Double-free in SplDoublyLinkedList::offsetSet
Stanislav Malyshev [Mon, 21 Mar 2016 05:29:08 +0000 (22:29 -0700)]
Fix bug #71735: Double-free in SplDoublyLinkedList::offsetSet

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sun, 20 Mar 2016 17:18:14 +0000 (18:18 +0100)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #62059
Nikita Popov [Sun, 20 Mar 2016 17:17:44 +0000 (18:17 +0100)]
Fixed bug #62059

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sun, 20 Mar 2016 16:48:22 +0000 (17:48 +0100)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sun, 20 Mar 2016 16:48:06 +0000 (17:48 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
ext/spl/spl_observer.c

9 years agoFixed bug #67582
Nikita Popov [Sun, 20 Mar 2016 16:46:12 +0000 (17:46 +0100)]
Fixed bug #67582

9 years agoFix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializ...
Jakub Zelenka [Sun, 20 Mar 2016 15:53:57 +0000 (15:53 +0000)]
Fix bug #71835 (json_encode sometimes incorrectly detects recursion with JsonSerializable)

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Sun, 20 Mar 2016 12:52:00 +0000 (13:52 +0100)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #71731
Nikita Popov [Sun, 20 Mar 2016 12:33:00 +0000 (13:33 +0100)]
Fixed bug #71731

The read_dimension() handler in BP_VAR_IS mode will now call
offsetExists() before caling offsetGet(). This has always been a
problem, however recently the issue has been exacerbated, because
the null-coalesce operator ?? makes it visible for non-nested
array accesses.

Also fixes #69659.

9 years agoFix use of UNDEF instead of NULL in read_dimension
Nikita Popov [Sun, 20 Mar 2016 11:58:58 +0000 (12:58 +0100)]
Fix use of UNDEF instead of NULL in read_dimension

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sun, 20 Mar 2016 11:55:11 +0000 (04:55 -0700)]
Merge branch 'PHP-7.0'

9 years agoFixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory...
Xinchen Hui [Sun, 20 Mar 2016 11:52:57 +0000 (04:52 -0700)]
Fixed Bug #71859 (zend_objects_store_call_destructors operates on realloced memory, crashing)

9 years agoFix broken merge
Nikita Popov [Sun, 20 Mar 2016 00:34:56 +0000 (01:34 +0100)]
Fix broken merge

9 years agoDrop some dead defines
Nikita Popov [Sat, 19 Mar 2016 17:12:03 +0000 (18:12 +0100)]
Drop some dead defines

9 years agoReplace php_math_is_finite with zend_finite
Andrea Faulds [Sun, 20 Mar 2016 00:15:39 +0000 (00:15 +0000)]
Replace php_math_is_finite with zend_finite

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 18 Mar 2016 19:29:09 +0000 (20:29 +0100)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #52339
Nikita Popov [Fri, 18 Mar 2016 19:26:24 +0000 (20:26 +0100)]
Fixed bug #52339

Autoloader 101: Don't throw if you fail. PHP will throw for you.

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 18 Mar 2016 19:00:19 +0000 (20:00 +0100)]
Merge branch 'PHP-7.0'

9 years agoAdd extra ArrayObject::sort() test
Nikita Popov [Fri, 18 Mar 2016 18:59:08 +0000 (19:59 +0100)]
Add extra ArrayObject::sort() test

9 years agoFix bug #71838
Nikita Popov [Fri, 18 Mar 2016 18:58:52 +0000 (19:58 +0100)]
Fix bug #71838

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 18 Mar 2016 18:31:43 +0000 (19:31 +0100)]
Merge branch 'PHP-7.0'

9 years agoFix ZEND_DEBUG condition
Nikita Popov [Fri, 18 Mar 2016 18:30:29 +0000 (19:30 +0100)]
Fix ZEND_DEBUG condition

9 years agoFIX #71831: CURLOPT_NOPROXY applied as long instead of string
Michael Sierks [Fri, 18 Mar 2016 12:29:01 +0000 (07:29 -0500)]
FIX #71831: CURLOPT_NOPROXY applied as long instead of string

The CURLOPT_NOPROXY option value is converted to a long before
being applied as a curl option. This causes the option to have
no effect. This patch changes this conversion to a string.

9 years agoUnused var
Xinchen Hui [Fri, 18 Mar 2016 08:02:32 +0000 (16:02 +0800)]
Unused var

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Fri, 18 Mar 2016 07:28:30 +0000 (10:28 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  typo

9 years agotypo
Dmitry Stogov [Fri, 18 Mar 2016 07:27:46 +0000 (10:27 +0300)]
typo

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Fri, 18 Mar 2016 07:26:41 +0000 (10:26 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  typo

9 years agotypo
Dmitry Stogov [Fri, 18 Mar 2016 07:25:48 +0000 (10:25 +0300)]
typo

9 years agoMerge branch 'typo-in-UPGRADING-doc' of https://github.com/drbyte/php-src
Xinchen Hui [Fri, 18 Mar 2016 03:55:06 +0000 (11:55 +0800)]
Merge branch 'typo-in-UPGRADING-doc' of https://github.com/drbyte/php-src

* 'typo-in-UPGRADING-doc' of https://github.com/drbyte/php-src:
  Small typo in UPGRADING doc

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Fri, 18 Mar 2016 03:50:38 +0000 (11:50 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex

9 years agoFixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex
Xinchen Hui [Fri, 18 Mar 2016 03:50:03 +0000 (11:50 +0800)]
Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Thu, 17 Mar 2016 19:44:23 +0000 (22:44 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.

9 years agoAdded ability to disable huge pages in Zend Memeory Manager through the environment...
Dmitry Stogov [Thu, 17 Mar 2016 19:43:42 +0000 (22:43 +0300)]
Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0.

9 years agoEnable DFA pass by default
Dmitry Stogov [Thu, 17 Mar 2016 19:37:20 +0000 (22:37 +0300)]
Enable DFA pass by default

9 years agoSquashed commit of the following:
Dmitry Stogov [Thu, 17 Mar 2016 19:00:27 +0000 (22:00 +0300)]
Squashed commit of the following:

commit 98471821a89d7106de508fc544504ba674025abe
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Mar 17 21:56:04 2016 +0300

    Fixed wrong constant usage

commit 8183b811e74c2989bcd8ab9d870fc3adbe973980
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Mar 17 21:10:23 2016 +0300

    Added ability to serialize and serialize opcode handlers for file-cache

commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Mar 17 10:11:59 2016 +0300

    Added missed file

commit f4475a23608623ccbf11b00c1c74df1db55dffa2
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Mar 17 10:00:45 2016 +0300

    Transparently introduce type-specialized opcode handlers.
    This affects only PHP VM, and doesn't change anything else.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 17 Mar 2016 18:05:33 +0000 (19:05 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix and update NEWS
  fix and update NEWS

9 years agofix and update NEWS
Anatol Belski [Thu, 17 Mar 2016 18:04:56 +0000 (19:04 +0100)]
fix and update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 17 Mar 2016 18:03:46 +0000 (19:03 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix and update NEWS

9 years agofix and update NEWS
Anatol Belski [Thu, 17 Mar 2016 18:02:08 +0000 (19:02 +0100)]
fix and update NEWS

9 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Thu, 17 Mar 2016 14:57:53 +0000 (07:57 -0700)]
Merge branch 'master' of git.php.net:/php-src

9 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Thu, 17 Mar 2016 14:57:22 +0000 (07:57 -0700)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 17 Mar 2016 14:55:50 +0000 (15:55 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Backport patch for bug #71820

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 17 Mar 2016 14:55:44 +0000 (07:55 -0700)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Thu, 17 Mar 2016 14:55:37 +0000 (15:55 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Backport patch for bug #71820

9 years agoFixed test & ZEND_BOOL should result TMP_VAR
Xinchen Hui [Thu, 17 Mar 2016 14:55:25 +0000 (07:55 -0700)]
Fixed test & ZEND_BOOL should result TMP_VAR

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 17 Mar 2016 14:45:19 +0000 (07:45 -0700)]
Merge branch 'PHP-7.0'

Conflicts:
Zend/zend_compile.c

9 years agoFixed #71837 (Wrong arrays behaviour)
Xinchen Hui [Thu, 17 Mar 2016 14:41:41 +0000 (07:41 -0700)]
Fixed #71837 (Wrong arrays behaviour)

9 years agoBackport patch for bug #71820
Anatol Belski [Thu, 17 Mar 2016 13:28:32 +0000 (14:28 +0100)]
Backport patch for bug #71820

Rev b4eedd128ba9f61be08a50c94afd72837d7cf70b

9 years agoMerge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
Xinchen Hui [Thu, 17 Mar 2016 13:27:23 +0000 (21:27 +0800)]
Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:/php-src:
  fix NEWS
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time

9 years agoMerge branch 'master' of git.php.net:/php-src
Xinchen Hui [Thu, 17 Mar 2016 13:27:07 +0000 (21:27 +0800)]
Merge branch 'master' of git.php.net:/php-src

* 'master' of git.php.net:/php-src:
  fix NEWS
  NEWS
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time
  Fixed bug #71820 pg_fetch_object bind parameters before call constructor

9 years agoMerge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Thu, 17 Mar 2016 13:26:14 +0000 (21:26 +0800)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  fix NEWS
  NEWS
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time
  Fixed bug #71820 pg_fetch_object bind parameters before call constructor

9 years agoFixed for master
Xinchen Hui [Thu, 17 Mar 2016 13:10:08 +0000 (21:10 +0800)]
Fixed for master

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Thu, 17 Mar 2016 12:54:01 +0000 (13:54 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fix NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Remi Collet [Thu, 17 Mar 2016 12:53:52 +0000 (13:53 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix NEWS

9 years agofix NEWS
Remi Collet [Thu, 17 Mar 2016 12:53:42 +0000 (13:53 +0100)]
fix NEWS

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Thu, 17 Mar 2016 12:44:34 +0000 (13:44 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  NEWS

9 years agoNEWS
Remi Collet [Thu, 17 Mar 2016 12:44:28 +0000 (13:44 +0100)]
NEWS

9 years agoMerge branch 'PHP-7.0'
Remi Collet [Thu, 17 Mar 2016 12:42:51 +0000 (13:42 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Remi Collet [Thu, 17 Mar 2016 12:42:34 +0000 (13:42 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  NEWS
  Fix Bug #63171  Script hangs after max_execution_time

9 years agoNEWS
Remi Collet [Thu, 17 Mar 2016 12:40:42 +0000 (13:40 +0100)]
NEWS

9 years agoFix Bug #63171 Script hangs after max_execution_time
Remi Collet [Thu, 17 Mar 2016 12:38:45 +0000 (13:38 +0100)]
Fix Bug #63171  Script hangs after max_execution_time

If aborted via timer expiration, don't try to call any unixODBC function
which may hangs because of internal locks

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 17 Mar 2016 12:24:43 +0000 (20:24 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove unnecessary pattern
  Fixed for PHP7
  Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)

Conflicts:
ext/opcache/Optimizer/block_pass.c

9 years agoRemove unnecessary pattern
Xinchen Hui [Thu, 17 Mar 2016 12:21:36 +0000 (20:21 +0800)]
Remove unnecessary pattern

9 years agoFixed for PHP7
Xinchen Hui [Thu, 17 Mar 2016 12:20:01 +0000 (20:20 +0800)]
Fixed for PHP7

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Thu, 17 Mar 2016 11:54:33 +0000 (19:54 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)

9 years agoFixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
Xinchen Hui [Thu, 17 Mar 2016 11:06:50 +0000 (19:06 +0800)]
Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Thu, 17 Mar 2016 11:49:34 +0000 (12:49 +0100)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed bug #71820 pg_fetch_object bind parameters before call constructor

9 years agoFixed bug #71820 pg_fetch_object bind parameters before call constructor
Anatol Belski [Thu, 17 Mar 2016 11:39:31 +0000 (12:39 +0100)]
Fixed bug #71820 pg_fetch_object bind parameters before call constructor

If we want to fetch into an object of a custom class that implemens
__set handler, the corstructor has to be called first. The data
passed to the constructor can be possibly required in __set handler.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 17 Mar 2016 09:07:14 +0000 (17:07 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed test script

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Thu, 17 Mar 2016 09:07:07 +0000 (17:07 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed test script

9 years agoFixed test script
Xinchen Hui [Thu, 17 Mar 2016 09:06:56 +0000 (17:06 +0800)]
Fixed test script

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 17 Mar 2016 07:27:56 +0000 (15:27 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove typo

9 years agoRemove typo
Xinchen Hui [Thu, 17 Mar 2016 07:27:36 +0000 (15:27 +0800)]
Remove typo

9 years agoUnnecessary anymore
Xinchen Hui [Thu, 17 Mar 2016 07:26:56 +0000 (15:26 +0800)]
Unnecessary anymore

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 17 Mar 2016 07:26:40 +0000 (15:26 +0800)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed test script
  Update NEWS
  Fixed bug #71841 (EG(error_zval) is not handled well)
  Fixed bug #71840 (Unserialize accepts wrongly data)

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Thu, 17 Mar 2016 07:23:53 +0000 (15:23 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed test script

9 years agoFixed test script
Xinchen Hui [Thu, 17 Mar 2016 07:23:44 +0000 (15:23 +0800)]
Fixed test script

9 years agoUpdate NEWS
Xinchen Hui [Thu, 17 Mar 2016 07:23:21 +0000 (15:23 +0800)]
Update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Thu, 17 Mar 2016 07:22:44 +0000 (15:22 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fixed bug #71841 (EG(error_zval) is not handled well)
  Fixed bug #71840 (Unserialize accepts wrongly data)

Conflicts:
Zend/zend_vm_def.h
Zend/zend_vm_execute.h
ext/standard/var_unserializer.c

9 years agoFixed bug #71841 (EG(error_zval) is not handled well)
Xinchen Hui [Thu, 17 Mar 2016 07:16:47 +0000 (15:16 +0800)]
Fixed bug #71841 (EG(error_zval) is not handled well)

9 years agoFixed bug #71840 (Unserialize accepts wrongly data)
Xinchen Hui [Thu, 17 Mar 2016 06:27:27 +0000 (14:27 +0800)]
Fixed bug #71840 (Unserialize accepts wrongly data)