Skip to content

L
libvmod-blobcode
Commit 8dc108d9 authored by Geoff Simmons's avatar Geoff Simmons
Browse files
Options

Update for compatibility with Varnish 5.1.

parent 59a83c24
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 61 deletions
README.rst
View file @ 8dc108d9
...@@ -413,9 +413,9 @@ to a header, then the header will not be set. ...@@ -413,9 +413,9 @@ to a header, then the header will not be set.
REQUIREMENTS REQUIREMENTS
============ ============
This version of the VMOD requires at least Varnish version 5.0.0. (See This version of the VMOD requires Varnish since version 5.1. (See the
branch 4.1 in the project repository for versions that are compatible project repository for versions that are compatible with other
with Varnish since 4.1.2.) versions of Varnish.)
Perl 5 is required for the build. Perl 5 is required for the build.
...@@ -507,6 +507,8 @@ HISTORY ...@@ -507,6 +507,8 @@ HISTORY
* version 2.0: compatible with Varnish versions since 5.0.0 * version 2.0: compatible with Varnish versions since 5.0.0
* version 3.0: compatible with Varnish versions since 5.1
SEE ALSO SEE ALSO
======== ========
......
configure.ac
View file @ 8dc108d9
AC_PREREQ(2.59) AC_PREREQ(2.59)
AC_COPYRIGHT([Copyright (c) 2015-2016 UPLEX - Nils Goroll Systemoptimierung]) AC_COPYRIGHT([Copyright (c) 2015-2016 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([libvmod-blobcode], [2.0]) AC_INIT([libvmod-blobcode], [3.0])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst])) m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
AC_CONFIG_SRCDIR(src/vmod_blobcode.vcc) AC_CONFIG_SRCDIR(src/vmod_blobcode.vcc)
......
src/tests/base64.vtc
View file @ 8dc108d9
...@@ -277,12 +277,9 @@ client c1 { ...@@ -277,12 +277,9 @@ client c1 {
logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" { logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
expect 0 * Begin req expect 0 * Begin req
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"-_-_\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "-_-_"$}
#" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "\+/\+/"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"\+/\+/\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "TWFu"$}
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"TWFu\"$"
#"
expect * = End expect * = End
} -start } -start
......
src/tests/base64_n.vtc
View file @ 8dc108d9
...@@ -191,12 +191,9 @@ client c1 { ...@@ -191,12 +191,9 @@ client c1 {
logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" { logexpect l1 -v v1 -d 1 -g vxid -q "VCL_Error" {
expect 0 * Begin req expect 0 * Begin req
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"-_-_\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "-_-_"$}
#" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "\+/\+/"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"\+/\+/\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "TWFu"$}
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"TWFu\"$"
#"
expect * = End expect * = End
} -start } -start
......
src/tests/examples.vtc
View file @ 8dc108d9
...@@ -145,7 +145,7 @@ varnish v1 -arg "-p http_max_hdr=128" -vcl+backend { ...@@ -145,7 +145,7 @@ varnish v1 -arg "-p http_max_hdr=128" -vcl+backend {
} -start } -start
logexpect l1 -v v1 { logexpect l1 -v v1 {
expect * 1001 VCL_Log "^Using VMOD blobcode version \S+$" expect * 1001 VCL_Log {^Using VMOD blobcode version \S+$}
} -start } -start
client c1 { client c1 {
......
src/tests/xcode.vtc
View file @ 8dc108d9
...@@ -343,28 +343,17 @@ varnish v1 -vcl { ...@@ -343,28 +343,17 @@ varnish v1 -vcl {
logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" { logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
expect 0 * Begin req expect 0 * Begin req
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"0x123456\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "0x123456"$}
#" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "-_-_"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"-_-_\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "\+/\+/"$}
#" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "TWFu"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"\+/\+/\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "_-_-"$}
#" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "/\+/\+"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"TWFu\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "Zm9v"$}
#" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"_-_-\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%2"$}
#" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%q"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"/\+/\+\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "%2q"$}
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"Zm9v\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%2\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%q\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%2q\"$"
#"
expect * = End expect * = End
} -start } -start
......
src/tests/xcode_n.vtc
View file @ 8dc108d9
...@@ -354,24 +354,15 @@ varnish v1 -vcl { ...@@ -354,24 +354,15 @@ varnish v1 -vcl {
logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" { logexpect l1 -v v1 -d 0 -g vxid -q "VCL_Error" {
expect 0 * Begin req expect 0 * Begin req
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"0x123456\"$" expect * = VCL_Error {^vmod blobcode error: cannot decode, illegal encoding beginning with "0x123456"$}
#" expect * = VCL_Error {vmod blobcode error: cannot decode, illegal encoding beginning with "-_-_"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"-_-_\"$" expect * = VCL_Error {vmod blobcode error: cannot decode, illegal encoding beginning with "\+/\+/"$}
#" expect * = VCL_Error {vmod blobcode error: cannot decode, illegal encoding beginning with "TWFu"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"\+/\+/\"$" expect * = VCL_Error {vmod blobcode error: cannot decode, illegal encoding beginning with "_-_-"$}
#" expect * = VCL_Error {vmod blobcode error: cannot decode, illegal encoding beginning with "/\+/\+"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"TWFu\"$" expect * = VCL_Error {vmod blobcode error: cannot decode, illegal encoding beginning with "Zm9v"$}
#" expect * = VCL_Error {vmod blobcode error: cannot decode, illegal encoding beginning with "%20"$}
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"_-_-\"$" expect * = VCL_Error {vmod blobcode error: cannot decode, illegal encoding beginning with "%20"$}
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"/\+/\+\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"Zm9v\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%20\"$"
#"
expect * = VCL_Error "^vmod blobcode error: cannot decode, illegal encoding beginning with \"%20\"$"
#"
expect * = End expect * = End
} -start } -start
......
src/vmod_blobcode.c
View file @ 8dc108d9
...@@ -415,7 +415,8 @@ decode(VRT_CTX, VCL_INT n, VCL_ENUM decs, ...@@ -415,7 +415,8 @@ decode(VRT_CTX, VCL_INT n, VCL_ENUM decs,
enum encoding dec = parse_encoding(decs); enum encoding dec = parse_encoding(decs);
struct wb_s wb; struct wb_s wb;
struct vmod_priv *b; struct vmod_priv *b;
char *snap, *buf; char *buf;
uintptr_t snap;
ssize_t len; ssize_t len;
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC); CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
......
src/vmod_blobcode.vcc
View file @ 8dc108d9
...@@ -341,9 +341,9 @@ to a header, then the header will not be set. ...@@ -341,9 +341,9 @@ to a header, then the header will not be set.
REQUIREMENTS REQUIREMENTS
============ ============
This version of the VMOD requires at least Varnish version 5.0.0. (See This version of the VMOD requires Varnish since version 5.1. (See the
branch 4.1 in the project repository for versions that are compatible project repository for versions that are compatible with other
with Varnish since 4.1.2.) versions of Varnish.)
Perl 5 is required for the build. Perl 5 is required for the build.
...@@ -435,6 +435,8 @@ HISTORY ...@@ -435,6 +435,8 @@ HISTORY
* version 2.0: compatible with Varnish versions since 5.0.0 * version 2.0: compatible with Varnish versions since 5.0.0
* version 3.0: compatible with Varnish versions since 5.1
SEE ALSO SEE ALSO
======== ========
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment