From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Satoshi Nakagawa Newsgroups: gmane.emacs.bugs Subject: bug#42422: fix: url-https-proxy-connect - CONNECT with Proxy-Authorization header Date: Sun, 19 Jul 2020 10:10:33 +0900 Message-ID: Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.1\)) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18384"; mail-complaints-to="usenet@ciao.gmane.io" To: 42422@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jul 19 03:45:11 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jwyO7-0004cF-52 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 19 Jul 2020 03:45:11 +0200 Original-Received: from localhost ([::1]:54924 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jwyO5-0005JN-EZ for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 18 Jul 2020 21:45:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:38442) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwyNy-0005JE-Ly for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2020 21:45:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48119) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jwyNy-0002aW-By for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2020 21:45:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jwyNy-0003af-8V for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2020 21:45:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Satoshi Nakagawa Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 19 Jul 2020 01:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42422 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.159512304913713 (code B ref -1); Sun, 19 Jul 2020 01:45:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 19 Jul 2020 01:44:09 +0000 Original-Received: from localhost ([127.0.0.1]:59665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jwyN5-0003Z4-DA for submit@debbugs.gnu.org; Sat, 18 Jul 2020 21:44:09 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:33360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jwxqi-0000Vl-JA for submit@debbugs.gnu.org; Sat, 18 Jul 2020 21:10:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:48742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jwxqi-0007Sh-CP for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2020 21:10:40 -0400 Original-Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:42486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jwxqg-000274-RC for bug-gnu-emacs@gnu.org; Sat, 18 Jul 2020 21:10:40 -0400 Original-Received: by mail-pg1-x544.google.com with SMTP id m22so8553696pgv.9 for ; Sat, 18 Jul 2020 18:10:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:content-transfer-encoding:mime-version:subject:message-id:date :to; bh=oNL43guN10udaEd0u9T0vx3mAg5tdNHIRDW+OgQmRBM=; b=Rfx9CELCNxvFqB1brnZ0ALqG2w9AATIlMPnFqlvPPDFRzZEup3YFoHX+eKQemtPsyY iwWI9nuA2tJF7vqqiCDgrJ7llhuki9i9KzlvH3sK41NNKQMOznRaGIC+kG6SfWhm1rTV nqgl+nxrGLS0M6FuQO+6tExjQNz0Hbq5AWLJmtzkqRNWqblWQC2yDnFzPMY0/8PG7pcv HLUq6Ts1ic44XdcHOOvgPpxBCQ0jBbwMKGcTPQpagBclGhTWdhvisofP4mzMIqw/0waw wWwvjME0QLDcAVmL82I2lZs/54rHz1iffh4YgX92kDbucPOyeOkQ8kky0jXupX6uWU1M XMAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:to; bh=oNL43guN10udaEd0u9T0vx3mAg5tdNHIRDW+OgQmRBM=; b=cbnxfi4SpOENRtYuZXWSfhcBgv161nvvqChGogXsKm/lCQ9O895PYWsm/0/JLUeQRH b2t6/0ncxtn4RGbRv3kETZXcD7paTHkXaiS3MMr2Y1UXKFVK9gFJbOWTO/cGsdccSiP7 g9jDf0zTDUDHYBbQAJHnRgQOOidZWufKB/WgAYgnFZ9aNugugMRkDxnOELzNLnijRWVE INKgyqQ2wLNCx78cQJylvix0c9JBYI7nHcHGKrQkyjt/yxf2HwObHIZUPmsWZwg4S6AM 0GCXU+8kpMLXDaLRW163jVgE8JMKdxaATjxmFkgznPD6db4OBl7S0uZgSuWKz5WpUMyP tzug== X-Gm-Message-State: AOAM532eW1LSpN5hgxCT/LvMuYm4lPoXCT8G6ixmhltHS6ZwIpY7rgpm OruuoMoq46qXmBvUD33TmIOj52SD X-Google-Smtp-Source: ABdhPJwp4GsrFOPQOigEahIH7cad/IrqzxNZJdncbt2gbkWxA0ZXza8nmfYvotelR8g9mHUhWxXnAw== X-Received: by 2002:a05:6a00:2294:: with SMTP id f20mr13992500pfe.126.1595121036508; Sat, 18 Jul 2020 18:10:36 -0700 (PDT) Original-Received: from ?IPv6:2409:250:3b80:2e10:a531:ac11:328d:a1b4? ([2409:250:3b80:2e10:a531:ac11:328d:a1b4]) by smtp.gmail.com with ESMTPSA id g10sm11806758pfr.164.2020.07.18.18.10.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 18 Jul 2020 18:10:36 -0700 (PDT) X-Mailer: Apple Mail (2.3608.120.23.2.1) Received-SPF: pass client-ip=2607:f8b0:4864:20::544; envelope-from=ghnacker@gmail.com; helo=mail-pg1-x544.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Sat, 18 Jul 2020 21:44:05 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:183190 Archived-At: commit 27b37d16418cd64321505e721b40b6b5d730ebdf (HEAD -> = fix/url-https-proxy-connect, fork/fix/url-https-proxy-connect) Author: Satoshi Nakagawa Date: Sun Jul 19 10:05:27 2020 +0900 fix: url-https-proxy-connect - CONNECT with Proxy-Authorization = header diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 669c24571f..9c1219d5c0 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -1406,6 +1406,10 @@ The return value of this function is the = retrieval buffer." (setq url-http-after-change-function = 'url-https-proxy-after-change-function) (process-send-string connection (format (concat "CONNECT %s:%d = HTTP/1.1\r\n" "Host: %s\r\n" + (let ((proxy-auth = (let ((url-basic-auth-storage + = 'url-http-proxy-basic-auth-storage)) + = (url-get-authentication url-http-proxy nil 'any nil)))) + (if proxy-auth = (concat "Proxy-Authorization: " proxy-auth "\r\n"))) "\r\n") (url-host url-current-object) (or (url-port = url-current-object)