clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 02:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
96,227 Commits 491 Branches 1,363 Tags 841 MiB
771e5cc247
Commit Graph

96227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aaron Piotrowski
771e5cc247 Replace zend_ce_error with NULL and replace more E_ERROR with thrown Error 2016-06-13 09:02:17 -05:00
Aaron Piotrowski
e3c681aa5c Merge branch 'master' into throw-error-in-extensions 2016-06-10 22:02:23 -05:00
Nikita Popov
792e89385c Fixed bug #72373 2016-06-10 15:57:18 +02:00
Anatol Belski
33f6fc1790 fix test out 2016-06-09 20:16:09 +02:00
Anatol Belski
4ceffa7204 fix test 2016-06-09 20:12:49 +02:00
Anatol Belski
b34496e08f sync with deleted file 2016-06-09 17:19:40 +02:00
Anatol Belski
30a78e96ed fix tests 2016-06-09 17:19:40 +02:00
Anatol Belski
22f20e2868 add flags to suppress the verbosity 2016-06-09 17:19:40 +02:00
Xinchen Hui
978f74a848 Request #69489 2016-06-09 17:19:40 +02:00
Christoph M. Becker
b4ca066455 Merge branch 'pull-request/1912' 2016-06-09 16:30:52 +02:00
Christoph M. Becker
2ce190bb83 Merge branch 'master' of http://git.php.net/repository/php-src 2016-06-09 15:58:09 +02:00
Christoph M. Becker
74c06a64f0 Merge branch 'PHP-7.0' 2016-06-09 15:45:54 +02:00
Christoph M. Becker
07a793810f Merge branch 'PHP-5.6' into PHP-7.0 2016-06-09 15:35:28 +02:00
Christoph M. Becker
1f7cc24df7 Merge branch 'pull-request/1930' into PHP-5.6 2016-06-09 15:28:58 +02:00
Dmitry Stogov
b602495e5c Optimization 2016-06-09 16:01:55 +03:00
Dmitry Stogov
df7dccea83 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Fixed bug #72369 (array_merge() produces references in PHP7)
 2016-06-09 15:09:09 +03:00
Dmitry Stogov
bfcf32237e Fixed bug #72369 (array_merge() produces references in PHP7) 2016-06-09 15:07:44 +03:00
Dmitry Stogov
e7e79aa409 Delay IS_ERROR checks 2016-06-09 12:39:38 +03:00
Ferenc Kovacs
4138db014c Merge branch 'PHP-7.0' 
* PHP-7.0:
  5.6.24 will be next
 2016-06-09 10:53:12 +02:00
Ferenc Kovacs
65b6950a56 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  5.6.24 will be next
 2016-06-09 10:52:26 +02:00
Ferenc Kovacs
c26097c2f1 5.6.24 will be next 2016-06-09 10:51:02 +02:00
Jakub Zelenka
296aa365ca Merge branch 'PHP-7.0' 2016-06-08 18:37:32 +01:00
Jakub Zelenka
84dce33b04 Merge branch 'PHP-5.6' into PHP-7.0 2016-06-08 18:36:36 +01:00
Jakub Zelenka
05033c9ebd Fix bug #72140 (segfault after calling ERR_free_strings()) 2016-06-08 18:21:39 +01:00
Dmitry Stogov
a315842751 typo 2016-06-08 19:01:28 +03:00
Nikita Popov
766ad0d970 Followup for bug #53432 
Assign-ops and nested accesses now get the same treatment.
 2016-06-08 15:43:58 +02:00
Dmitry Stogov
0c79896208 cleanup 2016-06-08 12:55:31 +03:00
Dmitry Stogov
b03dce0cb3 Replaced wrong check with proper ZEND_ASSERT() 2016-06-08 12:11:47 +03:00
Dmitry Stogov
fc587c7c55 Removed useless reference counting 2016-06-08 11:24:53 +03:00
Dmitry Stogov
3610156c5d This test was fixed together with fix for bug #70228 2016-06-08 11:14:06 +03:00
Anatol Belski
d2bc82586b fix php_log_err macro 2016-06-08 08:10:41 +02:00
Pierre Joye
4b75cb120d Merge branch 'PHP-5.6' 
* PHP-5.6:
  prevent invalid color index (palette only), may lead to crash
  Add CVE to #66387

Conflicts:
	NEWS
 2016-06-08 11:13:27 +07:00
Pierre Joye
ced675de22 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 2016-06-08 11:08:05 +07:00
Pierre Joye
4d81bf937f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  prevent invalid color index (palette only), may lead to crash
  Add CVE to #66387
  add missing NEWS entry
 2016-06-08 11:07:32 +07:00
Pierre Joye
6d3fa654b7 prevent invalid color index (palette only), may lead to crash 2016-06-08 11:06:48 +07:00
Dmitry Stogov
10f056255e Better fix for bug #70228 (memleak if return in finally block) 2016-06-08 02:20:45 +03:00
Dmitry Stogov
2bae4e18a2 Fixed bug #70228 (Memleak if return in finally block) 2016-06-08 00:23:33 +03:00
Dmitry Stogov
421843977f Fixed bug #71266 (Missing separation of properties HT in foreach etc). 2016-06-07 23:18:52 +03:00
Lior Kaplan
e6211038cb Add CVE to #66387 2016-06-07 21:46:59 +03:00
Lior Kaplan
48d629eb45 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add CVE to #66387
 2016-06-07 21:46:25 +03:00
Lior Kaplan
62f9d1e3ae Add CVE to #66387 2016-06-07 21:45:24 +03:00
Nikita Popov
be37de1ff1 Use LCA for object(ce) type joins 
For B, C extending A the join of object(B) and object(C) should
be object(instanceof A). For simplicity we only handle the class
hierarchy, as computing the least common unique ancestor for
interfaces would be more involved.

Also ignore phi sources that don't have an object type: The join
of null and object(A) is now null|object(A) rather than
null|object.
 2016-06-07 20:42:00 +02:00
Nikita Popov
d8a2370884 Cleanup 2016-06-07 20:42:00 +02:00
Anatol Belski
f4a0011b9e Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix NEWS
  add missing NEWS entry
  update NEWS
 2016-06-07 18:45:46 +02:00
Anatol Belski
7935a1e2ff fix NEWS 2016-06-07 18:44:40 +02:00
Anatol Belski
74d8429f53 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  add missing NEWS entry
 2016-06-07 18:42:55 +02:00
Anatol Belski
1d0f128351 add missing NEWS entry 2016-06-07 18:41:17 +02:00
Joe Watkins
23c4ac2ca3 bump news file 2016-06-07 14:10:27 +01:00
Joe Watkins
43293c426d Revert "bump news file" 
This reverts commit 61b848833d.
 2016-06-07 14:09:09 +01:00
Joe Watkins
cab1510360 Merge branch 'master' of https://github.com/php/php-src 2016-06-07 13:12:34 +01:00