granicus.if.org Git

Fixed Bug #67724

(chained zlib filters silently fail with large amounts of data)

Use the same buffer size zlib uses internally to avoid
Z_DATA_ERROR on massively compressed data

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 09:09:18 +0000 (11:09 +0200)]

typo

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 09:09:04 +0000 (11:09 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
typo
typo

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 09:08:54 +0000 (11:08 +0200)]

typo

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 09:08:41 +0000 (11:08 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
typo

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 09:08:30 +0000 (11:08 +0200)]

typo

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:50:56 +0000 (10:50 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:50:33 +0000 (10:50 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  NEWS
  NEWS
  Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:48:29 +0000 (10:48 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:47:54 +0000 (10:47 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
NEWS
Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:46:53 +0000 (10:46 +0200)]

NEWS

commit | commitdiff | tree

Remi Collet [Mon, 4 Aug 2014 08:42:39 +0000 (10:42 +0200)]

Fixed Bug #66901 php-gd 'c_color' NULL pointer dereference

Upstream https://bitbucket.org/libgd/gd-libgd/commits/463c3bd09bfe8e924e19acad7a2a6af16953a704

Notice: this fix don't manage monochrome/monovisual values
but just fix the security issue CVE-2014-2497
failing when trying to load such an image

commit | commitdiff | tree

Anatol Belski [Mon, 4 Aug 2014 07:58:47 +0000 (09:58 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
backport the fix for bug #67739

commit | commitdiff | tree

Anatol Belski [Mon, 4 Aug 2014 07:57:59 +0000 (09:57 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
backport the fix for bug #67739

commit | commitdiff | tree

Anatol Belski [Mon, 4 Aug 2014 07:57:08 +0000 (09:57 +0200)]

backport the fix for bug #67739

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:12:43 +0000 (00:12 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
add test
Fix bug #67705 (extensive backtracking in rule regular expression)

Conflicts:
ext/fileinfo/data_file.c
ext/fileinfo/libmagic/softmagic.c
ext/fileinfo/magicdata.patch

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:08:35 +0000 (00:08 -0700)]

Fix bug #67705 (extensive backtracking in rule regular expression)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:08:17 +0000 (00:08 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
add test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:08:08 +0000 (00:08 -0700)]

add test

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:05:56 +0000 (00:05 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67705 (extensive backtracking in rule regular expression)

commit | commitdiff | tree

Stanislav Malyshev [Mon, 4 Aug 2014 07:01:57 +0000 (00:01 -0700)]

Fix bug #67705 (extensive backtracking in rule regular expression)

commit | commitdiff | tree

Andrey Hristov [Thu, 31 Jul 2014 18:28:09 +0000 (21:28 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Andrey Hristov [Thu, 31 Jul 2014 18:27:51 +0000 (21:27 +0300)]

Fix wrong lenght size

commit | commitdiff | tree

Peter Cowburn [Thu, 31 Jul 2014 13:34:50 +0000 (14:34 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Bug #51096 - Remove unnecessary ? for first/last day of

commit | commitdiff | tree

Peter Cowburn [Thu, 31 Jul 2014 13:33:55 +0000 (14:33 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Bug #51096 - Remove unnecessary ? for first/last day of

Conflicts:
ext/date/lib/parse_date.c

commit | commitdiff | tree

Peter Cowburn [Thu, 31 Jul 2014 13:30:39 +0000 (14:30 +0100)]

Merge branch 'pull-request/754' into PHP-5.4

commit | commitdiff | tree

Peter Cowburn [Thu, 31 Jul 2014 13:21:38 +0000 (14:21 +0100)]

Bug #51096 - Remove unnecessary ? for first/last day of

commit | commitdiff | tree

Tjerk Meesters [Thu, 31 Jul 2014 04:17:17 +0000 (12:17 +0800)]

Moved streams related functions to xp_ssl.c

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 18:48:43 +0000 (18:48 +0000)]

Remove duplicate NEWS

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 18:41:13 +0000 (18:41 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Update NEWS
Update NEWS

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 18:39:59 +0000 (18:39 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 18:36:09 +0000 (18:36 +0000)]

Update NEWS

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 18:37:25 +0000 (18:37 +0000)]

Update NEWS

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 18:33:19 +0000 (18:33 +0000)]

Update NEWS

commit | commitdiff | tree

Michael Wallner [Wed, 30 Jul 2014 18:14:03 +0000 (20:14 +0200)]

BFN

commit | commitdiff | tree

Michael Wallner [Wed, 30 Jul 2014 18:13:39 +0000 (20:13 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
BFN
Fixed bug #67715 (php-milter does not build and crashes randomly).

commit | commitdiff | tree

Michael Wallner [Wed, 30 Jul 2014 18:13:17 +0000 (20:13 +0200)]

BFN

commit | commitdiff | tree

Michael Wallner [Wed, 30 Jul 2014 18:12:50 +0000 (20:12 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed bug #67715 (php-milter does not build and crashes randomly).

commit | commitdiff | tree

Michael Wallner [Wed, 30 Jul 2014 18:12:13 +0000 (20:12 +0200)]

Fixed bug #67715 (php-milter does not build and crashes randomly).

commit | commitdiff | tree

Rasmus Lerdorf [Wed, 30 Jul 2014 16:23:36 +0000 (12:23 -0400)]

Merge commit '8b9719d' into PHP-5.6

* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up

commit | commitdiff | tree

Rasmus Lerdorf [Wed, 30 Jul 2014 16:23:24 +0000 (12:23 -0400)]

Merge commit '8b9719d' into PHP-5.5

* commit '8b9719d':
We need to turn off any strict mode here for this warning to show up

commit | commitdiff | tree

Rasmus Lerdorf [Wed, 30 Jul 2014 16:22:48 +0000 (12:22 -0400)]

We need to turn off any strict mode here for this warning to show up

commit | commitdiff | tree

Bob Weinand [Wed, 30 Jul 2014 15:57:07 +0000 (17:57 +0200)]

Disable restrictions regarding arrays in constants at run-time.
For the discussion around it, see the thread on the mailing list:
http://www.mail-archive.com/internals@lists.php.net/msg68245.html

commit | commitdiff | tree

Bob Weinand [Wed, 30 Jul 2014 15:18:05 +0000 (17:18 +0200)]

Revert "Fix bug #67064 in a BC safe way"

This reverts commit 1a4a9eede59b853f11e8e8b965e5f715f53da8f7.

Conflicts:
ext/standard/array.c
ext/standard/tests/array/bug67064.phpt

commit | commitdiff | tree

Tjerk Meesters [Wed, 30 Jul 2014 10:27:29 +0000 (18:27 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array

commit | commitdiff | tree

Tjerk Meesters [Wed, 30 Jul 2014 10:17:36 +0000 (18:17 +0800)]

Updated NEWS for #67693

commit | commitdiff | tree

Tjerk Meesters [Wed, 30 Jul 2014 10:17:13 +0000 (18:17 +0800)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Updated NEWS for #67693
Fixed bug #67693 - incorrect push to the empty array

commit | commitdiff | tree

Tjerk Meesters [Wed, 30 Jul 2014 10:16:56 +0000 (18:16 +0800)]

Updated NEWS for #67693

commit | commitdiff | tree

Tjerk Meesters [Wed, 30 Jul 2014 09:54:09 +0000 (17:54 +0800)]

Fixed bug #67693 - incorrect push to the empty array

commit | commitdiff | tree

Ferenc Kovacs [Wed, 30 Jul 2014 09:47:14 +0000 (11:47 +0200)]

add missing entry to NEWS

commit | commitdiff | tree

Ferenc Kovacs [Wed, 30 Jul 2014 09:26:55 +0000 (11:26 +0200)]

add missing entries to NEWS

commit | commitdiff | tree

Ferenc Kovacs [Wed, 30 Jul 2014 08:51:28 +0000 (10:51 +0200)]

add NEWS block for the next RC

commit | commitdiff | tree

Ferenc Kovacs [Wed, 30 Jul 2014 08:45:35 +0000 (10:45 +0200)]

NEWS entry for #67713

commit | commitdiff | tree

Ferenc Kovacs [Wed, 30 Jul 2014 08:23:29 +0000 (10:23 +0200)]

Merge branch 'newInstanceWithoutConstructor' into PHP-5.6

* newInstanceWithoutConstructor:
update the exception message to better match the actual check
ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()

commit | commitdiff | tree

Ferenc Kovacs [Wed, 30 Jul 2014 08:08:26 +0000 (10:08 +0200)]

update the exception message to better match the actual check

commit | commitdiff | tree

Ferenc Kovacs [Wed, 23 Jul 2014 05:45:02 +0000 (07:45 +0200)]

ReflectionClass::newInstanceWithoutConstructor() should be allowed to instantiate every class except those internal classes with a final __construct()

commit | commitdiff | tree

Dmitry Stogov [Wed, 30 Jul 2014 06:40:06 +0000 (10:40 +0400)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed usage after free

commit | commitdiff | tree

Dmitry Stogov [Wed, 30 Jul 2014 06:39:25 +0000 (10:39 +0400)]

Fixed usage after free

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 02:41:01 +0000 (02:41 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Undo inadvertent commit of php_version
Corrected patch for bug #60616

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 02:34:46 +0000 (02:34 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Undo inadvertent commit of php_version
Corrected patch for bug #60616

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 02:34:21 +0000 (02:34 +0000)]

Undo inadvertent commit of php_version

commit | commitdiff | tree

Keyur Govande [Wed, 30 Jul 2014 02:28:31 +0000 (02:28 +0000)]

Corrected patch for bug #60616

For unixODBC, use ODBC version as defined by it (as of v2.2.14 it is 3.5).
This allows us to use newer features like SQL_DESC_OCTET_LENGTH (which
returns the number of bytes required to store the data). This fixes the issue
in #60616. If the newer version is not available, over-allocate to accomodate
4-byte Unicode characters for CHAR and VARCHAR datatypes (and their Wide
counterparts).
version.
Fixed a couple of failing tests.

commit | commitdiff | tree

Tjerk Meesters [Tue, 29 Jul 2014 11:15:01 +0000 (19:15 +0800)]

Wildcards should only be used in the first name component; fixed comment style

commit | commitdiff | tree

Keyur Govande [Mon, 28 Jul 2014 23:16:52 +0000 (23:16 +0000)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)

commit | commitdiff | tree

Keyur Govande [Mon, 28 Jul 2014 23:16:20 +0000 (23:16 +0000)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)

commit | commitdiff | tree

Keyur Govande [Mon, 28 Jul 2014 23:15:23 +0000 (23:15 +0000)]

Fix bug #60616 (odbc_fetch_into returns junk at end of multi-byte char fields)

The ODBC extension did not support WVARCHAR. WVARCHAR ends up being handled by
the default handler where vallen is set by the driver to the actual bytes
needed for the field. If it is larger than default-lrl then the output is
corrupted (reading past the buffer) because the return functions don't expect
that to happen. The patch add support to handle WVARCHAR just like a regular
VARCHAR.

commit | commitdiff | tree

Stanislav Malyshev [Sun, 27 Jul 2014 07:14:28 +0000 (00:14 -0700)]

fix SOAP for uninitialzed object

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Jul 2014 07:39:00 +0000 (00:39 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix NEWS

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Jul 2014 07:38:19 +0000 (00:38 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix NEWS

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Jul 2014 07:38:10 +0000 (00:38 -0700)]

fix NEWS

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Jul 2014 07:37:32 +0000 (00:37 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix missing type checks in various functions

Conflicts:
ext/openssl/openssl.c

commit | commitdiff | tree

Stanislav Malyshev [Mon, 28 Jul 2014 04:51:55 +0000 (21:51 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix missing type checks in various functions

commit | commitdiff | tree

Stanislav Malyshev [Sun, 27 Jul 2014 09:40:27 +0000 (02:40 -0700)]

Fix missing type checks in various functions

commit | commitdiff | tree

Stanislav Malyshev [Sun, 27 Jul 2014 01:00:16 +0000 (18:00 -0700)]

Fix SPL objects initialization checks

commit | commitdiff | tree

Stanislav Malyshev [Sat, 26 Jul 2014 22:52:51 +0000 (15:52 -0700)]

Add object initialization checks for sqlite3 classes

commit | commitdiff | tree

Ferenc Kovacs [Fri, 25 Jul 2014 11:15:27 +0000 (13:15 +0200)]

Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.

This reverts commit aefc8f22b35999624f3a579696cf68b389f41ae8.

Conflicts:
NEWS

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Jul 2014 05:58:29 +0000 (22:58 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Jul 2014 05:58:06 +0000 (22:58 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS
  Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)
  Fixed Bug #67538 (SPL Iterators use-after-free)

commit | commitdiff | tree

Stanislav Malyshev [Fri, 25 Jul 2014 05:55:39 +0000 (22:55 -0700)]

update NEWS

commit | commitdiff | tree

Xinchen Hui [Wed, 2 Jul 2014 09:57:42 +0000 (17:57 +0800)]

Fixed bug #67539 (ArrayIterator use-after-free due to object change during sorting)

commit | commitdiff | tree

Xinchen Hui [Wed, 2 Jul 2014 09:45:09 +0000 (17:45 +0800)]

Fixed Bug #67538 (SPL Iterators use-after-free)

commit | commitdiff | tree

Xinchen Hui [Fri, 25 Jul 2014 02:52:46 +0000 (10:52 +0800)]

Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6