Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
2e1dcdfd
Commit
2e1dcdfd
authored
Apr 23, 2013
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the argument provided workspace, rather than default to req->ws.
parent
7f2cd24b
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
cache_vrt.c
bin/varnishd/cache/cache_vrt.c
+3
-3
vrt.h
include/vrt.h
+1
-1
vcc_expr.c
lib/libvcl/vcc_expr.c
+1
-1
No files found.
bin/varnishd/cache/cache_vrt.c
View file @
2e1dcdfd
...
...
@@ -215,14 +215,14 @@ VRT_String(struct ws *ws, const char *h, const char *p, va_list ap)
*/
const
char
*
VRT_
ReqString
(
struct
req
*
req
,
const
char
*
p
,
...)
VRT_
CollectString
(
struct
ws
*
ws
,
const
char
*
p
,
...)
{
va_list
ap
;
char
*
b
;
CHECK_OBJ_NOTNULL
(
req
,
REQ
_MAGIC
);
CHECK_OBJ_NOTNULL
(
ws
,
WS
_MAGIC
);
va_start
(
ap
,
p
);
b
=
VRT_String
(
req
->
ws
,
NULL
,
p
,
ap
);
b
=
VRT_String
(
ws
,
NULL
,
p
,
ap
);
va_end
(
ap
);
return
(
b
);
}
...
...
include/vrt.h
View file @
2e1dcdfd
...
...
@@ -232,4 +232,4 @@ char *VRT_TIME_string(struct ws *, double);
const
char
*
VRT_BOOL_string
(
unsigned
);
const
char
*
VRT_BACKEND_string
(
const
struct
director
*
d
);
const
char
*
VRT_
ReqString
(
struct
req
*
,
const
char
*
p
,
...);
const
char
*
VRT_
CollectString
(
struct
ws
*
,
const
char
*
p
,
...);
lib/libvcl/vcc_expr.c
View file @
2e1dcdfd
...
...
@@ -914,7 +914,7 @@ vcc_expr_strfold(struct vcc *tl, struct expr **e, enum var_type fmt)
if
(
fmt
!=
STRING_LIST
&&
(
*
e
)
->
fmt
==
STRING_LIST
)
*
e
=
vcc_expr_edit
(
STRING
,
"
\v
+VRT_
ReqString(req,
\n\v
1,
\n
vrt_magic_string_end)
"
,
"
\v
+VRT_
CollectString(ws,
\n\v
1,
\n
vrt_magic_string_end)
\v
-
"
,
*
e
,
NULL
);
if
(
fmt
==
STRING_LIST
&&
(
*
e
)
->
fmt
==
STRING
)
(
*
e
)
->
fmt
=
STRING_LIST
;
...
...
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