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

Define HTTP/2.0 protocol version ID

This commit is contained in:
Tatsuhiro Tsujikawa 2013-07-26 01:38:04 +09:00
parent 9c54e63871
commit 459a269049
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/includes/nghttp2/nghttp2.h
View File

@ -35,6 +35,9 @@ extern "C" {
#include <nghttp2/nghttp2ver.h> #include <nghttp2/nghttp2ver.h>
#define NGHTTP2_PROTO_VERSION_ID "HTTP-draft-04/2.0"
#define NGHTTP2_PROTO_VERSION_ID_LEN 17
struct nghttp2_session; struct nghttp2_session;
/** /**
* @struct * @struct

3
lib/nghttp2_npn.c
View File

@ -32,7 +32,8 @@ int nghttp2_select_next_protocol(unsigned char **out, unsigned char *outlen,
int http_selected = 0; int http_selected = 0;
unsigned int i = 0; unsigned int i = 0;
for(; i < inlen; i += in[i]+1) { for(; i < inlen; i += in[i]+1) {
if(in[i] == 17 && memcmp(&in[i+1], "HTTP-draft-04/2.0", in[i]) == 0) { if(in[i] == NGHTTP2_PROTO_VERSION_ID_LEN &&
memcmp(&in[i+1], NGHTTP2_PROTO_VERSION_ID, in[i]) == 0) {
*out = (unsigned char*)&in[i+1]; *out = (unsigned char*)&in[i+1];
*outlen = in[i]; *outlen = in[i];
return 1; return 1;

5
src/HttpServer.cc
View File

@ -365,7 +365,7 @@ int Http2Handler::verify_npn_result()
if(sessions_->get_config()->verbose) { if(sessions_->get_config()->verbose) {
std::cout << "The negotiated next protocol: " << proto << std::endl; std::cout << "The negotiated next protocol: " << proto << std::endl;
} }
if(proto == "HTTP-draft-04/2.0") { if(proto == NGHTTP2_PROTO_VERSION_ID) {
return 0; return 0;
} }
} }
@ -1003,7 +1003,8 @@ int HttpServer::run()
} }
proto_list[0] = 17; proto_list[0] = 17;
memcpy(&proto_list[1], "HTTP-draft-04/2.0", 17); memcpy(&proto_list[1], NGHTTP2_PROTO_VERSION_ID,
NGHTTP2_PROTO_VERSION_ID_LEN);
next_proto.first = proto_list; next_proto.first = proto_list;
next_proto.second = 18; next_proto.second = 18;