]> granicus.if.org Git - php/log
php
9 years agoFix extension version
Stanislav Malyshev [Sun, 18 Oct 2015 22:12:11 +0000 (15:12 -0700)]
Fix extension version

9 years agoMerge branch 'pull-request/1511'
Stanislav Malyshev [Sun, 18 Oct 2015 22:05:09 +0000 (15:05 -0700)]
Merge branch 'pull-request/1511'

* pull-request/1511:
  Changed from testing cast-128 to cast-256

9 years agoMerge branch 'pull-request/1527'
Stanislav Malyshev [Sun, 18 Oct 2015 22:02:48 +0000 (15:02 -0700)]
Merge branch 'pull-request/1527'

* pull-request/1527:
  adding test scenario to improve coverage
  adding test scenario to improve coverage

9 years agoMerge branch 'pull-request/1563'
Stanislav Malyshev [Sun, 18 Oct 2015 22:01:15 +0000 (15:01 -0700)]
Merge branch 'pull-request/1563'

* pull-request/1563:
  Drop support for EOL'd PHP versions from run-tests

9 years agoMerge branch 'pull-request/1523'
Stanislav Malyshev [Sun, 18 Oct 2015 21:57:10 +0000 (14:57 -0700)]
Merge branch 'pull-request/1523'

* pull-request/1523:
  List PHP extension api version nos in zend_extensions.h

9 years agoMerge branch 'pull-request/1516'
Stanislav Malyshev [Sun, 18 Oct 2015 21:56:06 +0000 (14:56 -0700)]
Merge branch 'pull-request/1516'

* pull-request/1516:
  Remove wrong argument $session from SNMP::setSecurity()
  Fix SNMP::setSecurity() arginfo (Fixes bug #70476)

9 years agoMerge branch 'PHP-7.0'
Stanislav Malyshev [Sun, 18 Oct 2015 21:52:34 +0000 (14:52 -0700)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Remove wrong argument $session from SNMP::setSecurity()
  Fix SNMP::setSecurity() arginfo (Fixes bug #70476)

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Sun, 18 Oct 2015 21:51:13 +0000 (14:51 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Remove wrong argument $session from SNMP::setSecurity()
  Fix SNMP::setSecurity() arginfo (Fixes bug #70476)

9 years agoRemove wrong argument $session from SNMP::setSecurity()
jubianchi [Fri, 11 Sep 2015 16:13:23 +0000 (18:13 +0200)]
Remove wrong argument $session from SNMP::setSecurity()

9 years agoFix SNMP::setSecurity() arginfo (Fixes bug #70476)
jubianchi [Fri, 11 Sep 2015 15:54:31 +0000 (17:54 +0200)]
Fix SNMP::setSecurity() arginfo (Fixes bug #70476)

9 years agoMerge branch 'pull-request/1507'
Stanislav Malyshev [Sun, 18 Oct 2015 21:39:45 +0000 (14:39 -0700)]
Merge branch 'pull-request/1507'

* pull-request/1507:
  Include config.h instead of php_config.h in gd_compat.c to have the configure variable available in outside-of-the-tree module build

9 years agoMerge branch 'PHP-7.0'
Felipe Pena [Sun, 18 Oct 2015 14:10:03 +0000 (12:10 -0200)]
Merge branch 'PHP-7.0'

9 years ago- Implemented output paging
Felipe Pena [Sun, 18 Oct 2015 14:08:04 +0000 (12:08 -0200)]
- Implemented output paging

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Sun, 18 Oct 2015 09:36:23 +0000 (11:36 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  updated NEWS
  update NEWS

9 years agoupdated NEWS
Anatol Belski [Sun, 18 Oct 2015 09:36:04 +0000 (11:36 +0200)]
updated NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Sun, 18 Oct 2015 09:35:25 +0000 (11:35 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS

9 years agoupdate NEWS
Anatol Belski [Sun, 18 Oct 2015 09:34:42 +0000 (11:34 +0200)]
update NEWS

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Sun, 18 Oct 2015 09:31:19 +0000 (11:31 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  C89 compat
  use spprintf instead (no need to estrdup afterwards).
  dblib's dbcolname can return null in some cases
  testcase fot bug #69757
  Segmentation fault on pdo_dblib::nextRowset (bug #69757)

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Sun, 18 Oct 2015 09:28:57 +0000 (11:28 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  C89 compat
  use spprintf instead (no need to estrdup afterwards).
  dblib's dbcolname can return null in some cases
  testcase fot bug #69757
  Segmentation fault on pdo_dblib::nextRowset (bug #69757)

Conflicts:
ext/pdo_dblib/dblib_stmt.c

9 years agoC89 compat
Anatol Belski [Sun, 18 Oct 2015 09:14:30 +0000 (11:14 +0200)]
C89 compat

9 years agouse spprintf instead (no need to estrdup afterwards).
MiRacLe.RPZ [Sat, 17 Oct 2015 21:31:38 +0000 (00:31 +0300)]
use spprintf instead (no need to estrdup afterwards).

9 years agodblib's dbcolname can return null in some cases
MiRacLe.RPZ [Wed, 2 Sep 2015 19:36:14 +0000 (22:36 +0300)]
dblib's dbcolname can return null in some cases

9 years agotestcase fot bug #69757
MiRacLe.RPZ [Mon, 6 Jul 2015 20:31:57 +0000 (23:31 +0300)]
testcase fot bug #69757

9 years agoSegmentation fault on pdo_dblib::nextRowset (bug #69757)
MiRacLe.RPZ [Fri, 3 Jul 2015 07:28:06 +0000 (10:28 +0300)]
Segmentation fault on pdo_dblib::nextRowset (bug #69757)

9 years agoMerge branch 'PHP-7.0'
Aaron Piotrowski [Sun, 18 Oct 2015 07:24:05 +0000 (02:24 -0500)]
Merge branch 'PHP-7.0'

9 years agoFix missed assertion tests
Aaron Piotrowski [Sun, 18 Oct 2015 07:23:43 +0000 (02:23 -0500)]
Fix missed assertion tests

9 years agoMerge branch 'PHP-7.0'
Aaron Piotrowski [Sun, 18 Oct 2015 06:52:17 +0000 (01:52 -0500)]
Merge branch 'PHP-7.0'

9 years agoAlways return boolean from assert
Aaron Piotrowski [Sun, 18 Oct 2015 06:42:15 +0000 (01:42 -0500)]
Always return boolean from assert

Matches docs prototype

9 years agoMerge branch 'PHP-7.0'
Aaron Piotrowski [Sat, 17 Oct 2015 19:31:04 +0000 (14:31 -0500)]
Merge branch 'PHP-7.0'

9 years agoFix assert() implementation to match docs
Aaron Piotrowski [Sat, 17 Oct 2015 19:30:41 +0000 (14:30 -0500)]
Fix assert() implementation to match docs

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sat, 17 Oct 2015 12:29:32 +0000 (05:29 -0700)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70730 (Incorrect ArrayObject serialization if unset is called in serialize())
Xinchen Hui [Sat, 17 Oct 2015 12:28:49 +0000 (05:28 -0700)]
Fixed bug #70730 (Incorrect ArrayObject serialization if unset is called in serialize())

It's possible to fixed this in SPL side, but it will be ugly, and we
should make serialize more robust, so I prefer fix it in serialize side.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Sat, 17 Oct 2015 08:53:11 +0000 (01:53 -0700)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70724 (Undefined Symbols from opcache.so on Mac OS X 10.10)
Xinchen Hui [Sat, 17 Oct 2015 08:45:23 +0000 (01:45 -0700)]
Fixed bug #70724 (Undefined Symbols from opcache.so on Mac OS X 10.10)

9 years agoFix undefined symbol error when compiling with LLVM
Stanislav Malyshev [Sat, 17 Oct 2015 00:23:18 +0000 (17:23 -0700)]
Fix undefined symbol error when compiling with LLVM

Basically, LLVM in default mode treats inline in a way incompatible
with GCC in c89 mode, which leads to undefined symbol errors.
See more here: http://stackoverflow.com/questions/12844729/linking-error-for-inline-functions

9 years agoupdate NEWS and UPGRADING
Ferenc Kovacs [Fri, 16 Oct 2015 17:01:22 +0000 (19:01 +0200)]
update NEWS and UPGRADING

9 years agoMerge branch 'pr-1567'
Ferenc Kovacs [Fri, 16 Oct 2015 16:22:02 +0000 (18:22 +0200)]
Merge branch 'pr-1567'

* pr-1567:
  initialize *str
  calling getenv() without arguments should return the environment variables as an array

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Fri, 16 Oct 2015 15:45:55 +0000 (17:45 +0200)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70678 (PHP7 returns true when false is expected)
Felipe Pena [Sun, 11 Oct 2015 15:08:34 +0000 (12:08 -0300)]
Fixed bug #70678 (PHP7 returns true when false is expected)

Cherry-pick from master.

9 years agosync config.w32 with sha3 implementation
Anatol Belski [Fri, 16 Oct 2015 10:18:35 +0000 (12:18 +0200)]
sync config.w32 with sha3 implementation

9 years agoAdd missing NEWS entry, copyright notice, and vim settings
Sara Golemon [Fri, 16 Oct 2015 07:17:59 +0000 (00:17 -0700)]
Add missing NEWS entry, copyright notice, and vim settings

Should have gone with d244b54c67cc2725283b78d4bb128501ae7910d3

9 years agoImplement SHA3 hashing algorithm
Sara Golemon [Fri, 16 Oct 2015 02:13:04 +0000 (19:13 -0700)]
Implement SHA3 hashing algorithm

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Thu, 15 Oct 2015 20:14:55 +0000 (22:14 +0200)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70430
Nikita Popov [Mon, 12 Oct 2015 20:05:19 +0000 (22:05 +0200)]
Fixed bug #70430

9 years agoReindent zend_yytnamerr
Nikita Popov [Thu, 15 Oct 2015 19:23:29 +0000 (21:23 +0200)]
Reindent zend_yytnamerr

Separating this whitespace change from the next diff.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 15 Oct 2015 10:47:13 +0000 (18:47 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70715 (Segmentation fault inside soap client)
Xinchen Hui [Thu, 15 Oct 2015 10:46:57 +0000 (18:46 +0800)]
Fixed bug #70715 (Segmentation fault inside soap client)

9 years agoMerge branch 'PHP-7.0'
Sara Golemon [Thu, 15 Oct 2015 05:45:21 +0000 (22:45 -0700)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Scan through a range of ports in case 31338 is busy

9 years agoScan through a range of ports in case 31338 is busy
Sara Golemon [Thu, 15 Oct 2015 05:42:38 +0000 (22:42 -0700)]
Scan through a range of ports in case 31338 is busy

ext/standard/tests/network/ud4loop.phpt hardcodes port 31338.
If that fails to bind, try a few more (up to 31499) before giving up.

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Thu, 15 Oct 2015 02:19:55 +0000 (10:19 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70709 (SOAP Client generates Segfault)
Xinchen Hui [Thu, 15 Oct 2015 02:19:43 +0000 (10:19 +0800)]
Fixed bug #70709 (SOAP Client generates Segfault)

9 years agoMerge branch 'PHP-7.0'
Ferenc Kovacs [Wed, 14 Oct 2015 22:55:52 +0000 (00:55 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  prepare for 5.6.15RC1

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Wed, 14 Oct 2015 22:54:59 +0000 (00:54 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  prepare for 5.6.15RC1

9 years agoprepare for 5.6.15RC1
Ferenc Kovacs [Wed, 14 Oct 2015 22:22:12 +0000 (00:22 +0200)]
prepare for 5.6.15RC1

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Wed, 14 Oct 2015 10:10:07 +0000 (12:10 +0200)]
Merge branch 'PHP-7.0'

9 years agoDo not create a fake Closure for real Closures
Bob Weinand [Wed, 14 Oct 2015 10:07:04 +0000 (12:07 +0200)]
Do not create a fake Closure for real Closures
That is solved by just returning the Closure as is, which is safe due to Closures being immutable objects

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 14 Oct 2015 02:31:57 +0000 (10:31 +0800)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'patch-1' of https://github.com/glensc/php-src into PHP-7.0
Xinchen Hui [Wed, 14 Oct 2015 02:31:07 +0000 (10:31 +0800)]
Merge branch 'patch-1' of https://github.com/glensc/php-src into PHP-7.0

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 14 Oct 2015 02:27:59 +0000 (10:27 +0800)]
Merge branch 'PHP-7.0'

9 years agoMerge branch 'move-reflection-tests' of https://github.com/Sobak/php-src
Xinchen Hui [Wed, 14 Oct 2015 02:27:37 +0000 (10:27 +0800)]
Merge branch 'move-reflection-tests' of https://github.com/Sobak/php-src

9 years agoMove the tests to proper place
Xinchen Hui [Wed, 14 Oct 2015 02:26:02 +0000 (10:26 +0800)]
Move the tests to proper place

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Wed, 14 Oct 2015 02:20:13 +0000 (10:20 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed Conditional jump or move depends on uninitialised value
Xinchen Hui [Wed, 14 Oct 2015 02:19:57 +0000 (10:19 +0800)]
Fixed Conditional jump or move depends on uninitialised value

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Tue, 13 Oct 2015 13:51:42 +0000 (15:51 +0200)]
Merge branch 'PHP-7.0'

9 years agoPrevent memcmp() result truncation
Bob Weinand [Tue, 13 Oct 2015 13:51:23 +0000 (15:51 +0200)]
Prevent memcmp() result truncation
This fixes reported issues with sapi/phpdbg/tests/watch_001.phpt

9 years agophpdbg test info_001.phpt was dependent on auto_globals_jit
Bob Weinand [Tue, 13 Oct 2015 12:40:29 +0000 (14:40 +0200)]
phpdbg test info_001.phpt was dependent on auto_globals_jit

9 years agoMerge branch 'PHP-7.0'
Dmitry Stogov [Tue, 13 Oct 2015 12:21:26 +0000 (15:21 +0300)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  Fixed incorrect "peak" memory consumption calculation.

9 years agoFixed incorrect "peak" memory consumption calculation.
Dmitry Stogov [Tue, 13 Oct 2015 12:20:17 +0000 (15:20 +0300)]
Fixed incorrect "peak" memory consumption calculation.

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 13 Oct 2015 09:49:13 +0000 (11:49 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  update UPGRADING

9 years agoupdate UPGRADING
Anatol Belski [Tue, 13 Oct 2015 09:45:34 +0000 (11:45 +0200)]
update UPGRADING

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Tue, 13 Oct 2015 09:41:18 +0000 (17:41 +0800)]
Merge branch 'PHP-7.0'

9 years agoFixed bug #70689 (Exception handler does not work as expected)
Xinchen Hui [Tue, 13 Oct 2015 09:40:58 +0000 (17:40 +0800)]
Fixed bug #70689 (Exception handler does not work as expected)

9 years agoMerge branch 'PHP-7.0'
Bob Weinand [Tue, 13 Oct 2015 09:30:14 +0000 (11:30 +0200)]
Merge branch 'PHP-7.0'

9 years agoFix on/off values in phpdbg lexer
Bob Weinand [Tue, 13 Oct 2015 09:29:51 +0000 (11:29 +0200)]
Fix on/off values in phpdbg lexer

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Tue, 13 Oct 2015 08:35:33 +0000 (10:35 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  prepare NEWS for next
  update libs_versions.txt

9 years agoprepare NEWS for next
Anatol Belski [Tue, 13 Oct 2015 08:34:30 +0000 (10:34 +0200)]
prepare NEWS for next

9 years agoupdate libs_versions.txt
Anatol Belski [Mon, 12 Oct 2015 18:42:19 +0000 (20:42 +0200)]
update libs_versions.txt

9 years agoinitialize *str
Ferenc Kovacs [Mon, 12 Oct 2015 19:36:21 +0000 (21:36 +0200)]
initialize *str

9 years agocalling getenv() without arguments should return the environment variables as an...
Ferenc Kovacs [Mon, 12 Oct 2015 19:24:19 +0000 (21:24 +0200)]
calling getenv() without arguments should return the environment variables as an array

9 years agoMerge branch 'PHP-7.0'
Nikita Popov [Mon, 12 Oct 2015 18:37:55 +0000 (20:37 +0200)]
Merge branch 'PHP-7.0'

9 years agoAdd more tests for closure binding
Nikita Popov [Fri, 9 Oct 2015 21:38:25 +0000 (23:38 +0200)]
Add more tests for closure binding

9 years agoForbid "fake" closure rebinding
Dmitry Stogov [Fri, 9 Oct 2015 16:41:15 +0000 (18:41 +0200)]
Forbid "fake" closure rebinding

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 12 Oct 2015 18:26:34 +0000 (20:26 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  increase API versions

9 years agoincrease API versions
Anatol Belski [Mon, 12 Oct 2015 18:17:22 +0000 (20:17 +0200)]
increase API versions

9 years ago- Fixed missing line-break
Felipe Pena [Mon, 12 Oct 2015 12:54:03 +0000 (09:54 -0300)]
- Fixed missing line-break

9 years agoMerge branch 'master' of git.php.net:php-src
Felipe Pena [Mon, 12 Oct 2015 12:07:49 +0000 (09:07 -0300)]
Merge branch 'master' of git.php.net:php-src

9 years ago- Revert change, no check is needed there
Felipe Pena [Mon, 12 Oct 2015 12:07:28 +0000 (09:07 -0300)]
- Revert change, no check is needed there

9 years agoMerge branch 'PHP-7.0'
Anatol Belski [Mon, 12 Oct 2015 09:29:07 +0000 (11:29 +0200)]
Merge branch 'PHP-7.0'

* PHP-7.0:
  fork test for ICU 56.1
  fork test for ICU-56.1
  fix test for ICU-56.1

9 years agofork test for ICU 56.1
Anatol Belski [Mon, 12 Oct 2015 09:20:51 +0000 (11:20 +0200)]
fork test for ICU 56.1

9 years agofork test for ICU-56.1
Anatol Belski [Mon, 12 Oct 2015 09:16:27 +0000 (11:16 +0200)]
fork test for ICU-56.1

9 years agofix test for ICU-56.1
Anatol Belski [Mon, 12 Oct 2015 09:10:04 +0000 (11:10 +0200)]
fix test for ICU-56.1

9 years agoMerge branch 'PHP-5.6'
Matteo Beccati [Mon, 12 Oct 2015 07:47:09 +0000 (09:47 +0200)]
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Matteo Beccati [Mon, 12 Oct 2015 07:47:02 +0000 (09:47 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fix test

9 years agofix test
Anatol Belski [Wed, 30 Sep 2015 10:18:32 +0000 (12:18 +0200)]
fix test

9 years agoDrop support for EOL'd PHP versions from run-tests
Sobak [Sun, 11 Oct 2015 06:33:14 +0000 (08:33 +0200)]
Drop support for EOL'd PHP versions from run-tests

9 years agoMerge branch 'PHP-7.0'
Xinchen Hui [Mon, 12 Oct 2015 02:44:45 +0000 (10:44 +0800)]
Merge branch 'PHP-7.0'

9 years agoDouble declaration
Xinchen Hui [Mon, 12 Oct 2015 02:42:04 +0000 (10:42 +0800)]
Double declaration

9 years ago- Fixed bug #70678 (PHP7 returns true when false is expected)
Felipe Pena [Sun, 11 Oct 2015 15:08:34 +0000 (12:08 -0300)]
- Fixed bug #70678 (PHP7 returns true when false is expected)

9 years ago- Fixed regression when calling func_get_args() from global scope
Felipe Pena [Sun, 11 Oct 2015 13:30:44 +0000 (10:30 -0300)]
- Fixed regression when calling func_get_args() from global scope

9 years agoMove ext/reflection tests into the proper directory
Sobak [Sun, 11 Oct 2015 06:41:21 +0000 (08:41 +0200)]
Move ext/reflection tests into the proper directory