]>
granicus.if.org Git - php/log
Anatol Belski [Sun, 1 May 2016 17:05:02 +0000 (19:05 +0200)]
fix dir separator in test
Anatol Belski [Sun, 1 May 2016 11:23:35 +0000 (13:23 +0200)]
Merge branch 'PHP-7.0' of git.php.net:php-src into PHP-7.0
Anatol Belski [Sun, 1 May 2016 11:19:48 +0000 (13:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Update PHP 5.5 NEWS entries with CVE info
Added CVE
Updated NEWS
Anatol Belski [Sun, 1 May 2016 11:18:24 +0000 (13:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Update PHP 5.5 NEWS entries with CVE info
Added CVE
Updated NEWS
Lior Kaplan [Sun, 1 May 2016 11:14:57 +0000 (13:14 +0200)]
Update PHP 5.5 NEWS entries with CVE info
Nikita Popov [Sun, 1 May 2016 11:07:01 +0000 (13:07 +0200)]
Fix posix build
Nikita Popov [Sun, 1 May 2016 11:04:08 +0000 (13:04 +0200)]
Fix ('\bar')() in namespace
Xinchen Hui [Sun, 1 May 2016 03:00:41 +0000 (11:00 +0800)]
Fixed bug #72133 (php_posix_group_to_array crashes if gr_passwd is NULL)
Sara Golemon [Sat, 30 Apr 2016 06:02:01 +0000 (06:02 +0000)]
Create temporary sqlite db in test dir rather than cwd (and clean it up)
Well behaved tests do not leave their droppings all over the filesystem.
Anatol Belski [Fri, 29 Apr 2016 12:30:19 +0000 (14:30 +0200)]
fix test
Pierrick Charron [Wed, 27 Apr 2016 22:43:41 +0000 (18:43 -0400)]
Expose some of the new curl constants to PHP userspace
Lior Kaplan [Fri, 29 Apr 2016 10:41:29 +0000 (13:41 +0300)]
Add CVE IDs PHP 7.0.0
Lior Kaplan [Fri, 29 Apr 2016 10:40:44 +0000 (13:40 +0300)]
Add CVE IDs PHP 7.0.2
Lior Kaplan [Fri, 29 Apr 2016 10:40:07 +0000 (13:40 +0300)]
Add CVE IDs PHP 7.0.3
Lior Kaplan [Fri, 29 Apr 2016 10:39:03 +0000 (13:39 +0300)]
Add CVE IDs PHP 7.0.4
Lior Kaplan [Fri, 29 Apr 2016 10:38:25 +0000 (13:38 +0300)]
Add CVE IDs PHP 7.0.5
Lior Kaplan [Fri, 29 Apr 2016 10:36:24 +0000 (13:36 +0300)]
Add CVE to bug #71912 (PHP 7.0.6)
Lior Kaplan [Fri, 29 Apr 2016 10:26:46 +0000 (13:26 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add CVE to bug #69719 (PHP 5.6.10)
Add CVE IDs PHP 5.6.12
Add CVE IDs PHP 5.6.13
Add CVE IDs PHP 5.6.14
Add CVE to bug #70976 (PHP 5.6.17)
Add CVE IDs PHP 5.6.18
Add CVE IDs PHP 5.6.20
Add CVE to bug #71912 (PHP 5.6.21)
Lior Kaplan [Fri, 29 Apr 2016 10:23:41 +0000 (13:23 +0300)]
Add CVE to bug #69719 (PHP 5.6.10)
Lior Kaplan [Fri, 29 Apr 2016 10:21:35 +0000 (13:21 +0300)]
Add CVE IDs PHP 5.6.12
Lior Kaplan [Fri, 29 Apr 2016 10:19:46 +0000 (13:19 +0300)]
Add CVE IDs PHP 5.6.13
Lior Kaplan [Fri, 29 Apr 2016 10:17:34 +0000 (13:17 +0300)]
Add CVE IDs PHP 5.6.14
Lior Kaplan [Fri, 29 Apr 2016 10:16:27 +0000 (13:16 +0300)]
Add CVE to bug #70976 (PHP 5.6.17)
Lior Kaplan [Fri, 29 Apr 2016 10:15:30 +0000 (13:15 +0300)]
Add CVE IDs PHP 5.6.18
Lior Kaplan [Fri, 29 Apr 2016 10:11:54 +0000 (13:11 +0300)]
Add CVE IDs PHP 5.6.20
Lior Kaplan [Fri, 29 Apr 2016 10:10:13 +0000 (13:10 +0300)]
Add CVE to bug #71912 (PHP 5.6.21)
Joe Watkins [Fri, 29 Apr 2016 09:19:55 +0000 (10:19 +0100)]
fix size_t signed comparison
Julien Pauli [Fri, 29 Apr 2016 07:12:27 +0000 (09:12 +0200)]
Added CVE
Xinchen Hui [Fri, 29 Apr 2016 03:13:15 +0000 (11:13 +0800)]
Fixed build
Lior Kaplan [Thu, 28 Apr 2016 18:12:27 +0000 (21:12 +0300)]
Add NEWS entry for bug #71331 (fixed in 7.0.3)
Lior Kaplan [Thu, 28 Apr 2016 18:12:00 +0000 (21:12 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Add NEWS entry for bug #71331 (fixed in PHP 5.6.18)
Lior Kaplan [Thu, 28 Apr 2016 17:46:29 +0000 (20:46 +0300)]
Add NEWS entry for bug #71331 (fixed in PHP 5.6.18)
Anatol Belski [Thu, 28 Apr 2016 17:46:15 +0000 (19:46 +0200)]
update NEWS
Dmitry Stogov [Thu, 28 Apr 2016 17:12:42 +0000 (20:12 +0300)]
Added test
Dmitry Stogov [Thu, 28 Apr 2016 16:56:10 +0000 (19:56 +0300)]
Fixed BC break described by bug #72119.
It was introduced after 7.0.5 release by attempt to fix bug #71428.
Joe Watkins [Thu, 28 Apr 2016 14:52:30 +0000 (15:52 +0100)]
simplify expression
Joe Watkins [Thu, 28 Apr 2016 14:50:27 +0000 (15:50 +0100)]
simplify expression
Joe Watkins [Thu, 28 Apr 2016 14:41:23 +0000 (15:41 +0100)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Joe Watkins [Thu, 28 Apr 2016 14:40:28 +0000 (15:40 +0100)]
variable used out of scope
Bob Weinand [Thu, 28 Apr 2016 09:02:47 +0000 (11:02 +0200)]
Fixed bug #72116 (7.0.6 array_fill optimization breaks implementation)
Ferenc Kovacs [Thu, 28 Apr 2016 00:37:01 +0000 (02:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
small whitespace fix
Ferenc Kovacs [Thu, 28 Apr 2016 00:32:45 +0000 (02:32 +0200)]
small whitespace fix
Anatol Belski [Wed, 27 Apr 2016 16:58:28 +0000 (18:58 +0200)]
update NEWS
Anatol Belski [Wed, 27 Apr 2016 12:56:35 +0000 (14:56 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
update NEWS
Anatol Belski [Wed, 27 Apr 2016 12:56:08 +0000 (14:56 +0200)]
update NEWS
Anatol Belski [Wed, 27 Apr 2016 12:50:46 +0000 (14:50 +0200)]
update NEWS
Xinchen Hui [Wed, 27 Apr 2016 12:29:11 +0000 (20:29 +0800)]
Use zend_string_safe_alloc
Anatol Belski [Wed, 27 Apr 2016 11:19:29 +0000 (13:19 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
fix/improve tests
Anatol Belski [Wed, 27 Apr 2016 11:16:57 +0000 (13:16 +0200)]
fix/improve tests
Anatol Belski [Wed, 27 Apr 2016 10:24:28 +0000 (12:24 +0200)]
fix merge
Julien Pauli [Wed, 27 Apr 2016 09:55:05 +0000 (11:55 +0200)]
Updated NEWS
Anatol Belski [Wed, 27 Apr 2016 09:45:29 +0000 (11:45 +0200)]
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
Stanislav Malyshev [Wed, 27 Apr 2016 06:48:41 +0000 (23:48 -0700)]
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
Stanislav Malyshev [Wed, 27 Apr 2016 06:04:29 +0000 (23:04 -0700)]
fix build
Stanislav Malyshev [Wed, 20 Apr 2016 06:49:22 +0000 (23:49 -0700)]
Fix bug #71923 - integer overflow in ZipArchive::getFrom*
Stanislav Malyshev [Wed, 27 Apr 2016 05:54:58 +0000 (22:54 -0700)]
Fix memory leak
Stanislav Malyshev [Mon, 25 Apr 2016 06:50:57 +0000 (23:50 -0700)]
Fix bug #72099: xml_parse_into_struct segmentation fault
Xinchen Hui [Wed, 27 Apr 2016 04:23:51 +0000 (12:23 +0800)]
Use zend_string_safe_alloc
Julien Pauli [Tue, 26 Apr 2016 20:34:00 +0000 (22:34 +0200)]
5.5.36 now
Dmitry Stogov [Tue, 26 Apr 2016 10:44:52 +0000 (13:44 +0300)]
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)
Dmitry Stogov [Tue, 26 Apr 2016 10:43:18 +0000 (13:43 +0300)]
Fixed test on 32-bit platforms (split into 32-bit and 64-bit versions)
Dmitry Stogov [Tue, 26 Apr 2016 10:04:06 +0000 (13:04 +0300)]
Fixed bug #72100 (implode() inserts garbage into resulting string when joins very big integer). (Mikhail Galanin)
Dmitry Stogov [Mon, 25 Apr 2016 11:11:46 +0000 (14:11 +0300)]
Fixed bug #72101 (crash on complex code)
Stanislav Malyshev [Mon, 25 Apr 2016 02:33:52 +0000 (19:33 -0700)]
Fix bug #72094 - Out of bounds heap read access in exif header processing
Stanislav Malyshev [Mon, 25 Apr 2016 01:33:32 +0000 (18:33 -0700)]
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.
Stanislav Malyshev [Sun, 24 Apr 2016 19:49:01 +0000 (12:49 -0700)]
Fix bug #72061 - Out-of-bounds reads in zif_grapheme_stripos with negative offset
Pierrick Charron [Sun, 24 Apr 2016 02:55:00 +0000 (22:55 -0400)]
Fixed bug #68658 (Define CURLE_SSL_CACERT_BADFILE)
Pierrick Charron [Sat, 23 Apr 2016 22:37:55 +0000 (18:37 -0400)]
Fix cURL test to use local server instead of google
Anatol Belski [Thu, 21 Apr 2016 19:17:33 +0000 (21:17 +0200)]
Fixed bug #72035 php-cgi.exe fails to run scripts relative to drive root
Xinchen Hui [Sat, 23 Apr 2016 04:41:44 +0000 (21:41 -0700)]
Fixed bug #72069 (Behavior \JsonSerializable different from json_encode)
Xinchen Hui [Sat, 23 Apr 2016 04:20:53 +0000 (21:20 -0700)]
Fixed bug #72075 (Referencing socket resources breaks stream_select)
Nikita Popov [Thu, 21 Apr 2016 21:41:59 +0000 (23:41 +0200)]
Fix escape sequences in pgsql.c
Bob Weinand [Thu, 21 Apr 2016 19:51:00 +0000 (21:51 +0200)]
Fix constant expr coaleasce with protected mode opcache
Bob Weinand [Thu, 21 Apr 2016 00:48:52 +0000 (02:48 +0200)]
Fixed bug #72059 - Reference the bug id directly in NEWS
Bob Weinand [Thu, 21 Apr 2016 00:45:09 +0000 (02:45 +0200)]
Fix magic constants (__LINE__) with ?? for constant scalar exprs
Also fix general memory leak when root ast gets replaced in compile time evaluation
Bob Weinand [Wed, 20 Apr 2016 23:24:56 +0000 (01:24 +0200)]
Add NEWS entry for ?? in constant scalar expressions
Márcio Almada [Sun, 17 Apr 2016 08:27:15 +0000 (04:27 -0400)]
allow null coalescing (??) on constant expressions
Nikita Popov [Wed, 20 Apr 2016 17:00:02 +0000 (19:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
Conflicts:
Zend/zend_compile.c
Adam Harvey [Tue, 19 Apr 2016 02:20:35 +0000 (19:20 -0700)]
Fix ZTS builds by adding a missing TSRMLS_FETCH().
Nikita Popov [Wed, 20 Apr 2016 16:37:23 +0000 (18:37 +0200)]
Fix bug #71737
Also improve the error message for $this used in parameters.
Xinchen Hui [Wed, 20 Apr 2016 15:42:06 +0000 (08:42 -0700)]
Update NEWS
Nikita Nefedov [Tue, 19 Apr 2016 16:26:08 +0000 (19:26 +0300)]
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
Stanislav Malyshev [Wed, 20 Apr 2016 06:45:21 +0000 (23:45 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Better fix for #71952
Conflicts:
ext/gd/gd.c
Stanislav Malyshev [Wed, 20 Apr 2016 06:44:00 +0000 (23:44 -0700)]
Better fix for #71952
Stanislav Malyshev [Tue, 19 Apr 2016 06:34:26 +0000 (23:34 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Fix bug #71952: Corruption inside imageaffinematrixget
Conflicts:
ext/gd/gd.c
Stanislav Malyshev [Tue, 19 Apr 2016 06:31:03 +0000 (23:31 -0700)]
Fix bug #71952: Corruption inside imageaffinematrixget
Stanislav Malyshev [Tue, 19 Apr 2016 05:20:22 +0000 (22:20 -0700)]
Fix for bug #71912 (libgd: signedness vulnerability)
Xinchen Hui [Tue, 19 Apr 2016 02:59:35 +0000 (10:59 +0800)]
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
Xinchen Hui [Tue, 19 Apr 2016 02:59:10 +0000 (10:59 +0800)]
Fixed bug #72051 (The reference in CallbackFilterIterator doesn't work as expected)
Dmitry Stogov [Mon, 18 Apr 2016 22:37:24 +0000 (01:37 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Prevent usage in GC after free.
Dmitry Stogov [Mon, 18 Apr 2016 22:31:49 +0000 (01:31 +0300)]
Prevent usage in GC after free.
Nikita Popov [Mon, 18 Apr 2016 20:45:38 +0000 (22:45 +0200)]
Fix SEND_USER as well
Missed copy&paste code here
Nikita Popov [Mon, 18 Apr 2016 16:24:45 +0000 (18:24 +0200)]
Fix SEND_ARRAY+PREFER_REF SHM corruption
Make the behavior consistent between namespaced and not and with
PHP 5.6.
Xinchen Hui [Mon, 18 Apr 2016 11:13:54 +0000 (19:13 +0800)]
combine conditions
Bob Weinand [Mon, 18 Apr 2016 10:13:59 +0000 (12:13 +0200)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Ferenc Kovacs [Mon, 18 Apr 2016 07:04:55 +0000 (09:04 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
mark frequent intermittent fpm test with XFAIL
Ferenc Kovacs [Mon, 18 Apr 2016 07:04:27 +0000 (09:04 +0200)]
mark frequent intermittent fpm test with XFAIL
Ferenc Kovacs [Mon, 18 Apr 2016 06:15:47 +0000 (08:15 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
prepare for 5.6.21RC1
Ferenc Kovacs [Mon, 18 Apr 2016 06:14:16 +0000 (08:14 +0200)]
prepare for 5.6.21RC1
Christopher Jones [Mon, 18 Apr 2016 01:15:01 +0000 (11:15 +1000)]
Bump version in test
projects / php / log