From jlukens@botch.com Fri Feb 28 15:18:23 2014 Received: (at 440) by bugs.x2go.org; 28 Feb 2014 14:18:23 +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.8 required=5.0 tests=BAYES_50 autolearn=ham version=3.3.2 X-Greylist: delayed 1503 seconds by postgrey-1.34 at ymir; Fri, 28 Feb 2014 15:18:22 CET Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir (Postfix) with ESMTP id 436755DB16 for <440@bugs.x2go.org>; Fri, 28 Feb 2014 15:18:22 +0100 (CET) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id 086431AC0CB; Fri, 28 Feb 2014 08:53:15 -0500 (EST) Date: Fri, 28 Feb 2014 08:53:15 -0500 From: Josh Lukens To: Oleksandr Shneyder , 440@bugs.x2go.org Message-ID: In-Reply-To: <53108DDC.2030909@phoca-gmbh.de> References: <20140227151513.Horde.aM8IYVn5opfJd9ozoLbE6w8@mail.das-netzwerkteam.de> <53108DDC.2030909@phoca-gmbh.de> Subject: Re: [X2Go-Dev] Bug#440: Request for patch review X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="531094cb_1f0e5d0d_233f" --531094cb_1f0e5d0d_233f Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Not sure what happened, I just rebaselined and recreated the patch. New patch attached. Note this also includes possible fix for bug 138. --531094cb_1f0e5d0d_233f Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="switch-to-QNetworkAccessManager-v2.patch" ZGlmZiAtLWdpdCBhL2h0dHBicm9rZXJjbGllbnQuY3BwIGIvaHR0cGJyb2tlcmNsaWVudC5jcHAK aW5kZXggNGNhOGU1ZC4uMzRmZmRiYyAxMDA2NDQKLS0tIGEvaHR0cGJyb2tlcmNsaWVudC5jcHAK KysrIGIvaHR0cGJyb2tlcmNsaWVudC5jcHAKQEAgLTE2LDggKzE2LDExIEBACiAqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKiovCiAKICNpbmNsdWRlICJodHRwYnJva2VyY2xpZW50LmgiCisjaW5jbHVkZSA8UU5l dHdvcmtBY2Nlc3NNYW5hZ2VyPgogI2luY2x1ZGUgPFFVcmw+Ci0jaW5jbHVkZSA8UUh0dHA+Cisj aW5jbHVkZSA8UU5ldHdvcmtSZXF1ZXN0PgorI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+CisjaW5j bHVkZSA8UVV1aWQ+CiAjaW5jbHVkZSA8UVRleHRTdHJlYW0+CiAjaW5jbHVkZSA8UUZpbGU+CiAj aW5jbHVkZSA8UURpcj4KQEAgLTM0LDEyICszNywxNCBAQAogI2luY2x1ZGUgPFFUZW1wb3JhcnlG aWxlPgogI2luY2x1ZGUgPFFJbnB1dERpYWxvZz4KIAorCiBIdHRwQnJva2VyQ2xpZW50OjpIdHRw QnJva2VyQ2xpZW50ICggT05NYWluV2luZG93KiB3bmQsIENvbmZpZ0ZpbGUqIGNmZyApCiB7CiAg ICAgY29uZmlnPWNmZzsKICAgICBtYWluV2luZG93PXduZDsKICAgICBzc2hDb25uZWN0aW9uPTA7 CiAgICAgUVVybCBsdXJsICggY29uZmlnLT5icm9rZXJ1cmwgKTsKKwlRVXVpZCB1dWlkID0gUVV1 aWQ6OmNyZWF0ZVV1aWQoKTsKICAgICBpZihsdXJsLnVzZXJOYW1lKCkubGVuZ3RoKCk+MCkKICAg ICAgICAgY29uZmlnLT5icm9rZXJVc2VyPWx1cmwudXNlck5hbWUoKTsKIApAQCAtNTYsMzAgKzYx LDE5IEBAIEh0dHBCcm9rZXJDbGllbnQ6Okh0dHBCcm9rZXJDbGllbnQgKCBPTk1haW5XaW5kb3cq IHduZCwgQ29uZmlnRmlsZSogY2ZnICkKICAgICB7CiAgICAgICAgIHNzaEJyb2tlcj1mYWxzZTsK IAotICAgICAgICBodHRwPW5ldyBRSHR0cCAoIHRoaXMgKTsKLQotICAgICAgICBpZiAoIGNvbmZp Zy0+YnJva2VydXJsLmluZGV4T2YgKCAiaHR0cHM6Ly8iICkgPT0wICkgewotICAgICAgICAgICAg aWYgKChjb25maWctPmJyb2tlckNhQ2VydEZpbGUubGVuZ3RoKCkgPjApICYmIChRRmlsZTo6ZXhp c3RzKGNvbmZpZy0+YnJva2VyQ2FDZXJ0RmlsZSkpKSB7CisgICAgICAgIGlmICgoY29uZmlnLT5i cm9rZXJDYUNlcnRGaWxlLmxlbmd0aCgpID4wKSAmJiAoUUZpbGU6OmV4aXN0cyhjb25maWctPmJy b2tlckNhQ2VydEZpbGUpKSkgewkJCQkKKyAgICAgICAgICAgIFFTc2xTb2NrZXQ6OmFkZERlZmF1 bHRDYUNlcnRpZmljYXRlcyhjb25maWctPmJyb2tlckNhQ2VydEZpbGUsIFFTc2w6OlBlbSk7CisJ CSAgICB4MmdvRGVidWc8PCJDdXN0b20gQ0EgY2VydGlmaWNhdGUgZmlsZSBsb2FkZWQgaW50byBI VFRQUyBicm9rZXIgY2xpZW50OiAiPDxjb25maWctPmJyb2tlckNhQ2VydEZpbGU7CisJICAgIH0K KwkgICAKKyAgICAgICAgaHR0cD1uZXcgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyICggdGhpcyApOwor ICAgICAgICB4MmdvRGVidWc8PCJTZXR0aW5nIHVwIGNvbm5lY3Rpb24gdG8gYnJva2VyOiAiPDxj b25maWctPmJyb2tlcnVybDsKKyAgICAgIAorICAgICAgICBjb25uZWN0ICggaHR0cCwgU0lHTkFM ICggc3NsRXJyb3JzICggUU5ldHdvcmtSZXBseSosIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mICkg KSx0aGlzLAorCSAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RTc2xFcnJvcnMgKCBRTmV0d29y a1JlcGx5KiwgY29uc3QgUUxpc3Q8UVNzbEVycm9yPiYgKSApICk7CiAKLSAgICAgICAgICAgICAg ICBzc2xTb2NrZXQgPSBuZXcgUVNzbFNvY2tldCh0aGlzKTsKLSAgICAgICAgICAgICAgICBjb25u ZWN0ICggc3NsU29ja2V0LCBTSUdOQUwgKCBzc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3NsRXJy b3I+JiApICksdGhpcywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RTc2xF cnJvcnMgKCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+JiApICkgKTsKLSAgICAgICAgICAgICAgICBo dHRwLT5zZXRTb2NrZXQoc3NsU29ja2V0KTsKLSAgICAgICAgICAgICAgICBzc2xTb2NrZXQtPmFk ZENhQ2VydGlmaWNhdGVzKGNvbmZpZy0+YnJva2VyQ2FDZXJ0RmlsZSwgUVNzbDo6UGVtKTsKLSAg ICAgICAgICAgICAgICB4MmdvRGVidWc8PCJDdXN0b20gQ0EgY2VydGlmaWNhdGUgZmlsZSBsb2Fk ZWQgaW50byBIVFRQUyBicm9rZXIgY2xpZW50OiAiPDxjb25maWctPmJyb2tlckNhQ2VydEZpbGU7 Ci0KLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgY29ubmVjdCAoIGh0dHAs IFNJR05BTCAoIHNzbEVycm9ycyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mICkgKSx0aGlzLAot ICAgICAgICAgICAgICAgICAgICAgICAgICBTTE9UICggc2xvdFNzbEVycm9ycyAoIGNvbnN0IFFM aXN0PFFTc2xFcnJvcj4mICkgKSApOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaHR0cC0+ c2V0SG9zdCAoIGx1cmwuaG9zdCgpLFFIdHRwOjpDb25uZWN0aW9uTW9kZUh0dHBzLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGx1cmwucG9ydCAoIDQ0MyApICk7Ci0gICAgICAgIH0gZWxz ZSB7Ci0gICAgICAgICAgICBodHRwLT5zZXRIb3N0ICggbHVybC5ob3N0KCksUUh0dHA6OkNvbm5l Y3Rpb25Nb2RlSHR0cCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBsdXJsLnBvcnQgKCA4 MCApICk7Ci0gICAgICAgIH0KLSAgICAgICAgY29ubmVjdCAoIGh0dHAsU0lHTkFMICggcmVxdWVz dEZpbmlzaGVkICggaW50LGJvb2wgKSApLHRoaXMsCi0gICAgICAgICAgICAgICAgICBTTE9UICgg c2xvdFJlcXVlc3RGaW5pc2hlZCAoIGludCxib29sICkgKSApOworICAgICAgICBjb25uZWN0ICgg aHR0cCxTSUdOQUwgKCBmaW5pc2hlZCAoUU5ldHdvcmtSZXBseSopICksdGhpcywKKyAgICAgICAg ICAgICAgICAgIFNMT1QgKCBzbG90UmVxdWVzdEZpbmlzaGVkIChRTmV0d29ya1JlcGx5KikgKSAp OwogICAgIH0KIH0KIApAQCAtMjQ4LDYgKzI0Miw3IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6 c2xvdFNzaFVzZXJBdXRoRXJyb3IoUVN0cmluZyBlcnJvcikKIHZvaWQgSHR0cEJyb2tlckNsaWVu dDo6Z2V0VXNlclNlc3Npb25zKCkKIHsKICAgICBRU3RyaW5nIGJyb2tlclVzZXI9Y29uZmlnLT5i cm9rZXJVc2VyOworeDJnb0RlYnVnPDwiY2FsbGVkIGdldFVzZXJTZXNzaW9uczogYnJva2VydXNl cjogIjw8YnJva2VyVXNlcjw8IiBicm9rZXJwYXNzOiAiPDxjb25maWctPmJyb2tlclBhc3M8PCIg YXV0aGlkOiAiPDxjb25maWctPmJyb2tlclVzZXJJZDsKICAgICBpZihtYWluV2luZG93LT5nZXRV c2VQR1BDYXJkKCkpCiAgICAgICAgIGJyb2tlclVzZXI9bWFpbldpbmRvdy0+Z2V0Q2FyZExvZ2lu KCk7CiAgICAgY29uZmlnLT5zZXNzaW9uZGF0YT1RU3RyaW5nOjpudWxsOwpAQCAtMjU5LDEwICsy NTQsMTEgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpnZXRVc2VyU2Vzc2lvbnMoKQogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAidXNlcj0iPDxicm9rZXJVc2VyPDwiJiI8PAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAicGFzc3dvcmQ9Ijw8Y29uZmlnLT5icm9rZXJQYXNzPDwi JiI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8PGNvbmZpZy0+YnJv a2VyVXNlcklkOwotICAgICAgICBRVXJsIGx1cmwgKCBjb25maWctPmJyb2tlcnVybCApOwotICAg ICAgICBodHRwU2Vzc2lvbkFuc3dlci5jbG9zZSgpOwotICAgICAgICBodHRwU2Vzc2lvbkFuc3dl ci5zZXREYXRhICggMCwwICk7Ci0gICAgICAgIHNlc3Npb25zUmVxdWVzdD1odHRwLT5wb3N0ICgg bHVybC5wYXRoKCkscmVxLnRvVXRmOCgpLCZodHRwU2Vzc2lvbkFuc3dlciApOworCisgICAgICAg IHgyZ29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOworCSAgICBR TmV0d29ya1JlcXVlc3QgcmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSk7CisJICAgIHJl cXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVIZWFkZXIsICJhcHBs aWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKKyAgICAgICAgc2Vzc2lvbnNSZXF1ZXN0 PWh0dHAtPnBvc3QgKHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOwogICAgIH0KICAgICBlbHNlCiAg ICAgewpAQCAtMjgzLDYgKzI3OSw3IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Z2V0VXNlclNl c3Npb25zKCkKIAogdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzZWxlY3RVc2VyU2Vzc2lvbihjb25z dCBRU3RyaW5nJiBzZXNzaW9uKQogeworICAgIHgyZ29EZWJ1Zzw8ImNhbGxlZCBzZWxlY3RVc2Vy U2Vzc2lvbnMiOwogICAgIFFTdHJpbmcgYnJva2VyVXNlcj1jb25maWctPmJyb2tlclVzZXI7CiAg ICAgaWYobWFpbldpbmRvdy0+Z2V0VXNlUEdQQ2FyZCgpKQogICAgICAgICBicm9rZXJVc2VyPW1h aW5XaW5kb3ctPmdldENhcmRMb2dpbigpOwpAQCAtMjk2LDEwICsyOTMsMTEgQEAgdm9pZCBIdHRw QnJva2VyQ2xpZW50OjpzZWxlY3RVc2VyU2Vzc2lvbihjb25zdCBRU3RyaW5nJiBzZXNzaW9uKQog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidXNlcj0iPDxicm9rZXJVc2VyPDwiJiI8PAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicGFzc3dvcmQ9Ijw8Y29uZmlnLT5icm9rZXJQ YXNzPDwiJiI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8PGNvbmZp Zy0+YnJva2VyVXNlcklkOwotICAgICAgICBRVXJsIGx1cmwgKCBjb25maWctPmJyb2tlcnVybCAp OwotICAgICAgICBodHRwU2Vzc2lvbkFuc3dlci5jbG9zZSgpOwotICAgICAgICBodHRwU2Vzc2lv bkFuc3dlci5zZXREYXRhICggMCwwICk7Ci0gICAgICAgIHNlbFNlc3NSZXF1ZXN0PWh0dHAtPnBv c3QgKCBsdXJsLnBhdGgoKSxyZXEudG9VdGY4KCksJmh0dHBTZXNzaW9uQW5zd2VyICk7CisgICAg ICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOworCSAg ICBRTmV0d29ya1JlcXVlc3QgcmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSk7CisJICAg IHJlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVIZWFkZXIsICJh cHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKKyAgICAgICAgc2Vzc2lvbnNSZXF1 ZXN0PWh0dHAtPnBvc3QgKHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOworCiAgICAgfQogICAgIGVs c2UKICAgICB7CkBAIC0zMzAsMTEgKzMyOCwxMSBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OmNo YW5nZVBhc3N3b3JkKFFTdHJpbmcgbmV3UGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgInVzZXI9Ijw8YnJva2VyVXNlcjw8IiYiPDwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgInBhc3N3b3JkPSI8PGNvbmZpZy0+YnJva2VyUGFzczw8IiYiPDwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgImF1dGhpZD0iPDxjb25maWctPmJyb2tlclVzZXJJZDsKLSAgICAgICAg UVVybCBsdXJsICggY29uZmlnLT5icm9rZXJ1cmwgKTsKLSAgICAgICAgaHR0cFNlc3Npb25BbnN3 ZXIuY2xvc2UoKTsKLSAgICAgICAgaHR0cFNlc3Npb25BbnN3ZXIuc2V0RGF0YSAoIDAsMCApOwot ICAgICAgICBjaFBhc3NSZXF1ZXN0PWh0dHAtPnBvc3QgKCBsdXJsLnBhdGgoKSxyZXEudG9VdGY4 KCksJmh0dHBTZXNzaW9uQW5zd2VyICk7Ci0gICAgfQorICAgICAgICB4MmdvRGVidWcgPDwgInNl bmRpbmcgcmVxdWVzdDogIjw8IHJlcS50b1V0ZjgoKTsKKwkgICAgUU5ldHdvcmtSZXF1ZXN0IHJl cXVlc3QoUVVybChjb25maWctPmJyb2tlcnVybCkpOworCSAgICByZXF1ZXN0LnNldEhlYWRlcihR TmV0d29ya1JlcXVlc3Q6OkNvbnRlbnRUeXBlSGVhZGVyLCAiYXBwbGljYXRpb24veC13d3ctZm9y bS11cmxlbmNvZGVkIik7CisgICAgICAgIHNlc3Npb25zUmVxdWVzdD1odHRwLT5wb3N0IChyZXF1 ZXN0LCByZXEudG9VdGY4KCkgKTsKKwkJfQogICAgIGVsc2UKICAgICB7CiAgICAgICAgIGlmIChj b25maWctPmJyb2tlclVzZXJJZC5sZW5ndGgoKSA+IDApIHsKQEAgLTM0OSwxNyArMzQ3LDE3IEBA IHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Y2hhbmdlUGFzc3dvcmQoUVN0cmluZyBuZXdQYXNzKQog CiB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnRlc3RDb25uZWN0aW9uKCkKIHsKKyAgICB4MmdvRGVi dWc8PCJjYWxsZWQgdGVzdENvbm5lY3Rpb24iOwogICAgIGlmKCFzc2hCcm9rZXIpCiAgICAgewog ICAgICAgICBRU3RyaW5nIHJlcTsKICAgICAgICAgUVRleHRTdHJlYW0gKCAmcmVxICkgPDwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgInRhc2s9dGVzdGNvbiI7Ci0gICAgICAgIFFVcmwg bHVybCAoIGNvbmZpZy0+YnJva2VydXJsICk7Ci0gICAgICAgIGh0dHBTZXNzaW9uQW5zd2VyLmNs b3NlKCk7Ci0gICAgICAgIGh0dHBTZXNzaW9uQW5zd2VyLnNldERhdGEgKCAwLDAgKTsKLSAgICAg ICAgcmVxdWVzdFRpbWUuc3RhcnQoKTsKLSAgICAgICAgdGVzdENvblJlcXVlc3Q9aHR0cC0+cG9z dCAoIGx1cmwucGF0aCgpLHJlcS50b1V0ZjgoKSwmaHR0cFNlc3Npb25BbnN3ZXIgKTsKLSAgICB9 CisgICAgICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgp OworCSAgICBRTmV0d29ya1JlcXVlc3QgcmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSk7 CisJICAgIHJlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVIZWFk ZXIsICJhcHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKKyAgICAgICAgc2Vzc2lv bnNSZXF1ZXN0PWh0dHAtPnBvc3QgKHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOworCX0KICAgICBl bHNlCiAgICAgewogICAgICAgICBpZiAoY29uZmlnLT5icm9rZXJVc2VySWQubGVuZ3RoKCkgPiAw KSB7CkBAIC0zOTIsNiArMzkwLDcgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpjcmVhdGVJbmlG aWxlKGNvbnN0IFFTdHJpbmcmIHJhd19jb250ZW50KQogCiBib29sIEh0dHBCcm9rZXJDbGllbnQ6 OmNoZWNrQWNjZXNzKFFTdHJpbmcgYW5zd2VyICkKIHsKKyAgICB4MmdvRGVidWc8PCJjYWxsZWQg Y2hlY2tBY2Nlc3MgLSBhbnN3ZXIgd2FzOiAiPDxhbnN3ZXI7CiAgICAgaWYgKGFuc3dlci5pbmRl eE9mKCJBY2Nlc3MgZ3JhbnRlZCIpPT0tMSkKICAgICB7CiAgICAgICAgIFFNZXNzYWdlQm94Ojpj cml0aWNhbCAoCkBAIC00MDgsNiArNDA3LDcgQEAgYm9vbCBIdHRwQnJva2VyQ2xpZW50OjpjaGVj a0FjY2VzcyhRU3RyaW5nIGFuc3dlciApCiAKIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6c2xvdENv bm5lY3Rpb25UZXN0KGJvb2wgc3VjY2VzcywgUVN0cmluZyBhbnN3ZXIsIGludCkKIHsKK3gyZ29E ZWJ1Zzw8ImNhbGxlZCBzbG90Q29ubmVjdGlvblRlc3QiOwogICAgIGlmKCFzdWNjZXNzKQogICAg IHsKICAgICAgICAgeDJnb0RlYnVnPDxhbnN3ZXI7CkBAIC00MTksOCArNDE5LDggQEAgdm9pZCBI dHRwQnJva2VyQ2xpZW50OjpzbG90Q29ubmVjdGlvblRlc3QoYm9vbCBzdWNjZXNzLCBRU3RyaW5n IGFuc3dlciwgaW50KQogICAgICAgICByZXR1cm47CiAgICAgaWYoIXNzaEJyb2tlcikKICAgICB7 Ci0gICAgICAgIHgyZ29EZWJ1Zzw8ImVsYXBzZWQ6ICI8PHJlcXVlc3RUaW1lLmVsYXBzZWQoKTw8 InJlY2VpdmVkOiI8PGh0dHBTZXNzaW9uQW5zd2VyLnNpemUoKTw8ZW5kbDsKLSAgICAgICAgZW1p dCBjb25uZWN0aW9uVGltZShyZXF1ZXN0VGltZS5lbGFwc2VkKCksaHR0cFNlc3Npb25BbnN3ZXIu c2l6ZSgpKTsKKyAgICAgICB4MmdvRGVidWc8PCJlbGFwc2VkOiAiPDxyZXF1ZXN0VGltZS5lbGFw c2VkKCk8PCJyZWNlaXZlZDoiPDxhbnN3ZXIuc2l6ZSgpPDxlbmRsOworICAgICAgIGVtaXQgY29u bmVjdGlvblRpbWUocmVxdWVzdFRpbWUuZWxhcHNlZCgpLGFuc3dlci5zaXplKCkpOwogICAgIH0K ICAgICByZXR1cm47CiAKQEAgLTQ3MSwzNiArNDcxLDM4IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVu dDo6c2xvdFNlbGVjdFNlc3Npb24oYm9vbCBzdWNjZXNzLCBRU3RyaW5nIGFuc3dlciwgaW50KQog fQogCiAKLXZvaWQgSHR0cEJyb2tlckNsaWVudDo6c2xvdFJlcXVlc3RGaW5pc2hlZCAoIGludCBp ZCwgYm9vbCBlcnJvciApCi17Ci0vLyAgIAl4MmdvRGVidWc8PCJodHRwIHJlcXVlc3QgIjw8aWQ8 PCIsIGZpbmlzaGVkIHdpdGg6ICI8PGVycm9yOwotCi0gICAgaWYgKCBlcnJvciApCi0gICAgewot ICAgICAgICB4MmdvRGVidWc8PGh0dHAtPmVycm9yU3RyaW5nKCk7Ci0gICAgICAgIFFNZXNzYWdl Qm94Ojpjcml0aWNhbCgwLHRyKCJFcnJvciIpLGh0dHAtPmVycm9yU3RyaW5nKCkpOwotICAgICAg ICBlbWl0IGZhdGFsSHR0cEVycm9yKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Cit2b2lkIEh0 dHBCcm9rZXJDbGllbnQ6OnNsb3RSZXF1ZXN0RmluaXNoZWQgKCBRTmV0d29ya1JlcGx5KiAgcmVw bHkgKQorewkKKwlpZihyZXBseS0+ZXJyb3IoKSAhPSBRTmV0d29ya1JlcGx5OjpOb0Vycm9yKQor CQl7CisJCQl4MmdvRGVidWc8PCJCcm9rZXIgSFRUUCByZXF1ZXN0IGZhaWxlZCB3aXRoIGVycm9y OiAiPDxyZXBseS0+ZXJyb3JTdHJpbmcoKTsKKwkJCVFNZXNzYWdlQm94Ojpjcml0aWNhbCgwLHRy KCJFcnJvciIpLHJlcGx5LT5lcnJvclN0cmluZygpKTsKKwkJCWVtaXQgZmF0YWxIdHRwRXJyb3Io KTsKKwkJCXJldHVybjsKKwkJfQogCi0gICAgUVN0cmluZyBhbnN3ZXIgKCBodHRwU2Vzc2lvbkFu c3dlci5kYXRhKCkgKTsKLSAgICB4MmdvRGVidWc8PCJjbWQgcmVxdWVzdCBhbnN3ZXI6ICI8PGFu c3dlcjsKLSAgICBpZiAoaWQ9PXRlc3RDb25SZXF1ZXN0KQorICAgIFFTdHJpbmcgYW5zd2VyICgg cmVwbHktPnJlYWRBbGwoKSApOworICAgIHgyZ29EZWJ1Zzw8IkEgaHR0cCByZXF1ZXN0IHJldHVy bmVkLiAgUmVzdWx0IHdhczogIjw8YW5zd2VyOworICAgIGlmIChyZXBseSA9PSB0ZXN0Q29uUmVx dWVzdCkKICAgICB7CiAgICAgICAgIHNsb3RDb25uZWN0aW9uVGVzdCh0cnVlLGFuc3dlciwwKTsK ICAgICB9Ci0gICAgaWYgKGlkID09IHNlc3Npb25zUmVxdWVzdCkKKyAgICBpZiAocmVwbHkgPT0g c2Vzc2lvbnNSZXF1ZXN0KQogICAgIHsKICAgICAgICAgc2xvdExpc3RTZXNzaW9ucyh0cnVlLCBh bnN3ZXIsMCk7CiAgICAgfQotICAgIGlmIChpZCA9PSBzZWxTZXNzUmVxdWVzdCkKKyAgICBpZiAo cmVwbHkgPT0gc2VsU2Vzc1JlcXVlc3QpCiAgICAgewogICAgICAgICBzbG90U2VsZWN0U2Vzc2lv bih0cnVlLGFuc3dlciwwKTsKICAgICB9Ci0gICAgaWYgKCBpZCA9PSBjaFBhc3NSZXF1ZXN0KQor ICAgIGlmIChyZXBseSA9PSBjaFBhc3NSZXF1ZXN0KQogICAgIHsKICAgICAgICAgc2xvdFBhc3ND aGFuZ2VkKHRydWUsYW5zd2VyLDApOwogICAgIH0KKworICAgIC8vIFdlIHJlY2VpdmUgb3duZXJz aGlwIG9mIHRoZSByZXBseSBvYmplY3QKKyAgICAvLyBhbmQgdGhlcmVmb3JlIG5lZWQgdG8gaGFu ZGxlIGRlbGV0aW9uLgorICAgIHJlcGx5LT5kZWxldGVMYXRlcigpOwogfQogCiB2b2lkIEh0dHBC cm9rZXJDbGllbnQ6OnBhcnNlU2Vzc2lvbihRU3RyaW5nIHNpbmZvKQpAQCAtNTM3LDcgKzUzOSw3 IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6cGFyc2VTZXNzaW9uKFFTdHJpbmcgc2luZm8pCiB9 CiAKIAotdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90U3NsRXJyb3JzICggY29uc3QgUUxpc3Q8 UVNzbEVycm9yPiAmIGVycm9ycyApCit2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RTc2xFcnJv cnMgKCBRTmV0d29ya1JlcGx5KiBuZXRSZXBseSwgY29uc3QgUUxpc3Q8UVNzbEVycm9yPiAmIGVy cm9ycyApCiB7CiAgICAgUVN0cmluZ0xpc3QgZXJyOwogICAgIFFTc2xDZXJ0aWZpY2F0ZSBjZXJ0 OwpAQCAtNTY0LDcgKzU2Niw3IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6c2xvdFNzbEVycm9y cyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4gJiBlcnJvcnMgKQogICAgICAgICBRU3NsQ2VydGlm aWNhdGUgbWNlcnQgKCAmZmwgKTsKICAgICAgICAgaWYgKCBtY2VydD09Y2VydCApCiAgICAgICAg IHsKLSAgICAgICAgICAgIGh0dHAtPmlnbm9yZVNzbEVycm9ycygpOworICAgICAgICAgICAgbmV0 UmVwbHktPmlnbm9yZVNzbEVycm9ycygpOwogICAgICAgICAgICAgcmVxdWVzdFRpbWUucmVzdGFy dCgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC02MzUsNyArNjM3LDcgQEAg dm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90U3NsRXJyb3JzICggY29uc3QgUUxpc3Q8UVNzbEVy cm9yPiAmIGVycm9ycyApCiAgICAgICAgIGZsLm9wZW4gKCBRSU9EZXZpY2U6OldyaXRlT25seSB8 IFFJT0RldmljZTo6VGV4dCApOwogICAgICAgICBRVGV4dFN0cmVhbSAoICZmbCApIDw8Y2VydC50 b1BlbSgpOwogICAgICAgICBmbC5jbG9zZSgpOwotICAgICAgICBodHRwLT5pZ25vcmVTc2xFcnJv cnMoKTsKKwkJbmV0UmVwbHktPmlnbm9yZVNzbEVycm9ycygpOwogICAgICAgICB4MmdvRGVidWc8 PCJzdG9yZSBjZXJ0aWZpY2F0ZSBpbiAgIjw8aG9tZURpcisiLy54MmdvL3NzbC9leGNlcHRpb25z LyIrCiAgICAgICAgICAgICAgICAgIGx1cmwuaG9zdCgpICsiLyIrZm5hbWU7CiAgICAgICAgIHJl cXVlc3RUaW1lLnJlc3RhcnQoKTsKZGlmZiAtLWdpdCBhL2h0dHBicm9rZXJjbGllbnQuaCBiL2h0 dHBicm9rZXJjbGllbnQuaAppbmRleCA0ZWE0YTNkLi41MmU0YmViIDEwMDY0NAotLS0gYS9odHRw YnJva2VyY2xpZW50LmgKKysrIGIvaHR0cGJyb2tlcmNsaWVudC5oCkBAIC0xOCw2ICsxOCwxMCBA QAogI2lmbmRlZiBIVFRQQlJPS0VSQ0xJRU5UX0gKICNkZWZpbmUgSFRUUEJST0tFUkNMSUVOVF9I CiAjaW5jbHVkZSAieDJnb2NsaWVudGNvbmZpZy5oIgorI2luY2x1ZGUgPFFOZXR3b3JrQWNjZXNz TWFuYWdlcj4KKyNpbmNsdWRlIDxRVXJsPgorI2luY2x1ZGUgPFFOZXR3b3JrUmVxdWVzdD4KKyNp bmNsdWRlIDxRTmV0d29ya1JlcGx5PgogI2luY2x1ZGUgPFFTc2xFcnJvcj4KICNpbmNsdWRlIDxR QnVmZmVyPgogI2luY2x1ZGUgPFFPYmplY3Q+CkBAIC0yNyw3ICszMSw3IEBACiAvKioKIAlAYXV0 aG9yIE9sZWtzYW5kciBTaG5leWRlciA8b2xla3NhbmRyLnNobmV5ZGVyQG9idmlvdXNseS1uaWNl LmRlPgogKi8KLWNsYXNzIFFIdHRwOworY2xhc3MgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOwogc3Ry dWN0IENvbmZpZ0ZpbGU7CiBjbGFzcyBPTk1haW5XaW5kb3c7CiAKQEAgLTQxLDE0ICs0NSwxNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBjaGFuZ2VQYXNzd29yZChRU3RyaW5nIG5ld1Bhc3MpOwogICAg IHZvaWQgdGVzdENvbm5lY3Rpb24oKTsKIHByaXZhdGU6Ci0gICAgUUJ1ZmZlciBodHRwQ21kQW5z d2VyOwotICAgIFFCdWZmZXIgaHR0cFNlc3Npb25BbnN3ZXI7Ci0gICAgUUh0dHAqIGh0dHA7Cisg ICAgLy9RQnVmZmVyIGh0dHBDbWRBbnN3ZXI7CisgICAgLy9RQnVmZmVyIGh0dHBTZXNzaW9uQW5z d2VyOworICAgIC8vUUh0dHAqIGh0dHA7CisgICAgLy9RTmV0d29ya1JlcGx5KiBuZXRSZXBseTsJ CisgICAgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKiBodHRwOworICAgIFFOZXR3b3JrUmVxdWVzdCog bmV0UmVxdWVzdDsKICAgICBRU3NsU29ja2V0KiBzc2xTb2NrZXQ7Ci0gICAgaW50IHNlc3Npb25z UmVxdWVzdDsKLSAgICBpbnQgc2VsU2Vzc1JlcXVlc3Q7Ci0gICAgaW50IGNoUGFzc1JlcXVlc3Q7 Ci0gICAgaW50IHRlc3RDb25SZXF1ZXN0OworICAgIFFOZXR3b3JrUmVwbHkqIHNlc3Npb25zUmVx dWVzdDsKKyAgICBRTmV0d29ya1JlcGx5KiBzZWxTZXNzUmVxdWVzdDsKKyAgICBRTmV0d29ya1Jl cGx5KiBjaFBhc3NSZXF1ZXN0OworICAgIFFOZXR3b3JrUmVwbHkqIHRlc3RDb25SZXF1ZXN0Owog ICAgIFFTdHJpbmcgbmV3QnJva2VyUGFzczsKICAgICBDb25maWdGaWxlKiBjb25maWc7CiAgICAg T05NYWluV2luZG93KiBtYWluV2luZG93OwpAQCAtNjIsOCArNjksOCBAQCBwcml2YXRlOgogICAg IGJvb2wgY2hlY2tBY2Nlc3MoUVN0cmluZyBhbnN3ZXIpOwogCiBwcml2YXRlIHNsb3RzOgotICAg IHZvaWQgc2xvdFJlcXVlc3RGaW5pc2hlZCAoIGludCBpZCwgYm9vbCBlcnJvciApOwotICAgIHZv aWQgc2xvdFNzbEVycm9ycyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4gJiBlcnJvcnMgKSA7Cisg ICAgdm9pZCBzbG90UmVxdWVzdEZpbmlzaGVkICggUU5ldHdvcmtSZXBseSogIHJlcGx5ICk7Cisg ICAgdm9pZCBzbG90U3NsRXJyb3JzICggUU5ldHdvcmtSZXBseSogbmV0UmVwbHksIGNvbnN0IFFM aXN0PFFTc2xFcnJvcj4gJiBlcnJvcnMgKSA7CiAgICAgUVN0cmluZyBnZXRIZXhWYWwgKCBjb25z dCBRQnl0ZUFycmF5JiBiYSApOwogICAgIHZvaWQgc2xvdFNzaENvbm5lY3Rpb25FcnJvciAoIFFT dHJpbmcgbWVzc2FnZSwgUVN0cmluZyBsYXN0U2Vzc2lvbkVycm9yICk7CiAgICAgdm9pZCBzbG90 U3NoU2VydmVyQXV0aEVycm9yICggaW50IGVycm9yLCBRU3RyaW5nIHNzaE1lc3NhZ2UsIFNzaE1h c3RlckNvbm5lY3Rpb24qIGNvbm5lY3Rpb24gKTsK --531094cb_1f0e5d0d_233f--