]> granicus.if.org Git - php/log
php
8 years agoadd test for bug #72564 (7.x regression)
Remi Collet [Fri, 8 Jul 2016 08:45:13 +0000 (10:45 +0200)]
add test for bug #72564 (7.x regression)

8 years agoMask DB usernames from expected test output for test portability
Christopher Jones [Thu, 7 Jul 2016 01:52:17 +0000 (11:52 +1000)]
Mask DB usernames from expected test output for test portability

8 years agomerge NEWS blocks
Ferenc Kovacs [Wed, 6 Jul 2016 23:46:02 +0000 (01:46 +0200)]
merge NEWS blocks

8 years ago5.6.25 is next
Ferenc Kovacs [Wed, 6 Jul 2016 22:09:48 +0000 (00:09 +0200)]
5.6.25 is next

8 years agoUpdated to version 2016.6 (2016f)
Derick Rethans [Wed, 6 Jul 2016 10:15:42 +0000 (11:15 +0100)]
Updated to version 2016.6 (2016f)

8 years agoFix bug #55701: GlobIterator throws LogicException
Valentin VALCIU [Thu, 21 Apr 2016 16:02:52 +0000 (19:02 +0300)]
Fix bug #55701: GlobIterator throws LogicException

GlobIterator throws LogicException with message 'The parent constructor was
not called' on its first operation when the glob expression doesn't match
any file. It also throws on the first operation after the iteration
completes, when the glob expression matches some files.

# Resolved conflicts:
# ext/spl/spl_directory.c

8 years agoDon't enforce LSP if prototype method is private
Pedro Magalhães [Thu, 30 Jun 2016 07:00:33 +0000 (09:00 +0200)]
Don't enforce LSP if prototype method is private

Fixes bug #72496.

8 years agoFix typo in comment
Christoph M. Becker [Mon, 4 Jul 2016 01:17:17 +0000 (03:17 +0200)]
Fix typo in comment

8 years agothis was actually fixed in 5.6.23
Ferenc Kovacs [Sun, 3 Jul 2016 21:31:32 +0000 (23:31 +0200)]
this was actually fixed in 5.6.23

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Mon, 27 Jun 2016 19:32:11 +0000 (12:32 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix the fix for #72403 on nl2br
  5.5.38 now

Conflicts:
configure.in
main/php_version.h

8 years agoFix the fix for #72403 on nl2br
Stanislav Malyshev [Mon, 27 Jun 2016 19:30:42 +0000 (12:30 -0700)]
Fix the fix for #72403 on nl2br

8 years agoUpdate NEWS
Christoph M. Becker [Mon, 27 Jun 2016 15:07:26 +0000 (17:07 +0200)]
Update NEWS

8 years agoFix #70628: Clearing bindings on an SQLite3 statement doesn't work
Christoph M. Becker [Mon, 27 Jun 2016 14:55:15 +0000 (16:55 +0200)]
Fix #70628: Clearing bindings on an SQLite3 statement doesn't work

Obiously, it isn't sufficient to call sqlite3_clear_bindings() alone, but
also the bound_params of the php_sqlite3_stmt have to be cleared.

8 years agoAdd CVE info for PHP 5.6.22
Lior Kaplan [Sat, 25 Jun 2016 17:31:26 +0000 (20:31 +0300)]
Add CVE info for PHP 5.6.22

8 years agoAdd CVE info for PHP 5.6.23
Lior Kaplan [Sat, 25 Jun 2016 17:28:51 +0000 (20:28 +0300)]
Add CVE info for PHP 5.6.23

8 years agoAdd missing entries for PHP 5.6.23
Lior Kaplan [Sat, 25 Jun 2016 16:56:00 +0000 (19:56 +0300)]
Add missing entries for PHP 5.6.23

8 years agofix test cleanup
Anatol Belski [Wed, 22 Jun 2016 10:20:02 +0000 (12:20 +0200)]
fix test cleanup

8 years agofix dir separator in test
Anatol Belski [Wed, 22 Jun 2016 09:41:05 +0000 (11:41 +0200)]
fix dir separator in test

8 years agoupdate NEWS
Ferenc Kovacs [Wed, 22 Jun 2016 01:03:01 +0000 (03:03 +0200)]
update NEWS

8 years agofix test
Anatol Belski [Tue, 21 Jun 2016 14:20:03 +0000 (16:20 +0200)]
fix test

There is a difference between TS and NTS warning message, since
virtual_mkdir vs glibc directly is used. This has no effect for
the actual fix functionality.

8 years agore-fix leak
Anatol Belski [Tue, 21 Jun 2016 13:18:10 +0000 (15:18 +0200)]
re-fix leak

8 years agoRevert "fix leak"
Anatol Belski [Tue, 21 Jun 2016 12:51:43 +0000 (14:51 +0200)]
Revert "fix leak"

This reverts commit c5d9c508976bb289c265d99938bda4dbf14622d3.

8 years ago5.5.38 now
Julien Pauli [Tue, 21 Jun 2016 11:10:37 +0000 (13:10 +0200)]
5.5.38 now

8 years agofix leak
Anatol Belski [Tue, 21 Jun 2016 10:29:41 +0000 (12:29 +0200)]
fix leak

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Tue, 21 Jun 2016 07:53:04 +0000 (09:53 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  remove the huge test file, generate it on the fly instead

8 years agoremove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:42:38 +0000 (09:42 +0200)]
remove the huge test file, generate it on the fly instead

8 years agoremove the huge test file, generate it on the fly instead
Anatol Belski [Tue, 21 Jun 2016 07:42:38 +0000 (09:42 +0200)]
remove the huge test file, generate it on the fly instead

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Tue, 21 Jun 2016 07:27:46 +0000 (00:27 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Now the right bug #
  Fix NEWS

8 years agoNow the right bug #
Stanislav Malyshev [Tue, 21 Jun 2016 07:18:27 +0000 (00:18 -0700)]
Now the right bug #

8 years agoFix NEWS
Stanislav Malyshev [Tue, 21 Jun 2016 07:14:50 +0000 (00:14 -0700)]
Fix NEWS

8 years agoMerge branch 'PHP-5.6.23' into PHP-5.6
Stanislav Malyshev [Tue, 21 Jun 2016 07:02:37 +0000 (00:02 -0700)]
Merge branch 'PHP-5.6.23' into PHP-5.6

* PHP-5.6.23:
  Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
  update NEWS
  fix tests
  fix build
  Fix bug #72455:  Heap Overflow due to integer overflows
  Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
  Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
  Fix bug #72298 pass2_no_dither out-of-bounds access
  Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
  Fix bug #72262 - do not overflow int
  Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
  Fix bug #72275: don't allow smart_str to overflow int
  Fix bug #72340: Double Free Courruption in wddx_deserialize
  Fix bug #72321 - use efree() for emalloc allocation
  5.6.23RC1

Conflicts:
configure.in
main/php_version.h

8 years agoMerge branch 'PHP-5.5' into PHP-5.6.23
Stanislav Malyshev [Tue, 21 Jun 2016 07:01:48 +0000 (00:01 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6.23

* PHP-5.5:
  Fixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow
  update NEWS
  fix tests
  fix build
  Fix bug #72455:  Heap Overflow due to integer overflows
  Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
  Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
  Fix bug #72298 pass2_no_dither out-of-bounds access
  Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
  Fix bug #72262 - do not overflow int
  Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
  Fix bug #72275: don't allow smart_str to overflow int
  Fix bug #72340: Double Free Courruption in wddx_deserialize
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

Conflicts:
configure.in
ext/mcrypt/mcrypt.c
ext/spl/spl_directory.c
main/php_version.h

8 years agoiFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in...
Stanislav Malyshev [Tue, 21 Jun 2016 06:58:26 +0000 (23:58 -0700)]
iFixed bug #72446 - Integer Overflow in gdImagePaletteToTrueColor() resulting in heap overflow

8 years agoupdate NEWS
Stanislav Malyshev [Tue, 21 Jun 2016 06:45:37 +0000 (23:45 -0700)]
update NEWS

8 years agoMerge branch 'PHP-5.5.37' into PHP-5.5
Stanislav Malyshev [Tue, 21 Jun 2016 06:31:54 +0000 (23:31 -0700)]
Merge branch 'PHP-5.5.37' into PHP-5.5

* PHP-5.5.37:
  fix tests
  fix build
  Fix bug #72455:  Heap Overflow due to integer overflows
  Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
  Fix bug #72407: NULL Pointer Dereference at _gdScaleVert
  Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free
  Fix bug #72298 pass2_no_dither out-of-bounds access
  Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
  Fix bug #72262 - do not overflow int
  Fix bug #72400 and #72403 - prevent signed int overflows for string lengths
  Fix bug #72275: don't allow smart_str to overflow int
  Fix bug #72340: Double Free Courruption in wddx_deserialize

8 years agofix tests
Stanislav Malyshev [Tue, 21 Jun 2016 05:54:55 +0000 (22:54 -0700)]
fix tests

8 years agofix build
Stanislav Malyshev [Tue, 21 Jun 2016 05:13:31 +0000 (22:13 -0700)]
fix build

8 years agoFix bug #72455: Heap Overflow due to integer overflows
Stanislav Malyshev [Tue, 21 Jun 2016 04:51:42 +0000 (21:51 -0700)]
Fix bug #72455:  Heap Overflow due to integer overflows

8 years agoFix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm...
Stanislav Malyshev [Tue, 21 Jun 2016 04:35:22 +0000 (21:35 -0700)]
Fix bug #72434: ZipArchive class Use After Free Vulnerability in PHP's GC algorithm and unserialize

8 years agoFixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize
Stanislav Malyshev [Tue, 21 Jun 2016 04:26:33 +0000 (21:26 -0700)]
Fixed ##72433: Use After Free Vulnerability in PHP's GC algorithm and unserialize

8 years agoFix bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA)
Remi Collet [Mon, 20 Jun 2016 16:43:07 +0000 (18:43 +0200)]
Fix bug #71936 (Segmentation fault destroying HTTP_RAW_POST_DATA)

8 years agoUpdate NEWS
Christoph M. Becker [Mon, 20 Jun 2016 13:18:47 +0000 (15:18 +0200)]
Update NEWS

8 years agoFix #64641: imagefilledpolygon doesn't draw horizontal line
Christoph M. Becker [Sun, 19 Jun 2016 11:54:55 +0000 (13:54 +0200)]
Fix #64641: imagefilledpolygon doesn't draw horizontal line

As has been reported, 1-dimensional horizontal filled polygons are not drawn
at all. That is caused by the scanline algorithm used for drawing filled
polygons which skips the drawing of horizontal edges, because that is
normally not necessary. If, however, the polygon consists of horizontal
edges only, that obviously doesn't work, so we add a special case handling.

That has also been fixed in libgd with
<https://github.com/libgd/libgd/commit/f9f10fa9>.

8 years agoUpdate NEWS
Stanislav Malyshev [Sun, 19 Jun 2016 05:13:04 +0000 (22:13 -0700)]
Update NEWS

8 years agoFix bug #72447: Type Confusion in php_bz2_filter_create()
Stanislav Malyshev [Sun, 19 Jun 2016 05:10:22 +0000 (22:10 -0700)]
Fix bug #72447: Type Confusion in php_bz2_filter_create()

8 years agoFix bug #72407: NULL Pointer Dereference at _gdScaleVert
Stanislav Malyshev [Sun, 19 Jun 2016 04:57:25 +0000 (21:57 -0700)]
Fix bug #72407: NULL Pointer Dereference at _gdScaleVert

8 years agoFix bug #72402: _php_mb_regex_ereg_replace_exec - double free
Stanislav Malyshev [Sun, 19 Jun 2016 04:48:39 +0000 (21:48 -0700)]
Fix bug #72402: _php_mb_regex_ereg_replace_exec - double free

8 years agoFixed bug #72439 (Stream socket with remote address leads to a segmentation fault)
Xinchen Hui [Sun, 19 Jun 2016 04:29:47 +0000 (21:29 -0700)]
Fixed bug #72439 (Stream socket with remote address leads to a segmentation fault)

8 years agoFix bug #72298 pass2_no_dither out-of-bounds access
Stanislav Malyshev [Sun, 19 Jun 2016 04:04:33 +0000 (21:04 -0700)]
Fix bug #72298 pass2_no_dither out-of-bounds access

8 years agoFixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow
Pierre Joye [Sat, 18 Jun 2016 18:15:10 +0000 (20:15 +0200)]
Fixed #72339 Integer Overflow in _gd2GetHeader() resulting in heap overflow

8 years agoFix #53640: XBM images require width to be multiple of 8
Christoph M. Becker [Fri, 17 Jun 2016 15:50:36 +0000 (17:50 +0200)]
Fix #53640: XBM images require width to be multiple of 8

8 years agoFix incorrect error suppressing in openssl_error_string test
Jakub Zelenka [Thu, 16 Jun 2016 19:11:02 +0000 (20:11 +0100)]
Fix incorrect error suppressing in openssl_error_string test

8 years agoFix occasionally failing OpenSSL DH bug test
Jakub Zelenka [Thu, 16 Jun 2016 19:09:17 +0000 (20:09 +0100)]
Fix occasionally failing OpenSSL DH bug test

The test was failing when first byte was 0

8 years agoUpdate NEWS
Christoph M. Becker [Thu, 16 Jun 2016 12:26:45 +0000 (14:26 +0200)]
Update NEWS

8 years agoFix #43475: Styled thick horizontal lines are scrambled
Christoph M. Becker [Wed, 15 Jun 2016 18:58:06 +0000 (20:58 +0200)]
Fix #43475: Styled thick horizontal lines are scrambled

Thick lines are drawn by gdImageFilledRectangle(), which iterates over
the x ordinate first (Z order) to apply the style pattern. While this works
fine for vertical and diagonal lines, it obviously fails for horizontal
lines, which have to be iterated over in N order.

To fix this bug, we introduce the helpers  gdImageFilled(H|V)Rectangle(),
which may be reused for other purposes as well.

This is basically the same fix as libgd/libgd/c2b91dbc.

8 years agoFix bug #72262 - do not overflow int
Stanislav Malyshev [Thu, 16 Jun 2016 04:58:26 +0000 (21:58 -0700)]
Fix bug #72262 - do not overflow int

8 years agoFix bug #72400 and #72403 - prevent signed int overflows for string lengths
Stanislav Malyshev [Thu, 16 Jun 2016 04:46:46 +0000 (21:46 -0700)]
Fix bug #72400 and #72403 - prevent signed int overflows for string lengths

8 years agoFixed expected test outcome due to rule changes
Derick Rethans [Wed, 15 Jun 2016 17:31:41 +0000 (18:31 +0100)]
Fixed expected test outcome due to rule changes

8 years agoUpdated to version 2016.5 (2016e)
Derick Rethans [Wed, 15 Jun 2016 10:58:47 +0000 (11:58 +0100)]
Updated to version 2016.5 (2016e)

8 years agoMaybe fix bug #72011
Nikita Popov [Tue, 14 Jun 2016 20:36:09 +0000 (22:36 +0200)]
Maybe fix bug #72011

8 years agoFix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream
Bartosz Dziewoński [Tue, 14 Jun 2016 11:27:56 +0000 (13:27 +0200)]
Fix #50845: exif_process_IFD_TAG: Use the right offset if reading from stream

When the location of the data is outside of the range we have
preloaded (for example, if it's before the beginning of the IFD
structure), we have to read it from the stream into a separate buffer.
The offset calculations in this case were incorrect, resulting in
bogus values being read for the affected fields (sometimes parts of
other fields, sometimes binary data).

The included test image, sourced from [1], is in the public domain.

[1] https://commons.wikimedia.org/wiki/File:U.S._Marines_Prepare_to_board_an_MV-22_Osprey_160509-M-AF202-041.jpg

8 years agoFix bug #72138 - Integer Overflow in Length of String-typed ZVAL
Stanislav Malyshev [Tue, 14 Jun 2016 08:03:03 +0000 (01:03 -0700)]
Fix bug #72138 - Integer Overflow in Length of String-typed ZVAL

8 years agoFix bug #72275: don't allow smart_str to overflow int
Stanislav Malyshev [Tue, 14 Jun 2016 06:12:47 +0000 (23:12 -0700)]
Fix bug #72275: don't allow smart_str to overflow int

8 years agoFix bug #72340: Double Free Courruption in wddx_deserialize
Stanislav Malyshev [Mon, 13 Jun 2016 06:18:23 +0000 (23:18 -0700)]
Fix bug #72340: Double Free Courruption in wddx_deserialize

8 years agoMerge branch 'PHP-5.5' into PHP-5.6
Anatol Belski [Mon, 13 Jun 2016 06:15:31 +0000 (08:15 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fix #66387: Stack overflow with imagefilltoborder
  Skip test which is 64bits only
  5.5.37 now

8 years agoupdate NEWS
Anatol Belski [Mon, 13 Jun 2016 06:12:22 +0000 (08:12 +0200)]
update NEWS

8 years agoFix #66387: Stack overflow with imagefilltoborder
Christoph M. Becker [Mon, 20 Jul 2015 21:24:55 +0000 (23:24 +0200)]
Fix #66387: Stack overflow with imagefilltoborder

The stack overflow is caused by the recursive algorithm in combination with a
very large negative coordinate passed to gdImageFillToBorder(). As there is
already a clipping for large positive coordinates to the width and height of
the image, it seems to be consequent to clip to zero also.

8 years agoFix bug #72321 - use efree() for emalloc allocation
Stanislav Malyshev [Sun, 12 Jun 2016 23:43:12 +0000 (16:43 -0700)]
Fix bug #72321 - use efree() for emalloc allocation

8 years agoFix bug #71915 (openssl_random_pseudo_bytes is not fork-safe)
Jakub Zelenka [Sun, 12 Jun 2016 17:11:38 +0000 (18:11 +0100)]
Fix bug #71915 (openssl_random_pseudo_bytes is not fork-safe)

Add time to the entropy before using RAND_bytes

8 years agoFix bug #72336 (openssl_pkey_new does not fail for invalid DSA params)
Jakub Zelenka [Sun, 12 Jun 2016 16:57:08 +0000 (17:57 +0100)]
Fix bug #72336 (openssl_pkey_new does not fail for invalid DSA params)

8 years agoUpdate openssl_error_string to run and be more forgiving
Jakub Zelenka [Sun, 12 Jun 2016 16:54:37 +0000 (17:54 +0100)]
Update openssl_error_string to run and be more forgiving

8 years agoMerge branch 'pull-request/1930' into PHP-5.6
Christoph M. Becker [Thu, 9 Jun 2016 13:28:58 +0000 (15:28 +0200)]
Merge branch 'pull-request/1930' into PHP-5.6

8 years ago5.6.23RC1 php-5.6.23RC1
Ferenc Kovacs [Thu, 9 Jun 2016 08:54:35 +0000 (10:54 +0200)]
5.6.23RC1

8 years ago5.6.24 will be next
Ferenc Kovacs [Thu, 9 Jun 2016 08:51:02 +0000 (10:51 +0200)]
5.6.24 will be next

8 years agoFix bug #72140 (segfault after calling ERR_free_strings())
Jakub Zelenka [Wed, 8 Jun 2016 17:21:39 +0000 (18:21 +0100)]
Fix bug #72140 (segfault after calling ERR_free_strings())

8 years agoprevent invalid color index (palette only), may lead to crash
Pierre Joye [Wed, 8 Jun 2016 04:06:48 +0000 (11:06 +0700)]
prevent invalid color index (palette only), may lead to crash

8 years agoAdd CVE to #66387
Lior Kaplan [Tue, 7 Jun 2016 18:45:24 +0000 (21:45 +0300)]
Add CVE to #66387

8 years agoadd missing NEWS entry
Anatol Belski [Tue, 7 Jun 2016 16:41:17 +0000 (18:41 +0200)]
add missing NEWS entry

8 years ago#72337 invalid dimensions can lead to segv
Pierre Joye [Tue, 7 Jun 2016 10:16:40 +0000 (17:16 +0700)]
#72337 invalid dimensions can lead to segv

8 years agoAdd test for bug #53735
Anatol Belski [Mon, 6 Jun 2016 19:06:06 +0000 (21:06 +0200)]
Add test for bug #53735

8 years agofix typo
Anatol Belski [Mon, 6 Jun 2016 06:56:40 +0000 (08:56 +0200)]
fix typo

8 years agofix broken skipif and add xfail for now
Anatol Belski [Mon, 6 Jun 2016 06:20:01 +0000 (08:20 +0200)]
fix broken skipif and add xfail for now

8 years agomissing return
Anatol Belski [Mon, 6 Jun 2016 05:27:45 +0000 (07:27 +0200)]
missing return

8 years agoAdd new test for openssl_pkey_new
Jakub Zelenka [Sun, 5 Jun 2016 16:27:47 +0000 (17:27 +0100)]
Add new test for openssl_pkey_new

8 years agoAdd test for openssl_error_string
Jakub Zelenka [Sun, 5 Jun 2016 16:23:05 +0000 (17:23 +0100)]
Add test for openssl_error_string

This test is important for making sure that the error strings
from OpenSSL works as expected and we can safely add a fix
for storing the strings that is prepared.

8 years agoRemove openssl_x509_parse for OpenSSL 0.9.x
Jakub Zelenka [Sun, 5 Jun 2016 15:28:50 +0000 (16:28 +0100)]
Remove openssl_x509_parse for OpenSSL 0.9.x

The test is unstable and it actually fails with latest 0.9.8

8 years agofix typo
Raphaël Tournoy [Fri, 3 Jun 2016 15:18:14 +0000 (17:18 +0200)]
fix typo

8 years agoupdate NEWS
Anatol Belski [Thu, 2 Jun 2016 10:18:33 +0000 (12:18 +0200)]
update NEWS

8 years agoFixed bug #70484 selectordinal doesn't work with named parameters
Anatol Belski [Mon, 11 Apr 2016 13:00:58 +0000 (15:00 +0200)]
Fixed bug #70484 selectordinal doesn't work with named parameters

8 years agoFix ODBC bug for varchars returning with length zero
Elizabeth Marie Smith [Thu, 14 Jan 2016 12:19:20 +0000 (13:19 +0100)]
Fix ODBC bug for varchars returning with length zero

8 years agoupdate NEWS
Ferenc Kovacs [Thu, 26 May 2016 01:05:06 +0000 (03:05 +0200)]
update NEWS

8 years agoFix typo in phpdbg help.
Adam Harvey [Wed, 25 May 2016 17:47:16 +0000 (12:47 -0500)]
Fix typo in phpdbg help.

Sorry, I would have included this in the last push had I spotted it a
minute earlier.

8 years agoAdd missing newlines to phpdbg's help for the run command.
Adam Harvey [Wed, 25 May 2016 17:38:41 +0000 (12:38 -0500)]
Add missing newlines to phpdbg's help for the run command.

This is not at all related to needing screenshots for a talk I'm giving
in two days. No sir. Not at all.

8 years agoSkip test which is 64bits only
Remi Collet [Wed, 25 May 2016 14:17:12 +0000 (16:17 +0200)]
Skip test which is 64bits only

Diff from test output
001+ Warning: fread(): Length parameter must be greater than 0 in ...
001- Warning: fread(): Length parameter must be no more than 2147483647 in ...

8 years agoSkip test which is 64bits only
Remi Collet [Wed, 25 May 2016 14:17:12 +0000 (16:17 +0200)]
Skip test which is 64bits only

Diff from test output
001+ Warning: fread(): Length parameter must be greater than 0 in ...
001- Warning: fread(): Length parameter must be no more than 2147483647 in ...

8 years ago5.5.37 now
Julien Pauli [Wed, 25 May 2016 09:37:58 +0000 (11:37 +0200)]
5.5.37 now

8 years agofix test portability
Anatol Belski [Wed, 25 May 2016 09:19:19 +0000 (11:19 +0200)]
fix test portability

8 years agoMerge branch 'PHP-5.6.22' into PHP-5.6
Stanislav Malyshev [Wed, 25 May 2016 00:21:22 +0000 (17:21 -0700)]
Merge branch 'PHP-5.6.22' into PHP-5.6

* PHP-5.6.22:
  Fix memory leak in imagescale()
  Update NEWS
  Better fix for bug #72135
  Fixed bug #72227: imagescale out-of-bounds read
  Fix bug #72241: get_icu_value_internal out-of-bounds read
  Fix bug #72135 - don't create strings with lengths outside int range
  prepare for 5.6.22RC1
  Add check for string overflow to all string add operations
  Fix bug #72114 - int/size_t confusion in fread
  Updated NEWS
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()

Conflicts:
configure.in
main/php_version.h

8 years agoMerge branch 'PHP-5.5' into PHP-5.6.22
Stanislav Malyshev [Tue, 24 May 2016 23:35:12 +0000 (16:35 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6.22

* PHP-5.5:
  Fix memory leak in imagescale()
  Update NEWS
  Better fix for bug #72135
  Fixed bug #72227: imagescale out-of-bounds read
  Fix bug #72241: get_icu_value_internal out-of-bounds read
  Fix bug #72135 - don't create strings with lengths outside int range
  Add check for string overflow to all string add operations
  Fix bug #72114 - int/size_t confusion in fread
  Updated NEWS
  Fixed bug #71331 - Uninitialized pointer in phar_make_dirstream()

Conflicts:
Zend/zend_operators.c
ext/phar/dirstream.c
ext/phar/tests/bug71331.phpt

8 years agoFix memory leak in imagescale()
Stanislav Malyshev [Tue, 24 May 2016 23:12:01 +0000 (16:12 -0700)]
Fix memory leak in imagescale()