From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: Convert from using QHttp to QNetworkAccessManager for Session Broker Reply-To: Joshua Lukens , 440@bugs.x2go.org Resent-From: Joshua Lukens Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Thu, 27 Feb 2014 14:45:01 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: report 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: Received: via spool by submit@bugs.x2go.org id=B.139351210112710 (code B); Thu, 27 Feb 2014 14:45:01 +0000 Received: (at submit) by bugs.x2go.org; 27 Feb 2014 14:41:41 +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 1502 seconds by postgrey-1.34 at ymir; Thu, 27 Feb 2014 15:41:39 CET Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir (Postfix) with ESMTP id 01BD95DB16 for ; Thu, 27 Feb 2014 15:41:39 +0100 (CET) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id 706891AC0C7 for ; Thu, 27 Feb 2014 09:16:30 -0500 (EST) Date: Thu, 27 Feb 2014 09:16:29 -0500 From: Joshua Lukens To: submit@bugs.x2go.org Message-ID: <84F7E80E06784E5695FC31F4E72E3DC0@botch.com> X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="530f48bd_567bd50a_233f" --530f48bd_567bd50a_233f Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Package: x2goclient Version: 4.0.1.3 Severity: wishlist QT lists QHttp as "This class is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code." The current preferred method for making http/https request is to use QNetworkAccessManager. The attached patch makes that conversion. I've done light testing on patch with both OSX and Windows clients and it appears functional. --530f48bd_567bd50a_233f Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="switch-to-QNetworkAccessManager.patch" Y29tbWl0IDAwYjgwOWQ4MDlhZTRjYTY5MWQ1YTRlMmZhNjYxN2RlNzZjZmRjMGIKQXV0aG9yOiBK b3NoIEx1a2VucyA8amx1a2Vuc0Bib3RjaC5jb20+CkRhdGU6ICAgVGh1IEZlYiAyNyAwOTowNToy OCAyMDE0IC0wNTAwCgogICAgQ29udmVydCBmcm9tIHVzaW5nIFFIdHRwIHRvIFFOZXR3b3JrQWNj ZXNzTWFuYWdlciBmb3IgU2Vzc2lvbiBCcm9rZXIKCmRpZmYgLS1naXQgYS9odHRwYnJva2VyY2xp ZW50LmNwcCBiL2h0dHBicm9rZXJjbGllbnQuY3BwCmluZGV4IGQyMzhkODIuLjgyNzNkN2MgMTAw NjQ0Ci0tLSBhL2h0dHBicm9rZXJjbGllbnQuY3BwCisrKyBiL2h0dHBicm9rZXJjbGllbnQuY3Bw CkBAIC0xNiw4ICsxNiwxMCBAQAogKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogCiAjaW5jbHVkZSAiaHR0 cGJyb2tlcmNsaWVudC5oIgorI2luY2x1ZGUgPFFOZXR3b3JrQWNjZXNzTWFuYWdlcj4KICNpbmNs dWRlIDxRVXJsPgotI2luY2x1ZGUgPFFIdHRwPgorI2luY2x1ZGUgPFFOZXR3b3JrUmVxdWVzdD4K KyNpbmNsdWRlIDxRTmV0d29ya1JlcGx5PgogI2luY2x1ZGUgPFFUZXh0U3RyZWFtPgogI2luY2x1 ZGUgPFFGaWxlPgogI2luY2x1ZGUgPFFEaXI+CkBAIC0zNCw2ICszNiw3IEBACiAjaW5jbHVkZSA8 UVRlbXBvcmFyeUZpbGU+CiAjaW5jbHVkZSA8UUlucHV0RGlhbG9nPgogCisKIEh0dHBCcm9rZXJD bGllbnQ6Okh0dHBCcm9rZXJDbGllbnQgKCBPTk1haW5XaW5kb3cqIHduZCwgQ29uZmlnRmlsZSog Y2ZnICkKIHsKICAgICBjb25maWc9Y2ZnOwpAQCAtNTYsMzAgKzU5LDE5IEBAIEh0dHBCcm9rZXJD bGllbnQ6Okh0dHBCcm9rZXJDbGllbnQgKCBPTk1haW5XaW5kb3cqIHduZCwgQ29uZmlnRmlsZSog Y2ZnICkKICAgICB7CiAgICAgICAgIHNzaEJyb2tlcj1mYWxzZTsKIAotICAgICAgICBodHRwPW5l dyBRSHR0cCAoIHRoaXMgKTsKLQotICAgICAgICBpZiAoIGNvbmZpZy0+YnJva2VydXJsLmluZGV4 T2YgKCAiaHR0cHM6Ly8iICkgPT0wICkgewotICAgICAgICAgICAgaWYgKChjb25maWctPmJyb2tl ckNhQ2VydEZpbGUubGVuZ3RoKCkgPjApICYmIChRRmlsZTo6ZXhpc3RzKGNvbmZpZy0+YnJva2Vy Q2FDZXJ0RmlsZSkpKSB7Ci0KLSAgICAgICAgICAgICAgICBzc2xTb2NrZXQgPSBuZXcgUVNzbFNv Y2tldCh0aGlzKTsKLSAgICAgICAgICAgICAgICBjb25uZWN0ICggc3NsU29ja2V0LCBTSUdOQUwg KCBzc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+JiApICksdGhpcywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RTc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3Ns RXJyb3I+JiApICkgKTsKLSAgICAgICAgICAgICAgICBodHRwLT5zZXRTb2NrZXQoc3NsU29ja2V0 KTsKLSAgICAgICAgICAgICAgICBzc2xTb2NrZXQtPmFkZENhQ2VydGlmaWNhdGVzKGNvbmZpZy0+ YnJva2VyQ2FDZXJ0RmlsZSwgUVNzbDo6UGVtKTsKLSAgICAgICAgICAgICAgICB4MmdvRGVidWc8 PCJDdXN0b20gQ0EgY2VydGlmaWNhdGUgZmlsZSBsb2FkZWQgaW50byBIVFRQUyBicm9rZXIgY2xp ZW50OiAiPDxjb25maWctPmJyb2tlckNhQ2VydEZpbGU7CisgICAgICAgIGlmICgoY29uZmlnLT5i cm9rZXJDYUNlcnRGaWxlLmxlbmd0aCgpID4wKSAmJiAoUUZpbGU6OmV4aXN0cyhjb25maWctPmJy b2tlckNhQ2VydEZpbGUpKSkgewkJCQkKKyAgICAgICAgICAgIFFTc2xTb2NrZXQ6OmFkZERlZmF1 bHRDYUNlcnRpZmljYXRlcyhjb25maWctPmJyb2tlckNhQ2VydEZpbGUsIFFTc2w6OlBlbSk7CisJ CSAgICB4MmdvRGVidWc8PCJDdXN0b20gQ0EgY2VydGlmaWNhdGUgZmlsZSBsb2FkZWQgaW50byBI VFRQUyBicm9rZXIgY2xpZW50OiAiPDxjb25maWctPmJyb2tlckNhQ2VydEZpbGU7CisJICAgIH0K KwkgICAKKyAgICAgICAgaHR0cD1uZXcgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyICggdGhpcyApOwor ICAgICAgICB4MmdvRGVidWc8PCJTZXR0aW5nIHVwIGNvbm5lY3Rpb24gdG8gYnJva2VyOiAiPDxj b25maWctPmJyb2tlcnVybDsKKyAgICAgIAorICAgICAgICBjb25uZWN0ICggaHR0cCwgU0lHTkFM ICggc3NsRXJyb3JzICggUU5ldHdvcmtSZXBseSosIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mICkg KSx0aGlzLAorCSAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RTc2xFcnJvcnMgKCBRTmV0d29y a1JlcGx5KiwgY29uc3QgUUxpc3Q8UVNzbEVycm9yPiYgKSApICk7CiAKLSAgICAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAgICAgY29ubmVjdCAoIGh0dHAsIFNJR05BTCAoIHNzbEVycm9y cyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mICkgKSx0aGlzLAotICAgICAgICAgICAgICAgICAg ICAgICAgICBTTE9UICggc2xvdFNzbEVycm9ycyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mICkg KSApOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaHR0cC0+c2V0SG9zdCAoIGx1cmwuaG9z dCgpLFFIdHRwOjpDb25uZWN0aW9uTW9kZUh0dHBzLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGx1cmwucG9ydCAoIDQ0MyApICk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBo dHRwLT5zZXRIb3N0ICggbHVybC5ob3N0KCksUUh0dHA6OkNvbm5lY3Rpb25Nb2RlSHR0cCwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBsdXJsLnBvcnQgKCA4MCApICk7Ci0gICAgICAgIH0K LSAgICAgICAgY29ubmVjdCAoIGh0dHAsU0lHTkFMICggcmVxdWVzdEZpbmlzaGVkICggaW50LGJv b2wgKSApLHRoaXMsCi0gICAgICAgICAgICAgICAgICBTTE9UICggc2xvdFJlcXVlc3RGaW5pc2hl ZCAoIGludCxib29sICkgKSApOworICAgICAgICBjb25uZWN0ICggaHR0cCxTSUdOQUwgKCBmaW5p c2hlZCAoUU5ldHdvcmtSZXBseSopICksdGhpcywKKyAgICAgICAgICAgICAgICAgIFNMT1QgKCBz bG90UmVxdWVzdEZpbmlzaGVkIChRTmV0d29ya1JlcGx5KikgKSApOwogICAgIH0KIH0KIApAQCAt OTMsMTMgKzg1LDEzIEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Y3JlYXRlU3NoQ29ubmVjdGlv bigpCiAgICAgUVVybCBsdXJsICggY29uZmlnLT5icm9rZXJ1cmwgKTsKICAgICBzc2hDb25uZWN0 aW9uPW5ldyBTc2hNYXN0ZXJDb25uZWN0aW9uICh0aGlzLCBsdXJsLmhvc3QoKSwgbHVybC5wb3J0 KDIyKSxmYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25maWctPmJyb2tlclVzZXIsIGNvbmZpZy0+YnJva2VyUGFzcyxjb25maWctPmJyb2tlclNzaEtl eSxjb25maWctPmJyb2tlckF1dG9sb2dpbiwKLQkJCQkJICAgY29uZmlnLT5icm9rZXJLcmJMb2dp biwgZmFsc2UpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bmZpZy0+YnJva2VyS3JiTG9naW4sIGZhbHNlKTsKIAogICAgIGNvbm5lY3QgKCBzc2hDb25uZWN0 aW9uLCBTSUdOQUwgKCBjb25uZWN0aW9uT2soUVN0cmluZykpLCB0aGlzLCBTTE9UICggc2xvdFNz aENvbm5lY3Rpb25PaygpICkgKTsKICAgICBjb25uZWN0ICggc3NoQ29ubmVjdGlvbiwgU0lHTkFM ICggc2VydmVyQXV0aEVycm9yICggaW50LFFTdHJpbmcsIFNzaE1hc3RlckNvbm5lY3Rpb24qICkg KSx0aGlzLAogICAgICAgICAgICAgICBTTE9UICggc2xvdFNzaFNlcnZlckF1dGhFcnJvciAoIGlu dCxRU3RyaW5nLCBTc2hNYXN0ZXJDb25uZWN0aW9uKiApICkgKTsKLSAgICBjb25uZWN0ICggc3No Q29ubmVjdGlvbiwgU0lHTkFMICggbmVlZFBhc3NQaHJhc2UoU3NoTWFzdGVyQ29ubmVjdGlvbiop KSx0aGlzLAotICAgICAgICAgICAgICBTTE9UICggc2xvdFNzaFNlcnZlckF1dGhQYXNzcGhyYXNl KFNzaE1hc3RlckNvbm5lY3Rpb24qKSkgKTsKKyAgICBjb25uZWN0ICggc3NoQ29ubmVjdGlvbiwg U0lHTkFMICggbmVlZFBhc3NQaHJhc2UoU3NoTWFzdGVyQ29ubmVjdGlvbiosIGJvb2wpKSx0aGlz LAorICAgICAgICAgICAgICBTTE9UICggc2xvdFNzaFNlcnZlckF1dGhQYXNzcGhyYXNlKFNzaE1h c3RlckNvbm5lY3Rpb24qLCBib29sKSkgKTsKICAgICBjb25uZWN0ICggc3NoQ29ubmVjdGlvbiwg U0lHTkFMICggdXNlckF1dGhFcnJvciAoIFFTdHJpbmcgKSApLHRoaXMsU0xPVCAoIHNsb3RTc2hV c2VyQXV0aEVycm9yICggUVN0cmluZyApICkgKTsKICAgICBjb25uZWN0ICggc3NoQ29ubmVjdGlv biwgU0lHTkFMICggY29ubmVjdGlvbkVycm9yKFFTdHJpbmcsUVN0cmluZykpLCB0aGlzLAogICAg ICAgICAgICAgICBTTE9UICggc2xvdFNzaENvbm5lY3Rpb25FcnJvciAoIFFTdHJpbmcsUVN0cmlu ZyApICkgKTsKQEAgLTE5OSwxMSArMTkxLDIzIEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6c2xv dFNzaFNlcnZlckF1dGhFcnJvcihpbnQgZXJyb3IsIFFTdHJpbmcgc3NoTWVzc2FnZSwgU3NoCiAK IH0KIAotdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90U3NoU2VydmVyQXV0aFBhc3NwaHJhc2Uo U3NoTWFzdGVyQ29ubmVjdGlvbiogY29ubmVjdGlvbikKK3ZvaWQgSHR0cEJyb2tlckNsaWVudDo6 c2xvdFNzaFNlcnZlckF1dGhQYXNzcGhyYXNlKFNzaE1hc3RlckNvbm5lY3Rpb24qIGNvbm5lY3Rp b24sIGJvb2wgdmVyaWZpY2F0aW9uQ29kZSkKIHsKICAgICBib29sIG9rOworICAgIFFTdHJpbmcg bWVzc2FnZTsKKworICAgIGlmKHZlcmlmaWNhdGlvbkNvZGUpCisgICAgeworICAgICAgICBtZXNz YWdlPXRyKCJWZXJpZmljYXRpb24gY29kZToiKTsKKyAgICB9CisgICAgZWxzZQorICAgIHsKKyAg ICAgICAgbWVzc2FnZT10cigiRW50ZXIgcGFzc3BocmFzZSB0byBkZWNyeXB0IGEga2V5Iik7Cisg ICAgfQorCisKICAgICBRU3RyaW5nIHBocmFzZT1RSW5wdXREaWFsb2c6OmdldFRleHQoMCxjb25u ZWN0aW9uLT5nZXRVc2VyKCkrIkAiK2Nvbm5lY3Rpb24tPmdldEhvc3QoKSsiOiIrUVN0cmluZzo6 bnVtYmVyKGNvbm5lY3Rpb24tPmdldFBvcnQoKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHRyKCJFbnRlciBwYXNzcGhyYXNlIHRvIGRlY3J5cHQgYSBrZXkiKSxR TGluZUVkaXQ6OlBhc3N3b3JkLFFTdHJpbmc6Om51bGwsICZvayk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2UsIFFMaW5lRWRpdDo6UGFzc3dvcmQsUVN0 cmluZzo6bnVsbCwgJm9rKTsKICAgICBpZighb2spCiAgICAgewogICAgICAgICBwaHJhc2U9UVN0 cmluZzo6bnVsbDsKQEAgLTIzNiw2ICsyNDAsNyBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNs b3RTc2hVc2VyQXV0aEVycm9yKFFTdHJpbmcgZXJyb3IpCiB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6 OmdldFVzZXJTZXNzaW9ucygpCiB7CiAgICAgUVN0cmluZyBicm9rZXJVc2VyPWNvbmZpZy0+YnJv a2VyVXNlcjsKK3gyZ29EZWJ1Zzw8ImNhbGxlZCBnZXRVc2VyU2Vzc2lvbnM6IGJyb2tlcnVzZXI6 ICI8PGJyb2tlclVzZXI8PCIgYnJva2VycGFzczogIjw8Y29uZmlnLT5icm9rZXJQYXNzPDwiIGF1 dGhpZDogIjw8Y29uZmlnLT5icm9rZXJVc2VySWQ7CiAgICAgaWYobWFpbldpbmRvdy0+Z2V0VXNl UEdQQ2FyZCgpKQogICAgICAgICBicm9rZXJVc2VyPW1haW5XaW5kb3ctPmdldENhcmRMb2dpbigp OwogICAgIGNvbmZpZy0+c2Vzc2lvbmRhdGE9UVN0cmluZzo6bnVsbDsKQEAgLTI0NywxMCArMjUy LDkgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpnZXRVc2VyU2Vzc2lvbnMoKQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAidXNlcj0iPDxicm9rZXJVc2VyPDwiJiI8PAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAicGFzc3dvcmQ9Ijw8Y29uZmlnLT5icm9rZXJQYXNzPDwiJiI8 PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8PGNvbmZpZy0+YnJva2Vy VXNlcklkOwotICAgICAgICBRVXJsIGx1cmwgKCBjb25maWctPmJyb2tlcnVybCApOwotICAgICAg ICBodHRwU2Vzc2lvbkFuc3dlci5jbG9zZSgpOwotICAgICAgICBodHRwU2Vzc2lvbkFuc3dlci5z ZXREYXRhICggMCwwICk7Ci0gICAgICAgIHNlc3Npb25zUmVxdWVzdD1odHRwLT5wb3N0ICggbHVy bC5wYXRoKCkscmVxLnRvVXRmOCgpLCZodHRwU2Vzc2lvbkFuc3dlciApOworCisgICAgICAgIHgy Z29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOworICAgICAgICBz ZXNzaW9uc1JlcXVlc3Q9aHR0cC0+cG9zdCAoIFFOZXR3b3JrUmVxdWVzdChRVXJsKGNvbmZpZy0+ YnJva2VydXJsKSkscmVxLnRvVXRmOCgpICk7CiAgICAgfQogICAgIGVsc2UKICAgICB7CkBAIC0y NzEsNiArMjc1LDcgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpnZXRVc2VyU2Vzc2lvbnMoKQog CiB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNlbGVjdFVzZXJTZXNzaW9uKGNvbnN0IFFTdHJpbmcm IHNlc3Npb24pCiB7CisgICAgeDJnb0RlYnVnPDwiY2FsbGVkIHNlbGVjdFVzZXJTZXNzaW9ucyI7 CiAgICAgUVN0cmluZyBicm9rZXJVc2VyPWNvbmZpZy0+YnJva2VyVXNlcjsKICAgICBpZihtYWlu V2luZG93LT5nZXRVc2VQR1BDYXJkKCkpCiAgICAgICAgIGJyb2tlclVzZXI9bWFpbldpbmRvdy0+ Z2V0Q2FyZExvZ2luKCk7CkBAIC0yODQsMTAgKzI4OSw5IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVu dDo6c2VsZWN0VXNlclNlc3Npb24oY29uc3QgUVN0cmluZyYgc2Vzc2lvbikKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInVzZXI9Ijw8YnJva2VyVXNlcjw8IiYiPDwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInBhc3N3b3JkPSI8PGNvbmZpZy0+YnJva2VyUGFzczw8IiYiPDwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImF1dGhpZD0iPDxjb25maWctPmJyb2tlclVz ZXJJZDsKLSAgICAgICAgUVVybCBsdXJsICggY29uZmlnLT5icm9rZXJ1cmwgKTsKLSAgICAgICAg aHR0cFNlc3Npb25BbnN3ZXIuY2xvc2UoKTsKLSAgICAgICAgaHR0cFNlc3Npb25BbnN3ZXIuc2V0 RGF0YSAoIDAsMCApOwotICAgICAgICBzZWxTZXNzUmVxdWVzdD1odHRwLT5wb3N0ICggbHVybC5w YXRoKCkscmVxLnRvVXRmOCgpLCZodHRwU2Vzc2lvbkFuc3dlciApOworICAgICAgICB4MmdvRGVi dWcgPDwgInNlbmRpbmcgcmVxdWVzdDogIjw8IHJlcS50b1V0ZjgoKTsKKwkJc2VsU2Vzc1JlcXVl c3Q9aHR0cC0+cG9zdCAoICBRTmV0d29ya1JlcXVlc3QoUVVybChjb25maWctPmJyb2tlcnVybCkp LHJlcS50b1V0ZjgoKSApOworCiAgICAgfQogICAgIGVsc2UKICAgICB7CkBAIC0zMTgsMTEgKzMy Miw5IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Y2hhbmdlUGFzc3dvcmQoUVN0cmluZyBuZXdQ YXNzKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidXNlcj0iPDxicm9rZXJVc2VyPDwi JiI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicGFzc3dvcmQ9Ijw8Y29uZmlnLT5i cm9rZXJQYXNzPDwiJiI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8 PGNvbmZpZy0+YnJva2VyVXNlcklkOwotICAgICAgICBRVXJsIGx1cmwgKCBjb25maWctPmJyb2tl cnVybCApOwotICAgICAgICBodHRwU2Vzc2lvbkFuc3dlci5jbG9zZSgpOwotICAgICAgICBodHRw U2Vzc2lvbkFuc3dlci5zZXREYXRhICggMCwwICk7Ci0gICAgICAgIGNoUGFzc1JlcXVlc3Q9aHR0 cC0+cG9zdCAoIGx1cmwucGF0aCgpLHJlcS50b1V0ZjgoKSwmaHR0cFNlc3Npb25BbnN3ZXIgKTsK LSAgICB9CisgICAgICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRv VXRmOCgpOworICAgICAgICBjaFBhc3NSZXF1ZXN0PWh0dHAtPnBvc3QgKCAgUU5ldHdvcmtSZXF1 ZXN0KFFVcmwoY29uZmlnLT5icm9rZXJ1cmwpKSxyZXEudG9VdGY4KCkgKTsKKwkJfQogICAgIGVs c2UKICAgICB7CiAgICAgICAgIGlmIChjb25maWctPmJyb2tlclVzZXJJZC5sZW5ndGgoKSA+IDAp IHsKQEAgLTMzNywxNyArMzM5LDE1IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Y2hhbmdlUGFz c3dvcmQoUVN0cmluZyBuZXdQYXNzKQogCiB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnRlc3RDb25u ZWN0aW9uKCkKIHsKKyAgICB4MmdvRGVidWc8PCJjYWxsZWQgdGVzdENvbm5lY3Rpb24iOwogICAg IGlmKCFzc2hCcm9rZXIpCiAgICAgewogICAgICAgICBRU3RyaW5nIHJlcTsKICAgICAgICAgUVRl eHRTdHJlYW0gKCAmcmVxICkgPDwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInRhc2s9 dGVzdGNvbiI7Ci0gICAgICAgIFFVcmwgbHVybCAoIGNvbmZpZy0+YnJva2VydXJsICk7Ci0gICAg ICAgIGh0dHBTZXNzaW9uQW5zd2VyLmNsb3NlKCk7Ci0gICAgICAgIGh0dHBTZXNzaW9uQW5zd2Vy LnNldERhdGEgKCAwLDAgKTsKLSAgICAgICAgcmVxdWVzdFRpbWUuc3RhcnQoKTsKLSAgICAgICAg dGVzdENvblJlcXVlc3Q9aHR0cC0+cG9zdCAoIGx1cmwucGF0aCgpLHJlcS50b1V0ZjgoKSwmaHR0 cFNlc3Npb25BbnN3ZXIgKTsKLSAgICB9CisgICAgICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyBy ZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOworICAgICAgICB0ZXN0Q29uUmVxdWVzdD1odHRwLT5w b3N0ICggIFFOZXR3b3JrUmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSkscmVxLnRvVXRm OCgpICk7CisJfQogICAgIGVsc2UKICAgICB7CiAgICAgICAgIGlmIChjb25maWctPmJyb2tlclVz ZXJJZC5sZW5ndGgoKSA+IDApIHsKQEAgLTM4MCw2ICszODAsNyBAQCB2b2lkIEh0dHBCcm9rZXJD bGllbnQ6OmNyZWF0ZUluaUZpbGUoY29uc3QgUVN0cmluZyYgcmF3X2NvbnRlbnQpCiAKIGJvb2wg SHR0cEJyb2tlckNsaWVudDo6Y2hlY2tBY2Nlc3MoUVN0cmluZyBhbnN3ZXIgKQogeworICAgIHgy Z29EZWJ1Zzw8ImNhbGxlZCBjaGVja0FjY2VzcyAtIGFuc3dlciB3YXM6ICI8PGFuc3dlcjsKICAg ICBpZiAoYW5zd2VyLmluZGV4T2YoIkFjY2VzcyBncmFudGVkIik9PS0xKQogICAgIHsKICAgICAg ICAgUU1lc3NhZ2VCb3g6OmNyaXRpY2FsICgKQEAgLTM5Niw2ICszOTcsNyBAQCBib29sIEh0dHBC cm9rZXJDbGllbnQ6OmNoZWNrQWNjZXNzKFFTdHJpbmcgYW5zd2VyICkKIAogdm9pZCBIdHRwQnJv a2VyQ2xpZW50OjpzbG90Q29ubmVjdGlvblRlc3QoYm9vbCBzdWNjZXNzLCBRU3RyaW5nIGFuc3dl ciwgaW50KQogeworeDJnb0RlYnVnPDwiY2FsbGVkIHNsb3RDb25uZWN0aW9uVGVzdCI7CiAgICAg aWYoIXN1Y2Nlc3MpCiAgICAgewogICAgICAgICB4MmdvRGVidWc8PGFuc3dlcjsKQEAgLTQwNyw4 ICs0MDksOCBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RDb25uZWN0aW9uVGVzdChib29s IHN1Y2Nlc3MsIFFTdHJpbmcgYW5zd2VyLCBpbnQpCiAgICAgICAgIHJldHVybjsKICAgICBpZigh c3NoQnJva2VyKQogICAgIHsKLSAgICAgICAgeDJnb0RlYnVnPDwiZWxhcHNlZDogIjw8cmVxdWVz dFRpbWUuZWxhcHNlZCgpPDwicmVjZWl2ZWQ6Ijw8aHR0cFNlc3Npb25BbnN3ZXIuc2l6ZSgpPDxl bmRsOwotICAgICAgICBlbWl0IGNvbm5lY3Rpb25UaW1lKHJlcXVlc3RUaW1lLmVsYXBzZWQoKSxo dHRwU2Vzc2lvbkFuc3dlci5zaXplKCkpOworICAgICAgIHgyZ29EZWJ1Zzw8ImVsYXBzZWQ6ICI8 PHJlcXVlc3RUaW1lLmVsYXBzZWQoKTw8InJlY2VpdmVkOiI8PGFuc3dlci5zaXplKCk8PGVuZGw7 CisgICAgICAgZW1pdCBjb25uZWN0aW9uVGltZShyZXF1ZXN0VGltZS5lbGFwc2VkKCksYW5zd2Vy LnNpemUoKSk7CiAgICAgfQogICAgIHJldHVybjsKIApAQCAtNDU5LDM2ICs0NjEsMzggQEAgdm9p ZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90U2VsZWN0U2Vzc2lvbihib29sIHN1Y2Nlc3MsIFFTdHJp bmcgYW5zd2VyLCBpbnQpCiB9CiAKIAotdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90UmVxdWVz dEZpbmlzaGVkICggaW50IGlkLCBib29sIGVycm9yICkKLXsKLS8vICAgCXgyZ29EZWJ1Zzw8Imh0 dHAgcmVxdWVzdCAiPDxpZDw8IiwgZmluaXNoZWQgd2l0aDogIjw8ZXJyb3I7Ci0KLSAgICBpZiAo IGVycm9yICkKLSAgICB7Ci0gICAgICAgIHgyZ29EZWJ1Zzw8aHR0cC0+ZXJyb3JTdHJpbmcoKTsK LSAgICAgICAgUU1lc3NhZ2VCb3g6OmNyaXRpY2FsKDAsdHIoIkVycm9yIiksaHR0cC0+ZXJyb3JT dHJpbmcoKSk7Ci0gICAgICAgIGVtaXQgZmF0YWxIdHRwRXJyb3IoKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KK3ZvaWQgSHR0cEJyb2tlckNsaWVudDo6c2xvdFJlcXVlc3RGaW5pc2hlZCAoIFFO ZXR3b3JrUmVwbHkqICByZXBseSApCit7CQorCWlmKHJlcGx5LT5lcnJvcigpICE9IFFOZXR3b3Jr UmVwbHk6Ok5vRXJyb3IpCisJCXsKKwkJCXgyZ29EZWJ1Zzw8IkJyb2tlciBIVFRQIHJlcXVlc3Qg ZmFpbGVkIHdpdGggZXJyb3I6ICI8PHJlcGx5LT5lcnJvclN0cmluZygpOworCQkJUU1lc3NhZ2VC b3g6OmNyaXRpY2FsKDAsdHIoIkVycm9yIikscmVwbHktPmVycm9yU3RyaW5nKCkpOworCQkJZW1p dCBmYXRhbEh0dHBFcnJvcigpOworCQkJcmV0dXJuOworCQl9CiAKLSAgICBRU3RyaW5nIGFuc3dl ciAoIGh0dHBTZXNzaW9uQW5zd2VyLmRhdGEoKSApOwotICAgIHgyZ29EZWJ1Zzw8ImNtZCByZXF1 ZXN0IGFuc3dlcjogIjw8YW5zd2VyOwotICAgIGlmIChpZD09dGVzdENvblJlcXVlc3QpCisgICAg UVN0cmluZyBhbnN3ZXIgKCByZXBseS0+cmVhZEFsbCgpICk7CisgICAgeDJnb0RlYnVnPDwiQSBo dHRwIHJlcXVlc3QgcmV0dXJuZWQuICBSZXN1bHQgd2FzOiAiPDxhbnN3ZXI7CisgICAgaWYgKHJl cGx5ID09IHRlc3RDb25SZXF1ZXN0KQogICAgIHsKICAgICAgICAgc2xvdENvbm5lY3Rpb25UZXN0 KHRydWUsYW5zd2VyLDApOwogICAgIH0KLSAgICBpZiAoaWQgPT0gc2Vzc2lvbnNSZXF1ZXN0KQor ICAgIGlmIChyZXBseSA9PSBzZXNzaW9uc1JlcXVlc3QpCiAgICAgewogICAgICAgICBzbG90TGlz dFNlc3Npb25zKHRydWUsIGFuc3dlciwwKTsKICAgICB9Ci0gICAgaWYgKGlkID09IHNlbFNlc3NS ZXF1ZXN0KQorICAgIGlmIChyZXBseSA9PSBzZWxTZXNzUmVxdWVzdCkKICAgICB7CiAgICAgICAg IHNsb3RTZWxlY3RTZXNzaW9uKHRydWUsYW5zd2VyLDApOwogICAgIH0KLSAgICBpZiAoIGlkID09 IGNoUGFzc1JlcXVlc3QpCisgICAgaWYgKHJlcGx5ID09IGNoUGFzc1JlcXVlc3QpCiAgICAgewog ICAgICAgICBzbG90UGFzc0NoYW5nZWQodHJ1ZSxhbnN3ZXIsMCk7CiAgICAgfQorCisgICAgLy8g V2UgcmVjZWl2ZSBvd25lcnNoaXAgb2YgdGhlIHJlcGx5IG9iamVjdAorICAgIC8vIGFuZCB0aGVy ZWZvcmUgbmVlZCB0byBoYW5kbGUgZGVsZXRpb24uCisgICAgcmVwbHktPmRlbGV0ZUxhdGVyKCk7 CiB9CiAKIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6cGFyc2VTZXNzaW9uKFFTdHJpbmcgc2luZm8p CkBAIC01MjUsNyArNTI5LDcgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpwYXJzZVNlc3Npb24o UVN0cmluZyBzaW5mbykKIH0KIAogCi12b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RTc2xFcnJv cnMgKCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+ICYgZXJyb3JzICkKK3ZvaWQgSHR0cEJyb2tlckNs aWVudDo6c2xvdFNzbEVycm9ycyAoIFFOZXR3b3JrUmVwbHkqIG5ldFJlcGx5LCBjb25zdCBRTGlz dDxRU3NsRXJyb3I+ICYgZXJyb3JzICkKIHsKICAgICBRU3RyaW5nTGlzdCBlcnI7CiAgICAgUVNz bENlcnRpZmljYXRlIGNlcnQ7CkBAIC01NTIsNyArNTU2LDcgQEAgdm9pZCBIdHRwQnJva2VyQ2xp ZW50OjpzbG90U3NsRXJyb3JzICggY29uc3QgUUxpc3Q8UVNzbEVycm9yPiAmIGVycm9ycyApCiAg ICAgICAgIFFTc2xDZXJ0aWZpY2F0ZSBtY2VydCAoICZmbCApOwogICAgICAgICBpZiAoIG1jZXJ0 PT1jZXJ0ICkKICAgICAgICAgewotICAgICAgICAgICAgaHR0cC0+aWdub3JlU3NsRXJyb3JzKCk7 CisgICAgICAgICAgICBuZXRSZXBseS0+aWdub3JlU3NsRXJyb3JzKCk7CiAgICAgICAgICAgICBy ZXF1ZXN0VGltZS5yZXN0YXJ0KCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAg LTYyMyw3ICs2MjcsNyBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RTc2xFcnJvcnMgKCBj b25zdCBRTGlzdDxRU3NsRXJyb3I+ICYgZXJyb3JzICkKICAgICAgICAgZmwub3BlbiAoIFFJT0Rl dmljZTo6V3JpdGVPbmx5IHwgUUlPRGV2aWNlOjpUZXh0ICk7CiAgICAgICAgIFFUZXh0U3RyZWFt ICggJmZsICkgPDxjZXJ0LnRvUGVtKCk7CiAgICAgICAgIGZsLmNsb3NlKCk7Ci0gICAgICAgIGh0 dHAtPmlnbm9yZVNzbEVycm9ycygpOworCQluZXRSZXBseS0+aWdub3JlU3NsRXJyb3JzKCk7CiAg ICAgICAgIHgyZ29EZWJ1Zzw8InN0b3JlIGNlcnRpZmljYXRlIGluICAiPDxob21lRGlyKyIvLngy Z28vc3NsL2V4Y2VwdGlvbnMvIisKICAgICAgICAgICAgICAgICAgbHVybC5ob3N0KCkgKyIvIitm bmFtZTsKICAgICAgICAgcmVxdWVzdFRpbWUucmVzdGFydCgpOwpkaWZmIC0tZ2l0IGEvaHR0cGJy b2tlcmNsaWVudC5oIGIvaHR0cGJyb2tlcmNsaWVudC5oCmluZGV4IGY4MjFmYjAuLjUyZTRiZWIg MTAwNjQ0Ci0tLSBhL2h0dHBicm9rZXJjbGllbnQuaAorKysgYi9odHRwYnJva2VyY2xpZW50LmgK QEAgLTE4LDYgKzE4LDEwIEBACiAjaWZuZGVmIEhUVFBCUk9LRVJDTElFTlRfSAogI2RlZmluZSBI VFRQQlJPS0VSQ0xJRU5UX0gKICNpbmNsdWRlICJ4MmdvY2xpZW50Y29uZmlnLmgiCisjaW5jbHVk ZSA8UU5ldHdvcmtBY2Nlc3NNYW5hZ2VyPgorI2luY2x1ZGUgPFFVcmw+CisjaW5jbHVkZSA8UU5l dHdvcmtSZXF1ZXN0PgorI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+CiAjaW5jbHVkZSA8UVNzbEVy cm9yPgogI2luY2x1ZGUgPFFCdWZmZXI+CiAjaW5jbHVkZSA8UU9iamVjdD4KQEAgLTI3LDcgKzMx LDcgQEAKIC8qKgogCUBhdXRob3IgT2xla3NhbmRyIFNobmV5ZGVyIDxvbGVrc2FuZHIuc2huZXlk ZXJAb2J2aW91c2x5LW5pY2UuZGU+CiAqLwotY2xhc3MgUUh0dHA7CitjbGFzcyBRTmV0d29ya0Fj Y2Vzc01hbmFnZXI7CiBzdHJ1Y3QgQ29uZmlnRmlsZTsKIGNsYXNzIE9OTWFpbldpbmRvdzsKIApA QCAtNDEsMTQgKzQ1LDE3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNoYW5nZVBhc3N3b3JkKFFTdHJp bmcgbmV3UGFzcyk7CiAgICAgdm9pZCB0ZXN0Q29ubmVjdGlvbigpOwogcHJpdmF0ZToKLSAgICBR QnVmZmVyIGh0dHBDbWRBbnN3ZXI7Ci0gICAgUUJ1ZmZlciBodHRwU2Vzc2lvbkFuc3dlcjsKLSAg ICBRSHR0cCogaHR0cDsKKyAgICAvL1FCdWZmZXIgaHR0cENtZEFuc3dlcjsKKyAgICAvL1FCdWZm ZXIgaHR0cFNlc3Npb25BbnN3ZXI7CisgICAgLy9RSHR0cCogaHR0cDsKKyAgICAvL1FOZXR3b3Jr UmVwbHkqIG5ldFJlcGx5OwkKKyAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXIqIGh0dHA7CisgICAg UU5ldHdvcmtSZXF1ZXN0KiBuZXRSZXF1ZXN0OwogICAgIFFTc2xTb2NrZXQqIHNzbFNvY2tldDsK LSAgICBpbnQgc2Vzc2lvbnNSZXF1ZXN0OwotICAgIGludCBzZWxTZXNzUmVxdWVzdDsKLSAgICBp bnQgY2hQYXNzUmVxdWVzdDsKLSAgICBpbnQgdGVzdENvblJlcXVlc3Q7CisgICAgUU5ldHdvcmtS ZXBseSogc2Vzc2lvbnNSZXF1ZXN0OworICAgIFFOZXR3b3JrUmVwbHkqIHNlbFNlc3NSZXF1ZXN0 OworICAgIFFOZXR3b3JrUmVwbHkqIGNoUGFzc1JlcXVlc3Q7CisgICAgUU5ldHdvcmtSZXBseSog dGVzdENvblJlcXVlc3Q7CiAgICAgUVN0cmluZyBuZXdCcm9rZXJQYXNzOwogICAgIENvbmZpZ0Zp bGUqIGNvbmZpZzsKICAgICBPTk1haW5XaW5kb3cqIG1haW5XaW5kb3c7CkBAIC02MiwxMiArNjks MTIgQEAgcHJpdmF0ZToKICAgICBib29sIGNoZWNrQWNjZXNzKFFTdHJpbmcgYW5zd2VyKTsKIAog cHJpdmF0ZSBzbG90czoKLSAgICB2b2lkIHNsb3RSZXF1ZXN0RmluaXNoZWQgKCBpbnQgaWQsIGJv b2wgZXJyb3IgKTsKLSAgICB2b2lkIHNsb3RTc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3NsRXJy b3I+ICYgZXJyb3JzICkgOworICAgIHZvaWQgc2xvdFJlcXVlc3RGaW5pc2hlZCAoIFFOZXR3b3Jr UmVwbHkqICByZXBseSApOworICAgIHZvaWQgc2xvdFNzbEVycm9ycyAoIFFOZXR3b3JrUmVwbHkq IG5ldFJlcGx5LCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+ICYgZXJyb3JzICkgOwogICAgIFFTdHJp bmcgZ2V0SGV4VmFsICggY29uc3QgUUJ5dGVBcnJheSYgYmEgKTsKICAgICB2b2lkIHNsb3RTc2hD b25uZWN0aW9uRXJyb3IgKCBRU3RyaW5nIG1lc3NhZ2UsIFFTdHJpbmcgbGFzdFNlc3Npb25FcnJv ciApOwogICAgIHZvaWQgc2xvdFNzaFNlcnZlckF1dGhFcnJvciAoIGludCBlcnJvciwgUVN0cmlu ZyBzc2hNZXNzYWdlLCBTc2hNYXN0ZXJDb25uZWN0aW9uKiBjb25uZWN0aW9uICk7Ci0gICAgdm9p ZCBzbG90U3NoU2VydmVyQXV0aFBhc3NwaHJhc2UgKCBTc2hNYXN0ZXJDb25uZWN0aW9uKiBjb25u ZWN0aW9uICk7CisgICAgdm9pZCBzbG90U3NoU2VydmVyQXV0aFBhc3NwaHJhc2UgKCBTc2hNYXN0 ZXJDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBib29sIHZlcmlmaWNhdGlvbkNvZGU9ZmFsc2UgKTsK ICAgICB2b2lkIHNsb3RTc2hVc2VyQXV0aEVycm9yICggUVN0cmluZyBlcnJvciApOwogICAgIHZv aWQgc2xvdFNzaENvbm5lY3Rpb25PaygpOwogICAgIHZvaWQgc2xvdExpc3RTZXNzaW9ucyAoIGJv b2wgc3VjY2VzcywgUVN0cmluZyBhbnN3ZXIsIGludCBwaWQpOwo= --530f48bd_567bd50a_233f-- From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: Request for patch review Reply-To: Mike Gabriel , 440@bugs.x2go.org Resent-From: Mike Gabriel Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Thu, 27 Feb 2014 15:20:01 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: Received: via spool by 440-submit@bugs.x2go.org id=B440.139351411525698 (code B ref 440); Thu, 27 Feb 2014 15:20:01 +0000 Received: (at 440) by bugs.x2go.org; 27 Feb 2014 15:15:15 +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=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham version=3.3.2 Received: from freya.das-netzwerkteam.de (freya.das-netzwerkteam.de [88.198.48.199]) by ymir (Postfix) with ESMTPS id 3F4165DB16 for <440@bugs.x2go.org>; Thu, 27 Feb 2014 16:15:15 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98]) by freya.das-netzwerkteam.de (Postfix) with ESMTPS id A0D7D1EB99; Thu, 27 Feb 2014 16:15:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 74F7E3BE7E; Thu, 27 Feb 2014 16:15:14 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de Received: from grimnir.das-netzwerkteam.de ([127.0.0.1]) by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aO52GPQzKR+H; Thu, 27 Feb 2014 16:15:14 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 0915B3BE42; Thu, 27 Feb 2014 16:15:14 +0100 (CET) Received: from m-047.informatik.uni-kiel.de (m-047.informatik.uni-kiel.de [134.245.254.47]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP; Thu, 27 Feb 2014 15:15:13 +0000 Date: Thu, 27 Feb 2014 15:15:13 +0000 Message-ID: <20140227151513.Horde.aM8IYVn5opfJd9ozoLbE6w8@mail.das-netzwerkteam.de> From: Mike Gabriel To: 440@bugs.x2go.org Cc: o.schneyder@phoca-gmbh.de User-Agent: Internet Messaging Program (IMP) H5 (6.1.4) Accept-Language: en,de Organization: DAS-NETZWERKTEAM X-Originating-IP: 134.245.254.47 X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:26.0) Gecko/20100101 Firefox/26.0 Iceweasel/26.0 Content-Type: multipart/signed; boundary="=_QscyPGkJCY-i0w136dSlQg7"; protocol="application/pgp-signature"; micalg=pgp-sha1 MIME-Version: 1.0 This message is in MIME format and has been PGP signed. --=_QscyPGkJCY-i0w136dSlQg7 Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes Content-Disposition: inline Hi Alex, can you please review the proposed patch in #440 [1]? Thanks, Mike [1] http://bugs.x2go.org/440 -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb --=_QscyPGkJCY-i0w136dSlQg7 Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABAgAGBQJTD1aBAAoJEJr0azAldxsxlr4P/jr2C6W4B7N3zdaEfnhGWfnu pXys7Gt2eIp86JZkcYIm02NDWgrpbT5mPMVRrOthg4RY8hpEYz+IHYFssnlaBY2e S1oPCQlVLYLOZSPMz1VIsy/He+tHfpclFdTVzDF/zilraELDsjN0JEIUuPACKkcK 9WdLEH70sun2bN8StylkWaEKL58iPjgkb5/S/L/SXDLaEvhfZ62mCfXnqyTE+jRi j7bNOikpbpb16AQZyTtZqS5YEWo/ezgmz/af3UijF3qpP3mZExGrw2V7phpr7xjd eV1sjjMM07YmmGq4Z2w9llYlVfo75ftZPP2RE8S+8mXfGawBMighcH0UJBEt6DZl J8qFTlGgVmIUnwL7RXNy9rLgLMyCv6LGnndsrCwt5IclXmLLTwyhkYUmVFN25AVD oYOLgM+hTHvTkoXSXT5/0DFsB3WqF9cZHZeBBJEwvcl1dfe9z6cNTUtoawIw567m QBw8ClzPJCzA4E2CJ9coraUKaDoYXHfvh1I3UpM5KE5qWs4BQJmgNNRoDncqeCAz 4qAa2wgIC+fjSAFrWX7JB31b7+mbie2RkwcxQOg7ZddS+IG3WO1uapj1KTWGVjig Yst72ldm3EAKL8FDdpQ1VE79+PvkmJ4ct9kuSLRTyXK+MM9gdLrVGusuQ8Z6h5XV ljxv1/IcIQ1x3IOaxoUS =SBXq -----END PGP SIGNATURE----- --=_QscyPGkJCY-i0w136dSlQg7-- From mike.gabriel@das-netzwerkteam.de Fri Feb 28 12:58:40 2014 Received: (at control) by bugs.x2go.org; 28 Feb 2014 11:58:40 +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.1 required=5.0 tests=BAYES_00,MISSING_SUBJECT, URIBL_BLOCKED autolearn=no version=3.3.2 Received: from freya.das-netzwerkteam.de (freya.das-netzwerkteam.de [88.198.48.199]) by ymir (Postfix) with ESMTPS id F410E5DB16 for ; Fri, 28 Feb 2014 12:58:39 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98]) by freya.das-netzwerkteam.de (Postfix) with ESMTPS id B378A1EC65 for ; Fri, 28 Feb 2014 12:58:39 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id 9BC323BD70 for ; Fri, 28 Feb 2014 12:58:39 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de Received: from grimnir.das-netzwerkteam.de ([127.0.0.1]) by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V4bfrPd40TkO for ; Fri, 28 Feb 2014 12:58:39 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 6B0903BA7D for ; Fri, 28 Feb 2014 12:58:39 +0100 (CET) Received: from m-047.informatik.uni-kiel.de (m-047.informatik.uni-kiel.de [134.245.254.47]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP; Fri, 28 Feb 2014 11:58:39 +0000 Date: Fri, 28 Feb 2014 11:58:39 +0000 Message-ID: <20140228115839.Horde.o16c5I463ASZS1JZvVRDPw1@mail.das-netzwerkteam.de> From: Mike Gabriel To: control@bugs.x2go.org User-Agent: Internet Messaging Program (IMP) H5 (6.1.4) Accept-Language: en,de Organization: DAS-NETZWERKTEAM X-Originating-IP: 134.245.254.47 X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:26.0) Gecko/20100101 Firefox/26.0 Iceweasel/26.0 Content-Type: multipart/signed; boundary="=_1x5B1GxWpSdfQegT9SRLAw1"; protocol="application/pgp-signature"; micalg=pgp-sha1 MIME-Version: 1.0 This message is in MIME format and has been PGP signed. --=_1x5B1GxWpSdfQegT9SRLAw1 Content-Type: text/plain; charset=UTF-8; format=flowed; DelSp=Yes Content-Disposition: inline reassign #342 x2goclient reassign #343 x2goclient tag #138 patch tag #440 patch tag #157 build-macosx tag #208 build-macosx tag #252 build-macosx tag #317 build-win32 tag #389 patch tag #395 build-macosx tag #413 patch merge #413 #389 tag #421 build-win32 tag #422 build-win32 tag #425 build-win32 tag #195 build-win32 tag #39 build-macosx tag #234 build-macosx tag #236 build-macosx tag #297 build-win32 tag #387 build-macosx thanks -- DAS-NETZWERKTEAM mike gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.xfb --=_1x5B1GxWpSdfQegT9SRLAw1 Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABAgAGBQJTEHnvAAoJEJr0azAldxsxhkYP/RmxFlj1v4R7n4HoBg/NprvM 51MdPkGeee/jbP/cL3vsyGP1oYWsUAjfpBxaM8AipFSjFNtmf06KJ0o9qO82UknC zSuz5NGYwLCW05uTXOHGqA/XX/F/jR5c86T28oPfZPumePY2TuQX9Y4VhXAjESX8 WjXT3rMmAh4iDZ8Rfm1mLzWZbMTijLrBhA9mUGCNkgQ9so2Z+ZzYe2NIlsR5gi0i ONa0bbtMDLmmUV5ig3aevmXwbb542+b/spf2cRnr+mj7eW6EuXw022VRwoxlSgml 0YD4f7fNhiU7vIXhHPZ2xVnYR3EykMOY2o9rORtWqkaAsTdQDDDdTHanO5Kiym1y vBBrE2SJsQTkTgXoLenmnNpROwLDkzFbcnIxzNwbC2XiN3a9J+U9nL7yLY4X/XPi fuZlAUNIHl1HhlEmrhxtHoAlM6OYD1PzV6o5OGnB1Rcp6AqrDLUbzXHDNUREs7vx cACvCafvUiolghBnBhzDHmvv37ULjvKBhU0knxk9FaK7p8xHghhBdsI684Zxc20y /gzWS+XvwGQ8Sim32kdf/U0CcPte2sUQOWb3agD7lWSZunFtm03P8IE9QIbVfIut 5YLkINTQJR30fpWuyBN9MHfqcF+C722QkBd3KbkgMWl+SMM0+fx0SghETlAg0Fba rCFSqbkqZbpxZpD1dJ1f =+3Ji -----END PGP SIGNATURE----- --=_1x5B1GxWpSdfQegT9SRLAw1-- From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: Request for patch review Reply-To: Oleksandr Shneyder , 440@bugs.x2go.org Resent-From: Oleksandr Shneyder Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Fri, 28 Feb 2014 13:45:01 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: patch Received: via spool by 440-submit@bugs.x2go.org id=B440.139359502116986 (code B ref 440); Fri, 28 Feb 2014 13:45:01 +0000 Received: (at 440) by bugs.x2go.org; 28 Feb 2014 13:43:41 +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,URIBL_BLOCKED autolearn=ham version=3.3.2 X-Greylist: delayed 1188 seconds by postgrey-1.34 at ymir; Fri, 28 Feb 2014 14:43:40 CET Received: from mail.cowic.de (mail.cowic.de [80.190.97.242]) by ymir (Postfix) with ESMTP id 59BF05DB16 for <440@bugs.x2go.org>; Fri, 28 Feb 2014 14:43:40 +0100 (CET) Received: from [192.168.0.108] (188-195-168-164-dynip.superkabel.de [188.195.168.164]) by mail.cowic.de (Postfix) with ESMTP id DC647380B875; Fri, 28 Feb 2014 14:23:51 +0100 (CET) Message-ID: <53108DDC.2030909@phoca-gmbh.de> Date: Fri, 28 Feb 2014 14:23:40 +0100 From: Oleksandr Shneyder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131103 Icedove/17.0.10 MIME-Version: 1.0 To: Mike Gabriel CC: 440@bugs.x2go.org, o.schneyder@phoca-gmbh.de References: <20140227151513.Horde.aM8IYVn5opfJd9ozoLbE6w8@mail.das-netzwerkteam.de> In-Reply-To: <20140227151513.Horde.aM8IYVn5opfJd9ozoLbE6w8@mail.das-netzwerkteam.de> X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="----enig2ONCFBXTNQMORUGVQWJXU" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) ------enig2ONCFBXTNQMORUGVQWJXU Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Hi Mike, it seems good to me. However I can not apply this patch on master branch:= $ git apply --check switch-to-QNetworkAccessManager.patch error: patch failed: httpbrokerclient.cpp:93 error: httpbrokerclient.cpp: patch does not apply error: patch failed: httpbrokerclient.h:62 error: httpbrokerclient.h: patch does not apply please send correct patch for master branch *without* trailing whitespaces and I'll test and apply it. regards, Alex Am 27.02.2014 16:15, schrieb Mike Gabriel: > Hi Alex, >=20 > can you please review the proposed patch in #440 [1]? >=20 > Thanks, > Mike >=20 > [1] http://bugs.x2go.org/440 --=20 ---------------------------------------------------- Oleksandr Shneyder | Email: o.shneyder@phoca-gmbh.de phoca GmbH | Tel. : 0911 - 14870374 0 Br=C3=A4uhausgasse 9 | Fax. : 0911 - 14870374 9 D-82205 Gilching | Mobil: 0163 - 49 64 461 Gesch=C3=A4ftsf=C3=BChrung: Dipl.-Inf. Oleksandr Shneyder Amtsgericht M=C3=BCnchen | http://www.phoca-gmbh.de HRB 196 658 | http://www.x2go.org USt-IdNr.: DE281977973 ---------------------------------------------------- ------enig2ONCFBXTNQMORUGVQWJXU Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Icedove - http://www.enigmail.net/ iEYEARECAAYFAlMQjeYACgkQxQmEC5b4kTNMuQCeLkn4aendN/fgtjQs9S1gHFvA EIgAn2x5GPkPmpC4Vj78y//ekKBxKtMS =c4SZ -----END PGP SIGNATURE----- ------enig2ONCFBXTNQMORUGVQWJXU-- From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: [X2Go-Dev] Bug#440: Request for patch review Reply-To: Josh Lukens , 440@bugs.x2go.org Resent-From: Josh Lukens Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Fri, 28 Feb 2014 14:20:02 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: patch Received: via spool by 440-submit@bugs.x2go.org id=B440.139359710326663 (code B ref 440); Fri, 28 Feb 2014 14:20:02 +0000 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> 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-- From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: [X2Go-Dev] Bug#440: Bug#440: Request for patch review Reply-To: Josh Lukens , 440@bugs.x2go.org Resent-From: Josh Lukens Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Sat, 01 Mar 2014 04:10:01 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: patch Received: via spool by 440-submit@bugs.x2go.org id=B440.13936467095146 (code B ref 440); Sat, 01 Mar 2014 04:10:01 +0000 Received: (at 440) by bugs.x2go.org; 1 Mar 2014 04:05:09 +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.5 required=5.0 tests=BAYES_05 autolearn=ham version=3.3.2 Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir (Postfix) with ESMTP id 5064E5DA79 for <440@bugs.x2go.org>; Sat, 1 Mar 2014 05:05:07 +0100 (CET) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id 837231AC0CB; Fri, 28 Feb 2014 23:05:05 -0500 (EST) Date: Fri, 28 Feb 2014 23:05:05 -0500 From: Josh Lukens To: Oleksandr Shneyder , 440@bugs.x2go.org Message-ID: <063590E396BD4C059B471BC9B2AC6392@botch.com> In-Reply-To: References: <20140227151513.Horde.aM8IYVn5opfJd9ozoLbE6w8@mail.das-netzwerkteam.de> <53108DDC.2030909@phoca-gmbh.de> X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="53115c71_1626fb8c_233f" --53115c71_1626fb8c_233f Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline One last try. Cleaned up trailing white space, removed password from debug output, and fixed some spacing. --53115c71_1626fb8c_233f Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="switch-to-QNetworkAccessManager-v3.patch" ZGlmZiAtLWdpdCBhL2h0dHBicm9rZXJjbGllbnQuY3BwIGIvaHR0cGJyb2tlcmNsaWVudC5jcHAK aW5kZXggNGNhOGU1ZC4uOWU4ZDIxZCAxMDA2NDQKLS0tIGEvaHR0cGJyb2tlcmNsaWVudC5jcHAK KysrIGIvaHR0cGJyb2tlcmNsaWVudC5jcHAKQEAgLTE2LDggKzE2LDExIEBACiAqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKiovCiAKICNpbmNsdWRlICJodHRwYnJva2VyY2xpZW50LmgiCisjaW5jbHVkZSA8UU5l dHdvcmtBY2Nlc3NNYW5hZ2VyPgogI2luY2x1ZGUgPFFVcmw+Ci0jaW5jbHVkZSA8UUh0dHA+Cisj aW5jbHVkZSA8UU5ldHdvcmtSZXF1ZXN0PgorI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+CisjaW5j bHVkZSA8UVV1aWQ+CiAjaW5jbHVkZSA8UVRleHRTdHJlYW0+CiAjaW5jbHVkZSA8UUZpbGU+CiAj aW5jbHVkZSA8UURpcj4KQEAgLTM0LDYgKzM3LDcgQEAKICNpbmNsdWRlIDxRVGVtcG9yYXJ5Rmls ZT4KICNpbmNsdWRlIDxRSW5wdXREaWFsb2c+CiAKKwogSHR0cEJyb2tlckNsaWVudDo6SHR0cEJy b2tlckNsaWVudCAoIE9OTWFpbldpbmRvdyogd25kLCBDb25maWdGaWxlKiBjZmcgKQogewogICAg IGNvbmZpZz1jZmc7CkBAIC01NiwzMCArNjAsMTkgQEAgSHR0cEJyb2tlckNsaWVudDo6SHR0cEJy b2tlckNsaWVudCAoIE9OTWFpbldpbmRvdyogd25kLCBDb25maWdGaWxlKiBjZmcgKQogICAgIHsK ICAgICAgICAgc3NoQnJva2VyPWZhbHNlOwogCi0gICAgICAgIGh0dHA9bmV3IFFIdHRwICggdGhp cyApOworICAgICAgICBpZiAoKGNvbmZpZy0+YnJva2VyQ2FDZXJ0RmlsZS5sZW5ndGgoKSA+MCkg JiYgKFFGaWxlOjpleGlzdHMoY29uZmlnLT5icm9rZXJDYUNlcnRGaWxlKSkpIHsKKyAgICAgICAg ICAgIFFTc2xTb2NrZXQ6OmFkZERlZmF1bHRDYUNlcnRpZmljYXRlcyhjb25maWctPmJyb2tlckNh Q2VydEZpbGUsIFFTc2w6OlBlbSk7CisJCSAgICB4MmdvRGVidWc8PCJDdXN0b20gQ0EgY2VydGlm aWNhdGUgZmlsZSBsb2FkZWQgaW50byBIVFRQUyBicm9rZXIgY2xpZW50OiAiPDxjb25maWctPmJy b2tlckNhQ2VydEZpbGU7CisJICAgIH0KIAotICAgICAgICBpZiAoIGNvbmZpZy0+YnJva2VydXJs LmluZGV4T2YgKCAiaHR0cHM6Ly8iICkgPT0wICkgewotICAgICAgICAgICAgaWYgKChjb25maWct PmJyb2tlckNhQ2VydEZpbGUubGVuZ3RoKCkgPjApICYmIChRRmlsZTo6ZXhpc3RzKGNvbmZpZy0+ YnJva2VyQ2FDZXJ0RmlsZSkpKSB7CisgICAgICAgIGh0dHA9bmV3IFFOZXR3b3JrQWNjZXNzTWFu YWdlciAoIHRoaXMgKTsKKyAgICAgICAgeDJnb0RlYnVnPDwiU2V0dGluZyB1cCBjb25uZWN0aW9u IHRvIGJyb2tlcjogIjw8Y29uZmlnLT5icm9rZXJ1cmw7CiAKLSAgICAgICAgICAgICAgICBzc2xT b2NrZXQgPSBuZXcgUVNzbFNvY2tldCh0aGlzKTsKLSAgICAgICAgICAgICAgICBjb25uZWN0ICgg c3NsU29ja2V0LCBTSUdOQUwgKCBzc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+JiAp ICksdGhpcywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RTc2xFcnJvcnMg KCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+JiApICkgKTsKLSAgICAgICAgICAgICAgICBodHRwLT5z ZXRTb2NrZXQoc3NsU29ja2V0KTsKLSAgICAgICAgICAgICAgICBzc2xTb2NrZXQtPmFkZENhQ2Vy dGlmaWNhdGVzKGNvbmZpZy0+YnJva2VyQ2FDZXJ0RmlsZSwgUVNzbDo6UGVtKTsKLSAgICAgICAg ICAgICAgICB4MmdvRGVidWc8PCJDdXN0b20gQ0EgY2VydGlmaWNhdGUgZmlsZSBsb2FkZWQgaW50 byBIVFRQUyBicm9rZXIgY2xpZW50OiAiPDxjb25maWctPmJyb2tlckNhQ2VydEZpbGU7CisgICAg ICAgIGNvbm5lY3QgKCBodHRwLCBTSUdOQUwgKCBzc2xFcnJvcnMgKCBRTmV0d29ya1JlcGx5Kiwg Y29uc3QgUUxpc3Q8UVNzbEVycm9yPiYgKSApLHRoaXMsCisJICAgICAgICAgICAgICAgICBTTE9U ICggc2xvdFNzbEVycm9ycyAoIFFOZXR3b3JrUmVwbHkqLCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+ JiApICkgKTsKIAotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBjb25uZWN0 ICggaHR0cCwgU0lHTkFMICggc3NsRXJyb3JzICggY29uc3QgUUxpc3Q8UVNzbEVycm9yPiYgKSAp LHRoaXMsCi0gICAgICAgICAgICAgICAgICAgICAgICAgIFNMT1QgKCBzbG90U3NsRXJyb3JzICgg Y29uc3QgUUxpc3Q8UVNzbEVycm9yPiYgKSApICk7Ci0gICAgICAgICAgICB9Ci0gICAgICAgICAg ICBodHRwLT5zZXRIb3N0ICggbHVybC5ob3N0KCksUUh0dHA6OkNvbm5lY3Rpb25Nb2RlSHR0cHMs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgbHVybC5wb3J0ICggNDQzICkgKTsKLSAgICAg ICAgfSBlbHNlIHsKLSAgICAgICAgICAgIGh0dHAtPnNldEhvc3QgKCBsdXJsLmhvc3QoKSxRSHR0 cDo6Q29ubmVjdGlvbk1vZGVIdHRwLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGx1cmwu cG9ydCAoIDgwICkgKTsKLSAgICAgICAgfQotICAgICAgICBjb25uZWN0ICggaHR0cCxTSUdOQUwg KCByZXF1ZXN0RmluaXNoZWQgKCBpbnQsYm9vbCApICksdGhpcywKLSAgICAgICAgICAgICAgICAg IFNMT1QgKCBzbG90UmVxdWVzdEZpbmlzaGVkICggaW50LGJvb2wgKSApICk7CisgICAgICAgIGNv bm5lY3QgKCBodHRwLFNJR05BTCAoIGZpbmlzaGVkIChRTmV0d29ya1JlcGx5KikgKSx0aGlzLAor ICAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RSZXF1ZXN0RmluaXNoZWQgKFFOZXR3b3JrUmVw bHkqKSApICk7CiAgICAgfQogfQogCkBAIC0yNDgsNiArMjQxLDcgQEAgdm9pZCBIdHRwQnJva2Vy Q2xpZW50OjpzbG90U3NoVXNlckF1dGhFcnJvcihRU3RyaW5nIGVycm9yKQogdm9pZCBIdHRwQnJv a2VyQ2xpZW50OjpnZXRVc2VyU2Vzc2lvbnMoKQogewogICAgIFFTdHJpbmcgYnJva2VyVXNlcj1j b25maWctPmJyb2tlclVzZXI7CisgICAgeDJnb0RlYnVnPDwiY2FsbGVkIGdldFVzZXJTZXNzaW9u czogYnJva2VydXNlcjogIjw8YnJva2VyVXNlcjw8IiBhdXRoaWQ6ICI8PGNvbmZpZy0+YnJva2Vy VXNlcklkOwogICAgIGlmKG1haW5XaW5kb3ctPmdldFVzZVBHUENhcmQoKSkKICAgICAgICAgYnJv a2VyVXNlcj1tYWluV2luZG93LT5nZXRDYXJkTG9naW4oKTsKICAgICBjb25maWctPnNlc3Npb25k YXRhPVFTdHJpbmc6Om51bGw7CkBAIC0yNTksMTAgKzI1MywxMSBAQCB2b2lkIEh0dHBCcm9rZXJD bGllbnQ6OmdldFVzZXJTZXNzaW9ucygpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ1 c2VyPSI8PGJyb2tlclVzZXI8PCImIjw8CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJw YXNzd29yZD0iPDxjb25maWctPmJyb2tlclBhc3M8PCImIjw8CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJhdXRoaWQ9Ijw8Y29uZmlnLT5icm9rZXJVc2VySWQ7Ci0gICAgICAgIFFVcmwg bHVybCAoIGNvbmZpZy0+YnJva2VydXJsICk7Ci0gICAgICAgIGh0dHBTZXNzaW9uQW5zd2VyLmNs b3NlKCk7Ci0gICAgICAgIGh0dHBTZXNzaW9uQW5zd2VyLnNldERhdGEgKCAwLDAgKTsKLSAgICAg ICAgc2Vzc2lvbnNSZXF1ZXN0PWh0dHAtPnBvc3QgKCBsdXJsLnBhdGgoKSxyZXEudG9VdGY4KCks Jmh0dHBTZXNzaW9uQW5zd2VyICk7CisKKyAgICAgICAgeDJnb0RlYnVnIDw8ICJzZW5kaW5nIHJl cXVlc3Q6ICI8PCByZXEudG9VdGY4KCk7CisJICAgIFFOZXR3b3JrUmVxdWVzdCByZXF1ZXN0KFFV cmwoY29uZmlnLT5icm9rZXJ1cmwpKTsKKwkgICAgcmVxdWVzdC5zZXRIZWFkZXIoUU5ldHdvcmtS ZXF1ZXN0OjpDb250ZW50VHlwZUhlYWRlciwgImFwcGxpY2F0aW9uL3gtd3d3LWZvcm0tdXJsZW5j b2RlZCIpOworICAgICAgICBzZXNzaW9uc1JlcXVlc3Q9aHR0cC0+cG9zdCAocmVxdWVzdCwgcmVx LnRvVXRmOCgpICk7CiAgICAgfQogICAgIGVsc2UKICAgICB7CkBAIC0yODMsNiArMjc4LDcgQEAg dm9pZCBIdHRwQnJva2VyQ2xpZW50OjpnZXRVc2VyU2Vzc2lvbnMoKQogCiB2b2lkIEh0dHBCcm9r ZXJDbGllbnQ6OnNlbGVjdFVzZXJTZXNzaW9uKGNvbnN0IFFTdHJpbmcmIHNlc3Npb24pCiB7Cisg ICAgeDJnb0RlYnVnPDwiY2FsbGVkIHNlbGVjdFVzZXJTZXNzaW9ucyI7CiAgICAgUVN0cmluZyBi cm9rZXJVc2VyPWNvbmZpZy0+YnJva2VyVXNlcjsKICAgICBpZihtYWluV2luZG93LT5nZXRVc2VQ R1BDYXJkKCkpCiAgICAgICAgIGJyb2tlclVzZXI9bWFpbldpbmRvdy0+Z2V0Q2FyZExvZ2luKCk7 CkBAIC0yOTYsMTAgKzI5MiwxMSBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNlbGVjdFVzZXJT ZXNzaW9uKGNvbnN0IFFTdHJpbmcmIHNlc3Npb24pCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJ1c2VyPSI8PGJyb2tlclVzZXI8PCImIjw8CiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJwYXNzd29yZD0iPDxjb25maWctPmJyb2tlclBhc3M8PCImIjw8CiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJhdXRoaWQ9Ijw8Y29uZmlnLT5icm9rZXJVc2VySWQ7Ci0gICAgICAg IFFVcmwgbHVybCAoIGNvbmZpZy0+YnJva2VydXJsICk7Ci0gICAgICAgIGh0dHBTZXNzaW9uQW5z d2VyLmNsb3NlKCk7Ci0gICAgICAgIGh0dHBTZXNzaW9uQW5zd2VyLnNldERhdGEgKCAwLDAgKTsK LSAgICAgICAgc2VsU2Vzc1JlcXVlc3Q9aHR0cC0+cG9zdCAoIGx1cmwucGF0aCgpLHJlcS50b1V0 ZjgoKSwmaHR0cFNlc3Npb25BbnN3ZXIgKTsKKyAgICAgICAgeDJnb0RlYnVnIDw8ICJzZW5kaW5n IHJlcXVlc3Q6ICI8PCByZXEudG9VdGY4KCk7CisJICAgIFFOZXR3b3JrUmVxdWVzdCByZXF1ZXN0 KFFVcmwoY29uZmlnLT5icm9rZXJ1cmwpKTsKKwkgICAgcmVxdWVzdC5zZXRIZWFkZXIoUU5ldHdv cmtSZXF1ZXN0OjpDb250ZW50VHlwZUhlYWRlciwgImFwcGxpY2F0aW9uL3gtd3d3LWZvcm0tdXJs ZW5jb2RlZCIpOworICAgICAgICBzZXNzaW9uc1JlcXVlc3Q9aHR0cC0+cG9zdCAocmVxdWVzdCwg cmVxLnRvVXRmOCgpICk7CisKICAgICB9CiAgICAgZWxzZQogICAgIHsKQEAgLTMzMCwxMSArMzI3 LDExIEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Y2hhbmdlUGFzc3dvcmQoUVN0cmluZyBuZXdQ YXNzKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidXNlcj0iPDxicm9rZXJVc2VyPDwi JiI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicGFzc3dvcmQ9Ijw8Y29uZmlnLT5i cm9rZXJQYXNzPDwiJiI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8 PGNvbmZpZy0+YnJva2VyVXNlcklkOwotICAgICAgICBRVXJsIGx1cmwgKCBjb25maWctPmJyb2tl cnVybCApOwotICAgICAgICBodHRwU2Vzc2lvbkFuc3dlci5jbG9zZSgpOwotICAgICAgICBodHRw U2Vzc2lvbkFuc3dlci5zZXREYXRhICggMCwwICk7Ci0gICAgICAgIGNoUGFzc1JlcXVlc3Q9aHR0 cC0+cG9zdCAoIGx1cmwucGF0aCgpLHJlcS50b1V0ZjgoKSwmaHR0cFNlc3Npb25BbnN3ZXIgKTsK LSAgICB9CisgICAgICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRv VXRmOCgpOworCSAgICBRTmV0d29ya1JlcXVlc3QgcmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2Vy dXJsKSk7CisJICAgIHJlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5 cGVIZWFkZXIsICJhcHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQiKTsKKyAgICAgICAg c2Vzc2lvbnNSZXF1ZXN0PWh0dHAtPnBvc3QgKHJlcXVlc3QsIHJlcS50b1V0ZjgoKSApOworCQl9 CiAgICAgZWxzZQogICAgIHsKICAgICAgICAgaWYgKGNvbmZpZy0+YnJva2VyVXNlcklkLmxlbmd0 aCgpID4gMCkgewpAQCAtMzQ5LDE3ICszNDYsMTcgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50Ojpj aGFuZ2VQYXNzd29yZChRU3RyaW5nIG5ld1Bhc3MpCiAKIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6 dGVzdENvbm5lY3Rpb24oKQogeworICAgIHgyZ29EZWJ1Zzw8ImNhbGxlZCB0ZXN0Q29ubmVjdGlv biI7CiAgICAgaWYoIXNzaEJyb2tlcikKICAgICB7CiAgICAgICAgIFFTdHJpbmcgcmVxOwogICAg ICAgICBRVGV4dFN0cmVhbSAoICZyZXEgKSA8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAidGFzaz10ZXN0Y29uIjsKLSAgICAgICAgUVVybCBsdXJsICggY29uZmlnLT5icm9rZXJ1cmwg KTsKLSAgICAgICAgaHR0cFNlc3Npb25BbnN3ZXIuY2xvc2UoKTsKLSAgICAgICAgaHR0cFNlc3Np b25BbnN3ZXIuc2V0RGF0YSAoIDAsMCApOwotICAgICAgICByZXF1ZXN0VGltZS5zdGFydCgpOwot ICAgICAgICB0ZXN0Q29uUmVxdWVzdD1odHRwLT5wb3N0ICggbHVybC5wYXRoKCkscmVxLnRvVXRm OCgpLCZodHRwU2Vzc2lvbkFuc3dlciApOwotICAgIH0KKyAgICAgICAgeDJnb0RlYnVnIDw8ICJz ZW5kaW5nIHJlcXVlc3Q6ICI8PCByZXEudG9VdGY4KCk7CisJICAgIFFOZXR3b3JrUmVxdWVzdCBy ZXF1ZXN0KFFVcmwoY29uZmlnLT5icm9rZXJ1cmwpKTsKKwkgICAgcmVxdWVzdC5zZXRIZWFkZXIo UU5ldHdvcmtSZXF1ZXN0OjpDb250ZW50VHlwZUhlYWRlciwgImFwcGxpY2F0aW9uL3gtd3d3LWZv cm0tdXJsZW5jb2RlZCIpOworICAgICAgICBzZXNzaW9uc1JlcXVlc3Q9aHR0cC0+cG9zdCAocmVx dWVzdCwgcmVxLnRvVXRmOCgpICk7CisJfQogICAgIGVsc2UKICAgICB7CiAgICAgICAgIGlmIChj b25maWctPmJyb2tlclVzZXJJZC5sZW5ndGgoKSA+IDApIHsKQEAgLTM5Miw2ICszODksNyBAQCB2 b2lkIEh0dHBCcm9rZXJDbGllbnQ6OmNyZWF0ZUluaUZpbGUoY29uc3QgUVN0cmluZyYgcmF3X2Nv bnRlbnQpCiAKIGJvb2wgSHR0cEJyb2tlckNsaWVudDo6Y2hlY2tBY2Nlc3MoUVN0cmluZyBhbnN3 ZXIgKQogeworICAgIHgyZ29EZWJ1Zzw8ImNhbGxlZCBjaGVja0FjY2VzcyAtIGFuc3dlciB3YXM6 ICI8PGFuc3dlcjsKICAgICBpZiAoYW5zd2VyLmluZGV4T2YoIkFjY2VzcyBncmFudGVkIik9PS0x KQogICAgIHsKICAgICAgICAgUU1lc3NhZ2VCb3g6OmNyaXRpY2FsICgKQEAgLTQwOCw2ICs0MDYs NyBAQCBib29sIEh0dHBCcm9rZXJDbGllbnQ6OmNoZWNrQWNjZXNzKFFTdHJpbmcgYW5zd2VyICkK IAogdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90Q29ubmVjdGlvblRlc3QoYm9vbCBzdWNjZXNz LCBRU3RyaW5nIGFuc3dlciwgaW50KQogeworICAgIHgyZ29EZWJ1Zzw8ImNhbGxlZCBzbG90Q29u bmVjdGlvblRlc3QiOwogICAgIGlmKCFzdWNjZXNzKQogICAgIHsKICAgICAgICAgeDJnb0RlYnVn PDxhbnN3ZXI7CkBAIC00MTksOCArNDE4LDggQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90 Q29ubmVjdGlvblRlc3QoYm9vbCBzdWNjZXNzLCBRU3RyaW5nIGFuc3dlciwgaW50KQogICAgICAg ICByZXR1cm47CiAgICAgaWYoIXNzaEJyb2tlcikKICAgICB7Ci0gICAgICAgIHgyZ29EZWJ1Zzw8 ImVsYXBzZWQ6ICI8PHJlcXVlc3RUaW1lLmVsYXBzZWQoKTw8InJlY2VpdmVkOiI8PGh0dHBTZXNz aW9uQW5zd2VyLnNpemUoKTw8ZW5kbDsKLSAgICAgICAgZW1pdCBjb25uZWN0aW9uVGltZShyZXF1 ZXN0VGltZS5lbGFwc2VkKCksaHR0cFNlc3Npb25BbnN3ZXIuc2l6ZSgpKTsKKyAgICAgICB4Mmdv RGVidWc8PCJlbGFwc2VkOiAiPDxyZXF1ZXN0VGltZS5lbGFwc2VkKCk8PCJyZWNlaXZlZDoiPDxh bnN3ZXIuc2l6ZSgpPDxlbmRsOworICAgICAgIGVtaXQgY29ubmVjdGlvblRpbWUocmVxdWVzdFRp bWUuZWxhcHNlZCgpLGFuc3dlci5zaXplKCkpOwogICAgIH0KICAgICByZXR1cm47CiAKQEAgLTQ3 MSwzNiArNDcwLDM4IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6c2xvdFNlbGVjdFNlc3Npb24o Ym9vbCBzdWNjZXNzLCBRU3RyaW5nIGFuc3dlciwgaW50KQogfQogCiAKLXZvaWQgSHR0cEJyb2tl ckNsaWVudDo6c2xvdFJlcXVlc3RGaW5pc2hlZCAoIGludCBpZCwgYm9vbCBlcnJvciApCit2b2lk IEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RSZXF1ZXN0RmluaXNoZWQgKCBRTmV0d29ya1JlcGx5KiAg cmVwbHkgKQogewotLy8gICAJeDJnb0RlYnVnPDwiaHR0cCByZXF1ZXN0ICI8PGlkPDwiLCBmaW5p c2hlZCB3aXRoOiAiPDxlcnJvcjsKLQotICAgIGlmICggZXJyb3IgKQotICAgIHsKLSAgICAgICAg eDJnb0RlYnVnPDxodHRwLT5lcnJvclN0cmluZygpOwotICAgICAgICBRTWVzc2FnZUJveDo6Y3Jp dGljYWwoMCx0cigiRXJyb3IiKSxodHRwLT5lcnJvclN0cmluZygpKTsKLSAgICAgICAgZW1pdCBm YXRhbEh0dHBFcnJvcigpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgUVN0cmluZyBh bnN3ZXIgKCBodHRwU2Vzc2lvbkFuc3dlci5kYXRhKCkgKTsKLSAgICB4MmdvRGVidWc8PCJjbWQg cmVxdWVzdCBhbnN3ZXI6ICI8PGFuc3dlcjsKLSAgICBpZiAoaWQ9PXRlc3RDb25SZXF1ZXN0KQor CWlmKHJlcGx5LT5lcnJvcigpICE9IFFOZXR3b3JrUmVwbHk6Ok5vRXJyb3IpCisJCXsKKwkJCXgy Z29EZWJ1Zzw8IkJyb2tlciBIVFRQIHJlcXVlc3QgZmFpbGVkIHdpdGggZXJyb3I6ICI8PHJlcGx5 LT5lcnJvclN0cmluZygpOworCQkJUU1lc3NhZ2VCb3g6OmNyaXRpY2FsKDAsdHIoIkVycm9yIiks cmVwbHktPmVycm9yU3RyaW5nKCkpOworCQkJZW1pdCBmYXRhbEh0dHBFcnJvcigpOworCQkJcmV0 dXJuOworCQl9CisKKyAgICBRU3RyaW5nIGFuc3dlciAoIHJlcGx5LT5yZWFkQWxsKCkgKTsKKyAg ICB4MmdvRGVidWc8PCJBIGh0dHAgcmVxdWVzdCByZXR1cm5lZC4gIFJlc3VsdCB3YXM6ICI8PGFu c3dlcjsKKyAgICBpZiAocmVwbHkgPT0gdGVzdENvblJlcXVlc3QpCiAgICAgewogICAgICAgICBz bG90Q29ubmVjdGlvblRlc3QodHJ1ZSxhbnN3ZXIsMCk7CiAgICAgfQotICAgIGlmIChpZCA9PSBz ZXNzaW9uc1JlcXVlc3QpCisgICAgaWYgKHJlcGx5ID09IHNlc3Npb25zUmVxdWVzdCkKICAgICB7 CiAgICAgICAgIHNsb3RMaXN0U2Vzc2lvbnModHJ1ZSwgYW5zd2VyLDApOwogICAgIH0KLSAgICBp ZiAoaWQgPT0gc2VsU2Vzc1JlcXVlc3QpCisgICAgaWYgKHJlcGx5ID09IHNlbFNlc3NSZXF1ZXN0 KQogICAgIHsKICAgICAgICAgc2xvdFNlbGVjdFNlc3Npb24odHJ1ZSxhbnN3ZXIsMCk7CiAgICAg fQotICAgIGlmICggaWQgPT0gY2hQYXNzUmVxdWVzdCkKKyAgICBpZiAocmVwbHkgPT0gY2hQYXNz UmVxdWVzdCkKICAgICB7CiAgICAgICAgIHNsb3RQYXNzQ2hhbmdlZCh0cnVlLGFuc3dlciwwKTsK ICAgICB9CisKKyAgICAvLyBXZSByZWNlaXZlIG93bmVyc2hpcCBvZiB0aGUgcmVwbHkgb2JqZWN0 CisgICAgLy8gYW5kIHRoZXJlZm9yZSBuZWVkIHRvIGhhbmRsZSBkZWxldGlvbi4KKyAgICByZXBs eS0+ZGVsZXRlTGF0ZXIoKTsKIH0KIAogdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpwYXJzZVNlc3Np b24oUVN0cmluZyBzaW5mbykKQEAgLTUzNyw3ICs1MzgsNyBAQCB2b2lkIEh0dHBCcm9rZXJDbGll bnQ6OnBhcnNlU2Vzc2lvbihRU3RyaW5nIHNpbmZvKQogfQogCiAKLXZvaWQgSHR0cEJyb2tlckNs aWVudDo6c2xvdFNzbEVycm9ycyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4gJiBlcnJvcnMgKQor dm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90U3NsRXJyb3JzICggUU5ldHdvcmtSZXBseSogbmV0 UmVwbHksIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4gJiBlcnJvcnMgKQogewogICAgIFFTdHJpbmdM aXN0IGVycjsKICAgICBRU3NsQ2VydGlmaWNhdGUgY2VydDsKQEAgLTU2NCw3ICs1NjUsNyBAQCB2 b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RTc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3NsRXJy b3I+ICYgZXJyb3JzICkKICAgICAgICAgUVNzbENlcnRpZmljYXRlIG1jZXJ0ICggJmZsICk7CiAg ICAgICAgIGlmICggbWNlcnQ9PWNlcnQgKQogICAgICAgICB7Ci0gICAgICAgICAgICBodHRwLT5p Z25vcmVTc2xFcnJvcnMoKTsKKyAgICAgICAgICAgIG5ldFJlcGx5LT5pZ25vcmVTc2xFcnJvcnMo KTsKICAgICAgICAgICAgIHJlcXVlc3RUaW1lLnJlc3RhcnQoKTsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQpAQCAtNjM1LDcgKzYzNiw3IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6 c2xvdFNzbEVycm9ycyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4gJiBlcnJvcnMgKQogICAgICAg ICBmbC5vcGVuICggUUlPRGV2aWNlOjpXcml0ZU9ubHkgfCBRSU9EZXZpY2U6OlRleHQgKTsKICAg ICAgICAgUVRleHRTdHJlYW0gKCAmZmwgKSA8PGNlcnQudG9QZW0oKTsKICAgICAgICAgZmwuY2xv c2UoKTsKLSAgICAgICAgaHR0cC0+aWdub3JlU3NsRXJyb3JzKCk7CisJCW5ldFJlcGx5LT5pZ25v cmVTc2xFcnJvcnMoKTsKICAgICAgICAgeDJnb0RlYnVnPDwic3RvcmUgY2VydGlmaWNhdGUgaW4g ICI8PGhvbWVEaXIrIi8ueDJnby9zc2wvZXhjZXB0aW9ucy8iKwogICAgICAgICAgICAgICAgICBs dXJsLmhvc3QoKSArIi8iK2ZuYW1lOwogICAgICAgICByZXF1ZXN0VGltZS5yZXN0YXJ0KCk7CmRp ZmYgLS1naXQgYS9odHRwYnJva2VyY2xpZW50LmggYi9odHRwYnJva2VyY2xpZW50LmgKaW5kZXgg NGVhNGEzZC4uOGE3NzJkZiAxMDA2NDQKLS0tIGEvaHR0cGJyb2tlcmNsaWVudC5oCisrKyBiL2h0 dHBicm9rZXJjbGllbnQuaApAQCAtMTgsNiArMTgsMTAgQEAKICNpZm5kZWYgSFRUUEJST0tFUkNM SUVOVF9ICiAjZGVmaW5lIEhUVFBCUk9LRVJDTElFTlRfSAogI2luY2x1ZGUgIngyZ29jbGllbnRj b25maWcuaCIKKyNpbmNsdWRlIDxRTmV0d29ya0FjY2Vzc01hbmFnZXI+CisjaW5jbHVkZSA8UVVy bD4KKyNpbmNsdWRlIDxRTmV0d29ya1JlcXVlc3Q+CisjaW5jbHVkZSA8UU5ldHdvcmtSZXBseT4K ICNpbmNsdWRlIDxRU3NsRXJyb3I+CiAjaW5jbHVkZSA8UUJ1ZmZlcj4KICNpbmNsdWRlIDxRT2Jq ZWN0PgpAQCAtMjcsNyArMzEsNyBAQAogLyoqCiAJQGF1dGhvciBPbGVrc2FuZHIgU2huZXlkZXIg PG9sZWtzYW5kci5zaG5leWRlckBvYnZpb3VzbHktbmljZS5kZT4KICovCi1jbGFzcyBRSHR0cDsK K2NsYXNzIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjsKIHN0cnVjdCBDb25maWdGaWxlOwogY2xhc3Mg T05NYWluV2luZG93OwogCkBAIC00MSwxNCArNDUsMTMgQEAgcHVibGljOgogICAgIHZvaWQgY2hh bmdlUGFzc3dvcmQoUVN0cmluZyBuZXdQYXNzKTsKICAgICB2b2lkIHRlc3RDb25uZWN0aW9uKCk7 CiBwcml2YXRlOgotICAgIFFCdWZmZXIgaHR0cENtZEFuc3dlcjsKLSAgICBRQnVmZmVyIGh0dHBT ZXNzaW9uQW5zd2VyOwotICAgIFFIdHRwKiBodHRwOworICAgIFFOZXR3b3JrQWNjZXNzTWFuYWdl ciogaHR0cDsKKyAgICBRTmV0d29ya1JlcXVlc3QqIG5ldFJlcXVlc3Q7CiAgICAgUVNzbFNvY2tl dCogc3NsU29ja2V0OwotICAgIGludCBzZXNzaW9uc1JlcXVlc3Q7Ci0gICAgaW50IHNlbFNlc3NS ZXF1ZXN0OwotICAgIGludCBjaFBhc3NSZXF1ZXN0OwotICAgIGludCB0ZXN0Q29uUmVxdWVzdDsK KyAgICBRTmV0d29ya1JlcGx5KiBzZXNzaW9uc1JlcXVlc3Q7CisgICAgUU5ldHdvcmtSZXBseSog c2VsU2Vzc1JlcXVlc3Q7CisgICAgUU5ldHdvcmtSZXBseSogY2hQYXNzUmVxdWVzdDsKKyAgICBR TmV0d29ya1JlcGx5KiB0ZXN0Q29uUmVxdWVzdDsKICAgICBRU3RyaW5nIG5ld0Jyb2tlclBhc3M7 CiAgICAgQ29uZmlnRmlsZSogY29uZmlnOwogICAgIE9OTWFpbldpbmRvdyogbWFpbldpbmRvdzsK QEAgLTYyLDggKzY1LDggQEAgcHJpdmF0ZToKICAgICBib29sIGNoZWNrQWNjZXNzKFFTdHJpbmcg YW5zd2VyKTsKIAogcHJpdmF0ZSBzbG90czoKLSAgICB2b2lkIHNsb3RSZXF1ZXN0RmluaXNoZWQg KCBpbnQgaWQsIGJvb2wgZXJyb3IgKTsKLSAgICB2b2lkIHNsb3RTc2xFcnJvcnMgKCBjb25zdCBR TGlzdDxRU3NsRXJyb3I+ICYgZXJyb3JzICkgOworICAgIHZvaWQgc2xvdFJlcXVlc3RGaW5pc2hl ZCAoIFFOZXR3b3JrUmVwbHkqICByZXBseSApOworICAgIHZvaWQgc2xvdFNzbEVycm9ycyAoIFFO ZXR3b3JrUmVwbHkqIG5ldFJlcGx5LCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+ICYgZXJyb3JzICkg OwogICAgIFFTdHJpbmcgZ2V0SGV4VmFsICggY29uc3QgUUJ5dGVBcnJheSYgYmEgKTsKICAgICB2 b2lkIHNsb3RTc2hDb25uZWN0aW9uRXJyb3IgKCBRU3RyaW5nIG1lc3NhZ2UsIFFTdHJpbmcgbGFz dFNlc3Npb25FcnJvciApOwogICAgIHZvaWQgc2xvdFNzaFNlcnZlckF1dGhFcnJvciAoIGludCBl cnJvciwgUVN0cmluZyBzc2hNZXNzYWdlLCBTc2hNYXN0ZXJDb25uZWN0aW9uKiBjb25uZWN0aW9u ICk7Cg== --53115c71_1626fb8c_233f-- From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: X2Go issue (in src:x2goclient) has been marked as pending for release Reply-To: Mike Gabriel , 440@bugs.x2go.org Resent-From: Mike Gabriel Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Mon, 03 Mar 2014 11:00:02 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: patch Received: via spool by 440-submit@bugs.x2go.org id=B440.13938441998450 (code B ref 440); Mon, 03 Mar 2014 11:00:02 +0000 Received: (at 440) by bugs.x2go.org; 3 Mar 2014 10:56:39 +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=-1.9 required=5.0 tests=BAYES_00,NO_RELAYS, URIBL_BLOCKED autolearn=unavailable version=3.3.2 Received: by ymir (Postfix, from userid 1005) id 3840C5DB22; Mon, 3 Mar 2014 11:56:07 +0100 (CET) From: Mike Gabriel To: 440-submitter@bugs.x2go.org Cc: control@bugs.x2go.org, 440@bugs.x2go.org Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit X-Mailer: http://snipr.com/post-receive-tag-pending Message-Id: <20140303105607.3840C5DB22@ymir> Date: Mon, 3 Mar 2014 11:56:07 +0100 (CET) tag #440 pending fixed #440 4.0.2.0 thanks Hello, X2Go issue #440 (src:x2goclient) reported by you has been fixed in X2Go Git. You can see the changelog below, and you can check the diff of the fix at: http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=19fe787 The issue will most likely be fixed in src:x2goclient (4.0.2.0). light+love X2Go Git Admin (on behalf of the sender of this mail) --- commit 19fe7875e2b8203780340272dc83189e9b8e470c Author: Mike Gabriel Date: Mon Mar 3 11:55:44 2014 +0100 Switch to QNetworkAccessManager. Appropriately set content type header to "application/x-www-form-urlencoded" for HTTP post requests. (Fixes: #440, #138). diff --git a/debian/changelog b/debian/changelog index 42c5799..daec032 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,12 @@ x2goclient (4.0.2.0-0x2go1) UNRELEASED; urgency=low from terminal on linux and mac. - If no user in session config, display system username in pass form. + [ Josh Lukens ] + * New upstream version (4.0.2.0): + - Switch to QNetworkAccessManager. Appropriately set content type + header to "application/x-www-form-urlencoded" for HTTP post + requests. (Fixes: #440, #138). + [ Mike Gabriel ] * debian/control: + Build-depend on libssh-dev (>= 0.5.4-2). From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: Fix to copy/paste error in applied patch Reply-To: Josh Lukens , 440@bugs.x2go.org Resent-From: Josh Lukens Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Wed, 05 Mar 2014 03:40:01 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: pending patch Received: via spool by 440-submit@bugs.x2go.org id=B440.139399077722930 (code B ref 440); Wed, 05 Mar 2014 03:40:01 +0000 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> 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-- From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: [X2Go-Dev] Bug#440: Fix to copy/paste error in applied patch Reply-To: Mike Gabriel , 440@bugs.x2go.org Resent-From: Mike Gabriel Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Wed, 05 Mar 2014 07:45:02 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: pending patch Received: via spool by 440-submit@bugs.x2go.org id=B440.139400541212696 (code B ref 440); Wed, 05 Mar 2014 07:45:02 +0000 Received: (at 440) by bugs.x2go.org; 5 Mar 2014 07:43:32 +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=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham version=3.3.2 Received: from freya.das-netzwerkteam.de (freya.das-netzwerkteam.de [88.198.48.199]) by ymir (Postfix) with ESMTPS id 140BE5DB13 for <440@bugs.x2go.org>; Wed, 5 Mar 2014 08:43:32 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (grimnir.das-netzwerkteam.de [78.46.204.98]) by freya.das-netzwerkteam.de (Postfix) with ESMTPS id CCE721EC1E; Wed, 5 Mar 2014 08:43:31 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTP id C06C33BB1B; Wed, 5 Mar 2014 08:43:31 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at grimnir.das-netzwerkteam.de Received: from grimnir.das-netzwerkteam.de ([127.0.0.1]) by localhost (grimnir.das-netzwerkteam.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 14NFjOd1nOoH; Wed, 5 Mar 2014 08:43:31 +0100 (CET) Received: from grimnir.das-netzwerkteam.de (localhost [127.0.0.1]) by grimnir.das-netzwerkteam.de (Postfix) with ESMTPSA id 9A18E3BA27; Wed, 5 Mar 2014 08:43:31 +0100 (CET) Received: from m-047.informatik.uni-kiel.de (m-047.informatik.uni-kiel.de [134.245.254.47]) by mail.das-netzwerkteam.de (Horde Framework) with HTTP; Wed, 05 Mar 2014 07:43:31 +0000 Date: Wed, 05 Mar 2014 07:43:31 +0000 Message-ID: <20140305074331.Horde.lTL6Ee3SP4ZeeWPyu49nNQ2@mail.das-netzwerkteam.de> From: Mike Gabriel To: Josh Lukens , 440@bugs.x2go.org References: <20140227151513.Horde.aM8IYVn5opfJd9ozoLbE6w8@mail.das-netzwerkteam.de> <53108DDC.2030909@phoca-gmbh.de> <063590E396BD4C059B471BC9B2AC6392@botch.com> <4E7327ABC92D41DC9636AC973BF5C2C8@botch.com> In-Reply-To: <4E7327ABC92D41DC9636AC973BF5C2C8@botch.com> User-Agent: Internet Messaging Program (IMP) H5 (6.1.4) Accept-Language: en,de Organization: DAS-NETZWERKTEAM X-Originating-IP: 134.245.254.47 X-Remote-Browser: Mozilla/5.0 (X11; Linux x86_64; rv:26.0) Gecko/20100101 Firefox/26.0 Iceweasel/26.0 Content-Type: multipart/signed; boundary="=_utPKZIHGK_Eh18C1y7pEmg9"; protocol="application/pgp-signature"; micalg=pgp-sha1 MIME-Version: 1.0 This message is in MIME format and has been PGP signed. --=_utPKZIHGK_Eh18C1y7pEmg9 Content-Type: text/plain; charset=utf-8; format=flowed; DelSp=Yes Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mi 05 M=C3=A4r 2014 04:39:40 CET, Josh Lukens wrote: > Found a small (but important) copy and paste error introduced when I=20= =20 >=20remade the origional patch. As is session broker sessions can't be=20= =20 >=20properly selected. The attached patch against head corrects the=20=20 >=20issue. Committed and pushed: http://code.x2go.org/gitweb?p=3Dx2goclient.git;a=3Dcommitdiff;h=3D040c9423c= 2806de3236e8008059be30aa697ef81 THANKS! Mike --=20 DAS-NETZWERKTEAM mike=20gabriel, herweg 7, 24357 fleckeby fon: +49 (1520) 1976 148 GnuPG Key ID 0x25771B31 mail: mike.gabriel@das-netzwerkteam.de, http://das-netzwerkteam.de freeBusy: https://mail.das-netzwerkteam.de/freebusy/m.gabriel%40das-netzwerkteam.de.x= fb --=_utPKZIHGK_Eh18C1y7pEmg9 Content-Type: application/pgp-signature Content-Description: Digitale PGP-Signatur Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQIcBAABAgAGBQJTFtWjAAoJEJr0azAldxsx+BEP/3DXwXldimTWEBGpG6uRjAA7 FfaPNuSHxWFNtoe5Qo8IvvoddtTuzS4oThG+N9+MEug6dPai5DeNVPym2xZ+/EZG vPF5mAb6N51fH4fJ4oY/V++RyvNbDFj4wFbwe14+d3kWfv+7ovW2Z5zUJxukfljg Ed/5lIkHWNGn0tmy2dsQtpemkiEx4U2rNmX+QnHwVu2hH0H4gvnjqKKrQdBPMa1V kj5VdqKESsUJ7HAhgBdeanRERwXHkedz3QX0y0i+h5ARVQ6IwnwAk8YJaIY7n8ni yMsYn7OvD5jEKFsC6fu64k6pRnETSNk5B1+4RQg4F8T2MOGnsHwRA3Hqyo/pY7q0 hEOslk73U/hLi56jRM7Cjz0B304Aq/ZM9xE7bO9HWGnHYGAvRkVcbSnajOo0EWKE Jet+KmUau6GIVaqSmXZmWmZ55WeIQyzGC7gxEGw2NoI/EnMapthDdjpE/gRCsCf7 NRLIEtEcAJiiN1mUgzpW6vcuX6I9K03fksMB7jPAUbzdr9zv0knQbr8W5dG1ESKb kfvwe3z6i+8yFOf3kJ5sVFgIkHzuFn2GZGlaXZqhNBbOhBIbmNiBzHY22BQf8y1z F4LnVFdPDV+qvWaZVTt/rF/TRVP1+DZ4RdXev8Nwk9SyUcmgrn9ITfORs6NH4mqj gSntcdDuMNy3ZPxDTYaB =IDDI -----END PGP SIGNATURE----- --=_utPKZIHGK_Eh18C1y7pEmg9-- From unknown Fri Mar 29 13:19:59 2024 X-Loop: owner@bugs.x2go.org Subject: Bug#440: X2Go issue (in src:x2goclient) has been marked as closed Reply-To: Mike Gabriel , 440@bugs.x2go.org Resent-From: Mike Gabriel Resent-To: x2go-dev@lists.berlios.de Resent-CC: X2Go Developers X-Loop: owner@bugs.x2go.org Resent-Date: Thu, 10 Apr 2014 11:55:06 +0000 Resent-Message-ID: Resent-Sender: owner@bugs.x2go.org X-X2Go-PR-Message: followup 440 X-X2Go-PR-Package: x2goclient X-X2Go-PR-Keywords: pending patch Received: via spool by 440-submit@bugs.x2go.org id=B440.139713075030049 (code B ref 440); Thu, 10 Apr 2014 11:55:06 +0000 Received: (at 440) by bugs.x2go.org; 10 Apr 2014 11:52:30 +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=-1.9 required=5.0 tests=BAYES_00,NO_RELAYS, URIBL_BLOCKED autolearn=ham version=3.3.2 Received: by ymir.das-netzwerkteam.de (Postfix, from userid 1005) id E424E3BC4A; Thu, 10 Apr 2014 13:52:13 +0200 (CEST) From: Mike Gabriel To: 440-submitter@bugs.x2go.org Cc: control@bugs.x2go.org, 440@bugs.x2go.org Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Message-Id: <20140410115213.E424E3BC4A@ymir.das-netzwerkteam.de> Date: Thu, 10 Apr 2014 13:52:13 +0200 (CEST) close #440 thanks Hello, we are very hopeful that X2Go issue #440 reported by you has been resolved in the new release (4.0.2.0) of the X2Go source project »src:x2goclient«. You can view the complete changelog entry of src:x2goclient (4.0.2.0) below, and you can use the following link to view all the code changes between this and the last release of src:x2goclient. http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=cbe900f245206ad9bd62d0fbaf226da1b3ffc44e;hp=f7cdada8c57c45ee9ea3b6c42bd680fae26d728c If you feel that the issue has not been resolved satisfyingly, feel free to reopen this bug report or submit a follow-up report with further observations described based on the new released version of src:x2goclient. Thanks a lot for contributing to X2Go!!! light+love X2Go Git Admin (on behalf of the sender of this mail) --- X2Go Component: src:x2goclient Version: 4.0.2.0-0x2go1 Status: RELEASE Date: Thu, 10 Apr 2014 13:47:56 +0200 Fixes: 138 349 422 440 446 448 453 Changes: x2goclient (4.0.2.0-0x2go1) RELEASED; urgency=low . [ Oleksandr Shneyder ] * New upstream version (4.0.2.0): - Revrite SSH Classes to support libssh fix. - Add Class HelpDialog to show options in scroll area. - Fix authentication on SSH Broker with key + passphrase. - Set modmap timer timeout to 10 sec on Mac. - Fix running xmodmap if X2Go Client not started from terminal. - Setting keyboard modifiers with xmodmap. - Fix multimonitor support on Linux. - Display more version info. Parameters --version, --git, --changelog. - Don't show GUI dialog for --version, --help, etc, if started from terminal on linux and mac. - If no user in session config, display system username in pass form. - Check if txt/changelog and txt/git exist on config phase. Rename option "--git" to "--git-info". - Change x2goclient.nsi for nightly builds. . [ Josh Lukens ] * New upstream version (4.0.2.0): - Switch to QNetworkAccessManager. Appropriately set content type header to "application/x-www-form-urlencoded" for HTTP post requests. (Fixes: #440, #138). - Fix copy+paste errors in QNetworkAccessManager code. - Provide support for dynamic authentication IDs. This is a requirement for using the broker client against brokers that use some sort of OTP authentication mechanism. (Fixes: #446). . [ Mike Gabriel ] * New upstream version (4.0.2.0): - Drop create_text.sh again, implement changelog copying in distro build files. Implement Git history creation for nightly builds in build scripts. - Rename txt/git to txt/git-info (make it compliant with cmdline options). - Allow starting shadow sessions from the command line with option --hidden being enabled. (Fixes: #349). * debian/control: + Build-depend on libssh-dev (>= 0.5.4-2). + Bump Standards: to 3.9.5. No changes needed. * debian/rules: + Copy debian/changelog into txt/ subfolder during dh_auto_configure. + Create txt/git-info files for ChangeLog.git if it exists. * x2goclient.spec: + Copy ChangeLog (or debian/changelog) into txt/ subfolder during %setup. + Copy ChangeLog.gitlog (if present) into txt/ subfolder during %setup. + B-R (epel-7): man2html-core (same as for Fedora builds). . [ Mike DePaulo ] * New upstream version (4.0.2.0): - Decrease HelpDialog's tab width from 320 to 30 (the width of 10 spaces.) (Fixes: #453) - Windows: Fix compatibility with PulseAudio 3.0 & later through new cookie handling. (Fixes: #422) - Windows: Upgrade included PulseAudio from 1.1 to 5.0. The 5.0 build is patched for X2Go bug #363. and available here: https://build.opensuse.org/project/show/home:mikedep333:branches:home:\ mkbosmans:mingw32:pulseaudio - Windows: Reapply KDE on Windows's patch for Pageant support to libssh 0.5.5. (Fixes: #448) From unknown Fri Mar 29 13:19:59 2024 MIME-Version: 1.0 X-Mailer: MIME-tools 5.502 (Entity 5.502) X-Loop: owner@bugs.x2go.org From: owner@bugs.x2go.org (X2Go Bug Tracking System) Subject: Bug#440 closed by Mike Gabriel (X2Go issue (in src:x2goclient) has been marked as closed) Message-ID: References: <20140410115213.E424E3BC4A@ymir.das-netzwerkteam.de> X-X2go-PR-Keywords: pending patch X-X2go-PR-Message: they-closed 440 X-X2go-PR-Package: x2goclient X-X2go-PR-Source: x2goclient Date: Thu, 10 Apr 2014 11:55:11 +0000 Content-Type: multipart/mixed; boundary="----------=_1397130911-31551-0" This is a multi-part message in MIME format... ------------=_1397130911-31551-0 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 This is an automatic notification regarding your Bug report which was filed against the x2goclient package: #440: Convert from using QHttp to QNetworkAccessManager for Session Broker It has been closed by Mike Gabriel . Their explanation is attached below along with your original report. If this explanation is unsatisfactory and you have not received a better one in a separate message then please contact Mike Gabriel by replying to this email. --=20 X2Go Bug Tracking System Contact owner@bugs.x2go.org with problems ------------=_1397130911-31551-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at control) by bugs.x2go.org; 10 Apr 2014 11:53:03 +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=-1.9 required=5.0 tests=BAYES_00,NO_RELAYS, URIBL_BLOCKED autolearn=unavailable version=3.3.2 Received: by ymir.das-netzwerkteam.de (Postfix, from userid 1005) id E424E3BC4A; Thu, 10 Apr 2014 13:52:13 +0200 (CEST) From: Mike Gabriel To: 440-submitter@bugs.x2go.org Cc: control@bugs.x2go.org, 440@bugs.x2go.org Subject: X2Go issue (in src:x2goclient) has been marked as closed Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit Message-Id: <20140410115213.E424E3BC4A@ymir.das-netzwerkteam.de> Date: Thu, 10 Apr 2014 13:52:13 +0200 (CEST) close #440 thanks Hello, we are very hopeful that X2Go issue #440 reported by you has been resolved in the new release (4.0.2.0) of the X2Go source project »src:x2goclient«. You can view the complete changelog entry of src:x2goclient (4.0.2.0) below, and you can use the following link to view all the code changes between this and the last release of src:x2goclient. http://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff;h=cbe900f245206ad9bd62d0fbaf226da1b3ffc44e;hp=f7cdada8c57c45ee9ea3b6c42bd680fae26d728c If you feel that the issue has not been resolved satisfyingly, feel free to reopen this bug report or submit a follow-up report with further observations described based on the new released version of src:x2goclient. Thanks a lot for contributing to X2Go!!! light+love X2Go Git Admin (on behalf of the sender of this mail) --- X2Go Component: src:x2goclient Version: 4.0.2.0-0x2go1 Status: RELEASE Date: Thu, 10 Apr 2014 13:47:56 +0200 Fixes: 138 349 422 440 446 448 453 Changes: x2goclient (4.0.2.0-0x2go1) RELEASED; urgency=low . [ Oleksandr Shneyder ] * New upstream version (4.0.2.0): - Revrite SSH Classes to support libssh fix. - Add Class HelpDialog to show options in scroll area. - Fix authentication on SSH Broker with key + passphrase. - Set modmap timer timeout to 10 sec on Mac. - Fix running xmodmap if X2Go Client not started from terminal. - Setting keyboard modifiers with xmodmap. - Fix multimonitor support on Linux. - Display more version info. Parameters --version, --git, --changelog. - Don't show GUI dialog for --version, --help, etc, if started from terminal on linux and mac. - If no user in session config, display system username in pass form. - Check if txt/changelog and txt/git exist on config phase. Rename option "--git" to "--git-info". - Change x2goclient.nsi for nightly builds. . [ Josh Lukens ] * New upstream version (4.0.2.0): - Switch to QNetworkAccessManager. Appropriately set content type header to "application/x-www-form-urlencoded" for HTTP post requests. (Fixes: #440, #138). - Fix copy+paste errors in QNetworkAccessManager code. - Provide support for dynamic authentication IDs. This is a requirement for using the broker client against brokers that use some sort of OTP authentication mechanism. (Fixes: #446). . [ Mike Gabriel ] * New upstream version (4.0.2.0): - Drop create_text.sh again, implement changelog copying in distro build files. Implement Git history creation for nightly builds in build scripts. - Rename txt/git to txt/git-info (make it compliant with cmdline options). - Allow starting shadow sessions from the command line with option --hidden being enabled. (Fixes: #349). * debian/control: + Build-depend on libssh-dev (>= 0.5.4-2). + Bump Standards: to 3.9.5. No changes needed. * debian/rules: + Copy debian/changelog into txt/ subfolder during dh_auto_configure. + Create txt/git-info files for ChangeLog.git if it exists. * x2goclient.spec: + Copy ChangeLog (or debian/changelog) into txt/ subfolder during %setup. + Copy ChangeLog.gitlog (if present) into txt/ subfolder during %setup. + B-R (epel-7): man2html-core (same as for Fedora builds). . [ Mike DePaulo ] * New upstream version (4.0.2.0): - Decrease HelpDialog's tab width from 320 to 30 (the width of 10 spaces.) (Fixes: #453) - Windows: Fix compatibility with PulseAudio 3.0 & later through new cookie handling. (Fixes: #422) - Windows: Upgrade included PulseAudio from 1.1 to 5.0. The 5.0 build is patched for X2Go bug #363. and available here: https://build.opensuse.org/project/show/home:mikedep333:branches:home:\ mkbosmans:mingw32:pulseaudio - Windows: Reapply KDE on Windows's patch for Pageant support to libssh 0.5.5. (Fixes: #448) ------------=_1397130911-31551-0 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by bugs.x2go.org; 27 Feb 2014 14:41:41 +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 1502 seconds by postgrey-1.34 at ymir; Thu, 27 Feb 2014 15:41:39 CET Received: from felt.botch.com (felt.botch.com [207.145.43.98]) by ymir (Postfix) with ESMTP id 01BD95DB16 for ; Thu, 27 Feb 2014 15:41:39 +0100 (CET) Received: from [127.0.0.1] (unknown [192.168.254.1]) (Authenticated sender: jlukens) by felt.botch.com (Postfix) with ESMTP id 706891AC0C7 for ; Thu, 27 Feb 2014 09:16:30 -0500 (EST) Date: Thu, 27 Feb 2014 09:16:29 -0500 From: Joshua Lukens To: submit@bugs.x2go.org Message-ID: <84F7E80E06784E5695FC31F4E72E3DC0@botch.com> Subject: Convert from using QHttp to QNetworkAccessManager for Session Broker X-Mailer: sparrow 1.6.4 (build 1178) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="530f48bd_567bd50a_233f" --530f48bd_567bd50a_233f Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Package: x2goclient Version: 4.0.1.3 Severity: wishlist QT lists QHttp as "This class is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code." The current preferred method for making http/https request is to use QNetworkAccessManager. The attached patch makes that conversion. I've done light testing on patch with both OSX and Windows clients and it appears functional. --530f48bd_567bd50a_233f Content-Type: application/octet-stream Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="switch-to-QNetworkAccessManager.patch" Y29tbWl0IDAwYjgwOWQ4MDlhZTRjYTY5MWQ1YTRlMmZhNjYxN2RlNzZjZmRjMGIKQXV0aG9yOiBK b3NoIEx1a2VucyA8amx1a2Vuc0Bib3RjaC5jb20+CkRhdGU6ICAgVGh1IEZlYiAyNyAwOTowNToy OCAyMDE0IC0wNTAwCgogICAgQ29udmVydCBmcm9tIHVzaW5nIFFIdHRwIHRvIFFOZXR3b3JrQWNj ZXNzTWFuYWdlciBmb3IgU2Vzc2lvbiBCcm9rZXIKCmRpZmYgLS1naXQgYS9odHRwYnJva2VyY2xp ZW50LmNwcCBiL2h0dHBicm9rZXJjbGllbnQuY3BwCmluZGV4IGQyMzhkODIuLjgyNzNkN2MgMTAw NjQ0Ci0tLSBhL2h0dHBicm9rZXJjbGllbnQuY3BwCisrKyBiL2h0dHBicm9rZXJjbGllbnQuY3Bw CkBAIC0xNiw4ICsxNiwxMCBAQAogKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqLwogCiAjaW5jbHVkZSAiaHR0 cGJyb2tlcmNsaWVudC5oIgorI2luY2x1ZGUgPFFOZXR3b3JrQWNjZXNzTWFuYWdlcj4KICNpbmNs dWRlIDxRVXJsPgotI2luY2x1ZGUgPFFIdHRwPgorI2luY2x1ZGUgPFFOZXR3b3JrUmVxdWVzdD4K KyNpbmNsdWRlIDxRTmV0d29ya1JlcGx5PgogI2luY2x1ZGUgPFFUZXh0U3RyZWFtPgogI2luY2x1 ZGUgPFFGaWxlPgogI2luY2x1ZGUgPFFEaXI+CkBAIC0zNCw2ICszNiw3IEBACiAjaW5jbHVkZSA8 UVRlbXBvcmFyeUZpbGU+CiAjaW5jbHVkZSA8UUlucHV0RGlhbG9nPgogCisKIEh0dHBCcm9rZXJD bGllbnQ6Okh0dHBCcm9rZXJDbGllbnQgKCBPTk1haW5XaW5kb3cqIHduZCwgQ29uZmlnRmlsZSog Y2ZnICkKIHsKICAgICBjb25maWc9Y2ZnOwpAQCAtNTYsMzAgKzU5LDE5IEBAIEh0dHBCcm9rZXJD bGllbnQ6Okh0dHBCcm9rZXJDbGllbnQgKCBPTk1haW5XaW5kb3cqIHduZCwgQ29uZmlnRmlsZSog Y2ZnICkKICAgICB7CiAgICAgICAgIHNzaEJyb2tlcj1mYWxzZTsKIAotICAgICAgICBodHRwPW5l dyBRSHR0cCAoIHRoaXMgKTsKLQotICAgICAgICBpZiAoIGNvbmZpZy0+YnJva2VydXJsLmluZGV4 T2YgKCAiaHR0cHM6Ly8iICkgPT0wICkgewotICAgICAgICAgICAgaWYgKChjb25maWctPmJyb2tl ckNhQ2VydEZpbGUubGVuZ3RoKCkgPjApICYmIChRRmlsZTo6ZXhpc3RzKGNvbmZpZy0+YnJva2Vy Q2FDZXJ0RmlsZSkpKSB7Ci0KLSAgICAgICAgICAgICAgICBzc2xTb2NrZXQgPSBuZXcgUVNzbFNv Y2tldCh0aGlzKTsKLSAgICAgICAgICAgICAgICBjb25uZWN0ICggc3NsU29ja2V0LCBTSUdOQUwg KCBzc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+JiApICksdGhpcywKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RTc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3Ns RXJyb3I+JiApICkgKTsKLSAgICAgICAgICAgICAgICBodHRwLT5zZXRTb2NrZXQoc3NsU29ja2V0 KTsKLSAgICAgICAgICAgICAgICBzc2xTb2NrZXQtPmFkZENhQ2VydGlmaWNhdGVzKGNvbmZpZy0+ YnJva2VyQ2FDZXJ0RmlsZSwgUVNzbDo6UGVtKTsKLSAgICAgICAgICAgICAgICB4MmdvRGVidWc8 PCJDdXN0b20gQ0EgY2VydGlmaWNhdGUgZmlsZSBsb2FkZWQgaW50byBIVFRQUyBicm9rZXIgY2xp ZW50OiAiPDxjb25maWctPmJyb2tlckNhQ2VydEZpbGU7CisgICAgICAgIGlmICgoY29uZmlnLT5i cm9rZXJDYUNlcnRGaWxlLmxlbmd0aCgpID4wKSAmJiAoUUZpbGU6OmV4aXN0cyhjb25maWctPmJy b2tlckNhQ2VydEZpbGUpKSkgewkJCQkKKyAgICAgICAgICAgIFFTc2xTb2NrZXQ6OmFkZERlZmF1 bHRDYUNlcnRpZmljYXRlcyhjb25maWctPmJyb2tlckNhQ2VydEZpbGUsIFFTc2w6OlBlbSk7CisJ CSAgICB4MmdvRGVidWc8PCJDdXN0b20gQ0EgY2VydGlmaWNhdGUgZmlsZSBsb2FkZWQgaW50byBI VFRQUyBicm9rZXIgY2xpZW50OiAiPDxjb25maWctPmJyb2tlckNhQ2VydEZpbGU7CisJICAgIH0K KwkgICAKKyAgICAgICAgaHR0cD1uZXcgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyICggdGhpcyApOwor ICAgICAgICB4MmdvRGVidWc8PCJTZXR0aW5nIHVwIGNvbm5lY3Rpb24gdG8gYnJva2VyOiAiPDxj b25maWctPmJyb2tlcnVybDsKKyAgICAgIAorICAgICAgICBjb25uZWN0ICggaHR0cCwgU0lHTkFM ICggc3NsRXJyb3JzICggUU5ldHdvcmtSZXBseSosIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mICkg KSx0aGlzLAorCSAgICAgICAgICAgICAgICAgU0xPVCAoIHNsb3RTc2xFcnJvcnMgKCBRTmV0d29y a1JlcGx5KiwgY29uc3QgUUxpc3Q8UVNzbEVycm9yPiYgKSApICk7CiAKLSAgICAgICAgICAgIH0g ZWxzZSB7Ci0gICAgICAgICAgICAgICAgY29ubmVjdCAoIGh0dHAsIFNJR05BTCAoIHNzbEVycm9y cyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mICkgKSx0aGlzLAotICAgICAgICAgICAgICAgICAg ICAgICAgICBTTE9UICggc2xvdFNzbEVycm9ycyAoIGNvbnN0IFFMaXN0PFFTc2xFcnJvcj4mICkg KSApOwotICAgICAgICAgICAgfQotICAgICAgICAgICAgaHR0cC0+c2V0SG9zdCAoIGx1cmwuaG9z dCgpLFFIdHRwOjpDb25uZWN0aW9uTW9kZUh0dHBzLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGx1cmwucG9ydCAoIDQ0MyApICk7Ci0gICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBo dHRwLT5zZXRIb3N0ICggbHVybC5ob3N0KCksUUh0dHA6OkNvbm5lY3Rpb25Nb2RlSHR0cCwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICBsdXJsLnBvcnQgKCA4MCApICk7Ci0gICAgICAgIH0K LSAgICAgICAgY29ubmVjdCAoIGh0dHAsU0lHTkFMICggcmVxdWVzdEZpbmlzaGVkICggaW50LGJv b2wgKSApLHRoaXMsCi0gICAgICAgICAgICAgICAgICBTTE9UICggc2xvdFJlcXVlc3RGaW5pc2hl ZCAoIGludCxib29sICkgKSApOworICAgICAgICBjb25uZWN0ICggaHR0cCxTSUdOQUwgKCBmaW5p c2hlZCAoUU5ldHdvcmtSZXBseSopICksdGhpcywKKyAgICAgICAgICAgICAgICAgIFNMT1QgKCBz bG90UmVxdWVzdEZpbmlzaGVkIChRTmV0d29ya1JlcGx5KikgKSApOwogICAgIH0KIH0KIApAQCAt OTMsMTMgKzg1LDEzIEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Y3JlYXRlU3NoQ29ubmVjdGlv bigpCiAgICAgUVVybCBsdXJsICggY29uZmlnLT5icm9rZXJ1cmwgKTsKICAgICBzc2hDb25uZWN0 aW9uPW5ldyBTc2hNYXN0ZXJDb25uZWN0aW9uICh0aGlzLCBsdXJsLmhvc3QoKSwgbHVybC5wb3J0 KDIyKSxmYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25maWctPmJyb2tlclVzZXIsIGNvbmZpZy0+YnJva2VyUGFzcyxjb25maWctPmJyb2tlclNzaEtl eSxjb25maWctPmJyb2tlckF1dG9sb2dpbiwKLQkJCQkJICAgY29uZmlnLT5icm9rZXJLcmJMb2dp biwgZmFsc2UpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNv bmZpZy0+YnJva2VyS3JiTG9naW4sIGZhbHNlKTsKIAogICAgIGNvbm5lY3QgKCBzc2hDb25uZWN0 aW9uLCBTSUdOQUwgKCBjb25uZWN0aW9uT2soUVN0cmluZykpLCB0aGlzLCBTTE9UICggc2xvdFNz aENvbm5lY3Rpb25PaygpICkgKTsKICAgICBjb25uZWN0ICggc3NoQ29ubmVjdGlvbiwgU0lHTkFM ICggc2VydmVyQXV0aEVycm9yICggaW50LFFTdHJpbmcsIFNzaE1hc3RlckNvbm5lY3Rpb24qICkg KSx0aGlzLAogICAgICAgICAgICAgICBTTE9UICggc2xvdFNzaFNlcnZlckF1dGhFcnJvciAoIGlu dCxRU3RyaW5nLCBTc2hNYXN0ZXJDb25uZWN0aW9uKiApICkgKTsKLSAgICBjb25uZWN0ICggc3No Q29ubmVjdGlvbiwgU0lHTkFMICggbmVlZFBhc3NQaHJhc2UoU3NoTWFzdGVyQ29ubmVjdGlvbiop KSx0aGlzLAotICAgICAgICAgICAgICBTTE9UICggc2xvdFNzaFNlcnZlckF1dGhQYXNzcGhyYXNl KFNzaE1hc3RlckNvbm5lY3Rpb24qKSkgKTsKKyAgICBjb25uZWN0ICggc3NoQ29ubmVjdGlvbiwg U0lHTkFMICggbmVlZFBhc3NQaHJhc2UoU3NoTWFzdGVyQ29ubmVjdGlvbiosIGJvb2wpKSx0aGlz LAorICAgICAgICAgICAgICBTTE9UICggc2xvdFNzaFNlcnZlckF1dGhQYXNzcGhyYXNlKFNzaE1h c3RlckNvbm5lY3Rpb24qLCBib29sKSkgKTsKICAgICBjb25uZWN0ICggc3NoQ29ubmVjdGlvbiwg U0lHTkFMICggdXNlckF1dGhFcnJvciAoIFFTdHJpbmcgKSApLHRoaXMsU0xPVCAoIHNsb3RTc2hV c2VyQXV0aEVycm9yICggUVN0cmluZyApICkgKTsKICAgICBjb25uZWN0ICggc3NoQ29ubmVjdGlv biwgU0lHTkFMICggY29ubmVjdGlvbkVycm9yKFFTdHJpbmcsUVN0cmluZykpLCB0aGlzLAogICAg ICAgICAgICAgICBTTE9UICggc2xvdFNzaENvbm5lY3Rpb25FcnJvciAoIFFTdHJpbmcsUVN0cmlu ZyApICkgKTsKQEAgLTE5OSwxMSArMTkxLDIzIEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6c2xv dFNzaFNlcnZlckF1dGhFcnJvcihpbnQgZXJyb3IsIFFTdHJpbmcgc3NoTWVzc2FnZSwgU3NoCiAK IH0KIAotdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90U3NoU2VydmVyQXV0aFBhc3NwaHJhc2Uo U3NoTWFzdGVyQ29ubmVjdGlvbiogY29ubmVjdGlvbikKK3ZvaWQgSHR0cEJyb2tlckNsaWVudDo6 c2xvdFNzaFNlcnZlckF1dGhQYXNzcGhyYXNlKFNzaE1hc3RlckNvbm5lY3Rpb24qIGNvbm5lY3Rp b24sIGJvb2wgdmVyaWZpY2F0aW9uQ29kZSkKIHsKICAgICBib29sIG9rOworICAgIFFTdHJpbmcg bWVzc2FnZTsKKworICAgIGlmKHZlcmlmaWNhdGlvbkNvZGUpCisgICAgeworICAgICAgICBtZXNz YWdlPXRyKCJWZXJpZmljYXRpb24gY29kZToiKTsKKyAgICB9CisgICAgZWxzZQorICAgIHsKKyAg ICAgICAgbWVzc2FnZT10cigiRW50ZXIgcGFzc3BocmFzZSB0byBkZWNyeXB0IGEga2V5Iik7Cisg ICAgfQorCisKICAgICBRU3RyaW5nIHBocmFzZT1RSW5wdXREaWFsb2c6OmdldFRleHQoMCxjb25u ZWN0aW9uLT5nZXRVc2VyKCkrIkAiK2Nvbm5lY3Rpb24tPmdldEhvc3QoKSsiOiIrUVN0cmluZzo6 bnVtYmVyKGNvbm5lY3Rpb24tPmdldFBvcnQoKSksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHRyKCJFbnRlciBwYXNzcGhyYXNlIHRvIGRlY3J5cHQgYSBrZXkiKSxR TGluZUVkaXQ6OlBhc3N3b3JkLFFTdHJpbmc6Om51bGwsICZvayk7CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG1lc3NhZ2UsIFFMaW5lRWRpdDo6UGFzc3dvcmQsUVN0 cmluZzo6bnVsbCwgJm9rKTsKICAgICBpZighb2spCiAgICAgewogICAgICAgICBwaHJhc2U9UVN0 cmluZzo6bnVsbDsKQEAgLTIzNiw2ICsyNDAsNyBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNs b3RTc2hVc2VyQXV0aEVycm9yKFFTdHJpbmcgZXJyb3IpCiB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6 OmdldFVzZXJTZXNzaW9ucygpCiB7CiAgICAgUVN0cmluZyBicm9rZXJVc2VyPWNvbmZpZy0+YnJv a2VyVXNlcjsKK3gyZ29EZWJ1Zzw8ImNhbGxlZCBnZXRVc2VyU2Vzc2lvbnM6IGJyb2tlcnVzZXI6 ICI8PGJyb2tlclVzZXI8PCIgYnJva2VycGFzczogIjw8Y29uZmlnLT5icm9rZXJQYXNzPDwiIGF1 dGhpZDogIjw8Y29uZmlnLT5icm9rZXJVc2VySWQ7CiAgICAgaWYobWFpbldpbmRvdy0+Z2V0VXNl UEdQQ2FyZCgpKQogICAgICAgICBicm9rZXJVc2VyPW1haW5XaW5kb3ctPmdldENhcmRMb2dpbigp OwogICAgIGNvbmZpZy0+c2Vzc2lvbmRhdGE9UVN0cmluZzo6bnVsbDsKQEAgLTI0NywxMCArMjUy LDkgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpnZXRVc2VyU2Vzc2lvbnMoKQogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAidXNlcj0iPDxicm9rZXJVc2VyPDwiJiI8PAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAicGFzc3dvcmQ9Ijw8Y29uZmlnLT5icm9rZXJQYXNzPDwiJiI8 PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8PGNvbmZpZy0+YnJva2Vy VXNlcklkOwotICAgICAgICBRVXJsIGx1cmwgKCBjb25maWctPmJyb2tlcnVybCApOwotICAgICAg ICBodHRwU2Vzc2lvbkFuc3dlci5jbG9zZSgpOwotICAgICAgICBodHRwU2Vzc2lvbkFuc3dlci5z ZXREYXRhICggMCwwICk7Ci0gICAgICAgIHNlc3Npb25zUmVxdWVzdD1odHRwLT5wb3N0ICggbHVy bC5wYXRoKCkscmVxLnRvVXRmOCgpLCZodHRwU2Vzc2lvbkFuc3dlciApOworCisgICAgICAgIHgy Z29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOworICAgICAgICBz ZXNzaW9uc1JlcXVlc3Q9aHR0cC0+cG9zdCAoIFFOZXR3b3JrUmVxdWVzdChRVXJsKGNvbmZpZy0+ YnJva2VydXJsKSkscmVxLnRvVXRmOCgpICk7CiAgICAgfQogICAgIGVsc2UKICAgICB7CkBAIC0y NzEsNiArMjc1LDcgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpnZXRVc2VyU2Vzc2lvbnMoKQog CiB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNlbGVjdFVzZXJTZXNzaW9uKGNvbnN0IFFTdHJpbmcm IHNlc3Npb24pCiB7CisgICAgeDJnb0RlYnVnPDwiY2FsbGVkIHNlbGVjdFVzZXJTZXNzaW9ucyI7 CiAgICAgUVN0cmluZyBicm9rZXJVc2VyPWNvbmZpZy0+YnJva2VyVXNlcjsKICAgICBpZihtYWlu V2luZG93LT5nZXRVc2VQR1BDYXJkKCkpCiAgICAgICAgIGJyb2tlclVzZXI9bWFpbldpbmRvdy0+ Z2V0Q2FyZExvZ2luKCk7CkBAIC0yODQsMTAgKzI4OSw5IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVu dDo6c2VsZWN0VXNlclNlc3Npb24oY29uc3QgUVN0cmluZyYgc2Vzc2lvbikKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInVzZXI9Ijw8YnJva2VyVXNlcjw8IiYiPDwKICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInBhc3N3b3JkPSI8PGNvbmZpZy0+YnJva2VyUGFzczw8IiYiPDwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImF1dGhpZD0iPDxjb25maWctPmJyb2tlclVz ZXJJZDsKLSAgICAgICAgUVVybCBsdXJsICggY29uZmlnLT5icm9rZXJ1cmwgKTsKLSAgICAgICAg aHR0cFNlc3Npb25BbnN3ZXIuY2xvc2UoKTsKLSAgICAgICAgaHR0cFNlc3Npb25BbnN3ZXIuc2V0 RGF0YSAoIDAsMCApOwotICAgICAgICBzZWxTZXNzUmVxdWVzdD1odHRwLT5wb3N0ICggbHVybC5w YXRoKCkscmVxLnRvVXRmOCgpLCZodHRwU2Vzc2lvbkFuc3dlciApOworICAgICAgICB4MmdvRGVi dWcgPDwgInNlbmRpbmcgcmVxdWVzdDogIjw8IHJlcS50b1V0ZjgoKTsKKwkJc2VsU2Vzc1JlcXVl c3Q9aHR0cC0+cG9zdCAoICBRTmV0d29ya1JlcXVlc3QoUVVybChjb25maWctPmJyb2tlcnVybCkp LHJlcS50b1V0ZjgoKSApOworCiAgICAgfQogICAgIGVsc2UKICAgICB7CkBAIC0zMTgsMTEgKzMy Miw5IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Y2hhbmdlUGFzc3dvcmQoUVN0cmluZyBuZXdQ YXNzKQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAidXNlcj0iPDxicm9rZXJVc2VyPDwi JiI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAicGFzc3dvcmQ9Ijw8Y29uZmlnLT5i cm9rZXJQYXNzPDwiJiI8PAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiYXV0aGlkPSI8 PGNvbmZpZy0+YnJva2VyVXNlcklkOwotICAgICAgICBRVXJsIGx1cmwgKCBjb25maWctPmJyb2tl cnVybCApOwotICAgICAgICBodHRwU2Vzc2lvbkFuc3dlci5jbG9zZSgpOwotICAgICAgICBodHRw U2Vzc2lvbkFuc3dlci5zZXREYXRhICggMCwwICk7Ci0gICAgICAgIGNoUGFzc1JlcXVlc3Q9aHR0 cC0+cG9zdCAoIGx1cmwucGF0aCgpLHJlcS50b1V0ZjgoKSwmaHR0cFNlc3Npb25BbnN3ZXIgKTsK LSAgICB9CisgICAgICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyByZXF1ZXN0OiAiPDwgcmVxLnRv VXRmOCgpOworICAgICAgICBjaFBhc3NSZXF1ZXN0PWh0dHAtPnBvc3QgKCAgUU5ldHdvcmtSZXF1 ZXN0KFFVcmwoY29uZmlnLT5icm9rZXJ1cmwpKSxyZXEudG9VdGY4KCkgKTsKKwkJfQogICAgIGVs c2UKICAgICB7CiAgICAgICAgIGlmIChjb25maWctPmJyb2tlclVzZXJJZC5sZW5ndGgoKSA+IDAp IHsKQEAgLTMzNywxNyArMzM5LDE1IEBAIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6Y2hhbmdlUGFz c3dvcmQoUVN0cmluZyBuZXdQYXNzKQogCiB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnRlc3RDb25u ZWN0aW9uKCkKIHsKKyAgICB4MmdvRGVidWc8PCJjYWxsZWQgdGVzdENvbm5lY3Rpb24iOwogICAg IGlmKCFzc2hCcm9rZXIpCiAgICAgewogICAgICAgICBRU3RyaW5nIHJlcTsKICAgICAgICAgUVRl eHRTdHJlYW0gKCAmcmVxICkgPDwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgInRhc2s9 dGVzdGNvbiI7Ci0gICAgICAgIFFVcmwgbHVybCAoIGNvbmZpZy0+YnJva2VydXJsICk7Ci0gICAg ICAgIGh0dHBTZXNzaW9uQW5zd2VyLmNsb3NlKCk7Ci0gICAgICAgIGh0dHBTZXNzaW9uQW5zd2Vy LnNldERhdGEgKCAwLDAgKTsKLSAgICAgICAgcmVxdWVzdFRpbWUuc3RhcnQoKTsKLSAgICAgICAg dGVzdENvblJlcXVlc3Q9aHR0cC0+cG9zdCAoIGx1cmwucGF0aCgpLHJlcS50b1V0ZjgoKSwmaHR0 cFNlc3Npb25BbnN3ZXIgKTsKLSAgICB9CisgICAgICAgIHgyZ29EZWJ1ZyA8PCAic2VuZGluZyBy ZXF1ZXN0OiAiPDwgcmVxLnRvVXRmOCgpOworICAgICAgICB0ZXN0Q29uUmVxdWVzdD1odHRwLT5w b3N0ICggIFFOZXR3b3JrUmVxdWVzdChRVXJsKGNvbmZpZy0+YnJva2VydXJsKSkscmVxLnRvVXRm OCgpICk7CisJfQogICAgIGVsc2UKICAgICB7CiAgICAgICAgIGlmIChjb25maWctPmJyb2tlclVz ZXJJZC5sZW5ndGgoKSA+IDApIHsKQEAgLTM4MCw2ICszODAsNyBAQCB2b2lkIEh0dHBCcm9rZXJD bGllbnQ6OmNyZWF0ZUluaUZpbGUoY29uc3QgUVN0cmluZyYgcmF3X2NvbnRlbnQpCiAKIGJvb2wg SHR0cEJyb2tlckNsaWVudDo6Y2hlY2tBY2Nlc3MoUVN0cmluZyBhbnN3ZXIgKQogeworICAgIHgy Z29EZWJ1Zzw8ImNhbGxlZCBjaGVja0FjY2VzcyAtIGFuc3dlciB3YXM6ICI8PGFuc3dlcjsKICAg ICBpZiAoYW5zd2VyLmluZGV4T2YoIkFjY2VzcyBncmFudGVkIik9PS0xKQogICAgIHsKICAgICAg ICAgUU1lc3NhZ2VCb3g6OmNyaXRpY2FsICgKQEAgLTM5Niw2ICszOTcsNyBAQCBib29sIEh0dHBC cm9rZXJDbGllbnQ6OmNoZWNrQWNjZXNzKFFTdHJpbmcgYW5zd2VyICkKIAogdm9pZCBIdHRwQnJv a2VyQ2xpZW50OjpzbG90Q29ubmVjdGlvblRlc3QoYm9vbCBzdWNjZXNzLCBRU3RyaW5nIGFuc3dl ciwgaW50KQogeworeDJnb0RlYnVnPDwiY2FsbGVkIHNsb3RDb25uZWN0aW9uVGVzdCI7CiAgICAg aWYoIXN1Y2Nlc3MpCiAgICAgewogICAgICAgICB4MmdvRGVidWc8PGFuc3dlcjsKQEAgLTQwNyw4 ICs0MDksOCBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RDb25uZWN0aW9uVGVzdChib29s IHN1Y2Nlc3MsIFFTdHJpbmcgYW5zd2VyLCBpbnQpCiAgICAgICAgIHJldHVybjsKICAgICBpZigh c3NoQnJva2VyKQogICAgIHsKLSAgICAgICAgeDJnb0RlYnVnPDwiZWxhcHNlZDogIjw8cmVxdWVz dFRpbWUuZWxhcHNlZCgpPDwicmVjZWl2ZWQ6Ijw8aHR0cFNlc3Npb25BbnN3ZXIuc2l6ZSgpPDxl bmRsOwotICAgICAgICBlbWl0IGNvbm5lY3Rpb25UaW1lKHJlcXVlc3RUaW1lLmVsYXBzZWQoKSxo dHRwU2Vzc2lvbkFuc3dlci5zaXplKCkpOworICAgICAgIHgyZ29EZWJ1Zzw8ImVsYXBzZWQ6ICI8 PHJlcXVlc3RUaW1lLmVsYXBzZWQoKTw8InJlY2VpdmVkOiI8PGFuc3dlci5zaXplKCk8PGVuZGw7 CisgICAgICAgZW1pdCBjb25uZWN0aW9uVGltZShyZXF1ZXN0VGltZS5lbGFwc2VkKCksYW5zd2Vy LnNpemUoKSk7CiAgICAgfQogICAgIHJldHVybjsKIApAQCAtNDU5LDM2ICs0NjEsMzggQEAgdm9p ZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90U2VsZWN0U2Vzc2lvbihib29sIHN1Y2Nlc3MsIFFTdHJp bmcgYW5zd2VyLCBpbnQpCiB9CiAKIAotdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpzbG90UmVxdWVz dEZpbmlzaGVkICggaW50IGlkLCBib29sIGVycm9yICkKLXsKLS8vICAgCXgyZ29EZWJ1Zzw8Imh0 dHAgcmVxdWVzdCAiPDxpZDw8IiwgZmluaXNoZWQgd2l0aDogIjw8ZXJyb3I7Ci0KLSAgICBpZiAo IGVycm9yICkKLSAgICB7Ci0gICAgICAgIHgyZ29EZWJ1Zzw8aHR0cC0+ZXJyb3JTdHJpbmcoKTsK LSAgICAgICAgUU1lc3NhZ2VCb3g6OmNyaXRpY2FsKDAsdHIoIkVycm9yIiksaHR0cC0+ZXJyb3JT dHJpbmcoKSk7Ci0gICAgICAgIGVtaXQgZmF0YWxIdHRwRXJyb3IoKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0KK3ZvaWQgSHR0cEJyb2tlckNsaWVudDo6c2xvdFJlcXVlc3RGaW5pc2hlZCAoIFFO ZXR3b3JrUmVwbHkqICByZXBseSApCit7CQorCWlmKHJlcGx5LT5lcnJvcigpICE9IFFOZXR3b3Jr UmVwbHk6Ok5vRXJyb3IpCisJCXsKKwkJCXgyZ29EZWJ1Zzw8IkJyb2tlciBIVFRQIHJlcXVlc3Qg ZmFpbGVkIHdpdGggZXJyb3I6ICI8PHJlcGx5LT5lcnJvclN0cmluZygpOworCQkJUU1lc3NhZ2VC b3g6OmNyaXRpY2FsKDAsdHIoIkVycm9yIikscmVwbHktPmVycm9yU3RyaW5nKCkpOworCQkJZW1p dCBmYXRhbEh0dHBFcnJvcigpOworCQkJcmV0dXJuOworCQl9CiAKLSAgICBRU3RyaW5nIGFuc3dl ciAoIGh0dHBTZXNzaW9uQW5zd2VyLmRhdGEoKSApOwotICAgIHgyZ29EZWJ1Zzw8ImNtZCByZXF1 ZXN0IGFuc3dlcjogIjw8YW5zd2VyOwotICAgIGlmIChpZD09dGVzdENvblJlcXVlc3QpCisgICAg UVN0cmluZyBhbnN3ZXIgKCByZXBseS0+cmVhZEFsbCgpICk7CisgICAgeDJnb0RlYnVnPDwiQSBo dHRwIHJlcXVlc3QgcmV0dXJuZWQuICBSZXN1bHQgd2FzOiAiPDxhbnN3ZXI7CisgICAgaWYgKHJl cGx5ID09IHRlc3RDb25SZXF1ZXN0KQogICAgIHsKICAgICAgICAgc2xvdENvbm5lY3Rpb25UZXN0 KHRydWUsYW5zd2VyLDApOwogICAgIH0KLSAgICBpZiAoaWQgPT0gc2Vzc2lvbnNSZXF1ZXN0KQor ICAgIGlmIChyZXBseSA9PSBzZXNzaW9uc1JlcXVlc3QpCiAgICAgewogICAgICAgICBzbG90TGlz dFNlc3Npb25zKHRydWUsIGFuc3dlciwwKTsKICAgICB9Ci0gICAgaWYgKGlkID09IHNlbFNlc3NS ZXF1ZXN0KQorICAgIGlmIChyZXBseSA9PSBzZWxTZXNzUmVxdWVzdCkKICAgICB7CiAgICAgICAg IHNsb3RTZWxlY3RTZXNzaW9uKHRydWUsYW5zd2VyLDApOwogICAgIH0KLSAgICBpZiAoIGlkID09 IGNoUGFzc1JlcXVlc3QpCisgICAgaWYgKHJlcGx5ID09IGNoUGFzc1JlcXVlc3QpCiAgICAgewog ICAgICAgICBzbG90UGFzc0NoYW5nZWQodHJ1ZSxhbnN3ZXIsMCk7CiAgICAgfQorCisgICAgLy8g V2UgcmVjZWl2ZSBvd25lcnNoaXAgb2YgdGhlIHJlcGx5IG9iamVjdAorICAgIC8vIGFuZCB0aGVy ZWZvcmUgbmVlZCB0byBoYW5kbGUgZGVsZXRpb24uCisgICAgcmVwbHktPmRlbGV0ZUxhdGVyKCk7 CiB9CiAKIHZvaWQgSHR0cEJyb2tlckNsaWVudDo6cGFyc2VTZXNzaW9uKFFTdHJpbmcgc2luZm8p CkBAIC01MjUsNyArNTI5LDcgQEAgdm9pZCBIdHRwQnJva2VyQ2xpZW50OjpwYXJzZVNlc3Npb24o UVN0cmluZyBzaW5mbykKIH0KIAogCi12b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RTc2xFcnJv cnMgKCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+ICYgZXJyb3JzICkKK3ZvaWQgSHR0cEJyb2tlckNs aWVudDo6c2xvdFNzbEVycm9ycyAoIFFOZXR3b3JrUmVwbHkqIG5ldFJlcGx5LCBjb25zdCBRTGlz dDxRU3NsRXJyb3I+ICYgZXJyb3JzICkKIHsKICAgICBRU3RyaW5nTGlzdCBlcnI7CiAgICAgUVNz bENlcnRpZmljYXRlIGNlcnQ7CkBAIC01NTIsNyArNTU2LDcgQEAgdm9pZCBIdHRwQnJva2VyQ2xp ZW50OjpzbG90U3NsRXJyb3JzICggY29uc3QgUUxpc3Q8UVNzbEVycm9yPiAmIGVycm9ycyApCiAg ICAgICAgIFFTc2xDZXJ0aWZpY2F0ZSBtY2VydCAoICZmbCApOwogICAgICAgICBpZiAoIG1jZXJ0 PT1jZXJ0ICkKICAgICAgICAgewotICAgICAgICAgICAgaHR0cC0+aWdub3JlU3NsRXJyb3JzKCk7 CisgICAgICAgICAgICBuZXRSZXBseS0+aWdub3JlU3NsRXJyb3JzKCk7CiAgICAgICAgICAgICBy ZXF1ZXN0VGltZS5yZXN0YXJ0KCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KQEAg LTYyMyw3ICs2MjcsNyBAQCB2b2lkIEh0dHBCcm9rZXJDbGllbnQ6OnNsb3RTc2xFcnJvcnMgKCBj b25zdCBRTGlzdDxRU3NsRXJyb3I+ICYgZXJyb3JzICkKICAgICAgICAgZmwub3BlbiAoIFFJT0Rl dmljZTo6V3JpdGVPbmx5IHwgUUlPRGV2aWNlOjpUZXh0ICk7CiAgICAgICAgIFFUZXh0U3RyZWFt ICggJmZsICkgPDxjZXJ0LnRvUGVtKCk7CiAgICAgICAgIGZsLmNsb3NlKCk7Ci0gICAgICAgIGh0 dHAtPmlnbm9yZVNzbEVycm9ycygpOworCQluZXRSZXBseS0+aWdub3JlU3NsRXJyb3JzKCk7CiAg ICAgICAgIHgyZ29EZWJ1Zzw8InN0b3JlIGNlcnRpZmljYXRlIGluICAiPDxob21lRGlyKyIvLngy Z28vc3NsL2V4Y2VwdGlvbnMvIisKICAgICAgICAgICAgICAgICAgbHVybC5ob3N0KCkgKyIvIitm bmFtZTsKICAgICAgICAgcmVxdWVzdFRpbWUucmVzdGFydCgpOwpkaWZmIC0tZ2l0IGEvaHR0cGJy b2tlcmNsaWVudC5oIGIvaHR0cGJyb2tlcmNsaWVudC5oCmluZGV4IGY4MjFmYjAuLjUyZTRiZWIg MTAwNjQ0Ci0tLSBhL2h0dHBicm9rZXJjbGllbnQuaAorKysgYi9odHRwYnJva2VyY2xpZW50LmgK QEAgLTE4LDYgKzE4LDEwIEBACiAjaWZuZGVmIEhUVFBCUk9LRVJDTElFTlRfSAogI2RlZmluZSBI VFRQQlJPS0VSQ0xJRU5UX0gKICNpbmNsdWRlICJ4MmdvY2xpZW50Y29uZmlnLmgiCisjaW5jbHVk ZSA8UU5ldHdvcmtBY2Nlc3NNYW5hZ2VyPgorI2luY2x1ZGUgPFFVcmw+CisjaW5jbHVkZSA8UU5l dHdvcmtSZXF1ZXN0PgorI2luY2x1ZGUgPFFOZXR3b3JrUmVwbHk+CiAjaW5jbHVkZSA8UVNzbEVy cm9yPgogI2luY2x1ZGUgPFFCdWZmZXI+CiAjaW5jbHVkZSA8UU9iamVjdD4KQEAgLTI3LDcgKzMx LDcgQEAKIC8qKgogCUBhdXRob3IgT2xla3NhbmRyIFNobmV5ZGVyIDxvbGVrc2FuZHIuc2huZXlk ZXJAb2J2aW91c2x5LW5pY2UuZGU+CiAqLwotY2xhc3MgUUh0dHA7CitjbGFzcyBRTmV0d29ya0Fj Y2Vzc01hbmFnZXI7CiBzdHJ1Y3QgQ29uZmlnRmlsZTsKIGNsYXNzIE9OTWFpbldpbmRvdzsKIApA QCAtNDEsMTQgKzQ1LDE3IEBAIHB1YmxpYzoKICAgICB2b2lkIGNoYW5nZVBhc3N3b3JkKFFTdHJp bmcgbmV3UGFzcyk7CiAgICAgdm9pZCB0ZXN0Q29ubmVjdGlvbigpOwogcHJpdmF0ZToKLSAgICBR QnVmZmVyIGh0dHBDbWRBbnN3ZXI7Ci0gICAgUUJ1ZmZlciBodHRwU2Vzc2lvbkFuc3dlcjsKLSAg ICBRSHR0cCogaHR0cDsKKyAgICAvL1FCdWZmZXIgaHR0cENtZEFuc3dlcjsKKyAgICAvL1FCdWZm ZXIgaHR0cFNlc3Npb25BbnN3ZXI7CisgICAgLy9RSHR0cCogaHR0cDsKKyAgICAvL1FOZXR3b3Jr UmVwbHkqIG5ldFJlcGx5OwkKKyAgICBRTmV0d29ya0FjY2Vzc01hbmFnZXIqIGh0dHA7CisgICAg UU5ldHdvcmtSZXF1ZXN0KiBuZXRSZXF1ZXN0OwogICAgIFFTc2xTb2NrZXQqIHNzbFNvY2tldDsK LSAgICBpbnQgc2Vzc2lvbnNSZXF1ZXN0OwotICAgIGludCBzZWxTZXNzUmVxdWVzdDsKLSAgICBp bnQgY2hQYXNzUmVxdWVzdDsKLSAgICBpbnQgdGVzdENvblJlcXVlc3Q7CisgICAgUU5ldHdvcmtS ZXBseSogc2Vzc2lvbnNSZXF1ZXN0OworICAgIFFOZXR3b3JrUmVwbHkqIHNlbFNlc3NSZXF1ZXN0 OworICAgIFFOZXR3b3JrUmVwbHkqIGNoUGFzc1JlcXVlc3Q7CisgICAgUU5ldHdvcmtSZXBseSog dGVzdENvblJlcXVlc3Q7CiAgICAgUVN0cmluZyBuZXdCcm9rZXJQYXNzOwogICAgIENvbmZpZ0Zp bGUqIGNvbmZpZzsKICAgICBPTk1haW5XaW5kb3cqIG1haW5XaW5kb3c7CkBAIC02MiwxMiArNjks MTIgQEAgcHJpdmF0ZToKICAgICBib29sIGNoZWNrQWNjZXNzKFFTdHJpbmcgYW5zd2VyKTsKIAog cHJpdmF0ZSBzbG90czoKLSAgICB2b2lkIHNsb3RSZXF1ZXN0RmluaXNoZWQgKCBpbnQgaWQsIGJv b2wgZXJyb3IgKTsKLSAgICB2b2lkIHNsb3RTc2xFcnJvcnMgKCBjb25zdCBRTGlzdDxRU3NsRXJy b3I+ICYgZXJyb3JzICkgOworICAgIHZvaWQgc2xvdFJlcXVlc3RGaW5pc2hlZCAoIFFOZXR3b3Jr UmVwbHkqICByZXBseSApOworICAgIHZvaWQgc2xvdFNzbEVycm9ycyAoIFFOZXR3b3JrUmVwbHkq IG5ldFJlcGx5LCBjb25zdCBRTGlzdDxRU3NsRXJyb3I+ICYgZXJyb3JzICkgOwogICAgIFFTdHJp bmcgZ2V0SGV4VmFsICggY29uc3QgUUJ5dGVBcnJheSYgYmEgKTsKICAgICB2b2lkIHNsb3RTc2hD b25uZWN0aW9uRXJyb3IgKCBRU3RyaW5nIG1lc3NhZ2UsIFFTdHJpbmcgbGFzdFNlc3Npb25FcnJv ciApOwogICAgIHZvaWQgc2xvdFNzaFNlcnZlckF1dGhFcnJvciAoIGludCBlcnJvciwgUVN0cmlu ZyBzc2hNZXNzYWdlLCBTc2hNYXN0ZXJDb25uZWN0aW9uKiBjb25uZWN0aW9uICk7Ci0gICAgdm9p ZCBzbG90U3NoU2VydmVyQXV0aFBhc3NwaHJhc2UgKCBTc2hNYXN0ZXJDb25uZWN0aW9uKiBjb25u ZWN0aW9uICk7CisgICAgdm9pZCBzbG90U3NoU2VydmVyQXV0aFBhc3NwaHJhc2UgKCBTc2hNYXN0 ZXJDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBib29sIHZlcmlmaWNhdGlvbkNvZGU9ZmFsc2UgKTsK ICAgICB2b2lkIHNsb3RTc2hVc2VyQXV0aEVycm9yICggUVN0cmluZyBlcnJvciApOwogICAgIHZv aWQgc2xvdFNzaENvbm5lY3Rpb25PaygpOwogICAgIHZvaWQgc2xvdExpc3RTZXNzaW9ucyAoIGJv b2wgc3VjY2VzcywgUVN0cmluZyBhbnN3ZXIsIGludCBwaWQpOwo= --530f48bd_567bd50a_233f-- ------------=_1397130911-31551-0--