Skip to content

Commit 48062fb

Browse files
committed
Remove n/a change but document it for completeness
3.0 did not have return (fetch) in vcl_hit{}.
1 parent 71036de commit 48062fb

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

README.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ remove | unset
3737
req.backend | req.backend_hint
3838
req.grace | -
3939
req.* in vcl_backend_response | bereq.*
40-
return (fetch) in vcl_hit [2][3] | return (miss)
4140
return (hash) in vcl_hash | return (lookup)
4241
return (hit_for_pass) | set beresp.uncacheable = true;<br/>return (deliver);
4342
return (lookup) in vcl_recv | return (hash)
@@ -66,6 +65,10 @@ V3 | V4
6665
Add imports resulting from changes in V4, complete purge handling and
6766
any other changes missing from this document.
6867

68+
### N/A for 3.0 (for documentation only)
69+
70+
return (fetch) in vcl_hit [2][3] | return (miss)
71+
6972
### Notes
7073

7174
1. Comments in VCL are treated as code and as such references within

varnish3to4

-5
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ def fixup_multi(config, version):
110110
('(sub\s+vcl_backend_(error|response)\s(((?!sub ).)*$))',
111111
'return\s*\(?restart\)?[^;]', 'return (retry)'),
112112
]
113-
if '4.1' in version:
114-
v3v4.append(
115-
('(sub\s+vcl_hit\s(((?!sub ).)*$))',
116-
'return\s*\(?fetch\)?[^;]', 'return (miss)')
117-
)
118113
for s, v3, v4 in v3v4:
119114
for m in re.finditer(s, config, re.S | re.M):
120115
config = config.replace(m.group(1), re.sub(v3, v4, m.group(1)))

0 commit comments

Comments
 (0)