php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-14 11:32:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
94,021 Commits 547 Branches 1,483 Tags
33d41da3474729486d6bbb7fb13e1b697356481e
Commit Graph

94021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anatol Belski
33d41da347 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS
 2016-04-27 11:45:29 +02:00
Stanislav Malyshev
e315a162da Merge branch 'PHP-5.5' into PHP-5.6 
* PHP-5.5:
  Fix memory leak
  Fix bug #72099: xml_parse_into_struct segmentation fault
  5.5.36 now
  Fix bug #72094 - Out of bounds heap read access in exif header processing
  Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition
  Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
  Fix for bug #71912 (libgd: signedness vulnerability)
  Typo in NEWS

Conflicts:
	configure.in
	main/php_version.h
 2016-04-26 23:48:41 -07:00
Stanislav Malyshev
a32e143d4e fix build 2016-04-26 23:04:29 -07:00
Stanislav Malyshev
ccc12efa32 Fix bug #71923 - integer overflow in ZipArchive::getFrom* 2016-04-26 22:59:09 -07:00
Stanislav Malyshev
61c7a06e7c Fix memory leak 2016-04-26 22:54:58 -07:00
Stanislav Malyshev
dccda88f27 Fix bug #72099: xml_parse_into_struct segmentation fault 2016-04-26 22:46:28 -07:00
Xinchen Hui
c89b7a4860 Use zend_string_safe_alloc 2016-04-27 12:45:02 +08:00
Julien Pauli
f856734c67 5.5.36 now 2016-04-26 22:34:00 +02:00
Dmitry Stogov
4ce8a15eae Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
 2016-04-26 13:44:52 +03:00
Dmitry Stogov
9f389cccfd Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions) 2016-04-26 13:43:18 +03:00
Dmitry Stogov
8f0ceb97cf Fixed bug #72100 (implode() inserts garbage into resulting string when joins very big integer). (Mikhail Galanin) 2016-04-26 13:04:06 +03:00
Dmitry Stogov
92233dd736 Fixed bug #72101 (crash on complex code) 2016-04-25 14:11:46 +03:00
Stanislav Malyshev
082aecfc3a Fix bug #72094 - Out of bounds heap read access in exif header processing 2016-04-24 19:33:52 -07:00
Stanislav Malyshev
d650063a04 Fix bug #72093: bcpowmod accepts negative scale and corrupts _one_ definition 
We can not modify result since it can be copy of _zero_ or _one_, etc. and
"copy" in bcmath is just bumping the refcount.
 2016-04-24 18:33:32 -07:00
Stanislav Malyshev
fd9689745c Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset 2016-04-24 13:15:17 -07:00
Pierrick Charron
a2d78d1a5f Fixed bug #68658 (Define CURLE_SSL_CACERT_BADFILE) 2016-04-23 22:55:00 -04:00
Pierrick Charron
043ce195c6 Fix cURL test to use local server instead of google 2016-04-23 18:37:55 -04:00
Anatol Belski
e0edb25cf2 Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive root 2016-04-23 18:55:52 +02:00
Xinchen Hui
589d0e0f18 Fixed bug #72069 (Behavior \JsonSerializable different from json_encode) 2016-04-22 21:41:44 -07:00
Xinchen Hui
9eb7c8cd3b Fixed bug #72075 (Referencing socket resources breaks stream_select) 2016-04-22 21:21:49 -07:00
Nikita Popov
988bdd0908 Fix escape sequences in pgsql.c 2016-04-21 23:41:59 +02:00
Bob Weinand
69efeb1223 Fix constant expr coaleasce with protected mode opcache 2016-04-21 21:51:00 +02:00
Bob Weinand
5053fc078d Fixed bug #72059 - Reference the bug id directly in NEWS 2016-04-21 02:48:52 +02:00
Bob Weinand
a287c3f776 Fix magic constants (__LINE__) with ?? for constant scalar exprs 
Also fix general memory leak when root ast gets replaced in compile time evaluation
 2016-04-21 02:45:09 +02:00
Bob Weinand
672a99597c Add NEWS entry for ?? in constant scalar expressions 2016-04-21 01:24:56 +02:00
Márcio Almada
9f3eab44df allow null coalescing (??) on constant expressions 2016-04-21 01:22:28 +02:00
Nikita Popov
85867268fd Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	Zend/zend_compile.c
 2016-04-20 19:00:02 +02:00
Adam Harvey
c4f69b6dfd Fix ZTS builds by adding a missing TSRMLS_FETCH(). 2016-04-20 18:58:29 +02:00
Nikita Popov
77bb96d7c9 Fix bug #71737 
Also improve the error message for $this used in parameters.
 2016-04-20 18:38:40 +02:00
Xinchen Hui
ede06b7e20 Update NEWS 2016-04-20 08:42:06 -07:00
Nikita Nefedov
19759a5602 Fix RECV opcode to handle all kinds of exceptions 
fix RECV opcode to handle exceptions thrown from user-defined error handler
as a result Notice error from failed type coercion
 2016-04-20 08:40:44 -07:00
Stanislav Malyshev
7d93363bd9 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Better fix for #71952

Conflicts:
	ext/gd/gd.c
 2016-04-19 23:45:21 -07:00
Stanislav Malyshev
c02301b666 Better fix for #71952 2016-04-19 23:44:00 -07:00
Stanislav Malyshev
086729bb6c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Fix bug #71952: Corruption inside imageaffinematrixget

Conflicts:
	ext/gd/gd.c
 2016-04-18 23:34:26 -07:00
Stanislav Malyshev
f061867fd3 Fix bug #71952: Corruption inside imageaffinematrixget 2016-04-18 23:33:21 -07:00
Stanislav Malyshev
b15f0ecc0f Fix for bug #71912 (libgd: signedness vulnerability) 2016-04-18 22:24:16 -07:00
Xinchen Hui
5ea2b3625d Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0 
* 'PHP-7.0' of git.php.net:/php-src:
  Prevent usage in GC after free.
  Fix SEND_USER as well
  Fix SEND_ARRAY+PREFER_REF SHM corruption
 2016-04-19 10:59:35 +08:00
Xinchen Hui
7648f20de3 Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected) 2016-04-19 10:59:10 +08:00
Dmitry Stogov
e46be0cd19 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Prevent usage in GC after free.
 2016-04-19 01:37:24 +03:00
Dmitry Stogov
ffc697ac27 Prevent usage in GC after free. 2016-04-19 01:31:49 +03:00
Nikita Popov
73958ca62d Fix SEND_USER as well 
Missed copy&paste code here
 2016-04-18 22:45:38 +02:00
Nikita Popov
a8792158bd Fix SEND_ARRAY+PREFER_REF SHM corruption 
Make the behavior consistent between namespaced and not and with
PHP 5.6.
 2016-04-18 18:26:20 +02:00
Xinchen Hui
aa9f8e695c combine conditions 2016-04-18 19:13:54 +08:00
Bob Weinand
b08bde185d Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0 2016-04-18 12:13:59 +02:00
Ferenc Kovacs
8f35ee49ee Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  mark frequent intermittent fpm test with XFAIL
 2016-04-18 09:04:55 +02:00
Ferenc Kovacs
3a16f511d9 mark frequent intermittent fpm test with XFAIL 2016-04-18 09:04:27 +02:00
Ferenc Kovacs
50cfe0a15c Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  prepare for 5.6.21RC1
 2016-04-18 08:15:47 +02:00
Ferenc Kovacs
6497d40521 prepare for 5.6.21RC1 2016-04-18 08:14:16 +02:00
Christopher Jones
3b54d93b2f Bump version in test 2016-04-18 11:15:01 +10:00
Nikita Popov
d1a38743a5 Fix SEND_UNPACK array separation 
Separating only immutable arrays is not enough.
 2016-04-16 22:33:23 +02:00