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

41711 Commits

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
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
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
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
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
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
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
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
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
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
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
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
Nikita Popov
e6296f0dcc Fix VERIFY_RETURN_TYPE elision 
This both fixes incorrect elision and allows elision for cases
where we only have a subset (e.g. true of bool).
 2016-06-05 23:44:08 +02:00
Nikita Popov
c5348850df Fix bug71843.phpt 
Is Travis not running opcache tests?
 2016-06-05 23:05:03 +02:00
Nikita Popov
9fa1ab1b22 Check SKIP_SLOW_TESTS in issue0140.phpt 
This test contains two sleeps...
 2016-06-05 23:05:00 +02:00
Nikita Popov
7b4618e396 Fix SSA NOP removal 
NOPs need to be tracked in the shiftlist as well, as there may be
jumps to NOPs.
 2016-06-05 23:00:32 +02:00
Nikita Popov
3be92120ba Fix handling of parse_str() with unpack in optimizer 2016-06-05 22:16:15 +02:00
Nikita Popov
70f0546885 Don't optimize special dynamic calls to non-dynamic 
As it drops the warning. This is more problematic with constant
propagation, as tests would fail.

Extract a zend_optimizer_classify_function() function, as its now
needed by zend_cfg and update_opN.
 2016-06-05 22:04:36 +02:00
Jakub Zelenka
da83e4295a Merge branch 'PHP-7.0' 2016-06-05 17:31:05 +01:00