php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-26 17:38:14 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,547 Commits 549 Branches 1,485 Tags
89fdebfc511a1d9aa1b80783d20f19794964a9b2
Commit Graph

100547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui 89fdebfc51 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed tests
 2016-12-10 16:43:38 +08:00
Xinchen Hui 0ad804ec9b Fixed tests 2016-12-10 16:43:17 +08:00
Xinchen Hui 2dd3dc0fb3 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Update NEWS
 2016-12-09 22:39:51 +08:00
Xinchen Hui 4eb4ec2cb1 Update NEWS 2016-12-09 22:39:42 +08:00
Xinchen Hui 7695fba388 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest)
  Revert "Refix bug #73686"
 2016-12-09 22:30:41 +08:00
Xinchen Hui 09b36113b0 Fix the bug in ZEND_ASSIGN_DIM (as nikic suggest) 2016-12-09 22:30:24 +08:00
Xinchen Hui 6812721ef2 Revert "Refix bug #73686" 
This reverts commit 4589386026.
 2016-12-09 22:22:59 +08:00
Xinchen Hui 95f41f21e1 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Refix bug #73686
 2016-12-09 16:43:45 +08:00
Xinchen Hui 4589386026 Refix bug #73686 2016-12-09 16:37:22 +08:00
Xinchen Hui bc6b17148b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73646 (mb_ereg_search_init null pointer dereference)
 2016-12-09 15:56:41 +08:00
Xinchen Hui 6a43c61bcd Fixed bug #73646 (mb_ereg_search_init null pointer dereference) 2016-12-09 15:55:07 +08:00
Xinchen Hui 97bed9b932 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references)
 2016-12-09 11:42:11 +08:00
Xinchen Hui 4faa540b45 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
 2016-12-09 11:41:26 +08:00
Xinchen Hui 68bdd6d018 Fixed bug #73686 (Adding settype()ed values to ArrayObject results in references) 2016-12-09 11:41:08 +08:00
Anatol Belski 4fc394464c Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix uninitialized member
 2016-12-08 17:18:06 +01:00
Anatol Belski d46972b6ae Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix uninitialized member
 2016-12-08 17:16:48 +01:00
Anatol Belski 66ad7918b8 fix uninitialized member 2016-12-08 17:15:06 +01:00
Xinchen Hui 9f1e456d5a Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed possible false assertion failure
 2016-12-08 22:05:17 +08:00
Xinchen Hui 8250b3fca1 Fixed possible false assertion failure 2016-12-08 22:04:43 +08:00
Dmitry Stogov a3526cd9b7 Regenerated zend_vm_execute.h (fixed white spaces) 2016-12-08 13:37:57 +03:00
Ferenc Kovacs 618d912f80 Merge branch 'PHP-7.1' 2016-12-08 07:12:07 +01:00
Ferenc Kovacs f8ea3e3e4c Merge branch 'PHP-7.0' into PHP-7.1 2016-12-08 07:11:11 +01:00
Ferenc Kovacs a4d6d16b3b Merge branch 'PHP-5.6' into PHP-7.0 2016-12-08 07:09:41 +01:00
Ferenc Kovacs 60da307c61 update NEWS 2016-12-08 07:05:32 +01:00
Kalle Sommer Nielsen cf24a61735 Disable C4101 warnings entirely on Windows 2016-12-08 03:50:31 +01:00
Anatol Belski aea2035600 Merge branch 'PHP-7.1' 
* PHP-7.1:
  git clean section
 2016-12-08 03:25:40 +01:00
Anatol Belski 394a3593cc Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  git clean section
 2016-12-08 03:24:59 +01:00
Anatol Belski ff6565462e git clean section 2016-12-08 03:24:18 +01:00
Nikita Popov 683a0a0f6e Merge branch 'PHP-7.1' 2016-12-07 23:15:02 +01:00
Nikita Popov 60249f4390 Fix propagation of QM_ASSIGN into VERIFY_RETURN_TYPE 
VERIFY_RETURN_TYPE uses different formats for the CONST/non-CONST
cases. If we progate a CONST operand into op1, op1 should be
moved to result.
 2016-12-07 23:14:46 +01:00
Adam Baratz d98da850c4 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Remove noop param hook
  Clean up tabs and whitespace
 2016-12-07 17:10:36 -05:00
Adam Baratz 5a20d83be8 Remove noop param hook 2016-12-07 17:09:09 -05:00
Adam Baratz e133a2dd78 Clean up tabs and whitespace 2016-12-07 17:08:51 -05:00
Anatol Belski 76fe66c8dd Merge branch 'PHP-7.1' 
* PHP-7.1:
  update NEWS
  update NEWS
 2016-12-07 21:24:56 +01:00
Anatol Belski 8e40fdd37c update NEWS 2016-12-07 21:24:16 +01:00
Anatol Belski 68d119bcdb Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  update NEWS
 2016-12-07 21:23:37 +01:00
Anatol Belski 73fb2192d2 update NEWS 2016-12-07 21:22:34 +01:00
Anatol Belski 7da5720834 Merge branch 'PHP-7.1' 
* PHP-7.1:
  Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement
 2016-12-07 21:18:42 +01:00
Anatol Belski 67b7c5055c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement
 2016-12-07 21:07:14 +01:00
Dorin Marcoci 13ffa88e1f Fixed bug #72931 PDO_FIREBIRD with Firebird 3.0 not work on returning statement 2016-12-07 21:06:11 +01:00
Johannes Schlüter 972776cb3d Merge branch 'PHP-7.1' 2016-12-07 17:50:40 +01:00
Johannes Schlüter 54f526be89 Install ext/json headers 2016-12-07 17:50:05 +01:00
Anatol Belski ffb1773bcb Merge branch 'PHP-7.1' 
* PHP-7.1:
  fix test compat with MySQL 5.7
 2016-12-07 16:05:43 +01:00
Anatol Belski 5b3e36fe78 fix test compat with MySQL 5.7 2016-12-07 16:04:47 +01:00
Christoph M. Becker ced66cd6ca Merge branch 'PHP-7.1' 2016-12-07 13:50:11 +01:00
Christoph M. Becker 00ee42e385 Merge branch 'PHP-7.0' into PHP-7.1 2016-12-07 13:45:18 +01:00
Markus Staab dd77116fb0 Fixed typo in skipif error message 2016-12-07 13:35:58 +01:00
Dmitry Stogov 000d4a1a1b Merge branch 'PHP-7.1' 
* PHP-7.1:
  Check if PHP is in execution state.
 2016-12-07 15:13:00 +03:00
Dmitry Stogov ee15891c35 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Check if PHP is in execution state.
 2016-12-07 15:12:48 +03:00
Dmitry Stogov 3c8c347fa7 Check if PHP is in execution state. 2016-12-07 15:12:18 +03:00