summaryrefslogtreecommitdiffstats
path: root/73320ff0c35fe102944eae1fb4ed36bfb7d63b18.patch
blob: 8bb6a66d75e2cde68aa10db590771e86a86ea510 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
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
 };