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 --------------------------------------------------------------- 1 file changed, 79 deletions(-) delete mode 100644 410.patch (limited to '410.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); - -- cgit