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
c2bfe9d0
Commit
c2bfe9d0
authored
Aug 30, 2016
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tolerate whitespace in declarations
This fixes a regression against 4.1 Reported by Dridi
parent
cbc900ae
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
6 deletions
+7
-6
vmodtool.py
lib/libvcc/vmodtool.py
+5
-4
vmod.vcc
lib/libvmod_debug/vmod.vcc
+2
-2
No files found.
lib/libvcc/vmodtool.py
View file @
c2bfe9d0
...
@@ -244,12 +244,12 @@ def arg(txt):
...
@@ -244,12 +244,12 @@ def arg(txt):
i
=
s
.
find
(
','
)
i
=
s
.
find
(
','
)
if
i
<
0
:
if
i
<
0
:
i
=
len
(
s
)
i
=
len
(
s
)
a
.
nm
=
s
[:
i
]
a
.
nm
=
s
[:
i
]
.
rstrip
()
s
=
s
[
i
:]
s
=
s
[
i
:]
return
a
,
s
return
a
,
s
a
.
nm
=
s
[:
i
]
a
.
nm
=
s
[:
i
]
.
rstrip
()
s
=
s
[
i
+
1
:]
s
=
s
[
i
+
1
:]
.
lstrip
()
if
s
[
0
]
==
'"'
or
s
[
0
]
==
"'"
:
if
s
[
0
]
==
'"'
or
s
[
0
]
==
"'"
:
m
=
re
.
match
(
"(['
\"
]).*?(
\\
1)"
,
s
)
m
=
re
.
match
(
"(['
\"
]).*?(
\\
1)"
,
s
)
if
not
m
:
if
not
m
:
...
@@ -260,7 +260,7 @@ def arg(txt):
...
@@ -260,7 +260,7 @@ def arg(txt):
i
=
s
.
find
(
','
)
i
=
s
.
find
(
','
)
if
i
<
0
:
if
i
<
0
:
i
=
len
(
s
)
i
=
len
(
s
)
a
.
defval
=
s
[:
i
]
a
.
defval
=
s
[:
i
]
.
rstrip
()
s
=
s
[
i
:]
s
=
s
[
i
:]
return
a
,
s
return
a
,
s
...
@@ -294,6 +294,7 @@ class prototype(object):
...
@@ -294,6 +294,7 @@ class prototype(object):
while
len
(
s
)
>
0
:
while
len
(
s
)
>
0
:
a
,
s
=
arg
(
s
)
a
,
s
=
arg
(
s
)
self
.
args
.
append
(
a
)
self
.
args
.
append
(
a
)
s
=
s
.
lstrip
()
if
len
(
s
)
==
0
:
if
len
(
s
)
==
0
:
break
;
break
;
assert
s
[
0
]
==
','
assert
s
[
0
]
==
','
...
...
lib/libvmod_debug/vmod.vcc
View file @
c2bfe9d0
...
@@ -103,8 +103,8 @@ Encrypt the HTTP header with quad-ROT13 encryption,
...
@@ -103,8 +103,8 @@ Encrypt the HTTP header with quad-ROT13 encryption,
(this is approx 33% better than triple-DES).
(this is approx 33% better than triple-DES).
$Function STRING argtest(
$Function STRING argtest(
STRING one, REAL two
=2, STRING three=
"3",
STRING one, REAL two
=2, STRING three=
"3",
STRING comma=","
, INT four=4
)
STRING comma=","
, INT four = 4
)
$Function INT vre_limit()
$Function INT vre_limit()
...
...
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