granicus.if.org Git

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:28:23 +0000 (18:28 +0800)]

Merge branch 'PHP-5.6'

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

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:29 +0000 (11:47 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
add missing entry to NEWS

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:27:13 +0000 (11:27 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
add missing entries 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:44 +0000 (10:51 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
add NEWS block for the next RC

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:46:31 +0000 (10:46 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS entry for #67713
  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: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:32 +0000 (10:40 +0400)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fixed usage after free

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:47:44 +0000 (02:47 +0000)]

Merge branch 'PHP-5.6'

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

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:20 +0000 (19:15 +0800)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Wildcards should only be used in the first name component; fixed comment style

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:17:23 +0000 (23:17 +0000)]

Merge branch 'PHP-5.6'

* PHP-5.6:
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: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 [Mon, 28 Jul 2014 18:38:20 +0000 (11:38 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix SOAP for uninitialzed object

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:24 +0000 (00:39 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix NEWS
Fix missing type checks in various functions

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 02:37:37 +0000 (19:37 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix SPL objects initialization checks

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 23:58:09 +0000 (16:58 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Add object initialization checks for sqlite3 classes

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:16:31 +0000 (13:16 +0200)]

Merge branch 'PHP-5.6'

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

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:59:01 +0000 (22:59 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  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: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:57 +0000 (10:52 +0800)]

Merge branch 'PHP-5.6'