walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Rename PROTO_SPDY with PROTO_HTTP2 for backend protocol name

This commit is contained in:
Tatsuhiro Tsujikawa 2013-11-04 18:15:56 +09:00
parent ba3db66cec
commit 0fcd14300a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/shrpx.cc
View File

@ -293,7 +293,7 @@ int event_loop()
if(get_config()->num_worker > 1) { if(get_config()->num_worker > 1) {
listener_handler->create_worker_thread(get_config()->num_worker); listener_handler->create_worker_thread(get_config()->num_worker);
} else if(get_config()->downstream_proto == PROTO_SPDY) { } else if(get_config()->downstream_proto == PROTO_HTTP2) {
listener_handler->create_http2_session(); listener_handler->create_http2_session();
} }
@ -1061,7 +1061,7 @@ int main(int argc, char **argv)
} }
if(get_config()->client_mode || get_config()->http2_bridge) { if(get_config()->client_mode || get_config()->http2_bridge) {
mod_config()->downstream_proto = PROTO_SPDY; mod_config()->downstream_proto = PROTO_HTTP2;
} else { } else {
mod_config()->downstream_proto = PROTO_HTTP; mod_config()->downstream_proto = PROTO_HTTP;
} }

2
src/shrpx_config.h
View File

@ -104,7 +104,7 @@ union sockaddr_union {
}; };
enum shrpx_proto { enum shrpx_proto {
PROTO_SPDY, PROTO_HTTP2,
PROTO_HTTP PROTO_HTTP
}; };

2
src/shrpx_worker.cc
View File

@ -90,7 +90,7 @@ void Worker::run()
return; return;
} }
std::unique_ptr<Http2Session> http2session; std::unique_ptr<Http2Session> http2session;
if(get_config()->downstream_proto == PROTO_SPDY) { if(get_config()->downstream_proto == PROTO_HTTP2) {
http2session = util::make_unique<Http2Session>(evbase.get(), cl_ssl_ctx_); http2session = util::make_unique<Http2Session>(evbase.get(), cl_ssl_ctx_);
if(http2session->init_notification() == -1) { if(http2session->init_notification() == -1) {
DIE(); DIE();