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

Rename nghttp2_session_request_allowed as nghttp2_session_check_request_allowed

This commit is contained in:
Tatsuhiro Tsujikawa 2015-10-30 22:48:27 +09:00
parent 6ff9c4d8f9
commit be0d0e2995
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Makefile.am
View File

@ -105,7 +105,7 @@ APIDOCS= \
nghttp2_session_mem_recv.rst \ nghttp2_session_mem_recv.rst \
nghttp2_session_mem_send.rst \ nghttp2_session_mem_send.rst \
nghttp2_session_recv.rst \ nghttp2_session_recv.rst \
nghttp2_session_request_allowed.rst \ nghttp2_session_check_request_allowed.rst \
nghttp2_session_resume_data.rst \ nghttp2_session_resume_data.rst \
nghttp2_session_send.rst \ nghttp2_session_send.rst \
nghttp2_session_server_new.rst \ nghttp2_session_server_new.rst \

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

@ -3494,7 +3494,8 @@ NGHTTP2_EXTERN int32_t
* may return error. Or, request is failed to sent, and * may return error. Or, request is failed to sent, and
* :type:`nghttp2_on_stream_close_callback` is called. * :type:`nghttp2_on_stream_close_callback` is called.
*/ */
NGHTTP2_EXTERN int nghttp2_session_request_allowed(nghttp2_session *session); NGHTTP2_EXTERN int
nghttp2_session_check_request_allowed(nghttp2_session *session);
/** /**
* @function * @function

2
lib/nghttp2_session.c
View File

@ -1322,7 +1322,7 @@ static int session_predicate_for_stream_send(nghttp2_session *session,
return 0; return 0;
} }
int nghttp2_session_request_allowed(nghttp2_session *session) { int nghttp2_session_check_request_allowed(nghttp2_session *session) {
return !session->server && session->next_stream_id <= INT32_MAX && return !session->server && session->next_stream_id <= INT32_MAX &&
(session->goaway_flags & (session->goaway_flags &
(NGHTTP2_GOAWAY_TERM_ON_SEND | NGHTTP2_GOAWAY_RECV)) == 0; (NGHTTP2_GOAWAY_TERM_ON_SEND | NGHTTP2_GOAWAY_RECV)) == 0;

2
src/h2load_http2_session.cc
View File

@ -210,7 +210,7 @@ void Http2Session::on_connect() {
} }
int Http2Session::submit_request(RequestStat *req_stat) { int Http2Session::submit_request(RequestStat *req_stat) {
if (nghttp2_session_request_allowed(session_) == 0) { if (nghttp2_session_check_request_allowed(session_) == 0) {
return -1; return -1;
} }