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
a37d3cc1
Commit
a37d3cc1
authored
Nov 10, 2011
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a struct member hit by a global name-space edit
parent
e4fa4c7a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
cache_cli.c
bin/varnishd/cache_cli.c
+1
-1
heritage.h
bin/varnishd/heritage.h
+1
-1
mgt_child.c
bin/varnishd/mgt/mgt_child.c
+4
-4
No files found.
bin/varnishd/cache_cli.c
View file @
a37d3cc1
...
@@ -102,7 +102,7 @@ CLI_Run(void)
...
@@ -102,7 +102,7 @@ CLI_Run(void)
add_check
=
1
;
add_check
=
1
;
AN
(
VCLS_AddFd
(
cls
,
heritage
.
cli_in
,
heritage
.
VCLI_O
ut
,
NULL
,
NULL
));
AN
(
VCLS_AddFd
(
cls
,
heritage
.
cli_in
,
heritage
.
cli_o
ut
,
NULL
,
NULL
));
do
{
do
{
i
=
VCLS_Poll
(
cls
,
-
1
);
i
=
VCLS_Poll
(
cls
,
-
1
);
...
...
bin/varnishd/heritage.h
View file @
a37d3cc1
...
@@ -46,7 +46,7 @@ struct heritage {
...
@@ -46,7 +46,7 @@ struct heritage {
/* Two pipe(2)'s for CLI connection between cache and mgt. */
/* Two pipe(2)'s for CLI connection between cache and mgt. */
int
cli_in
;
int
cli_in
;
int
VCLI_O
ut
;
int
cli_o
ut
;
/* File descriptor for stdout/stderr */
/* File descriptor for stdout/stderr */
int
std_fd
;
int
std_fd
;
...
...
bin/varnishd/mgt/mgt_child.c
View file @
a37d3cc1
...
@@ -303,8 +303,8 @@ start_child(struct cli *cli)
...
@@ -303,8 +303,8 @@ start_child(struct cli *cli)
/* Open pipe for child->mgr CLI */
/* Open pipe for child->mgr CLI */
AZ
(
pipe
(
cp
));
AZ
(
pipe
(
cp
));
heritage
.
VCLI_O
ut
=
cp
[
1
];
heritage
.
cli_o
ut
=
cp
[
1
];
mgt_child_inherit
(
heritage
.
VCLI_Out
,
"VCLI_O
ut"
);
mgt_child_inherit
(
heritage
.
cli_out
,
"cli_o
ut"
);
child_cli_in
=
cp
[
0
];
child_cli_in
=
cp
[
0
];
/*
/*
...
@@ -356,8 +356,8 @@ start_child(struct cli *cli)
...
@@ -356,8 +356,8 @@ start_child(struct cli *cli)
mgt_child_inherit
(
heritage
.
cli_in
,
NULL
);
mgt_child_inherit
(
heritage
.
cli_in
,
NULL
);
closex
(
&
heritage
.
cli_in
);
closex
(
&
heritage
.
cli_in
);
mgt_child_inherit
(
heritage
.
VCLI_O
ut
,
NULL
);
mgt_child_inherit
(
heritage
.
cli_o
ut
,
NULL
);
closex
(
&
heritage
.
VCLI_O
ut
);
closex
(
&
heritage
.
cli_o
ut
);
close_sockets
();
close_sockets
();
...
...
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