diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 15:28:28 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2018-12-10 15:28:28 +0200 |
commit | 7443b68a9899bd8120f69593a9e361524f10b9f3 (patch) | |
tree | af5b4c600a8c677a0145c4c898a2c695696a8587 | |
parent | e85dac41c9bacb8bcd56f56f55c282434ecd8c80 (diff) | |
download | vmod-geoip-7443b68a9899bd8120f69593a9e361524f10b9f3.tar.gz vmod-geoip-7443b68a9899bd8120f69593a9e361524f10b9f3.tar.bz2 |
Version 1.0; Support Varnish 6.0.2release-1.0
-rw-r--r-- | NEWS | 9 | ||||
-rw-r--r-- | README | 3 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | src/vmod_geoip.c | 20 |
5 files changed, 26 insertions, 14 deletions
@@ -1,16 +1,19 @@ | |||
1 | Vmod-geoip NEWS -- history of user-visible changes. 2017-05-09 | 1 | Vmod-geoip NEWS -- history of user-visible changes. 2018-12-10 |
2 | Copyright (C) 2017 Sergey Poznyakoff | ||
3 | See the end of file for copying conditions. | 2 | See the end of file for copying conditions. |
4 | 3 | ||
5 | Please send Vmod-geoip bug reports to <gray@gnu.org> | 4 | Please send Vmod-geoip bug reports to <gray@gnu.org> |
6 | 5 | ||
6 | Version 1.0, 2018-12-10 | ||
7 | |||
8 | * Support for Varnish 6.0.2 | ||
9 | |||
7 | Version 0.90 (Git) | 10 | Version 0.90 (Git) |
8 | 11 | ||
9 | Initial release | 12 | Initial release |
10 | 13 | ||
11 | Copyright information: | 14 | Copyright information: |
12 | 15 | ||
13 | Copyright (C) 2017 Sergey Poznyakoff | 16 | Copyright (C) 2017-2018 Sergey Poznyakoff |
14 | 17 | ||
15 | Permission is granted to anyone to make or distribute verbatim copies | 18 | Permission is granted to anyone to make or distribute verbatim copies |
16 | of this document as received, in any medium, provided that the | 19 | of this document as received, in any medium, provided that the |
@@ -1,5 +1,4 @@ | |||
1 | Vmod-geoip README | 1 | Vmod-geoip README |
2 | Copyright (C) 2017 Sergey Poznyakoff | ||
3 | See the end of file for copying conditions. | 2 | See the end of file for copying conditions. |
4 | 3 | ||
5 | * Overview | 4 | * Overview |
@@ -58,7 +57,7 @@ Send bug reports and suggestions to <gray@gnu.org> | |||
58 | 57 | ||
59 | * Copyright information: | 58 | * Copyright information: |
60 | 59 | ||
61 | Copyright (C) 2017 Sergey Poznyakoff | 60 | Copyright (C) 2017-2018 Sergey Poznyakoff |
62 | 61 | ||
63 | Permission is granted to anyone to make or distribute verbatim copies | 62 | Permission is granted to anyone to make or distribute verbatim copies |
64 | of this document as received, in any medium, provided that the | 63 | of this document as received, in any medium, provided that the |
diff --git a/acvmod b/acvmod | |||
Subproject ba32780019480b89cd9d796b93a76cae6afe99a | Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181 | ||
diff --git a/configure.ac b/configure.ac index 6ed462f..ede46f9 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,5 +1,5 @@ | |||
1 | # This file is part of vmod-geoip -*- autoconf -*- | 1 | # This file is part of vmod-geoip -*- autoconf -*- |
2 | # Copyright (C) 2017 Sergey Poznyakoff | 2 | # Copyright (C) 2017-2018 Sergey Poznyakoff |
3 | # | 3 | # |
4 | # Vmod-geoip is free software; you can redistribute it and/or modify | 4 | # Vmod-geoip is free software; you can redistribute it and/or modify |
5 | # it under the terms of the GNU General Public License as published by | 5 | # it under the terms of the GNU General Public License as published by |
@@ -14,7 +14,7 @@ | |||
14 | # You should have received a copy of the GNU General Public License | 14 | # You should have received a copy of the GNU General Public License |
15 | # along with vmod-geoip. If not, see <http://www.gnu.org/licenses/>. | 15 | # along with vmod-geoip. If not, see <http://www.gnu.org/licenses/>. |
16 | AC_PREREQ(2.69) | 16 | AC_PREREQ(2.69) |
17 | AC_INIT([vmod-geoip], 0.91, [gray@gnu.org]) | 17 | AC_INIT([vmod-geoip], 1.0, [gray@gnu.org]) |
18 | AC_CONFIG_AUX_DIR([build-aux]) | 18 | AC_CONFIG_AUX_DIR([build-aux]) |
19 | AC_CONFIG_MACRO_DIR([m4]) | 19 | AC_CONFIG_MACRO_DIR([m4]) |
20 | AC_CONFIG_SRCDIR(src/vmod_geoip.vcc) | 20 | AC_CONFIG_SRCDIR(src/vmod_geoip.vcc) |
@@ -42,7 +42,9 @@ AC_PROG_MAKE_SET | |||
42 | AC_HEADER_STDC | 42 | AC_HEADER_STDC |
43 | AC_CHECK_HEADERS([sys/stdlib.h]) | 43 | AC_CHECK_HEADERS([sys/stdlib.h]) |
44 | 44 | ||
45 | AM_VARNISHAPI | 45 | AM_VARNISHAPI([5.1], [6.0.2]) |
46 | AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR], | ||
47 | [Varnish API major version number]) | ||
46 | 48 | ||
47 | PKG_CHECK_MODULES([MMDB], [libmaxminddb]) | 49 | PKG_CHECK_MODULES([MMDB], [libmaxminddb]) |
48 | 50 | ||
diff --git a/src/vmod_geoip.c b/src/vmod_geoip.c index b7e30ba..5c1a2d4 100644 --- a/src/vmod_geoip.c +++ b/src/vmod_geoip.c | |||
@@ -8,12 +8,20 @@ | |||
8 | #include <errno.h> | 8 | #include <errno.h> |
9 | #include <string.h> | 9 | #include <string.h> |
10 | #include <inttypes.h> | 10 | #include <inttypes.h> |
11 | #include "vcl.h" | 11 | |
12 | #include "vrt.h" | 12 | #if VARNISHAPI_MAJOR > 5 |
13 | #include "vtcp.h" | 13 | # include <cache/cache.h> |
14 | #include "vsa.h" | 14 | # include <vcl.h> |
15 | #include "vcc_if.h" | 15 | # include <vcc_if.h> |
16 | #include "cache/cache.h" | 16 | #else |
17 | # include <vcl.h> | ||
18 | # include <vrt.h> | ||
19 | # include <vcc_if.h> | ||
20 | # include <cache/cache.h> | ||
21 | #endif | ||
22 | #include <vtcp.h> | ||
23 | #include <vsa.h> | ||
24 | |||
17 | #include <maxminddb.h> | 25 | #include <maxminddb.h> |
18 | #include <assert.h> | 26 | #include <assert.h> |
19 | 27 | ||