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

Allow client side to send PUSH_PROMISE

This commit is contained in:
Tatsuhiro Tsujikawa 2014-01-09 21:39:29 +09:00
parent b4058d150a
commit fe1a39ed10
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/nghttp2_session.c
View File

@ -523,8 +523,10 @@ int nghttp2_session_add_frame(nghttp2_session *session,
} }
if(frame->hd.type == NGHTTP2_HEADERS && if(frame->hd.type == NGHTTP2_HEADERS &&
(frame->hd.stream_id == -1 || (frame->hd.stream_id == -1 ||
(stream && stream->state == NGHTTP2_STREAM_RESERVED && (stream && stream->state == NGHTTP2_STREAM_RESERVED))) {
session->server))) { /* We push request HEADERS and push response HEADERS to
dedicated queue because their transmission is affected by
SETTINGS_MAX_CONCURRENT_STREAMS */
/* TODO If 2 HEADERS are submitted for reserved stream, then /* TODO If 2 HEADERS are submitted for reserved stream, then
both of them are queued into ob_ss_pq, which is not both of them are queued into ob_ss_pq, which is not
desirable. */ desirable. */
@ -791,7 +793,7 @@ static int nghttp2_session_predicate_response_headers_send
* NGHTTP2_ERR_STREAM_SHUT_WR * NGHTTP2_ERR_STREAM_SHUT_WR
* The stream is half-closed for transmission. * The stream is half-closed for transmission.
* NGHTTP2_ERR_PROTO * NGHTTP2_ERR_PROTO
* The session is client-side and/or stream is not reserved state * The stream is not reserved state
* NGHTTP2_ERR_STREAM_CLOSED * NGHTTP2_ERR_STREAM_CLOSED
* RST_STREAM was queued for this stream. * RST_STREAM was queued for this stream.
*/ */
@ -805,8 +807,7 @@ static int nghttp2_session_predicate_push_response_headers_send
if(r != 0) { if(r != 0) {
return r; return r;
} }
if(!session->server || stream->state != NGHTTP2_STREAM_RESERVED) { if(stream->state != NGHTTP2_STREAM_RESERVED) {
/* Only server can send HEADERS for reserved streams */
return NGHTTP2_ERR_PROTO; return NGHTTP2_ERR_PROTO;
} }
if(stream->state == NGHTTP2_STREAM_CLOSING) { if(stream->state == NGHTTP2_STREAM_CLOSING) {
@ -917,9 +918,8 @@ static int nghttp2_session_predicate_push_promise_send
{ {
int rv; int rv;
nghttp2_stream *stream; nghttp2_stream *stream;
if(!session->server || nghttp2_session_is_my_stream_id(session, stream_id)) { if(nghttp2_session_is_my_stream_id(session, stream_id)) {
/* Only server is allowed to push. And associated stream must be /* The associated stream must be initiated by the remote peer */
created from client side */
return NGHTTP2_ERR_PROTO; return NGHTTP2_ERR_PROTO;
} }
stream = nghttp2_session_get_stream(session, stream_id); stream = nghttp2_session_get_stream(session, stream_id);
@ -1995,7 +1995,7 @@ int nghttp2_session_on_push_response_headers_received(nghttp2_session *session,
nghttp2_stream *stream) nghttp2_stream *stream)
{ {
int rv = 0; int rv = 0;
assert(!session->server && stream->state == NGHTTP2_STREAM_RESERVED); assert(stream->state == NGHTTP2_STREAM_RESERVED);
if(frame->hd.stream_id == 0) { if(frame->hd.stream_id == 0) {
return nghttp2_session_handle_invalid_connection(session, frame, return nghttp2_session_handle_invalid_connection(session, frame,
NGHTTP2_PROTOCOL_ERROR); NGHTTP2_PROTOCOL_ERROR);
@ -2543,7 +2543,7 @@ int nghttp2_session_on_push_promise_received(nghttp2_session *session,
{ {
nghttp2_stream *stream; nghttp2_stream *stream;
nghttp2_stream *promised_stream; nghttp2_stream *promised_stream;
if(session->server || frame->hd.stream_id == 0) { if(frame->hd.stream_id == 0) {
return nghttp2_session_handle_invalid_connection(session, frame, return nghttp2_session_handle_invalid_connection(session, frame,
NGHTTP2_PROTOCOL_ERROR); NGHTTP2_PROTOCOL_ERROR);
} }
@ -2810,8 +2810,7 @@ static int nghttp2_session_process_ctrl_frame(nghttp2_session *session)
frame->headers.cat = NGHTTP2_HCAT_HEADERS; frame->headers.cat = NGHTTP2_HCAT_HEADERS;
r = nghttp2_session_on_headers_received(session, frame, stream); r = nghttp2_session_on_headers_received(session, frame, stream);
} }
} else if(!session->server && } else if(stream->state == NGHTTP2_STREAM_RESERVED) {
stream->state == NGHTTP2_STREAM_RESERVED) {
frame->headers.cat = NGHTTP2_HCAT_PUSH_RESPONSE; frame->headers.cat = NGHTTP2_HCAT_PUSH_RESPONSE;
r = nghttp2_session_on_push_response_headers_received r = nghttp2_session_on_push_response_headers_received
(session, frame, stream); (session, frame, stream);