From dev-return-189482-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org Wed Mar 7 15:44:26 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id BD4E8180656 for ; Wed, 7 Mar 2018 15:44:25 +0100 (CET) Received: (qmail 19174 invoked by uid 500); 7 Mar 2018 14:44:19 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 19162 invoked by uid 99); 7 Mar 2018 14:44:19 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 07 Mar 2018 14:44:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 39DA9C69F1 for ; Wed, 7 Mar 2018 14:44:19 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.698 X-Spam-Level: X-Spam-Status: No, score=0.698 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id H0yX1quKQ_bz for ; Wed, 7 Mar 2018 14:44:18 +0000 (UTC) Received: from mail-io0-f172.google.com (mail-io0-f172.google.com [209.85.223.172]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id BE3B05F2C4 for ; Wed, 7 Mar 2018 14:44:17 +0000 (UTC) Received: by mail-io0-f172.google.com with SMTP id p78so3254263iod.13 for ; Wed, 07 Mar 2018 06:44:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=3KznNbgg2UIv70p4vchp/FdAZyPKbj74i4Rls/l8RE0=; b=lR4W8h9P1IHTD6FHWnrcgqs2rnrckraRG/HUT/Q1jrSapacWjrvwP6nL4LQ4Ers6OR eFor6uLDsHp67wpANnv8v3OI0B0AXuDj8hswP1/HN/lmrp26X03jOxxyTx0kMo/dQfty x1U+VINDDWqqTjPPu5WJO2Mtqb2HOGhkJYYOzk/OCkvelBn2YSNLXLAll8QwrMvQIAka Y7oprpvxDaA85Y0UuKaPNvKQjhBdABz2KOXLb/ETEP2589CWkh+KATXn9gbafw/IwrlA rGOQmeld/6xz7E/tcdCEh91vbpCFq5sHPn5JDkkvQbPiqipTuHDKzkaoRwJNmgHuaq86 4lAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=3KznNbgg2UIv70p4vchp/FdAZyPKbj74i4Rls/l8RE0=; b=N0WO2XgLc10KZpkYCf/HkxmVwlFjietl6nyto1I0gzSUnqQUHb+EQhxeAOeqVWx1Aj hu5gofZrcSYkm9bp4c7UX95BY2yIAd0732++eRNKieWQKMHyxwFW9QuMEuzihWYnvene Nvn8d+egOfsg9H5rwGyo+DQDv3L2Ybegv+UsWbHr65kVk6mZwdowedhGp7LutlnAP6sV nEYXlf0aVRrhQgWLWdvvSx+9ggfV8BLxKfbapac0goW/K03tRs5sOZ6RPW278mQ5FUL6 GOMZHqD7fwOS+B7z+4wkubC3z64EHVaiwk9WxUQip9oS91Pv4g+UCOCUZVKQ1q+kE4i0 UU6A== X-Gm-Message-State: AElRT7HaOSW+TYLaJ3G2aW5pTAZMqYf2ZDkRc00FnCMiEiwq+4ADF6kw Zq/cs3GVSxMFQztxIefhakTh/uJvdDzIjrNdXT/re+1Z X-Google-Smtp-Source: AG47ELszJFUuLX8g9HTuNSl0F0+lZ48nLeVvjY4FZOAapwbbXDAnGusHfA4zXzK1qlOdN0EaMmX4e/iFPRE8hu1fjxU= X-Received: by 10.107.148.142 with SMTP id w136mr26823890iod.65.1520433856620; Wed, 07 Mar 2018 06:44:16 -0800 (PST) MIME-Version: 1.0 Received: by 10.79.205.14 with HTTP; Wed, 7 Mar 2018 06:44:16 -0800 (PST) In-Reply-To: <20180307143753.299773A00AF@svn01-us-west.apache.org> References: <20180307143753.299773A00AF@svn01-us-west.apache.org> From: Konstantin Kolinko Date: Wed, 7 Mar 2018 17:44:16 +0300 Message-ID: Subject: Re: svn commit: r1826111 - in /tomcat/trunk: conf/logging.properties java/org/apache/coyote/http2/Http2UpgradeHandler.java webapps/docs/changelog.xml To: Tomcat Developers List Content-Type: text/plain; charset="UTF-8" 2018-03-07 17:37 GMT+03:00 : > Author: markt > Date: Wed Mar 7 14:37:52 2018 > New Revision: 1826111 > > URL: http://svn.apache.org/viewvc?rev=1826111&view=rev > Log: > Address intermittent test failure (hopefully) in TestHttp2Section_6_8. > > Modified: > tomcat/trunk/conf/logging.properties > tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java > tomcat/trunk/webapps/docs/changelog.xml > > Modified: tomcat/trunk/conf/logging.properties > URL: http://svn.apache.org/viewvc/tomcat/trunk/conf/logging.properties?rev=1826111&r1=1826110&r2=1826111&view=diff > ============================================================================== > --- tomcat/trunk/conf/logging.properties (original) > +++ tomcat/trunk/conf/logging.properties Wed Mar 7 14:37:52 2018 > @@ -68,7 +68,7 @@ org.apache.catalina.core.ContainerBase.[ > #org.apache.jasper.compiler.TldLocationsCache.level = FINE > > # To see debug messages for HTTP/2 handling, uncomment the following line: > -#org.apache.coyote.http2.level = FINE > +org.apache.coyote.http2.level = FINE > > # To see debug messages for WebSocket handling, uncomment the following line: > #org.apache.tomcat.websocket.level = FINE I am sure that you did not want to commit the above. > Modified: tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java?rev=1826111&r1=1826110&r2=1826111&view=diff > ============================================================================== > --- tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java (original) > +++ tomcat/trunk/java/org/apache/coyote/http2/Http2UpgradeHandler.java Wed Mar 7 14:37:52 2018 > @@ -1299,11 +1299,13 @@ class Http2UpgradeHandler extends Abstra > > @Override > public void headersEnd(int streamId) throws ConnectionException { > - setMaxProcessedStream(streamId); > Stream stream = getStream(streamId, connectionState.get().isNewStreamAllowed()); > - if (stream != null && stream.isActive()) { > - if (stream.receivedEndOfHeaders()) { > - processStreamOnContainerThread(stream); > + if (stream != null) { > + setMaxProcessedStream(streamId); > + if (stream.isActive()) { > + if (stream.receivedEndOfHeaders()) { > + processStreamOnContainerThread(stream); > + } > } > } > } > > Modified: tomcat/trunk/webapps/docs/changelog.xml > URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1826111&r1=1826110&r2=1826111&view=diff > ============================================================================== > --- tomcat/trunk/webapps/docs/changelog.xml (original) > +++ tomcat/trunk/webapps/docs/changelog.xml Wed Mar 7 14:37:52 2018 > @@ -59,6 +59,10 @@ > > Avoid potential loop in APR/Native poller. (markt) > > + > + Ensure streams that are received but not processed are excluded from the > + tracking of maximum ID of processed streams. (markt) I hope that you understand better, but from a quick look (not knowing the details) it looks like the opposite of the above description, the streams are "included" into tracking -- a call to setMaxProcessedStream(streamId); was added. > + > > Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org