granicus.if.org Git

commit | commitdiff | tree

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

Merge branch 'PHP-5.6'

* PHP-5.6:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]

Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

Remi Collet [Fri, 15 Aug 2014 00:19:03 +0000 (17:19 -0700)]

Fix bug #67716 - Segfault in cdf.c

commit | commitdiff | tree

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

Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test
  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:08:37 +0000 (17:08 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix test

commit | commitdiff | tree

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

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix test

commit | commitdiff | tree

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

commit | commitdiff | tree

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

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

Sara Golemon [Thu, 14 Aug 2014 20:34:06 +0000 (13:34 -0700)]

Add NEWS entry for log() improvements

commit | commitdiff | tree

Sara Golemon [Thu, 14 Aug 2014 16:44:14 +0000 (09:44 -0700)]

Merge branch 'pull-request/658'

commit | commitdiff | tree

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

Merge branch 'PHP-5.6'

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

Merge branch 'PHP-5.6'

* PHP-5.6:
new NEWS block for the next release

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

Merge branch 'PHP-5.6'

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

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:48:48 +0000 (14:48 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
  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

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

Merge branch 'PHP-5.6'

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

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

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

Merge branch 'pull-request/681'

commit | commitdiff | tree

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

Merge branch 'PHP-5.6'

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

Merge branch 'PHP-5.6'

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

Merge branch 'PHP-5.6'

* PHP-5.6:
Add __debugInfo() to UPGRADING.

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:51:04 +0000 (19:51 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
fix TS build

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:45:50 +0000 (12:45 -0400)]

Merge branch 'PHP-5.6'

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

Christopher Jones [Thu, 7 Aug 2014 16:30:19 +0000 (09:30 -0700)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Small tidy ups and raise visibility of GitHub PR process

commit | commitdiff | tree

Christopher Jones [Thu, 7 Aug 2014 16:29:47 +0000 (09:29 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Small tidy ups and raise visibility of GitHub PR process

Conflicts:
README.SUBMITTING_PATCH

commit | commitdiff | tree

Christopher Jones [Thu, 7 Aug 2014 16:27:53 +0000 (09:27 -0700)]

Small tidy ups and raise visibility of GitHub PR process

commit | commitdiff | tree

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

Merge branch 'PHP-5.6'

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

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

Merge branch 'PHP-5.6'

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

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

Merge branch 'PHP-5.6'

Not sure what's going wrong here for UPGRADING.INTERNALS...

Conflicts:
UPGRADING.INTERNALS

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 19:11:02 +0000 (21:11 +0200)]

Merge branch 'PHP-5.6'

* PHP-5.6:
Revert "Add SO_REUSEPORT + SO_BROADCAST support via socket stream context option"

Didn't actually merged the revert as we wan't to keep this in master, but merged it with -s ours.

commit | commitdiff | tree

Andrea Faulds [Wed, 6 Aug 2014 18:56:32 +0000 (19:56 +0100)]

NEWS and UPGRADING for intdiv()

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

Andrea Faulds [Wed, 6 Aug 2014 15:02:38 +0000 (16:02 +0100)]

Merge branch 'master' of git.php.net:php-src

commit | commitdiff | tree

Andrea Faulds [Wed, 6 Aug 2014 15:02:02 +0000 (16:02 +0100)]

Fixed skip case for intdiv 64-bit test