49627 2010-11-16 14:57:27 -0800 [Qt][WK2] Make it possible to set custom user agent strings in MiniBrowser 2010-11-17 11:31:26 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Qt P2 Normal --- 1 abecsi abecsi kling rniwa tonikitoo oldest_to_newest 309959 0 abecsi 2010-11-16 14:57:27 -0800 It is not possible to set custom user agent strings in MiniBrowser. 309963 1 74045 abecsi 2010-11-16 15:08:30 -0800 Created attachment 74045 proposed patch 310163 2 74045 kling 2010-11-17 01:14:13 -0800 Comment on attachment 74045 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=74045&action=review > WebKitTools/MiniBrowser/qt/BrowserWindow.cpp:151 > + QDialog* dialog = new QDialog(this); Put this on the stack instead, no need for the explicit delete later. > WebKitTools/MiniBrowser/qt/MiniBrowser.qrc:3 > + <file>useragentlist.txt</file> Could we share this file with QtTestBrowser somehow? Seems unnecessary to have two copies of it. 310309 3 74118 abecsi 2010-11-17 08:43:20 -0800 Created attachment 74118 proposed patch v2 Addressed Andreas' suggestions. 310325 4 74118 kling 2010-11-17 09:03:49 -0800 Comment on attachment 74118 proposed patch v2 View in context: https://bugs.webkit.org/attachment.cgi?id=74118&action=review LGTM, just one thing: > WebKitTools/MiniBrowser/qt/BrowserWindow.cpp:141 > + ASSERT(!m_userAgentList.isEmpty()); Use Q_ASSERT instead and remove the WTF include + JavaScriptCore path in .pro 310373 5 abecsi 2010-11-17 10:40:39 -0800 Committed r72220: <http://trac.webkit.org/changeset/72220> 310375 6 74118 abecsi 2010-11-17 10:43:04 -0800 Comment on attachment 74118 proposed patch v2 Clearing flags. 310387 7 rniwa 2010-11-17 10:59:46 -0800 I think this broke qt release build. 310410 8 abecsi 2010-11-17 11:31:26 -0800 (In reply to comment #7) > I think this broke qt release build. Build fixed with r72223 and r72224. 74045 2010-11-16 15:08:30 -0800 2010-11-17 08:43:20 -0800 proposed patch patch.diff text/plain 8675 abecsi ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MTUwNjA1NS4uZjQ2Mzg1OSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMS0xNiAgQW5kcmFzIEJlY3Np ICA8YWJlY3NpQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XVtXSzJdIE1ha2UgaXQgcG9zc2libGUgdG8gc2V0IGN1c3RvbSB1 c2VyIGFnZW50IHN0cmluZ3MgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ5NjI3CisKKyAgICAgICAgQWRkIGEgbWV0aG9kIHRv IFFXS1BhZ2UgdG8gcmV0cmlldmUgdGhlIGN1c3RvbSB1c2VyIGFnZW50IHN0cmluZy4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHA6CisgICAgICAgIChRV0tQYWdlOjpj dXN0b21Vc2VyQWdlbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oOgor CiAyMDEwLTExLTE2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAg ICAgICAgRml4IGNsYW5nKysgYnVpbGQuCmRpZmYgLS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvcXQvcXdrcGFnZS5jcHAgYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAK aW5kZXggNmRmZjE1My4uM2MyNzcyNSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L3F0L3F3a3BhZ2UuY3BwCisrKyBiL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNw cApAQCAtNDcxLDYgKzQ3MSwxMSBAQCB2b2lkIFFXS1BhZ2U6OnNldEN1c3RvbVVzZXJBZ2VudChj b25zdCBRU3RyaW5nJiB1c2VyQWdlbnQpCiAgICAgV0tQYWdlU2V0Q3VzdG9tVXNlckFnZW50KHBh Z2VSZWYoKSwgd2tVc2VyQWdlbnQuZ2V0KCkpOwogfQogCitRU3RyaW5nIFFXS1BhZ2U6OmN1c3Rv bVVzZXJBZ2VudCgpIGNvbnN0Cit7CisgICAgcmV0dXJuIFdLU3RyaW5nQ29weVFTdHJpbmcoV0tQ YWdlQ29weUN1c3RvbVVzZXJBZ2VudChwYWdlUmVmKCkpKTsKK30KKwogdm9pZCBRV0tQYWdlOjps b2FkKGNvbnN0IFFVcmwmIHVybCkKIHsKICAgICBXS1JldGFpblB0cjxXS1VSTFJlZj4gd2t1cmwo V0tVUkxDcmVhdGVXaXRoUVVybCh1cmwpKTsKZGlmZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9xdC9xd2twYWdlLmggYi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oCmlu ZGV4IDg4MmIzOGYuLjI4NDE4MjkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xd2twYWdlLmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaApAQCAt OTMsNiArOTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDcmVhdGVOZXdQYWdlRnVuY3Rpb24o Q3JlYXRlTmV3UGFnZUZuIGZ1bmN0aW9uKTsKIAogICAgIHZvaWQgc2V0Q3VzdG9tVXNlckFnZW50 KGNvbnN0IFFTdHJpbmcmKTsKKyAgICBRU3RyaW5nIGN1c3RvbVVzZXJBZ2VudCgpIGNvbnN0Owog CiAgICAgcXJlYWwgdGV4dFpvb21GYWN0b3IoKSBjb25zdDsKICAgICBxcmVhbCBwYWdlWm9vbUZh Y3RvcigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0 VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGVjODFiMWUuLmY4NTE0NTQgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy MSBAQAorMjAxMC0xMS0xNiAgQW5kcmFzIEJlY3NpICA8YWJlY3NpQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XVtXSzJdIE1h a2UgaXQgcG9zc2libGUgdG8gc2V0IGN1c3RvbSB1c2VyIGFnZW50IHN0cmluZ3MgaW4gTWluaUJy b3dzZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00 OTYyNworCisgICAgICAgIEFkZCBhIHVzZXIgYWdlbnQgZGlhbG9nIGFuZCBhIHVzZXIgYWdlbnQg bGlzdCB0byBNaW5pQnJvd3Nlci4KKworICAgICAgICAqIE1pbmlCcm93c2VyL3F0L0Jyb3dzZXJX aW5kb3cuY3BwOgorICAgICAgICAoQnJvd3NlcldpbmRvdzo6QnJvd3NlcldpbmRvdyk6CisgICAg ICAgIChCcm93c2VyV2luZG93Ojp1cGRhdGVVc2VyQWdlbnRMaXN0KToKKyAgICAgICAgKEJyb3dz ZXJXaW5kb3c6OnNob3dVc2VyQWdlbnREaWFsb2cpOgorICAgICAgICAqIE1pbmlCcm93c2VyL3F0 L0Jyb3dzZXJXaW5kb3cuaDoKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5w cm86CisgICAgICAgICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucXJjOiBBZGRlZC4KKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9xdC91c2VyYWdlbnRsaXN0LnR4dDogQWRkZWQuCisKIDIwMTAt MTEtMTYgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIE9ubHkgdHJp Z2dlciBXaW5kb3dzIGJ1aWxkcyB3aGVuIGZpbGVzIHRoYXQgd2UgYWN0dWFsbHkgdXNlIG9uIFdp bmRvd3MKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5k b3cuY3BwIGIvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKaW5k ZXggMWFmMThhMy4uZWU5ZGI1MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIv cXQvQnJvd3NlcldpbmRvdy5jcHAKKysrIGIvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJv d3NlcldpbmRvdy5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkJyb3dzZXJXaW5k b3cuaCIKIAorI2luY2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CiAjaW5jbHVkZSAiV0tQYWdlTmFt ZXNwYWNlLmgiCiAKIEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3coUUdyYXBoaWNzV0tWaWV3 OjpCYWNraW5nU3RvcmVUeXBlIHR5cGUpCkBAIC00MCw2ICs0MSw5IEBAIEJyb3dzZXJXaW5kb3c6 OkJyb3dzZXJXaW5kb3coUUdyYXBoaWNzV0tWaWV3OjpCYWNraW5nU3RvcmVUeXBlIHR5cGUpCiAg ICAgbV9hZGRyZXNzQmFyID0gbmV3IFFMaW5lRWRpdCgpOwogCiAgICAgbV9tZW51LT5hZGRBY3Rp b24oIk5ldyBXaW5kb3ciLCB0aGlzLCBTTE9UKG5ld1dpbmRvdygpKSk7CisgICAgbV9tZW51LT5h ZGRBY3Rpb24oIkNoYW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlh bG9nKCkpKTsKKworICAgIG1fbWVudS0+YWRkU2VwYXJhdG9yKCk7CiAgICAgbV9tZW51LT5hZGRB Y3Rpb24oIlF1aXQiLCB0aGlzLCBTTE9UKGNsb3NlKCkpKTsKIAogICAgIG1fYnJvd3Nlci0+c2V0 Rm9jdXMoUXQ6Ok90aGVyRm9jdXNSZWFzb24pOwpAQCAtMTIyLDYgKzEyNiw1NSBAQCB2b2lkIEJy b3dzZXJXaW5kb3c6OnVybENoYW5nZWQoY29uc3QgUVVybCYgdXJsKQogICAgIG1fYWRkcmVzc0Jh ci0+c2V0VGV4dCh1cmwudG9TdHJpbmcoKSk7CiB9CiAKK3ZvaWQgQnJvd3NlcldpbmRvdzo6dXBk YXRlVXNlckFnZW50TGlzdCgpCit7CisgICAgUVdLUGFnZSogcGFnZSA9IG1fYnJvd3Nlci0+dmll dygpLT5wYWdlKCk7CisKKyAgICBRRmlsZSBmaWxlKCI6L3VzZXJhZ2VudGxpc3QudHh0Iik7CisK KyAgICBpZiAoZmlsZS5vcGVuKFFJT0RldmljZTo6UmVhZE9ubHkpKSB7CisgICAgICAgIHdoaWxl ICghZmlsZS5hdEVuZCgpKQorICAgICAgICAgICAgbV91c2VyQWdlbnRMaXN0IDw8IGZpbGUucmVh ZExpbmUoKS50cmltbWVkKCk7CisgICAgICAgIGZpbGUuY2xvc2UoKTsKKyAgICB9CisKKyAgICBB U1NFUlQoIW1fdXNlckFnZW50TGlzdC5pc0VtcHR5KCkpOworCisgICAgaWYgKCEocGFnZS0+Y3Vz dG9tVXNlckFnZW50KCkuaXNFbXB0eSgpIHx8IG1fdXNlckFnZW50TGlzdC5jb250YWlucyhwYWdl LT5jdXN0b21Vc2VyQWdlbnQoKSkpKQorICAgICAgICBtX3VzZXJBZ2VudExpc3QgPDwgcGFnZS0+ Y3VzdG9tVXNlckFnZW50KCk7Cit9CisKK3ZvaWQgQnJvd3NlcldpbmRvdzo6c2hvd1VzZXJBZ2Vu dERpYWxvZygpCit7CisgICAgdXBkYXRlVXNlckFnZW50TGlzdCgpOworCisgICAgUURpYWxvZyog ZGlhbG9nID0gbmV3IFFEaWFsb2codGhpcyk7CisgICAgZGlhbG9nLT5zZXRXaW5kb3dUaXRsZSgi Q2hhbmdlIFVzZXIgQWdlbnQiKTsKKyAgICBkaWFsb2ctPnJlc2l6ZShzaXplKCkud2lkdGgoKSAq IDAuNywgZGlhbG9nLT5zaXplKCkuaGVpZ2h0KCkpOworICAgIFFWQm94TGF5b3V0KiBsYXlvdXQg PSBuZXcgUVZCb3hMYXlvdXQoZGlhbG9nKTsKKyAgICBkaWFsb2ctPnNldExheW91dChsYXlvdXQp OworCisgICAgUUNvbWJvQm94KiBjb21ibyA9IG5ldyBRQ29tYm9Cb3goZGlhbG9nKTsKKyAgICBj b21iby0+c2V0U2l6ZUFkanVzdFBvbGljeShRQ29tYm9Cb3g6OkFkanVzdFRvTWluaW11bUNvbnRl bnRzTGVuZ3RoKTsKKyAgICBjb21iby0+c2V0RWRpdGFibGUodHJ1ZSk7CisgICAgY29tYm8tPmlu c2VydEl0ZW1zKDAsIG1fdXNlckFnZW50TGlzdCk7CisgICAgbGF5b3V0LT5hZGRXaWRnZXQoY29t Ym8pOworCisgICAgaW50IGluZGV4ID0gY29tYm8tPmZpbmRUZXh0KG1fYnJvd3Nlci0+dmlldygp LT5wYWdlKCktPmN1c3RvbVVzZXJBZ2VudCgpKTsKKyAgICBjb21iby0+c2V0Q3VycmVudEluZGV4 KGluZGV4KTsKKworICAgIFFEaWFsb2dCdXR0b25Cb3gqIGJ1dHRvbkJveCA9IG5ldyBRRGlhbG9n QnV0dG9uQm94KFFEaWFsb2dCdXR0b25Cb3g6Ok9rIHwgUURpYWxvZ0J1dHRvbkJveDo6Q2FuY2Vs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAs IFF0OjpIb3Jpem9udGFsLCBkaWFsb2cpOworICAgIGNvbm5lY3QoYnV0dG9uQm94LCBTSUdOQUwo YWNjZXB0ZWQoKSksIGRpYWxvZywgU0xPVChhY2NlcHQoKSkpOworICAgIGNvbm5lY3QoYnV0dG9u Qm94LCBTSUdOQUwocmVqZWN0ZWQoKSksIGRpYWxvZywgU0xPVChyZWplY3QoKSkpOworICAgIGxh eW91dC0+YWRkV2lkZ2V0KGJ1dHRvbkJveCk7CisKKyAgICBpZiAoZGlhbG9nLT5leGVjKCkgJiYg IWNvbWJvLT5jdXJyZW50VGV4dCgpLmlzRW1wdHkoKSkKKyAgICAgICAgbV9icm93c2VyLT52aWV3 KCktPnBhZ2UoKS0+c2V0Q3VzdG9tVXNlckFnZW50KGNvbWJvLT5jdXJyZW50VGV4dCgpKTsKKwor ICAgIGRlbGV0ZSBkaWFsb2c7Cit9CisKIEJyb3dzZXJXaW5kb3c6On5Ccm93c2VyV2luZG93KCkK IHsKICAgICBkZWxldGUgbV9hZGRyZXNzQmFyOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvTWlu aUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oIGIvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQv QnJvd3NlcldpbmRvdy5oCmluZGV4IGIxNzFhNTAuLmZlOTRkNmIgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaAorKysgYi9XZWJLaXRUb29scy9N aW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmgKQEAgLTI5LDExICsyOSwxMCBAQAogI2lmbmRl ZiBCcm93c2VyV2luZG93X2gKICNkZWZpbmUgQnJvd3NlcldpbmRvd19oCiAKLSNkZWZpbmUgUExB VEZPUk0oeCkgMAotCiAjaW5jbHVkZSAiQnJvd3NlclZpZXcuaCIKLSNpbmNsdWRlIDxxZ3JhcGhp Y3N3a3ZpZXcuaD4KKyNpbmNsdWRlIDxRU3RyaW5nTGlzdD4KICNpbmNsdWRlIDxRdEd1aT4KKyNp bmNsdWRlIDxxZ3JhcGhpY3N3a3ZpZXcuaD4KIAogY2xhc3MgQnJvd3NlcldpbmRvdyA6IHB1Ymxp YyBRTWFpbldpbmRvdyB7CiAgICAgUV9PQkpFQ1QKQEAgLTUyLDExICs1MSwxNSBAQCBwcm90ZWN0 ZWQgc2xvdHM6CiAgICAgdm9pZCBsb2FkUHJvZ3Jlc3MoaW50IHByb2dyZXNzKTsKICAgICB2b2lk IHRpdGxlQ2hhbmdlZChjb25zdCBRU3RyaW5nJik7CiAgICAgdm9pZCB1cmxDaGFuZ2VkKGNvbnN0 IFFVcmwmKTsKKyAgICB2b2lkIHNob3dVc2VyQWdlbnREaWFsb2coKTsKIAogcHJpdmF0ZToKKyAg ICB2b2lkIHVwZGF0ZVVzZXJBZ2VudExpc3QoKTsKKwogICAgIEJyb3dzZXJWaWV3KiBtX2Jyb3dz ZXI7CiAgICAgUU1lbnVCYXIqIG1fbWVudTsKICAgICBRTGluZUVkaXQqIG1fYWRkcmVzc0JhcjsK KyAgICBRU3RyaW5nTGlzdCBtX3VzZXJBZ2VudExpc3Q7CiAgICAgUUdyYXBoaWNzV0tWaWV3OjpC YWNraW5nU3RvcmVUeXBlIG1fYmFja2luZ1N0b3JlVHlwZTsKIH07CiAKZGlmZiAtLWdpdCBhL1dl YktpdFRvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBybyBiL1dlYktpdFRvb2xzL01p bmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBybwppbmRleCBlNDJjNDlhLi40NWYxYjlmIDEwMDY0 NAotLS0gYS9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5wcm8KKysrIGIv V2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucHJvCkBAIC0yMCw2ICsyMCw3 IEBAIElOQ0xVREVQQVRIICs9IFwKICAgICAkJFBXRC8uLi8uLi8uLi9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvY3BwIFwKICAgICAkJFBXRC8uLi8uLi8uLi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQyBc CiAgICAgJCRQV0QvLi4vLi4vLi4vV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0IFwKKyAgICAkJFBX RC8uLi8uLi8uLi9KYXZhU2NyaXB0Q29yZSBcCiAgICAgJCRPVVRQVVRfRElSL2luY2x1ZGUKIAog CkBAIC01MSwzICs1Miw2IEBAIGNvbnRhaW5zKFFUX0NPTkZJRywgb3BlbmdsKSB7CiAgICAgUVQg Kz0gb3BlbmdsCiAgICAgREVGSU5FUyArPSBRVF9DT05GSUdVUkVEX1dJVEhfT1BFTkdMCiB9CisK K1JFU09VUkNFUyArPSBcCisgICAgTWluaUJyb3dzZXIucXJjCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5xcmMgYi9XZWJLaXRUb29scy9NaW5pQnJv d3Nlci9xdC9NaW5pQnJvd3Nlci5xcmMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uZmZlNzdiMAotLS0gL2Rldi9udWxsCisrKyBiL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL3F0 L01pbmlCcm93c2VyLnFyYwpAQCAtMCwwICsxLDUgQEAKKzxSQ0M+CisgICAgPHFyZXNvdXJjZSBw cmVmaXg9Ii8iPgorICAgICAgICA8ZmlsZT51c2VyYWdlbnRsaXN0LnR4dDwvZmlsZT4KKyAgICA8 L3FyZXNvdXJjZT4KKzwvUkNDPgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIv cXQvdXNlcmFnZW50bGlzdC50eHQgYi9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9xdC91c2VyYWdl bnRsaXN0LnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wMWUzMzFiCi0t LSAvZGV2L251bGwKKysrIGIvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvdXNlcmFnZW50bGlz dC50eHQKQEAgLTAsMCArMSwxMCBAQAorTW96aWxsYS81LjAgKFgxMTsgVTsgTGludXg7IGVuLVVT KSBBcHBsZVdlYktpdC81MzMuMyAoS0hUTUwsIGxpa2UgR2Vja28pIE1pbmlCcm93c2VyLzAuMSBT YWZhcmkvNTMzLjMKK01vemlsbGEvNS4wIChTeW1iaWFuT1MvOS40OyBVOyBTZXJpZXM2MC81LjA7 IGVuLUdCKSBBcHBsZVdlYktpdC81MzMuMyAoS0hUTUwsIGxpa2UgR2Vja28pIE1pbmlCcm93c2Vy LzAuMSBNb2JpbGUgU2FmYXJpLzUzMy4zCitNb3ppbGxhLzUuMCAoTWFjaW50b3NoOyBVOyBQUEMg TWFjIE9TIFg7IGVuKSBBcHBsZVdlYktpdC8xMjUuMiAoS0hUTUwsIGxpa2UgR2Vja28pIFNhZmFy aS8xMjUuOAorTW96aWxsYS81LjAgKExpbnV4OyBVOyBBbmRyb2lkIDEuMTsgZW4tZ2I7IGRyZWFt KSBBcHBsZVdlYktpdC81MjUuMTArIChLSFRNTCwgbGlrZSBHZWNrbykgVmVyc2lvbi8zLjAuNCBN b2JpbGUgU2FmYXJpLzUyMy4xMi4yCitNb3ppbGxhLzUuMCAoaVBob25lOyBVOyBDUFUgT1MgM18y IGxpa2UgTWFjIE9TIFg7IGVuLXVzKSBBcHBsZVdlYktpdC81MzEuMjEuMTAgKEtIVE1MLCBsaWtl IEdlY2tvKSBWZXJzaW9uLzQuMC40IE1vYmlsZS83QjMzNGIgU2FmYXJpLzUzMS4yMS4xMAorTW96 aWxsYS81LjAgKGlQaG9uZTsgVTsgQ1BVIGlQaG9uZSBPUyA0XzAgbGlrZSBNYWMgT1MgWDsgZW4t dXMpIEFwcGxlV2ViS2l0LzUzMi45IChLSFRNTCwgbGlrZSBHZWNrbykgVmVyc2lvbi80LjAuNSBN b2JpbGUvOEEyOTMgU2FmYXJpLzY1MzEuMjIuNworTW96aWxsYS81LjAoaVBhZDsgVTsgQ1BVIGlQ aG9uZSBPUyAzXzIgbGlrZSBNYWMgT1MgWDsgZW4tdXMpIEFwcGxlV2ViS2l0LzUzMS4yMS4xMCAo S0hUTUwsIGxpa2UgR2Vja28pIFZlcnNpb24vNC4wLjQgTW9iaWxlLzdCMzE0IFNhZmFyaS81MzEu MjEuMTAKK09wZXJhLzkuMjUgKFdpbmRvd3MgTlQgNi4wOyBVOyBlbikKK01vemlsbGEvNS4wIChT eW1iaWFuT1MvOS40OyBVOyBTZXJpZXM2MC81LjAgTm9raWE1ODAwZC0xYi8yMC4yLjAxNDsgUHJv ZmlsZS9NSURQLTIuMSBDb25maWd1cmF0aW9uL0NMREMtMS4xICkgQXBwbGVXZWJLaXQvNDEzIChL SFRNTCwgbGlrZSBHZWNrbykgU2FmYXJpLzQxMworTW96aWxsYS80LjAgKGNvbXBhdGlibGU7IE1T SUUgOC4wOyBXaW5kb3dzIE5UIDYuMjsgVHJpZGVudC80LjA7IFNMQ0MyOyAuTkVUIENMUiAyLjAu NTA3Mjc7IC5ORVQgQ0xSIDMuNS4zMDcyOTsgLk5FVCBDTFIgMy4wLjMwNzI5OyBNZWRpYSBDZW50 ZXIgUEMgNi4wKQo= 74118 2010-11-17 08:43:20 -0800 2010-11-17 10:43:04 -0800 proposed patch v2 0001-Qt-WK2-Make-it-possible-to-set-custom-user-agent-str.patch text/plain 10453 abecsi RnJvbSA2OGRhNTdhOGExZjczYjYyNGU4YmU3MjQyYjU4MGNjYzBjYzYzYTllIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbmRyYXMgQmVjc2kgPGFiZWNzaUBpbmYudS1zemVnZWQuaHU+ CkRhdGU6IFdlZCwgMTcgTm92IDIwMTAgMTc6NDA6NDggKzAxMDAKU3ViamVjdDogW1BBVENIXSBb UXRdW1dLMl0gTWFrZSBpdCBwb3NzaWJsZSB0byBzZXQgY3VzdG9tIHVzZXIgYWdlbnQgc3RyaW5n cyBpbiBNaW5pQnJvd3NlcgoKLS0tCiBXZWJLaXQyL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMTcgKysrKysrKysrCiBXZWJLaXQyL0Rlcml2ZWRTb3VyY2VzLnBybyAg ICAgICAgICAgICAgICAgICB8ICAgMTcgKysrKysrKystCiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXdrcGFnZS5jcHAgICAgICAgICB8ICAgIDUgKysrCiBXZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXdrcGFnZS5oICAgICAgICAgICB8ICAgIDEgKwogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nICAg ICAgICAgICAgICAgICAgICAgICAgfCAgIDE5ICsrKysrKysrKysKIFdlYktpdFRvb2xzL01pbmlC cm93c2VyL01pbmlCcm93c2VyLnFyYyAgICAgIHwgICAgNSArKysKIFdlYktpdFRvb2xzL01pbmlC cm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwIHwgICA1MSArKysrKysrKysrKysrKysrKysrKysr KysrKwogV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oICAgfCAgICA5 ICsrKy0tCiBXZWJLaXRUb29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5wcm8gICB8ICAg IDggKysrKwogOSBmaWxlcyBjaGFuZ2VkLCAxMjggaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMo LSkKIGNyZWF0ZSBtb2RlIDEwMDY0NCBXZWJLaXRUb29scy9NaW5pQnJvd3Nlci9NaW5pQnJvd3Nl ci5xcmMKCmRpZmYgLS1naXQgYS9XZWJLaXQyL0NoYW5nZUxvZyBiL1dlYktpdDIvQ2hhbmdlTG9n CmluZGV4IDU2NzVkN2EuLjAzODUzNzIgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvQ2hhbmdlTG9nCisr KyBiL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTAtMTEtMTcgIEFuZHJh cyBCZWNzaSAgPGFiZWNzaUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF1bV0syXSBNYWtlIGl0IHBvc3NpYmxlIHRvIHNldCBj dXN0b20gdXNlciBhZ2VudCBzdHJpbmdzIGluIE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTYyNworCisgICAgICAgIENvcHkgdGhl IE1pbmlCcm93c2VyLnFyYyBhbmQgUXRUZXN0QnJvd3NlcidzIHVzZXJhZ2VudGxpc3QudHh0IGZp bGUKKyAgICAgICAgdG8gdGhlIGJ1aWxkIGRpcmVjdG9yeSBvZiBNaW5pQnJvd3NlciBiZWNhdXNl IGl0IGhhcyB0byBiZSBpbiBhCisgICAgICAgIHN1YmRpcmVjdG9yeSBvZiB0aGUgcmVzb3VyY2Ug ZmlsZS4KKyAgICAgICAgQWRkIGEgbWV0aG9kIHRvIFFXS1BhZ2UgdG8gcmV0cmlldmUgdGhlIGN1 c3RvbSB1c2VyIGFnZW50IHN0cmluZy4KKworICAgICAgICAqIERlcml2ZWRTb3VyY2VzLnBybzoK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwOgorICAgICAgICAoUVdLUGFn ZTo6Y3VzdG9tVXNlckFnZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2Uu aDoKKwogMjAxMC0xMS0xNyAgQmVuamFtaW4gUG91bGFpbiAgPGJlbmphbWluLnBvdWxhaW5Abm9r aWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2Vu LgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9EZXJpdmVkU291cmNlcy5wcm8gYi9XZWJLaXQyL0Rlcml2 ZWRTb3VyY2VzLnBybwppbmRleCA1N2VjNTI4Li5mYTY0NmU0IDEwMDY0NAotLS0gYS9XZWJLaXQy L0Rlcml2ZWRTb3VyY2VzLnBybworKysgYi9XZWJLaXQyL0Rlcml2ZWRTb3VyY2VzLnBybwpAQCAt MzksNyArMzksOCBAQCBESVJTID0gXAogICAgICQkT1VUUFVUX0RJUi9pbmNsdWRlL0phdmFTY3Jp cHRDb3JlIFwKICAgICAkJE9VVFBVVF9ESVIvaW5jbHVkZS9XZWJDb3JlIFwKICAgICAkJE9VVFBV VF9ESVIvaW5jbHVkZS9XZWJLaXQyIFwKLSAgICAkJE9VVFBVVF9ESVIvV2ViS2l0Mi9nZW5lcmF0 ZWQKKyAgICAkJE9VVFBVVF9ESVIvV2ViS2l0Mi9nZW5lcmF0ZWQgXAorICAgICQkT1VUUFVUX0RJ Ui9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9xdAogCiBmb3IoRElSLCBESVJTKSB7CiAgICAgIWV4 aXN0cygkJERJUik6IHN5c3RlbSgkJFFNQUtFX01LRElSICQkRElSKQpAQCAtMTA5LDYgKzExMCwy MCBAQCBTQ1JJUFRTID0gXAogICAgICQkUFdEL1NjcmlwdHMvd2Via2l0Mi9fX2luaXRfXy5weSBc CiAgICAgJCRQV0QvU2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5CiAKK3VhbGlzdF9jb3BpZXIu Y29tbWFuZHMgPSAkKENPUFlfRklMRSkgJCR7U1JDX1JPT1RfRElSfS9XZWJLaXRUb29scy9RdFRl c3RCcm93c2VyL3VzZXJhZ2VudGxpc3QudHh0ICQkT1VUUFVUX0RJUi9XZWJLaXRUb29scy9NaW5p QnJvd3Nlci9xdC91c2VyYWdlbnRsaXN0LnR4dAordWFsaXN0X2NvcGllci5kZXBlbmRzID0gJCR7 U1JDX1JPT1RfRElSfS9XZWJLaXRUb29scy9RdFRlc3RCcm93c2VyL3VzZXJhZ2VudGxpc3QudHh0 Cit1YWxpc3RfY29waWVyLmlucHV0ID0gJCR7U1JDX1JPT1RfRElSfS9XZWJLaXRUb29scy9RdFRl c3RCcm93c2VyL3VzZXJhZ2VudGxpc3QudHh0Cit1YWxpc3RfY29waWVyLm91dHB1dCA9ICQkT1VU UFVUX0RJUi9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9xdC91c2VyYWdlbnRsaXN0LnR4dAorZ2Vu ZXJhdGVkX2ZpbGVzLmRlcGVuZHMgKz0gdWFsaXN0X2NvcGllcgorUU1BS0VfRVhUUkFfVEFSR0VU UyArPSB1YWxpc3RfY29waWVyCisKK3FyY19jb3BpZXIuY29tbWFuZHMgPSAkKENPUFlfRklMRSkg JCR7U1JDX1JPT1RfRElSfS9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9NaW5pQnJvd3Nlci5xcmMg JCRPVVRQVVRfRElSL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnFyYwor cXJjX2NvcGllci5kZXBlbmRzID0gdWFsaXN0X2NvcGllciAkJHtTUkNfUk9PVF9ESVJ9L1dlYktp dFRvb2xzL01pbmlCcm93c2VyL01pbmlCcm93c2VyLnFyYworcXJjX2NvcGllci5pbnB1dCA9ICQk e1NSQ19ST09UX0RJUn0vV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvTWluaUJyb3dzZXIucXJjCitx cmNfY29waWVyLm91dHB1dCA9ICQkT1VUUFVUX0RJUi9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9x dC9NaW5pQnJvd3Nlci5xcmMKK2dlbmVyYXRlZF9maWxlcy5kZXBlbmRzICs9IHFyY19jb3BpZXIK K1FNQUtFX0VYVFJBX1RBUkdFVFMgKz0gcXJjX2NvcGllcgorCiBtZXNzYWdlX2hlYWRlcl9nZW5l cmF0b3IuY29tbWFuZHMgPSAkJHtQWVRIT059ICQke1NSQ19ST09UX0RJUn1XZWJLaXQyL1Njcmlw dHMvZ2VuZXJhdGUtbWVzc2FnZXMtaGVhZGVyLnB5ICR7UU1BS0VfRklMRV9JTn0gPiAke1FNQUtF X0ZJTEVfT1VUfQogbWVzc2FnZV9oZWFkZXJfZ2VuZXJhdG9yLmlucHV0ID0gTUVTU0FHRV9SRUNF SVZFUlMKIG1lc3NhZ2VfaGVhZGVyX2dlbmVyYXRvci5kZXBlbmRzID0gJCRTQ1JJUFRTCmRpZmYg LS1naXQgYS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAgYi9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5jcHAKaW5kZXggMmViNTA3YS4uNGExZjJjZSAxMDA2NDQK LS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3F3a3BhZ2UuY3BwCisrKyBiL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmNwcApAQCAtNDc2LDYgKzQ3NiwxMSBAQCB2b2lkIFFX S1BhZ2U6OnNldEN1c3RvbVVzZXJBZ2VudChjb25zdCBRU3RyaW5nJiB1c2VyQWdlbnQpCiAgICAg V0tQYWdlU2V0Q3VzdG9tVXNlckFnZW50KHBhZ2VSZWYoKSwgd2tVc2VyQWdlbnQuZ2V0KCkpOwog fQogCitRU3RyaW5nIFFXS1BhZ2U6OmN1c3RvbVVzZXJBZ2VudCgpIGNvbnN0Cit7CisgICAgcmV0 dXJuIFdLU3RyaW5nQ29weVFTdHJpbmcoV0tQYWdlQ29weUN1c3RvbVVzZXJBZ2VudChwYWdlUmVm KCkpKTsKK30KKwogdm9pZCBRV0tQYWdlOjpsb2FkKGNvbnN0IFFVcmwmIHVybCkKIHsKICAgICBX S1JldGFpblB0cjxXS1VSTFJlZj4gd2t1cmwoV0tVUkxDcmVhdGVXaXRoUVVybCh1cmwpKTsKZGlm ZiAtLWdpdCBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmggYi9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvcXQvcXdrcGFnZS5oCmluZGV4IDhmNjNiYmMuLjg2NmY4NGYgMTAwNjQ0Ci0t LSBhL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xd2twYWdlLmgKKysrIGIvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3F3a3BhZ2UuaApAQCAtOTMsNiArOTMsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzZXRDcmVhdGVOZXdQYWdlRnVuY3Rpb24oQ3JlYXRlTmV3UGFnZUZuIGZ1bmN0aW9uKTsKIAog ICAgIHZvaWQgc2V0Q3VzdG9tVXNlckFnZW50KGNvbnN0IFFTdHJpbmcmKTsKKyAgICBRU3RyaW5n IGN1c3RvbVVzZXJBZ2VudCgpIGNvbnN0OwogCiAgICAgcXJlYWwgdGV4dFpvb21GYWN0b3IoKSBj b25zdDsKICAgICBxcmVhbCBwYWdlWm9vbUZhY3RvcigpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDY2MzkzODgu LjYzNDczOGMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRU b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMC0xMS0xNyAgQW5kcmFzIEJlY3Np ICA8YWJlY3NpQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW1F0XVtXSzJdIE1ha2UgaXQgcG9zc2libGUgdG8gc2V0IGN1c3RvbSB1 c2VyIGFnZW50IHN0cmluZ3MgaW4gTWluaUJyb3dzZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00OTYyNworCisgICAgICAgIEFkZCBhIHVzZXIgYWdl bnQgZGlhbG9nIGFuZCBhIHJlc291cmNlIGZpbGUgZm9yIHVzZXJhZ2VudGxpc3QudHh0IHRvIE1p bmlCcm93c2VyLgorCisgICAgICAgICogTWluaUJyb3dzZXIvTWluaUJyb3dzZXIucXJjOiBBZGRl ZC4KKyAgICAgICAgQWRkIGl0IGhlcmUgdG8gcHJldmVudCBxbWFrZSBmcm9tIGRldGVjdGluZyBp dAorICAgICAgICBzaW5jZSBpdCBuZWVkcyB0byBiZSBjb3BpZWQgdG8gdGhlIGJ1aWxkIGRpcmVj dG9yeS4KKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmNwcDoKKyAgICAg ICAgKEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3cpOgorICAgICAgICAoQnJvd3NlcldpbmRv dzo6dXBkYXRlVXNlckFnZW50TGlzdCk6CisgICAgICAgIChCcm93c2VyV2luZG93OjpzaG93VXNl ckFnZW50RGlhbG9nKToKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93Lmg6 CisgICAgICAgICogTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucHJvOgorCiAyMDEwLTExLTE3 ICBTYXRpc2ggU2FtcGF0aCAgPHNhdGlzaEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgSmVyZW15IE9ybG93LgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIv TWluaUJyb3dzZXIucXJjIGIvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvTWluaUJyb3dzZXIucXJj Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmZmZTc3YjAKLS0tIC9kZXYvbnVs bAorKysgYi9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9NaW5pQnJvd3Nlci5xcmMKQEAgLTAsMCAr MSw1IEBACis8UkNDPgorICAgIDxxcmVzb3VyY2UgcHJlZml4PSIvIj4KKyAgICAgICAgPGZpbGU+ dXNlcmFnZW50bGlzdC50eHQ8L2ZpbGU+CisgICAgPC9xcmVzb3VyY2U+Cis8L1JDQz4KZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwIGIvV2Vi S2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKaW5kZXggMWFmMThhMy4u ZjkyNzAyNyAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3Nlcldp bmRvdy5jcHAKKysrIGIvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5j cHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgIkJyb3dzZXJXaW5kb3cuaCIKIAorI2lu Y2x1ZGUgPHd0Zi9Bc3NlcnRpb25zLmg+CiAjaW5jbHVkZSAiV0tQYWdlTmFtZXNwYWNlLmgiCiAK IEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3coUUdyYXBoaWNzV0tWaWV3OjpCYWNraW5nU3Rv cmVUeXBlIHR5cGUpCkBAIC00MCw2ICs0MSw5IEBAIEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5k b3coUUdyYXBoaWNzV0tWaWV3OjpCYWNraW5nU3RvcmVUeXBlIHR5cGUpCiAgICAgbV9hZGRyZXNz QmFyID0gbmV3IFFMaW5lRWRpdCgpOwogCiAgICAgbV9tZW51LT5hZGRBY3Rpb24oIk5ldyBXaW5k b3ciLCB0aGlzLCBTTE9UKG5ld1dpbmRvdygpKSk7CisgICAgbV9tZW51LT5hZGRBY3Rpb24oIkNo YW5nZSBVc2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlhbG9nKCkpKTsKKwor ICAgIG1fbWVudS0+YWRkU2VwYXJhdG9yKCk7CiAgICAgbV9tZW51LT5hZGRBY3Rpb24oIlF1aXQi LCB0aGlzLCBTTE9UKGNsb3NlKCkpKTsKIAogICAgIG1fYnJvd3Nlci0+c2V0Rm9jdXMoUXQ6Ok90 aGVyRm9jdXNSZWFzb24pOwpAQCAtMTIyLDYgKzEyNiw1MyBAQCB2b2lkIEJyb3dzZXJXaW5kb3c6 OnVybENoYW5nZWQoY29uc3QgUVVybCYgdXJsKQogICAgIG1fYWRkcmVzc0Jhci0+c2V0VGV4dCh1 cmwudG9TdHJpbmcoKSk7CiB9CiAKK3ZvaWQgQnJvd3NlcldpbmRvdzo6dXBkYXRlVXNlckFnZW50 TGlzdCgpCit7CisgICAgUVdLUGFnZSogcGFnZSA9IG1fYnJvd3Nlci0+dmlldygpLT5wYWdlKCk7 CisKKyAgICBRRmlsZSBmaWxlKCI6L3VzZXJhZ2VudGxpc3QudHh0Iik7CisKKyAgICBpZiAoZmls ZS5vcGVuKFFJT0RldmljZTo6UmVhZE9ubHkpKSB7CisgICAgICAgIHdoaWxlICghZmlsZS5hdEVu ZCgpKQorICAgICAgICAgICAgbV91c2VyQWdlbnRMaXN0IDw8IGZpbGUucmVhZExpbmUoKS50cmlt bWVkKCk7CisgICAgICAgIGZpbGUuY2xvc2UoKTsKKyAgICB9CisKKyAgICBBU1NFUlQoIW1fdXNl ckFnZW50TGlzdC5pc0VtcHR5KCkpOworCisgICAgaWYgKCEocGFnZS0+Y3VzdG9tVXNlckFnZW50 KCkuaXNFbXB0eSgpIHx8IG1fdXNlckFnZW50TGlzdC5jb250YWlucyhwYWdlLT5jdXN0b21Vc2Vy QWdlbnQoKSkpKQorICAgICAgICBtX3VzZXJBZ2VudExpc3QgPDwgcGFnZS0+Y3VzdG9tVXNlckFn ZW50KCk7Cit9CisKK3ZvaWQgQnJvd3NlcldpbmRvdzo6c2hvd1VzZXJBZ2VudERpYWxvZygpCit7 CisgICAgdXBkYXRlVXNlckFnZW50TGlzdCgpOworCisgICAgUURpYWxvZyBkaWFsb2codGhpcyk7 CisgICAgZGlhbG9nLnNldFdpbmRvd1RpdGxlKCJDaGFuZ2UgVXNlciBBZ2VudCIpOworICAgIGRp YWxvZy5yZXNpemUoc2l6ZSgpLndpZHRoKCkgKiAwLjcsIGRpYWxvZy5zaXplKCkuaGVpZ2h0KCkp OworICAgIFFWQm94TGF5b3V0KiBsYXlvdXQgPSBuZXcgUVZCb3hMYXlvdXQoJmRpYWxvZyk7Cisg ICAgZGlhbG9nLnNldExheW91dChsYXlvdXQpOworCisgICAgUUNvbWJvQm94KiBjb21ibyA9IG5l dyBRQ29tYm9Cb3goJmRpYWxvZyk7CisgICAgY29tYm8tPnNldFNpemVBZGp1c3RQb2xpY3koUUNv bWJvQm94OjpBZGp1c3RUb01pbmltdW1Db250ZW50c0xlbmd0aCk7CisgICAgY29tYm8tPnNldEVk aXRhYmxlKHRydWUpOworICAgIGNvbWJvLT5pbnNlcnRJdGVtcygwLCBtX3VzZXJBZ2VudExpc3Qp OworICAgIGxheW91dC0+YWRkV2lkZ2V0KGNvbWJvKTsKKworICAgIGludCBpbmRleCA9IGNvbWJv LT5maW5kVGV4dChtX2Jyb3dzZXItPnZpZXcoKS0+cGFnZSgpLT5jdXN0b21Vc2VyQWdlbnQoKSk7 CisgICAgY29tYm8tPnNldEN1cnJlbnRJbmRleChpbmRleCk7CisKKyAgICBRRGlhbG9nQnV0dG9u Qm94KiBidXR0b25Cb3ggPSBuZXcgUURpYWxvZ0J1dHRvbkJveChRRGlhbG9nQnV0dG9uQm94OjpP ayB8IFFEaWFsb2dCdXR0b25Cb3g6OkNhbmNlbAorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgLCBRdDo6SG9yaXpvbnRhbCwgJmRpYWxvZyk7Cisg ICAgY29ubmVjdChidXR0b25Cb3gsIFNJR05BTChhY2NlcHRlZCgpKSwgJmRpYWxvZywgU0xPVChh Y2NlcHQoKSkpOworICAgIGNvbm5lY3QoYnV0dG9uQm94LCBTSUdOQUwocmVqZWN0ZWQoKSksICZk aWFsb2csIFNMT1QocmVqZWN0KCkpKTsKKyAgICBsYXlvdXQtPmFkZFdpZGdldChidXR0b25Cb3gp OworCisgICAgaWYgKGRpYWxvZy5leGVjKCkgJiYgIWNvbWJvLT5jdXJyZW50VGV4dCgpLmlzRW1w dHkoKSkKKyAgICAgICAgbV9icm93c2VyLT52aWV3KCktPnBhZ2UoKS0+c2V0Q3VzdG9tVXNlckFn ZW50KGNvbWJvLT5jdXJyZW50VGV4dCgpKTsKK30KKwogQnJvd3NlcldpbmRvdzo6fkJyb3dzZXJX aW5kb3coKQogewogICAgIGRlbGV0ZSBtX2FkZHJlc3NCYXI7CmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmggYi9XZWJLaXRUb29scy9NaW5pQnJv d3Nlci9xdC9Ccm93c2VyV2luZG93LmgKaW5kZXggYjE3MWE1MC4uZmU5NGQ2YiAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oCisrKyBiL1dlYktp dFRvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaApAQCAtMjksMTEgKzI5LDEwIEBA CiAjaWZuZGVmIEJyb3dzZXJXaW5kb3dfaAogI2RlZmluZSBCcm93c2VyV2luZG93X2gKIAotI2Rl ZmluZSBQTEFURk9STSh4KSAwCi0KICNpbmNsdWRlICJCcm93c2VyVmlldy5oIgotI2luY2x1ZGUg PHFncmFwaGljc3drdmlldy5oPgorI2luY2x1ZGUgPFFTdHJpbmdMaXN0PgogI2luY2x1ZGUgPFF0 R3VpPgorI2luY2x1ZGUgPHFncmFwaGljc3drdmlldy5oPgogCiBjbGFzcyBCcm93c2VyV2luZG93 IDogcHVibGljIFFNYWluV2luZG93IHsKICAgICBRX09CSkVDVApAQCAtNTIsMTEgKzUxLDE1IEBA IHByb3RlY3RlZCBzbG90czoKICAgICB2b2lkIGxvYWRQcm9ncmVzcyhpbnQgcHJvZ3Jlc3MpOwog ICAgIHZvaWQgdGl0bGVDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKTsKICAgICB2b2lkIHVybENoYW5n ZWQoY29uc3QgUVVybCYpOworICAgIHZvaWQgc2hvd1VzZXJBZ2VudERpYWxvZygpOwogCiBwcml2 YXRlOgorICAgIHZvaWQgdXBkYXRlVXNlckFnZW50TGlzdCgpOworCiAgICAgQnJvd3NlclZpZXcq IG1fYnJvd3NlcjsKICAgICBRTWVudUJhciogbV9tZW51OwogICAgIFFMaW5lRWRpdCogbV9hZGRy ZXNzQmFyOworICAgIFFTdHJpbmdMaXN0IG1fdXNlckFnZW50TGlzdDsKICAgICBRR3JhcGhpY3NX S1ZpZXc6OkJhY2tpbmdTdG9yZVR5cGUgbV9iYWNraW5nU3RvcmVUeXBlOwogfTsKIApkaWZmIC0t Z2l0IGEvV2ViS2l0VG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucHJvIGIvV2ViS2l0 VG9vbHMvTWluaUJyb3dzZXIvcXQvTWluaUJyb3dzZXIucHJvCmluZGV4IGU0MmM0OWEuLmY4ZmQ2 MzYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL01pbmlCcm93c2VyL3F0L01pbmlCcm93c2VyLnBy bworKysgYi9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJvd3Nlci5wcm8KQEAgLTIw LDYgKzIwLDcgQEAgSU5DTFVERVBBVEggKz0gXAogICAgICQkUFdELy4uLy4uLy4uL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9jcHAgXAogICAgICQkUFdELy4uLy4uLy4uL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9DIFwKICAgICAkJFBXRC8uLi8uLi8uLi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQgXAor ICAgICQkUFdELy4uLy4uLy4uL0phdmFTY3JpcHRDb3JlIFwKICAgICAkJE9VVFBVVF9ESVIvaW5j bHVkZQogCiAKQEAgLTUxLDMgKzUyLDEwIEBAIGNvbnRhaW5zKFFUX0NPTkZJRywgb3BlbmdsKSB7 CiAgICAgUVQgKz0gb3BlbmdsCiAgICAgREVGSU5FUyArPSBRVF9DT05GSUdVUkVEX1dJVEhfT1BF TkdMCiB9CisKKyMgV2UgaGF2ZSB0byBjb3B5IHRoZSByZXNvdXJjZSBmaWxlIHRvIHRoZSBidWls ZCBkaXJlY3RvcnkKKyMgdG8gdXNlIHRoZSB1c2VyYWdlbnRsaXN0LnR4dCBmaWxlIG9mIFF0VGVz dEJyb3dzZXIgd2l0aG91dAorIyBwb2xsdXRpbmcgdGhlIHNvdXJjZSB0cmVlLgorIyBUaGUgY29w aWVyIGlzIGRlZmluZWQgaW4gV2ViS2l0Mi9EZXJpdmVkU291cmNlcy5wcm8uCitSRVNPVVJDRVMg Kz0gXAorICAgICQkT1VUUFVUX0RJUi9XZWJLaXRUb29scy9NaW5pQnJvd3Nlci9xdC9NaW5pQnJv d3Nlci5xcmMKLS0gCjEuNy4zLjIKCg==