granicus.if.org Git

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fixed glob() edge case on windows, ref bug #47358
- fix bug #47358, glob returns error, should be empty array()

commit | commitdiff | tree

Anatol Belski [Mon, 19 Aug 2013 12:21:16 +0000 (14:21 +0200)]

fixed glob() edge case on windows, ref bug #47358

commit | commitdiff | tree

Pierre Joye [Tue, 8 Jan 2013 14:02:04 +0000 (15:02 +0100)]

- fix bug #47358, glob returns error, should be empty array()

Conflicts:
ext/standard/dir.c

commit | commitdiff | tree

Johannes Schlüter [Thu, 14 Aug 2014 15:22:25 +0000 (17:22 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Johannes Schlüter [Thu, 14 Aug 2014 15:13:44 +0000 (17:13 +0200)]

Merge branch 'PHP-5.3' into PHP-5.4

commit | commitdiff | tree

Johannes Schlüter [Thu, 14 Aug 2014 15:08:02 +0000 (17:08 +0200)]

Update Git rules

commit | commitdiff | tree

Johannes Schlüter [Thu, 14 Aug 2014 15:05:20 +0000 (17:05 +0200)]

Back to -dev (with EOL notice in NEWS)

commit | commitdiff | tree

Johannes Schlüter [Wed, 13 Aug 2014 19:22:50 +0000 (21:22 +0200)]

It's 2014 already, fix copyright year where user visible

Left out all file headers

commit | commitdiff | tree

Johannes Schlüter [Wed, 13 Aug 2014 16:36:10 +0000 (18:36 +0200)]

PHP 5.3.29

commit | commitdiff | tree

Tjerk Meesters [Wed, 13 Aug 2014 12:57:10 +0000 (20:57 +0800)]

Some changes were lost in the merge commit of #66091

commit | commitdiff | tree

Tjerk Meesters [Wed, 13 Aug 2014 12:16:22 +0000 (20:16 +0800)]

Updated NEWS for #66091

commit | commitdiff | tree

Tjerk Meesters [Wed, 13 Aug 2014 12:12:42 +0000 (20:12 +0800)]

Fixed #66091

commit | commitdiff | tree

Tjerk Meesters [Wed, 13 Aug 2014 12:12:42 +0000 (20:12 +0800)]

Fixed #66091

commit | commitdiff | tree

Anatol Belski [Tue, 12 Aug 2014 09:51:42 +0000 (11:51 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 12 Aug 2014 09:50:55 +0000 (11:50 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
updated NEWS
backported the fix for bug #41577

commit | commitdiff | tree

Anatol Belski [Tue, 12 Aug 2014 09:50:26 +0000 (11:50 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 12 Aug 2014 09:49:46 +0000 (11:49 +0200)]

backported the fix for bug #41577

commit | commitdiff | tree

Ferenc Kovacs [Tue, 12 Aug 2014 08:37:44 +0000 (10:37 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix the failing date tests introduced with the latest timezonedb update Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it

commit | commitdiff | tree

Ferenc Kovacs [Tue, 12 Aug 2014 08:34:54 +0000 (10:34 +0200)]

fix the failing date tests introduced with the latest timezonedb update
Derick confirmed on irc that the new/current behavior is the correct and that the tests should be updated to reflect it

commit | commitdiff | tree

Xinchen Hui [Mon, 11 Aug 2014 09:46:56 +0000 (17:46 +0800)]

Fixed bug #67813 (CachingIterator::__construct InvalidArgumentException wrong message)

commit | commitdiff | tree

Xinchen Hui [Mon, 11 Aug 2014 09:44:42 +0000 (17:44 +0800)]

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

commit | commitdiff | tree

Anatol Belski [Thu, 7 Aug 2014 17:50:25 +0000 (19:50 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix TS build

commit | commitdiff | tree

Anatol Belski [Thu, 7 Aug 2014 17:49:59 +0000 (19:49 +0200)]

fix TS build

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 16:39:42 +0000 (12:39 -0400)]

Update NEWS

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 16:38:04 +0000 (12:38 -0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 16:37:50 +0000 (12:37 -0400)]

Update NEWS

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 15:51:42 +0000 (11:51 -0400)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Bug #41631: Observe socket read timeouts in SSL streams

commit | commitdiff | tree

Daniel Lowrey [Thu, 7 Aug 2014 15:47:42 +0000 (11:47 -0400)]

Bug #41631: Observe socket read timeouts in SSL streams

commit | commitdiff | tree

Anatol Belski [Thu, 7 Aug 2014 13:21:42 +0000 (15:21 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
wrap int8_t and int16_t with #ifdef to avoid possible clashes

commit | commitdiff | tree

Anatol Belski [Thu, 7 Aug 2014 13:20:17 +0000 (15:20 +0200)]

wrap int8_t and int16_t with #ifdef to avoid possible clashes

commit | commitdiff | tree

Derick Rethans [Thu, 7 Aug 2014 09:22:10 +0000 (10:22 +0100)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Derick Rethans [Thu, 7 Aug 2014 09:22:09 +0000 (10:22 +0100)]

- Updated to version 2014.6 (2014f)

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 14:02:17 +0000 (17:02 +0300)]

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

Conflicts:
NEWS
configure.in
main/php_version.h

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 12:28:06 +0000 (15:28 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 12:27:56 +0000 (15:27 +0300)]

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
NEWS
configure.in
main/php_version.h

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 12:27:29 +0000 (15:27 +0300)]

Add EXPECTF

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 11:52:55 +0000 (14:52 +0300)]

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 11:52:12 +0000 (14:52 +0300)]

Fix handling of multi-result sets with PS...used to clean not only
the result set but the whole PS.

commit | commitdiff | tree

Julien Pauli [Wed, 6 Aug 2014 08:20:31 +0000 (10:20 +0200)]

5.5.17 now

commit | commitdiff | tree

Stanislav Malyshev [Wed, 6 Aug 2014 04:26:11 +0000 (21:26 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
5.4.33-dev now

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Stanislav Malyshev [Wed, 6 Aug 2014 04:24:55 +0000 (21:24 -0700)]

5.4.33-dev now

commit | commitdiff | tree

Michael Wallner [Tue, 5 Aug 2014 13:47:52 +0000 (15:47 +0200)]

BFN

commit | commitdiff | tree

Michael Wallner [Tue, 5 Aug 2014 13:46:52 +0000 (15:46 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed Bug #67724

commit | commitdiff | tree

Michael Wallner [Tue, 5 Aug 2014 13:44:43 +0000 (15:44 +0200)]

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: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: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: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: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:27:51 +0000 (21:27 +0300)]

Fix wrong lenght size

commit | commitdiff | tree

Johannes Schlüter [Thu, 31 Jul 2014 13:40:51 +0000 (15:40 +0200)]

PHP 5.3.29RC1

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

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

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:33:19 +0000 (18:33 +0000)]

Update NEWS

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: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

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

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: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

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 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 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 [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:27 +0000 (10:52 +0800)]

Add CVE no