]> granicus.if.org Git - php/log
php
9 years agoFix frequent reallocations with many small strings
Dmitry Stogov [Tue, 27 Oct 2015 15:53:17 +0000 (16:53 +0100)]
Fix frequent reallocations with many small strings

9 years agocorrect snprintf usage
Anatol Belski [Fri, 23 Oct 2015 10:07:16 +0000 (12:07 +0200)]
correct snprintf usage

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Andrey Hristov [Tue, 27 Oct 2015 12:32:45 +0000 (13:32 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoAnother Fix for Bug #68344 MySQLi does not provide way to disable peer certificate...
Andrey Hristov [Tue, 27 Oct 2015 11:59:09 +0000 (12:59 +0100)]
Another Fix for Bug #68344  MySQLi does not provide way to disable peer certificate validation
Added the possibility to explicitly state that the peer certificate should not be checked.
Back to the default - checking the certificate.
Exported MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT
Usage : mysqli_real_connect( , , , , , MYSQLI_CLIENT_SSL | MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT)

If mysqli_ssl_set() is not called, but only MYSQLI_CLIENT_SSL is passed, without the (don't) very flag,
then no verification takes place.

9 years agoRemove arc4random
Leigh [Mon, 26 Oct 2015 20:40:28 +0000 (20:40 +0000)]
Remove arc4random

There has been a lot of discussion around whether arc4random should be included. Given how many different impementations of it are in the wild, we can't guarantee a secure implementation on all platforms.

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Mon, 26 Oct 2015 14:57:26 +0000 (15:57 +0100)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  update NEWS
  Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
  unbreak coverage data: fix #line directives in phpdbg parser
  exclude datelib from coverage report as asked by Derick

9 years agoupdate NEWS
Anatol Belski [Mon, 26 Oct 2015 14:56:34 +0000 (15:56 +0100)]
update NEWS

9 years agoFixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64
Anatol Belski [Mon, 26 Oct 2015 14:54:29 +0000 (15:54 +0100)]
Fixed bug #70718 stream_select() when OpenSSL extension is loaded on PHP Win64

9 years agoFixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build...
Dmitry Stogov [Mon, 26 Oct 2015 13:01:20 +0000 (16:01 +0300)]
Fixed inconsistent exception handling (uopz/tests/006.phpt was failed when PHP build with --disable-gcc-global-regs).

9 years agoFixed bug #70785 (Infinite loop due to exception during identical comparison)
Xinchen Hui [Mon, 26 Oct 2015 03:15:17 +0000 (11:15 +0800)]
Fixed bug #70785 (Infinite loop due to exception during identical comparison)

9 years agoCheck EVP_SealFinal return code
Jakub Zelenka [Sun, 25 Oct 2015 17:53:39 +0000 (17:53 +0000)]
Check EVP_SealFinal return code

This can be done since we no longer support OpenSSL 0.9.6

9 years agoFix refcount reaching 2^32 - 1 for resources
Bob Weinand [Sun, 25 Oct 2015 17:47:50 +0000 (18:47 +0100)]
Fix refcount reaching 2^32 - 1 for resources
Happens e.g. in proc_close() when nothing is referencing the file handles, e.g. they have refcount 0 when passed to zend_list_close() and then zend_list_delete() which decrements it to (uint32_t) -1

9 years agounbreak coverage data: fix #line directives in phpdbg parser
Nuno Lopes [Sat, 24 Oct 2015 22:12:24 +0000 (18:12 -0400)]
unbreak coverage data: fix #line directives in phpdbg parser

9 years agounbreak coverage data: fix #line directives in phpdbg parser
Nuno Lopes [Sat, 24 Oct 2015 21:45:53 +0000 (17:45 -0400)]
unbreak coverage data: fix #line directives in phpdbg parser

9 years agoexclude datelib from coverage report as asked by Derick
Nuno Lopes [Sat, 24 Oct 2015 21:38:20 +0000 (17:38 -0400)]
exclude datelib from coverage report as asked by Derick

9 years agoexclude datelib from coverage report as asked by Derick
Nuno Lopes [Sat, 24 Oct 2015 21:37:00 +0000 (17:37 -0400)]
exclude datelib from coverage report as asked by Derick

9 years agoFix bug #70782
Nikita Popov [Sat, 24 Oct 2015 21:18:28 +0000 (23:18 +0200)]
Fix bug #70782

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Fri, 23 Oct 2015 11:59:27 +0000 (13:59 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix globals initialization in sapi/cgi

9 years agoFix globals initialization in sapi/cgi
Anatol Belski [Fri, 23 Oct 2015 11:56:40 +0000 (13:56 +0200)]
Fix globals initialization in sapi/cgi

Basically backport 8430ec17

9 years agorather use the supplied inttypes.h with vc14
Anatol Belski [Fri, 23 Oct 2015 07:47:00 +0000 (09:47 +0200)]
rather use the supplied inttypes.h with vc14

9 years agofix test redirection when run not from source root
Anatol Belski [Tue, 20 Oct 2015 09:44:12 +0000 (11:44 +0200)]
fix test redirection when run not from source root

9 years agoIndents
Xinchen Hui [Fri, 23 Oct 2015 03:18:30 +0000 (11:18 +0800)]
Indents

9 years agoFix boolean conversion warnings
c9s [Thu, 22 Oct 2015 12:59:42 +0000 (20:59 +0800)]
Fix boolean conversion warnings

Summary:

The compiler complains and raised some warnings about boolean
conversion:

    warning: address of 'ce->constants_table' will always evaluate to
    'true' [-Wpointer-bool-conversion]

Since the address of 'HashTable' will always evaluate to true. the
condition should be removed. The scope is kept for local variables.

Platform:

    OS X 10.11

Compiler:

    Apple LLVM version 7.0.0 (clang-700.0.72)
    Target: x86_64-apple-darwin15.0.0
    Thread model: posix

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Andrey Hristov [Thu, 22 Oct 2015 09:50:12 +0000 (11:50 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoImprove fix for Bug #68344 MySQLi does not provide way to disable peer certificate...
Andrey Hristov [Thu, 22 Oct 2015 09:48:53 +0000 (11:48 +0200)]
Improve fix for Bug #68344 MySQLi does not provide way to disable peer certificate validation

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Andrey Hristov [Wed, 21 Oct 2015 13:52:38 +0000 (15:52 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

9 years agoFix for Bug #68344 MySQLi does not provide way to disable peer certificate validation
Andrey Hristov [Wed, 21 Oct 2015 13:10:24 +0000 (15:10 +0200)]
Fix for Bug #68344  MySQLi does not provide way to disable peer certificate validation

9 years agoUpdate the certificates needed for the mysqli tests
Andrey Hristov [Wed, 21 Oct 2015 08:42:15 +0000 (10:42 +0200)]
Update the certificates needed for the mysqli tests

9 years agoExempt paging from -qrr mode
Bob Weinand [Tue, 20 Oct 2015 19:56:00 +0000 (21:56 +0200)]
Exempt paging from -qrr mode

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Anatol Belski [Tue, 20 Oct 2015 18:07:14 +0000 (20:07 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  backport 262160e and 2d55e8c into 5.6

9 years agobackport 262160e and 2d55e8c into 5.6
Anatol Belski [Tue, 20 Oct 2015 18:05:44 +0000 (20:05 +0200)]
backport 262160e and 2d55e8c into 5.6

9 years agoRevert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler"
Xinchen Hui [Tue, 20 Oct 2015 15:12:04 +0000 (08:12 -0700)]
Revert "Ensure proper exception handling and EX(opline) state in USER_OPCODE handler"

read: http://news.php.net/php.internals/88887

This reverts commit 808f62bb4d9812e9b7b35c87f3e90e5fc2bc244b.

9 years agoRegenerate zend_ini_scanner.c
Xinchen Hui [Tue, 20 Oct 2015 08:58:30 +0000 (16:58 +0800)]
Regenerate zend_ini_scanner.c

9 years agoUpdate NEWS
Xinchen Hui [Tue, 20 Oct 2015 05:26:40 +0000 (13:26 +0800)]
Update NEWS

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Xinchen Hui [Tue, 20 Oct 2015 05:26:02 +0000 (13:26 +0800)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
Zend/zend_ini_scanner.c

9 years agoFixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)
Xinchen Hui [Tue, 20 Oct 2015 05:20:56 +0000 (13:20 +0800)]
Fixed bug #70748 (Segfault in ini_lex () at Zend/zend_ini_scanner.l)

9 years agoremove imap tests for now until I finish the sudoless dovecot config
Ferenc Kovacs [Mon, 19 Oct 2015 21:56:23 +0000 (23:56 +0200)]
remove imap tests for now until I finish the sudoless dovecot config

9 years agoremove imap tests for now until I finish the sudoless dovecot config
Ferenc Kovacs [Mon, 19 Oct 2015 21:43:26 +0000 (23:43 +0200)]
remove imap tests for now until I finish the sudoless dovecot config

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Mon, 19 Oct 2015 21:02:52 +0000 (23:02 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo

9 years agoMerge branch 'PHP-5.5' into PHP-5.6
Ferenc Kovacs [Mon, 19 Oct 2015 20:47:23 +0000 (22:47 +0200)]
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo

9 years agoMerge branch 'pr-1483' into PHP-5.5
Ferenc Kovacs [Mon, 19 Oct 2015 20:44:19 +0000 (22:44 +0200)]
Merge branch 'pr-1483' into PHP-5.5

* pr-1483:
  fixup, both catched by nikic
  use another character device in this test as /dev/console seems that it is different for lxc containers
  the de_DE(iso-8859-1) locale is not available on ubuntu by default, but there is no reason to require that over the utf-8 one
  let's try running our testsuite without sudo

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Mon, 19 Oct 2015 00:20:00 +0000 (17:20 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Fix bug #64172
  Bug #70561: Fix DirectoryIterator to throw OutOfBoundsException

Conflicts:
ext/pdo/pdo_dbh.c

9 years agoMerge branch 'pull-request/1535' into PHP-5.6
Stanislav Malyshev [Mon, 19 Oct 2015 00:17:55 +0000 (17:17 -0700)]
Merge branch 'pull-request/1535' into PHP-5.6

* pull-request/1535:
  Bug #70561: Fix DirectoryIterator to throw OutOfBoundsException

9 years agoFix bug #64172
Daniel Persson [Sat, 26 Sep 2015 19:28:23 +0000 (21:28 +0200)]
Fix bug #64172

Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.

9 years agoFix bug #64172
Daniel Persson [Sat, 26 Sep 2015 19:48:18 +0000 (21:48 +0200)]
Fix bug #64172

Check if the SQLSTATE error code is equal to PDO_ERR_NONE before we ask the driver.
And if no error is reported skip the extra call to the driver.

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Sun, 18 Oct 2015 22:45:40 +0000 (15:45 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Skip some tests for platforms different than x86

9 years agoSkip some tests for platforms different than x86
Fábio Perez [Fri, 16 Oct 2015 16:01:25 +0000 (13:01 -0300)]
Skip some tests for platforms different than x86

These tests are verifying undefined behaviour such as shifting by more than 63
bits and by negative numbers.

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Stanislav Malyshev [Sun, 18 Oct 2015 22:44:59 +0000 (15:44 -0700)]
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Skip serialize test if ext/session is not loaded

Conflicts:
ext/standard/tests/serialize/bug70219_1.phpt

9 years agoSkip serialize test if ext/session is not loaded
Stanislav Malyshev [Sun, 18 Oct 2015 22:43:03 +0000 (15:43 -0700)]
Skip serialize test if ext/session is not loaded

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 ago- Implemented output paging
Felipe Pena [Sun, 18 Oct 2015 14:08:04 +0000 (12:08 -0200)]
- Implemented output paging

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-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 agoFix missed assertion tests
Aaron Piotrowski [Sun, 18 Oct 2015 07:23:43 +0000 (02:23 -0500)]
Fix missed assertion tests

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 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 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 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 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 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 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 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 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-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 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 '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 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 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 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 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 agoupdate UPGRADING
Anatol Belski [Tue, 13 Oct 2015 09:45:34 +0000 (11:45 +0200)]
update UPGRADING

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 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 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 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 agoincrease API versions
Anatol Belski [Mon, 12 Oct 2015 18:17:22 +0000 (20:17 +0200)]
increase API versions

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' 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 agoDouble declaration
Xinchen Hui [Mon, 12 Oct 2015 02:42:04 +0000 (10:42 +0800)]
Double declaration

9 years agofix stack overflow
Anatol Belski [Tue, 22 Sep 2015 19:12:05 +0000 (21:12 +0200)]
fix stack overflow

9 years agoGenerally run all tests in sapi folder by default
Bob Weinand [Sat, 10 Oct 2015 15:24:14 +0000 (17:24 +0200)]
Generally run all tests in sapi folder by default

Turned out that sapi/phpdbg actually wasn't explicitly included as sapi folders were individually selected

9 years agoMerge branch 'PHP-5.6' into PHP-7.0
Nikita Popov [Sat, 10 Oct 2015 13:00:41 +0000 (15:00 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
Zend/zend_closures.c

9 years agoFixed bug #70685
Nikita Popov [Sat, 10 Oct 2015 12:54:14 +0000 (14:54 +0200)]
Fixed bug #70685

Doing a less intrusive variant of the PHP 7.0 fix for 5.6.