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
478fde5f
Commit
478fde5f
authored
Feb 29, 2016
by
Tatsuhiro Tsujikawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
nghttpx: Fix compile error
parent
bffc0ec8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
src/shrpx_config.cc
src/shrpx_config.cc
+3
-0
src/shrpx_ssl.cc
src/shrpx_ssl.cc
+2
-2
No files found.
src/shrpx_config.cc
View file @
478fde5f
...
@@ -2603,6 +2603,9 @@ StringRef strproto(shrpx_proto proto) {
...
@@ -2603,6 +2603,9 @@ StringRef strproto(shrpx_proto proto) {
case
PROTO_MEMCACHED
:
case
PROTO_MEMCACHED
:
return
StringRef
::
from_lit
(
"memcached"
);
return
StringRef
::
from_lit
(
"memcached"
);
}
}
// gcc needs this.
assert
(
0
);
}
}
}
// namespace shrpx
}
// namespace shrpx
src/shrpx_ssl.cc
View file @
478fde5f
...
@@ -1325,17 +1325,17 @@ SSL_CTX *setup_downstream_client_ssl_context(
...
@@ -1325,17 +1325,17 @@ SSL_CTX *setup_downstream_client_ssl_context(
}
}
void
setup_downstream_http2_alpn
(
SSL
*
ssl
)
{
void
setup_downstream_http2_alpn
(
SSL
*
ssl
)
{
auto
alpn
=
util
::
get_default_alpn
();
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
// ALPN advertisement
// ALPN advertisement
auto
alpn
=
util
::
get_default_alpn
();
SSL_set_alpn_protos
(
ssl
,
alpn
.
data
(),
alpn
.
size
());
SSL_set_alpn_protos
(
ssl
,
alpn
.
data
(),
alpn
.
size
());
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
}
}
void
setup_downstream_http1_alpn
(
SSL
*
ssl
)
{
void
setup_downstream_http1_alpn
(
SSL
*
ssl
)
{
auto
alpn
=
StringRef
::
from_lit
(
NGHTTP2_H1_1_ALPN
);
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
#if OPENSSL_VERSION_NUMBER >= 0x10002000L
// ALPN advertisement
// ALPN advertisement
auto
alpn
=
StringRef
::
from_lit
(
NGHTTP2_H1_1_ALPN
);
SSL_set_alpn_protos
(
ssl
,
alpn
.
byte
(),
alpn
.
size
());
SSL_set_alpn_protos
(
ssl
,
alpn
.
byte
(),
alpn
.
size
());
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
}
}
...
...
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