]> granicus.if.org Git - php/log
php
8 years agoAdd VT100 support for Windows
Michele Locati [Mon, 29 Aug 2016 09:57:53 +0000 (11:57 +0200)]
Add VT100 support for Windows

Fix function names prefix

Use Unicode version of GetFinalPathNameByHandle

Use EG(windows_version_info) instead of RtlGetVersion

Use the specified handle_id instead of STD_OUTPUT_HANDLE

Switch from stream name to stream resource

Allow running tests capturing only stdout and/or stderr

Add tests for stream_vt100_support function

Export Win32 console functions

Fix x64 build

Use zend_long instead of long long, use GetConsole instead of GetFinalPathNameByHandleW to check if a handle is a valid console stream

Always use zend_long on any platform

Use _get_osfhandle to determine the standard handle

Accept stream names

Raise warnings in case of invalid stream parameter

Return true if disabling VT100 support on a not-console/redirected stream or on old Windows versions

Remove php_win32_console_os_supports_vt100

Differentiate stdin vs stdout/stderr

Simplify setting flag

Allow avoid piping STDIN

Let stream_vt100_support accept only resources

Fix run-tests

Revert console flags in case of failure

Simplify logic of stream_vt100_support when setting the flag

Return true if succeeded, false otherwise

Drop support for STDIN

More comprehensive tests for stream_vt100_support

Remove old tests

Fix name of included file and use absolute paths

Enable ENABLE_VIRTUAL_TERMINAL_PROCESSING on Windows by default

Remove tests for stream_vt100_support

Split stream_vt100_support into stream_isatty+sapi_windows_vt100_support

Add tests for stream_isatty

Add tests for sapi_windows_vt100_support

Return null from stream_isatty is neither Windows nor Posix

Fallback to S_ISCHR if neither Windows nor Posix

Avoid defining argc since it's only used once

Better comment about php_win32_console_fileno_is_console

Use events instead of cNumberOfEvents

Do not restore previous console mode

We need to restore previous console mode on failing SetConsole calls only for STDIN

Don't configure STDOUT/STDERR on Windows with PHP_CLI_WIN32_NO_CONSOLE

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Fri, 28 Oct 2016 13:22:02 +0000 (21:22 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS
  Fixed bug #73392 (A use-after-free in zend allocator management)

8 years agoUpdate NEWS
Xinchen Hui [Fri, 28 Oct 2016 13:21:48 +0000 (21:21 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Fri, 28 Oct 2016 13:21:35 +0000 (21:21 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73392 (A use-after-free in zend allocator management)

8 years agoFixed bug #73392 (A use-after-free in zend allocator management)
Xinchen Hui [Fri, 28 Oct 2016 13:21:24 +0000 (21:21 +0800)]
Fixed bug #73392 (A use-after-free in zend allocator management)

8 years agoMerge branch 'PHP-7.1'
Ferenc Kovacs [Thu, 27 Oct 2016 21:44:24 +0000 (23:44 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Ferenc Kovacs [Thu, 27 Oct 2016 21:40:41 +0000 (23:40 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Ferenc Kovacs [Thu, 27 Oct 2016 21:37:51 +0000 (23:37 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years ago5.6.29 will be next
Ferenc Kovacs [Thu, 27 Oct 2016 21:10:59 +0000 (23:10 +0200)]
5.6.29 will be next

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 27 Oct 2016 20:36:28 +0000 (22:36 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  use rather the nmake var as it's evaluated on every run

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 27 Oct 2016 20:36:00 +0000 (22:36 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  use rather the nmake var as it's evaluated on every run

8 years agouse rather the nmake var as it's evaluated on every run
Anatol Belski [Thu, 27 Oct 2016 20:34:34 +0000 (22:34 +0200)]
use rather the nmake var as it's evaluated on every run

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 27 Oct 2016 18:44:30 +0000 (20:44 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  prepend known bin folders to the path for nmake test runs

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 27 Oct 2016 18:43:25 +0000 (20:43 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  prepend known bin folders to the path for nmake test runs

8 years agoprepend known bin folders to the path for nmake test runs
Anatol Belski [Thu, 27 Oct 2016 18:41:41 +0000 (20:41 +0200)]
prepend known bin folders to the path for nmake test runs

8 years agoFix #73396: bigint columns are returned as strings
Adam Baratz [Thu, 27 Oct 2016 17:52:59 +0000 (13:52 -0400)]
Fix #73396: bigint columns are returned as strings

8 years agoRemove unneeded macro check. This "hack" is replicated in php_pdo_dblib_int.h.
Adam Baratz [Thu, 27 Oct 2016 16:15:45 +0000 (12:15 -0400)]
Remove unneeded macro check. This "hack" is replicated in php_pdo_dblib_int.h.

8 years agoremove unread var
Adam Baratz [Thu, 27 Oct 2016 16:15:01 +0000 (12:15 -0400)]
remove unread var

8 years agoadd myself to pdo_dblib CREDITS
Adam Baratz [Thu, 27 Oct 2016 16:14:06 +0000 (12:14 -0400)]
add myself to pdo_dblib CREDITS

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 27 Oct 2016 00:46:18 +0000 (02:46 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  yet another uninitialized pointer

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 27 Oct 2016 00:45:48 +0000 (02:45 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  yet another uninitialized pointer

8 years agoyet another uninitialized pointer
Anatol Belski [Thu, 27 Oct 2016 00:40:30 +0000 (02:40 +0200)]
yet another uninitialized pointer

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Thu, 27 Oct 2016 00:20:35 +0000 (02:20 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  fix uninitialized pointer

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Thu, 27 Oct 2016 00:20:12 +0000 (02:20 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix uninitialized pointer

8 years agofix uninitialized pointer
Anatol Belski [Thu, 27 Oct 2016 00:15:14 +0000 (02:15 +0200)]
fix uninitialized pointer

8 years agonote to UPGRADING
Anatol Belski [Wed, 26 Oct 2016 19:10:17 +0000 (21:10 +0200)]
note to UPGRADING

8 years agoadd some float limits constants
Anatol Belski [Wed, 26 Oct 2016 16:10:44 +0000 (18:10 +0200)]
add some float limits constants

8 years agoremove dead code
Anatol Belski [Mon, 24 Oct 2016 18:07:15 +0000 (20:07 +0200)]
remove dead code

8 years agoreset also the cwd_length, when cwd is free'd
Anatol Belski [Mon, 24 Oct 2016 12:36:17 +0000 (14:36 +0200)]
reset also the cwd_length, when cwd is free'd

8 years agoMerge branch 'DedupNANINF'
Andrea Faulds [Wed, 26 Oct 2016 15:46:36 +0000 (16:46 +0100)]
Merge branch 'DedupNANINF'

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Wed, 26 Oct 2016 12:23:33 +0000 (15:23 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Dmitry Stogov [Wed, 26 Oct 2016 12:22:51 +0000 (15:22 +0300)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO)

8 years agoFixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO)
Dmitry Stogov [Wed, 26 Oct 2016 12:17:09 +0000 (15:17 +0300)]
Fixded bug #72736 (Slow performance when fetching large dataset with mysqli / PDO)

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Wed, 26 Oct 2016 11:08:17 +0000 (13:08 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  make config.w32 compatible with ICU 58

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Wed, 26 Oct 2016 11:07:44 +0000 (13:07 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  make config.w32 compatible with ICU 58

8 years agomake config.w32 compatible with ICU 58
Anatol Belski [Wed, 26 Oct 2016 11:05:03 +0000 (13:05 +0200)]
make config.w32 compatible with ICU 58

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Tue, 25 Oct 2016 19:13:46 +0000 (22:13 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed incorrec type usage
  Revert "Update UPGRADING to reflect bug fix" This change was made in 7.0. Sorry for the noise.
  Update UPGRADING to reflect bug fix
  news for next rc

8 years agoFixed incorrec type usage
Dmitry Stogov [Tue, 25 Oct 2016 19:12:34 +0000 (22:12 +0300)]
Fixed incorrec type usage

8 years agoRevert "Update UPGRADING to reflect bug fix"
Yasuo Ohgaki [Tue, 25 Oct 2016 19:01:55 +0000 (04:01 +0900)]
Revert "Update UPGRADING to reflect bug fix"
This change was made in 7.0. Sorry for the noise.

This reverts commit e9c8e50b66366c250becb663bb76db24ed1b5890.

8 years agoUpdate UPGRADING to reflect bug fix
Yasuo Ohgaki [Tue, 25 Oct 2016 18:26:44 +0000 (03:26 +0900)]
Update UPGRADING to reflect bug fix

8 years agonews for next rc
Joe Watkins [Tue, 25 Oct 2016 15:22:23 +0000 (16:22 +0100)]
news for next rc

8 years agoMerge branch 'PHP-7.1'
Dmitry Stogov [Tue, 25 Oct 2016 14:21:12 +0000 (17:21 +0300)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Export zend_analyze_calls() to allow building call trees.

8 years agoExport zend_analyze_calls() to allow building call trees.
Dmitry Stogov [Tue, 25 Oct 2016 14:20:27 +0000 (17:20 +0300)]
Export zend_analyze_calls() to allow building call trees.

8 years agoMerge branch 'PHP-7.1'
Christoph M. Becker [Tue, 25 Oct 2016 12:41:00 +0000 (14:41 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Christoph M. Becker [Tue, 25 Oct 2016 12:34:43 +0000 (14:34 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoMerge branch 'PHP-5.6' into PHP-7.0
Christoph M. Becker [Tue, 25 Oct 2016 12:30:59 +0000 (14:30 +0200)]
Merge branch 'PHP-5.6' into PHP-7.0

8 years agoFix #72494: imagecropauto out-of-bounds access
Christoph M. Becker [Tue, 25 Oct 2016 12:19:36 +0000 (14:19 +0200)]
Fix #72494: imagecropauto out-of-bounds access

This issue has actually already been fixed with commit 46f2c690. We're
adding a regression test and a NEWS entry, and also port the fix in
gdImageCropThreshold() from libgd:
  * <https://github.com/libgd/libgd/commit/b347e034>
  * <https://github.com/libgd/libgd/commit/46f2c690>

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Tue, 25 Oct 2016 08:32:15 +0000 (10:32 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  move dev to 7.0.14

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Anatol Belski [Tue, 25 Oct 2016 08:31:49 +0000 (10:31 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  move dev to 7.0.14

8 years agomove dev to 7.0.14
Anatol Belski [Tue, 25 Oct 2016 08:29:51 +0000 (10:29 +0200)]
move dev to 7.0.14

8 years agoUpdated to version 2016.8 (2016h)
Derick Rethans [Mon, 24 Oct 2016 09:37:20 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)

8 years agoEmpty merge
Derick Rethans [Mon, 24 Oct 2016 09:37:19 +0000 (10:37 +0100)]
Empty merge

8 years agoUpdated to version 2016.8 (2016h)
Derick Rethans [Mon, 24 Oct 2016 09:37:17 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)

8 years agoEmpty merge
Derick Rethans [Mon, 24 Oct 2016 09:37:16 +0000 (10:37 +0100)]
Empty merge

8 years agoUpdated to version 2016.8 (2016h)
Derick Rethans [Mon, 24 Oct 2016 09:37:13 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)

8 years agoEmpty merge
Derick Rethans [Mon, 24 Oct 2016 09:37:12 +0000 (10:37 +0100)]
Empty merge

8 years agoUpdated to version 2016.8 (2016h)
Derick Rethans [Mon, 24 Oct 2016 09:37:07 +0000 (10:37 +0100)]
Updated to version 2016.8 (2016h)

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sun, 23 Oct 2016 20:27:25 +0000 (22:27 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Sun, 23 Oct 2016 20:27:11 +0000 (22:27 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix test output
Nikita Popov [Sun, 23 Oct 2016 20:26:25 +0000 (22:26 +0200)]
Fix test output

Changed due to eca84946a4e7269d59ea2d79b5f42117de89ae74.

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Sun, 23 Oct 2016 20:13:59 +0000 (22:13 +0200)]
Merge branch 'PHP-7.1'

8 years agoFix call graph construction
Nikita Popov [Sun, 23 Oct 2016 20:12:55 +0000 (22:12 +0200)]
Fix call graph construction

Travis build for 7.1+ has been failing for the past week...

8 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 23 Oct 2016 18:56:29 +0000 (19:56 +0100)]
Merge branch 'PHP-7.1'

8 years agoTry to fix LibreSSL build
Jakub Zelenka [Sun, 23 Oct 2016 18:55:22 +0000 (19:55 +0100)]
Try to fix LibreSSL build

8 years agoMerge branch 'PHP-7.1'
Jakub Zelenka [Sun, 23 Oct 2016 18:40:48 +0000 (19:40 +0100)]
Merge branch 'PHP-7.1'

8 years agoDrop useless checks for DH and RSA
Jakub Zelenka [Sun, 23 Oct 2016 18:37:07 +0000 (19:37 +0100)]
Drop useless checks for DH and RSA

If DH or RSA was disabled, the build would fail already as
it's used already elsewhere without checking the OPENSSL_NO_DH
or OPENSSL_NO_RSA defines.

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Sat, 22 Oct 2016 06:51:23 +0000 (14:51 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Update NEWS

8 years agoUpdate NEWS
Xinchen Hui [Sat, 22 Oct 2016 06:51:11 +0000 (14:51 +0800)]
Update NEWS

8 years agoMerge branch 'PHP-7.1'
Xinchen Hui [Sat, 22 Oct 2016 06:50:53 +0000 (14:50 +0800)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73350 (Exception::__toString() cause circular references)

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Xinchen Hui [Sat, 22 Oct 2016 06:50:42 +0000 (14:50 +0800)]
Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #73350 (Exception::__toString() cause circular references)

8 years agoFixed bug #73350 (Exception::__toString() cause circular references)
Xinchen Hui [Sat, 22 Oct 2016 06:50:21 +0000 (14:50 +0800)]
Fixed bug #73350 (Exception::__toString() cause circular references)

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 21 Oct 2016 19:34:09 +0000 (21:34 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Better fix for bug #73360
  Revert "Fixed bug #73360 Unable to work in root with unicode chars"

8 years agoBetter fix for bug #73360
Anatol Belski [Fri, 21 Oct 2016 19:29:35 +0000 (21:29 +0200)]
Better fix for bug #73360

This also fixes the TS issue. And, it also reveals that there's an
issue in the VCWD_* API to be possibly addressed.

8 years agoRevert "Fixed bug #73360 Unable to work in root with unicode chars"
Anatol Belski [Fri, 21 Oct 2016 18:15:16 +0000 (20:15 +0200)]
Revert "Fixed bug #73360 Unable to work in root with unicode chars"

This reverts commit 64fee0aecb2c804a088b896da6f736dbc19d8424.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 21 Oct 2016 14:57:30 +0000 (16:57 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  update NEWS

8 years agoTurn IS_TYPE_COLLECTABLE zval flag into GC_COLLECTABLE zend_refcounted flag.
Dmitry Stogov [Fri, 21 Oct 2016 14:47:30 +0000 (17:47 +0300)]
Turn IS_TYPE_COLLECTABLE zval flag into GC_COLLECTABLE zend_refcounted flag.
This simplifies checks and allows reset this flag for "acyclic" arrays and objects.

8 years agoupdate NEWS
Anatol Belski [Fri, 21 Oct 2016 14:43:55 +0000 (16:43 +0200)]
update NEWS

The bug is currently not good testable, because the doc_root will be
blocked from the invoked test server process. This will prevent the
cleanup, which would be confusing.

8 years agoMerge branch 'PHP-7.1'
Anatol Belski [Fri, 21 Oct 2016 14:00:49 +0000 (16:00 +0200)]
Merge branch 'PHP-7.1'

* PHP-7.1:
  Fixed bug #73360 Unable to work in root with unicode chars

8 years agoFixed bug #73360 Unable to work in root with unicode chars
Anatol Belski [Fri, 21 Oct 2016 13:22:59 +0000 (15:22 +0200)]
Fixed bug #73360 Unable to work in root with unicode chars

8 years agoAdd tests for PDO::getAvailableDrivers
Amo Chohan [Fri, 21 Oct 2016 03:21:42 +0000 (20:21 -0700)]
Add tests for PDO::getAvailableDrivers

8 years agoRemove DBDO-specific field
Adam Baratz [Thu, 20 Oct 2016 21:34:29 +0000 (17:34 -0400)]
Remove DBDO-specific field

DBDO is a PECL package which hasn't been updated since 2010 and has been marked
as unmaintained. Additionally, I can't find a reference to this field in the
latest source.

8 years agoSave some more calls to strlen() on the CURLFile helper methods
Kalle Sommer Nielsen [Thu, 20 Oct 2016 14:03:46 +0000 (16:03 +0200)]
Save some more calls to strlen() on the CURLFile helper methods

8 years agoRevert "Fix test, this is kinda ugly, but at least for me on Windows there seems...
Kalle Sommer Nielsen [Thu, 20 Oct 2016 14:02:37 +0000 (16:02 +0200)]
Revert "Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings"

This reverts commit aeeaedeeb7bdf7df3f0885a62e8d317762e88bf8.

This seems to make Travis unhappy (shocker), so revert for now until we find a better fix

8 years agoMerge branch 'master' of git.php.net:php-src
Kalle Sommer Nielsen [Thu, 20 Oct 2016 12:28:52 +0000 (14:28 +0200)]
Merge branch 'master' of git.php.net:php-src

8 years agoSave a call to strlen(), since we can figure out the length of this constant value...
Kalle Sommer Nielsen [Thu, 20 Oct 2016 12:28:24 +0000 (14:28 +0200)]
Save a call to strlen(), since we can figure out the length of this constant value with sizeof() at compile time

8 years agoFix test, this is kinda ugly, but at least for me on Windows there seems to be some...
Kalle Sommer Nielsen [Thu, 20 Oct 2016 12:24:01 +0000 (14:24 +0200)]
Fix test, this is kinda ugly, but at least for me on Windows there seems to be some messed up line endings

8 years agoMerge branch 'PHP-7.1'
Nikita Popov [Thu, 20 Oct 2016 11:26:51 +0000 (13:26 +0200)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Nikita Popov [Thu, 20 Oct 2016 11:26:34 +0000 (13:26 +0200)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoFix bug #71241: array_replace_recursive mutates ref params
Adam Saponara [Fri, 26 Aug 2016 21:33:22 +0000 (17:33 -0400)]
Fix bug #71241: array_replace_recursive mutates ref params

`array_replace_recursive` can sometimes mutate its params if
references are nested within. This differs from the PHP 5 behavior.

8 years agoMerge branch 'master' of git.php.net:php-src
Kalle Sommer Nielsen [Thu, 20 Oct 2016 11:10:51 +0000 (13:10 +0200)]
Merge branch 'master' of git.php.net:php-src

8 years agoDo not overwrite config.nice.bat if --with-config-profile is used on Windows
Kalle Sommer Nielsen [Thu, 20 Oct 2016 11:10:28 +0000 (13:10 +0200)]
Do not overwrite config.nice.bat if --with-config-profile is used on Windows

8 years agoUpdate UPGRADING wrt. imageresolution()
Christoph M. Becker [Thu, 20 Oct 2016 10:59:03 +0000 (12:59 +0200)]
Update UPGRADING wrt. imageresolution()

Cf. <http://git.php.net/?p=php-src.git;a=commit;h=209d4220>.

8 years agoFixed test to accept MYSQLI_OPT_READ_TIMEOUT
Matteo Beccati [Thu, 20 Oct 2016 10:51:18 +0000 (12:51 +0200)]
Fixed test to accept MYSQLI_OPT_READ_TIMEOUT

The new constant has been added in 7108db30

8 years agoremove redundant includes
Anatol Belski [Thu, 20 Oct 2016 09:41:52 +0000 (11:41 +0200)]
remove redundant includes

8 years agofix Windows compilation
Anatol Belski [Thu, 20 Oct 2016 09:38:59 +0000 (11:38 +0200)]
fix Windows compilation

php.h is included, it contains all the stuff needed and conflicts
otherwise.

8 years agoMerge branch 'PHP-7.1'
Leigh [Thu, 20 Oct 2016 09:18:38 +0000 (10:18 +0100)]
Merge branch 'PHP-7.1'

8 years agoMerge branch 'PHP-7.0' into PHP-7.1
Leigh [Thu, 20 Oct 2016 09:18:16 +0000 (10:18 +0100)]
Merge branch 'PHP-7.0' into PHP-7.1

8 years agoAdd php_random_int internal API
Leigh [Wed, 19 Oct 2016 17:00:54 +0000 (18:00 +0100)]
Add php_random_int internal API

This is the internal API compliment to `php_random_bytes`

8 years agoFix compiler warnings, always cast to zend_long from sqlite3_int64 when converting...
Kalle Sommer Nielsen [Thu, 20 Oct 2016 08:57:38 +0000 (10:57 +0200)]
Fix compiler warnings, always cast to zend_long from sqlite3_int64 when converting to a zval

8 years agoIgnore the return value of sqlite3->busyTimeout() if their "API Armor" is not enabled.
Kalle Sommer Nielsen [Thu, 20 Oct 2016 08:56:08 +0000 (10:56 +0200)]
Ignore the return value of sqlite3->busyTimeout() if their "API Armor" is not enabled.

The sqlite3_busy_timeout() function can only ever return SQLITE_OK if the armor is not compiled in, which means we can skip this error check