]>
granicus.if.org Git - php/log
Joe Watkins [Thu, 28 Apr 2016 14:40:28 +0000 (15:40 +0100)]
variable used out of scope
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
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
Nikita Popov [Sat, 16 Apr 2016 20:33:23 +0000 (22:33 +0200)]
Fix SEND_UNPACK array separation
Separating only immutable arrays is not enough.
Bob Weinand [Sat, 16 Apr 2016 18:57:28 +0000 (20:57 +0200)]
Fix non-/Zend tests too
Bob Weinand [Sat, 16 Apr 2016 18:27:53 +0000 (20:27 +0200)]
Fixed bug #72038 (Function calls with values to a by-ref parameter don't always throw a notice)
Dominic Luechinger [Wed, 13 Apr 2016 20:14:43 +0000 (22:14 +0200)]
Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification
Anatol Belski [Sat, 16 Apr 2016 14:11:22 +0000 (16:11 +0200)]
Add test for bug #72028
Nikita Popov [Sat, 16 Apr 2016 07:56:08 +0000 (09:56 +0200)]
Use symtable lookup for arrays in array_column
Nikita Popov [Sat, 16 Apr 2016 07:52:22 +0000 (09:52 +0200)]
Respect property visibility in array_column
Nikita Popov [Fri, 15 Apr 2016 14:28:48 +0000 (16:28 +0200)]
Fixed bug #72031
Xinchen Hui [Sat, 16 Apr 2016 04:29:27 +0000 (21:29 -0700)]
Fixed bug #72028 (pg_query_params(): NULL converts to empty string)
I don't have a pgsql server by hand, so no test script, but the fix must
be right.
Xinchen Hui [Sat, 16 Apr 2016 04:08:51 +0000 (21:08 -0700)]
Fixed bug #71972 (Cyclic references causing session_start(): Failed to decode session object)
Lior Kaplan [Fri, 15 Apr 2016 19:17:37 +0000 (22:17 +0300)]
Align NEWS entry format
Lior Kaplan [Fri, 15 Apr 2016 19:09:05 +0000 (22:09 +0300)]
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Align NEWS entry format
Lior Kaplan [Fri, 15 Apr 2016 19:07:47 +0000 (22:07 +0300)]
Align NEWS entry format
Anatol Belski [Fri, 15 Apr 2016 11:41:09 +0000 (13:41 +0200)]
update NEWS
Anatol Belski [Fri, 15 Apr 2016 11:38:49 +0000 (13:38 +0200)]
Fixed #71062 pg_convert() doesn't accept ISO 8601 for datatype timestamp
Xinchen Hui [Fri, 15 Apr 2016 03:57:53 +0000 (11:57 +0800)]
Fixed failed with libedit
Xinchen Hui [Thu, 14 Apr 2016 12:21:19 +0000 (20:21 +0800)]
Fixed bug #72014 (Including a file with anonymous classes multiple times leads to fatal error)
Christopher Jones [Thu, 14 Apr 2016 05:49:15 +0000 (15:49 +1000)]
On second thoughts, keep this in sync with 5.6 for 71422
Christopher Jones [Thu, 14 Apr 2016 05:09:02 +0000 (15:09 +1000)]
Merge branch 'PHP-5.6' into PHP-7.0
Christopher Jones [Thu, 14 Apr 2016 05:08:42 +0000 (15:08 +1000)]
Fix old comment cut-n-paste error
Christopher Jones [Thu, 14 Apr 2016 04:09:16 +0000 (14:09 +1000)]
Fixed bug #71600 (oci_fetch_all segfaults when selecting more than 8 columns) (Tian Yang)
Christopher Jones [Thu, 14 Apr 2016 03:55:32 +0000 (13:55 +1000)]
Merge fix for bug #71422. No code changed needed in PHP 7
Christopher Jones [Thu, 14 Apr 2016 03:50:01 +0000 (13:50 +1000)]
Fixed bug #71422 (Fix ORA-01438: value larger than specified precision allowed for this column)
Christopher Jones [Thu, 14 Apr 2016 03:43:13 +0000 (13:43 +1000)]
Merge branch 'PHP-7.0' of https://git.php.net/repository/php-src into PHP-7.0
Anatol Belski [Tue, 12 Apr 2016 17:37:36 +0000 (19:37 +0200)]
update NEWS
Anatol Belski [Tue, 12 Apr 2016 17:12:45 +0000 (19:12 +0200)]
Fixed bug #68849 bindValue is not using the right data type
Nikita Popov [Tue, 12 Apr 2016 12:39:05 +0000 (14:39 +0200)]
Fix ZEND_SEPARATE for by-val func returning ref zval
Nikita Popov [Tue, 12 Apr 2016 12:33:56 +0000 (14:33 +0200)]
Drop unnecessary ZEND_SEPARATE code
The following write ops will separate if necessary.
Joe Watkins [Tue, 12 Apr 2016 12:40:03 +0000 (13:40 +0100)]
phpdbg: close file handles
Remi Collet [Tue, 12 Apr 2016 11:46:06 +0000 (13:46 +0200)]
fix skipif
Xinchen Hui [Tue, 12 Apr 2016 07:30:11 +0000 (15:30 +0800)]
This only make sense on *nix
Anatol Belski [Tue, 12 Apr 2016 04:49:30 +0000 (06:49 +0200)]
prepare next
Anatol Belski [Mon, 11 Apr 2016 13:37:45 +0000 (15:37 +0200)]
update NEWS
Anatol Belski [Mon, 11 Apr 2016 13:00:58 +0000 (15:00 +0200)]
Fixed bug #70484 selectordinal doesn't work with named parameters
Anatol Belski [Mon, 11 Apr 2016 12:54:58 +0000 (14:54 +0200)]
fix version macro to check
Joe Watkins [Mon, 11 Apr 2016 12:24:37 +0000 (13:24 +0100)]
handle dummy frame
Joe Watkins [Mon, 11 Apr 2016 07:04:14 +0000 (08:04 +0100)]
Merge branch 'PHP-7.0' of https://github.com/php/php-src into PHP-7.0
Joe Watkins [Mon, 11 Apr 2016 07:03:15 +0000 (08:03 +0100)]
fix calendar segfault
Anatol Belski [Sun, 10 Apr 2016 17:10:45 +0000 (19:10 +0200)]
update NEWS
Anatol Belski [Sun, 10 Apr 2016 16:48:35 +0000 (18:48 +0200)]
Fixed bug #71998 Function pg_insert does not insert when column type = inet
Anatol Belski [Sat, 9 Apr 2016 17:10:53 +0000 (19:10 +0200)]
Fixed bug #65480 No declaration for msgformat_fix_quotes() in msgformat.c or msgformat_attr.c
Xinchen Hui [Sat, 9 Apr 2016 17:02:20 +0000 (10:02 -0700)]
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
Xinchen Hui [Sat, 9 Apr 2016 17:01:04 +0000 (10:01 -0700)]
Fixed bug #71995 (Returning the same var twice from __sleep() produces broken serialized data)