php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-29 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
95,130 Commits 549 Branches 1,486 Tags
09da666cfa763855e33ec0c27c79e800ad993a68
Commit Graph

95130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikita Popov 09da666cfa Merge branch 'PHP-7.0' 2016-03-18 20:00:19 +01:00
Nikita Popov a2522efa9f Add extra ArrayObject::sort() test 2016-03-18 19:59:08 +01:00
Nikita Popov 094c808374 Fix bug #71838 2016-03-18 19:58:52 +01:00
Nikita Popov c5212da8b5 Merge branch 'PHP-7.0' 2016-03-18 19:31:43 +01:00
Nikita Popov fd95555107 Fix ZEND_DEBUG condition 2016-03-18 19:31:34 +01:00
Xinchen Hui 85419b4f28 Unused var 2016-03-18 16:02:32 +08:00
Dmitry Stogov 7bf4ae32be Merge branch 'PHP-7.0' 
* PHP-7.0:
  typo
 2016-03-18 10:28:30 +03:00
Dmitry Stogov 69c9be5c99 typo 2016-03-18 10:27:46 +03:00
Dmitry Stogov c1bcb198d3 Merge branch 'PHP-7.0' 
* PHP-7.0:
  typo
 2016-03-18 10:26:41 +03:00
Dmitry Stogov 11594e86b8 typo 2016-03-18 10:25:48 +03:00
Xinchen Hui 85009e0768 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
 2016-03-18 11:55:06 +08:00
Xinchen Hui 5e2186e5a7 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex
 2016-03-18 11:50:38 +08:00
Xinchen Hui 5b8d0dc6ae Fixed pdo_stmt.c: zval* being passed into zend_parse_parameters_ex 2016-03-18 11:50:03 +08:00
Dmitry Stogov 48e3459567 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.
 2016-03-17 22:44:23 +03:00
Dmitry Stogov 945a661912 Added ability to disable huge pages in Zend Memeory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=0. 2016-03-17 22:43:42 +03:00
Dmitry Stogov 681de72554 Enable DFA pass by default 2016-03-17 22:37:20 +03:00
Dmitry Stogov fc7cbdce61 Squashed commit of the following: 
commit 98471821a8
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Mar 17 21:56:04 2016 +0300

    Fixed wrong constant usage

commit 8183b811e7
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 3516b261de
Author: Dmitry Stogov <dmitry@zend.com>
Date:   Thu Mar 17 10:11:59 2016 +0300

    Added missed file

commit f4475a2360
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.
 2016-03-17 22:00:27 +03:00
Anatol Belski 93ca094aab Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix and update NEWS
  fix and update NEWS
 2016-03-17 19:05:33 +01:00
Anatol Belski 28b6f0232b fix and update NEWS 2016-03-17 19:04:56 +01:00
Anatol Belski d529c3358c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix and update NEWS
 2016-03-17 19:03:46 +01:00
Anatol Belski b8c9c92d44 fix and update NEWS 2016-03-17 19:02:08 +01:00
Xinchen Hui a5f72c8dac Merge branch 'master' of git.php.net:/php-src 2016-03-17 07:57:53 -07:00
Xinchen Hui a2ca4558b5 Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 2016-03-17 07:57:22 -07:00
Anatol Belski 78d28bfe13 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Backport patch for bug #71820
 2016-03-17 15:55:50 +01:00
Xinchen Hui 36dbaac595 Merge branch 'PHP-7.0' 2016-03-17 07:55:44 -07:00
Anatol Belski ef8d6435a2 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Backport patch for bug #71820
 2016-03-17 15:55:37 +01:00
Xinchen Hui 93499bfd8a Fixed test & ZEND_BOOL should result TMP_VAR 2016-03-17 07:55:25 -07:00
Xinchen Hui f2b6b26189 Merge branch 'PHP-7.0' 
Conflicts:
	Zend/zend_compile.c
 2016-03-17 07:51:26 -07:00
Xinchen Hui 345ecd9822 Fixed #71837 (Wrong arrays behaviour) 2016-03-17 07:41:41 -07:00
Anatol Belski 1b632cfe83 Backport patch for bug #71820 
Rev b4eedd128b
 2016-03-17 14:28:58 +01:00
Xinchen Hui eb405623ec 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
 2016-03-17 21:27:23 +08:00
Xinchen Hui e8e9ffdeb2 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
 2016-03-17 21:27:07 +08:00
Xinchen Hui 383dde5b15 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
 2016-03-17 21:26:14 +08:00
Xinchen Hui 910e6dc6b8 Fixed for master 2016-03-17 21:10:08 +08:00
Remi Collet f3b1865dd9 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix NEWS
 2016-03-17 13:54:01 +01:00
Remi Collet e7f74a3f9b Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix NEWS
 2016-03-17 13:53:52 +01:00
Remi Collet b5b1ba850a fix NEWS 2016-03-17 13:53:42 +01:00
Remi Collet 5d0a8809cd Merge branch 'PHP-7.0' 
* PHP-7.0:
  NEWS
 2016-03-17 13:44:34 +01:00
Remi Collet 9073208f6c NEWS 2016-03-17 13:44:28 +01:00
Remi Collet 904808ff66 Merge branch 'PHP-7.0' 
* PHP-7.0:
  NEWS
  Fix Bug #63171 	Script hangs after max_execution_time
 2016-03-17 13:42:51 +01:00
Remi Collet 2291ebc0ea Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  NEWS
  Fix Bug #63171 	Script hangs after max_execution_time
 2016-03-17 13:42:34 +01:00
Remi Collet d513b4cde5 NEWS 2016-03-17 13:40:42 +01:00
Remi Collet 407ad28ae5 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
 2016-03-17 13:38:45 +01:00
Xinchen Hui adb82514eb 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
 2016-03-17 20:24:59 +08:00
Xinchen Hui aef22ac1c1 Remove unnecessary pattern 2016-03-17 20:21:36 +08:00
Xinchen Hui 041a01fd6c Fixed for PHP7 2016-03-17 20:20:01 +08:00
Xinchen Hui 820b0aa2ab Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER)
 2016-03-17 19:54:33 +08:00
Xinchen Hui 8e2f658f49 Fixed bug #71843 (null ptr deref ZEND_RETURN_SPEC_CONST_HANDLER) 2016-03-17 19:54:19 +08:00
Anatol Belski ad7e1768aa Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #71820 pg_fetch_object bind parameters before call constructor
 2016-03-17 12:49:34 +01:00
Anatol Belski b4eedd128b 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.
 2016-03-17 12:41:55 +01:00