]>
granicus.if.org Git - php/log
Xinchen Hui [Fri, 18 Mar 2016 08:02:32 +0000 (16:02 +0800)]
Unused var
Dmitry Stogov [Fri, 18 Mar 2016 07:28:30 +0000 (10:28 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
typo
Dmitry Stogov [Fri, 18 Mar 2016 07:27:46 +0000 (10:27 +0300)]
typo
Dmitry Stogov [Fri, 18 Mar 2016 07:26:41 +0000 (10:26 +0300)]
Merge branch 'PHP-7.0'
* PHP-7.0:
typo
Dmitry Stogov [Fri, 18 Mar 2016 07:25:48 +0000 (10:25 +0300)]
typo
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
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
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
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.
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.
Dmitry Stogov [Thu, 17 Mar 2016 19:37:20 +0000 (22:37 +0300)]
Enable DFA pass by default
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.
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
Anatol Belski [Thu, 17 Mar 2016 18:04:56 +0000 (19:04 +0100)]
fix and update NEWS
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
Anatol Belski [Thu, 17 Mar 2016 18:02:08 +0000 (19:02 +0100)]
fix and update NEWS
Xinchen Hui [Thu, 17 Mar 2016 14:57:53 +0000 (07:57 -0700)]
Merge branch 'master' of git.php.net:/php-src
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
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
Xinchen Hui [Thu, 17 Mar 2016 14:55:44 +0000 (07:55 -0700)]
Merge branch '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
Xinchen Hui [Thu, 17 Mar 2016 14:55:25 +0000 (07:55 -0700)]
Fixed test & ZEND_BOOL should result TMP_VAR
Xinchen Hui [Thu, 17 Mar 2016 14:45:19 +0000 (07:45 -0700)]
Merge branch 'PHP-7.0'
Conflicts:
Zend/zend_compile.c
Xinchen Hui [Thu, 17 Mar 2016 14:41:41 +0000 (07:41 -0700)]
Fixed #71837 (Wrong arrays behaviour)
Anatol Belski [Thu, 17 Mar 2016 13:28:32 +0000 (14:28 +0100)]
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
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
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
Xinchen Hui [Thu, 17 Mar 2016 13:10:08 +0000 (21:10 +0800)]
Fixed for master
Remi Collet [Thu, 17 Mar 2016 12:54:01 +0000 (13:54 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix NEWS
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
Remi Collet [Thu, 17 Mar 2016 12:53:42 +0000 (13:53 +0100)]
fix NEWS
Remi Collet [Thu, 17 Mar 2016 12:44:34 +0000 (13:44 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
NEWS
Remi Collet [Thu, 17 Mar 2016 12:44:28 +0000 (13:44 +0100)]
NEWS
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
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
Remi Collet [Thu, 17 Mar 2016 12:40:42 +0000 (13:40 +0100)]
NEWS
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
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
Xinchen Hui [Thu, 17 Mar 2016 12:21:36 +0000 (20:21 +0800)]
Remove unnecessary pattern
Xinchen Hui [Thu, 17 Mar 2016 12:20:01 +0000 (20:20 +0800)]
Fixed for PHP7
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)
Xinchen Hui [Thu, 17 Mar 2016 11:06:50 +0000 (19:06 +0800)]
Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
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
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.
Xinchen Hui [Thu, 17 Mar 2016 09:07:14 +0000 (17:07 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed test script
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
Xinchen Hui [Thu, 17 Mar 2016 09:06:56 +0000 (17:06 +0800)]
Fixed test script
Xinchen Hui [Thu, 17 Mar 2016 07:27:56 +0000 (15:27 +0800)]
Merge branch 'PHP-7.0'
* PHP-7.0:
Remove typo
Xinchen Hui [Thu, 17 Mar 2016 07:27:36 +0000 (15:27 +0800)]
Remove typo
Xinchen Hui [Thu, 17 Mar 2016 07:26:56 +0000 (15:26 +0800)]
Unnecessary anymore
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
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
Xinchen Hui [Thu, 17 Mar 2016 07:23:44 +0000 (15:23 +0800)]
Fixed test script
Xinchen Hui [Thu, 17 Mar 2016 07:23:21 +0000 (15:23 +0800)]
Update NEWS
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
Xinchen Hui [Thu, 17 Mar 2016 07:16:47 +0000 (15:16 +0800)]
Fixed bug #71841 (EG(error_zval) is not handled well)
Xinchen Hui [Thu, 17 Mar 2016 06:27:27 +0000 (14:27 +0800)]
Fixed bug #71840 (Unserialize accepts wrongly data)
Dmitry Stogov [Thu, 17 Mar 2016 06:58:15 +0000 (09:58 +0300)]
Change LONG constants into DOUBLE, if they are going to be used as DOUBLE.
Xinchen Hui [Thu, 17 Mar 2016 03:59:15 +0000 (11:59 +0800)]
Sorry for that... Merged by accident....
Revert "Transparently introduce type-specialized opcode handlers."
This reverts commit
59d00b8bcc05f72b29c3c768542b2bb6e69e1af4 .
Xinchen Hui [Thu, 17 Mar 2016 03:58:59 +0000 (11:58 +0800)]
Revert "Taking into account "undefined" variables"
This reverts commit
9020086a13c506ec127a648d08e9a30a81f08883 .
Xinchen Hui [Thu, 17 Mar 2016 03:57:08 +0000 (11:57 +0800)]
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fix build
Fix build
Fix build
prepare for 5.6.20RC1
Fix more emails
More email fixing
Fix emails in headers. @mysql.com addresses are no more since many years.
fix #ifdef usage
Xinchen Hui [Thu, 17 Mar 2016 03:56:32 +0000 (11:56 +0800)]
Fixed Bug #71824 (null ptr deref _zval_get_string_func (zend_operators.c:851))
Kalle Sommer Nielsen [Thu, 17 Mar 2016 02:53:01 +0000 (03:53 +0100)]
Fix build
Kalle Sommer Nielsen [Thu, 17 Mar 2016 02:45:04 +0000 (03:45 +0100)]
Fix build
Kalle Sommer Nielsen [Thu, 17 Mar 2016 02:41:36 +0000 (03:41 +0100)]
Fix build
Ferenc Kovacs [Thu, 17 Mar 2016 00:48:16 +0000 (01:48 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
prepare for 5.6.20RC1
Ferenc Kovacs [Thu, 17 Mar 2016 00:47:37 +0000 (01:47 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.20RC1
Ferenc Kovacs [Thu, 17 Mar 2016 00:46:00 +0000 (01:46 +0100)]
prepare for 5.6.20RC1
Andrey Hristov [Wed, 16 Mar 2016 09:57:12 +0000 (10:57 +0100)]
Fix more emails
Andrey Hristov [Wed, 16 Mar 2016 09:55:09 +0000 (10:55 +0100)]
Merge branch 'PHP-7.0'
Andrey Hristov [Wed, 16 Mar 2016 09:54:56 +0000 (10:54 +0100)]
More email fixing
Andrey Hristov [Wed, 16 Mar 2016 09:47:27 +0000 (10:47 +0100)]
Merge branch 'PHP-7.0'
Andrey Hristov [Wed, 16 Mar 2016 09:24:52 +0000 (10:24 +0100)]
Fix emails in headers. @mysql.com addresses are no more since many years.
Remi Collet [Wed, 16 Mar 2016 06:18:23 +0000 (07:18 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix #ifdef usage
Remi Collet [Wed, 16 Mar 2016 06:18:09 +0000 (07:18 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix #ifdef usage
Remi Collet [Wed, 16 Mar 2016 06:17:49 +0000 (07:17 +0100)]
fix #ifdef usage
Dmitry Stogov [Wed, 16 Mar 2016 01:20:43 +0000 (04:20 +0300)]
Taking into account "undefined" variables
Dmitry Stogov [Wed, 16 Mar 2016 00:36:58 +0000 (03:36 +0300)]
Transparently introduce type-specialized opcode handlers.
This affects only PHP VM, and doesn't change anything else.
Chris Brown [Tue, 15 Mar 2016 20:34:05 +0000 (16:34 -0400)]
Small typo in UPGRADING doc
Dmitry Stogov [Tue, 15 Mar 2016 19:19:01 +0000 (22:19 +0300)]
Convert LONG constants to DOUBLE, when later they are going to be used as DOUBLE
Derick Rethans [Tue, 15 Mar 2016 09:14:12 +0000 (09:14 +0000)]
Updated to version 2016.2 (2016b)
Derick Rethans [Tue, 15 Mar 2016 09:14:12 +0000 (09:14 +0000)]
Empty merge
Derick Rethans [Tue, 15 Mar 2016 09:14:11 +0000 (09:14 +0000)]
Updated to version 2016.2 (2016b)
Derick Rethans [Tue, 15 Mar 2016 09:14:10 +0000 (09:14 +0000)]
Empty merge
Derick Rethans [Tue, 15 Mar 2016 09:14:09 +0000 (09:14 +0000)]
Updated to version 2016.2 (2016b)
Anatol Belski [Tue, 15 Mar 2016 08:44:48 +0000 (09:44 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update libs versions
update libs versions
Anatol Belski [Tue, 15 Mar 2016 08:44:05 +0000 (09:44 +0100)]
update libs versions
Anatol Belski [Tue, 15 Mar 2016 08:43:08 +0000 (09:43 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update libs versions
Anatol Belski [Tue, 15 Mar 2016 08:41:34 +0000 (09:41 +0100)]
update libs versions
Anatol Belski [Tue, 15 Mar 2016 07:26:12 +0000 (08:26 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
prepare next
Anatol Belski [Tue, 15 Mar 2016 07:24:41 +0000 (08:24 +0100)]
prepare next
Anatol Belski [Tue, 15 Mar 2016 06:11:54 +0000 (07:11 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
update NEWS
Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn
fix uninitialized value
Anatol Belski [Tue, 15 Mar 2016 06:11:21 +0000 (07:11 +0100)]
update NEWS
Sean DuBois [Sun, 13 Mar 2016 03:15:54 +0000 (21:15 -0600)]
Fix bug #71624, PHP_MODE_PROCESS_STDIN (CLI SAPI called with '-R') did not properly set $argi and $argn
Anatol Belski [Tue, 15 Mar 2016 05:43:29 +0000 (06:43 +0100)]
fix uninitialized value
Nikita Popov [Wed, 2 Mar 2016 12:21:20 +0000 (13:21 +0100)]
Mark uses in UNSET_VAR op1 + FE_FETCH_R op2 as no_val
Nikita Popov [Sun, 13 Mar 2016 17:01:51 +0000 (18:01 +0100)]
Statically bind static method call arguments
If we know what method will be called, use ct-bound send opcodes.
The intl test is changed because a runtime error changed to a
compile-time error.
Anatol Belski [Mon, 14 Mar 2016 15:45:12 +0000 (16:45 +0100)]
Merge branch 'PHP-7.0'
* PHP-7.0:
fix pointer truncation on 64 bit
Anatol Belski [Mon, 14 Mar 2016 15:44:27 +0000 (16:44 +0100)]
fix pointer truncation on 64 bit