php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-24 00:18:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
100,916 Commits 549 Branches 1,485 Tags
2dd77456fe0f9e01f80414790653ce94156f67ab
Commit Graph

100916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Watkins 2dd77456fe Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed #75220 - Segfault when calling is_callable on parent
 2017-09-27 06:08:01 +01:00
Nester a680d701ce Fixed #75220 - Segfault when calling is_callable on parent 2017-09-27 06:07:24 +01:00
Anatol Belski 0217a81722 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Remove some old sapi/apache_hooks and sapi/apache leftovers
 2017-09-25 21:58:18 +02:00
Peter Kokot 3752d18ffe Remove some old sapi/apache_hooks and sapi/apache leftovers 2017-09-25 21:56:39 +02:00
Dmitry Stogov 550595c085 Added missed ~ 2017-09-25 12:22:35 +03:00
Dmitry Stogov d526ddec85 Fixed type inference 2017-09-25 12:03:47 +03:00
Xinchen Hui 634f79d8d8 Update NEWS 2017-09-24 17:24:43 +08:00
Xinchen Hui e8c200515a Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()).
  Compiler warning
 2017-09-24 17:24:23 +08:00
Xinchen Hui b05ff14a9a Fixed bug #75241 (Null pointer dereference in zend_mm_alloc_small()). 2017-09-24 17:24:11 +08:00
Xinchen Hui db63367871 Compiler warning 2017-09-24 17:19:05 +08:00
Nikita Popov 628c257f71 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-24 08:54:36 +02:00
Nikita Popov 73d6456d7d Fixed bug #75252 2017-09-24 08:53:27 +02:00
Anatol Belski 96323d1bd7 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix thread safety
 2017-09-21 10:32:47 +02:00
Anatol Belski da2f581833 Fix thread safety 2017-09-21 10:32:09 +02:00
Andrea Faulds b71023e297 Merge branch 'PHP-7.0' into PHP-7.1 2017-09-21 00:04:08 +01:00
Andrea Faulds 418f97443a Fix bug #75236 2017-09-21 00:02:52 +01:00
Christoph M. Becker 0c0b955d5f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags)
 2017-09-20 15:47:02 +02:00
Christoph M. Becker eedc060c92 Fixed bug #73629 (SplDoublyLinkedList::setIteratorMode masks intern flags) 
We must not overwrite the SPL_DLLIST_IT_FIX flag when changing the
iterator mode.
 2017-09-20 15:46:04 +02:00
Anatol Belski 5c59dd0047 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix the version check causing the test fail
 2017-09-18 12:06:23 +02:00
Anatol Belski 9641586efa Fix the version check causing the test fail 2017-09-18 12:04:31 +02:00
Anatol Belski e3e3d37fa9 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Update lib_versions.txt
 2017-09-18 09:36:29 +02:00
Anatol Belski 7670590efd Update lib_versions.txt 2017-09-18 09:34:58 +02:00
Anatol Belski 351f98f5f3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move to next binary SDK version for AppVeyor
 2017-09-15 23:05:25 +02:00
Anatol Belski 7910c1dee9 Move to next binary SDK version for AppVeyor 2017-09-15 23:04:15 +02:00
Anatol Belski fba792945e [ci skip] update NEWS 
Fix format
 2017-09-13 15:46:33 +02:00
Anatol Belski 3d93856c4a Fixed bug #75018, fixed bug #75177 
Both are caused by the same cast issue in mysqlnd on 32-bit.
 2017-09-13 14:10:30 +02:00
Dmitry Stogov c24b3eff11 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Properly update string type flags
 2017-09-13 01:46:12 +03:00
Dmitry Stogov d7a10f0e32 Properly update string type flags 2017-09-13 01:45:57 +03:00
Dmitry Stogov 5f1d553e7e Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Revert "Properly update string type flags"
 2017-09-13 00:15:08 +03:00
Dmitry Stogov 83d8ebc991 Revert "Properly update string type flags" 
This reverts commit 99b1a62d55.
 2017-09-13 00:14:39 +03:00
Dmitry Stogov 253d49369d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed test
 2017-09-12 23:47:39 +03:00
Dmitry Stogov 2874fa8fb0 Fixed test 2017-09-12 23:47:22 +03:00
Dmitry Stogov 7452fd0263 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Properly update string type flags
 2017-09-12 23:43:42 +03:00
Dmitry Stogov 99b1a62d55 Properly update string type flags 2017-09-12 23:42:51 +03:00
Anatol Belski fcad6a97b8 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix test failure on 32-bit
 2017-09-12 18:18:44 +02:00
Anatol Belski 7674b5e574 Fix test failure on 32-bit 2017-09-12 18:17:28 +02:00
Joe Watkins 7f01872a24 bump versions 2017-09-12 15:34:30 +01:00
Remi Collet 42e15813e2 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  drop symbol definition, and not defined anywhere
 2017-09-12 13:03:39 +02:00
Remi Collet 35deb4c88b drop symbol definition, and not defined anywhere 2017-09-12 13:03:18 +02:00
Anatol Belski ac6eefcf3d Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] update NEWS
 2017-09-12 12:18:01 +02:00
Anatol Belski 3719aaebbf [ci skip] update NEWS 2017-09-12 12:17:46 +02:00
Anatol Belski 3d1cb7e32c [ci skip] update NEWS 2017-09-12 12:17:12 +02:00
Anatol Belski 05c65de082 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #75193 segfault in collator_convert_object_to_string
 2017-09-12 12:13:42 +02:00
Remi Collet b09497c0e2 Fixed bug #75193 segfault in collator_convert_object_to_string 2017-09-12 12:12:06 +02:00
Anatol Belski 0cb5a2cb49 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Move dev to 7.0.25
 2017-09-12 09:03:07 +02:00
Anatol Belski 5cf215536b Move dev to 7.0.25 2017-09-12 09:02:01 +02:00
Anatol Belski ea21b60dda Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  [ci skip] Fix news entry format
 2017-09-12 08:38:10 +02:00
Anatol Belski b5c9cd4df6 [ci skip] Fix news entry format 2017-09-12 08:36:05 +02:00
Anatol Belski 194547f591 [ci skip] Fix news entry format 2017-09-12 08:35:10 +02:00
Joe Watkins 7015d22116 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix bug #75173 incorrect behavior of AppendIterator::append in foreach loop
 2017-09-12 07:06:35 +01:00