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

Address CI build errors/warnings

This commit is contained in:
Lucas Pardue 2017-04-25 16:22:14 +01:00
parent 5d81f12262
commit f78673075a
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/nghttp2_frame.c
View File

@ -792,15 +792,10 @@ void nghttp2_frame_unpack_origin_payload(nghttp2_extension *frame,
size_t origin_len, uint8_t *payload, size_t origin_len, uint8_t *payload,
size_t payloadlen) { size_t payloadlen) {
nghttp2_ext_origin *origin_frame; nghttp2_ext_origin *origin_frame;
uint8_t *p; (void)payloadlen;
origin_frame = frame->payload; origin_frame = frame->payload;
p = payload; origin_frame->origin = payload;
origin_frame->origin = p;
p += origin_len;
origin_frame->origin_len = origin_len; origin_frame->origin_len = origin_len;
} }

1
lib/nghttp2_frame.h
View File

@ -431,7 +431,6 @@ void nghttp2_frame_unpack_origin_payload(nghttp2_extension *frame,
int nghttp2_frame_unpack_origin_payload2(nghttp2_extension *frame, int nghttp2_frame_unpack_origin_payload2(nghttp2_extension *frame,
const uint8_t *payload, const uint8_t *payload,
size_t payloadlen, nghttp2_mem *mem); size_t payloadlen, nghttp2_mem *mem);
/* /*
* Initializes HEADERS frame |frame| with given values. |frame| takes * Initializes HEADERS frame |frame| with given values. |frame| takes
* ownership of |nva|, so caller must not free it. If |stream_id| is * ownership of |nva|, so caller must not free it. If |stream_id| is

2
lib/nghttp2_session.c
View File

@ -5824,6 +5824,7 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
iframe->state = NGHTTP2_IB_READ_NBYTE; iframe->state = NGHTTP2_IB_READ_NBYTE;
inbound_frame_set_mark(iframe, 2); inbound_frame_set_mark(iframe, 2);
break;
case NGHTTP2_ORIGIN: case NGHTTP2_ORIGIN:
if ((session->builtin_recv_ext_types & NGHTTP2_TYPEMASK_ORIGIN) == if ((session->builtin_recv_ext_types & NGHTTP2_TYPEMASK_ORIGIN) ==
0) { 0) {
@ -5855,7 +5856,6 @@ ssize_t nghttp2_session_mem_recv(nghttp2_session *session, const uint8_t *in,
inbound_frame_set_mark(iframe, 2); inbound_frame_set_mark(iframe, 2);
break; break;
break;
default: default:
busy = 1; busy = 1;

3
tests/nghttp2_session_test.h
View File

@ -46,6 +46,7 @@ void test_nghttp2_session_recv_settings_header_table_size(void);
void test_nghttp2_session_recv_too_large_frame_length(void); void test_nghttp2_session_recv_too_large_frame_length(void);
void test_nghttp2_session_recv_extension(void); void test_nghttp2_session_recv_extension(void);
void test_nghttp2_session_recv_altsvc(void); void test_nghttp2_session_recv_altsvc(void);
void test_nghttp2_session_recv_origin(void);
void test_nghttp2_session_continue(void); void test_nghttp2_session_continue(void);
void test_nghttp2_session_add_frame(void); void test_nghttp2_session_add_frame(void);
void test_nghttp2_session_on_request_headers_received(void); void test_nghttp2_session_on_request_headers_received(void);
@ -62,6 +63,7 @@ void test_nghttp2_session_on_window_update_received(void);
void test_nghttp2_session_on_data_received(void); void test_nghttp2_session_on_data_received(void);
void test_nghttp2_session_on_data_received_fail_fast(void); void test_nghttp2_session_on_data_received_fail_fast(void);
void test_nghttp2_session_on_altsvc_received(void); void test_nghttp2_session_on_altsvc_received(void);
void test_nghttp2_session_on_origin_received(void);
void test_nghttp2_session_send_headers_start_stream(void); void test_nghttp2_session_send_headers_start_stream(void);
void test_nghttp2_session_send_headers_reply(void); void test_nghttp2_session_send_headers_reply(void);
void test_nghttp2_session_send_headers_frame_size_error(void); void test_nghttp2_session_send_headers_frame_size_error(void);
@ -99,6 +101,7 @@ void test_nghttp2_submit_shutdown_notice(void);
void test_nghttp2_submit_invalid_nv(void); void test_nghttp2_submit_invalid_nv(void);
void test_nghttp2_submit_extension(void); void test_nghttp2_submit_extension(void);
void test_nghttp2_submit_altsvc(void); void test_nghttp2_submit_altsvc(void);
void test_nghttp2_submit_origin(void);
void test_nghttp2_session_open_stream(void); void test_nghttp2_session_open_stream(void);
void test_nghttp2_session_open_stream_with_idle_stream_dep(void); void test_nghttp2_session_open_stream_with_idle_stream_dep(void);
void test_nghttp2_session_get_next_ob_item(void); void test_nghttp2_session_get_next_ob_item(void);