archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
80697 commits 526 branches 1434 tags 877 MiB
Commit graph

8079 commits

Author SHA1 Message Date
Nikita Popov
ac552cccc1 Merge branch 'PHP-5.6' 2014-07-02 17:37:25 +02:00
Nikita Popov
1ea4b17af2 Merge branch 'PHP-5.5' into PHP-5.6 2014-07-02 17:36:27 +02:00
Nikita Popov
d9ebd0f3d6 Fix bug #67497: eval with parse error causes segfault in generator 2014-07-02 17:33:31 +02:00
Bob Weinand
6b0beb9df1 Merge branch 'PHP-5.6' 2014-07-02 17:26:44 +02:00
Bob Weinand
1163a7ce24 Mark test as XFAIL until fixed 2014-07-02 17:25:47 +02:00
Bob Weinand
c01dcd325d Merge branch 'PHP-5.6' 2014-07-02 12:44:30 +02:00
Bob Weinand
33699a4dab Messed up syntax of tests 2014-07-02 12:43:27 +02:00
Bob Weinand
0870cc8a7c Merge branch 'PHP-5.6' 2014-07-02 12:35:06 +02:00
Bob Weinand
09d1a8aaab Add tests for constant expression arrays 
Adding one failing (!) test for now about circular constant references embedded in a constant AST, must be fixed before PHP 5.6 release.
 2014-07-02 12:33:46 +02:00
Dmitry Stogov
8c9b3e664c Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fixed possible crash because of race conditions on modifying constants in shared memory
 2014-07-01 00:17:55 +04:00
Dmitry Stogov
2330be5641 Fixed possible crash because of race conditions on modifying constants in shared memory 2014-07-01 00:13:34 +04:00
Xinchen Hui
18bde665f5 Merge branch 'PHP-5.6' 2014-06-24 13:53:43 +08:00
Xinchen Hui
9d49492fd6 Fixed bug #67368 (Memory leak with immediately dereferenced array in class constant) 2014-06-24 13:53:05 +08:00
Ferenc Kovacs
f5defa1cf2 Merge branch 'PHP-5.6' 
* PHP-5.6:
  testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
  mention 67468 fix in NEWS
  Fix Bug #67468  Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded
 2014-06-23 10:14:08 +02:00
Ferenc Kovacs
53158f2c32 testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql) 2014-06-23 10:10:17 +02:00
Andreas Ferber
c5e6c2a5f5 Fix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded 
str_efree() must be used in zend_highlight() and zend_indent() to free
string data assigned to a zval to account for interned strings.
 2014-06-23 09:51:44 +02:00
Bob Weinand
b4d61c335b Merge branch 'PHP-5.6' 2014-06-16 11:20:05 +02:00
Bob Weinand
3c2b42ac41 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_compile.c
 2014-06-16 11:18:45 +02:00
Bob Weinand
e93f8e74d4 Merge branch 'PHP-5.4' into PHP-5.5 2014-06-16 11:16:33 +02:00
Bob Weinand
0a3979e08b Fix patch for bug #67436 2014-06-16 11:10:50 +02:00
Bob Weinand
8668f205ca Merge branch 'PHP-5.6' 2014-06-16 00:43:31 +02:00
Bob Weinand
7cef3a57ad Merge branch 'PHP-5.5' into PHP-5.6 2014-06-16 00:42:50 +02:00
Bob Weinand
03ee0ddc5f Merge branch 'PHP-5.4' into PHP-5.5 2014-06-16 00:41:46 +02:00
Levi Morrison
6c9c44905e Added tests for bug 67436 2014-06-15 16:31:39 -06:00
Bob Weinand
143cc3f0da Merge branch 'PHP-5.6' 2014-06-15 23:16:21 +02:00
Bob Weinand
f92143f740 Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	NEWS
	Zend/zend_compile.c
 2014-06-15 23:06:15 +02:00
Bob Weinand
f5f1c702cd Merge branch 'PHP-5.4' into PHP-5.5 2014-06-15 22:24:44 +02:00
Bob Weinand
ca29063da5 Fix bug #67436 2014-06-15 22:18:25 +02:00
Xinchen Hui
d461afc3a2 Merge branch 'PHP-5.6' 2014-06-10 21:58:31 +08:00
Xinchen Hui
ebe6854dbc Merge branch 'PHP-5.5' into PHP-5.6 
Conflicts:
	Zend/zend_execute_API.c
 2014-06-10 21:58:16 +08:00
Xinchen Hui
e8699d75da Remove unused included file 2014-06-10 21:56:30 +08:00
Stanislav Malyshev
9fceb05fcf Merge branch 'PHP-5.6' 
* PHP-5.6:
  Bug 64744 Show the type of the non-object for more descriptive errors
 2014-06-08 19:18:09 -07:00
Boro Sitnikovski
cfccdc6362 Bug 64744 
Show the type of the non-object for more descriptive errors
 2014-06-08 19:14:58 -07:00
Stanislav Malyshev
a17734fb04 Merge branch 'PHP-5.6' 
* PHP-5.6:
  Fix bug 666222
  Fix bug 666222
 2014-06-08 19:02:51 -07:00
Stanislav Malyshev
8f527fbf14 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix bug 666222
  Fix bug 666222
 2014-06-08 19:02:24 -07:00
Levi Morrison
f47976dd9b Fix bug 666222 
This also adds some smaller, isolated tests related to bug 66622.
 2014-06-08 18:59:44 -07:00
Levi Morrison
e030efa4f6 Fix bug 666222 
This also adds some smaller, isolated tests related to bug 66622.

Conflicts:
	Zend/zend_vm_def.h
	Zend/zend_vm_execute.h
 2014-06-08 18:59:23 -07:00
Stanislav Malyshev
19edbc9720 Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fixed identation on file
  Fix align indentation
 2014-06-08 15:54:32 -07:00
Stanislav Malyshev
38343856e1 Merge branch 'PHp-5.4' into PHP-5.5 
* PHp-5.4:
  Fixed identation on file
  Fix align indentation
 2014-06-08 15:53:26 -07:00
Stanislav Malyshev
224f369a03 Merge remote-tracking branch 'github/pr/671' 
* github/pr/671:
  Fix align indentation
  Fixed identation on file
 2014-06-08 14:29:03 -07:00
Jefersson Nathan
e51eaaf665 Fix align indentation 2014-06-08 14:28:51 -07:00
Nikita Popov
2adda06544 Merge branch 'PHP-5.6' 2014-06-06 17:13:08 +02:00
Nikita Popov
6d1885342c Fix bug #67392: dtrace breaks argument unpack 2014-06-06 17:09:49 +02:00
Xinchen Hui
dc8a53d4ba Merge branch 'PHP-5.6' 2014-05-24 21:11:26 +08:00
Xinchen Hui
666197b8cc Added folder mark 2014-05-24 21:11:13 +08:00
Jefersson Nathan
dd2005535c Fix align indentation 2014-05-12 13:37:47 -03:00
Bob Weinand
5bc4eb714a Merge branch 'PHP-5.4' into PHP-5.5 2014-05-11 15:15:27 +02:00
Bob Weinand
5bf6a093ad Fix Linux specific fail in error traces (cherry-picked and fix for bug #67245) 
Linux apparently does not like memcpy in overlapping regions...
 2014-05-11 15:11:03 +02:00
Anatol Belski
149568f4da Merge branch 'PHP-5.6' 
* PHP-5.6:
  fixed ZEND_DEBUG usage
 2014-05-05 00:51:40 +02:00
Anatol Belski
0d5121a3c7 fixed ZEND_DEBUG usage 2014-05-05 00:50:51 +02:00