From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#51993: 29.0.50; [PATCH for 29.1] Killing emacsclient terminal with `server-stop-automatically' doesn't prompt to save files Date: Fri, 2 Dec 2022 13:33:39 -0800 Message-ID: <9b079bad-8d51-02b9-baad-151c57cfed3f@gmail.com> References: <9e47c871-a2c3-d764-bec9-d87abf3efe83@gmail.com> <79a53ecc-dbfc-d088-d80d-96f349be794a@gmail.com> <834k7vw2vb.fsf@gnu.org> <87czc4tosz.fsf@gnus.org> <83lepoi58p.fsf@gnu.org> <83y1tbxbbt.fsf@gnu.org> <83h6zxwujo.fsf@gnu.org> <2738f071-c87f-72cf-226f-6e8597cb07a8@gmail.com> <83a65ouz0e.fsf@gnu.org> <83lenrghhg.fsf@gnu.org> <8e62e7aa-7050-6b35-9128-79517efa4557@gmail.com> <83edthgam5.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------SbPo8vFz6U0x2FD0julmjuXQ" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20544"; mail-complaints-to="usenet@ciao.gmane.io" Cc: larsi@gnus.org, 51993@debbugs.gnu.org, gregory@heytings.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Dec 02 22:34:27 2022 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 1p1Dfu-0005AP-R1 for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 02 Dec 2022 22:34:26 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p1Dfd-00028N-CP; Fri, 02 Dec 2022 16:34:09 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p1DfY-000285-Ri for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 16:34:08 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p1DfX-0005Z7-5l for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 16:34:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p1DfW-0001a0-MM for bug-gnu-emacs@gnu.org; Fri, 02 Dec 2022 16:34:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 02 Dec 2022 21:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51993 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 51993-submit@debbugs.gnu.org id=B51993.16700168306063 (code B ref 51993); Fri, 02 Dec 2022 21:34:02 +0000 Original-Received: (at 51993) by debbugs.gnu.org; 2 Dec 2022 21:33:50 +0000 Original-Received: from localhost ([127.0.0.1]:49013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1DfJ-0001Zj-W6 for submit@debbugs.gnu.org; Fri, 02 Dec 2022 16:33:50 -0500 Original-Received: from mail-pj1-f45.google.com ([209.85.216.45]:56141) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p1DfH-0001Zd-QR for 51993@debbugs.gnu.org; Fri, 02 Dec 2022 16:33:48 -0500 Original-Received: by mail-pj1-f45.google.com with SMTP id k5so6074035pjo.5 for <51993@debbugs.gnu.org>; Fri, 02 Dec 2022 13:33:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=Rk0cj9ePobc9FCMnZymPb1IZ6Kzx8pnp/fBT4hKWBLY=; b=iyYTmCDfruj5uJwOmECb8ARCiYuh/2IhrktnNUyRIJJDOhi6YbsifYiwiTFSP1zA2W 7FlmFiMs+bYBM3ZM/bPkWs1Ju4pSbWVb1l/wrW+7q18aIe8n1IsrNKqC03MWZhdFKcd6 q/xsJi1w4VHBxHTO2PzXCrj2lmyfNwQ2SRHiZPQ58JyxXSlRxp0ngonHp/tsd1xPOufm DHUXosX6ZZrMX5SrTq2BURNHpVWCS3+rRPX/li2Lb4hqqZl8528T24U6NoK67ltvXy98 Gm2TpGmksESr7izmGISTTilCRtICcaplu1mqi0GkHQTiJ593HCdqdsDeehUGsbHDAasL AFgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=Rk0cj9ePobc9FCMnZymPb1IZ6Kzx8pnp/fBT4hKWBLY=; b=d5YfVa73xp73+lhswqDu99NOotErLUj5WXcQFAEqEJAWrOuQjOny2GgQ7OJeOZyMrI SeoKiNbFsp/P5Svc6VnYL67sVKq6Klnz4l1Ez4YpJTQo3up2QLGhPkVpO1XL4S5vatdr qELD4vB/gwolfW5skrBU48EwNWhh84BMS6os1mb+w5Fltu15+3mN5IKgkNVbB+qJxio/ +xjC0vEnLb0+Y7iYIvEPeifS6SzMkA1CBIK9T5lqsAf6QKse9yuiGa4quOoJwi483zg8 nIUdNaU+b6jUYdPGIuTALKGgRQTEx7YpMu/EHkoE2hq88UHFBMwHIuVOEXoM7tbnLmju BmHw== X-Gm-Message-State: ANoB5pltt2WthlgJLQDsz5ihkPxjYKDPL3UQsncUaHcIFa5e/x7um3H5 2XRYpIqKC+5OQAsWTmawg9k= X-Google-Smtp-Source: AA0mqf4lgQaLpZtfQphwkem7vwicxJqazJsOxJ17bh6+edO9upqTbQkd2HNfdAoQ+MJB7bya+Qj81g== X-Received: by 2002:a17:90b:48c8:b0:20b:16bc:8493 with SMTP id li8-20020a17090b48c800b0020b16bc8493mr8689655pjb.210.1670016821886; Fri, 02 Dec 2022 13:33:41 -0800 (PST) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id t15-20020a63f34f000000b0046fefb18a09sm4466041pgj.91.2022.12.02.13.33.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 02 Dec 2022 13:33:40 -0800 (PST) Content-Language: en-US In-Reply-To: <83edthgam5.fsf@gnu.org> 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-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:249789 Archived-At: This is a multi-part message in MIME format. --------------SbPo8vFz6U0x2FD0julmjuXQ Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/2/2022 6:10 AM, Eli Zaretskii wrote: > [Please in the future avoid changing the Subject when discussing bugs: it > makes it harder for me and others to follow the discussion by grouping > messages by Subject.] Sorry about that. I thought it would be easier to see that I'd split the topic into two separate tracks. I'll keep that in mind for the future though. > Thanks. Surprisingly, the previous version was easier to review and agree > to in some of its parts, because it kept more of the original code, and only > changed the conditions when save-some-buffers or save-buffers-kill-emacs > were called. I think I must have misinterpreted where your main concerns were, and went down the wrong avenue as a result. I think your other comments here (and re-reading your previous message) have helped me get a better idea of your concerns, so I'll try to address your earlier message better. On 12/1/2022 9:29 AM, Eli Zaretskii wrote: >> (defun server-stop-automatically--handle-delete-frame (frame) >> "Handle deletion of FRAME when `server-stop-automatically' is used." [snip -- long diff removed] > > And here you completely rewrote a function. Thinking about this some more, that change wasn't strictly necessary for 29.1, since it should really just be dead code, and won't hurt anything. I've split this part out into a separate commit that we could apply to only the master branch. That simplifies the first commit (for 29.1) a fair bit. >> @@ -1801,31 +1809,20 @@ server-save-buffers-kill-terminal >> ;; ARG is non-nil), since we're not killing >> ;; Emacs (unlike `save-buffers-kill-emacs'). >> (and arg t))) >> - (server-delete-client proc))) >> - (t (error "Invalid client frame")))))) >> + (server-delete-client proc)) >> + ;; If `server-stop-automatically' is set, there are no >> + ;; other client processes, and no other client frames >> + ;; (e.g. `nowait' frames), kill Emacs. >> + (save-buffers-kill-emacs arg))) >> + (t (error "Invalid client frame"))))) > > But this one is problematic: it adds save-buffers-kill-emacs which wasn't in > the original code, and I don't understand why. The bug wasn't about this, > was it? I believe this change is the most important part of the patch, so I'll try to explain why I added this. The 'server-stop-automatically' feature causes the Emacs daemon to be killed when certain conditions are met. For the 'kill-terminal' case[1], that means that, "when the last client frame is being closed with C-x C-c, you are asked whether [various questions], and if so, the server is stopped." (From the manual section on this.) The "last client frame" check is the conditional just before this hunk (you mentioned that this part was fine, so I didn't include it in this message). The latter part of the sentence in the manual is just a description of 'save-buffers-kill-emacs'. So I've tried to take the text of the manual and turn it into code. Another way of looking at it: the new 'save-buffers-kill-emacs' call above is really the result of me moving the handling for this condition from 'server-stop-automatically--handle-delete-frame' into 'server-save-buffers-kill-terminal'. Previously, that function was responsible for calling 'save-buffers-kill-emacs' at the right time. Doing it this way lets me avoid calling 'SSA--handle-delete-frame' so that we get the benefit of using the longstanding implementation of 'server-save-buffers-kill-terminal', just with the minimum of necessary enhancements to make this stop-automatically setting behave as documented. [1] This also applies to 'delete-frame', but that setting does more beyond this. --------------SbPo8vFz6U0x2FD0julmjuXQ Content-Type: text/plain; charset=UTF-8; name="29.1--0001-Make-killing-a-non-last-client-work-the-same-no-matt.patch" Content-Disposition: attachment; filename*0="29.1--0001-Make-killing-a-non-last-client-work-the-same-no-m"; filename*1="att.patch" Content-Transfer-Encoding: base64 RnJvbSA2MDgxZTE1NmJhMzRmOWY3ZDhiMjEyYmU4MjAxNjM5ZjJmNjg5MjE5IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IEZyaSwgMiBEZWMgMjAyMiAxMjoxNDo1MCAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggMS8yXSBNYWtlIGtpbGxpbmcgYSBub24tbGFzdCBjbGllbnQgd29yayB0aGUgc2FtZSBu byBtYXR0ZXIKIHRoZSBhdXRvLXN0b3Agc2V0dGluZwoKUHJldmlvdXNseSwgaWYgJ3NlcnZl ci1zdG9wLWF1dG9tYXRpY2FsbHknIHdhcyBjb25maWd1cmVkIGZvcgona2lsbC10ZXJtaW5h bCcgb3IgJ2RlbGV0ZS1mcmFtZScsIGtpbGxpbmcgYSBjbGllbnQgdmlhCidzYXZlLWJ1ZmZl cnMta2lsbC10ZXJtaW5hbCcgd291bGRuJ3QgcHJvbXB0IGFib3V0IHRoZSBzYXZpbmcgZmls ZXMgaW4KdGhlIGNsaWVudCdzIGJ1ZmZlciBsaXN0IChhcyBpdCBkb2VzIHdoZW4gbm90IHVz aW5nIHRob3NlIHNldHRpbmdzKS4KVGhpcyBjaGFuZ2UgZW5zdXJlcyB0aGF0IHRob3NlIHNl dHRpbmdzIG9ubHkgYXBwbHkgd2hlbiBraWxsaW5nIHRoZQpsYXN0IGNsaWVudCwgYXMgZGVz Y3JpYmVkIGluIHRoZSBtYW51YWwgKGJ1ZyM1MTk5MykuCgoqIGxpc3Avc2VydmVyLmVsIChz ZXJ2ZXItc2F2ZS1idWZmZXJzLWtpbGwtdGVybWluYWwpOiBIYW5kbGUKJ3NlcnZlci1zdG9w LWF1dG9tYXRpY2FsbHknIGJlaGF2aW9yIGluIHRoaXMgZnVuY3Rpb24sIHJhdGhlciB0aGFu CmNhbGxpbmcgJ3NlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLWhhbmRsZS1kZWxldGUtZnJh bWUnLgotLS0KIGxpc3Avc2VydmVyLmVsIHwgNjAgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAzNyBpbnNlcnRp b25zKCspLCAyMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saXNwL3NlcnZlci5lbCBi L2xpc3Avc2VydmVyLmVsCmluZGV4IDFiMDI3Zjg4Y2UuLjdlNzEzZWFlY2QgMTAwNjQ0Ci0t LSBhL2xpc3Avc2VydmVyLmVsCisrKyBiL2xpc3Avc2VydmVyLmVsCkBAIC0xNzgwLDI5ICsx NzgwLDQzIEBAIHNlcnZlci1zYXZlLWJ1ZmZlcnMta2lsbC10ZXJtaW5hbAogCiBJZiBlbWFj c2NsaWVudCB3YXMgc3RhcnRlZCB3aXRoIGEgbGlzdCBvZiBmaWxlbmFtZXMgdG8gZWRpdCwg dGhlbgogb25seSB0aGVzZSBmaWxlcyB3aWxsIGJlIGFza2VkIHRvIGJlIHNhdmVkLiIKLSAg KGlmIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkKLSAgICAgIChzZXJ2ZXItc3RvcC1hdXRv bWF0aWNhbGx5LS1oYW5kbGUtZGVsZXRlLWZyYW1lIChzZWxlY3RlZC1mcmFtZSkpCi0gICAg KGxldCAoKHByb2MgKGZyYW1lLXBhcmFtZXRlciBuaWwgJ2NsaWVudCkpKQotICAgICAgKGNv bmQgKChlcSBwcm9jICdub3dhaXQpCi0JICAgICA7OyBOb3dhaXQgZnJhbWVzIGhhdmUgbm8g Y2xpZW50IGJ1ZmZlciBsaXN0LgotCSAgICAgKGlmIChjZHIgKGZyYW1lLWxpc3QpKQotCSAg ICAgICAgIChwcm9nbiAoc2F2ZS1zb21lLWJ1ZmZlcnMgYXJnKQotCQkgICAgICAgIChkZWxl dGUtZnJhbWUpKQotCSAgICAgICA7OyBJZiB3ZSdyZSB0aGUgbGFzdCBmcmFtZSBzdGFuZGlu Zywga2lsbCBFbWFjcy4KLQkgICAgICAgKHNhdmUtYnVmZmVycy1raWxsLWVtYWNzIGFyZykp KQotCSAgICAoKHByb2Nlc3NwIHByb2MpCi0JICAgICAobGV0ICgoYnVmZmVycyAocHJvY2Vz cy1nZXQgcHJvYyAnYnVmZmVycykpKQotCSAgICAgICAoc2F2ZS1zb21lLWJ1ZmZlcnMKLQkg ICAgICAgIGFyZyAoaWYgYnVmZmVycwotICAgICAgICAgICAgICAgICAgICAgICAgOzsgT25s eSBmaWxlcyBmcm9tIGVtYWNzY2xpZW50IGZpbGUgbGlzdC4KLQkJICAgICAgICAobGFtYmRh ICgpIChtZW1xIChjdXJyZW50LWJ1ZmZlcikgYnVmZmVycykpCi0gICAgICAgICAgICAgICAg ICAgICAgOzsgTm8gZW1hY3NjbGllbnQgZmlsZSBsaXN0OiBkb24ndCBvdmVycmlkZQotICAg ICAgICAgICAgICAgICAgICAgIDs7IGBzYXZlLXNvbWUtYnVmZmVycy1kZWZhdWx0LXByZWRp Y2F0ZScgKHVubGVzcwotICAgICAgICAgICAgICAgICAgICAgIDs7IEFSRyBpcyBub24tbmls KSwgc2luY2Ugd2UncmUgbm90IGtpbGxpbmcKLSAgICAgICAgICAgICAgICAgICAgICA7OyBF bWFjcyAodW5saWtlIGBzYXZlLWJ1ZmZlcnMta2lsbC1lbWFjcycpLgotCQkgICAgICAoYW5k IGFyZyB0KSkpCi0JICAgICAgIChzZXJ2ZXItZGVsZXRlLWNsaWVudCBwcm9jKSkpCi0JICAg ICh0IChlcnJvciAiSW52YWxpZCBjbGllbnQgZnJhbWUiKSkpKSkpCisgIChsZXQgKChwcm9j IChmcmFtZS1wYXJhbWV0ZXIgbmlsICdjbGllbnQpKSkKKyAgICAoY29uZCAoKGVxIHByb2Mg J25vd2FpdCkKKwkgICA7OyBOb3dhaXQgZnJhbWVzIGhhdmUgbm8gY2xpZW50IGJ1ZmZlciBs aXN0LgorCSAgIChpZiAobGVuZ3RoPiAoZnJhbWUtbGlzdCkgKGlmIHNlcnZlci1zdG9wLWF1 dG9tYXRpY2FsbHkgMiAxKSkKKyAgICAgICAgICAgICAgIDs7IElmIHRoZXJlIGFyZSBhbnkg b3RoZXIgZnJhbWVzLCBvbmx5IGRlbGV0ZSB0aGlzIG9uZS4KKyAgICAgICAgICAgICAgIDs7 IFdoZW4gYHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHknIGlzIHNldCwgZG9uJ3QgY291bnQK KyAgICAgICAgICAgICAgIDs7IHRoZSBkYWVtb24gZnJhbWUuCisJICAgICAgIChwcm9nbiAo c2F2ZS1zb21lLWJ1ZmZlcnMgYXJnKQorCQkgICAgICAoZGVsZXRlLWZyYW1lKSkKKwkgICAg IDs7IElmIHdlJ3JlIHRoZSBsYXN0IGZyYW1lIHN0YW5kaW5nLCBraWxsIEVtYWNzLgorCSAg ICAgKHNhdmUtYnVmZmVycy1raWxsLWVtYWNzIGFyZykpKQorCSAgKChwcm9jZXNzcCBwcm9j KQorICAgICAgICAgICAoaWYgKG9yIChub3Qgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseSkK KyAgICAgICAgICAgICAgICAgICAobGVuZ3RoPiBzZXJ2ZXItY2xpZW50cyAxKQorICAgICAg ICAgICAgICAgICAgIChzZXEtc29tZQorICAgICAgICAgICAgICAgICAgICAobGFtYmRhIChm cmFtZSkKKyAgICAgICAgICAgICAgICAgICAgICAod2hlbi1sZXQgKChwIChmcmFtZS1wYXJh bWV0ZXIgZnJhbWUgJ2NsaWVudCkpKQorICAgICAgICAgICAgICAgICAgICAgICAgKG5vdCAo ZXEgcHJvYyBwKSkpKQorICAgICAgICAgICAgICAgICAgICAoZnJhbWUtbGlzdCkpKQorICAg ICAgICAgICAgICAgOzsgSWYgYHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHknIGlzIG5vdCBl bmFibGVkLCB0aGVyZQorICAgICAgICAgICAgICAgOzsgYXJlIGFueSBvdGhlciBjbGllbnRz LCBvciB0aGVyZSBhcmUgZnJhbWVzIG5vdCBvd25lZAorICAgICAgICAgICAgICAgOzsgYnkg dGhlIGN1cnJlbnQgY2xpZW50IChlLmcuIGBub3dhaXQnIGZyYW1lcyksIHRoZW4KKyAgICAg ICAgICAgICAgIDs7IHdlIGp1c3Qgd2FudCB0byBkZWxldGUgdGhpcyBjbGllbnQuCisJICAg ICAgIChsZXQgKChidWZmZXJzIChwcm9jZXNzLWdldCBwcm9jICdidWZmZXJzKSkpCisJICAg ICAgICAgKHNhdmUtc29tZS1idWZmZXJzCisJICAgICAgICAgIGFyZyAoaWYgYnVmZmVycwor ICAgICAgICAgICAgICAgICAgICAgICAgICA7OyBPbmx5IGZpbGVzIGZyb20gZW1hY3NjbGll bnQgZmlsZSBsaXN0LgorCQkgICAgICAgICAgKGxhbWJkYSAoKSAobWVtcSAoY3VycmVudC1i dWZmZXIpIGJ1ZmZlcnMpKQorICAgICAgICAgICAgICAgICAgICAgICAgOzsgTm8gZW1hY3Nj bGllbnQgZmlsZSBsaXN0OiBkb24ndCBvdmVycmlkZQorICAgICAgICAgICAgICAgICAgICAg ICAgOzsgYHNhdmUtc29tZS1idWZmZXJzLWRlZmF1bHQtcHJlZGljYXRlJyAodW5sZXNzCisg ICAgICAgICAgICAgICAgICAgICAgICA7OyBBUkcgaXMgbm9uLW5pbCksIHNpbmNlIHdlJ3Jl IG5vdCBraWxsaW5nCisgICAgICAgICAgICAgICAgICAgICAgICA7OyBFbWFjcyAodW5saWtl IGBzYXZlLWJ1ZmZlcnMta2lsbC1lbWFjcycpLgorCQkgICAgICAgIChhbmQgYXJnIHQpKSkK KwkgICAgICAgICAoc2VydmVyLWRlbGV0ZS1jbGllbnQgcHJvYykpCisgICAgICAgICAgICAg OzsgT3RoZXJ3aXNlLCB3ZSB3YW50IHRvIGtpbGwgRW1hY3MuCisgICAgICAgICAgICAgKHNh dmUtYnVmZmVycy1raWxsLWVtYWNzIGFyZykpKQorCSAgKHQgKGVycm9yICJJbnZhbGlkIGNs aWVudCBmcmFtZSIpKSkpKQogCiAoZGVmdW4gc2VydmVyLXN0b3AtYXV0b21hdGljYWxseS0t aGFuZGxlLWRlbGV0ZS1mcmFtZSAoZnJhbWUpCiAgICJIYW5kbGUgZGVsZXRpb24gb2YgRlJB TUUgd2hlbiBgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseScgaXMgdXNlZC4iCi0tIAoyLjI1 LjEKCg== --------------SbPo8vFz6U0x2FD0julmjuXQ Content-Type: text/plain; charset=UTF-8; name="master--0002-Remove-dead-code-from-server-stop-automatically-hand.patch" Content-Disposition: attachment; filename*0="master--0002-Remove-dead-code-from-server-stop-automatically"; filename*1="-hand.patch" Content-Transfer-Encoding: base64 RnJvbSBhMTRiMDQyOTgyZGM1OTc2NzQ5NTkwNWE5ZDQ1ZTA1NDIxMjRjMWU2IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IEZyaSwgMiBEZWMgMjAyMiAxMjoxNTo0NiAtMDgwMApTdWJqZWN0OiBbUEFU Q0ggMi8yXSA7IFJlbW92ZSBkZWFkIGNvZGUgZnJvbQogJ3NlcnZlci1zdG9wLWF1dG9tYXRp Y2FsbHktLWhhbmRsZS1kZWxldGUtZnJhbWUnCgoqIGxpc3Avc2VydmVyLmVsIChzZXJ2ZXIt c3RvcC1hdXRvbWF0aWNhbGx5LS1oYW5kbGUtZGVsZXRlLWZyYW1lKToKU2luY2UgJ3RoaXMt Y29tbWFuZCcgaXMgbmV2ZXIgJ3NhdmUtYnVmZmVycy1raWxsLXRlcm1pbmFsJyBpbiB0aGlz CmZ1bmN0aW9uLCB3ZSBjYW4gcmVtb3ZlIHRoZSBzZWNvbmQgJ2lmJyBibG9jayBhbmQgaXQn cyB0aGVuLWZvcm0sCmxlYXZpbmcgb25seSB0aGUgZWxzZS1mb3JtLiAgQWRkaXRpb25hbGx5 LCByZW1vdmUgdGhlICdkZWxldGUtZnJhbWUnCmNhbGw7IGl0J3Mgbm90IG5lY2Vzc2FyeSwg c2luY2Ugd2UganVzdCBraWxsZWQgRW1hY3Mgb24gdGhlIHByaW9yCmxpbmUuCi0tLQogbGlz cC9zZXJ2ZXIuZWwgfCAyNCArKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFu Z2VkLCA0IGluc2VydGlvbnMoKyksIDIwIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2xp c3Avc2VydmVyLmVsIGIvbGlzcC9zZXJ2ZXIuZWwKaW5kZXggN2U3MTNlYWVjZC4uYWE2MmIy NWE4OSAxMDA2NDQKLS0tIGEvbGlzcC9zZXJ2ZXIuZWwKKysrIGIvbGlzcC9zZXJ2ZXIuZWwK QEAgLTE4MjAsMjYgKzE4MjAsMTAgQEAgc2VydmVyLXNhdmUtYnVmZmVycy1raWxsLXRlcm1p bmFsCiAKIChkZWZ1biBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5LS1oYW5kbGUtZGVsZXRl LWZyYW1lIChmcmFtZSkKICAgIkhhbmRsZSBkZWxldGlvbiBvZiBGUkFNRSB3aGVuIGBzZXJ2 ZXItc3RvcC1hdXRvbWF0aWNhbGx5JyBpcyB1c2VkLiIKLSAgKHdoZW4gc2VydmVyLXN0b3At YXV0b21hdGljYWxseQotICAgIChpZiAoaWYgKGFuZCAocHJvY2Vzc3AgKGZyYW1lLXBhcmFt ZXRlciBmcmFtZSAnY2xpZW50KSkKLQkJIChlcSB0aGlzLWNvbW1hbmQgJ3NhdmUtYnVmZmVy cy1raWxsLXRlcm1pbmFsKSkKLQkgICAgKHByb2duCi0JICAgICAgKGRvbGlzdCAoZiAoZnJh bWUtbGlzdCkpCi0JCSh3aGVuIChhbmQgKGVxIChmcmFtZS1wYXJhbWV0ZXIgZnJhbWUgJ2Ns aWVudCkKLQkJCSAgICAgICAoZnJhbWUtcGFyYW1ldGVyIGYgJ2NsaWVudCkpCi0JCQkgICAo bm90IChlcSBmcmFtZSBmKSkpCi0JCSAgKHNldC1mcmFtZS1wYXJhbWV0ZXIgZiAnY2xpZW50 IG5pbCkKLQkJICAobGV0ICgoc2VydmVyLXN0b3AtYXV0b21hdGljYWxseSBuaWwpKQotCQkg ICAgKGRlbGV0ZS1mcmFtZSBmKSkpKQotCSAgICAgIChpZiAoY2RkciAoZnJhbWUtbGlzdCkp Ci0JCSAgKGxldCAoKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkgbmlsKSkKLQkJICAgIChk ZWxldGUtZnJhbWUgZnJhbWUpCi0JCSAgICBuaWwpCi0JCXQpKQotCSAgKG51bGwgKGNkZHIg KGZyYW1lLWxpc3QpKSkpCi0JKGxldCAoKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkgbmls KSkKLQkgIChzYXZlLWJ1ZmZlcnMta2lsbC1lbWFjcykKLQkgIChkZWxldGUtZnJhbWUgZnJh bWUpKSkpKQorICAod2hlbiAoYW5kIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkKKyAgICAg ICAgICAgICAobnVsbCAoY2RkciAoZnJhbWUtbGlzdCkpKSkKKyAgICAobGV0ICgoc2VydmVy LXN0b3AtYXV0b21hdGljYWxseSBuaWwpKQorICAgICAgKHNhdmUtYnVmZmVycy1raWxsLWVt YWNzKSkpKQogCiAoZGVmdW4gc2VydmVyLXN0b3AtYXV0b21hdGljYWxseS0tbWF5YmUta2ls bC1lbWFjcyAoKQogICAiSGFuZGxlIGNsb3Npbmcgb2YgRW1hY3MgZGFlbW9uIHdoZW4gYHNl cnZlci1zdG9wLWF1dG9tYXRpY2FsbHknIGlzIHVzZWQuIgotLSAKMi4yNS4xCgo= --------------SbPo8vFz6U0x2FD0julmjuXQ--