Return-Path: <dev-return-173570-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id BF8F02009D9
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Tue,  3 May 2016 00:10:24 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id BC8E21609B0; Tue,  3 May 2016 00:10:24 +0200 (CEST)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 106181602C5
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  3 May 2016 00:10:23 +0200 (CEST)
Received: (qmail 7935 invoked by uid 500); 2 May 2016 22:10:23 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 7920 invoked by uid 99); 2 May 2016 22:10:23 -0000
Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2016 22:10:23 +0000
Received: from localhost (localhost [127.0.0.1])
	by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id B5C381A0134
	for <dev@tomcat.apache.org>; Mon,  2 May 2016 22:10:22 +0000 (UTC)
X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org
X-Spam-Flag: NO
X-Spam-Score: 0.999
X-Spam-Level: 
X-Spam-Status: No, score=0.999 tagged_above=-999 required=6.31
	tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001]
	autolearn=disabled
Received: from mx1-lw-us.apache.org ([10.40.0.8])
	by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024)
	with ESMTP id HMUa0m2ibb-1 for <dev@tomcat.apache.org>;
	Mon,  2 May 2016 22:10:22 +0000 (UTC)
Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139])
	by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTP id CE1AF5FACB
	for <dev@tomcat.apache.org>; Mon,  2 May 2016 22:10:21 +0000 (UTC)
Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6])
	by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 0CED4E0057
	for <dev@tomcat.apache.org>; Mon,  2 May 2016 22:10:19 +0000 (UTC)
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 6FE103A0056
	for <dev@tomcat.apache.org>; Mon,  2 May 2016 22:10:19 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1742042 -
 /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Date: Mon, 02 May 2016 22:10:18 -0000
To: dev@tomcat.apache.org
From: remm@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20160502221019.6FE103A0056@svn01-us-west.apache.org>
archived-at: Mon, 02 May 2016 22:10:24 -0000

Author: remm
Date: Mon May  2 22:10:18 2016
New Revision: 1742042

URL: http://svn.apache.org/viewvc?rev=1742042&view=rev
Log:
Fail connection if no HTTP/2 protocol is available (same as ALPN).

Modified:
    tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1742042&r1=1742041&r2=1742042&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon May  2 22:10:18 2016
@@ -801,6 +801,13 @@ public abstract class AbstractProtocol<S
                                 wrapper.unRead(leftOverInput);
                                 // Associate with the processor with the connection
                                 connections.put(socket, processor);
+                            } else {
+                                if (getLog().isDebugEnabled()) {
+                                    getLog().debug(sm.getString(
+                                        "abstractConnectionHandler.negotiatedProcessor.fail",
+                                        "h2c"));
+                                }
+                                return SocketState.CLOSED;
                             }
                         } else {
                             HttpUpgradeHandler httpUpgradeHandler = upgradeToken.getHttpUpgradeHandler();



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org