3535import java .util .Deque ;
3636import java .util .Iterator ;
3737import java .util .List ;
38- import java .util .Map ;
3938import java .util .Queue ;
40- import java .util .concurrent .ConcurrentHashMap ;
4139import java .util .concurrent .ConcurrentLinkedDeque ;
4240import java .util .concurrent .ConcurrentLinkedQueue ;
4341import java .util .concurrent .atomic .AtomicInteger ;
@@ -143,7 +141,6 @@ enum SettingsHandshake { READY, TRANSMITTED, ACKED }
143141 private EndpointDetails endpointDetails ;
144142 private boolean goAwayReceived ;
145143
146- private final Map <Integer , PriorityValue > priorities = new ConcurrentHashMap <>();
147144 private volatile boolean peerNoRfc7540Priorities ;
148145
149146
@@ -1061,6 +1058,9 @@ private void consumeFrame(final RawFrame frame) throws HttpException, IOExceptio
10611058 throw new H2ConnectionException (H2Error .FRAME_SIZE_ERROR , "Invalid PRIORITY_UPDATE payload" );
10621059 }
10631060 final int prioritizedId = payload .getInt () & 0x7fffffff ;
1061+ if (prioritizedId == 0 ) {
1062+ throw new H2ConnectionException (H2Error .PROTOCOL_ERROR , "PRIORITY_UPDATE stream id is 0" );
1063+ }
10641064 final int len = payload .remaining ();
10651065 final String field ;
10661066 if (len > 0 ) {
@@ -1070,9 +1070,11 @@ private void consumeFrame(final RawFrame frame) throws HttpException, IOExceptio
10701070 } else {
10711071 field = "" ;
10721072 }
1073- final PriorityValue pv = PriorityParamsParser .parse (field ).toValueWithDefaults ();
1074- priorities .put (prioritizedId , pv );
1075- requestSessionOutput ();
1073+ final PriorityValue pv = parsePriorityValue (field );
1074+ final H2Stream prioritizedStream = streams .lookupSeen (prioritizedId );
1075+ if (prioritizedStream != null ) {
1076+ prioritizedStream .setPriorityValue (pv );
1077+ }
10761078 }
10771079 break ;
10781080 }
@@ -1147,7 +1149,7 @@ private void consumeHeaderFrame(final RawFrame frame, final H2Stream stream) thr
11471149 if (streamListener != null ) {
11481150 streamListener .onHeaderInput (this , streamId , headers );
11491151 }
1150- recordPriorityFromHeaders (streamId , headers );
1152+ recordPriorityFromHeaders (stream , headers );
11511153 stream .consumeHeader (headers , frame .isFlagSet (FrameFlag .END_STREAM ));
11521154 } else {
11531155 continuation .copyPayload (payload );
@@ -1166,7 +1168,7 @@ private void consumeContinuationFrame(final RawFrame frame, final H2Stream strea
11661168 if (streamListener != null ) {
11671169 streamListener .onHeaderInput (this , streamId , headers );
11681170 }
1169- recordPriorityFromHeaders (streamId , headers );
1171+ recordPriorityFromHeaders (stream , headers );
11701172 if (continuation .type == FrameType .PUSH_PROMISE .getValue ()) {
11711173 stream .consumePromise (headers );
11721174 } else {
@@ -1419,19 +1421,27 @@ H2Stream createStream(final H2StreamChannel channel, final H2StreamHandler strea
14191421 return stream ;
14201422 }
14211423
1422- private void recordPriorityFromHeaders (final int streamId , final List <? extends Header > headers ) {
1424+ private void recordPriorityFromHeaders (final H2Stream stream , final List <? extends Header > headers ) {
14231425 if (headers == null || headers .isEmpty ()) {
14241426 return ;
14251427 }
14261428 for (final Header h : headers ) {
14271429 if (HttpHeaders .PRIORITY .equalsIgnoreCase (h .getName ())) {
1428- final PriorityValue pv = PriorityParamsParser . parse ( h . getValue ()). toValueWithDefaults ( );
1429- priorities . put ( streamId , pv );
1430+ final PriorityValue pv = parsePriorityValue ( h );
1431+ stream . setPriorityValue ( pv );
14301432 break ;
14311433 }
14321434 }
14331435 }
14341436
1437+ private PriorityValue parsePriorityValue (final Header header ) {
1438+ return PriorityParamsParser .parse (header ).toValueWithDefaults ();
1439+ }
1440+
1441+ private PriorityValue parsePriorityValue (final String field ) {
1442+ return PriorityParamsParser .parse (field ).toValueWithDefaults ();
1443+ }
1444+
14351445 class H2StreamChannelImpl implements H2StreamChannel {
14361446
14371447 private final int id ;
@@ -1479,18 +1489,21 @@ public void submit(final List<Header> headers, final boolean endStream) throws I
14791489 return ;
14801490 }
14811491 ensureNotClosed ();
1482- if (peerNoRfc7540Priorities && streams . isSameSide ( id ) ) {
1492+ if (peerNoRfc7540Priorities ) {
14831493 for (final Header h : headers ) {
14841494 if (HttpHeaders .PRIORITY .equalsIgnoreCase (h .getName ())) {
14851495 final byte [] ascii = h .getValue () != null
14861496 ? h .getValue ().getBytes (StandardCharsets .US_ASCII )
14871497 : new byte [0 ];
1498+
1499+ final int sid = id & 0x7fffffff ;
14881500 final ByteArrayBuffer b = new ByteArrayBuffer (4 + ascii .length );
1489- b .append ((byte ) (id >> 24 ));
1490- b .append ((byte ) (id >> 16 ));
1491- b .append ((byte ) (id >> 8 ));
1492- b .append ((byte ) id );
1501+ b .append ((byte ) (sid >> 24 ));
1502+ b .append ((byte ) (sid >> 16 ));
1503+ b .append ((byte ) (sid >> 8 ));
1504+ b .append ((byte ) sid );
14931505 b .append (ascii , 0 , ascii .length );
1506+
14941507 final ByteBuffer pl = ByteBuffer .wrap (b .array (), 0 , b .length ());
14951508 final RawFrame priUpd = new RawFrame (FrameType .PRIORITY_UPDATE .getValue (), 0 , 0 , pl );
14961509 commitFrameInternal (priUpd );
0 commit comments