diff options
author | Remi Collet <remi@remirepo.net> | 2018-11-21 07:25:25 +0100 |
---|---|---|
committer | Remi Collet <remi@remirepo.net> | 2018-11-21 07:25:25 +0100 |
commit | 122edc9ae0bfe968947801e1ff5c931bbf52c5c8 (patch) | |
tree | 469d40df1f65298b125464d9e7f7e316d7b55ef6 /73320ff0c35fe102944eae1fb4ed36bfb7d63b18.patch | |
parent | 12219f55fe14585575c45ac0da2939e185bbec62 (diff) |
update to 1.4.0
open https://github.com/maxmind/MaxMind-DB-Reader-php/issues/79 to report test failure on 32-bit
Diffstat (limited to '73320ff0c35fe102944eae1fb4ed36bfb7d63b18.patch')
-rw-r--r-- | 73320ff0c35fe102944eae1fb4ed36bfb7d63b18.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/73320ff0c35fe102944eae1fb4ed36bfb7d63b18.patch b/73320ff0c35fe102944eae1fb4ed36bfb7d63b18.patch deleted file mode 100644 index 8bb6a66..0000000 --- a/73320ff0c35fe102944eae1fb4ed36bfb7d63b18.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 73320ff0c35fe102944eae1fb4ed36bfb7d63b18 Mon Sep 17 00:00:00 2001 -From: Remi Collet <remi@remirepo.net> -Date: Wed, 7 Nov 2018 14:18:00 +0100 -Subject: [PATCH] add MINFO method, and display both extension and library - versions - ---- - ext/maxminddb.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/ext/maxminddb.c b/ext/maxminddb.c -index c0177df..6fd758f 100644 ---- a/ext/maxminddb.c -+++ b/ext/maxminddb.c -@@ -20,6 +20,7 @@ - #include <php.h> - #include <zend.h> - #include "Zend/zend_exceptions.h" -+#include "ext/standard/info.h" - #include <maxminddb.h> - - #ifdef ZTS -@@ -546,6 +547,17 @@ PHP_MINIT_FUNCTION(maxminddb){ - return SUCCESS; - } - -+static PHP_MINFO_FUNCTION(maxminddb) -+{ -+ php_info_print_table_start(); -+ -+ php_info_print_table_row(2, "MaxMind DB Reader", "enabled"); -+ php_info_print_table_row(2, "maxminddb extension version", PHP_MAXMINDDB_VERSION); -+ php_info_print_table_row(2, "libmaxminddb library version", MMDB_lib_version()); -+ -+ php_info_print_table_end(); -+} -+ - zend_module_entry maxminddb_module_entry = { - STANDARD_MODULE_HEADER, - PHP_MAXMINDDB_EXTNAME, -@@ -554,7 +566,7 @@ zend_module_entry maxminddb_module_entry = { - NULL, - NULL, - NULL, -- NULL, -+ PHP_MINFO(maxminddb), - PHP_MAXMINDDB_VERSION, - STANDARD_MODULE_PROPERTIES - }; |