Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
7c89c968
Commit
7c89c968
authored
Nov 25, 2019
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Monday morning flexelinting & whitespace OCD
parent
4e568f8f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
18 additions
and
16 deletions
+18
-16
cache_vcl.c
bin/varnishd/cache/cache_vcl.c
+1
-1
cache_vcl.h
bin/varnishd/cache/cache_vcl.h
+1
-1
flint.lnt
bin/varnishd/flint.lnt
+2
-0
r02872.vtc
bin/varnishtest/tests/r02872.vtc
+11
-12
sess_attr.h
include/tbl/sess_attr.h
+2
-2
vmod_vtc.c
lib/libvmod_vtc/vmod_vtc.c
+1
-0
No files found.
bin/varnishd/cache/cache_vcl.c
View file @
7c89c968
...
@@ -52,7 +52,7 @@ const struct vcltemp VCL_TEMP_BUSY[1] = {{ .name = "busy", .is_warm = 1 }};
...
@@ -52,7 +52,7 @@ const struct vcltemp VCL_TEMP_BUSY[1] = {{ .name = "busy", .is_warm = 1 }};
const
struct
vcltemp
VCL_TEMP_COOLING
[
1
]
=
{{
.
name
=
"cooling"
}};
const
struct
vcltemp
VCL_TEMP_COOLING
[
1
]
=
{{
.
name
=
"cooling"
}};
// not really a temperature
// not really a temperature
const
struct
vcltemp
VCL_TEMP_LABEL
[
1
]
=
{{
.
name
=
"label"
}};
static
const
struct
vcltemp
VCL_TEMP_LABEL
[
1
]
=
{{
.
name
=
"label"
}};
/*
/*
* XXX: Presently all modifications to this list happen from the
* XXX: Presently all modifications to this list happen from the
...
...
bin/varnishd/cache/cache_vcl.h
View file @
7c89c968
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
*/
*/
struct
vfilter
;
struct
vfilter
;
struct
vcltemp
;
;
struct
vcltemp
;
VTAILQ_HEAD
(
vfilter_head
,
vfilter
);
VTAILQ_HEAD
(
vfilter_head
,
vfilter
);
...
...
bin/varnishd/flint.lnt
View file @
7c89c968
...
@@ -146,6 +146,8 @@
...
@@ -146,6 +146,8 @@
// cache_vcl.c
// cache_vcl.c
-esym(528, vcl_call_method) // Not referenced
-esym(528, vcl_call_method) // Not referenced
-esym(765, VCL_TEMP_*)
-esym(759, VCL_TEMP_*)
-e441 // for clause irregularity: loop variable '___' not found in 2nd for expression
-e441 // for clause irregularity: loop variable '___' not found in 2nd for expression
...
...
bin/varnishtest/tests/r02872.vtc
View file @
7c89c968
varnishtest "VSL quoted fields"
varnishtest "VSL quoted fields"
server s1 {
server s1 {
rxreq
rxreq
txresp
txresp
} -start
} -start
varnish v1 -vcl {
varnish v1 -vcl {
import std;
import std;
backend be {
backend be {
.host = "${s1_sock}";
.host = "${s1_sock}";
.probe = { .interval = 1m; }
.probe = { .interval = 1m; }
}
}
sub vcl_recv {
sub vcl_recv {
# a series of 3-fields log records
# a series of 3-fields log records
std.log({" custom log "ok" "});
std.log({" custom log "ok" "});
std.log({" "valid" "fields" ok "});
std.log({" "valid" "fields" ok "});
std.log({" "missing""blank" ko "});
std.log({" "missing""blank" ko "});
std.log({" missing dquote "ko "});
std.log({" missing dquote "ko "}); # "
# "
return (synth(200));
return (synth(200));
}
}
} -start
} -start
...
@@ -30,17 +29,17 @@ client c1 {
...
@@ -30,17 +29,17 @@ client c1 {
# records with malformed fields don't show up
# records with malformed fields don't show up
shell -expect "2" {
shell -expect "2" {
varnishlog -d -n ${v1_name} -g raw -q 'VCL_Log[3]' | wc -l
varnishlog -d -n ${v1_name} -g raw -q 'VCL_Log[3]' | wc -l
}
}
server s1 -wait
server s1 -wait
shell -expect "Went healthy" {
shell -expect "Went healthy" {
varnishlog -d -n ${v1_name} -g raw \
varnishlog -d -n ${v1_name} -g raw \
-q 'Backend_health[10] eq "HTTP/1.1 200 OK"'
-q 'Backend_health[10] eq "HTTP/1.1 200 OK"'
}
}
# s1 starts sick before the first probe request is made
# s1 starts sick before the first probe request is made
shell -expect "Went sick" {
shell -expect "Went sick" {
varnishlog -d -n ${v1_name} -g raw -q 'Backend_health[10] eq ""'
varnishlog -d -n ${v1_name} -g raw -q 'Backend_health[10] eq ""'
}
}
include/tbl/sess_attr.h
View file @
7c89c968
...
@@ -32,8 +32,8 @@
...
@@ -32,8 +32,8 @@
/*lint -save -e525 -e539 */
/*lint -save -e525 -e539 */
//
upper lower
type len
//
upper lower
type len
SESS_ATTR
(
TRANSPORT
,
transport
,
void
,
0
)
SESS_ATTR
(
TRANSPORT
,
transport
,
void
,
0
)
SESS_ATTR
(
REMOTE_ADDR
,
remote_addr
,
struct
suckaddr
,
vsa_suckaddr_len
)
SESS_ATTR
(
REMOTE_ADDR
,
remote_addr
,
struct
suckaddr
,
vsa_suckaddr_len
)
SESS_ATTR
(
LOCAL_ADDR
,
local_addr
,
struct
suckaddr
,
vsa_suckaddr_len
)
SESS_ATTR
(
LOCAL_ADDR
,
local_addr
,
struct
suckaddr
,
vsa_suckaddr_len
)
SESS_ATTR
(
CLIENT_ADDR
,
client_addr
,
struct
suckaddr
,
vsa_suckaddr_len
)
SESS_ATTR
(
CLIENT_ADDR
,
client_addr
,
struct
suckaddr
,
vsa_suckaddr_len
)
...
...
lib/libvmod_vtc/vmod_vtc.c
View file @
7c89c968
...
@@ -297,6 +297,7 @@ vmod_typesize(VRT_CTX, VCL_STRING s)
...
@@ -297,6 +297,7 @@ vmod_typesize(VRT_CTX, VCL_STRING s)
i
+=
(
l
-
a
);
/* align */
i
+=
(
l
-
a
);
/* align */
i
+=
l
;
i
+=
l
;
}
}
AN
(
p
);
a
=
i
%
p
;
a
=
i
%
p
;
if
(
a
!=
0
)
if
(
a
!=
0
)
i
+=
(
p
-
a
);
/* pad */
i
+=
(
p
-
a
);
/* pad */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment