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
c58af7ed
Commit
c58af7ed
authored
Sep 26, 2018
by
Poul-Henning Kamp
Committed by
Dridi Boukelmoune
Oct 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dup(2) stderr before calling VCLS on -I argument.
Fixes: #2782
parent
aea1eafd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
mgt_child.c
bin/varnishd/mgt/mgt_child.c
+2
-0
mgt_main.c
bin/varnishd/mgt/mgt_main.c
+2
-1
No files found.
bin/varnishd/mgt/mgt_child.c
View file @
c58af7ed
...
...
@@ -278,6 +278,8 @@ mgt_launch_child(struct cli *cli)
/* Open pipe for mgt->child CLI */
AZ
(
pipe
(
cp
));
heritage
.
cli_in
=
cp
[
0
];
assert
(
cp
[
0
]
>
STDERR_FILENO
);
// See #2782
assert
(
cp
[
1
]
>
STDERR_FILENO
);
MCH_Fd_Inherit
(
heritage
.
cli_in
,
"cli_in"
);
child_cli_out
=
cp
[
1
];
...
...
bin/varnishd/mgt/mgt_main.c
View file @
c58af7ed
...
...
@@ -861,7 +861,8 @@ main(int argc, char * const *argv)
if
(
I_fd
>=
0
)
{
fprintf
(
stderr
,
"BEGIN of -I file processing
\n
"
);
mgt_cli_setup
(
I_fd
,
2
,
1
,
"-I file"
,
mgt_I_close
,
stderr
);
/* We must dup stderr, because VCLS closes the output fd */
mgt_cli_setup
(
I_fd
,
dup
(
2
),
1
,
"-I file"
,
mgt_I_close
,
stderr
);
while
(
I_fd
>=
0
)
{
o
=
VEV_Once
(
mgt_evb
);
if
(
o
!=
1
)
...
...
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