From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#22789: 25.1.50; In last master build https connections stop working Date: Sat, 27 Feb 2016 14:19:08 +1030 Message-ID: <8737sen77v.fsf@gnus.org> References: <864mcyo14y.fsf@Lenovo-PC.i-did-not-set--mail-host-address--so-tickle-me> <87d1rmxl65.fsf@gnus.org> <86povm6qeu.wl-j_l_domenech@yahoo.com> <83k2lugeym.fsf@gnu.org> <871t81wtyt.fsf@gnus.org> <87r3g1veqc.fsf@gnus.org> <83k2lsg2sx.fsf@gnu.org> <87k2lsnqzw.fsf@gnus.org> <83egbzertw.fsf@gnu.org> <878u26nauj.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1456545026 15523 80.91.229.3 (27 Feb 2016 03:50:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 27 Feb 2016 03:50:26 +0000 (UTC) Cc: j_l_domenech@yahoo.com, 22789@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Feb 27 04:50:14 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aZVtV-0003bW-64 for geb-bug-gnu-emacs@m.gmane.org; Sat, 27 Feb 2016 04:50:13 +0100 Original-Received: from localhost ([::1]:53201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZVtU-0006Cj-2o for geb-bug-gnu-emacs@m.gmane.org; Fri, 26 Feb 2016 22:50:12 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZVtN-00068O-Qj for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 22:50:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aZVtJ-00065W-VO for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 22:50:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:50939) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aZVtJ-00065S-SK for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 22:50:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aZVtJ-000077-LH for bug-gnu-emacs@gnu.org; Fri, 26 Feb 2016 22:50:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Feb 2016 03:50:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22789 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22789-submit@debbugs.gnu.org id=B22789.1456544994419 (code B ref 22789); Sat, 27 Feb 2016 03:50:01 +0000 Original-Received: (at 22789) by debbugs.gnu.org; 27 Feb 2016 03:49:54 +0000 Original-Received: from localhost ([127.0.0.1]:48066 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aZVt8-00006W-TE for submit@debbugs.gnu.org; Fri, 26 Feb 2016 22:49:54 -0500 Original-Received: from hermes.netfonds.no ([80.91.224.195]:51182) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aZVt3-00006J-Di for 22789@debbugs.gnu.org; Fri, 26 Feb 2016 22:49:49 -0500 Original-Received: from [175.103.25.178] (helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1aZVsX-0001Ph-F9; Sat, 27 Feb 2016 04:49:14 +0100 In-Reply-To: <878u26nauj.fsf@gnus.org> (Lars Ingebrigtsen's message of "Sat, 27 Feb 2016 13:00:44 +1030") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-MailScanner-ID: 1aZVsX-0001Ph-F9 MailScanner-NULL-Check: 1457149755.58863@VbbPD7U8i5lZOnEkCGaMbA X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:113925 Archived-At: Lars Ingebrigtsen writes: > So deferring setting g->gnutls_p is not a good idea. I'll try to debug > this further, but may not have time today... Hey! Time! The following patch should make the rest of Emacs leave the TLS socket alone until we've done the handshake, I think. It works for me under Linux (and makes the negotiation blocking). Could you test this under Windows? diff --git a/src/gnutls.c b/src/gnutls.c index d1b34c5..002e7b4 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -403,6 +403,9 @@ gnutls_try_handshake (struct Lisp_Process *proc) gnutls_session_t state = proc->gnutls_state; int ret; + if (proc->is_non_blocking_client) + proc->gnutls_p = true; + do { ret = gnutls_handshake (state); @@ -410,13 +413,13 @@ gnutls_try_handshake (struct Lisp_Process *proc) QUIT; } while (ret < 0 && gnutls_error_is_fatal (ret) == 0 - && ! proc->is_non_blocking_client); +#if 0 + && ! proc->is_non_blocking_client +#endif + ); proc->gnutls_initstage = GNUTLS_STAGE_HANDSHAKE_TRIED; - if (proc->is_non_blocking_client) - proc->gnutls_p = true; - if (ret == GNUTLS_E_SUCCESS) { /* Here we're finally done. */ -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no