From bb45a24f1fb33f645f390ad8ae8d04fb29a783e6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 26 Jun 2017 17:21:29 +0200 Subject: add patch for php 7.1 and 7.2 --- 0001-Use-IS_VOID-7.1-instead-of-IS_NULL.patch | 84 +++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 0001-Use-IS_VOID-7.1-instead-of-IS_NULL.patch (limited to '0001-Use-IS_VOID-7.1-instead-of-IS_NULL.patch') diff --git a/0001-Use-IS_VOID-7.1-instead-of-IS_NULL.patch b/0001-Use-IS_VOID-7.1-instead-of-IS_NULL.patch new file mode 100644 index 0000000..75c511a --- /dev/null +++ b/0001-Use-IS_VOID-7.1-instead-of-IS_NULL.patch @@ -0,0 +1,84 @@ +From d4542bf4278386020f081c6a5ba8c3acfbe2c432 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 15 Jun 2017 08:36:02 +0200 +Subject: [PATCH 1/3] Use IS_VOID (7.1+) instead of IS_NULL + +--- + serverresponse.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/serverresponse.c b/serverresponse.c +index 5e013a5..2e912f7 100644 +--- a/serverresponse.c ++++ b/serverresponse.c +@@ -34,14 +34,14 @@ ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(getVersion), 0, 0, IS_STRING, NULL, 0) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(setVersion), 0, 1, IS_NULL, NULL, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(setVersion), 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, version, IS_STRING, 0) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(getStatus), 0, 0, IS_LONG, NULL, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(getStatus), 0, 0, 0) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(setStatus), 0, 1, IS_NULL, NULL, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(setStatus), 0, 0, 1) + ZEND_ARG_TYPE_INFO(0, status, IS_LONG, 0) + ZEND_END_ARG_INFO() + +@@ -51,7 +51,7 @@ ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(getHeaders), 0, 0, IS_ARRAY, NULL, 0) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(addSetHeader), 0, 2, IS_NULL, NULL, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(addSetHeader), 0, 0, 2) + ZEND_ARG_TYPE_INFO(0, label, IS_STRING, 0) + ZEND_ARG_INFO(0, value) + ZEND_END_ARG_INFO() +@@ -59,7 +59,7 @@ ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(getCookies), 0, 0, IS_ARRAY, NULL, 0) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(setCookie), 0, 1, IS_NULL, NULL, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(setCookie), 0, 0, 1) + ZEND_ARG_INFO(0, name) + ZEND_ARG_TYPE_INFO(0, value, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, expires, IS_LONG, 0) +@@ -72,18 +72,18 @@ ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(AI(getContent), 0, 0, 0) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(setContent), 0, 1, IS_NULL, NULL, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(setContent), 0, 0, 1) + ZEND_ARG_INFO(0, content) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(setContentJson), 0, 1, IS_NULL, NULL, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(setContentJson), 0, 0, 1) + ZEND_ARG_INFO(0, content) + ZEND_ARG_TYPE_INFO(0, options, IS_LONG, 0) + ZEND_ARG_TYPE_INFO(0, depth, IS_LONG, 0) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(setContentDownload), 0, 1, IS_NULL, NULL, 0) +- ZEND_ARG_TYPE_INFO(0, fh, IS_RESOURCE, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(setContentDownload), 0, 0, 2) ++ ZEND_ARG_INFO(0, fh) + ZEND_ARG_TYPE_INFO(0, name, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, disposition, IS_STRING, 0) + ZEND_ARG_TYPE_INFO(0, params, IS_ARRAY, 0) +@@ -93,7 +93,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(date), 0, 1, IS_STRING, NULL, 0) + ZEND_ARG_INFO(0, date) + ZEND_END_ARG_INFO() + +-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(AI(send), 0, 0, IS_NULL, NULL, 0) ++ZEND_BEGIN_ARG_INFO_EX(AI(send), 0, 0, 0) + ZEND_END_ARG_INFO() + /* }}} Argument Info */ + +-- +2.9.4 + -- cgit