KalleZ

ext/com_dotnet/com_persist.c:	le_istream = zend_register_list_destructors_ex(istream_dtor,
ext/com_dotnet/com_wrapper.c:	le_dispatch = zend_register_list_destructors_ex(dispatch_dtor,
ext/curl/interface.c:	le_curl = zend_register_list_destructors_ex(_php_curl_close, NULL, "curl", module_number);
ext/curl/interface.c:	le_curl_multi_handle = zend_register_list_destructors_ex(_php_curl_multi_close, NULL, "curl_multi", module_number);
ext/curl/interface.c:	le_curl_share_handle = zend_register_list_destructors_ex(_php_curl_share_close, NULL, "curl_share", module_number);
ext/dba/dba.c:	le_db = zend_register_list_destructors_ex(dba_close_rsrc, NULL, "dba", module_number);
ext/dba/dba.c:	le_pdb = zend_register_list_destructors_ex(dba_close_pe_rsrc, dba_close_rsrc, "dba persistent", module_number);
ext/enchant/enchant.c:	le_enchant_broker = zend_register_list_destructors_ex(php_enchant_broker_free, NULL, "enchant_broker", module_number);
ext/enchant/enchant.c:	le_enchant_dict = zend_register_list_destructors_ex(php_e

KalleZ

ext/interbase/interbase.c:              if (le->type != le_index_ptr) {
ext/interbase/interbase.c:      new_index_ptr.type = le_index_ptr;
ext/oci8/oci8.c:                        if (le->type == le_index_ptr) {
ext/oci8/oci8.c:                new_le.type = le_index_ptr;
ext/odbc/php_odbc.c:                    if (index_ptr->type != le_index_ptr) {
ext/odbc/php_odbc.c:            new_index_ptr.type = le_index_ptr;
ext/pgsql/pgsql.c:                      if (index_ptr->type != le_index_ptr) {
ext/pgsql/pgsql.c:              new_index_ptr.type = le_index_ptr;
main/main.c:    le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index pointer", 0);
Zend/zend_list.c:ZEND_API int le_index_ptr;

KalleZ

 sapi/cli/php_cli.c | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index dc92045..2ea0c50 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -1226,6 +1226,37 @@ int main(int argc, char *argv[])
 		_CrtSetDbgFlag(tmp_flag);
 	}

KalleZ

PHP_FUNCTION(hello_square)
{
	zval *b;
	
	ZEND_PARSE_PARAMETERS_START(1, 1)
		Z_PARAM_ZVAL_DEREF(b)
	ZEND_PARSE_PARAMETERS_END();
	
	zval_dtor(b);
	ZVAL_LONG(b, b * b);

KalleZ

 win32/build/confutils.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 0c88d13..207190c 100644
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -405,12 +405,12 @@ function conf_process_args()
 			}
 		}

KalleZ

 supported-versions.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/supported-versions.php b/supported-versions.php
index aa95113..0a852be 100644
--- a/supported-versions.php
+++ b/supported-versions.php
@@ -4,6 +4,23 @@ $_SERVER['BASE_PAGE'] = 'supported-versions.php';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/branches.inc';

KalleZ

<?php
	const API_KEY = 'XXX';


	function get_wow_item($id)
	{
		$json = json_decode(file_get_contents('https://eu.api.battle.net/wow/item/' . $id . '?locale=en_GB&apikey=' . API_KEY));

		if($json->itemBind)
		{

KalleZ

diff --git a/ext/sqlite3/config.w32 b/ext/sqlite3/config.w32
index 29a2832..b5ca2fb 100644
--- a/ext/sqlite3/config.w32
+++ b/ext/sqlite3/config.w32
@@ -10,5 +10,7 @@ if (PHP_SQLITE3 != "no") {
 	ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c", "sqlite3");
 
 	AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
+	AC_DEFINE("HAVE_SQLITE3_ERRSTR", 1, "Have sqlite3_errstr");
+	AC_DEFINE("HAVE_SQLITE3_CLOSE_V2", 1, "Have sqlite3_close_v2");

KalleZ

diff --git a/ext/pdo_dblib/dblib_driver.c b/ext/pdo_dblib/dblib_driver.c
index efc8dc1..c75c698 100644
--- a/ext/pdo_dblib/dblib_driver.c
+++ b/ext/pdo_dblib/dblib_driver.c
@@ -375,6 +375,8 @@ static int pdo_dblib_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
 		,{ "dbname",	NULL,	0 }
 		,{ "secure",	NULL,	0 } /* DBSETLSECURE */
 		,{ "version",	NULL,	0 } /* DBSETLVERSION */
+		,{ "user",      NULL,   0 }
+		,{ "password",  NULL,   0 }

KalleZ

diff --git a/main/output.c b/main/output.c
index 3eb6ddc..6fd1d78 100644
--- a/main/output.c
+++ b/main/output.c
@@ -1514,17 +1514,21 @@ PHP_FUNCTION(ob_get_status)
 }
 /* }}} */
 
-/* {{{ proto void ob_implicit_flush([int flag])
+/* {{{ proto void ob_implicit_flush([bool flag])