diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/http2.c | 10 | ||||
| -rw-r--r-- | lib/url.c | 4 | ||||
| -rw-r--r-- | lib/urldata.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/lib/http2.c b/lib/http2.c index 87d4a19ec..261e7f98d 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -52,7 +52,7 @@ */ void Curl_http2_init_state(struct UrlState *state) { - state->stream_prio = NGHTTP2_DEFAULT_WEIGHT; + state->stream_weight = NGHTTP2_DEFAULT_WEIGHT; } /* @@ -61,7 +61,7 @@ void Curl_http2_init_state(struct UrlState *state) */ void Curl_http2_init_userset(struct UserDefined *set) { - set->stream_prio = NGHTTP2_DEFAULT_WEIGHT; + set->stream_weight = NGHTTP2_DEFAULT_WEIGHT; } static int http2_perform_getsock(const struct connectdata *conn, @@ -1013,9 +1013,9 @@ static void h2_pri_spec(struct SessionHandle *data, struct HTTP *depstream = (data->set.stream_depends_on? data->set.stream_depends_on->req.protop:NULL); int32_t depstream_id = depstream? depstream->stream_id:0; - nghttp2_priority_spec_init(pri_spec, depstream_id, data->set.stream_prio, + nghttp2_priority_spec_init(pri_spec, depstream_id, data->set.stream_weight, data->set.stream_depends_e); - data->state.stream_prio = data->set.stream_prio; + data->state.stream_weight = data->set.stream_weight; data->state.stream_depends_e = data->set.stream_depends_e; data->state.stream_depends_on = data->set.stream_depends_on; } @@ -1029,7 +1029,7 @@ static int h2_session_send(struct SessionHandle *data, nghttp2_session *h2) { struct HTTP *stream = data->req.protop; - if((data->set.stream_prio != data->state.stream_prio) || + if((data->set.stream_weight != data->state.stream_weight) || (data->set.stream_depends_e != data->state.stream_depends_e) || (data->set.stream_depends_on != data->state.stream_depends_on) ) { /* send new weight and/or dependency */ @@ -2663,13 +2663,13 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, case CURLOPT_PIPEWAIT: data->set.pipewait = (0 != va_arg(param, long))?TRUE:FALSE; break; - case CURLOPT_STREAM_PRIORITY: + case CURLOPT_STREAM_WEIGHT: #ifndef USE_NGHTTP2 return CURLE_NOT_BUILT_IN; #else arg = va_arg(param, long); if((arg>=1) && (arg <= 256)) - data->set.stream_prio = (int)arg; + data->set.stream_weight = (int)arg; break; #endif case CURLOPT_STREAM_DEPENDS: diff --git a/lib/urldata.h b/lib/urldata.h index 7d6025cb5..6ddf15e37 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -1340,7 +1340,7 @@ struct UrlState { struct SessionHandle *stream_depends_on; bool stream_depends_e; /* set or don't set the Exclusive bit */ - int stream_prio; + int stream_weight; }; @@ -1660,7 +1660,7 @@ struct UserDefined { struct SessionHandle *stream_depends_on; bool stream_depends_e; /* set or don't set the Exclusive bit */ - int stream_prio; + int stream_weight; }; struct Names { |