69832 2011-10-11 05:44:58 -0700 [Qt][WK2] Implement decidePolicyForResponse in our PolicyClient 2011-10-17 05:41:14 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt, QtTriaged P2 Normal --- 70115 1 jesus jesus cshu gopal.1.raghavan webkit.review.bot yael zalan oldest_to_newest 481580 0 jesus 2011-10-11 05:44:58 -0700 Our PolicyClient implementation is missing decidePolicyForResponse and, therefore, can't check for a response mime type and decide whether it should download or load it. 481658 1 110519 jesus 2011-10-11 09:01:09 -0700 Created attachment 110519 Patch 481726 2 110519 cshu 2011-10-11 10:45:23 -0700 Comment on attachment 110519 Patch It looks to me the patch is missing some code. 481748 3 110544 jesus 2011-10-11 11:15:53 -0700 Created attachment 110544 Patch 481749 4 jesus 2011-10-11 11:16:46 -0700 (In reply to comment #2) > (From update of attachment 110519 [details]) > It looks to me the patch is missing some code. Yeah, sorry, I forgot the QtWebPageProxy piece. Here it goes... 481758 5 110544 cshu 2011-10-11 11:30:44 -0700 Comment on attachment 110544 Patch The implementation in WK1 may output "Ignore" policy. Can you explain why we don't need it here? Also, is it possible to create some test cases? 481793 6 gopal.1.raghavan 2011-10-11 12:01:35 -0700 This could be duplicate. There is a related patch for navigationPolicy in https://bugs.webkit.org/show_bug.cgi?id=69572. 481799 7 110544 jesus 2011-10-11 12:05:41 -0700 Comment on attachment 110544 Patch Patch is missing a Ignore for downloadable content from subframes. I will update it and upload a new version. 481801 8 jesus 2011-10-11 12:07:34 -0700 (In reply to comment #6) > This could be duplicate. There is a related patch for navigationPolicy in https://bugs.webkit.org/show_bug.cgi?id=69572. Gopal, this patch is implemented decidePolicyForResponse that we currently missing in our PolicyClient. This function used to be called decidePolicyForMIMEType. 481839 9 110561 jesus 2011-10-11 12:51:10 -0700 Created attachment 110561 Patch 481843 10 jesus 2011-10-11 12:58:19 -0700 (In reply to comment #5) > (From update of attachment 110544 [details]) > The implementation in WK1 may output "Ignore" policy. Can you explain why we don't need it here? This new patch is covering the Ignore cases, according to decisions made for N9's browser (https://gitorious.org/+qtwebkit-webkit2-dev/webkit/qtwebkit-webkit2-dev/blobs/master/WebKit2/UIProcess/API/qt/ClientImpl.cpp#line439) > Also, is it possible to create some test cases? There is no API directly related to this so it isn't testable directly but it will be covered when the Download API patch is reviewed and landed. I will block the other bug (#68692) with this one to keep this ongoing "relation". 483182 11 zalan 2011-10-13 07:40:28 -0700 This is inline with N9's browser policy decision. There's no perfect way to handle non-supported subframe content AFAICS. This looks good to me. (as long as there isnt a priority use-case that overrides it) 483346 12 110561 webkit.review.bot 2011-10-13 11:43:08 -0700 Comment on attachment 110561 Patch Clearing flags on attachment: 110561 Committed r97375: <http://trac.webkit.org/changeset/97375> 483347 13 webkit.review.bot 2011-10-13 11:43:13 -0700 All reviewed patches have been landed. Closing bug. 484110 14 jesus 2011-10-14 11:34:45 -0700 This broke QtWebKit2 trunk making it impossible to load pages. While working on it I had my Download patch (https://bugs.webkit.org/show_bug.cgi?id=68962) applied locally and I didn't realize they depended on each other. I don't believe this patch should only work with the download one, so I will investigate and clarify it. Sorry for breaking QtWK2... 484264 15 111069 jesus 2011-10-14 13:59:07 -0700 Created attachment 111069 Patch 484265 16 jesus 2011-10-14 14:00:48 -0700 (In reply to comment #15) > Created an attachment (id=111069) [details] > Patch We were dealing with an empty ResourceResponse so this patch adds the needed serialization code. It was working locally because I had this implemented on another patch... Nothing has changed on the decidePolicyForResponse implementation. 484575 17 111069 kenneth 2011-10-15 06:36:36 -0700 Comment on attachment 111069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111069&action=review > Source/WebKit2/UIProcess/qt/ClientImpl.cpp:274 > + // It makes the browser intentionally behave differently when it comes to text(application)/xml content in subframes vs. mainframe. I think we should not write "browser" :-) maybe client? The W3C specs call it "user agent" 485063 18 jesus 2011-10-17 05:04:42 -0700 (In reply to comment #17) > I think we should not write "browser" :-) maybe client? The W3C specs call it "user agent" Ok, Kenneth, I will fix this and land the patch. Thanks for the review! 485081 19 jesus 2011-10-17 05:41:14 -0700 Committed r97608: <http://trac.webkit.org/changeset/97608> 110519 2011-10-11 09:01:09 -0700 2011-10-11 11:15:46 -0700 Patch bug-69832-20111011130048.patch text/plain 2884 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogOTcxNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0NWE2NjE5MWNmODEzZmYy MzBiYzU2MzA3M2JiZWQzZWQ4NGE1ODVkLi5jNzJiOTBlMWY4OWI4MWUzYjA0ZDgwOTE5MDU0MTg2 NGFkOTAzZmY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTEgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFtRdF1bV0syXSBJbXBsZW1lbnQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgaW4gb3VyIFBv bGljeUNsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Njk4MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZSBpbXBsZW1lbnQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgaW4gb3VyIFBvbGljeUNsaWVu dCBpbiBvcmRlciB0bworICAgICAgICBkZWNpZGUgd2hldGhlciBhIGdpdmVuIFJlc291cmNlUmVz cG9uc2Ugc2hvdWxkIGJlIGRvd25sb2FkZWQgb3IgbG9hZGVkLgorCisgICAgICAgICogVUlQcm9j ZXNzL3F0L0NsaWVudEltcGwuY3BwOgorICAgICAgICAocXRfd2tfZGVjaWRlUG9saWN5Rm9yUmVz cG9uc2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmg6CisgICAgICAgICog VUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5 Ojppbml0KToKKwogMjAxMS0xMC0xMSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Ri b0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBSZW1vdmUgYWxsIHJlZmVyZW5jZXMgdG8gUVRE SVJfYnVpbGQgYW5kIHN0YW5kYWxvbmVfcGFja2FnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L0NsaWVudEltcGwuY3BwCmluZGV4IDM4Y2JhNzE4NjE3ZTY4Mzc5YjBlOGYzOWQxMzcyYzA4 ODY1YmViM2EuLjcyZjMyMTM1YTY4ZTlhYzhmOGI5ODc3NDUxYjI4YjYwZDFhOTVkNmEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5jcHAKQEAgLTI0NywzICsyNDcs MjIgQEAgdm9pZCBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdLUGFnZVJl ZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0YKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQor Cit2b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdLUGFnZVJlZiBwYWdlLCBXS0Zy YW1lUmVmIGZyYW1lLCBXS1VSTFJlc3BvbnNlUmVmIHJlc3BvbnNlLCBXS1VSTFJlcXVlc3RSZWYg cmVxdWVzdCwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBXS1R5cGVSZWYgdXNl ckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgaWYgKFdLUGFnZUdldE1haW5G cmFtZShwYWdlKSAhPSBmcmFtZSkgeworICAgICAgICBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2Uo bGlzdGVuZXIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgU3RyaW5nIHR5cGUgPSB0 b0ltcGwocmVzcG9uc2UpLT5yZXNvdXJjZVJlc3BvbnNlKCkubWltZVR5cGUoKTsKKyAgICB0eXBl Lm1ha2VMb3dlcigpOworCisgICAgaWYgKHRvSW1wbChmcmFtZSktPmNhblNob3dNSU1FVHlwZSh0 eXBlKSkgeworICAgICAgICBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2UobGlzdGVuZXIpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gSWYgd2UgY2FuJ3QgdXNlIChzaG93KSBpdCB0 aGVuIHdlIHNob3VsZCBkb3dubG9hZCBpdC4KKyAgICBXS0ZyYW1lUG9saWN5TGlzdGVuZXJEb3du bG9hZChsaXN0ZW5lcik7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvQ2xpZW50SW1wbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwu aAppbmRleCAzNmYyZTRjYWE0NTQ2MDIxODYwZjIyYjAzZjQ1NjNiMzE1NDgxMDU0Li5iYjMyMDlm ZmFkMTYxNTE0NjA0MWIwZDlhNDliMjBmNzY0Njc2Nzk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9DbGllbnRJbXBsLmgKQEAgLTQ4LDYgKzQ4LDcgQEAgdm9pZCBxdF93a19tb3VzZURp ZE1vdmVPdmVyRWxlbWVudChXS1BhZ2VSZWYsIFdLSGl0VGVzdFJlc3VsdFJlZiwgV0tFdmVudE1v ZGlmaWUKIAogLy8gUG9saWN5IGNsaWVudC4KIHZvaWQgcXRfd2tfZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbkFjdGlvbihXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLRnJhbWVOYXZpZ2F0aW9uVHlw ZSwgV0tFdmVudE1vZGlmaWVycywgV0tFdmVudE1vdXNlQnV0dG9uLCBXS1VSTFJlcXVlc3RSZWYs IFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lk KiBjbGllbnRJbmZvKTsKK3ZvaWQgcXRfd2tfZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV0tQYWdl UmVmLCBXS0ZyYW1lUmVmLCBXS1VSTFJlc3BvbnNlUmVmLCBXS1VSTFJlcXVlc3RSZWYsIFdLRnJh bWVQb2xpY3lMaXN0ZW5lclJlZiwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCiB9Cg== 110544 2011-10-11 11:15:53 -0700 2011-10-11 12:51:03 -0700 Patch bug-69832-20111011151532.patch text/plain 3628 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogOTcxNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0NWE2NjE5MWNmODEzZmYy MzBiYzU2MzA3M2JiZWQzZWQ4NGE1ODVkLi5jNzJiOTBlMWY4OWI4MWUzYjA0ZDgwOTE5MDU0MTg2 NGFkOTAzZmY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTEgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFtRdF1bV0syXSBJbXBsZW1lbnQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgaW4gb3VyIFBv bGljeUNsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Njk4MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZSBpbXBsZW1lbnQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgaW4gb3VyIFBvbGljeUNsaWVu dCBpbiBvcmRlciB0bworICAgICAgICBkZWNpZGUgd2hldGhlciBhIGdpdmVuIFJlc291cmNlUmVz cG9uc2Ugc2hvdWxkIGJlIGRvd25sb2FkZWQgb3IgbG9hZGVkLgorCisgICAgICAgICogVUlQcm9j ZXNzL3F0L0NsaWVudEltcGwuY3BwOgorICAgICAgICAocXRfd2tfZGVjaWRlUG9saWN5Rm9yUmVz cG9uc2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmg6CisgICAgICAgICog VUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5 Ojppbml0KToKKwogMjAxMS0xMC0xMSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Ri b0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBSZW1vdmUgYWxsIHJlZmVyZW5jZXMgdG8gUVRE SVJfYnVpbGQgYW5kIHN0YW5kYWxvbmVfcGFja2FnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L0NsaWVudEltcGwuY3BwCmluZGV4IDM4Y2JhNzE4NjE3ZTY4Mzc5YjBlOGYzOWQxMzcyYzA4 ODY1YmViM2EuLjcyZjMyMTM1YTY4ZTlhYzhmOGI5ODc3NDUxYjI4YjYwZDFhOTVkNmEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5jcHAKQEAgLTI0NywzICsyNDcs MjIgQEAgdm9pZCBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdLUGFnZVJl ZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0YKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQor Cit2b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdLUGFnZVJlZiBwYWdlLCBXS0Zy YW1lUmVmIGZyYW1lLCBXS1VSTFJlc3BvbnNlUmVmIHJlc3BvbnNlLCBXS1VSTFJlcXVlc3RSZWYg cmVxdWVzdCwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBXS1R5cGVSZWYgdXNl ckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgaWYgKFdLUGFnZUdldE1haW5G cmFtZShwYWdlKSAhPSBmcmFtZSkgeworICAgICAgICBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2Uo bGlzdGVuZXIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgU3RyaW5nIHR5cGUgPSB0 b0ltcGwocmVzcG9uc2UpLT5yZXNvdXJjZVJlc3BvbnNlKCkubWltZVR5cGUoKTsKKyAgICB0eXBl Lm1ha2VMb3dlcigpOworCisgICAgaWYgKHRvSW1wbChmcmFtZSktPmNhblNob3dNSU1FVHlwZSh0 eXBlKSkgeworICAgICAgICBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2UobGlzdGVuZXIpOworICAg ICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gSWYgd2UgY2FuJ3QgdXNlIChzaG93KSBpdCB0 aGVuIHdlIHNob3VsZCBkb3dubG9hZCBpdC4KKyAgICBXS0ZyYW1lUG9saWN5TGlzdGVuZXJEb3du bG9hZChsaXN0ZW5lcik7Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvQ2xpZW50SW1wbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwu aAppbmRleCAzNmYyZTRjYWE0NTQ2MDIxODYwZjIyYjAzZjQ1NjNiMzE1NDgxMDU0Li5iYjMyMDlm ZmFkMTYxNTE0NjA0MWIwZDlhNDliMjBmNzY0Njc2Nzk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9DbGllbnRJbXBsLmgKQEAgLTQ4LDYgKzQ4LDcgQEAgdm9pZCBxdF93a19tb3VzZURp ZE1vdmVPdmVyRWxlbWVudChXS1BhZ2VSZWYsIFdLSGl0VGVzdFJlc3VsdFJlZiwgV0tFdmVudE1v ZGlmaWUKIAogLy8gUG9saWN5IGNsaWVudC4KIHZvaWQgcXRfd2tfZGVjaWRlUG9saWN5Rm9yTmF2 aWdhdGlvbkFjdGlvbihXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLRnJhbWVOYXZpZ2F0aW9uVHlw ZSwgV0tFdmVudE1vZGlmaWVycywgV0tFdmVudE1vdXNlQnV0dG9uLCBXS1VSTFJlcXVlc3RSZWYs IFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lk KiBjbGllbnRJbmZvKTsKK3ZvaWQgcXRfd2tfZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV0tQYWdl UmVmLCBXS0ZyYW1lUmVmLCBXS1VSTFJlc3BvbnNlUmVmLCBXS1VSTFJlcXVlc3RSZWYsIFdLRnJh bWVQb2xpY3lMaXN0ZW5lclJlZiwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKTsKIAogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAppbmRleCA3YjQ1MjI0ZTU1MDdkM2U5MDgyZmNi YzllYWNlZjYwYzE1MmMxZWQxLi4yYjVlNjZhMGIzMzY2M2I2OTNhOTgzOGIxY2MxNDUxOThmMmQ3 MDdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJv eHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5j cHAKQEAgLTE1Niw2ICsxNTYsNyBAQCB2b2lkIFF0V2ViUGFnZVByb3h5Ojppbml0KCkKICAgICAg ICAgcG9saWN5Q2xpZW50LnZlcnNpb24gPSBrV0tQYWdlUG9saWN5Q2xpZW50Q3VycmVudFZlcnNp b247CiAgICAgICAgIHBvbGljeUNsaWVudC5jbGllbnRJbmZvID0gbV9wb2xpY3lJbnRlcmZhY2U7 CiAgICAgICAgIHBvbGljeUNsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0g cXRfd2tfZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjsKKyAgICAgICAgcG9saWN5Q2xp ZW50LmRlY2lkZVBvbGljeUZvclJlc3BvbnNlID0gcXRfd2tfZGVjaWRlUG9saWN5Rm9yUmVzcG9u c2U7CiAgICAgICAgIFdLUGFnZVNldFBhZ2VQb2xpY3lDbGllbnQodG9BUEkobV93ZWJQYWdlUHJv eHkuZ2V0KCkpLCAmcG9saWN5Q2xpZW50KTsKICAgICB9CiB9Cg== 110561 2011-10-11 12:51:10 -0700 2011-10-14 13:58:59 -0700 Patch bug-69832-20111011165049.patch text/plain 4145 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogOTcxNDYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA0NWE2NjE5MWNmODEzZmYy MzBiYzU2MzA3M2JiZWQzZWQ4NGE1ODVkLi5jNzJiOTBlMWY4OWI4MWUzYjA0ZDgwOTE5MDU0MTg2 NGFkOTAzZmY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMTAtMTEgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFtRdF1bV0syXSBJbXBsZW1lbnQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgaW4gb3VyIFBv bGljeUNsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Njk4MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZSBpbXBsZW1lbnQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgaW4gb3VyIFBvbGljeUNsaWVu dCBpbiBvcmRlciB0bworICAgICAgICBkZWNpZGUgd2hldGhlciBhIGdpdmVuIFJlc291cmNlUmVz cG9uc2Ugc2hvdWxkIGJlIGRvd25sb2FkZWQgb3IgbG9hZGVkLgorCisgICAgICAgICogVUlQcm9j ZXNzL3F0L0NsaWVudEltcGwuY3BwOgorICAgICAgICAocXRfd2tfZGVjaWRlUG9saWN5Rm9yUmVz cG9uc2UpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmg6CisgICAgICAgICog VUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5 Ojppbml0KToKKwogMjAxMS0xMC0xMSAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Ri b0Bub2tpYS5jb20+CiAKICAgICAgICAgW1F0XSBSZW1vdmUgYWxsIHJlZmVyZW5jZXMgdG8gUVRE SVJfYnVpbGQgYW5kIHN0YW5kYWxvbmVfcGFja2FnZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L0NsaWVudEltcGwuY3BwCmluZGV4IDM4Y2JhNzE4NjE3ZTY4Mzc5YjBlOGYzOWQxMzcyYzA4 ODY1YmViM2EuLjhmZjhlZDgyNTM3NjljYTM2NWJjOTc4MGE2MjUwZTExYTE5NjUxMDcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5jcHAKQEAgLTI0NywzICsyNDcs MzAgQEAgdm9pZCBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdLUGFnZVJl ZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0YKICAgICAgICAgYnJlYWs7CiAgICAgfQogfQor Cit2b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdLUGFnZVJlZiBwYWdlLCBXS0Zy YW1lUmVmIGZyYW1lLCBXS1VSTFJlc3BvbnNlUmVmIHJlc3BvbnNlLCBXS1VSTFJlcXVlc3RSZWYg cmVxdWVzdCwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBXS1R5cGVSZWYgdXNl ckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCit7CisgICAgU3RyaW5nIHR5cGUgPSB0b0lt cGwocmVzcG9uc2UpLT5yZXNvdXJjZVJlc3BvbnNlKCkubWltZVR5cGUoKTsKKyAgICB0eXBlLm1h a2VMb3dlcigpOworICAgIGJvb2wgY2FuU2hvd01JTUVUeXBlID0gdG9JbXBsKGZyYW1lKS0+Y2Fu U2hvd01JTUVUeXBlKHR5cGUpOworCisgICAgaWYgKFdLUGFnZUdldE1haW5GcmFtZShwYWdlKSA9 PSBmcmFtZSkgeworICAgICAgICBpZiAoY2FuU2hvd01JTUVUeXBlKSB7CisgICAgICAgICAgICBX S0ZyYW1lUG9saWN5TGlzdGVuZXJVc2UobGlzdGVuZXIpOworICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CisKKyAgICAgICAgLy8gSWYgd2UgY2FuJ3QgdXNlIChzaG93KSBpdCB0aGVuIHdl IHNob3VsZCBkb3dubG9hZCBpdC4KKyAgICAgICAgV0tGcmFtZVBvbGljeUxpc3RlbmVyRG93bmxv YWQobGlzdGVuZXIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgLy8gV2Ugc2hvdWxk IGlnbm9yZSBkb3dubG9hZGFibGUgdG9wLWxldmVsIGNvbnRlbnQgZm9yIHN1YmZyYW1lcywgd2l0 aCBhbiBleGNlcHRpb24gZm9yIHRleHQveG1sIGFuZCBhcHBsaWNhdGlvbi94bWwgc28gd2UgY2Fu IHN0aWxsIHN1cHBvcnQgQWNpZDMgdGVzdC4KKyAgICAvLyBJdCBtYWtlcyB0aGUgYnJvd3NlciBp bnRlbnRpb25hbGx5IGJlaGF2ZSBkaWZmZXJlbnRseSB3aGVuIGl0IGNvbWVzIHRvIHRleHQoYXBw bGljYXRpb24pL3htbCBjb250ZW50IGluIHN1YmZyYW1lcyB2cy4gbWFpbmZyYW1lLgorICAgIGlm ICghY2FuU2hvd01JTUVUeXBlICYmICEodHlwZSA9PSAidGV4dC94bWwiIHx8IHR5cGUgPT0gImFw cGxpY2F0aW9uL3htbCIpKSB7CisgICAgICAgIFdLRnJhbWVQb2xpY3lMaXN0ZW5lcklnbm9yZShs aXN0ZW5lcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBXS0ZyYW1lUG9saWN5TGlz dGVuZXJVc2UobGlzdGVuZXIpOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L0NsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJ bXBsLmgKaW5kZXggMzZmMmU0Y2FhNDU0NjAyMTg2MGYyMmIwM2Y0NTYzYjMxNTQ4MTA1NC4uYmIz MjA5ZmZhZDE2MTUxNDYwNDFiMGQ5YTQ5YjIwZjc2NDY3Njc5OCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5oCkBAIC00OCw2ICs0OCw3IEBAIHZvaWQgcXRfd2tfbW91 c2VEaWRNb3ZlT3ZlckVsZW1lbnQoV0tQYWdlUmVmLCBXS0hpdFRlc3RSZXN1bHRSZWYsIFdLRXZl bnRNb2RpZmllCiAKIC8vIFBvbGljeSBjbGllbnQuCiB2b2lkIHF0X3drX2RlY2lkZVBvbGljeUZv ck5hdmlnYXRpb25BY3Rpb24oV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS0ZyYW1lTmF2aWdhdGlv blR5cGUsIFdLRXZlbnRNb2RpZmllcnMsIFdLRXZlbnRNb3VzZUJ1dHRvbiwgV0tVUkxSZXF1ZXN0 UmVmLCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qg dm9pZCogY2xpZW50SW5mbyk7Cit2b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdL UGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tVUkxSZXNwb25zZVJlZiwgV0tVUkxSZXF1ZXN0UmVmLCBX S0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCog Y2xpZW50SW5mbyk7CiAKICNpZmRlZiBfX2NwbHVzcGx1cwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAKaW5kZXggN2I0NTIyNGU1NTA3ZDNlOTA4 MmZjYmM5ZWFjZWY2MGMxNTJjMWVkMS4uMmI1ZTY2YTBiMzM2NjNiNjkzYTk4MzhiMWNjMTQ1MTk4 ZjJkNzA3YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFn ZVByb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJv eHkuY3BwCkBAIC0xNTYsNiArMTU2LDcgQEAgdm9pZCBRdFdlYlBhZ2VQcm94eTo6aW5pdCgpCiAg ICAgICAgIHBvbGljeUNsaWVudC52ZXJzaW9uID0ga1dLUGFnZVBvbGljeUNsaWVudEN1cnJlbnRW ZXJzaW9uOwogICAgICAgICBwb2xpY3lDbGllbnQuY2xpZW50SW5mbyA9IG1fcG9saWN5SW50ZXJm YWNlOwogICAgICAgICBwb2xpY3lDbGllbnQuZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlv biA9IHF0X3drX2RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb247CisgICAgICAgIHBvbGlj eUNsaWVudC5kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSA9IHF0X3drX2RlY2lkZVBvbGljeUZvclJl c3BvbnNlOwogICAgICAgICBXS1BhZ2VTZXRQYWdlUG9saWN5Q2xpZW50KHRvQVBJKG1fd2ViUGFn ZVByb3h5LmdldCgpKSwgJnBvbGljeUNsaWVudCk7CiAgICAgfQogfQo= 111069 2011-10-14 13:59:07 -0700 2011-10-15 06:36:36 -0700 Patch bug-69832-20111014175848.patch text/plain 6192 jesus U3VidmVyc2lvbiBSZXZpc2lvbjogOTc1MDAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBiMmI2NGZhOTVhNjY5N2Fi NzI4YzMzYmMxMjJhYTk2ZGI3ODA3N2Q3Li5lY2E3ZjhlMWE3ZjZmNjY3ZjQxMDI3ZjAxYjhhM2Y4 ZDIxZGVhZWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMTAtMTQgIEplc3Vz IFNhbmNoZXotUGFsZW5jaWEgIDxqZXN1cy5wYWxlbmNpYUBvcGVuYm9zc2Eub3JnPgorCisgICAg ICAgIFtRdF1bV0syXSBJbXBsZW1lbnQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgaW4gb3VyIFBv bGljeUNsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Njk4MzIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZSBpbXBsZW1lbnQgZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgaW4gb3VyIFBvbGljeUNsaWVu dCBpbiBvcmRlciB0bworICAgICAgICBkZWNpZGUgd2hldGhlciBhIGdpdmVuIFJlc291cmNlUmVz cG9uc2Ugc2hvdWxkIGJlIGRvd25sb2FkZWQgb3IgbG9hZGVkLgorCisgICAgICAgICogU2hhcmVk L3F0L1dlYkNvcmVBcmd1bWVudENvZGVyc1F0LmNwcDoKKyAgICAgICAgKENvcmVJUEM6Ojo6ZW5j b2RlKToKKyAgICAgICAgKENvcmVJUEM6Ojo6ZGVjb2RlKToKKyAgICAgICAgSW1wbGVtZW50IHNl cmlhbGl6YXRpb24gb2YgUmVzb3VyY2VSZXNwb25zZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9x dC9DbGllbnRJbXBsLmNwcDoKKyAgICAgICAgKHF0X3drX2RlY2lkZVBvbGljeUZvclJlc3BvbnNl KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6aW5p dCk6CisKIDIwMTEtMTAtMTQgIE5heWFuIEt1bWFyIEsgIDxuYXlhbmtrQG1vdG9yb2xhLmNvbT4K IAogICAgICAgICBbV2ViS2l0Ml1bZ3RrXSBTa2lwIFRlc3RXZWJLaXRTZXR0aW5ncyB0ZXN0Lgpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL3F0L1dlYkNvcmVBcmd1bWVudENvZGVy c1F0LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9xdC9XZWJDb3JlQXJndW1lbnRDb2RlcnNR dC5jcHAKaW5kZXggMjNmOTllOWY1YWI0ZGE3YzMyZWZiMjk0MWJkYjE2MWJhYjc1OTU2NS4uMWZj MTVjNTk2ZjZmY2Y3ZDlmOGQzM2ZkZWViMzNjMWVlZTI4NmE3YiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvU2hhcmVkL3F0L1dlYkNvcmVBcmd1bWVudENvZGVyc1F0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvcXQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzUXQuY3BwCkBAIC0yNiw3 ICsyNiw2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiV2ViQ29yZUFyZ3VtZW50 Q29kZXJzLmgiCiAKLSNpbmNsdWRlIDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW5jbHVk ZSA8V2ViQ29yZS9SZXNvdXJjZUVycm9yLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9SZXNvdXJjZVJl cXVlc3QuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1Jlc291cmNlUmVzcG9uc2UuaD4KQEAgLTU4LDE1 ICs1NywzNyBAQCBib29sIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VSZXF1ZXN0Pjo6ZGVjb2RlKEFy Z3VtZW50RGVjb2RlciogZGVjb2RlciwgUmVzb3VyY2VSZQogCiB2b2lkIEFyZ3VtZW50Q29kZXI8 UmVzb3VyY2VSZXNwb25zZT46OmVuY29kZShBcmd1bWVudEVuY29kZXIqIGVuY29kZXIsIGNvbnN0 IFJlc291cmNlUmVzcG9uc2UmIHJlc291cmNlUmVzcG9uc2UpCiB7Ci0gICAgbm90SW1wbGVtZW50 ZWQoKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUocmVzb3VyY2VSZXNwb25zZS51cmwoKS5zdHJpbmco KSk7CisgICAgZW5jb2Rlci0+ZW5jb2RlKHJlc291cmNlUmVzcG9uc2UubWltZVR5cGUoKSk7Cisg ICAgZW5jb2Rlci0+ZW5jb2RlKHN0YXRpY19jYXN0PGludDY0X3Q+KHJlc291cmNlUmVzcG9uc2Uu ZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCkpKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUocmVzb3VyY2VS ZXNwb25zZS50ZXh0RW5jb2RpbmdOYW1lKCkpOwogfQogCiBib29sIEFyZ3VtZW50Q29kZXI8UmVz b3VyY2VSZXNwb25zZT46OmRlY29kZShBcmd1bWVudERlY29kZXIqIGRlY29kZXIsIFJlc291cmNl UmVzcG9uc2UmIHJlc291cmNlUmVzcG9uc2UpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAg ICBSZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlOwogCi0gICAgLy8gRklYTUU6IERpdHRvLgotICAg IHJlc291cmNlUmVzcG9uc2UgPSBSZXNvdXJjZVJlc3BvbnNlKCk7CisgICAgU3RyaW5nIHVybDsK KyAgICBpZiAoIWRlY29kZXItPmRlY29kZSh1cmwpKQorICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgcmVzcG9uc2Uuc2V0VVJMKEtVUkwoV2ViQ29yZTo6UGFyc2VkVVJMU3RyaW5nLCB1cmwpKTsK KworICAgIFN0cmluZyBtaW1lVHlwZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZShtaW1lVHlw ZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXNwb25zZS5zZXRNaW1lVHlwZShtaW1l VHlwZSk7CisKKyAgICBpbnQ2NF90IGNvbnRlbnRMZW5ndGg7CisgICAgaWYgKCFkZWNvZGVyLT5k ZWNvZGUoY29udGVudExlbmd0aCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICByZXNwb25z ZS5zZXRFeHBlY3RlZENvbnRlbnRMZW5ndGgoY29udGVudExlbmd0aCk7CisKKyAgICBTdHJpbmcg dGV4dEVuY29kaW5nTmFtZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZSh0ZXh0RW5jb2RpbmdO YW1lKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIHJlc3BvbnNlLnNldFRleHRFbmNvZGlu Z05hbWUodGV4dEVuY29kaW5nTmFtZSk7CisKKyAgICByZXNvdXJjZVJlc3BvbnNlID0gcmVzcG9u c2U7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9DbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9D bGllbnRJbXBsLmNwcAppbmRleCAzNDFlZDA3NDY1OTVlOTNkYmY0ZDY0YzBiNTFhODQ0MWMwM2Yz YmRjLi5jMDAzZGZjZDE2OWViMWIxYWEzMGQwYzNhNTRlNDI2NGI4YTNjMGRhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwuY3BwCkBAIC0yNTIsMyArMjUyLDMwIEBA IHZvaWQgcXRfd2tfZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbihXS1BhZ2VSZWYgcGFn ZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tGCiAgICAgICAgIGJyZWFrOwogICAgIH0KIH0KKwordm9p ZCBxdF93a19kZWNpZGVQb2xpY3lGb3JSZXNwb25zZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJl ZiBmcmFtZSwgV0tVUkxSZXNwb25zZVJlZiByZXNwb25zZSwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVl c3QsIFdLRnJhbWVQb2xpY3lMaXN0ZW5lclJlZiBsaXN0ZW5lciwgV0tUeXBlUmVmIHVzZXJEYXRh LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQoreworICAgIFN0cmluZyB0eXBlID0gdG9JbXBsKHJl c3BvbnNlKS0+cmVzb3VyY2VSZXNwb25zZSgpLm1pbWVUeXBlKCk7CisgICAgdHlwZS5tYWtlTG93 ZXIoKTsKKyAgICBib29sIGNhblNob3dNSU1FVHlwZSA9IHRvSW1wbChmcmFtZSktPmNhblNob3dN SU1FVHlwZSh0eXBlKTsKKworICAgIGlmIChXS1BhZ2VHZXRNYWluRnJhbWUocGFnZSkgPT0gZnJh bWUpIHsKKyAgICAgICAgaWYgKGNhblNob3dNSU1FVHlwZSkgeworICAgICAgICAgICAgV0tGcmFt ZVBvbGljeUxpc3RlbmVyVXNlKGxpc3RlbmVyKTsKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAg ICAgfQorCisgICAgICAgIC8vIElmIHdlIGNhbid0IHVzZSAoc2hvdykgaXQgdGhlbiB3ZSBzaG91 bGQgZG93bmxvYWQgaXQuCisgICAgICAgIFdLRnJhbWVQb2xpY3lMaXN0ZW5lckRvd25sb2FkKGxp c3RlbmVyKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIC8vIFdlIHNob3VsZCBpZ25v cmUgZG93bmxvYWRhYmxlIHRvcC1sZXZlbCBjb250ZW50IGZvciBzdWJmcmFtZXMsIHdpdGggYW4g ZXhjZXB0aW9uIGZvciB0ZXh0L3htbCBhbmQgYXBwbGljYXRpb24veG1sIHNvIHdlIGNhbiBzdGls bCBzdXBwb3J0IEFjaWQzIHRlc3QuCisgICAgLy8gSXQgbWFrZXMgdGhlIGJyb3dzZXIgaW50ZW50 aW9uYWxseSBiZWhhdmUgZGlmZmVyZW50bHkgd2hlbiBpdCBjb21lcyB0byB0ZXh0KGFwcGxpY2F0 aW9uKS94bWwgY29udGVudCBpbiBzdWJmcmFtZXMgdnMuIG1haW5mcmFtZS4KKyAgICBpZiAoIWNh blNob3dNSU1FVHlwZSAmJiAhKHR5cGUgPT0gInRleHQveG1sIiB8fCB0eXBlID09ICJhcHBsaWNh dGlvbi94bWwiKSkgeworICAgICAgICBXS0ZyYW1lUG9saWN5TGlzdGVuZXJJZ25vcmUobGlzdGVu ZXIpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgV0tGcmFtZVBvbGljeUxpc3RlbmVy VXNlKGxpc3RlbmVyKTsKK30KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9DbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5o CmluZGV4IDM2ZjJlNGNhYTQ1NDYwMjE4NjBmMjJiMDNmNDU2M2IzMTU0ODEwNTQuLmJiMzIwOWZm YWQxNjE1MTQ2MDQxYjBkOWE0OWIyMGY3NjQ2NzY3OTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L0NsaWVudEltcGwuaApAQCAtNDgsNiArNDgsNyBAQCB2b2lkIHF0X3drX21vdXNlRGlk TW92ZU92ZXJFbGVtZW50KFdLUGFnZVJlZiwgV0tIaXRUZXN0UmVzdWx0UmVmLCBXS0V2ZW50TW9k aWZpZQogCiAvLyBQb2xpY3kgY2xpZW50Lgogdm9pZCBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZp Z2F0aW9uQWN0aW9uKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tGcmFtZU5hdmlnYXRpb25UeXBl LCBXS0V2ZW50TW9kaWZpZXJzLCBXS0V2ZW50TW91c2VCdXR0b24sIFdLVVJMUmVxdWVzdFJlZiwg V0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQq IGNsaWVudEluZm8pOwordm9pZCBxdF93a19kZWNpZGVQb2xpY3lGb3JSZXNwb25zZShXS1BhZ2VS ZWYsIFdLRnJhbWVSZWYsIFdLVVJMUmVzcG9uc2VSZWYsIFdLVVJMUmVxdWVzdFJlZiwgV0tGcmFt ZVBvbGljeUxpc3RlbmVyUmVmLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pOwogCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCmluZGV4IDdiNDUyMjRlNTUwN2QzZTkwODJmY2Jj OWVhY2VmNjBjMTUyYzFlZDEuLjJiNWU2NmEwYjMzNjYzYjY5M2E5ODM4YjFjYzE0NTE5OGYyZDcw N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94 eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNw cApAQCAtMTU2LDYgKzE1Niw3IEBAIHZvaWQgUXRXZWJQYWdlUHJveHk6OmluaXQoKQogICAgICAg ICBwb2xpY3lDbGllbnQudmVyc2lvbiA9IGtXS1BhZ2VQb2xpY3lDbGllbnRDdXJyZW50VmVyc2lv bjsKICAgICAgICAgcG9saWN5Q2xpZW50LmNsaWVudEluZm8gPSBtX3BvbGljeUludGVyZmFjZTsK ICAgICAgICAgcG9saWN5Q2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gPSBx dF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOworICAgICAgICBwb2xpY3lDbGll bnQuZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UgPSBxdF93a19kZWNpZGVQb2xpY3lGb3JSZXNwb25z ZTsKICAgICAgICAgV0tQYWdlU2V0UGFnZVBvbGljeUNsaWVudCh0b0FQSShtX3dlYlBhZ2VQcm94 eS5nZXQoKSksICZwb2xpY3lDbGllbnQpOwogICAgIH0KIH0K