Commit ceb74b60 authored by Federico G. Schwindt's avatar Federico G. Schwindt

Turn bereq.uncacheable read-only

This had the same effect as writing to beresp.uncacheble.
parent 980243cb
...@@ -204,20 +204,6 @@ VRT_r_beresp_##field(VRT_CTX) \ ...@@ -204,20 +204,6 @@ VRT_r_beresp_##field(VRT_CTX) \
/*--------------------------------------------------------------------*/ /*--------------------------------------------------------------------*/
void
VRT_l_bereq_uncacheable(VRT_CTX, unsigned a)
{
CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
CHECK_OBJ_NOTNULL(ctx->bo, BUSYOBJ_MAGIC);
if (ctx->bo->do_pass && !a) {
VSLb(ctx->vsl, SLT_VCL_Error,
"Ignoring attempt to reset bereq.uncacheable");
} else if (a) {
ctx->bo->do_pass = 1;
}
}
unsigned unsigned
VRT_r_bereq_uncacheable(VRT_CTX) VRT_r_bereq_uncacheable(VRT_CTX)
{ {
......
...@@ -52,7 +52,6 @@ varnish v1 -arg "-i J.F.Nobody" -vcl+backend { ...@@ -52,7 +52,6 @@ varnish v1 -arg "-i J.F.Nobody" -vcl+backend {
} }
sub vcl_backend_fetch { sub vcl_backend_fetch {
set bereq.uncacheable = false;
if (bereq.between_bytes_timeout < 10s) { if (bereq.between_bytes_timeout < 10s) {
set bereq.http.quick = "please"; set bereq.http.quick = "please";
} }
......
...@@ -360,17 +360,10 @@ sp_variables = [ ...@@ -360,17 +360,10 @@ sp_variables = [
('bereq.uncacheable', ('bereq.uncacheable',
'BOOL', 'BOOL',
( 'backend', ), ( 'backend', ),
( 'backend_fetch', ), """ ( ), """
Indicates whether the object requested from the backend is Indicates whether this request is uncacheable due
going to be uncacheable - either because the request was an to a pass in the client side or a hit on an existing
explicit pass from the client side or a hit on an uncacheable uncacheable object (aka hit-for-pass).
("hit for pass") object.
Setting this variable in vcl_backend_fetch makes the object
uncacheable.
Clearing the variable has no effect and will log the warning
"Ignoring attempt to reset bereq.uncacheable".
""" """
), ),
('bereq.connect_timeout', ('bereq.connect_timeout',
......
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