php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-28 02:33:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
96,188 Commits 549 Branches 1,485 Tags
d2bc82586b67882fdcdabac8e05cfbb4104bfd47
Commit Graph

96188 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 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
Joe Watkins 61b848833d bump news file 2016-06-07 13:12:00 +01:00
Dmitry Stogov 90c2b237d6 Merge branch 'master' of git.php.net:php-src 
* 'master' of git.php.net:php-src:
  #72337 invalid dimensions can lead to segv
  7.0.9 next
 2016-06-07 14:08:41 +03:00
Dmitry Stogov b12dfbad6a Added test 2016-06-07 14:08:12 +03:00
Dmitry Stogov 5b81f9d92e Fixed bug #72202 (curl_close doesn't close cURL handle) 
Now curl_close() forces connection close, independently of other links to the same resource.

This reverts commit 3ba4f8263d.
 2016-06-07 14:03:14 +03:00
Pierre Joye 99f8a5587b update NEWS 2016-06-07 17:40:55 +07:00
Pierre Joye 2edbb3e115 Merge branch 'master' of git.php.net:php-src 2016-06-07 17:39:22 +07:00
Pierre Joye 3071ba1ff8 Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0 2016-06-07 17:38:41 +07:00
Pierre Joye 4f8a451371 Merge branch 'PHP-5.6' 
* PHP-5.6:
  #72337 invalid dimensions can lead to segv
 2016-06-07 17:19:17 +07:00
Pierre Joye 1bbd7fc7eb Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  #72337 invalid dimensions can lead to segv
 2016-06-07 17:18:14 +07:00
Pierre Joye f80125950c #72337 invalid dimensions can lead to segv 2016-06-07 17:16:40 +07:00
Anatol Belski d48764880e Merge branch 'PHP-7.0' 
* PHP-7.0:
  7.0.9 next
 2016-06-07 10:04:58 +02:00
Anatol Belski 041210f441 7.0.9 next 2016-06-07 10:04:25 +02:00
Dmitry Stogov 214d4613f5 cleanup 2016-06-07 01:14:53 +03:00
Dmitry Stogov d324db717c Fixed mixed declarations and code 2016-06-07 01:01:48 +03:00
Anatol Belski 3c4edc8c62 Merge branch 'PHP-7.0' 
* PHP-7.0:
  Add test for bug #53735
 2016-06-06 21:08:18 +02:00
Anatol Belski edb8c3f6e3 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add test for bug #53735
 2016-06-06 21:07:45 +02:00
Anatol Belski 2a0ed8a2eb Add test for bug #53735 2016-06-06 21:06:06 +02:00
Dmitry Stogov cebb5cd46e micro-optimization 2016-06-06 20:45:10 +03:00
Dmitry Stogov 58c083dfc9 simplification 2016-06-06 15:50:06 +03:00
Dmitry Stogov 80b39b498a Improve type narrowing (check only SSA definitions). 2016-06-06 14:57:02 +03:00
Nikita Popov 543649bd4c Fix correctness issues with type narrowing 
Fixes bug #72335.
 2016-06-06 14:56:17 +03:00
Anatol Belski da280d41b6 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix ibase handle initialization, mostly compiler warnings
 2016-06-06 13:33:39 +02:00
Anatol Belski 3e6c02b91a fix ibase handle initialization, mostly compiler warnings 2016-06-06 13:30:17 +02:00
Anatol Belski edf769c023 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix typo
 2016-06-06 08:58:40 +02:00
Anatol Belski 174c3371bd Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix typo
 2016-06-06 08:58:08 +02:00
Anatol Belski eaef8f6db2 fix typo 2016-06-06 08:56:40 +02:00
Anatol Belski ba3763fa2d hard_timeout ignored on TS 2016-06-06 08:41:07 +02:00
Anatol Belski 52ebd5611f fix hard_timeout support in shutdown functions 2016-06-06 08:41:07 +02:00
Anatol Belski db68121da8 Merge branch 'PHP-7.0' 
* PHP-7.0:
  fix broken skipif and add xfail for now
 2016-06-06 08:23:22 +02:00
Anatol Belski 075c75873e Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  fix broken skipif and add xfail for now
 2016-06-06 08:21:39 +02:00
Anatol Belski 1b2afd478b fix broken skipif and add xfail for now 2016-06-06 08:20:01 +02:00
Anatol Belski 628272ee6c Merge branch 'PHP-7.0' 
* PHP-7.0:
  missing return
 2016-06-06 07:34:34 +02:00
Anatol Belski 6ec8b2c57d Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  missing return
 2016-06-06 07:33:36 +02:00
Anatol Belski c05b417718 missing return 2016-06-06 07:28:12 +02:00