From jlukens@botch.com Wed Mar 5 04:39:36 2014 Received: (at 440) by bugs.x2go.org; 5 Mar 2014 03:39:37 +0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on ymir.das-netzwerkteam.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAYES_40 autolearn=ham version=3.3.2 Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir (Postfix) with ESMTP id E4EDD5DB13 for <440@bugs.x2go.org>; Wed, 5 Mar 2014 04:39:35 +0100 (CET) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id C5A3A1AC0C5; Tue, 4 Mar 2014 22:39:33 -0500 (EST) Date: Tue, 4 Mar 2014 22:39:40 -0500 From: Josh Lukens To: Oleksandr Shneyder , 440@bugs.x2go.org Message-ID: <4E7327ABC92D41DC9636AC973BF5C2C8@botch.com> In-Reply-To: <063590E396BD4C059B471BC9B2AC6392@botch.com> References: <20140227151513.Horde.aM8IYVn5opfJd9ozoLbE6w8@mail.das-netzwerkteam.de> <53108DDC.2030909@phoca-gmbh.de> <063590E396BD4C059B471BC9B2AC6392@botch.com> Subject: Fix to copy/paste error in applied patch X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="53169c7c_79e2a9e3_7cc0" --53169c7c_79e2a9e3_7cc0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Found a small (but important) copy and paste error introduced when I remade the origional patch. As is session broker sessions can't be properly selected. The attached patch against head corrects the issue. --53169c7c_79e2a9e3_7cc0 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="switch-to-QNetworkAccessManager-fix.patch" ZGlmZiAtLWdpdCBhL2h0dHBicm9rZXJjbGllbnQuY3BwIGIvaHR0cGJyb2tlcmNsaWVudC5jcHAK aW5kZXggZmNhNTliNC4uZWM4NjU5MyAxMDA2NDQKLS0tIGEvaHR0cGJyb2tlcmNsaWVudC5jcHAK KysrIGIvaHR0cGJyb2tlcmNsaWVudC5jcHAKQEAgLTI5NSw3ICsyOTUsNyBAQCB2b2lkIEh0dHBC cm9rZXJDbGllbnQ6OnNlbGVjdFVzZXJTZXNzaW9uKGNvbnN0IFFTdHJpbmcmIHNlc3Npb24pCiAg ICAgICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOwog ICAgICAgICBRTmV0d29ya1JlcXVlc3QgcmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSk7 CiAgICAgICAgIHJlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVI ZWFkZXIsICJhcHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKLSAgICAgICAgc2Vz c2lvbnNSZXF1ZXN0PWh0dHAtPnBvc3QgKHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOworICAgICAg ICBzZWxTZXNzUmVxdWVzdD1odHRwLT5wb3N0IChyZXF1ZXN0LCByZXEudG9VdGY4KCkgKTsKIAog ICAgIH0KICAgICBlbHNlCkBAIC0zMzAsNyArMzMwLDcgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50 OjpjaGFuZ2VQYXNzd29yZChRU3RyaW5nIG5ld1Bhc3MpCiAgICAgICAgIHgyZ29EZWJ1ZyA8PCAi c2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOwogICAgICAgICBRTmV0d29ya1JlcXVl c3QgcmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSk7CiAgICAgICAgIHJlcXVlc3Quc2V0 SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVIZWFkZXIsICJhcHBsaWNhdGlvbi94 LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKLSAgICAgICAgc2Vzc2lvbnNSZXF1ZXN0PWh0dHAtPnBv c3QgKHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOworICAgICAgICBjaFBhc3NSZXF1ZXN0PWh0dHAt PnBvc3QgKHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOwogICAgIH0KICAgICBlbHNlCiAgICAgewpA QCAtMzU1LDcgKzM1NSw3IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6dGVzdENvbm5lY3Rpb24o KQogICAgICAgICB4MmdvRGVidWcgPDwgInNlbmRpbmcgcmVxdWVzdDogIjw8IHJlcS50b1V0Zjgo KTsKICAgICAgICAgUU5ldHdvcmtSZXF1ZXN0IHJlcXVlc3QoUVVybChjb25maWctPmJyb2tlcnVy bCkpOwogICAgICAgICByZXF1ZXN0LnNldEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRlbnRU eXBlSGVhZGVyLCAiYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNvZGVkIik7Ci0gICAgICAg IHNlc3Npb25zUmVxdWVzdD1odHRwLT5wb3N0IChyZXF1ZXN0LCByZXEudG9VdGY4KCkgKTsKKyAg ICAgICAgdGVzdENvblJlcXVlc3Q9aHR0cC0+cG9zdCAocmVxdWVzdCwgcmVxLnRvVXRmOCgpICk7 CiAgICAgfQogICAgIGVsc2UKICAgICB7Cg== --53169c7c_79e2a9e3_7cc0--