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
b0e924cd
Commit
b0e924cd
authored
Jun 27, 2018
by
Nils Goroll
Committed by
Dridi Boukelmoune
Aug 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tell the truth about vmod filenames
parent
ca354bdd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
cache_vrt_vmod.c
bin/varnishd/cache/cache_vrt_vmod.c
+6
-5
No files found.
bin/varnishd/cache/cache_vrt_vmod.c
View file @
b0e924cd
...
@@ -93,7 +93,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
...
@@ -93,7 +93,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
dlhdl
=
dlopen
(
backup
,
RTLD_NOW
|
RTLD_LOCAL
);
dlhdl
=
dlopen
(
backup
,
RTLD_NOW
|
RTLD_LOCAL
);
if
(
dlhdl
==
NULL
)
{
if
(
dlhdl
==
NULL
)
{
VSB_printf
(
ctx
->
msg
,
"Loading vmod %s from %s:
\n
"
,
nm
,
backup
);
VSB_printf
(
ctx
->
msg
,
"Loading vmod %s from %s (%s):
\n
"
,
nm
,
backup
,
path
);
VSB_printf
(
ctx
->
msg
,
"dlopen() failed: %s
\n
"
,
dlerror
());
VSB_printf
(
ctx
->
msg
,
"dlopen() failed: %s
\n
"
,
dlerror
());
return
(
1
);
return
(
1
);
}
}
...
@@ -113,8 +114,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
...
@@ -113,8 +114,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
if
(
d
==
NULL
||
if
(
d
==
NULL
||
d
->
file_id
==
NULL
||
d
->
file_id
==
NULL
||
strcmp
(
d
->
file_id
,
file_id
))
{
strcmp
(
d
->
file_id
,
file_id
))
{
VSB_printf
(
ctx
->
msg
,
VSB_printf
(
ctx
->
msg
,
"Loading vmod %s from %s (%s):
\n
"
,
"Loading vmod %s from %s:
\n
"
,
nm
,
path
);
nm
,
backup
,
path
);
VSB_printf
(
ctx
->
msg
,
VSB_printf
(
ctx
->
msg
,
"This is no longer the same file seen by"
"This is no longer the same file seen by"
" the VCL-compiler.
\n
"
);
" the VCL-compiler.
\n
"
);
...
@@ -129,8 +130,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
...
@@ -129,8 +130,8 @@ VRT_Vmod_Init(VRT_CTX, struct vmod **hdl, void *ptr, int len, const char *nm,
d
->
func_len
<=
0
||
d
->
func_len
<=
0
||
d
->
proto
==
NULL
||
d
->
proto
==
NULL
||
d
->
json
==
NULL
)
{
d
->
json
==
NULL
)
{
VSB_printf
(
ctx
->
msg
,
VSB_printf
(
ctx
->
msg
,
"Loading vmod %s from %s (%s):
\n
"
,
"Loading VMOD %s from %s:
\n
"
,
nm
,
path
);
nm
,
backup
,
path
);
VSB_printf
(
ctx
->
msg
,
"VMOD data is mangled.
\n
"
);
VSB_printf
(
ctx
->
msg
,
"VMOD data is mangled.
\n
"
);
(
void
)
dlclose
(
v
->
hdl
);
(
void
)
dlclose
(
v
->
hdl
);
FREE_OBJ
(
v
);
FREE_OBJ
(
v
);
...
...
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