Support for varnish 6.0.2release-1.7

6 files changed, 18 insertions, 31 deletions

diff --git a/NEWS b/NEWS
index f2290c2..b78a16d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,13 @@
-Vmod-basicauth NEWS -- history of user-visible changes. 2017-10-26
-Copyright (C) 2013-2017 Sergey Poznyakoff
+Vmod-basicauth NEWS -- history of user-visible changes. 2018-12-10
 See the end of file for copying conditions.
 
 Please send Vmod-basicauth bug reports to <gray@gnu.org>
 
+Version 1.7, 2018-12-10
+
+* Support for Varnish 6.0.2
+
+
 Version 1.6, 2017-10-26
 
 * Fixed coredump on receiving a valid username with a wrong password
@@ -53,7 +57,7 @@ Initial release.
 
 Copyright information:
 
-Copyright (C) 2013-2017 Sergey Poznyakoff
+Copyright (C) 2013-2018 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/README b/README
index bb82cc8..c1eb761 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
 Vmod-basicauth README
-Copyright (C) 2013-2017 Sergey Poznyakoff
 See the end of file for copying conditions.
 
 * Overview
@@ -8,7 +7,7 @@ This module implements basic HTTP authentication against the password file
 created with the htpasswd(1) utility.  The following password hashes are
 supported: Apache MD5, crypt(3), SHA1, and plaintext.
 
-The module has been tested with Varnish versions 4.1, and 5.1.
+The module has been tested with Varnish versions 4.1 to 6.0.2
 
 * Example
 
@@ -65,7 +64,7 @@ Send bug reports and suggestions to <gray@gnu.org>
 
 * Copyright information:
 
-Copyright (C) 2013-2017 Sergey Poznyakoff
+Copyright (C) 2013-2018 Sergey Poznyakoff
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/acvmod b/acvmod
-Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81
+Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/configure.ac b/configure.ac
index aeee5e1..a85214e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with vmod-basicauth.  If not, see <http://www.gnu.org/licenses/>.
 AC_PREREQ(2.69)
-AC_INIT([vmod-basicauth], 1.6, [gray@gnu.org])
+AC_INIT([vmod-basicauth], 1.7, [gray@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/vmod_basicauth.vcc)
@@ -42,7 +42,7 @@ AC_PROG_MAKE_SET
 AC_HEADER_STDC
 AC_CHECK_HEADERS([sys/stdlib.h crypt.h])
 
-AM_VARNISHAPI([4.1],[5.1])
+AM_VARNISHAPI([4.1],[6.0.2])
 
 saved_LIBS=$LIBS
 LIBS=-lcrypt
diff --git a/src/vmod-basicauth.3 b/src/vmod-basicauth.3
index 24da83e..d0ec1cd 100644
--- a/src/vmod-basicauth.3
+++ b/src/vmod-basicauth.3
@@ -1,5 +1,5 @@
 .\" This file is part of Vmod-basicauth -*- nroff -*-
-.\" Copyright (C) 2013-2015 Sergey Poznyakoff
+.\" Copyright (C) 2013-2018 Sergey Poznyakoff
 .\"
 .\" Vmod-basicauth is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
 .\"
 .\" You should have received a copy of the GNU General Public License
 .\" along with vmod-basicauth.  If not, see <http://www.gnu.org/licenses/>.
-.TH VMOD-BASICAUTH 1 "January 30, 2015" "VMOD-BASICAUTH" "User Reference"
+.TH VMOD-BASICAUTH 1 "December 10, 2018" "VMOD-BASICAUTH" "User Reference"
 .SH NAME
 vmod-basicauth \- Basic HTTP authentication
 .SH SYNOPSIS
@@ -40,24 +40,7 @@ supplies the name of the password file to use.  The \fIauthstr\fR argument
 is the authentication string (normally, the value of the
 \fBAuthorization\fR HTTP header.
 .PP
-.SS Example: VCL 3.0
-.PP
-.EX
-sub vcl_recv {
-    if (!basicauth.match("/var/www/.htpasswd",
-                         req.http.Authorization)) {
-        error 401 "Restricted";
-    }
-}
-
-sub vcl_error {
-    if (obj.status == 401) {
-        set obj.http.WWW-Authenticate =
-            {"Basic realm="Restricted area""};
-    }
-}    
-.EE
-.SS Example: VCL 4.0
+.SS Example: 
 .PP
 .EX
 sub vcl_recv {
@@ -79,7 +62,7 @@ sub vcl_synth {
 .\" for man-based doc pages.
 .if "\V[MANCGI]"WEBDOC" \{\
 .       ds package vmod-basicauth
-.       ds version 1.6
+.       ds version 1.7
 .       so download.inc
 \}
 .SH "SEE ALSO"
@@ -90,7 +73,7 @@ Sergey Poznyakoff
 .SH "BUG REPORTS"
 Report bugs to <gray@gnu.org>.
 .SH COPYRIGHT
-Copyright \(co 2013-2015 Sergey Poznyakoff
+Copyright \(co 2013-2018 Sergey Poznyakoff
 .br
 .na
 License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
diff --git a/src/vmod_basicauth.c b/src/vmod_basicauth.c
index d106afd..9fd3e23 100644
--- a/src/vmod_basicauth.c
+++ b/src/vmod_basicauth.c
@@ -27,8 +27,9 @@
 # include <crypt.h>
 #endif
 
-#include "vcl.h"
+#include "vdef.h"
 #include "vrt.h"
+#include "vcl.h"
 #include "vcc_if.h"
 #include "pthread.h"