GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — http2: improve nghttp2 error callback · nodejs/node@a4d6543

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- node_http2.cc
- node_http2.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/node_http2.cc‎`

Copy file name to clipboardExpand all lines: src/node_http2.cc

+3-7Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -437,8 +437,7 @@ Http2Session::Callbacks::Callbacks(bool kHasGetPaddingCallback) {`
`437`	`437`	`callbacks_, OnFrameNotSent);`
`438`	`438`	`nghttp2_session_callbacks_set_on_invalid_header_callback2(`
`439`	`439`	`callbacks_, OnInvalidHeader);`
`440`		`- nghttp2_session_callbacks_set_error_callback(`
`441`		`- callbacks_, OnNghttpError);`
	`440`	`+ nghttp2_session_callbacks_set_error_callback2(callbacks_, OnNghttpError);`
`442`	`441`	`nghttp2_session_callbacks_set_send_data_callback(`
`443`	`442`	`callbacks_, OnSendData);`
`444`	`443`	`nghttp2_session_callbacks_set_on_invalid_frame_recv_callback(`
`@@ -1257,21 +1256,18 @@ ssize_t Http2Session::OnSelectPadding(nghttp2_session* handle,`
`1257`	`1256`	`return padding;`
`1258`	`1257`	`}`
`1259`	`1258`
`1260`		`-#define BAD_PEER_MESSAGE "Remote peer returned unexpected data while we " \`
`1261`		`- "expected SETTINGS frame. Perhaps, peer does not " \`
`1262`		`- "support HTTP/2 properly."`
`1263`		`-`
`1264`	`1259`	`// We use this currently to determine when an attempt is made to use the http2`
`1265`	`1260`	`// protocol with a non-http2 peer.`
`1266`	`1261`	`int Http2Session::OnNghttpError(nghttp2_session* handle,`
	`1262`	`+ int lib_error_code,`
`1267`	`1263`	`const char* message,`
`1268`	`1264`	`size_t len,`
`1269`	`1265`	`void* user_data) {`
`1270`	`1266`	`// Unfortunately, this is currently the only way for us to know if`
`1271`	`1267`	`// the session errored because the peer is not an http2 peer.`
`1272`	`1268`	`Http2Session* session = static_cast<Http2Session*>(user_data);`
`1273`	`1269`	`Debug(session, "Error '%s'", message);`
`1274`		`- if (strncmp(message, BAD_PEER_MESSAGE, len) == 0) {`
	`1270`	`+ if (lib_error_code == NGHTTP2_ERR_SETTINGS_EXPECTED) {`
`1275`	`1271`	`Environment* env = session->env();`
`1276`	`1272`	`Isolate* isolate = env->isolate();`
`1277`	`1273`	`HandleScope scope(isolate);`

Collapse file

`‎src/node_http2.h‎`

Copy file name to clipboardExpand all lines: src/node_http2.h

+5-5Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -843,11 +843,11 @@ class Http2Session : public AsyncWrap,`
`843`	`843`	`const nghttp2_frame* frame,`
`844`	`844`	`size_t maxPayloadLen,`
`845`	`845`	`void* user_data);`
`846`		`- static int OnNghttpError(`
`847`		`- nghttp2_session* session,`
`848`		`- const char* message,`
`849`		`- size_t len,`
`850`		`- void* user_data);`
	`846`	`+ static int OnNghttpError(nghttp2_session* session,`
	`847`	`+ int lib_error_code,`
	`848`	`+ const char* message,`
	`849`	`+ size_t len,`
	`850`	`+ void* user_data);`
`851`	`851`	`static int OnSendData(`
`852`	`852`	`nghttp2_session* session,`
`853`	`853`	`nghttp2_frame* frame,`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.