Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
nghttp2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
nghttp2
Commits
d105619b
Commit
d105619b
authored
Oct 15, 2018
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src: Remove extra braces if possible
parent
ec5729b1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
src/memchunk_test.cc
src/memchunk_test.cc
+8
-8
src/shrpx_api_downstream_connection.cc
src/shrpx_api_downstream_connection.cc
+2
-2
src/shrpx_client_handler.cc
src/shrpx_client_handler.cc
+1
-1
src/shrpx_signal.cc
src/shrpx_signal.cc
+3
-3
No files found.
src/memchunk_test.cc
View file @
d105619b
...
...
@@ -224,10 +224,10 @@ void test_peek_memchunks_append(void) {
MemchunkPool16
pool
;
PeekMemchunks16
pchunks
(
&
pool
);
std
::
array
<
uint8_t
,
32
>
b
{
{
std
::
array
<
uint8_t
,
32
>
b
{
'0'
,
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'7'
,
'8'
,
'9'
,
'0'
,
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'7'
,
'8'
,
'9'
,
'0'
,
'1'
,
}
}
,
},
d
;
pchunks
.
append
(
b
.
data
(),
b
.
size
());
...
...
@@ -259,10 +259,10 @@ void test_peek_memchunks_disable_peek_drain(void) {
MemchunkPool16
pool
;
PeekMemchunks16
pchunks
(
&
pool
);
std
::
array
<
uint8_t
,
32
>
b
{
{
std
::
array
<
uint8_t
,
32
>
b
{
'0'
,
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'7'
,
'8'
,
'9'
,
'0'
,
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'7'
,
'8'
,
'9'
,
'0'
,
'1'
,
}
}
,
},
d
;
pchunks
.
append
(
b
.
data
(),
b
.
size
());
...
...
@@ -287,10 +287,10 @@ void test_peek_memchunks_disable_peek_no_drain(void) {
MemchunkPool16
pool
;
PeekMemchunks16
pchunks
(
&
pool
);
std
::
array
<
uint8_t
,
32
>
b
{
{
std
::
array
<
uint8_t
,
32
>
b
{
'0'
,
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'7'
,
'8'
,
'9'
,
'0'
,
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'7'
,
'8'
,
'9'
,
'0'
,
'1'
,
}
}
,
},
d
;
pchunks
.
append
(
b
.
data
(),
b
.
size
());
...
...
@@ -315,10 +315,10 @@ void test_peek_memchunks_reset(void) {
MemchunkPool16
pool
;
PeekMemchunks16
pchunks
(
&
pool
);
std
::
array
<
uint8_t
,
32
>
b
{
{
std
::
array
<
uint8_t
,
32
>
b
{
'0'
,
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'7'
,
'8'
,
'9'
,
'0'
,
'1'
,
'2'
,
'3'
,
'4'
,
'5'
,
'6'
,
'7'
,
'8'
,
'9'
,
'0'
,
'1'
,
}
}
,
},
d
;
pchunks
.
append
(
b
.
data
(),
b
.
size
());
...
...
src/shrpx_api_downstream_connection.cc
View file @
d105619b
...
...
@@ -41,7 +41,7 @@ namespace shrpx {
namespace
{
// List of API endpoints
const
std
::
array
<
APIEndpoint
,
2
>
&
apis
()
{
static
const
auto
apis
=
new
std
::
array
<
APIEndpoint
,
2
>
{
{
static
const
auto
apis
=
new
std
::
array
<
APIEndpoint
,
2
>
{
APIEndpoint
{
StringRef
::
from_lit
(
"/api/v1beta1/backendconfig"
),
true
,
...
...
@@ -54,7 +54,7 @@ const std::array<APIEndpoint, 2> &apis() {
(
1
<<
API_METHOD_GET
),
&
APIDownstreamConnection
::
handle_configrevision
,
},
}
}
;
};
return
*
apis
;
}
...
...
src/shrpx_client_handler.cc
View file @
d105619b
...
...
@@ -1319,7 +1319,7 @@ int ClientHandler::proxy_protocol_read() {
// NULL character really destroys functions which expects NULL
// terminated string. We won't expect it in PROXY protocol line, so
// find it here.
auto
chrs
=
std
::
array
<
char
,
2
>
{
{
'\n'
,
'\0'
}
};
auto
chrs
=
std
::
array
<
char
,
2
>
{
'\n'
,
'\0'
};
constexpr
size_t
MAX_PROXY_LINELEN
=
107
;
...
...
src/shrpx_signal.cc
View file @
d105619b
...
...
@@ -110,13 +110,13 @@ int signal_set_handler(void (*handler)(int), Signals &&sigs) {
}
// namespace
namespace
{
constexpr
auto
master_proc_ign_signals
=
std
::
array
<
int
,
1
>
{
{
SIGPIPE
}
};
constexpr
auto
master_proc_ign_signals
=
std
::
array
<
int
,
1
>
{
SIGPIPE
};
}
// namespace
namespace
{
constexpr
auto
worker_proc_ign_signals
=
std
::
array
<
int
,
5
>
{
{
REOPEN_LOG_SIGNAL
,
EXEC_BINARY_SIGNAL
,
GRACEFUL_SHUTDOWN_SIGNAL
,
RELOAD_SIGNAL
,
SIGPIPE
}
};
std
::
array
<
int
,
5
>
{
REOPEN_LOG_SIGNAL
,
EXEC_BINARY_SIGNAL
,
GRACEFUL_SHUTDOWN_SIGNAL
,
RELOAD_SIGNAL
,
SIGPIPE
};
}
// namespace
int
shrpx_signal_set_master_proc_ign_handler
()
{
...
...
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