90870 2012-07-10 04:32:32 -0700 REGRESSION(r109480): Form state for iframe content is not restored 2012-08-27 21:19:54 -0700 1 1 1 Unclassified WebKit History 528+ (Nightly build) All All RESOLVED FIXED P1 Normal --- 1 tkent tkent abarth beidson japhet jochen webkit.review.bot oldest_to_newest 665655 0 151438 tkent 2012-07-10 04:32:32 -0700 Created attachment 151438 Repro. Put this to LayoutTests/fast/loader/. Requires iframe/@srcdoc. Regression by http://trac.webkit.org/changeset/109480/trunk https://bugs.webkit.org/show_bug.cgi?id=79206 In r109480, I forgot to take care of documents in <iframe>s in a document loaded by FrameLoader::loadItem(). 666459 1 151624 tkent 2012-07-11 00:43:26 -0700 Created attachment 151624 Patch 666465 2 151624 tkent 2012-07-11 00:47:30 -0700 Comment on attachment 151624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=151624&action=review > Source/WebCore/loader/HistoryController.cpp:166 > - if (item->isCurrentDocument(document)) { > + if (item->isCurrentDocument(document) && document->attached()) { I'm not confident of this change. HistoryController::saveDocumentState() is called twice for a subframe document when the main frame is navigated to another URL. 1. FrameLoader::detachChildren() of the parent FrameLoader FrameLoader::detachFromParent() FrameLoader::closeURL() HistoryController::saveDocumentState() 2. HTMLFrameOwnerElement::disconnectContentFrame FrameLoader::frameDetached() FrameLoader::detachFromParent() FrameLoader::closeURL() HistoryController::saveDocumentState() Is it an expected behavior? 703617 3 160301 tkent 2012-08-23 17:58:39 -0700 Created attachment 160301 Patch 2 just rebase 705148 4 160301 jochen 2012-08-27 04:05:42 -0700 Comment on attachment 160301 Patch 2 View in context: https://bugs.webkit.org/attachment.cgi?id=160301&action=review > Source/WebCore/ChangeLog:29 > + Added. This function checks the current HisotryItem is associated spelling Hisotry > Source/WebCore/loader/HistoryController.cpp:182 > +static inline bool isAssociatedToRequestedHisotryItem(const HistoryItem* current, Frame* frame, const HistoryItem* requested) spelling "Hisotry" 706029 5 160891 tkent 2012-08-27 20:36:31 -0700 Created attachment 160891 Patch for landing hisotry 706043 6 160891 webkit.review.bot 2012-08-27 21:19:50 -0700 Comment on attachment 160891 Patch for landing Clearing flags on attachment: 160891 Committed r126839: <http://trac.webkit.org/changeset/126839> 706044 7 webkit.review.bot 2012-08-27 21:19:54 -0700 All reviewed patches have been landed. Closing bug. 151438 2012-07-10 04:32:32 -0700 2012-07-10 04:32:32 -0700 Repro. Put this to LayoutTests/fast/loader/. Requires iframe/@srcdoc. form-state-restore-with-frames.html text/html 977 tkent PCFET0NUWVBFIGh0bWw+CjxoZWFkPgo8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRl c3QtcHJlLmpzIj48L3NjcmlwdD4KPG1ldGEgaHR0cC1lcXVpdj0icHJhZ21hIiBjb250ZW50PSJu by1jYWNoZSI+CjxtZXRhIGh0dHAtZXF1aXY9ImNhY2hlLWNvbnRyb2wiIGNvbnRlbnQ9Im5vLWNh Y2hlIj4KPC9oZWFkPgo8Ym9keSBvbmxvYWQ9InN0YXJ0VGVzdCgpIj4KPGlucHV0IG5hbWU9Im5h bWUxIiBpZD0iaW5wdXQxIj4KPGlmcmFtZSBpZD0iZnJhbWUxIiBzcmNkb2M9IiZsdDtpbnB1dCBu YW1lPSduYW1lMicgaWQ9J2lucHV0Mic+Ij4KPC9pZnJhbWU+Cjxmb3JtIGlkPSJmb3JtMSIgYWN0 aW9uPSJkYXRhOnRleHQvaHRtbCwmbHQ7c2NyaXB0Pmhpc3RvcnkuYmFjaygpOyZsdDsvc2NyaXB0 PiI+CjxpbnB1dCB0eXBlPSJzdWJtaXQiPgo8L2Zvcm0+Cgo8c2NyaXB0PgpmdW5jdGlvbiAkKGlk KSB7CiAgICByZXR1cm4gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpOwp9CgpmdW5jdGlvbiBz dGFydFRlc3QoKSB7CiAgICBpZiAoJCgnaW5wdXQxJykudmFsdWUgPT0gJ3Zpc2l0ZWQnKSB7Cglz aG91bGRCZUVxdWFsVG9TdHJpbmcoIiQoJ2ZyYW1lMScpLmNvbnRlbnREb2N1bWVudC5nZXRFbGVt ZW50QnlJZCgnaW5wdXQyJykudmFsdWUiLCAidmFsdWUyIik7CiAgICAgICAgZmluaXNoSlNUZXN0 KCk7CiAgICB9IGVsc2UgewoJc2V0VGltZW91dChmdW5jdGlvbigpIHsKCSAgICAkKCdpbnB1dDEn KS52YWx1ZSA9ICd2aXNpdGVkJzsKCSAgICAkKCdmcmFtZTEnKS5jb250ZW50RG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ2lucHV0MicpLnZhbHVlID0gInZhbHVlMiI7CgkgICAgJCgnZm9ybTEnKS5z dWJtaXQoKTsKCX0sIDApOwogICAgfQp9Cgpqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKPC9zY3JpcHQ+ CjxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K PC9ib2R5Pgo= 151624 2012-07-11 00:43:26 -0700 2012-08-23 17:58:35 -0700 Patch bug-90870-20120711164325.patch text/plain 9152 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTIyMjIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTQ2NmU1ZWIwZDgyY2I3 M2YyMmQwNmUxMjA5OTZkYjVkMDA5MjZmYy4uMjFhMGJiMDNiMmJmMzFjZTE0NjdlZTAyYTNjNTI3 N2VhZjk4MWRkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA3LTExICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OKHIxMDk0 ODApOiBGb3JtIHN0YXRlIGZvciBpZnJhbWUgY29udGVudCBpcyBub3QgcmVzdG9yZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwODcwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2UgcjEwOTQ4MCwg d2UgaGF2ZSByZXN0b3JlZCBmb3JtIHN0YXRlIG9ubHkgZm9yIGRvY3VtZW50cworICAgICAgICBs b2FkZWQgYnkgRnJhbWVMb2FkZXI6OmxvYWRJdGVtKCkuIEhvd2V2ZXIgd2Ugc2hvdWxkIHJlc3Rv cmUgZm9ybQorICAgICAgICBzdGF0ZSBmb3IgZG9jdW1lbnRzIGluIHN1Yi1mcmFtZXMgb2YgZG9j dW1lbnRzIGxvYWRlZCBieQorICAgICAgICBGcmFtZUxvYWRlcjo6bG9hZEl0ZW0oKS4KKworICAg ICAgICBUZXN0OiBmYXN0L2xvYWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMuaHRt bAorCisgICAgICAgICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIaXN0b3J5SXRlbTo6aXNBbmNlc3Rvck9mKToKKyAgICAgICAgQWRkZWQuIEEgZnVuY3Rpb24g dG8gc2VhcmNoIGRlc2NlbmRhbnRzIGZvciB0aGUgc3BlY2lmaWVkCisgICAgICAgIEhpc290cnlJ dGVtLiBUaGlzIGlzIHVzZWQgYnkgaXNBc3NvY2lhdGVkVG9SZXF1ZXN0ZWRIaXNvdHJ5SXRlbSgp LgorICAgICAgICAqIGhpc3RvcnkvSGlzdG9yeUl0ZW0uaDoKKyAgICAgICAgKEhpc3RvcnlJdGVt KTogRGVjbGFyZSBpc0FuY2VzdG9yT2YoKS4KKyAgICAgICAgKiBsb2FkZXIvSGlzdG9yeUNvbnRy b2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OnNhdmVEb2N1 bWVudFN0YXRlKToKKyAgICAgICAgRG9uJ3Qgc2F2ZSBmb3JtIHN0YXRlIGZvciBkZXRhY2hlZCBk b2N1bWVudC4KKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgYmVjYXVzZSBzYXZlRG9jdW1lbnRTdGF0 ZSgpIGlzIGNhbGxlZCB0d2ljZTsgYmVmb3JlCisgICAgICAgIGRvY3VtZW50IGRldGFjaCBhbmQg YWZ0ZXIgZG9jdW1lbnQgZGV0YWNoLiBXZSBuZWVkIHRvIGF2b2lkIHRoZQorICAgICAgICBsYXR0 ZXIgY2FsbCBiZWNhdXNlIGZvcm1FbGVtZW50c1N0YXRlKCkgZm9yIGEgZGV0YWNoZWQgZG9jdW1l bnQKKyAgICAgICAgcHJvZHVjZXMgYW4gZW1wdHkgc3RhdGUuCisgICAgICAgIChXZWJDb3JlOjpp c0Fzc29jaWF0ZWRUb1JlcXVlc3RlZEhpc290cnlJdGVtKToKKyAgICAgICAgQWRkZWQuIFRoaXMg ZnVuY3Rpb24gY2hlY2tzIHRoZSBjdXJyZW50IEhpc290cnlJdGVtIGlzIGFzc29jaWF0ZWQKKyAg ICAgICAgdG8gdGhlIEhpc290cnlJdGVtIHNwZWNpZmllZCB0byBGcmFtZUxvYWRlcjo6bG9hZEl0 ZW0oKS4KKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjpyZXN0b3JlRG9jdW1l bnRTdGF0ZSk6CisgICAgICAgIFVzZXMgaXNBc3NvY2lhdGVkVG9SZXF1ZXN0ZWRIaXNvdHJ5SXRl bSgpLgorCiAyMDEyLTA3LTEwICBIdWFuZyBEb25nc3VuZyAgPGx1eHRlbGxhQGNvbXBhbnkxMDAu bmV0PgogCiAgICAgICAgIERvbid0IGRlc3Ryb3kgdGhlIGRlY29kZWQgZGF0YSBvZiBhbiBpbWFn ZSBpZiBXZWJLaXQgaXMgYWJvdXQgdG8gcmVuZGVyIHRoZSBpbWFnZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwIGIvU291cmNlL1dlYkNvcmUvaGlz dG9yeS9IaXN0b3J5SXRlbS5jcHAKaW5kZXggZmUxMWVhYmIxNWZiYWRhMjBlN2I2YzhiMjEyMzE3 MDE4OTQzNDhiZC4uYThmMzc0ZWNjMDE5ZWI3MjdiZTEwYjdkNDI2YzIyODc0MDM4ZWIwZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKQEAgLTUzMiw2ICs1MzIsMTggQEAg dm9pZCBIaXN0b3J5SXRlbTo6Y2xlYXJDaGlsZHJlbigpCiAgICAgbV9jaGlsZHJlbi5jbGVhcigp OwogfQogCitib29sIEhpc3RvcnlJdGVtOjppc0FuY2VzdG9yT2YoY29uc3QgSGlzdG9yeUl0ZW0q IGl0ZW0pIGNvbnN0Cit7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2NoaWxkcmVuLnNp emUoKTsgKytpKSB7CisgICAgICAgIEhpc3RvcnlJdGVtKiBjaGlsZCA9IG1fY2hpbGRyZW5baV0u Z2V0KCk7CisgICAgICAgIGlmIChjaGlsZCA9PSBpdGVtKQorICAgICAgICAgICAgcmV0dXJuIHRy dWU7CisgICAgICAgIGlmIChjaGlsZC0+aXNBbmNlc3Rvck9mKGl0ZW0pKQorICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogLy8gV2UgZG8gc2Ft ZS1kb2N1bWVudCBuYXZpZ2F0aW9uIGlmIGdvaW5nIHRvIGEgZGlmZmVyZW50IGl0ZW0gYW5kIGlm IGVpdGhlciBvZiB0aGUgZm9sbG93aW5nIGlzIHRydWU6CiAvLyAtIFRoZSBvdGhlciBpdGVtIGNv cnJlc3BvbmRzIHRvIHRoZSBzYW1lIGRvY3VtZW50IChmb3IgaGlzdG9yeSBlbnRyaWVzIGNyZWF0 ZWQgdmlhIHB1c2hTdGF0ZSBvciBmcmFnbWVudCBjaGFuZ2VzKS4KIC8vIC0gVGhlIG90aGVyIGl0 ZW0gY29ycmVzcG9uZHMgdG8gdGhlIHNhbWUgc2V0IG9mIGRvY3VtZW50cywgaW5jbHVkaW5nIGZy YW1lcyAoZm9yIGhpc3RvcnkgZW50cmllcyBjcmVhdGVkIHZpYSByZWd1bGFyIG5hdmlnYXRpb24p CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmggYi9Tb3Vy Y2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgKaW5kZXggMmNjZjk0ZWFmODk1YzA1MmM3 ODExZTY5YWRmZmNhYzU3MDVlNWNmYS4uMjFkNWMyMjc3OTk5YTNiYWYxZWZlZDM5N2Y4OTA5NWUz MDIzNDA2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaApAQCAtMTcxLDYgKzE3 MSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBIaXN0b3J5SXRlbVZlY3RvciYgY2hpbGRyZW4oKSBj b25zdDsKICAgICBib29sIGhhc0NoaWxkcmVuKCkgY29uc3Q7CiAgICAgdm9pZCBjbGVhckNoaWxk cmVuKCk7CisgICAgYm9vbCBpc0FuY2VzdG9yT2YoY29uc3QgSGlzdG9yeUl0ZW0qKSBjb25zdDsK ICAgICAKICAgICBib29sIHNob3VsZERvU2FtZURvY3VtZW50TmF2aWdhdGlvblRvKEhpc3RvcnlJ dGVtKiBvdGhlckl0ZW0pIGNvbnN0OwogICAgIGJvb2wgaGFzU2FtZUZyYW1lcyhIaXN0b3J5SXRl bSogb3RoZXJJdGVtKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9I aXN0b3J5Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRy b2xsZXIuY3BwCmluZGV4IGJmOGQ3YzhlMjZmOTYxYjNmZmU5ZjVlMThiNDRmMmE1ODA5OGIwM2Eu LjNmYTMzNGUzNzgzZDljMmVlYjlhYzRjYThmMTI2MzA4ZjA1MjhiZWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcApAQCAtMTYzLDcgKzE2Myw3IEBAIHZv aWQgSGlzdG9yeUNvbnRyb2xsZXI6OnNhdmVEb2N1bWVudFN0YXRlKCkKICAgICBEb2N1bWVudCog ZG9jdW1lbnQgPSBtX2ZyYW1lLT5kb2N1bWVudCgpOwogICAgIEFTU0VSVChkb2N1bWVudCk7CiAg ICAgCi0gICAgaWYgKGl0ZW0tPmlzQ3VycmVudERvY3VtZW50KGRvY3VtZW50KSkgeworICAgIGlm IChpdGVtLT5pc0N1cnJlbnREb2N1bWVudChkb2N1bWVudCkgJiYgZG9jdW1lbnQtPmF0dGFjaGVk KCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJDb3JlTG9hZGluZyAlczogc2F2aW5nIGZv cm0gc3RhdGUgdG8gJXAiLCBtX2ZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUoKS5zdHJpbmcoKS51 dGY4KCkuZGF0YSgpLCBpdGVtKTsKICAgICAgICAgaXRlbS0+c2V0RG9jdW1lbnRTdGF0ZShkb2N1 bWVudC0+Zm9ybUVsZW1lbnRzU3RhdGUoKSk7CiAgICAgfQpAQCAtMTc5LDYgKzE3OSwyMiBAQCB2 b2lkIEhpc3RvcnlDb250cm9sbGVyOjpzYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0ZSgpCiAgICAg fQogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaXNBc3NvY2lhdGVkVG9SZXF1ZXN0ZWRIaXNvdHJ5 SXRlbShjb25zdCBIaXN0b3J5SXRlbSogY3VycmVudCwgRnJhbWUqIGZyYW1lLCBjb25zdCBIaXN0 b3J5SXRlbSogcmVxdWVzdGVkKQoreworICAgIGlmIChyZXF1ZXN0ZWQgPT0gY3VycmVudCkKKyAg ICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKHJlcXVlc3RlZCkKKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIHdoaWxlICgoZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSkpIHsKKyAg ICAgICAgcmVxdWVzdGVkID0gZnJhbWUtPmxvYWRlcigpLT5yZXF1ZXN0ZWRIaXN0b3J5SXRlbSgp OworICAgICAgICBpZiAoIXJlcXVlc3RlZCkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAg ICBpZiAocmVxdWVzdGVkLT5pc0FuY2VzdG9yT2YoY3VycmVudCkpCisgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIEhpc3RvcnlDb250 cm9sbGVyOjpyZXN0b3JlRG9jdW1lbnRTdGF0ZSgpCiB7CiAgICAgRG9jdW1lbnQqIGRvYyA9IG1f ZnJhbWUtPmRvY3VtZW50KCk7CkBAIC0yMDEsNyArMjE3LDcgQEAgdm9pZCBIaXN0b3J5Q29udHJv bGxlcjo6cmVzdG9yZURvY3VtZW50U3RhdGUoKQogICAgIAogICAgIGlmICghaXRlbVRvUmVzdG9y ZSkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChtX2ZyYW1lLT5sb2FkZXIoKS0+cmVxdWVzdGVk SGlzdG9yeUl0ZW0oKSA9PSBtX2N1cnJlbnRJdGVtLmdldCgpICYmICFtX2ZyYW1lLT5sb2FkZXIo KS0+ZG9jdW1lbnRMb2FkZXIoKS0+aXNDbGllbnRSZWRpcmVjdCgpKSB7CisgICAgaWYgKGlzQXNz b2NpYXRlZFRvUmVxdWVzdGVkSGlzb3RyeUl0ZW0oaXRlbVRvUmVzdG9yZSwgbV9mcmFtZSwgbV9m cmFtZS0+bG9hZGVyKCktPnJlcXVlc3RlZEhpc3RvcnlJdGVtKCkpICYmICFtX2ZyYW1lLT5sb2Fk ZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+aXNDbGllbnRSZWRpcmVjdCgpKSB7CiAgICAgICAgIExP RyhMb2FkaW5nLCAiV2ViQ29yZUxvYWRpbmcgJXM6IHJlc3RvcmluZyBmb3JtIHN0YXRlIGZyb20g JXAiLCBtX2ZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgp LCBpdGVtVG9SZXN0b3JlKTsKICAgICAgICAgZG9jLT5zZXRTdGF0ZUZvck5ld0Zvcm1FbGVtZW50 cyhpdGVtVG9SZXN0b3JlLT5kb2N1bWVudFN0YXRlKCkpOwogICAgIH0KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlODY3OTIw Y2ZmZmUzZDQ1YzI4MzQxZDJmNzQyZjc2OTU2MTA1MTAxLi42ODk3MjBiNWFmNzgxZjc4MTZkNzJk MjVlN2YwNzA5YWJlMzE2YWUzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysr IGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTItMDctMTEgIEtl bnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JFU1NJT04ocjEw OTQ4MCk6IEZvcm0gc3RhdGUgZm9yIGlmcmFtZSBjb250ZW50IGlzIG5vdCByZXN0b3JlZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA4NzAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbG9hZGVy L2Zvcm0tc3RhdGUtcmVzdG9yZS13aXRoLWZyYW1lcy5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2xvYWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMtZXhwZWN0ZWQudHh0OiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9yZXNvdXJjZXMvZm9ybS1zdGF0ZS1yZXN0b3Jl LXdpdGgtZnJhbWVzLTEuaHRtbDogQWRkZWQuCisKIDIwMTItMDctMTAgIFphbiBEb2JlcnNlayAg PHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIEdUSyBnYXJkZW5p bmcsIGFkZGluZyBhIHRleHQgZXhwZWN0YXRpb24gZm9yIHRoZQpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvZmFzdC9sb2FkZXIvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2Zvcm0tc3RhdGUtcmVzdG9yZS13aXRoLWZy YW1lcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDIwYTM3MDFkNGE4ZWMxN2EyZGMyYzYyNmFh ZTNmNWYwOGY4N2I2MQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVy L2Zvcm0tc3RhdGUtcmVzdG9yZS13aXRoLWZyYW1lcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw3 IEBACitQQVNTIGZyYW1lJCgkKCJmcmFtZTEiKSwgImlucHV0MiIpLnZhbHVlIGlzICJ2YWx1ZTIi CitQQVNTIGZyYW1lJChmcmFtZSQoJCgiZnJhbWUxIiksICJmcmFtZTIiKSwgImlucHV0MyIpLnZh bHVlIGlzICJ2YWx1ZTMiCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1Qg Q09NUExFVEUKKyAKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvZm9ybS1z dGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9m b3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44ZDY3MDNjMGU0 OTg2OTBhYjcwNzlkYmZkZDE2MTk1ZGQwZTZlMTFhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvZmFzdC9sb2FkZXIvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLmh0bWwKQEAg LTAsMCArMSw0MSBAQAorPCFET0NUWVBFIGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9q cy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPG1ldGEgaHR0cC1lcXVpdj0i cHJhZ21hIiBjb250ZW50PSJuby1jYWNoZSI+Cis8bWV0YSBodHRwLWVxdWl2PSJjYWNoZS1jb250 cm9sIiBjb250ZW50PSJuby1jYWNoZSI+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InN0YXJ0VGVz dCgpIj4KKzxpbnB1dCBuYW1lPSJuYW1lMSIgaWQ9ImlucHV0MSI+Cis8aWZyYW1lIGlkPSJmcmFt ZTEiIHNyYz0icmVzb3VyY2VzL2Zvcm0tc3RhdGUtcmVzdG9yZS13aXRoLWZyYW1lcy0xLmh0bWwi PgorPC9pZnJhbWU+Cis8Zm9ybSBpZD0iZm9ybTEiIGFjdGlvbj0iZGF0YTp0ZXh0L2h0bWwsJmx0 O3NjcmlwdD5oaXN0b3J5LmJhY2soKTsmbHQ7L3NjcmlwdD4iPgorPGlucHV0IHR5cGU9InN1Ym1p dCI+Cis8L2Zvcm0+CisKKzxzY3JpcHQ+CitmdW5jdGlvbiAkKGlkKSB7CisgICAgcmV0dXJuIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKGlkKTsKK30KK2Z1bmN0aW9uIGZyYW1lJChmcmFtZSwgaWQp IHsKKyAgICByZXR1cm4gZnJhbWUuY29udGVudERvY3VtZW50LmdldEVsZW1lbnRCeUlkKGlkKTsK K30KKworZnVuY3Rpb24gc3RhcnRUZXN0KCkgeworICAgIGlmICgkKCdpbnB1dDEnKS52YWx1ZSA9 PSAndmlzaXRlZCcpIHsKKyAgICAgICAgc2hvdWxkQmVFcXVhbFRvU3RyaW5nKCdmcmFtZSQoJCgi ZnJhbWUxIiksICJpbnB1dDIiKS52YWx1ZScsICd2YWx1ZTInKTsKKyAgICAgICAgc2hvdWxkQmVF cXVhbFRvU3RyaW5nKCdmcmFtZSQoZnJhbWUkKCQoImZyYW1lMSIpLCAiZnJhbWUyIiksICJpbnB1 dDMiKS52YWx1ZScsICd2YWx1ZTMnKTsKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgfSBl bHNlIHsKKyAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICQoJ2lu cHV0MScpLnZhbHVlID0gJ3Zpc2l0ZWQnOworICAgICAgICAgICAgZnJhbWUkKCQoJ2ZyYW1lMScp LCAnaW5wdXQyJykudmFsdWUgPSAndmFsdWUyJzsKKyAgICAgICAgICAgIGZyYW1lJChmcmFtZSQo JCgnZnJhbWUxJyksICdmcmFtZTInKSwgJ2lucHV0MycpLnZhbHVlID0gJ3ZhbHVlMyc7CisgICAg ICAgICAgICAkKCdmb3JtMScpLnN1Ym1pdCgpOworICAgICAgICB9LCAwKTsKKyAgICB9Cit9CisK K2pzVGVzdElzQXN5bmMgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVz b3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2xvYWRlci9yZXNvdXJjZXMvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgt ZnJhbWVzLTEuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL3Jlc291cmNlcy9mb3JtLXN0 YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMtMS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjZkMTMyYzRjYWFlOTY2 MmYxOWE3NmJkNmY4OTFmN2ViNjc1MGQxZTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9mYXN0L2xvYWRlci9yZXNvdXJjZXMvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLTEu aHRtbApAQCAtMCwwICsxLDQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGlucHV0IG5hbWU9Im5hbWUy IiBpZD0iaW5wdXQyIj4KKzxpZnJhbWUgaWQ9ImZyYW1lMiIgc3JjZG9jPSImbHQ7aW5wdXQgbmFt ZT1uYW1lMyBpZD1pbnB1dDM+Ij4KKzwvaWZyYW1lPgo= 160301 2012-08-23 17:58:39 -0700 2012-08-27 20:36:27 -0700 Patch 2 bug-90870-20120824095839.patch text/plain 9126 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmZlNzdmZTQxNmU1YTBl ODdjN2Y0MzdmNTkzMjlmYzM0MGVjZTdkOS4uMWJlMWQ3ZTBhNzI2NmIwZDU3NGE5ODUwOWU5MjI3 MjZiMmRmYzdjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA4LTIzICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OKHIxMDk0 ODApOiBGb3JtIHN0YXRlIGZvciBpZnJhbWUgY29udGVudCBpcyBub3QgcmVzdG9yZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwODcwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2luY2UgcjEwOTQ4MCwg d2UgaGF2ZSByZXN0b3JlZCBmb3JtIHN0YXRlIG9ubHkgZm9yIGRvY3VtZW50cworICAgICAgICBs b2FkZWQgYnkgRnJhbWVMb2FkZXI6OmxvYWRJdGVtKCkuIEhvd2V2ZXIgd2Ugc2hvdWxkIHJlc3Rv cmUgZm9ybQorICAgICAgICBzdGF0ZSBmb3IgZG9jdW1lbnRzIGluIHN1Yi1mcmFtZXMgb2YgZG9j dW1lbnRzIGxvYWRlZCBieQorICAgICAgICBGcmFtZUxvYWRlcjo6bG9hZEl0ZW0oKS4KKworICAg ICAgICBUZXN0OiBmYXN0L2xvYWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMuaHRt bAorCisgICAgICAgICogaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpIaXN0b3J5SXRlbTo6aXNBbmNlc3Rvck9mKToKKyAgICAgICAgQWRkZWQuIEEgZnVuY3Rpb24g dG8gc2VhcmNoIGRlc2NlbmRhbnRzIGZvciB0aGUgc3BlY2lmaWVkCisgICAgICAgIEhpc290cnlJ dGVtLiBUaGlzIGlzIHVzZWQgYnkgaXNBc3NvY2lhdGVkVG9SZXF1ZXN0ZWRIaXNvdHJ5SXRlbSgp LgorICAgICAgICAqIGhpc3RvcnkvSGlzdG9yeUl0ZW0uaDoKKyAgICAgICAgKEhpc3RvcnlJdGVt KTogRGVjbGFyZSBpc0FuY2VzdG9yT2YoKS4KKyAgICAgICAgKiBsb2FkZXIvSGlzdG9yeUNvbnRy b2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUNvbnRyb2xsZXI6OnNhdmVEb2N1 bWVudFN0YXRlKToKKyAgICAgICAgRG9uJ3Qgc2F2ZSBmb3JtIHN0YXRlIGZvciBkZXRhY2hlZCBk b2N1bWVudC4KKyAgICAgICAgVGhpcyBpcyBuZWVkZWQgYmVjYXVzZSBzYXZlRG9jdW1lbnRTdGF0 ZSgpIGlzIGNhbGxlZCB0d2ljZTsgYmVmb3JlCisgICAgICAgIGRvY3VtZW50IGRldGFjaCBhbmQg YWZ0ZXIgZG9jdW1lbnQgZGV0YWNoLiBXZSBuZWVkIHRvIGF2b2lkIHRoZQorICAgICAgICBsYXR0 ZXIgY2FsbCBiZWNhdXNlIGZvcm1FbGVtZW50c1N0YXRlKCkgZm9yIGEgZGV0YWNoZWQgZG9jdW1l bnQKKyAgICAgICAgcHJvZHVjZXMgYW4gZW1wdHkgc3RhdGUuCisgICAgICAgIChXZWJDb3JlOjpp c0Fzc29jaWF0ZWRUb1JlcXVlc3RlZEhpc290cnlJdGVtKToKKyAgICAgICAgQWRkZWQuIFRoaXMg ZnVuY3Rpb24gY2hlY2tzIHRoZSBjdXJyZW50IEhpc290cnlJdGVtIGlzIGFzc29jaWF0ZWQKKyAg ICAgICAgdG8gdGhlIEhpc290cnlJdGVtIHNwZWNpZmllZCB0byBGcmFtZUxvYWRlcjo6bG9hZEl0 ZW0oKS4KKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjpyZXN0b3JlRG9jdW1l bnRTdGF0ZSk6CisgICAgICAgIFVzZXMgaXNBc3NvY2lhdGVkVG9SZXF1ZXN0ZWRIaXNvdHJ5SXRl bSgpLgorCiAyMDEyLTA4LTIzICBFbWlsIEEgRWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBBZGQgc2F0dXJhdGlvbiBhcml0aG1ldGljIHN1cHBvcnQgdG8gRnJhY3Rpb25hbExh eW91dFVuaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0u Y3BwIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKaW5kZXggZmUxMWVh YmIxNWZiYWRhMjBlN2I2YzhiMjEyMzE3MDE4OTQzNDhiZC4uYThmMzc0ZWNjMDE5ZWI3MjdiZTEw YjdkNDI2YzIyODc0MDM4ZWIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9I aXN0b3J5SXRlbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5j cHAKQEAgLTUzMiw2ICs1MzIsMTggQEAgdm9pZCBIaXN0b3J5SXRlbTo6Y2xlYXJDaGlsZHJlbigp CiAgICAgbV9jaGlsZHJlbi5jbGVhcigpOwogfQogCitib29sIEhpc3RvcnlJdGVtOjppc0FuY2Vz dG9yT2YoY29uc3QgSGlzdG9yeUl0ZW0qIGl0ZW0pIGNvbnN0Cit7CisgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBtX2NoaWxkcmVuLnNpemUoKTsgKytpKSB7CisgICAgICAgIEhpc3RvcnlJdGVt KiBjaGlsZCA9IG1fY2hpbGRyZW5baV0uZ2V0KCk7CisgICAgICAgIGlmIChjaGlsZCA9PSBpdGVt KQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgICAgIGlmIChjaGlsZC0+aXNBbmNlc3Rv ck9mKGl0ZW0pKQorICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBm YWxzZTsKK30KKwogLy8gV2UgZG8gc2FtZS1kb2N1bWVudCBuYXZpZ2F0aW9uIGlmIGdvaW5nIHRv IGEgZGlmZmVyZW50IGl0ZW0gYW5kIGlmIGVpdGhlciBvZiB0aGUgZm9sbG93aW5nIGlzIHRydWU6 CiAvLyAtIFRoZSBvdGhlciBpdGVtIGNvcnJlc3BvbmRzIHRvIHRoZSBzYW1lIGRvY3VtZW50IChm b3IgaGlzdG9yeSBlbnRyaWVzIGNyZWF0ZWQgdmlhIHB1c2hTdGF0ZSBvciBmcmFnbWVudCBjaGFu Z2VzKS4KIC8vIC0gVGhlIG90aGVyIGl0ZW0gY29ycmVzcG9uZHMgdG8gdGhlIHNhbWUgc2V0IG9m IGRvY3VtZW50cywgaW5jbHVkaW5nIGZyYW1lcyAoZm9yIGhpc3RvcnkgZW50cmllcyBjcmVhdGVk IHZpYSByZWd1bGFyIG5hdmlnYXRpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0 b3J5L0hpc3RvcnlJdGVtLmggYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgK aW5kZXggZmZlNjRmYjQzYmE2MjQzYjRlMDczNzk3YzI1MzM5OTZkMGE4Yzc3Ny4uOTdkNzI5YjA4 OTNkMzYxYjhmZDVhMzRkNjEzMDdlZDBlOGU3ZWE2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlz dG9yeUl0ZW0uaApAQCAtMTcxLDYgKzE3MSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBIaXN0b3J5 SXRlbVZlY3RvciYgY2hpbGRyZW4oKSBjb25zdDsKICAgICBib29sIGhhc0NoaWxkcmVuKCkgY29u c3Q7CiAgICAgdm9pZCBjbGVhckNoaWxkcmVuKCk7CisgICAgYm9vbCBpc0FuY2VzdG9yT2YoY29u c3QgSGlzdG9yeUl0ZW0qKSBjb25zdDsKICAgICAKICAgICBib29sIHNob3VsZERvU2FtZURvY3Vt ZW50TmF2aWdhdGlvblRvKEhpc3RvcnlJdGVtKiBvdGhlckl0ZW0pIGNvbnN0OwogICAgIGJvb2wg aGFzU2FtZUZyYW1lcyhIaXN0b3J5SXRlbSogb3RoZXJJdGVtKSBjb25zdDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvSGlzdG9yeUNvbnRyb2xsZXIuY3BwCmluZGV4IDVlM2NlODRiYjRjMDlhMzU3 Yjc4NWIyZGMyODkzZjU0ZDQyYWEzODcuLmFkMDFlMjkzZjZhNjBkMWUyMmE3OWU3MWFiNjdiNWJj NTFhYjgxOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJv bGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNw cApAQCAtMTYzLDcgKzE2Myw3IEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnNhdmVEb2N1bWVu dFN0YXRlKCkKICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBtX2ZyYW1lLT5kb2N1bWVudCgpOwog ICAgIEFTU0VSVChkb2N1bWVudCk7CiAgICAgCi0gICAgaWYgKGl0ZW0tPmlzQ3VycmVudERvY3Vt ZW50KGRvY3VtZW50KSkgeworICAgIGlmIChpdGVtLT5pc0N1cnJlbnREb2N1bWVudChkb2N1bWVu dCkgJiYgZG9jdW1lbnQtPmF0dGFjaGVkKCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJD b3JlTG9hZGluZyAlczogc2F2aW5nIGZvcm0gc3RhdGUgdG8gJXAiLCBtX2ZyYW1lLT50cmVlKCkt PnVuaXF1ZU5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBpdGVtKTsKICAgICAgICAgaXRl bS0+c2V0RG9jdW1lbnRTdGF0ZShkb2N1bWVudC0+Zm9ybUVsZW1lbnRzU3RhdGUoKSk7CiAgICAg fQpAQCAtMTc5LDYgKzE3OSwyMiBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjpzYXZlRG9jdW1l bnRBbmRTY3JvbGxTdGF0ZSgpCiAgICAgfQogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaXNBc3Nv Y2lhdGVkVG9SZXF1ZXN0ZWRIaXNvdHJ5SXRlbShjb25zdCBIaXN0b3J5SXRlbSogY3VycmVudCwg RnJhbWUqIGZyYW1lLCBjb25zdCBIaXN0b3J5SXRlbSogcmVxdWVzdGVkKQoreworICAgIGlmIChy ZXF1ZXN0ZWQgPT0gY3VycmVudCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKHJlcXVl c3RlZCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHdoaWxlICgoZnJhbWUgPSBmcmFtZS0+ dHJlZSgpLT5wYXJlbnQoKSkpIHsKKyAgICAgICAgcmVxdWVzdGVkID0gZnJhbWUtPmxvYWRlcigp LT5yZXF1ZXN0ZWRIaXN0b3J5SXRlbSgpOworICAgICAgICBpZiAoIXJlcXVlc3RlZCkKKyAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICBpZiAocmVxdWVzdGVkLT5pc0FuY2VzdG9yT2YoY3Vy cmVudCkpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNl OworfQorCiB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjpyZXN0b3JlRG9jdW1lbnRTdGF0ZSgpCiB7 CiAgICAgRG9jdW1lbnQqIGRvYyA9IG1fZnJhbWUtPmRvY3VtZW50KCk7CkBAIC0yMDEsNyArMjE3 LDcgQEAgdm9pZCBIaXN0b3J5Q29udHJvbGxlcjo6cmVzdG9yZURvY3VtZW50U3RhdGUoKQogICAg IAogICAgIGlmICghaXRlbVRvUmVzdG9yZSkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChtX2Zy YW1lLT5sb2FkZXIoKS0+cmVxdWVzdGVkSGlzdG9yeUl0ZW0oKSA9PSBtX2N1cnJlbnRJdGVtLmdl dCgpICYmICFtX2ZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+aXNDbGllbnRSZWRp cmVjdCgpKSB7CisgICAgaWYgKGlzQXNzb2NpYXRlZFRvUmVxdWVzdGVkSGlzb3RyeUl0ZW0oaXRl bVRvUmVzdG9yZSwgbV9mcmFtZSwgbV9mcmFtZS0+bG9hZGVyKCktPnJlcXVlc3RlZEhpc3RvcnlJ dGVtKCkpICYmICFtX2ZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+aXNDbGllbnRS ZWRpcmVjdCgpKSB7CiAgICAgICAgIExPRyhMb2FkaW5nLCAiV2ViQ29yZUxvYWRpbmcgJXM6IHJl c3RvcmluZyBmb3JtIHN0YXRlIGZyb20gJXAiLCBtX2ZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUo KS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBpdGVtVG9SZXN0b3JlKTsKICAgICAgICAgZG9jLT5z ZXRTdGF0ZUZvck5ld0Zvcm1FbGVtZW50cyhpdGVtVG9SZXN0b3JlLT5kb2N1bWVudFN0YXRlKCkp OwogICAgIH0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCA4NmY4ODVjNWNmY2FkNGNlOGNiMjJjOTJkZmI3ZGY1MjQ2ZGJiZDNl Li4xZDI3MjVkMWRiZjBiOWVkNzFhOGUzYmI3ZGQ1NTI2ZTQ4ZGU0YWYwIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTQgQEAKKzIwMTItMDgtMjMgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJFR1JFU1NJT04ocjEwOTQ4MCk6IEZvcm0gc3RhdGUgZm9yIGlmcmFtZSBjb250 ZW50IGlzIG5vdCByZXN0b3JlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTA4NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGZhc3QvbG9hZGVyL2Zvcm0tc3RhdGUtcmVzdG9yZS13aXRoLWZyYW1lcy5o dG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0 aC1mcmFtZXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2xvYWRlci9yZXNv dXJjZXMvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLTEuaHRtbDogQWRkZWQuCisKIDIw MTItMDgtMjMgIFNoZXphbiBCYWlnICA8c2hlemJhaWcud2tAZ21haWwuY29tPgogCiAgICAgICAg IEZpeCBjcm9zcy1kaXJlY3Rpb24gc3RyZXRjaCBmb3IgcmVwbGFjZWQgZWxlbWVudHMgaW4gY29s dW1uIGZsZXhib3gKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2Zvcm0tc3Rh dGUtcmVzdG9yZS13aXRoLWZyYW1lcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2xv YWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjAyMGEzNzAxZDRhOGVjMTdhMmRjMmM2MjZhYWUzZjVmMDhmODdiNjEKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1m cmFtZXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNyBAQAorUEFTUyBmcmFtZSQoJCgiZnJhbWUx IiksICJpbnB1dDIiKS52YWx1ZSBpcyAidmFsdWUyIgorUEFTUyBmcmFtZSQoZnJhbWUkKCQoImZy YW1lMSIpLCAiZnJhbWUyIiksICJpbnB1dDMiKS52YWx1ZSBpcyAidmFsdWUzIgorUEFTUyBzdWNj ZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisgCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2Zvcm0tc3RhdGUtcmVzdG9yZS13aXRoLWZyYW1lcy5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJh bWVzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uOGQ2NzAzYzBlNDk4NjkwYWI3MDc5ZGJmZGQxNjE5NWRkMGU2 ZTExYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2Zvcm0tc3Rh dGUtcmVzdG9yZS13aXRoLWZyYW1lcy5odG1sCkBAIC0wLDAgKzEsNDEgQEAKKzwhRE9DVFlQRSBo dG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpz Ij48L3NjcmlwdD4KKzxtZXRhIGh0dHAtZXF1aXY9InByYWdtYSIgY29udGVudD0ibm8tY2FjaGUi PgorPG1ldGEgaHR0cC1lcXVpdj0iY2FjaGUtY29udHJvbCIgY29udGVudD0ibm8tY2FjaGUiPgor PC9oZWFkPgorPGJvZHkgb25sb2FkPSJzdGFydFRlc3QoKSI+Cis8aW5wdXQgbmFtZT0ibmFtZTEi IGlkPSJpbnB1dDEiPgorPGlmcmFtZSBpZD0iZnJhbWUxIiBzcmM9InJlc291cmNlcy9mb3JtLXN0 YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMtMS5odG1sIj4KKzwvaWZyYW1lPgorPGZvcm0gaWQ9ImZv cm0xIiBhY3Rpb249ImRhdGE6dGV4dC9odG1sLCZsdDtzY3JpcHQ+aGlzdG9yeS5iYWNrKCk7Jmx0 Oy9zY3JpcHQ+Ij4KKzxpbnB1dCB0eXBlPSJzdWJtaXQiPgorPC9mb3JtPgorCis8c2NyaXB0Pgor ZnVuY3Rpb24gJChpZCkgeworICAgIHJldHVybiBkb2N1bWVudC5nZXRFbGVtZW50QnlJZChpZCk7 Cit9CitmdW5jdGlvbiBmcmFtZSQoZnJhbWUsIGlkKSB7CisgICAgcmV0dXJuIGZyYW1lLmNvbnRl bnREb2N1bWVudC5nZXRFbGVtZW50QnlJZChpZCk7Cit9CisKK2Z1bmN0aW9uIHN0YXJ0VGVzdCgp IHsKKyAgICBpZiAoJCgnaW5wdXQxJykudmFsdWUgPT0gJ3Zpc2l0ZWQnKSB7CisgICAgICAgIHNo b3VsZEJlRXF1YWxUb1N0cmluZygnZnJhbWUkKCQoImZyYW1lMSIpLCAiaW5wdXQyIikudmFsdWUn LCAndmFsdWUyJyk7CisgICAgICAgIHNob3VsZEJlRXF1YWxUb1N0cmluZygnZnJhbWUkKGZyYW1l JCgkKCJmcmFtZTEiKSwgImZyYW1lMiIpLCAiaW5wdXQzIikudmFsdWUnLCAndmFsdWUzJyk7Cisg ICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgIH0gZWxzZSB7CisgICAgICAgIHNldFRpbWVvdXQo ZnVuY3Rpb24oKSB7CisgICAgICAgICAgICAkKCdpbnB1dDEnKS52YWx1ZSA9ICd2aXNpdGVkJzsK KyAgICAgICAgICAgIGZyYW1lJCgkKCdmcmFtZTEnKSwgJ2lucHV0MicpLnZhbHVlID0gJ3ZhbHVl Mic7CisgICAgICAgICAgICBmcmFtZSQoZnJhbWUkKCQoJ2ZyYW1lMScpLCAnZnJhbWUyJyksICdp bnB1dDMnKS52YWx1ZSA9ICd2YWx1ZTMnOworICAgICAgICAgICAgJCgnZm9ybTEnKS5zdWJtaXQo KTsKKyAgICAgICAgfSwgMCk7CisgICAgfQorfQorCitqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKzwv c2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwv c2NyaXB0PgorPC9ib2R5PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvcmVz b3VyY2VzL2Zvcm0tc3RhdGUtcmVzdG9yZS13aXRoLWZyYW1lcy0xLmh0bWwgYi9MYXlvdXRUZXN0 cy9mYXN0L2xvYWRlci9yZXNvdXJjZXMvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLTEu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwLi42ZDEzMmM0Y2FhZTk2NjJmMTlhNzZiZDZmODkxZjdlYjY3NTBkMWU4 Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvcmVzb3VyY2VzL2Zv cm0tc3RhdGUtcmVzdG9yZS13aXRoLWZyYW1lcy0xLmh0bWwKQEAgLTAsMCArMSw0IEBACis8IURP Q1RZUEUgaHRtbD4KKzxpbnB1dCBuYW1lPSJuYW1lMiIgaWQ9ImlucHV0MiI+Cis8aWZyYW1lIGlk PSJmcmFtZTIiIHNyY2RvYz0iJmx0O2lucHV0IG5hbWU9bmFtZTMgaWQ9aW5wdXQzPiI+Cis8L2lm cmFtZT4K 160891 2012-08-27 20:36:31 -0700 2012-08-27 21:19:50 -0700 Patch for landing bug-90870-20120828123622.patch text/plain 9085 tkent U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2ODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDI3MjdlMGFlNjY0OWMz M2U2YjcxNDA1YzUzODIxMzdiZTFkNmUxMS4uOTJlMDRmMDNlM2QxNzI0MGJmYzFkOTE5OWVhYTQw NTJiMDY3ZmRiYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEyLTA4LTIzICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KKworICAgICAgICBSRUdSRVNTSU9OKHIxMDk0 ODApOiBGb3JtIHN0YXRlIGZvciBpZnJhbWUgY29udGVudCBpcyBub3QgcmVzdG9yZWQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkwODcwCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgSm9jaGVuIEVpc2luZ2VyLgorCisgICAgICAgIFNpbmNlIHIxMDk0ODAs IHdlIGhhdmUgcmVzdG9yZWQgZm9ybSBzdGF0ZSBvbmx5IGZvciBkb2N1bWVudHMKKyAgICAgICAg bG9hZGVkIGJ5IEZyYW1lTG9hZGVyOjpsb2FkSXRlbSgpLiBIb3dldmVyIHdlIHNob3VsZCByZXN0 b3JlIGZvcm0KKyAgICAgICAgc3RhdGUgZm9yIGRvY3VtZW50cyBpbiBzdWItZnJhbWVzIG9mIGRv Y3VtZW50cyBsb2FkZWQgYnkKKyAgICAgICAgRnJhbWVMb2FkZXI6OmxvYWRJdGVtKCkuCisKKyAg ICAgICAgVGVzdDogZmFzdC9sb2FkZXIvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLmh0 bWwKKworICAgICAgICAqIGhpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6SGlzdG9yeUl0ZW06OmlzQW5jZXN0b3JPZik6CisgICAgICAgIEFkZGVkLiBBIGZ1bmN0aW9u IHRvIHNlYXJjaCBkZXNjZW5kYW50cyBmb3IgdGhlIHNwZWNpZmllZAorICAgICAgICBIaXN0b3J5 SXRlbS4gVGhpcyBpcyB1c2VkIGJ5IGlzQXNzb2NpYXRlZFRvUmVxdWVzdGVkSGlzdG9yeUl0ZW0o KS4KKyAgICAgICAgKiBoaXN0b3J5L0hpc3RvcnlJdGVtLmg6CisgICAgICAgIChIaXN0b3J5SXRl bSk6IERlY2xhcmUgaXNBbmNlc3Rvck9mKCkuCisgICAgICAgICogbG9hZGVyL0hpc3RvcnlDb250 cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjpzYXZlRG9j dW1lbnRTdGF0ZSk6CisgICAgICAgIERvbid0IHNhdmUgZm9ybSBzdGF0ZSBmb3IgZGV0YWNoZWQg ZG9jdW1lbnQuCisgICAgICAgIFRoaXMgaXMgbmVlZGVkIGJlY2F1c2Ugc2F2ZURvY3VtZW50U3Rh dGUoKSBpcyBjYWxsZWQgdHdpY2U7IGJlZm9yZQorICAgICAgICBkb2N1bWVudCBkZXRhY2ggYW5k IGFmdGVyIGRvY3VtZW50IGRldGFjaC4gV2UgbmVlZCB0byBhdm9pZCB0aGUKKyAgICAgICAgbGF0 dGVyIGNhbGwgYmVjYXVzZSBmb3JtRWxlbWVudHNTdGF0ZSgpIGZvciBhIGRldGFjaGVkIGRvY3Vt ZW50CisgICAgICAgIHByb2R1Y2VzIGFuIGVtcHR5IHN0YXRlLgorICAgICAgICAoV2ViQ29yZTo6 aXNBc3NvY2lhdGVkVG9SZXF1ZXN0ZWRIaXN0b3J5SXRlbSk6CisgICAgICAgIEFkZGVkLiBUaGlz IGZ1bmN0aW9uIGNoZWNrcyB0aGUgY3VycmVudCBIaXN0b3J5SXRlbSBpcyBhc3NvY2lhdGVkCisg ICAgICAgIHRvIHRoZSBIaXN0b3J5SXRlbSBzcGVjaWZpZWQgdG8gRnJhbWVMb2FkZXI6OmxvYWRJ dGVtKCkuCisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5Q29udHJvbGxlcjo6cmVzdG9yZURvY3Vt ZW50U3RhdGUpOgorICAgICAgICBVc2VzIGlzQXNzb2NpYXRlZFRvUmVxdWVzdGVkSGlzdG9yeUl0 ZW0oKS4KKwogMjAxMi0wOC0yNyAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFp bC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEyNjgzNi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwIGIvU291cmNlL1dl YkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKaW5kZXggZmUxMWVhYmIxNWZiYWRhMjBlN2I2 YzhiMjEyMzE3MDE4OTQzNDhiZC4uYThmMzc0ZWNjMDE5ZWI3MjdiZTEwYjdkNDI2YzIyODc0MDM4 ZWIwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAKQEAgLTUzMiw2ICs1 MzIsMTggQEAgdm9pZCBIaXN0b3J5SXRlbTo6Y2xlYXJDaGlsZHJlbigpCiAgICAgbV9jaGlsZHJl bi5jbGVhcigpOwogfQogCitib29sIEhpc3RvcnlJdGVtOjppc0FuY2VzdG9yT2YoY29uc3QgSGlz dG9yeUl0ZW0qIGl0ZW0pIGNvbnN0Cit7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBtX2No aWxkcmVuLnNpemUoKTsgKytpKSB7CisgICAgICAgIEhpc3RvcnlJdGVtKiBjaGlsZCA9IG1fY2hp bGRyZW5baV0uZ2V0KCk7CisgICAgICAgIGlmIChjaGlsZCA9PSBpdGVtKQorICAgICAgICAgICAg cmV0dXJuIHRydWU7CisgICAgICAgIGlmIChjaGlsZC0+aXNBbmNlc3Rvck9mKGl0ZW0pKQorICAg ICAgICAgICAgcmV0dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogLy8g V2UgZG8gc2FtZS1kb2N1bWVudCBuYXZpZ2F0aW9uIGlmIGdvaW5nIHRvIGEgZGlmZmVyZW50IGl0 ZW0gYW5kIGlmIGVpdGhlciBvZiB0aGUgZm9sbG93aW5nIGlzIHRydWU6CiAvLyAtIFRoZSBvdGhl ciBpdGVtIGNvcnJlc3BvbmRzIHRvIHRoZSBzYW1lIGRvY3VtZW50IChmb3IgaGlzdG9yeSBlbnRy aWVzIGNyZWF0ZWQgdmlhIHB1c2hTdGF0ZSBvciBmcmFnbWVudCBjaGFuZ2VzKS4KIC8vIC0gVGhl IG90aGVyIGl0ZW0gY29ycmVzcG9uZHMgdG8gdGhlIHNhbWUgc2V0IG9mIGRvY3VtZW50cywgaW5j bHVkaW5nIGZyYW1lcyAoZm9yIGhpc3RvcnkgZW50cmllcyBjcmVhdGVkIHZpYSByZWd1bGFyIG5h dmlnYXRpb24pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVt LmggYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgKaW5kZXggZmZlNjRmYjQz YmE2MjQzYjRlMDczNzk3YzI1MzM5OTZkMGE4Yzc3Ny4uOTdkNzI5YjA4OTNkMzYxYjhmZDVhMzRk NjEzMDdlZDBlOGU3ZWE2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0 b3J5SXRlbS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaApAQCAt MTcxLDYgKzE3MSw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBIaXN0b3J5SXRlbVZlY3RvciYgY2hp bGRyZW4oKSBjb25zdDsKICAgICBib29sIGhhc0NoaWxkcmVuKCkgY29uc3Q7CiAgICAgdm9pZCBj bGVhckNoaWxkcmVuKCk7CisgICAgYm9vbCBpc0FuY2VzdG9yT2YoY29uc3QgSGlzdG9yeUl0ZW0q KSBjb25zdDsKICAgICAKICAgICBib29sIHNob3VsZERvU2FtZURvY3VtZW50TmF2aWdhdGlvblRv KEhpc3RvcnlJdGVtKiBvdGhlckl0ZW0pIGNvbnN0OwogICAgIGJvb2wgaGFzU2FtZUZyYW1lcyhI aXN0b3J5SXRlbSogb3RoZXJJdGVtKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlz dG9yeUNvbnRyb2xsZXIuY3BwCmluZGV4IDVlM2NlODRiYjRjMDlhMzU3Yjc4NWIyZGMyODkzZjU0 ZDQyYWEzODcuLmViNTgzNDE0ZDFmYjdmZGNjZDNhNzJlMThhODk2ZDM1YTA5ODQwYjIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcApAQCAtMTYzLDcgKzE2 Myw3IEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnNhdmVEb2N1bWVudFN0YXRlKCkKICAgICBE b2N1bWVudCogZG9jdW1lbnQgPSBtX2ZyYW1lLT5kb2N1bWVudCgpOwogICAgIEFTU0VSVChkb2N1 bWVudCk7CiAgICAgCi0gICAgaWYgKGl0ZW0tPmlzQ3VycmVudERvY3VtZW50KGRvY3VtZW50KSkg eworICAgIGlmIChpdGVtLT5pc0N1cnJlbnREb2N1bWVudChkb2N1bWVudCkgJiYgZG9jdW1lbnQt PmF0dGFjaGVkKCkpIHsKICAgICAgICAgTE9HKExvYWRpbmcsICJXZWJDb3JlTG9hZGluZyAlczog c2F2aW5nIGZvcm0gc3RhdGUgdG8gJXAiLCBtX2ZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUoKS5z dHJpbmcoKS51dGY4KCkuZGF0YSgpLCBpdGVtKTsKICAgICAgICAgaXRlbS0+c2V0RG9jdW1lbnRT dGF0ZShkb2N1bWVudC0+Zm9ybUVsZW1lbnRzU3RhdGUoKSk7CiAgICAgfQpAQCAtMTc5LDYgKzE3 OSwyMiBAQCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjpzYXZlRG9jdW1lbnRBbmRTY3JvbGxTdGF0 ZSgpCiAgICAgfQogfQogCitzdGF0aWMgaW5saW5lIGJvb2wgaXNBc3NvY2lhdGVkVG9SZXF1ZXN0 ZWRIaXN0b3J5SXRlbShjb25zdCBIaXN0b3J5SXRlbSogY3VycmVudCwgRnJhbWUqIGZyYW1lLCBj b25zdCBIaXN0b3J5SXRlbSogcmVxdWVzdGVkKQoreworICAgIGlmIChyZXF1ZXN0ZWQgPT0gY3Vy cmVudCkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgaWYgKHJlcXVlc3RlZCkKKyAgICAgICAg cmV0dXJuIGZhbHNlOworICAgIHdoaWxlICgoZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT5wYXJlbnQo KSkpIHsKKyAgICAgICAgcmVxdWVzdGVkID0gZnJhbWUtPmxvYWRlcigpLT5yZXF1ZXN0ZWRIaXN0 b3J5SXRlbSgpOworICAgICAgICBpZiAoIXJlcXVlc3RlZCkKKyAgICAgICAgICAgIGNvbnRpbnVl OworICAgICAgICBpZiAocmVxdWVzdGVkLT5pc0FuY2VzdG9yT2YoY3VycmVudCkpCisgICAgICAg ICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisgICAgcmV0dXJuIGZhbHNlOworfQorCiB2b2lkIEhp c3RvcnlDb250cm9sbGVyOjpyZXN0b3JlRG9jdW1lbnRTdGF0ZSgpCiB7CiAgICAgRG9jdW1lbnQq IGRvYyA9IG1fZnJhbWUtPmRvY3VtZW50KCk7CkBAIC0yMDEsNyArMjE3LDcgQEAgdm9pZCBIaXN0 b3J5Q29udHJvbGxlcjo6cmVzdG9yZURvY3VtZW50U3RhdGUoKQogICAgIAogICAgIGlmICghaXRl bVRvUmVzdG9yZSkKICAgICAgICAgcmV0dXJuOwotICAgIGlmIChtX2ZyYW1lLT5sb2FkZXIoKS0+ cmVxdWVzdGVkSGlzdG9yeUl0ZW0oKSA9PSBtX2N1cnJlbnRJdGVtLmdldCgpICYmICFtX2ZyYW1l LT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+aXNDbGllbnRSZWRpcmVjdCgpKSB7CisgICAg aWYgKGlzQXNzb2NpYXRlZFRvUmVxdWVzdGVkSGlzdG9yeUl0ZW0oaXRlbVRvUmVzdG9yZSwgbV9m cmFtZSwgbV9mcmFtZS0+bG9hZGVyKCktPnJlcXVlc3RlZEhpc3RvcnlJdGVtKCkpICYmICFtX2Zy YW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+aXNDbGllbnRSZWRpcmVjdCgpKSB7CiAg ICAgICAgIExPRyhMb2FkaW5nLCAiV2ViQ29yZUxvYWRpbmcgJXM6IHJlc3RvcmluZyBmb3JtIHN0 YXRlIGZyb20gJXAiLCBtX2ZyYW1lLT50cmVlKCktPnVuaXF1ZU5hbWUoKS5zdHJpbmcoKS51dGY4 KCkuZGF0YSgpLCBpdGVtVG9SZXN0b3JlKTsKICAgICAgICAgZG9jLT5zZXRTdGF0ZUZvck5ld0Zv cm1FbGVtZW50cyhpdGVtVG9SZXN0b3JlLT5kb2N1bWVudFN0YXRlKCkpOwogICAgIH0KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRl eCBlMjk3NjhjOTU5ZmE2YjUwYmY5YWNmZmRlOWM0ZDc3ZDNjNWI2NjAyLi4xYTA0NmQwMDUyY2Qy ZWU1ZDAxNzA4MDVhMjBiMDkzYTkxNDYyMDliIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTIt MDgtMjMgIEtlbnQgVGFtdXJhICA8dGtlbnRAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJFR1JF U1NJT04ocjEwOTQ4MCk6IEZvcm0gc3RhdGUgZm9yIGlmcmFtZSBjb250ZW50IGlzIG5vdCByZXN0 b3JlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTA4 NzAKKworICAgICAgICBSZXZpZXdlZCBieSBKb2NoZW4gRWlzaW5nZXIuCisKKyAgICAgICAgKiBm YXN0L2xvYWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMuaHRtbDogQWRkZWQuCisg ICAgICAgICogZmFzdC9sb2FkZXIvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLWV4cGVj dGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9sb2FkZXIvcmVzb3VyY2VzL2Zvcm0tc3Rh dGUtcmVzdG9yZS13aXRoLWZyYW1lcy0xLmh0bWw6IEFkZGVkLgorCiAyMDEyLTA4LTI3ICBKdWxp ZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJraXQub3JnPgogCiAgICAgICAgIENyYXNoIGlu IFJlbmRlclRhYmxlOjpyZW1vdmVDYXB0aW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2xvYWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMtZXhwZWN0ZWQudHh0IGIvTGF5 b3V0VGVzdHMvZmFzdC9sb2FkZXIvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4wMjBhMzcwMWQ0YThlYzE3YTJkYzJjNjI2YWFlM2Y1ZjA4Zjg3 YjYxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvZm9ybS1zdGF0 ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcgQEAKK1BBU1Mg ZnJhbWUkKCQoImZyYW1lMSIpLCAiaW5wdXQyIikudmFsdWUgaXMgInZhbHVlMiIKK1BBU1MgZnJh bWUkKGZyYW1lJCgkKCJmcmFtZTEiKSwgImZyYW1lMiIpLCAiaW5wdXQzIikudmFsdWUgaXMgInZh bHVlMyIKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQor IAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9mb3JtLXN0YXRlLXJlc3Rv cmUtd2l0aC1mcmFtZXMuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2Zvcm0tc3RhdGUt cmVzdG9yZS13aXRoLWZyYW1lcy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjhkNjcwM2MwZTQ5ODY5MGFiNzA3 OWRiZmRkMTYxOTVkZDBlNmUxMWEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L2xvYWRlci9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMuaHRtbApAQCAtMCwwICsxLDQx IEBACis8IURPQ1RZUEUgaHRtbD4KKzxoZWFkPgorPHNjcmlwdCBzcmM9Ii4uL2pzL3Jlc291cmNl cy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8bWV0YSBodHRwLWVxdWl2PSJwcmFnbWEiIGNv bnRlbnQ9Im5vLWNhY2hlIj4KKzxtZXRhIGh0dHAtZXF1aXY9ImNhY2hlLWNvbnRyb2wiIGNvbnRl bnQ9Im5vLWNhY2hlIj4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0ic3RhcnRUZXN0KCkiPgorPGlu cHV0IG5hbWU9Im5hbWUxIiBpZD0iaW5wdXQxIj4KKzxpZnJhbWUgaWQ9ImZyYW1lMSIgc3JjPSJy ZXNvdXJjZXMvZm9ybS1zdGF0ZS1yZXN0b3JlLXdpdGgtZnJhbWVzLTEuaHRtbCI+Cis8L2lmcmFt ZT4KKzxmb3JtIGlkPSJmb3JtMSIgYWN0aW9uPSJkYXRhOnRleHQvaHRtbCwmbHQ7c2NyaXB0Pmhp c3RvcnkuYmFjaygpOyZsdDsvc2NyaXB0PiI+Cis8aW5wdXQgdHlwZT0ic3VibWl0Ij4KKzwvZm9y bT4KKworPHNjcmlwdD4KK2Z1bmN0aW9uICQoaWQpIHsKKyAgICByZXR1cm4gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoaWQpOworfQorZnVuY3Rpb24gZnJhbWUkKGZyYW1lLCBpZCkgeworICAgIHJl dHVybiBmcmFtZS5jb250ZW50RG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoaWQpOworfQorCitmdW5j dGlvbiBzdGFydFRlc3QoKSB7CisgICAgaWYgKCQoJ2lucHV0MScpLnZhbHVlID09ICd2aXNpdGVk JykgeworICAgICAgICBzaG91bGRCZUVxdWFsVG9TdHJpbmcoJ2ZyYW1lJCgkKCJmcmFtZTEiKSwg ImlucHV0MiIpLnZhbHVlJywgJ3ZhbHVlMicpOworICAgICAgICBzaG91bGRCZUVxdWFsVG9TdHJp bmcoJ2ZyYW1lJChmcmFtZSQoJCgiZnJhbWUxIiksICJmcmFtZTIiKSwgImlucHV0MyIpLnZhbHVl JywgJ3ZhbHVlMycpOworICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICB9IGVsc2UgeworICAg ICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgJCgnaW5wdXQxJykudmFs dWUgPSAndmlzaXRlZCc7CisgICAgICAgICAgICBmcmFtZSQoJCgnZnJhbWUxJyksICdpbnB1dDIn KS52YWx1ZSA9ICd2YWx1ZTInOworICAgICAgICAgICAgZnJhbWUkKGZyYW1lJCgkKCdmcmFtZTEn KSwgJ2ZyYW1lMicpLCAnaW5wdXQzJykudmFsdWUgPSAndmFsdWUzJzsKKyAgICAgICAgICAgICQo J2Zvcm0xJykuc3VibWl0KCk7CisgICAgICAgIH0sIDApOworICAgIH0KK30KKworanNUZXN0SXNB c3luYyA9IHRydWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9qcy9yZXNvdXJjZXMvanMt dGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvbG9hZGVyL3Jlc291cmNlcy9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMtMS5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9sb2FkZXIvcmVzb3VyY2VzL2Zvcm0tc3RhdGUtcmVzdG9y ZS13aXRoLWZyYW1lcy0xLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNmQxMzJjNGNhYWU5NjYyZjE5YTc2YmQ2 Zjg5MWY3ZWI2NzUwZDFlOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbG9h ZGVyL3Jlc291cmNlcy9mb3JtLXN0YXRlLXJlc3RvcmUtd2l0aC1mcmFtZXMtMS5odG1sCkBAIC0w LDAgKzEsNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aW5wdXQgbmFtZT0ibmFtZTIiIGlkPSJpbnB1 dDIiPgorPGlmcmFtZSBpZD0iZnJhbWUyIiBzcmNkb2M9IiZsdDtpbnB1dCBuYW1lPW5hbWUzIGlk PWlucHV0Mz4iPgorPC9pZnJhbWU+Cg==