granicus.if.org Git

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  split the glob() test to test different basedir
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()

commit | commitdiff | tree

Stanislav Malyshev [Fri, 15 Aug 2014 00:05:03 +0000 (17:05 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
split the glob() test to test different basedir

commit | commitdiff | tree

Anatol Belski [Tue, 20 Aug 2013 11:39:30 +0000 (13:39 +0200)]

split the glob() test to test different basedir

commit | commitdiff | tree

Stanislav Malyshev [Thu, 14 Aug 2014 23:59:14 +0000 (16:59 -0700)]

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:25:22 +0000 (17:25 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

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)]

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

Ferenc Kovacs [Thu, 14 Aug 2014 00:17:55 +0000 (02:17 +0200)]

new NEWS block for the next release

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)]

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)]

commit | commitdiff | tree

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

Updated NEWS for #66091

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Updated NEWS for #66091
Fixed #66091

Conflicts:
ext/date/php_date.c

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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed #66091

Conflicts:
ext/date/php_date.c

commit | commitdiff | tree

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

commit | commitdiff | tree

Ferenc Kovacs [Tue, 12 Aug 2014 12:47:03 +0000 (14:47 +0200)]

Merge branch 'pr-765' into PHP-5.6

* pr-765:
  NEWS entry for e6d93a1 / d73d44c
  restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606
  Revert "Merge branch 'pull-request/694' into PHP-5.6"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

commit | commitdiff | tree

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

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)]

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
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: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:47:36 +0000 (17:47 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

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

David Zuelke [Sat, 9 Aug 2014 06:30:50 +0000 (08:30 +0200)]

NEWS entry for e6d93a1 / d73d44c

commit | commitdiff | tree

David Zuelke [Sat, 9 Aug 2014 06:26:33 +0000 (08:26 +0200)]

restore FPM compatibility with mod_fastcgi broken since #694 / 67541, fixes bug 67606

commit | commitdiff | tree

David Zuelke [Sat, 9 Aug 2014 06:14:23 +0000 (08:14 +0200)]

Revert "Merge branch 'pull-request/694' into PHP-5.6"

This reverts commit d96de86b5b4ca8adf63ac6e07ab57fc2ec9d87f4, reversing
changes made to b1e32a4f7a6c2351a2006c2c1b9085336ba513e4.

commit | commitdiff | tree

Adam Harvey [Fri, 8 Aug 2014 19:00:13 +0000 (12:00 -0700)]

Add __debugInfo() to UPGRADING.

RMs: this is an UPGRADING only change, and should be safe for RCs.

Developers: please remember to update UPGRADING, otherwise there's a good
chance your shiny new feature won't be documented! (As has happened here.)

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix TS build

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)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Update NEWS
Update NEWS

commit | commitdiff | tree

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

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)]

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

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

Conflicts:
ext/openssl/xp_ssl.c

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:22:28 +0000 (15:22 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

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

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:14 +0000 (10:22 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

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

Bob Weinand [Wed, 6 Aug 2014 19:13:58 +0000 (21:13 +0200)]

Removed Countable::count() change info from UPGRADE.INTERNALS too

commit | commitdiff | tree

Ferenc Kovacs [Wed, 6 Aug 2014 18:33:48 +0000 (20:33 +0200)]

Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"

This reverts commit a51bf0cadf7862d10b2cc19cae2c991d24d670b1.

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
NEWS
configure.in
main/php_version.h

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 13:59:56 +0000 (16:59 +0300)]

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

Conflicts:
NEWS

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 13:50:27 +0000 (16:50 +0300)]

Use callback structure

commit | commitdiff | tree

Andrey Hristov [Wed, 6 Aug 2014 13:25:12 +0000 (16:25 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

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

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)]

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)]

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
5.4.33-dev 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)]

commit | commitdiff | tree

Daniel Lowrey [Mon, 4 Aug 2014 16:41:51 +0000 (12:41 -0400)]

Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option

commit | commitdiff | tree

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

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
BFN
Fixed Bug #67724

commit | commitdiff | tree

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

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

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)]

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)]

commit | commitdiff | tree

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

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)]

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)]

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

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom