clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-10-01 06:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
89,612 Commits 494 Branches 1,367 Tags 800 MiB
018bcc6388
Commit Graph

89612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xinchen Hui
556e6f6cb1 Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_exceptions.c
 2015-04-15 10:44:51 +08:00
Xinchen Hui
caf4beab2d Merge branch 'PHP-5.5' into PHP-5.6 2015-04-15 10:39:17 +08:00
Xinchen Hui
82ec0d5fc5 Fixed res leak 2015-04-15 10:38:55 +08:00
Xinchen Hui
be504995c3 Fixed warnings 2015-04-15 10:37:35 +08:00
Nikita Popov
108ae7961e Fix leak when calling ->get() on tmp property 2015-04-14 22:16:18 +02:00
Nikita Popov
10756522a7 Fix leak in timezone_open when instantiation fails 2015-04-14 21:44:33 +02:00
Nikita Popov
a5f2be38d4 Regenerate tokenizer data 2015-04-14 21:36:17 +02:00
Nikita Popov
38eb3cdf67 Drop ??? for AST_ZNODE in ast pretty printer 2015-04-14 21:35:38 +02:00
Stanislav Malyshev
6c39ce2bf2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed recently introduced memory leak
  Fix Bug #69402: Reading empty SSL stream hangs until timeout
 2015-04-14 11:13:17 -07:00
Stanislav Malyshev
9d7b5e30eb Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed recently introduced memory leak
  Fix Bug #69402: Reading empty SSL stream hangs until timeout
 2015-04-14 11:12:58 -07:00
Stanislav Malyshev
df33731812 Merge branch 'PHP-5.4' into PHP-5.5 
* PHP-5.4:
  Fixed recently introduced memory leak
 2015-04-14 11:12:48 -07:00
Dmitry Stogov
cee9722028 Fixed recently introduced memory leak 2015-04-14 11:08:38 -07:00
Nikita Popov
acd61be985 Add "yield from" support to ast pretty printer 2015-04-14 19:15:40 +02:00
Dmitry Stogov
7bf5b341e4 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  Add NEWS/UPGRADING and some implementation notes
 2015-04-14 19:54:30 +03:00
Dmitry Stogov
00445ba22d Fixed bug #69446 (GC leak relating to removal of nested data after dtors run) 2015-04-14 19:53:56 +03:00
Bob Weinand
a029ec9ee0 Add NEWS/UPGRADING and some implementation notes 2015-04-14 18:35:47 +02:00
Bob Weinand
2256dbfb21 Merge branch 'master' of https://github.com/php/php-src 2015-04-14 18:02:18 +02:00
Bob Weinand
f3e124d58d Merge branch 'coroutineDelegation' of https://github.com/bwoebi/php-src 2015-04-14 17:58:58 +02:00
Levi Morrison
dad622bf42 Fix bug #69448 
ReflectionClass::newInstanceWithoutConstructor should not call
object_init_ex when the class is internal and final. This is because
the class dtor may rely on the ctor being called and in some cases
this will cause a segfault.
 2015-04-14 09:45:41 -06:00
Daniel Lowrey
8dfb35eae0 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Update NEWS
 2015-04-14 09:42:01 -06:00
Daniel Lowrey
b9940ab1bd Update NEWS 2015-04-14 09:37:17 -06:00
Daniel Lowrey
4f07330e79 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix Bug #69402: Reading empty SSL stream hangs until timeout

Conflicts:
	ext/openssl/xp_ssl.c
 2015-04-14 09:27:37 -06:00
Daniel Lowrey
81f356b4ae Fix Bug #69402: Reading empty SSL stream hangs until timeout 2015-04-14 09:25:11 -06:00
Daniel Lowrey
601d60a978 Fix Bug #69402: Reading empty SSL stream hangs until timeout 2015-04-14 09:24:40 -06:00
Nikita Popov
a7059f1eac Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2015-04-14 16:38:09 +02:00
Nikita Popov
ed7e6d4758 Merge branch 'PHP-5.5' into PHP-5.6 2015-04-14 16:36:36 +02:00
Nikita Popov
95650d0942 Fixed bug #69419 2015-04-14 16:35:23 +02:00
Dmitry Stogov
65baab7741 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug #63336 is not a bug
  fix test

Conflicts:
	Zend/tests/bug63336.phpt
 2015-04-14 17:18:55 +03:00
Dmitry Stogov
e8fb5201ba Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Bug #63336 is not a bug
 2015-04-14 17:16:57 +03:00
Dmitry Stogov
dc024f0bdc Bug #63336 is not a bug 2015-04-14 17:15:50 +03:00
Dmitry Stogov
b7d8edca1f Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  fix test
 2015-04-14 16:42:35 +03:00
Dmitry Stogov
3037665f04 Fixed use after free 2015-04-14 16:42:02 +03:00
Anatol Belski
63c92a6e96 fix test 2015-04-14 15:24:46 +02:00
Anatol Belski
bc63491da8 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  fix test
 2015-04-14 15:21:47 +02:00
Anatol Belski
3803bbde24 fix test 2015-04-14 15:20:44 +02:00
Dmitry Stogov
6762fcfa90 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed recently introduced memory leak
 2015-04-14 15:49:44 +03:00
Dmitry Stogov
e1821090ef Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed recently introduced memory leak
 2015-04-14 15:48:20 +03:00
Dmitry Stogov
dfffa0ba5b Fixed recently introduced memory leak 2015-04-14 15:47:26 +03:00
Dmitry Stogov
753fa0c593 Partial revert of 1a7798c786 that introduced wrong memory access 2015-04-14 15:35:33 +03:00
Xinchen Hui
5db1a56705 Merge branch 'master' of https://git.php.net/repository/php-src 2015-04-14 19:50:03 +08:00
Xinchen Hui
a4d5a78f89 Fixed test in PHP7 2015-04-14 19:49:00 +08:00
Dmitry Stogov
28011fd14f Fixed recently introduced memory leak 2015-04-14 14:46:26 +03:00
Xinchen Hui
e68b851217 Merge branch 'PHP-5.6' 
Conflicts:
	Zend/zend_exceptions.c
 2015-04-14 19:33:46 +08:00
Xinchen Hui
5fc635548e Merge branch 'PHP-5.5' into PHP-5.6 2015-04-14 19:32:28 +08:00
Xinchen Hui
4b27569dc3 codes standard 2015-04-14 19:32:01 +08:00
Dmitry Stogov
26a6d707a1 Fixed memory leak in ext/standard/tests/array/compact_variation1.phpt 2015-04-14 13:45:05 +03:00
Dmitry Stogov
0d18aa8610 Use Z_TYPE_INFO_P() instead Z_TYPE_P() when we check for few scalar types. This allow C compiler to generate the better code. 2015-04-14 13:09:31 +03:00
Derick Rethans
66bd59225b - Updated to version 2015.3 (2015c) 2015-04-14 10:51:15 +01:00
Derick Rethans
9f815c9201 Empty merge 2015-04-14 10:51:15 +01:00
Derick Rethans
d887ef5a04 - Updated to version 2015.3 (2015c) 2015-04-14 10:51:12 +01:00