From 74988eed9972c498a0fc57f3bd035bab189a03ab Mon Sep 17 00:00:00 2001 From: Joe Watkins Date: Tue, 31 Jul 2018 16:38:35 +0200 Subject: [PATCH 1/2] bump version --- NEWS | 5 ++++- configure.in | 2 +- main/php_version.h | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 0ab5c59e4d4..1a7e6eee36b 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,9 @@ PHP NEWS ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| -?? ??? ????, PHP 7.1.21 +?? ??? ????, PHP 7.1.22 + + +16 Aug 2018, PHP 7.1.21 - Calendar: . Fixed bug #52974 (jewish.c: compile error under Windows with GBK charset). diff --git a/configure.in b/configure.in index b920d5b7683..8999db449f7 100644 --- a/configure.in +++ b/configure.in @@ -119,7 +119,7 @@ int zend_sprintf(char *buffer, const char *format, ...); PHP_MAJOR_VERSION=7 PHP_MINOR_VERSION=1 -PHP_RELEASE_VERSION=20 +PHP_RELEASE_VERSION=22 PHP_EXTRA_VERSION="-dev" PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` diff --git a/main/php_version.h b/main/php_version.h index dcb9a710b76..01ca986206f 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,7 +2,7 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 7 #define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 20 +#define PHP_RELEASE_VERSION 22 #define PHP_EXTRA_VERSION "-dev" -#define PHP_VERSION "7.1.20-dev" -#define PHP_VERSION_ID 70120 +#define PHP_VERSION "7.1.22-dev" +#define PHP_VERSION_ID 70122 From 19592519c2803a42762e8fee18505083dc3474fc Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 2 Aug 2018 18:59:34 +0200 Subject: [PATCH 2/2] Fix callbacks The signatures wasn't synced in 7.0 --- ext/com_dotnet/com_iterator.c | 9 ++++----- ext/com_dotnet/com_saproxy.c | 4 +--- ext/com_dotnet/com_typeinfo.c | 4 ++-- ext/com_dotnet/php_com_dotnet_internal.h | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/ext/com_dotnet/com_iterator.c b/ext/com_dotnet/com_iterator.c index b399ca88287..03db8fd45de 100644 --- a/ext/com_dotnet/com_iterator.c +++ b/ext/com_dotnet/com_iterator.c @@ -82,7 +82,7 @@ static void com_iter_get_key(zend_object_iterator *iter, zval *key) } } -static int com_iter_move_forwards(zend_object_iterator *iter) +static void com_iter_move_forwards(zend_object_iterator *iter) { struct php_com_iterator *I = (struct php_com_iterator*)Z_PTR(iter->data); unsigned long n_fetched; @@ -103,18 +103,18 @@ static int com_iter_move_forwards(zend_object_iterator *iter) } else { /* indicate that there are no more items */ I->key = (ulong)-1; - return FAILURE; + return; } } else { /* safe array */ if (I->key >= (ULONG) I->sa_max) { I->key = (ulong)-1; - return FAILURE; + return; } I->key++; if (php_com_safearray_get_elem(&I->safe_array, &I->v, (LONG)I->key) == 0) { I->key = (ulong)-1; - return FAILURE; + return; } } @@ -122,7 +122,6 @@ static int com_iter_move_forwards(zend_object_iterator *iter) php_com_zval_from_variant(&ptr, &I->v, I->code_page); /* php_com_wrap_variant(ptr, &I->v, I->code_page); */ ZVAL_COPY_VALUE(&I->zdata, &ptr); - return SUCCESS; } diff --git a/ext/com_dotnet/com_saproxy.c b/ext/com_dotnet/com_saproxy.c index 09dce26061d..4fff1341786 100644 --- a/ext/com_dotnet/com_saproxy.c +++ b/ext/com_dotnet/com_saproxy.c @@ -514,15 +514,13 @@ static void saproxy_iter_get_key(zend_object_iterator *iter, zval *key) } } -static int saproxy_iter_move_forwards(zend_object_iterator *iter) +static void saproxy_iter_move_forwards(zend_object_iterator *iter) { php_com_saproxy_iter *I = (php_com_saproxy_iter*)Z_PTR(iter->data); if (++I->key >= I->imax) { I->key = -1; - return FAILURE; } - return SUCCESS; } static zend_object_iterator_funcs saproxy_iter_funcs = { diff --git a/ext/com_dotnet/com_typeinfo.c b/ext/com_dotnet/com_typeinfo.c index a0e90df9869..7302871bcff 100644 --- a/ext/com_dotnet/com_typeinfo.c +++ b/ext/com_dotnet/com_typeinfo.c @@ -223,9 +223,9 @@ PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepa } /* Type-library stuff */ -void php_com_typelibrary_dtor(void *pDest) +void php_com_typelibrary_dtor(zval *pDest) { - ITypeLib **Lib = (ITypeLib**)pDest; + ITypeLib **Lib = (ITypeLib**)Z_PTR_P(pDest); ITypeLib_Release(*Lib); } diff --git a/ext/com_dotnet/php_com_dotnet_internal.h b/ext/com_dotnet/php_com_dotnet_internal.h index 4745de9f263..506a14b5425 100644 --- a/ext/com_dotnet/php_com_dotnet_internal.h +++ b/ext/com_dotnet/php_com_dotnet_internal.h @@ -174,7 +174,7 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string, PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage); PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, int codepage); -void php_com_typelibrary_dtor(void *pDest); +void php_com_typelibrary_dtor(zval *pDest); ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink); int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage);