]> granicus.if.org Git - php/log
php
10 years agoMerge branch 'PHP-5.6'
Remi Collet [Mon, 23 Jun 2014 08:39:22 +0000 (10:39 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91

10 years agoNEWS
Remi Collet [Mon, 23 Jun 2014 08:39:06 +0000 (10:39 +0200)]
NEWS

10 years agoBetter fix for phpdbg + libedit
Remi Collet [Mon, 23 Jun 2014 08:17:43 +0000 (10:17 +0200)]
Better fix for phpdbg + libedit
- fix include
- disable coloured prompt only with libedit

10 years agoFix https://github.com/krakjoe/phpdbg/issues/91
Remi Collet [Mon, 23 Jun 2014 08:04:40 +0000 (10:04 +0200)]
Fix https://github.com/krakjoe/phpdbg/issues/91

Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Mon, 23 Jun 2014 08:18:55 +0000 (10:18 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Better fix for phpdbg + libedit - fix include - disable coloured prompt only with libedit
  Fix https://github.com/krakjoe/phpdbg/issues/91

10 years agoBetter fix for phpdbg + libedit
Remi Collet [Mon, 23 Jun 2014 08:17:43 +0000 (10:17 +0200)]
Better fix for phpdbg + libedit
- fix include
- disable coloured prompt only with libedit

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Mon, 23 Jun 2014 08:14:08 +0000 (10:14 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)
  mention 67468 fix in NEWS
  Fix Bug #67468  Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded

10 years agotestcase for 67468 (only for debug build, as I could not create a stable segfault...
Ferenc Kovacs [Mon, 23 Jun 2014 08:10:17 +0000 (10:10 +0200)]
testcase for 67468 (only for debug build, as I could not create a stable segfault without loading other exts like pgsql)

10 years agomention 67468 fix in NEWS
Ferenc Kovacs [Fri, 20 Jun 2014 22:06:51 +0000 (00:06 +0200)]
mention 67468 fix in NEWS

10 years agoFix https://github.com/krakjoe/phpdbg/issues/91
Remi Collet [Mon, 23 Jun 2014 08:04:40 +0000 (10:04 +0200)]
Fix https://github.com/krakjoe/phpdbg/issues/91

Enable edit feature when build with libedit.

Notice: coloured prompt only enable with READLINE

10 years agoFix Bug #67468 Segfault in highlight_file()/highlight_string() when pgsql.so module...
Andreas Ferber [Wed, 18 Jun 2014 22:15:07 +0000 (00:15 +0200)]
Fix Bug #67468  Segfault in highlight_file()/highlight_string() when pgsql.so module is loaded

str_efree() must be used in zend_highlight() and zend_indent() to free
string data assigned to a zval to account for interned strings.

10 years agoMerge branch 'PHP-5.6'
Dmitry Stogov [Fri, 20 Jun 2014 10:01:22 +0000 (14:01 +0400)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed MarinaDB support

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Dmitry Stogov [Fri, 20 Jun 2014 09:58:26 +0000 (13:58 +0400)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed MarinaDB support

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Dmitry Stogov [Fri, 20 Jun 2014 09:57:38 +0000 (13:57 +0400)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed MarinaDB support

10 years agoFixed MarinaDB support
Dmitry Stogov [Fri, 20 Jun 2014 09:56:32 +0000 (13:56 +0400)]
Fixed MarinaDB support

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Fri, 20 Jun 2014 04:45:36 +0000 (06:45 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  skip this test which fails without network

10 years agoskip this test which fails without network
Remi Collet [Fri, 20 Jun 2014 04:45:16 +0000 (06:45 +0200)]
skip this test which fails without network

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Thu, 19 Jun 2014 00:29:42 +0000 (02:29 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing entry to NEWS

10 years agoadd missing entry to NEWS
Ferenc Kovacs [Thu, 19 Jun 2014 00:29:27 +0000 (02:29 +0200)]
add missing entry to NEWS

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Thu, 19 Jun 2014 00:18:52 +0000 (02:18 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add missing entry to NEWS

10 years agoadd missing entry to NEWS
Ferenc Kovacs [Thu, 19 Jun 2014 00:18:26 +0000 (02:18 +0200)]
add missing entry to NEWS

10 years agoMerge branch 'PHP-5.6'
Ferenc Kovacs [Wed, 18 Jun 2014 23:35:19 +0000 (01:35 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  add NEWS block for 5.6.0RC2

10 years agoadd NEWS block for 5.6.0RC2
Ferenc Kovacs [Wed, 18 Jun 2014 23:34:25 +0000 (01:34 +0200)]
add NEWS block for 5.6.0RC2

10 years agoMerge branch 'PHP-5.6'
Andrey Hristov [Wed, 18 Jun 2014 18:54:26 +0000 (21:54 +0300)]
Merge branch 'PHP-5.6'

Conflicts:
NEWS

10 years agoAdd support for gb18030/MySQL 5.7
Andrey Hristov [Wed, 18 Jun 2014 18:53:34 +0000 (21:53 +0300)]
Add support for gb18030/MySQL 5.7

10 years agoMerge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
Andrey Hristov [Wed, 18 Jun 2014 15:32:51 +0000 (18:32 +0300)]
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

10 years agoMerge branch 'master' of git.php.net:php-src
Andrey Hristov [Wed, 18 Jun 2014 15:31:07 +0000 (18:31 +0300)]
Merge branch 'master' of git.php.net:php-src

10 years agoMerge branch 'PHP-5.6'
Andrey Hristov [Wed, 18 Jun 2014 15:30:49 +0000 (18:30 +0300)]
Merge branch 'PHP-5.6'

10 years agoFix another problem with MySQL 5.7
Andrey Hristov [Wed, 18 Jun 2014 15:30:37 +0000 (18:30 +0300)]
Fix another problem with MySQL 5.7

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Wed, 18 Jun 2014 14:00:07 +0000 (16:00 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  new test, missing in ea466a3

10 years agonew test, missing in ea466a3
Remi Collet [Wed, 18 Jun 2014 13:59:45 +0000 (15:59 +0200)]
new test, missing in ea466a3

10 years agoMerge branch 'PHP-5.6'
Andrey Hristov [Wed, 18 Jun 2014 13:45:12 +0000 (16:45 +0300)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Andrey Hristov [Wed, 18 Jun 2014 13:42:42 +0000 (16:42 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoSuppress test failure with MySQL 5.7
Andrey Hristov [Wed, 18 Jun 2014 13:20:14 +0000 (16:20 +0300)]
Suppress test failure with MySQL 5.7

10 years agoUpdate copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:22:16 +0000 (00:22 +0300)]
Update copyright year to 2014

10 years agoMerge branch 'PHP-5.6'
Lior Kaplan [Tue, 17 Jun 2014 21:21:20 +0000 (00:21 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014

10 years agoUpdate copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:18:47 +0000 (00:18 +0300)]
Update copyright year to 2014

10 years agoUpdate copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:16:23 +0000 (00:16 +0300)]
Update copyright year to 2014

Align with online version at http://www.php.net/license/3_01.txt

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Lior Kaplan [Tue, 17 Jun 2014 21:14:18 +0000 (00:14 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014
  Update copyright year to 2014

10 years agoUpdate copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:12:33 +0000 (00:12 +0300)]
Update copyright year to 2014

10 years agoUpdate copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 21:11:55 +0000 (00:11 +0300)]
Update copyright year to 2014

Align with online version at http://www.php.net/license/3_01.txt

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lior Kaplan [Tue, 17 Jun 2014 21:11:35 +0000 (00:11 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update copyright year to 2014
  Update copyright year to 2014

10 years agoUpdate copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 20:57:20 +0000 (23:57 +0300)]
Update copyright year to 2014

10 years agoUpdate copyright year to 2014
Lior Kaplan [Tue, 17 Jun 2014 20:56:46 +0000 (23:56 +0300)]
Update copyright year to 2014

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Tue, 17 Jun 2014 07:41:30 +0000 (09:41 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS
  Fix Request #67453 Allow to unserialize empty data.

10 years agoNEWS
Remi Collet [Tue, 17 Jun 2014 07:41:10 +0000 (09:41 +0200)]
NEWS

10 years agoFix Request #67453 Allow to unserialize empty data.
Remi Collet [Tue, 17 Jun 2014 07:38:54 +0000 (09:38 +0200)]
Fix Request #67453 Allow to unserialize empty data.

SplDoublyLinkedList, SplObjectStorage and ArrayObject have empty
constructor (no arg), so it make sense to allow to unserialize empty
data.

This allow the hack (used in various place, including PHPUnit) to
instanciate class without call to constructor to work.

10 years agoMerge branch 'PHP-5.6'
Lior Kaplan [Mon, 16 Jun 2014 20:36:39 +0000 (23:36 +0300)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Update copyright year to 2014
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well

10 years agoUpdate copyright year to 2014
Lior Kaplan [Mon, 16 Jun 2014 20:34:50 +0000 (23:34 +0300)]
Update copyright year to 2014

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Lior Kaplan [Mon, 16 Jun 2014 20:32:10 +0000 (23:32 +0300)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Lior Kaplan [Mon, 16 Jun 2014 20:30:44 +0000 (23:30 +0300)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Update copyright year for re2c generated files
  Update copyright year to 2014
  Update copyright year for re2c files as well

10 years agoUpdate copyright year for re2c generated files
Lior Kaplan [Mon, 16 Jun 2014 20:28:36 +0000 (23:28 +0300)]
Update copyright year for re2c generated files

10 years agoUpdate copyright year to 2014
Lior Kaplan [Mon, 16 Jun 2014 20:27:45 +0000 (23:27 +0300)]
Update copyright year to 2014

10 years agoUpdate copyright year for re2c files as well
Lior Kaplan [Mon, 16 Jun 2014 20:26:50 +0000 (23:26 +0300)]
Update copyright year for re2c files as well

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Mon, 16 Jun 2014 09:20:05 +0000 (11:20 +0200)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Mon, 16 Jun 2014 09:18:45 +0000 (11:18 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_compile.c

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Mon, 16 Jun 2014 09:16:33 +0000 (11:16 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoFix patch for bug #67436
Bob Weinand [Mon, 16 Jun 2014 09:10:50 +0000 (11:10 +0200)]
Fix patch for bug #67436

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Mon, 16 Jun 2014 08:52:39 +0000 (10:52 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix failed test

10 years agofix failed test
Remi Collet [Mon, 16 Jun 2014 08:52:26 +0000 (10:52 +0200)]
fix failed test

10 years agoMerge branch 'PHP-5.6'
Remi Collet [Mon, 16 Jun 2014 07:44:58 +0000 (09:44 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix test on modern distro where old unsecure algo are disabled in openssl config. Testing recent algo should be enough to check this function.

10 years agoFix test on modern distro where old unsecure algo are disabled in openssl config.
Remi Collet [Mon, 16 Jun 2014 07:42:55 +0000 (09:42 +0200)]
Fix test on modern distro where old unsecure algo are disabled in openssl config.
Testing recent algo should be enough to check this function.

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Sun, 15 Jun 2014 22:43:31 +0000 (00:43 +0200)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Sun, 15 Jun 2014 22:42:50 +0000 (00:42 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 22:41:46 +0000 (00:41 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoMerge branch 'pull-request/695' into PHP-5.4
Bob Weinand [Sun, 15 Jun 2014 22:35:20 +0000 (00:35 +0200)]
Merge branch 'pull-request/695' into PHP-5.4

10 years agoAdded tests for bug 67436
Levi Morrison [Sun, 15 Jun 2014 22:10:40 +0000 (16:10 -0600)]
Added tests for bug 67436

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Sun, 15 Jun 2014 21:56:14 +0000 (23:56 +0200)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Sun, 15 Jun 2014 21:55:44 +0000 (23:55 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 21:54:05 +0000 (23:54 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoFixed wrong XFAIL test - already fixed
Bob Weinand [Sun, 15 Jun 2014 21:51:51 +0000 (23:51 +0200)]
Fixed wrong XFAIL test - already fixed

10 years agoFix typo in Bug #67406 NEWS entry
Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]
Fix typo in Bug #67406 NEWS entry

10 years agoFix typo in Bug #67406 NEWS entry
Lior Kaplan [Sun, 15 Jun 2014 21:26:01 +0000 (00:26 +0300)]
Fix typo in Bug #67406 NEWS entry

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Sun, 15 Jun 2014 21:16:21 +0000 (23:16 +0200)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Bob Weinand [Sun, 15 Jun 2014 21:06:15 +0000 (23:06 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
NEWS
Zend/zend_compile.c

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 20:36:13 +0000 (22:36 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoUpdated NEWS
Bob Weinand [Sun, 15 Jun 2014 20:32:47 +0000 (22:32 +0200)]
Updated NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Bob Weinand [Sun, 15 Jun 2014 20:24:44 +0000 (22:24 +0200)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years agoFix bug #67436
Bob Weinand [Sun, 15 Jun 2014 20:18:25 +0000 (22:18 +0200)]
Fix bug #67436

10 years agoUpdate NEWS
Bob Weinand [Sun, 15 Jun 2014 13:50:36 +0000 (15:50 +0200)]
Update NEWS

10 years agoMerge branch 'PHP-5.6'
Bob Weinand [Sun, 15 Jun 2014 13:47:44 +0000 (15:47 +0200)]
Merge branch 'PHP-5.6'

10 years agoMerge sapi/phpdbg into PHP-5.6
Bob Weinand [Sun, 15 Jun 2014 13:47:14 +0000 (15:47 +0200)]
Merge sapi/phpdbg into PHP-5.6

10 years agoMerge branch 'PHP-5.6'
Stanislav Malyshev [Sun, 15 Jun 2014 08:08:16 +0000 (01:08 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  update NEWS
  update NEWS
  update NEWS

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Stanislav Malyshev [Sun, 15 Jun 2014 08:07:48 +0000 (01:07 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update NEWS
  update NEWS

10 years agoupdate NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 08:07:39 +0000 (01:07 -0700)]
update NEWS

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Stanislav Malyshev [Sun, 15 Jun 2014 08:06:46 +0000 (01:06 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update NEWS

10 years agoupdate NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 08:06:37 +0000 (01:06 -0700)]
update NEWS

10 years agoupdate NEWS
Stanislav Malyshev [Sun, 15 Jun 2014 07:46:31 +0000 (00:46 -0700)]
update NEWS

10 years agofix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ
kovacs.ferenc [Sat, 14 Jun 2014 21:48:17 +0000 (23:48 +0200)]
fix bugsnet #67212: phpdbg uses non-standard TIOCGWINSZ

10 years agochange the default terminal width from 100 to 80, as that is the most common value
kovacs.ferenc [Thu, 12 Jun 2014 21:13:50 +0000 (23:13 +0200)]
change the default terminal width from 100 to 80, as that is the most common value

10 years agoMerge branch 'PHP-5.6'
Derick Rethans [Fri, 13 Jun 2014 22:26:50 +0000 (23:26 +0100)]
Merge branch 'PHP-5.6'

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Derick Rethans [Fri, 13 Jun 2014 22:26:47 +0000 (23:26 +0100)]
Merge branch 'PHP-5.5' into PHP-5.6

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Derick Rethans [Fri, 13 Jun 2014 22:26:43 +0000 (23:26 +0100)]
Merge branch 'PHP-5.4' into PHP-5.5

10 years ago- Updated to version 2014.5 (2014e)
Derick Rethans [Fri, 13 Jun 2014 22:26:42 +0000 (23:26 +0100)]
- Updated to version 2014.5 (2014e)

10 years agoMerge branch 'PHP-5.6'
Matteo Beccati [Fri, 13 Jun 2014 11:14:52 +0000 (13:14 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67433 SIGSEGV when using count() on an object implementing Countable

10 years agoFix bug #67433 SIGSEGV when using count() on an object implementing Countable
Matteo Beccati [Fri, 13 Jun 2014 11:14:12 +0000 (13:14 +0200)]
Fix bug #67433 SIGSEGV when using count() on an object implementing Countable

10 years agoremove all references
krakjoe [Fri, 13 Jun 2014 06:35:11 +0000 (07:35 +0100)]
remove all references

10 years agoMerge branch 'PHP-5.6'
Adam Harvey [Fri, 13 Jun 2014 01:19:11 +0000 (18:19 -0700)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  Follow 308 Permanent Redirect responses.

10 years agoMerge branch 'PHP-5.5' into PHP-5.6
Adam Harvey [Fri, 13 Jun 2014 01:17:18 +0000 (18:17 -0700)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Follow 308 Permanent Redirect responses.

10 years agoMerge branch 'PHP-5.4' into PHP-5.5
Adam Harvey [Fri, 13 Jun 2014 01:15:07 +0000 (18:15 -0700)]
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Follow 308 Permanent Redirect responses.