From 842e6fd991fa27f5706df592efbeb3fef70b0128 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 10 Dec 2018 11:16:05 +0100 Subject: v3.0.8 --- 410.patch | 79 -------------------------- 931dc56c7a53c388c21d679ae10dfe0b245aed32.patch | 47 --------------- PHPINFO | 2 +- REFLECTION | 4 +- php-pecl-yaf.spec | 18 ++---- 5 files changed, 8 insertions(+), 142 deletions(-) delete mode 100644 410.patch delete mode 100644 931dc56c7a53c388c21d679ae10dfe0b245aed32.patch diff --git a/410.patch b/410.patch deleted file mode 100644 index 3c09d1c..0000000 --- a/410.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 4eac86bfb340438bddfe397361f5322e85ea39f3 Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Wed, 18 Jul 2018 11:48:57 +0200 -Subject: [PATCH] Fix for 7.3.0alpha4, make PUBLIC else - zend_read_static_property fails - ---- - yaf_application.c | 2 +- - yaf_dispatcher.c | 2 +- - yaf_loader.c | 2 +- - yaf_registry.c | 2 +- - yaf_session.c | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/yaf_application.c b/yaf_application.c -index fe7ec77..451af52 100644 ---- a/yaf_application.c -+++ b/yaf_application.c -@@ -672,7 +672,7 @@ YAF_STARTUP_FUNCTION(application) { - zend_declare_property_null(yaf_application_ce, - ZEND_STRL(YAF_APPLICATION_PROPERTY_NAME_DISPATCHER), ZEND_ACC_PROTECTED); - zend_declare_property_null(yaf_application_ce, -- ZEND_STRL(YAF_APPLICATION_PROPERTY_NAME_APP), ZEND_ACC_STATIC | ZEND_ACC_PROTECTED); -+ ZEND_STRL(YAF_APPLICATION_PROPERTY_NAME_APP), ZEND_ACC_STATIC); - zend_declare_property_null(yaf_application_ce, - ZEND_STRL(YAF_APPLICATION_PROPERTY_NAME_MODULES), ZEND_ACC_PROTECTED); - -diff --git a/yaf_dispatcher.c b/yaf_dispatcher.c -index f20b40a..07cf73e 100644 ---- a/yaf_dispatcher.c -+++ b/yaf_dispatcher.c -@@ -1356,7 +1356,7 @@ YAF_STARTUP_FUNCTION(dispatcher) { - zend_declare_property_null(yaf_dispatcher_ce, ZEND_STRL(YAF_DISPATCHER_PROPERTY_NAME_REQUEST), ZEND_ACC_PROTECTED); - zend_declare_property_null(yaf_dispatcher_ce, ZEND_STRL(YAF_DISPATCHER_PROPERTY_NAME_PLUGINS), ZEND_ACC_PROTECTED); - -- zend_declare_property_null(yaf_dispatcher_ce, ZEND_STRL(YAF_DISPATCHER_PROPERTY_NAME_INSTANCE), ZEND_ACC_PROTECTED|ZEND_ACC_STATIC); -+ zend_declare_property_null(yaf_dispatcher_ce, ZEND_STRL(YAF_DISPATCHER_PROPERTY_NAME_INSTANCE), ZEND_ACC_STATIC); - - zend_declare_property_bool(yaf_dispatcher_ce, ZEND_STRL(YAF_DISPATCHER_PROPERTY_NAME_RENDER), 1, ZEND_ACC_PROTECTED); - zend_declare_property_bool(yaf_dispatcher_ce, ZEND_STRL(YAF_DISPATCHER_PROPERTY_NAME_RETURN), 0, ZEND_ACC_PROTECTED); -diff --git a/yaf_loader.c b/yaf_loader.c -index c533bc0..822da4b 100644 ---- a/yaf_loader.c -+++ b/yaf_loader.c -@@ -790,7 +790,7 @@ YAF_STARTUP_FUNCTION(loader) { - - zend_declare_property_null(yaf_loader_ce, ZEND_STRL(YAF_LOADER_PROPERTY_NAME_LIBRARY), ZEND_ACC_PROTECTED); - zend_declare_property_null(yaf_loader_ce, ZEND_STRL(YAF_LOADER_PROPERTY_NAME_GLOBAL_LIB), ZEND_ACC_PROTECTED); -- zend_declare_property_null(yaf_loader_ce, ZEND_STRL(YAF_LOADER_PROPERTY_NAME_INSTANCE), ZEND_ACC_PROTECTED|ZEND_ACC_STATIC); -+ zend_declare_property_null(yaf_loader_ce, ZEND_STRL(YAF_LOADER_PROPERTY_NAME_INSTANCE), ZEND_ACC_STATIC); - - return SUCCESS; - } -diff --git a/yaf_registry.c b/yaf_registry.c -index 891b47b..f08ae36 100644 ---- a/yaf_registry.c -+++ b/yaf_registry.c -@@ -205,7 +205,7 @@ YAF_STARTUP_FUNCTION(registry) { - yaf_registry_ce = zend_register_internal_class_ex(&ce, NULL); - yaf_registry_ce->ce_flags |= ZEND_ACC_FINAL; - -- zend_declare_property_null(yaf_registry_ce, ZEND_STRL(YAF_REGISTRY_PROPERTY_NAME_INSTANCE), ZEND_ACC_PROTECTED|ZEND_ACC_STATIC); -+ zend_declare_property_null(yaf_registry_ce, ZEND_STRL(YAF_REGISTRY_PROPERTY_NAME_INSTANCE), ZEND_ACC_STATIC); - zend_declare_property_null(yaf_registry_ce, ZEND_STRL(YAF_REGISTRY_PROPERTY_NAME_ENTRYS), ZEND_ACC_PROTECTED); - - return SUCCESS; -diff --git a/yaf_session.c b/yaf_session.c -index 65d6184..e08117f 100644 ---- a/yaf_session.c -+++ b/yaf_session.c -@@ -371,7 +371,7 @@ YAF_STARTUP_FUNCTION(session) { - zend_class_implements(yaf_session_ce, 2, zend_ce_iterator, zend_ce_arrayaccess); - #endif - -- zend_declare_property_null(yaf_session_ce, ZEND_STRL(YAF_SESSION_PROPERTY_NAME_INSTANCE), ZEND_ACC_PROTECTED|ZEND_ACC_STATIC); -+ zend_declare_property_null(yaf_session_ce, ZEND_STRL(YAF_SESSION_PROPERTY_NAME_INSTANCE), ZEND_ACC_STATIC); - zend_declare_property_null(yaf_session_ce, ZEND_STRL(YAF_SESSION_PROPERTY_NAME_SESSION), ZEND_ACC_PROTECTED); - zend_declare_property_bool(yaf_session_ce, ZEND_STRL(YAF_SESSION_PROPERTY_NAME_STATUS), 0, ZEND_ACC_PROTECTED); - diff --git a/931dc56c7a53c388c21d679ae10dfe0b245aed32.patch b/931dc56c7a53c388c21d679ae10dfe0b245aed32.patch deleted file mode 100644 index a0e125a..0000000 --- a/931dc56c7a53c388c21d679ae10dfe0b245aed32.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 931dc56c7a53c388c21d679ae10dfe0b245aed32 Mon Sep 17 00:00:00 2001 -From: Xinchen Hui -Date: Fri, 22 Jun 2018 18:21:44 +0800 -Subject: [PATCH] Fixed build with PHP-7.3 - ---- - requests/yaf_request_http.c | 5 +++++ - yaf_session.c | 7 ++++++- - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/requests/yaf_request_http.c b/requests/yaf_request_http.c -index 23b215e..8658611 100644 ---- a/requests/yaf_request_http.c -+++ b/requests/yaf_request_http.c -@@ -96,9 +96,14 @@ yaf_request_t *yaf_request_http_instance(yaf_request_t *this_ptr, zend_string *r - * only use url path */ - if (strncasecmp(Z_STRVAL_P(uri), "http", sizeof("http") - 1) == 0) { - php_url *url_info = php_url_parse(Z_STRVAL_P(uri)); -+#if PHP_VERSION_ID < 70300 - if (url_info && url_info->path) { - settled_uri = zend_string_init(url_info->path, strlen(url_info->path), 0); - } -+#else -+ settled_uri = url_info->path; -+ url_info->path = NULL; -+#endif - php_url_free(url_info); - } else { - char *pos = NULL; -diff --git a/yaf_session.c b/yaf_session.c -index ff48291..65d6184 100644 ---- a/yaf_session.c -+++ b/yaf_session.c -@@ -94,7 +94,12 @@ static yaf_session_t *yaf_session_instance(yaf_session_t *this_ptr) /* {{{ */ { - - zval_ptr_dtor(&member); - -- if (property_info->offset != ZEND_WRONG_PROPERTY_OFFSET) { -+#if PHP_VERSION_ID < 70300 -+ if (property_info->offset != ZEND_WRONG_PROPERTY_OFFSET) -+#else -+ if (IS_VALID_PROPERTY_OFFSET(property_info->offset)) -+#endif -+ { - zval *prop = OBJ_PROP(obj, property_info->offset); - ZVAL_COPY(prop, sess); - } diff --git a/PHPINFO b/PHPINFO index 9fb2a21..651a47f 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,7 +2,7 @@ yaf yaf support => enabled -Version => 3.0.7 +Version => 3.0.8 Supports => http://pecl.php.net/package/yaf Directive => Local Value => Master Value diff --git a/REFLECTION b/REFLECTION index d5ff8d8..13edef0 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #174 yaf version 3.0.7 ] { +Extension [ extension #176 yaf version 3.0.8 ] { - Dependencies { Dependency [ spl (Required) ] @@ -40,7 +40,7 @@ Extension [ extension #174 yaf version 3.0.7 ] { } - Constants [12] { - Constant [ string YAF_VERSION ] { 3.0.7 } + Constant [ string YAF_VERSION ] { 3.0.8 } Constant [ string YAF_ENVIRON ] { product } Constant [ integer YAF_ERR_STARTUP_FAILED ] { 512 } Constant [ integer YAF_ERR_ROUTE_FAILED ] { 513 } diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec index 58863c0..bee0334 100644 --- a/php-pecl-yaf.spec +++ b/php-pecl-yaf.spec @@ -26,21 +26,18 @@ Summary: Yet Another Framework Name: %{?sub_prefix}php-pecl-yaf -Version: 3.0.7 +Version: 3.0.8 %if 0%{?gh_date:1} Release: 0.12.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source: http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz %endif License: PHP URL: http://pecl.php.net/package/yaf Source1: %{pecl_name}.ini -Patch0: https://github.com/laruence/yaf/commit/931dc56c7a53c388c21d679ae10dfe0b245aed32.patch -Patch1: https://patch-diff.githubusercontent.com/raw/laruence/yaf/pull/410.patch - BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel >= 7 BuildRequires: %{?scl_prefix}php-pear @@ -61,12 +58,6 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{relea %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} -Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} -Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -Obsoletes: php55u-pecl-%{pecl_name} <= %{version} -Obsoletes: php55w-pecl-%{pecl_name} <= %{version} Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} Obsoletes: php70u-pecl-%{pecl_name} <= %{version} @@ -114,8 +105,6 @@ sed -e 's/role="test"/role="src"/' \ -i package.xml cd NTS -%patch0 -p1 -b .up -%patch1 -p1 -b .pr410 # Sanity check, really often broken extver=$(sed -n '/#define PHP_YAF_VERSION/{s/.*\t"//;s/".*$//;p}' php_yaf.h ) @@ -237,6 +226,9 @@ fi %changelog +* Mon Dec 10 2018 Remi Collet - 3.0.8-1 +- update to 3.0.8 + * Thu Aug 16 2018 Remi Collet - 3.0.7-4 - rebuild for 7.3.0beta2 new ABI -- cgit