Submitter | Gábor Stefanik |
---|---|
Date | Aug. 21, 2017, 4:06 p.m. |
Message ID | <e2b082707b44c5d9f630.1503331581@GSTEFANIK.NavnGo.local> |
Download | mbox | patch |
Permalink | /patch/23182/ |
State | Accepted |
Headers | show
Return-Path: <mercurial-devel-bounces@mercurial-scm.org> X-Original-To: patchwork@mercurial-scm.org Delivered-To: patchwork@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 2CD742C212; Mon, 21 Aug 2017 12:06:31 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id gIAMTUpBdc3Q; Mon, 21 Aug 2017 12:06:30 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id F1E522C215; Mon, 21 Aug 2017 12:06:28 -0400 (EDT) X-Original-To: mercurial-devel@mercurial-scm.org Delivered-To: mercurial-devel@mercurial-scm.org Received: from localhost (localhost [127.0.0.1]) by mercurial-scm.org (Postfix) with ESMTP id 4CBD62C1B8 for <mercurial-devel@mercurial-scm.org>; Mon, 21 Aug 2017 12:06:27 -0400 (EDT) X-Virus-Scanned: Debian amavisd-new at mercurial-scm.org Received: from mercurial-scm.org ([127.0.0.1]) by localhost (mercurial-scm.org [127.0.0.1]) (amavisd-new, port 10024) with LMTP id foTYF42EO1tC for <mercurial-devel@mercurial-scm.org>; Mon, 21 Aug 2017 12:06:26 -0400 (EDT) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0086.outbound.protection.outlook.com [104.47.2.86]) by mercurial-scm.org (Postfix) with ESMTPS id 603D22C1CA for <mercurial-devel@mercurial-scm.org>; Mon, 21 Aug 2017 12:06:26 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NNGCloud.onmicrosoft.com; s=selector1-nng-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=xuStGR+K11pZ9gddAAN1vPrY2YRbgyp7lGLhUJr8xss=; b=hkHd5g1KjEwouxLj6IZ+XDoimKGpt8w/wsyRJ7CTmwUsT0MIBo5MVkFJBbnUS8BLPF/6nU5Y6ZamsGtKsFSHBZJxSxo323wE4jEqDopM/YQmVrVDCg/xra022gfKCc+KXHMlDQnXmiYFuVnBRNmzPBxvYQFfHe203jdj0oFeM0g= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Gabor.STEFANIK@nng.com; Received: from GSTEFANIK.NavnGo.local (91.82.219.229) by VI1PR0701MB1821.eurprd07.prod.outlook.com (2603:10a6:800:38::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1385.4; Mon, 21 Aug 2017 16:06:22 +0000 MIME-Version: 1.0 Subject: [PATCH 2 of 4] client: kill the server on unrecoverable communication errors (issue5516) X-Mercurial-Node: e2b082707b44c5d9f630bf0ca722723bad8cefb1 X-Mercurial-Series-Index: 2 X-Mercurial-Series-Total: 4 Message-Id: <e2b082707b44c5d9f630.1503331581@GSTEFANIK.NavnGo.local> X-Mercurial-Series-Id: <242d719e85ce451e61ab.1503331580@GSTEFANIK.NavnGo.local> In-Reply-To: <242d719e85ce451e61ab.1503331580@GSTEFANIK.NavnGo.local> References: <242d719e85ce451e61ab.1503331580@GSTEFANIK.NavnGo.local> User-Agent: Mercurial-patchbomb/4.1.1 Date: Mon, 21 Aug 2017 18:06:21 +0200 From: =?iso-8859-1?q?G=E1bor_Stefanik?= <gabor.stefanik@nng.com> To: mercurial-devel@mercurial-scm.org X-ClientProxiedBy: VI1P18901CA0005.EURP189.PROD.OUTLOOK.COM (2603:10a6:801::15) To VI1PR0701MB1821.eurprd07.prod.outlook.com (2603:10a6:800:38::27) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 014df06e-8647-490a-4008-08d4e8ae915b X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:VI1PR0701MB1821; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB1821; 3:OtBrhCjSI0a/gLOZ9qQiL/+hI7qPIHe0vokKH+5hPi9RYI+Whi8FZ1EYwHt3j7KGW+cRnXwYJg/2ZddHBF1852DseYtcIyK7IX8ZEEUNS2m8LCB1nd5FcbImLkzp7MugZlZwt05BFH0tT/vl2wbRnx6bykkQ2rGHAyVDroaT2aeJPMbzNe/foaA+8dEhmsgg+Hlu0bX/iPK1Krc7J83ma4OejQPlowb7zccCpQqWxNccrl9FlgDYvckUdJI7xWjX; 25:69aM4mjClxdsURIgnVG/vpS4l3isqveLbWj3JAqbwzABEw2XrO/1znEkDRe1sTTlOM9+3cZx2Cl/tvXfdpOY54gzejdqoQBDEVNF+HRs24XJ0aErqOcMXV8pOqVsBFIAosIUE01CvmgL7zHaEcLu6NyPpmt8ijDw1Kk7tL9xrwU1PzWjtaljkScV1G2vp8w1ed4iqpsDSocJ60DcEacC9c5tyrpWSpUlOvBGBEDO9TF+mv/jYAaQT7bACHaF1tUoRn9FiV20fWxqnegj9qCWnAXYLmav803y6uoo7y/BR06xV0aWga4lpq+JzbFIiTxgbzsdd/MPIiElOUfR+Smspw==; 31:VeOEI+Gj1RYQAFxHPD6tkL7vXMGAqnIw5pVGpYtVclwE4Ri+6C/s9LK1edxJ+V9O4SB74Tpq0zSJ4gTeNqZxvRiQl67qmyjAyWNAKuKbVe0/xQQtOQVO/ZUNm4u+Wbtw+2XeS41AR/zlLAOKHKVA10FVtaJwBSl5ONbpXYVMe0WWfQfrDX21USyX49+l6tXe37QpqT65zsKV5exnyT+OZxEs0DsYX4Z4bGlg6LB3uVs= X-MS-TrafficTypeDiagnostic: VI1PR0701MB1821: X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB1821; 20:jOhCLqVNikL2L731yjxkX7V+/ZsVhZUNMIY6HHdmBlNiiky9TI6xwOBT0z9qU/Ks9X3hQZyVVI9fpLvSOkSQZjGnUX6hCAWquaM7zaZkqeHAWI9uuR4MMQZJ3ZzS4Ar+rq0k/Oy8Al5yFw1d6/vgazrVmVeEzgu28j0xr8xf29bYVH3N2ssa7hvGJbVGcKP421vGv1KU9BrT/2WJYupcvj32kXP0tw4gO+8bZovyfAeE05NfExF3EzC9HrDkaqM/nqwmFJOB3BHeW/+yCumsQ1q20ZD40bQfVxpIIKbsAAQBLWpBCjhIoVPUPBjiXKBezfe0+8kyiDA/rE5sbDdqBeqlKulGSnHx0iVmOudXoBjptoPW1PcaiAlThFfwkEwMpoY/vRSERXISoN/QClrq2ffCWeilql0/eHDJuSZWX9yxlHnlGj70UBwBc6VNuSc1HaeWTEaH6y9MdhyLwPbO4Fa0MxxhgSZghCmt9QSrBIm4XBExkw8Hrnn4sgtgOmkm; 4:4nBnPYSyuJGERLObKIE8JLvrFmyi8zg6TaSdIIFPsaDA4dolDj35UwO4WjjWxKeb8sL9ZlOge+PA0ECSJFHQIn/3pOPTZV0rxD2CYyZIOJ248gqLFkYA196wz/QhGajlYAHm391vbXJmpJr6Q/9KrILUv8zeePv3wmZ3ChzxauDlGniy+UWl6/QAhNyJQGLotMhlly2orWdo2CWqQpF/jCKW8xR1NUW6Vth+tQKkrsY68t4x7d8IvySZOhS+pw8up3RTrGNYnnRPOGSzLnsjWF5K9XJ6TyBM5M+Packh5Lc= X-Exchange-Antispam-Report-Test: UriScan:(158342451672863); X-Microsoft-Antispam-PRVS: <VI1PR0701MB182131FF2E81FEB10B16317B8C870@VI1PR0701MB1821.eurprd07.prod.outlook.com> X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(6041248)(20161123562025)(20161123555025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:VI1PR0701MB1821; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:VI1PR0701MB1821; X-Forefront-PRVS: 040655413E X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(7370300001)(4630300001)(6009001)(189002)(199003)(83506001)(33646002)(5660300001)(575784001)(105586002)(25786009)(86362001)(189998001)(76176999)(478600001)(106356001)(97736004)(966005)(50986999)(8676002)(50466002)(54356999)(42186005)(4001350100001)(2351001)(72206003)(2906002)(5890100001)(2361001)(6506006)(6306002)(6916009)(2950100002)(101416001)(9686003)(7350300001)(98436002)(305945005)(68736007)(47776003)(81166006)(81156014)(55016002)(53936002)(110136004); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR0701MB1821; H:GSTEFANIK.NavnGo.local; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: nng.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?windows-1250?Q?1; VI1PR0701MB1821; 23:7zF2eSPQpFVA4M9Sa+XAMbMekIs2xWsOiYQ?= =?windows-1250?Q?j0uMFqAjaHT0bqc0BxOWIbXKvxHc1I7JbQCqSv+KSl63NQCpsH83cBSb?= =?windows-1250?Q?Nxtvt89FYdAC6xXLWLFlmGo1E/R3sq7sKVC5f0qCSCI0+MRtMU0HLTJb?= =?windows-1250?Q?hObTyCW9bUY/wVQAgpWG4kyxm98Nbwk8YUjNKcoA38bNnwnznPNLVdXS?= =?windows-1250?Q?12TDKIuvn0wXT+JbPv71cqNq5sOc0BwdbM5Ruz2r5cDJjCjuJG7bjjCg?= =?windows-1250?Q?n8LNrG7G3TrMleWsU/Tqu9xIJh5QEUwjEHeqpekerPnovwezFGED/AU8?= =?windows-1250?Q?e/1YX7rSmAusf5tr/r2eFwrX+vTkZHOOaWj0kJKg/kO4JZUKcZKw4Mlg?= =?windows-1250?Q?jEqOLXAuz26rM4qD/pHKey/B+PasK+XicpLpAfdjLaO2YARHFmy3fLCr?= =?windows-1250?Q?0+xJC7FEUi0CYpvUKRJvr48wesxRJYxBGlFBQKuWwZlSbXCOpr0946sI?= =?windows-1250?Q?cTXQ6IACU3liPxJXNqiixDuZKcq+ai3TjeXTrxMqa+/3Q9FQEZSBrlP6?= =?windows-1250?Q?EbOPXDMoTKxP4qk92il7TcjoLgSrPjLVEBjwxtRVzrlApnyDrnTbsBGA?= =?windows-1250?Q?U5ZvgPeLcXElLXbobGWFbwWGAQdLQVBtc160mIgpmgoqjXUj/pOcxr/D?= =?windows-1250?Q?G91OvtBpYLy+Qev+bDtSZARt0OTUv4sr06nyXZlEJs9f/+JV0qrmOHvl?= =?windows-1250?Q?UpGiRlxKbbf2EuunGST12gBmPqYBvlhdG1uKtISs5J17DS9ihI93w4Qr?= =?windows-1250?Q?9/mx+U1bgFOZ2Gf60KkSDVO7AKGbkL4bXNRXpcFMmn0exqZY1U7LFccG?= =?windows-1250?Q?4G51Bq/aBMydNf+WQYq2a4odDCvkfTIbGeYx6Kub4EaZGOikIq7eaQZ4?= =?windows-1250?Q?981b5rWhu7hlA3tfeHtr2Jvv+mW0z/lK8CpiEC4LMs4dh2qoCXgvGr2q?= =?windows-1250?Q?dwx5CxUJjX04RqEJOMUfY1CwdOU1S3dl94dvjn0TINhi94nn29tYHgN2?= =?windows-1250?Q?ljiCOczbrgaS5MB4cw7Th2IjFvDDdI7rIR4v+aiXG6ePMW+O0jz2LL8z?= =?windows-1250?Q?aeUXJrRcArkb0ME+zB+XKx5mrMdoEjNLN8DZRJ8NKRqpPpYA+c29vArC?= =?windows-1250?Q?HKFx9Ln20+93DkCg33J19d0sZKVRFWk8=3D?= X-Microsoft-Exchange-Diagnostics: 1; VI1PR0701MB1821; 6:buhWU7EAS2fbOk36XWAAajXePw6OjvTREX4F9yQ33EUaEvaXVvtvAWijlyEY/wLYOdy3Y9RgYHhGXR7DPccRDcMgp4jCXNl6SV+AOquONdHFgXg4RwweEiVtCthN1bUc7GzaoA1/iAkocJhL7NSBsl9DLLaaeuj14ZqQ/+UcN0PeZhlNdXNQ8U3D4nnz/vMnbRzlBqTWlJDut6HILPWjLr1NWF2eveCpyxuCj8wsEeAeQOnW5S0/yN35hjhcEcmPTnOK2blO1QpetPLx5X+lSDkJ2qEhO4caAaBol6Gp/+CAwF6ocS5lriGUf1ZJ6DYeKTvNgcL849N8kAk2uQAPQA==; 5:F0MAdDoFuRmdpjQBE4QWmgl+cfpRTVSiKtqhP7xUhCok6jA+5usPCH1EfqSFI5qAGGGBkuU6Ytm1qYZVWTEssO/IeOqKzCl8KWOVqQW50FZS/CBVk2xUgIG8J9bffuwf+yE8Ht6EMCZPrXE4ivGUiQ==; 24:q65Ttbo+C16c7dKyGAgODXCDqvzGIL36nbrvArAlDGfitC0OfXgjmnYczQliK2uutEB5nfcnzulpr3Iq9eg0QPBG8/5kegpyLOEa5yFqVgA=; 7:BD+fFDZNxFvOSmWbrYuD00LWkPkhDhFu+kyuM/LXccE/l+wsLJA2cDAa0DxNKA5NuFwOs1bbgp0lnKaponj4i5P/XhRxak+QulCO1Xf9kjv/7KCH9hwC+myTtP5qRoAI3PGX2FMO5j02BM+xb7AIuqEUpHPBD+D94/3VM6knbUonL5PVMMALMiN2f/1GbkT6MrJ/C8cSnLWwKg/m971aAzwH9W6W/jxt1e04BpW0/kY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: nng.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Aug 2017 16:06:22.6400 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0701MB1821 X-BeenThere: mercurial-devel@mercurial-scm.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <mercurial-devel.mercurial-scm.org> List-Unsubscribe: <https://www.mercurial-scm.org/mailman/options/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=unsubscribe> List-Archive: <http://www.mercurial-scm.org/pipermail/mercurial-devel/> List-Post: <mailto:mercurial-devel@mercurial-scm.org> List-Help: <mailto:mercurial-devel-request@mercurial-scm.org?subject=help> List-Subscribe: <https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel>, <mailto:mercurial-devel-request@mercurial-scm.org?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org> |
Comments
Gábor Stefanik - Aug. 21, 2017, 4:06 p.m.
Patch
diff -r 242d719e85ce -r e2b082707b44 hglib/client.py --- a/hglib/client.py Mon Aug 21 16:39:17 2017 +0200 +++ b/hglib/client.py Mon Aug 21 17:02:14 2017 +0200 @@ -139,6 +139,7 @@ def _readchannel(self): data = self.server.stdout.read(hgclient.outputfmtsize) if not data: + self.close() raise error.ServerError() channel, length = struct.unpack(hgclient.outputfmt, data) if channel in b('IL'): @@ -190,6 +191,7 @@ return struct.unpack(hgclient.retfmt, data)[0] # a channel that we don't know and can't ignore elif channel.isupper(): + self.close() raise error.ResponseError( "unexpected data on required channel '%s'" % channel) # optional channel