granicus.if.org Git

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
ext/standard/pack.c

commit | commitdiff | tree

Stanislav Malyshev [Tue, 12 May 2015 21:24:15 +0000 (14:24 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix format
  update NEWS
  Add test for bug #69522
  Update tests
  Fix bug #69522 - do not allow int overflow
  Forgot test file
  Fix bug #69403 and other int overflows
  Fixed bug #69418 - more s->p fixes for filenames
  Fixed bug #69364 - use smart_str to assemble strings
  Fix bug #69453 - don't try to cut empty string
  Fix bug #69545 - avoid overflow when reading list

Conflicts:
ext/pcntl/pcntl.c
ext/standard/basic_functions.c
ext/standard/pack.c
ext/standard/tests/dir/opendir_variation1-win32.phpt

commit | commitdiff | tree

Stanislav Malyshev [Tue, 12 May 2015 19:37:28 +0000 (12:37 -0700)]

fix format

commit | commitdiff | tree

Stanislav Malyshev [Tue, 12 May 2015 19:17:54 +0000 (12:17 -0700)]

update NEWS

commit | commitdiff | tree

Julien Pauli [Tue, 12 May 2015 14:13:39 +0000 (16:13 +0200)]

Updated NEWS

commit | commitdiff | tree

Julien Pauli [Tue, 12 May 2015 14:12:51 +0000 (16:12 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix for #66048

commit | commitdiff | tree

Julien Pauli [Tue, 12 May 2015 14:12:29 +0000 (16:12 +0200)]

Fix for #66048

commit | commitdiff | tree

Nikita Popov [Tue, 12 May 2015 13:08:12 +0000 (15:08 +0200)]

Fix bug #69599

commit | commitdiff | tree

Stanislav Malyshev [Mon, 11 May 2015 08:10:35 +0000 (01:10 -0700)]

Add test for bug #69522

commit | commitdiff | tree

Stanislav Malyshev [Mon, 11 May 2015 06:33:44 +0000 (23:33 -0700)]

Update tests

commit | commitdiff | tree

Stanislav Malyshev [Mon, 11 May 2015 06:06:08 +0000 (23:06 -0700)]

Fix bug #69522 - do not allow int overflow

commit | commitdiff | tree

Stanislav Malyshev [Sun, 10 May 2015 09:24:29 +0000 (02:24 -0700)]

Forgot test file

commit | commitdiff | tree

Stanislav Malyshev [Sun, 10 May 2015 09:20:08 +0000 (02:20 -0700)]

Fix bug #69403 and other int overflows

commit | commitdiff | tree

Stanislav Malyshev [Sun, 10 May 2015 06:13:06 +0000 (23:13 -0700)]

Fixed bug #69418 - more s->p fixes for filenames

commit | commitdiff | tree

Stanislav Malyshev [Sun, 10 May 2015 06:04:25 +0000 (23:04 -0700)]

Fixed bug #69364 - use smart_str to assemble strings

commit | commitdiff | tree

Stanislav Malyshev [Sun, 10 May 2015 01:56:25 +0000 (18:56 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix #48147 - implement manual handling of //IGNORE for broken libc

commit | commitdiff | tree

Stanislav Malyshev [Fri, 8 May 2015 07:03:54 +0000 (00:03 -0700)]

Fix #48147 - implement manual handling of //IGNORE for broken libc

Conflicts:
ext/iconv/iconv.c

commit | commitdiff | tree

Dmitry Stogov [Thu, 7 May 2015 09:16:40 +0000 (12:16 +0300)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)

Conflicts:
NEWS

commit | commitdiff | tree

Dmitry Stogov [Thu, 7 May 2015 09:14:14 +0000 (12:14 +0300)]

Fixed bug #69549 (Memory leak with opcache.optimization_level=0xFFFFFFFF)

commit | commitdiff | tree

Remi Collet [Tue, 5 May 2015 09:23:13 +0000 (11:23 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Relax tests failing on i386 with new zic

commit | commitdiff | tree

Remi Collet [Tue, 5 May 2015 09:22:29 +0000 (11:22 +0200)]

Relax tests failing on i386 with new zic

commit | commitdiff | tree

Rasmus Lerdorf [Wed, 8 Apr 2015 16:55:55 +0000 (09:55 -0700)]

Remove SSLv3 test dependencies
SSLv3 is going away. Debian8 already ships with an openssl
with no SSLv3 support which was causing these tests to fail.

Conflicts:
ext/openssl/tests/session_meta_capture.phpt

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 03:06:23 +0000 (11:06 +0800)]

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

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 03:06:14 +0000 (11:06 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Tue, 5 May 2015 03:06:04 +0000 (11:06 +0800)]

Update version

commit | commitdiff | tree

Anatol Belski [Mon, 4 May 2015 13:59:14 +0000 (15:59 +0200)]

add config vars for phpize

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 11:22:22 +0000 (19:22 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 11:21:54 +0000 (19:21 +0800)]

Saving the latter checking in most cases

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 02:34:48 +0000 (10:34 +0800)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Xinchen Hui [Mon, 4 May 2015 02:34:39 +0000 (10:34 +0800)]

Update NEWS

commit | commitdiff | tree

John Boehr [Sun, 3 May 2015 21:29:19 +0000 (14:29 -0700)]

Fix uninitialized value with extension traits

commit | commitdiff | tree

John Boehr [Sun, 3 May 2015 21:29:19 +0000 (14:29 -0700)]

Fix uninitialized value with extension traits

commit | commitdiff | tree

Stanislav Malyshev [Thu, 30 Apr 2015 05:04:20 +0000 (22:04 -0700)]

Fix bug #69453 - don't try to cut empty string

commit | commitdiff | tree

Stanislav Malyshev [Thu, 30 Apr 2015 04:57:33 +0000 (21:57 -0700)]

Fix bug #69545 - avoid overflow when reading list

commit | commitdiff | tree

Stanislav Malyshev [Thu, 30 Apr 2015 05:28:04 +0000 (22:28 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Upgrade to PCRE 8.37 due to various bugfixes

commit | commitdiff | tree

Stanislav Malyshev [Thu, 30 Apr 2015 05:27:21 +0000 (22:27 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Upgrade to PCRE 8.37 due to various bugfixes

commit | commitdiff | tree

Stanislav Malyshev [Thu, 30 Apr 2015 05:25:02 +0000 (22:25 -0700)]

Upgrade to PCRE 8.37 due to various bugfixes

commit | commitdiff | tree

Ferenc Kovacs [Wed, 29 Apr 2015 22:01:55 +0000 (00:01 +0200)]

5.6.10 will be next

commit | commitdiff | tree

Julien Pauli [Wed, 29 Apr 2015 09:21:18 +0000 (11:21 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
5.5.26 now

Conflicts:
configure.in
main/php_version.h

commit | commitdiff | tree

Julien Pauli [Wed, 29 Apr 2015 09:16:06 +0000 (11:16 +0200)]

5.5.26 now

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:28:56 +0000 (00:28 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:28:50 +0000 (00:28 +0100)]

Use new structures for tzdb header here as well

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:27:55 +0000 (00:27 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:25:29 +0000 (00:25 +0100)]

This doesn't work in PHP 5.5 - sigh, I wish the libs were kept in sync

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:09:00 +0000 (00:09 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 23:08:28 +0000 (00:08 +0100)]

Split header reading in 32bit and 64bit variants.

We need to use the 64bit header for the second set of transitions, as there
could be a different amount of transitions. This also opens up the way towards
real 64bit support.

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 14:57:35 +0000 (15:57 +0100)]

Merge branch 'PHP-5.5' into PHP-5.6

commit | commitdiff | tree

Derick Rethans [Tue, 28 Apr 2015 14:57:26 +0000 (15:57 +0100)]

Merge whitespace changes that have been made to timelib and PHP-5.6 and master

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:34:11 +0000 (15:34 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:32:22 +0000 (15:32 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
backported patch for bug #69472

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:31:47 +0000 (15:31 +0200)]

backported patch for bug #69472

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:14:45 +0000 (15:14 +0200)]

updated NEWS

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:13:46 +0000 (15:13 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
updated NEWS
Fixed bug #69381 out of memory with sage odbc driver

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 13:13:19 +0000 (15:13 +0200)]

updated NEWS

commit | commitdiff | tree

Frederic Marchal [Tue, 28 Apr 2015 13:08:53 +0000 (15:08 +0200)]

Fixed bug #69381 out of memory with sage odbc driver

This is just a hotfix as there are still drivers with no full
ODBC 3.x support. This patch origins from bug #68350 which was
solved by the proper 3.0 migration, another driver (Sage)
turned out to have the real issue.

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 12:38:45 +0000 (14:38 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
fix VC9 build with PCRE
Revert "Fix segfault in ext/date since 957aa2"

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 12:38:21 +0000 (14:38 +0200)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
fix VC9 build with PCRE

commit | commitdiff | tree

Anatol Belski [Tue, 28 Apr 2015 11:15:39 +0000 (13:15 +0200)]

fix VC9 build with PCRE

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 10:48:00 +0000 (12:48 +0200)]

Revert "Fix segfault in ext/date since 957aa2"

This reverts commit b5e5098c50397ed910a79ac1d64b7d0fff2c02e1.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 10:48:00 +0000 (12:48 +0200)]

Revert "Fix segfault in ext/date since 957aa2"

This reverts commit b5e5098c50397ed910a79ac1d64b7d0fff2c02e1.

A proper fix from Derick is underway. I apologise for stepping on his toes ;)

commit | commitdiff | tree

Remi Collet [Tue, 28 Apr 2015 10:50:09 +0000 (12:50 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  relax tests with huge year (new zic)
  ignore second value for huge timestamp test (new zic)
  relax test for date < INT32_MIN (new zic)
  relax bigbang content (new zic)
  Make date transitions tests more flexible

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 08:00:15 +0000 (10:00 +0200)]

relax tests with huge year (new zic)

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 07:37:06 +0000 (09:37 +0200)]

ignore second value for huge timestamp test (new zic)

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 07:28:29 +0000 (09:28 +0200)]

relax test for date < INT32_MIN (new zic)

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 07:11:39 +0000 (09:11 +0200)]

relax bigbang content (new zic)

commit | commitdiff | tree

Remi Collet [Sat, 18 Apr 2015 05:47:47 +0000 (07:47 +0200)]

Make date transitions tests more flexible

zic in recent glibc (2.20) introduce a new transitionn
so use a range to avoid failure when total number
of transitions is different (243/244)

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 08:57:52 +0000 (10:57 +0200)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Fix segfault in ext/date since 957aa2

commit | commitdiff | tree

Matteo Beccati [Tue, 28 Apr 2015 08:57:18 +0000 (10:57 +0200)]

Fix segfault in ext/date since 957aa2

commit | commitdiff | tree

Stanislav Malyshev [Tue, 28 Apr 2015 06:30:57 +0000 (23:30 -0700)]

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
Upgrade PCRE to 8.36, it fixes some crashes

commit | commitdiff | tree

Stanislav Malyshev [Tue, 28 Apr 2015 06:22:44 +0000 (23:22 -0700)]

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Upgrade PCRE to 8.36, it fixes some crashes