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

Merge branch 'misc' of https://github.com/alagoutte/nghttp2 into alagoutte-misc

This commit is contained in:
Tatsuhiro Tsujikawa 2015-04-30 18:42:17 +09:00
parent ea612a2dce a62778d6b0
commit 9d81be4b35
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/tiny-nghttpd.c
View File

@ -190,7 +190,7 @@ typedef enum {
NGHTTP2_TOKEN__METHOD, NGHTTP2_TOKEN__METHOD,
NGHTTP2_TOKEN__PATH, NGHTTP2_TOKEN__PATH,
NGHTTP2_TOKEN__SCHEME, NGHTTP2_TOKEN__SCHEME,
NGHTTP2_TOKEN_HOST, NGHTTP2_TOKEN_HOST
} nghttp2_token; } nghttp2_token;
/* Inspired by h2o header lookup. https://github.com/h2o/h2o */ /* Inspired by h2o header lookup. https://github.com/h2o/h2o */

2
lib/nghttp2_hd.h
View File

@ -109,7 +109,7 @@ typedef enum {
NGHTTP2_TOKEN_CONNECTION, NGHTTP2_TOKEN_CONNECTION,
NGHTTP2_TOKEN_KEEP_ALIVE, NGHTTP2_TOKEN_KEEP_ALIVE,
NGHTTP2_TOKEN_PROXY_CONNECTION, NGHTTP2_TOKEN_PROXY_CONNECTION,
NGHTTP2_TOKEN_UPGRADE, NGHTTP2_TOKEN_UPGRADE
} nghttp2_token; } nghttp2_token;
typedef enum { typedef enum {

2
lib/nghttp2_option.h
View File

@ -58,7 +58,7 @@ typedef enum {
*/ */
NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS = 1 << 1, NGHTTP2_OPT_PEER_MAX_CONCURRENT_STREAMS = 1 << 1,
NGHTTP2_OPT_RECV_CLIENT_PREFACE = 1 << 2, NGHTTP2_OPT_RECV_CLIENT_PREFACE = 1 << 2,
NGHTTP2_OPT_NO_HTTP_MESSAGING = 1 << 3, NGHTTP2_OPT_NO_HTTP_MESSAGING = 1 << 3
} nghttp2_option_flag; } nghttp2_option_flag;
/** /**

2
lib/nghttp2_outbound_item.h
View File

@ -81,7 +81,7 @@ typedef enum {
/* indicates that this GOAWAY is just a notification for graceful /* indicates that this GOAWAY is just a notification for graceful
shutdown. No nghttp2_session.goaway_flags should be updated on shutdown. No nghttp2_session.goaway_flags should be updated on
the reaction to this frame. */ the reaction to this frame. */
NGHTTP2_GOAWAY_AUX_SHUTDOWN_NOTICE = 0x2, NGHTTP2_GOAWAY_AUX_SHUTDOWN_NOTICE = 0x2
} nghttp2_goaway_aux_flag; } nghttp2_goaway_aux_flag;
/* struct used for GOAWAY frame */ /* struct used for GOAWAY frame */

6
lib/nghttp2_session.h
View File

@ -47,7 +47,7 @@
typedef enum { typedef enum {
NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE = 1 << 0, NGHTTP2_OPTMASK_NO_AUTO_WINDOW_UPDATE = 1 << 0,
NGHTTP2_OPTMASK_RECV_CLIENT_PREFACE = 1 << 1, NGHTTP2_OPTMASK_RECV_CLIENT_PREFACE = 1 << 1,
NGHTTP2_OPTMASK_NO_HTTP_MESSAGING = 1 << 2, NGHTTP2_OPTMASK_NO_HTTP_MESSAGING = 1 << 2
} nghttp2_optmask; } nghttp2_optmask;
typedef enum { typedef enum {
@ -84,7 +84,7 @@ typedef enum {
NGHTTP2_IB_READ_PAD_DATA, NGHTTP2_IB_READ_PAD_DATA,
NGHTTP2_IB_READ_DATA, NGHTTP2_IB_READ_DATA,
NGHTTP2_IB_IGN_DATA, NGHTTP2_IB_IGN_DATA,
NGHTTP2_IB_IGN_ALL, NGHTTP2_IB_IGN_ALL
} nghttp2_inbound_state; } nghttp2_inbound_state;
#define NGHTTP2_INBOUND_NUM_IV 7 #define NGHTTP2_INBOUND_NUM_IV 7
@ -136,7 +136,7 @@ typedef enum {
/* Flag means GOAWAY was sent */ /* Flag means GOAWAY was sent */
NGHTTP2_GOAWAY_SENT = 0x4, NGHTTP2_GOAWAY_SENT = 0x4,
/* Flag means GOAWAY was received */ /* Flag means GOAWAY was received */
NGHTTP2_GOAWAY_RECV = 0x8, NGHTTP2_GOAWAY_RECV = 0x8
} nghttp2_goaway_flag; } nghttp2_goaway_flag;
struct nghttp2_session { struct nghttp2_session {

2
lib/nghttp2_stream.h
View File

@ -133,7 +133,7 @@ typedef enum {
/* "http" or "https" scheme */ /* "http" or "https" scheme */
NGHTTP2_HTTP_FLAG_SCHEME_HTTP = 1 << 12, NGHTTP2_HTTP_FLAG_SCHEME_HTTP = 1 << 12,
/* set if final response is expected */ /* set if final response is expected */
NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE = 1 << 13, NGHTTP2_HTTP_FLAG_EXPECT_FINAL_RESPONSE = 1 << 13
} nghttp2_http_flag; } nghttp2_http_flag;
typedef enum { typedef enum {