Submitter | Yuya Nishihara |
---|---|
Date | July 8, 2018, 12:30 p.m. |
Message ID | <b263133eeb5a5db11706.1531053044@mimosa> |
Download | mbox | patch |
Permalink | /patch/32689/ |
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 2442F2C356; Sun, 8 Jul 2018 08:31:00 -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 VTVs5eoWkz8K; Sun, 8 Jul 2018 08:30:59 -0400 (EDT) Received: from mercurial-scm.org (localhost [IPv6:::1]) by mercurial-scm.org (Postfix) with ESMTP id E21B42C347; Sun, 8 Jul 2018 08:30:58 -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 4C4C12C349 for <mercurial-devel@mercurial-scm.org>; Sun, 8 Jul 2018 08:30:57 -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 bqeFB72i2h9W for <mercurial-devel@mercurial-scm.org>; Sun, 8 Jul 2018 08:30:56 -0400 (EDT) Received: from mail-pf0-x236.google.com (mail-pf0-x236.google.com [IPv6:2607:f8b0:400e:c00::236]) by mercurial-scm.org (Postfix) with ESMTPS id E02EF2C34E for <mercurial-devel@mercurial-scm.org>; Sun, 8 Jul 2018 08:30:54 -0400 (EDT) Received: by mail-pf0-x236.google.com with SMTP id l123-v6so11722075pfl.13 for <mercurial-devel@mercurial-scm.org>; Sun, 08 Jul 2018 05:30:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:mime-version:content-transfer-encoding:subject:message-id :in-reply-to:references:user-agent:date:from:to; bh=ri4Qu3uyVAt6kb49D++ybHHETymEThh0U/4YGfka4ek=; b=AlKRd68nUCNFpZY7nOL/br8dQt5xrhvpNQgnOx68eU/W8eoD1bdcg8dfp619oFIxPi LmBjth5F0kfZsjee9ngR6yVjycqZQlHkWEnPQAJwXwbZ70KzF3uThZ5gfb4ysrZtWdop Cf27M9fi27cohkTtrlGWoRUk6y+PKZHKe2hiQhlCkiquv9VO9WEcVFBFblSHr4ZI3GhP bd//s7KxcnfNIBrxGDpDQXzJPvNZ3/g9jpX5ghA3eidiTAXH8Ebs+A/wgtPFYfz3vYmE z+eKhbOdW+OPPlGyEUY3XFkbkWHHgIm8NYMmwnHe+ZJO7HytWue2O/p3xkAIrt3JhOeQ NjLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:mime-version:content-transfer-encoding :subject:message-id:in-reply-to:references:user-agent:date:from:to; bh=ri4Qu3uyVAt6kb49D++ybHHETymEThh0U/4YGfka4ek=; b=SFd2WOEZq0HWN62hGgkD8oYAm98/SgZFonuwovPgWuEQZUOII2/tC4Da05cts/HPDN RHtlh/urW8YxiuZ3IeqonD1kwhft0h0yg5ezPWdfM8E7ya1TwGLUfqU/UvEdVncbrjJW bQkfrIXqzhqrEFhsdhT7Kfudd9lYSP2pvaScg6IuP1F/mY4O9gp1l/6GqbHvl4vE2Tm/ o7AvnZtn1P6vUSM4Mc/+bjnvocRQZK9eAk2ibSJ13J8q54ViM129ZnFZB0drUlZXNlup 6998cKqeh97RH87UmDyTq3ALFzVSRYlQbQaHZMdbuBK7kyEiFBvcnubo31fjcwBYz+ij as8g== X-Gm-Message-State: APt69E3RuvVdolr4lnj4gTkrPgs4sjN0ReVjwY17w9eDOoI/yQP8/OnW RH7dBVpZSO1+zgLeJCnvQB5XbgoS X-Google-Smtp-Source: AAOMgpfzR53i5QThvEENAjZgr0I/KqsCyT3Xq8IHGKkcUDRXj+wDoVOH2/JHoNDhM2xLioENeq1biA== X-Received: by 2002:a63:5922:: with SMTP id n34-v6mr15522051pgb.113.1531053053729; Sun, 08 Jul 2018 05:30:53 -0700 (PDT) Received: from [127.0.1.1] (pdb6fbe2b.tkyea126.ap.so-net.ne.jp. [219.111.190.43]) by smtp.gmail.com with ESMTPSA id v66-v6sm24306906pfb.84.2018.07.08.05.30.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 05:30:52 -0700 (PDT) MIME-Version: 1.0 Subject: [PATCH 3 of 6] py3: convert server-string to unicode to make http library happy X-Mercurial-Node: b263133eeb5a5db11706fd146ea68ea7ce6ca632 X-Mercurial-Series-Index: 3 X-Mercurial-Series-Total: 6 Message-Id: <b263133eeb5a5db11706.1531053044@mimosa> X-Mercurial-Series-Id: <21be76e071488bd19482.1531053042@mimosa> In-Reply-To: <21be76e071488bd19482.1531053042@mimosa> References: <21be76e071488bd19482.1531053042@mimosa> User-Agent: Mercurial-patchbomb/4.6.2+669-88e6630dc8d0 Date: Sun, 08 Jul 2018 21:30:44 +0900 From: Yuya Nishihara <yuya@tcha.org> To: mercurial-devel@mercurial-scm.org 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
Yuya Nishihara - July 8, 2018, 12:30 p.m.
Patch
diff --git a/mercurial/hgweb/server.py b/mercurial/hgweb/server.py --- a/mercurial/hgweb/server.py +++ b/mercurial/hgweb/server.py @@ -246,7 +246,7 @@ class _httprequesthandler(httpservermod. def version_string(self): if self.server.serverheader: - return self.server.serverheader + return encoding.strfromlocal(self.server.serverheader) return httpservermod.basehttprequesthandler.version_string(self) class _httprequesthandlerssl(_httprequesthandler):