php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-31 20:53:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
99,229 Commits 547 Branches 1,481 Tags
4faa540b45fce018252cd00751d3a5002ad3d00a
Commit Graph

10551 Commits

Author SHA1 Message Date
Stanislav Malyshev
619a691c7c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fix bug #73645 - int/size_t confusion
 2016-12-05 22:16:42 -08:00
Stanislav Malyshev
1d59ed7524 Fix bug #73645 - int/size_t confusion 2016-12-05 22:16:00 -08:00
Anatol Belski
9c7540d357 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  improve skipif
 2016-12-01 13:33:42 +01:00
Anatol Belski
615c9bfe5a fix condition 2016-12-01 13:33:27 +01:00
Anatol Belski
043d8e2fe1 improve skipif 2016-12-01 13:32:10 +01:00
Anatol Belski
8ecbb660d0 improve skipif 2016-12-01 13:25:28 +01:00
Dmitry Stogov
cabcf8971f Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on).
 2016-11-28 12:57:02 +03:00
Dmitry Stogov
9a9ad56af0 Fixed bug #73586 (php_user_filter::$stream is not set to the stream the filter is working on). 2016-11-28 12:54:47 +03:00
Stanislav Malyshev
dd7eee0609 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add more mbfl string size checks (bug #73505)
 2016-11-26 14:48:50 -08:00
Stanislav Malyshev
58cdd03d92 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add more mbfl string size checks (bug #73505)
 2016-11-26 14:48:40 -08:00
Stanislav Malyshev
5ee02b207d Add more mbfl string size checks (bug #73505) 2016-11-26 14:47:58 -08:00
Nikita Popov
1c733a345f Merge branch 'PHP-7.0' into PHP-7.1 2016-11-22 19:25:53 +01:00
Nikita Popov
5b88c61580 Merge branch 'PHP-5.6' into PHP-7.0 2016-11-22 19:25:31 +01:00
Nikita Popov
2d19c92fc2 Make php_url_parse_ex() respect length argument 
This should fix all out-of-bounds reads that could previously
occur if the string passed to php_url_parse_ex() is not NUL
terminated.
 2016-11-22 19:24:24 +01:00
Nikita Popov
f0f68c7274 Cleanup parse_url() query/fragment handling 
The query/fragment handling was pretty convoluted, with many parts
being duplicated. Simplify by checking for fragment, then for query,
then for path.
 2016-11-22 19:24:23 +01:00
Nikita Popov
9befad6fc2 Cleanup parse_url() gotos 
Simplify some unnecessarily complicated code. In particular the
length updates are unnecessary (length is only used at the very
start) and we're goto'ing around a bit too much.
 2016-11-22 19:24:21 +01:00
Nikita Popov
8bb3957270 Fixed bug #73303 2016-11-18 21:41:43 +01:00
Mitch Hagstrand
55980684f6 Fix the lchwon error test for Travis CI. 
The E_WARNING message from the PHP function lchown is passed
from the system function lchown. The error message returned
from lchown can be filesystem dependent.
 2016-11-18 17:55:44 +01:00
Dmitry Stogov
d769a020df Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed memory leaks in parse_ini_file()
 2016-11-18 16:18:22 +03:00
Dmitry Stogov
97b65cc9c2 Fixed memory leaks in parse_ini_file() 2016-11-18 16:17:52 +03:00
Julien Pauli
4b2cbc3f2f Improvement for bug73297 2016-11-17 11:51:53 +01:00
Rowan Collins
66ac73bee8 Simplify ext/standard/tests/http/bug73297.phpt 2016-11-17 11:51:53 +01:00
Rowan Collins
94374c51e7 http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses 2016-11-17 11:51:53 +01:00
Rowan Collins
4683377dfa Add failing test for bug#73297 2016-11-17 11:51:53 +01:00
Julien Pauli
0f9225f893 Improvement for bug73297 2016-11-17 11:51:30 +01:00
Rowan Collins
773bc082ca Simplify ext/standard/tests/http/bug73297.phpt 2016-11-17 11:51:29 +01:00
Rowan Collins
417162a9ba http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses 2016-11-17 11:51:29 +01:00
Rowan Collins
12c4ff9b87 Add failing test for bug#73297 2016-11-17 11:51:29 +01:00
Julien Pauli
49030f2a25 Improvement for bug73297 2016-11-17 11:33:36 +01:00
Rowan Collins
eba5e276c7 Simplify ext/standard/tests/http/bug73297.phpt 2016-11-17 11:04:57 +01:00
Rowan Collins
aec1a5eccc http_fopen_wrapper.c - bug#73297 Skip past "100 Continue" responses 2016-11-17 11:04:56 +01:00
Rowan Collins
6122526cea Add failing test for bug#73297 2016-11-17 11:04:56 +01:00
Joe Watkins
ff1986e4d7 Merge branch 'pull-request/2198' 2016-11-12 08:16:01 +00:00
Joe Watkins
41e04dbec0 Merge branch 'pull-request/2198' 2016-11-12 08:15:52 +00:00
Anatol Belski
9b81342352 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
  Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
  Fix #72696: imagefilltoborder stackoverflow on truecolor images
  Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
  Fix bug #73144 and bug #73341 - remove extra dtor
  remove unreferenced var came in with merge
  Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
  Fix #72696: imagefilltoborder stackoverflow on truecolor images
  Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
  fix version
  set versions
  Fix bug #73144 and bug #73341 - remove extra dtor
  Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
 2016-11-08 11:15:06 +01:00
Anatol Belski
2b30b54275 Merge remote-tracking branch 'phpsec/PHP-7.0.13' into PHP-7.0 
* phpsec/PHP-7.0.13:
  Fixed bug #73418 Integer Overflow in "_php_imap_mail" leads to crash
  Fix #72696: imagefilltoborder stackoverflow on truecolor images
  Fix #72482: Ilegal write/read access caused by gdImageAALine overflow
  Fix bug #73144 and bug #73341 - remove extra dtor
  remove unreferenced var came in with merge
  Fix bug #73331 - do not try to serialize/unserialize objects wddx can not handle
  fix version
  set versions
 2016-11-08 11:13:29 +01:00
Anatol Belski
33766347cb Merge remote-tracking branch 'phpsec/PHP-5.6.28' into PHP-5.6 2016-11-08 11:06:52 +01:00
Nikita Popov
c0762bd8c8 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-05 23:10:19 +01:00
Nikita Popov
b2af4e8868 Complete the fix of bug #70172 for PHP 7 2016-11-05 23:06:27 +01:00
Stanislav Malyshev
3b78cabc88 More int->size_t and string overflow fixes 2016-11-05 14:00:47 -07:00
Stanislav Malyshev
f7f8aae33c Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  More int->size_t and string overflow fixes
 2016-11-05 13:59:35 -07:00
Stanislav Malyshev
669763d88a More int->size_t and string overflow fixes 2016-11-05 13:22:17 -07:00
Anatol Belski
617f38b0e0 fix dir separator in test 2016-11-04 18:29:54 +01:00
Anatol Belski
177bb79359 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  fix dir separator
 2016-11-04 13:11:29 +01:00
Anatol Belski
a61eade827 fix dir separator 2016-11-04 13:10:52 +01:00
Stanislav Malyshev
25d04ad8e3 Merge branch 'PHP-7.0' into PHP-7.1 
* PHP-7.0:
  Add length check for bzcompress too - fix for bug #73356
  More string length checks & fixes
  More string length checks & fixes
 2016-11-03 22:53:05 -07:00
Stanislav Malyshev
d858b4c77f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Add length check for bzcompress too - fix for bug #73356
 2016-11-03 22:30:46 -07:00
Stanislav Malyshev
2fa455128c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  More string length checks & fixes
 2016-11-03 22:05:25 -07:00
Stanislav Malyshev
1fd18821e0 More string length checks & fixes 2016-11-03 21:35:09 -07:00
Christoph M. Becker
b281362681 Merge branch 'PHP-7.0' into PHP-7.1 2016-11-01 20:29:11 +01:00