clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
96,283 Commits 491 Branches 1,363 Tags 836 MiB
fba6f90ae3
Commit Graph

96283 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jakub Zelenka
1f7535234e Merge branch 'PHP-5.6' into PHP-7.0 2016-06-05 17:30:03 +01:00
Jakub Zelenka
d4615d1118 Add new test for openssl_pkey_new 2016-06-05 17:27:47 +01:00