158967 2016-06-20 18:27:18 -0700 Upstream WKHTTPCookiesForURL from WebKitSystemInterface to OpenSource 2016-06-21 10:20:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aalavi aalavi aestes bfulgham commit-queue oldest_to_newest 1203971 0 aalavi 2016-06-20 18:27:18 -0700 Upstream WKHTTPCookiesForURL from WebKitSystemInterface to OpenSource 1203973 1 281691 aalavi 2016-06-20 18:40:14 -0700 Created attachment 281691 Patch 1203974 2 281691 aestes 2016-06-20 18:47:59 -0700 Comment on attachment 281691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281691&action=review r=me with a few comments. > Source/WebCore/platform/network/mac/CookieJarMac.mm:60 > + CFArrayRef cookies = _CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(cookieStorage, static_cast<CFURLRef>(url), static_cast<CFURLRef>(firstParty), secure); > + > + NSArray *nsCookies = [NSHTTPCookie _cf2nsCookies:cookies]; > + CFRelease(cookies); While we're here, let's change this to use a RetainPtr: auto cookies = adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(cookieStorage, static_cast<CFURLRef>(url), static_cast<CFURLRef>(firstParty), secure)); NSArray *nsCookies = [NSHTTPCookie _cf2nsCookies:cookies.get()]; Then get rid of the call to CFRelease(). > Source/WebCore/platform/network/mac/CookieJarMac.mm:253 > - NSArray *cookies = wkHTTPCookiesForURL(cookieStorage.get(), 0, url); > + NSArray *cookies = httpCookiesForURL(cookieStorage.get(), 0, url); Also while we're here, we should pass nil as the second argument to httpCookiesForURL() instead of 0. > Source/WebCore/platform/spi/cf/CFNetworkSPI.h:224 > ++ (NSArray*)_cf2nsCookies:(CFArrayRef)cfCookies; There should be a space between the NSArray and the *. 1204004 3 aestes 2016-06-20 20:02:37 -0700 rdar://problem/26630073 1204071 4 ap 2016-06-20 23:59:06 -0700 *** Bug 158966 has been marked as a duplicate of this bug. *** 1204074 5 ap 2016-06-20 23:59:09 -0700 *** Bug 158964 has been marked as a duplicate of this bug. *** 1204076 6 ap 2016-06-20 23:59:12 -0700 *** Bug 158965 has been marked as a duplicate of this bug. *** 1204077 7 281691 ap 2016-06-21 00:03:06 -0700 Comment on attachment 281691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281691&action=review > Source/WebCore/platform/network/mac/CookieJarMac.mm:51 > + // FIXME: The fallback to NSHTTPCookieStorage should not be present when USE(CFNETWORK) is defined in WebKit. Now that this code is in WebKit, " in WebKit" should be removed. 1204174 8 281691 bfulgham 2016-06-21 09:42:35 -0700 Comment on attachment 281691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281691&action=review >> Source/WebCore/platform/network/mac/CookieJarMac.mm:51 >> + // FIXME: The fallback to NSHTTPCookieStorage should not be present when USE(CFNETWORK) is defined in WebKit. > > Now that this code is in WebKit, " in WebKit" should be removed. Fixed while landing. >> Source/WebCore/platform/network/mac/CookieJarMac.mm:60 >> + CFRelease(cookies); > > While we're here, let's change this to use a RetainPtr: > > auto cookies = adoptCF(_CFHTTPCookieStorageCopyCookiesForURLWithMainDocumentURL(cookieStorage, static_cast<CFURLRef>(url), static_cast<CFURLRef>(firstParty), secure)); > NSArray *nsCookies = [NSHTTPCookie _cf2nsCookies:cookies.get()]; > > Then get rid of the call to CFRelease(). Fixed while landing. >> Source/WebCore/platform/network/mac/CookieJarMac.mm:253 >> + NSArray *cookies = httpCookiesForURL(cookieStorage.get(), 0, url); > > Also while we're here, we should pass nil as the second argument to httpCookiesForURL() instead of 0. Fixed while landing. 1204175 9 281691 bfulgham 2016-06-21 09:43:27 -0700 Comment on attachment 281691 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=281691&action=review > Source/WebCore/ChangeLog:6 > + Reviewed by NOBODY (OOPS!). What tests did we run that confirm that this change didn't break anything? Obviously it shouldn't since we are just moving code around -- but what cookie tests actually exercise this code? 1204180 10 281755 aalavi 2016-06-21 09:49:40 -0700 Created attachment 281755 Patch 1204181 11 bfulgham 2016-06-21 09:51:11 -0700 (In reply to comment #9) > Comment on attachment 281691 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=281691&action=review > > > Source/WebCore/ChangeLog:6 > > + Reviewed by NOBODY (OOPS!). > > What tests did we run that confirm that this change didn't break anything? > Obviously it shouldn't since we are just moving code around -- but what > cookie tests actually exercise this code? EWS shows all tests continue to pass, but it would be nice to mention one or two tests that are known to exercise the 'filterCookies' and 'deleteCookies' methods. 1204182 12 281755 bfulgham 2016-06-21 09:51:47 -0700 Comment on attachment 281755 Patch r=me 1204186 13 281755 commit-queue 2016-06-21 10:20:18 -0700 Comment on attachment 281755 Patch Clearing flags on attachment: 281755 Committed r202279: <http://trac.webkit.org/changeset/202279> 1204187 14 commit-queue 2016-06-21 10:20:22 -0700 All reviewed patches have been landed. Closing bug. 281691 2016-06-20 18:40:14 -0700 2016-06-21 09:49:38 -0700 Patch bug-158967-20160620184007.patch text/plain 10478 aalavi U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2MwN2YxYjY1NWM1MWFh M2ZhNzg5ODkzNzA0MTVlY2FlNDg3ZDM3Mi4uYWI1NjQ1MGRjYTgwMGU2NjhmMDk4YWQzZGJlYmMy ZjQ2NWI1ZDE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA2LTIwICBBbWly IEFsYXZpICA8YWFsYXZpQGFwcGxlLmNvbT4KKworICAgICAgICBVcHN0cmVhbSBXS0hUVFBDb29r aWVzRm9yVVJMIGZyb20gV2ViS2l0U3lzdGVtSW50ZXJmYWNlIHRvIE9wZW5Tb3VyY2UKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODk2NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vaW9z L1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2VJT1MubW06CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dl YkNvcmVTeXN0ZW1JbnRlcmZhY2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViQ29yZVN5 c3RlbUludGVyZmFjZS5tbToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL21hYy9Db29raWVK YXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpodHRwQ29va2llc0ZvclVSTCk6IFVwc3RyZWFt ZWQgZnJvbSBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuCisgICAgICAgIChXZWJDb3JlOjpjb29raWVz Rm9yVVJMKTogQ2hhbmdlZCB0byBjYWxsIGh0dHBDb29raWVzRm9yVVJMLgorICAgICAgICAoV2Vi Q29yZTo6ZGVsZXRlQ29va2llKTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vc3BpL2NmL0NG TmV0d29ya1NQSS5oOgorCiAyMDE2LTA2LTAxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IG51bGwgZGVyZWZlcmVuY2luZyBpbiBSZXNv dXJjZVRpbWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRpbWluZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmlu ZGV4IDlkMWYxN2RiMDI4ZmEyODU3MWFlN2UwOWZlYTVmNjQ0NTE1MDdkZjYuLmMyZWQ3OWEwMDA1 NmMyNjAwZWYwYWIwZjMzZGE1ZGFjZDk5NWI2ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAxNi0wNi0yMCAgQW1pciBBbGF2aSAgPGFhbGF2aUBhcHBsZS5jb20+CisKKyAg ICAgICAgVXBzdHJlYW0gV0tIVFRQQ29va2llc0ZvclVSTCBmcm9tIFdlYktpdFN5c3RlbUludGVy ZmFjZSB0byBPcGVuU291cmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTg5NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbToKKyAgICAg ICAgKEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKTogRGVsZXRlZC4KKwogMjAxNi0wNS0zMSAg WXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsIG91dCByMjAxNDgxLCByMjAxNTIzOiAwLjMlIHJlZ3Jlc3Npb24gaW4gT2N0YW5l IGNvZGUtbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGI4ZjZkNGVmY2U5MTI1MWVlYTdlMWIwZGMyZjE4NTY2 YzJiYzZjZDkuLmMwNzdiOTBlNjYyZjhmZjRjNTc4YzY1OTNlMzQ2YjUyMDM0YTE1NWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNi0wNi0yMCAgQW1pciBBbGF2aSAgPGFhbGF2aUBh cHBsZS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gV0tIVFRQQ29va2llc0ZvclVSTCBmcm9tIFdl YktpdFN5c3RlbUludGVyZmFjZSB0byBPcGVuU291cmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg5NjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFj L1dlYlN5c3RlbUludGVyZmFjZS5tbToKKyAgICAgICAgKEluaXRXZWJDb3JlU3lzdGVtSW50ZXJm YWNlKTogRGVsZXRlZC4KKwogMjAxNi0wNS0zMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVh QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsIG91dCByMjAxNDgxLCByMjAx NTIzOiAwLjMlIHJlZ3Jlc3Npb24gaW4gT2N0YW5lIGNvZGUtbG9hZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2VJT1MubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQpp bmRleCAzNWM3NGY1Nzc0ZTc3MWI2NTA1MTI3NDRmNDdmMDhlZjJhZDBhNDAyLi42NDU1ODE5N2Rh OTUxZThmYmM2MDVmYTBmNWIwNmZiZTM2ZTA2YTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQpAQCAtNDMs NyArNDMsNiBAQCBXRUJDT1JFX0VYUE9SVCBDRlVSTFN0b3JhZ2VTZXNzaW9uUmVmICgqd2tDcmVh dGVQcml2YXRlU3RvcmFnZVNlc3Npb24pKENGU3RyaW5nUgogV0VCQ09SRV9FWFBPUlQgTlNVUkxS ZXF1ZXN0KiAoKndrQ29weVJlcXVlc3RXaXRoU3RvcmFnZVNlc3Npb24pKENGVVJMU3RvcmFnZVNl c3Npb25SZWYsIE5TVVJMUmVxdWVzdCopOwogV0VCQ09SRV9FWFBPUlQgdW5zaWduZWQgKCp3a0dl dEhUVFBDb29raWVBY2NlcHRQb2xpY3kpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYpOwogV0VCQ09S RV9FWFBPUlQgTlNBcnJheSAqKCp3a0hUVFBDb29raWVzKShDRkhUVFBDb29raWVTdG9yYWdlUmVm KTsKLVdFQkNPUkVfRVhQT1JUIE5TQXJyYXkgKigqd2tIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQ Q29va2llU3RvcmFnZVJlZiwgTlNVUkwgKiwgTlNVUkwgKik7CiBXRUJDT1JFX0VYUE9SVCB2b2lk ICgqd2tTZXRIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiwgTlNBcnJh eSAqLCBOU1VSTCAqLCBOU1VSTCAqKTsKIFdFQkNPUkVfRVhQT1JUIHZvaWQgKCp3a0RlbGV0ZUFs bEhUVFBDb29raWVzKShDRkhUVFBDb29raWVTdG9yYWdlUmVmKTsKIFdFQkNPUkVfRVhQT1JUIHZv aWQgKCp3a0RlbGV0ZUhUVFBDb29raWUpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYsIE5TSFRUUENv b2tpZSAqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3Jl U3lzdGVtSW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5 c3RlbUludGVyZmFjZS5oCmluZGV4IGE5ZmFjYjRmMmE5MzY1YjllZDBmZWQ1ZTk2YTE5Yzk3MGE1 YThkYTYuLmY0Y2MyNzBlNDUwYjFlNDIyYzljNWFiN2I5NTc3YmFkNmVmOWNiMGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2Uu aApAQCAtMjIyLDcgKzIyMiw2IEBAIGV4dGVybiBOU1VSTFJlcXVlc3QqICgqd2tDb3B5UmVxdWVz dFdpdGhTdG9yYWdlU2Vzc2lvbikoQ0ZVUkxTdG9yYWdlU2Vzc2lvblJlZiwKIHR5cGVkZWYgc3Ry dWN0IE9wYXF1ZUNGSFRUUENvb2tpZVN0b3JhZ2UqIENGSFRUUENvb2tpZVN0b3JhZ2VSZWY7CiBl eHRlcm4gdW5zaWduZWQgKCp3a0dldEhUVFBDb29raWVBY2NlcHRQb2xpY3kpKENGSFRUUENvb2tp ZVN0b3JhZ2VSZWYpOwogZXh0ZXJuIE5TQXJyYXkgKigqd2tIVFRQQ29va2llcykoQ0ZIVFRQQ29v a2llU3RvcmFnZVJlZik7Ci1leHRlcm4gTlNBcnJheSAqKCp3a0hUVFBDb29raWVzRm9yVVJMKShD RkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU1VSTCAqLCBOU1VSTCAqKTsKIGV4dGVybiB2b2lkICgq d2tTZXRIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiwgTlNBcnJheSAq LCBOU1VSTCAqLCBOU1VSTCAqKTsKIGV4dGVybiB2b2lkICgqd2tEZWxldGVIVFRQQ29va2llKShD RkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU0hUVFBDb29raWUgKik7CiBleHRlcm4gdm9pZCAoKndr RGVsZXRlQWxsSFRUUENvb2tpZXMpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQpp bmRleCBjMzljYzllMjg1MmJlNTlmZTI4NzgzYWY2NjIzYmQ3MTgwMzRmNTcxLi5jYjU1MjU2NzI3 N2EzNDg0Mzc4MTI5MTk0MzRmMWU1YzU3NGYzY2U2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQpAQCAtOTksNyArOTks NiBAQCBDRlVSTFN0b3JhZ2VTZXNzaW9uUmVmICgqd2tDcmVhdGVQcml2YXRlU3RvcmFnZVNlc3Np b24pKENGU3RyaW5nUmVmKTsKIE5TVVJMUmVxdWVzdCogKCp3a0NvcHlSZXF1ZXN0V2l0aFN0b3Jh Z2VTZXNzaW9uKShDRlVSTFN0b3JhZ2VTZXNzaW9uUmVmLCBOU1VSTFJlcXVlc3QqKTsKIHVuc2ln bmVkICgqd2tHZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KShDRkhUVFBDb29raWVTdG9yYWdlUmVm KTsKIE5TQXJyYXkgKigqd2tIVFRQQ29va2llcykoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7Ci1O U0FycmF5ICooKndrSFRUUENvb2tpZXNGb3JVUkwpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYsIE5T VVJMICosIE5TVVJMICopOwogdm9pZCAoKndrU2V0SFRUUENvb2tpZXNGb3JVUkwpKENGSFRUUENv b2tpZVN0b3JhZ2VSZWYsIE5TQXJyYXkgKiwgTlNVUkwgKiwgTlNVUkwgKik7CiB2b2lkICgqd2tE ZWxldGVBbGxIVFRQQ29va2llcykoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7CiB2b2lkICgqd2tE ZWxldGVIVFRQQ29va2llKShDRkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU0hUVFBDb29raWUgKik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9Db29raWVK YXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9Db29raWVKYXJN YWMubW0KaW5kZXggNWVjOTk4MDkzYjM3MWZiMDNmNTAwMGUxODc2NTc1YTg5N2JkZWM2ZC4uMTVl NDIwNGNhYjVmN2YwMWJhNjFjMmQ3OGYwNzEwMzRmZjU3OGVjMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0Nvb2tpZUphck1hYy5tbQpAQCAtNDUsNiAr NDUsMjQgQEAgc3RhdGljIE5TSFRUUENvb2tpZVN0b3JhZ2UgKmNvb2tpZVN0b3JhZ2UoY29uc3Qg TmV0d29ya1N0b3JhZ2VTZXNzaW9uJik7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGlj IE5TQXJyYXkgKmh0dHBDb29raWVzRm9yVVJMKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYgY29va2ll U3RvcmFnZSwgTlNVUkwgKmZpcnN0UGFydHksIE5TVVJMICp1cmwpCit7CisgICAgaWYgKCFjb29r aWVTdG9yYWdlKSB7CisgICAgICAgIC8vIEZJWE1FOiBUaGUgZmFsbGJhY2sgdG8gTlNIVFRQQ29v a2llU3RvcmFnZSBzaG91bGQgbm90IGJlIHByZXNlbnQgd2hlbiBVU0UoQ0ZORVRXT1JLKSBpcyBk ZWZpbmVkIGluIFdlYktpdC4KKyAgICAgICAgcmV0dXJuIFtbTlNIVFRQQ29va2llU3RvcmFnZSBz aGFyZWRIVFRQQ29va2llU3RvcmFnZV0gY29va2llc0ZvclVSTDp1cmxdOworICAgIH0KKworICAg IGJvb2wgc2VjdXJlID0gIVtbdXJsIHNjaGVtZV0gY2FzZUluc2Vuc2l0aXZlQ29tcGFyZTpAImh0 dHBzIl07CisgICAgCisgICAgQ0ZBcnJheVJlZiBjb29raWVzID0gX0NGSFRUUENvb2tpZVN0b3Jh Z2VDb3B5Q29va2llc0ZvclVSTFdpdGhNYWluRG9jdW1lbnRVUkwoY29va2llU3RvcmFnZSwgc3Rh dGljX2Nhc3Q8Q0ZVUkxSZWY+KHVybCksIHN0YXRpY19jYXN0PENGVVJMUmVmPihmaXJzdFBhcnR5 KSwgc2VjdXJlKTsKKworICAgIE5TQXJyYXkgKm5zQ29va2llcyA9IFtOU0hUVFBDb29raWUgX2Nm Mm5zQ29va2llczpjb29raWVzXTsKKyAgICBDRlJlbGVhc2UoY29va2llcyk7CisKKyAgICByZXR1 cm4gbnNDb29raWVzOworfQorCisgICAgCiBzdGF0aWMgUmV0YWluUHRyPE5TQXJyYXk+IGZpbHRl ckNvb2tpZXMoTlNBcnJheSAqdW5maWx0ZXJlZENvb2tpZXMpCiB7CiAgICAgTlNVSW50ZWdlciBj b3VudCA9IFt1bmZpbHRlcmVkQ29va2llcyBjb3VudF07CkBAIC0xMTgsNyArMTM2LDcgQEAgc3Rh dGljIE5TQXJyYXkgKmNvb2tpZXNGb3JVUkwoY29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBz ZXNzaW9uLCBjb25zdCBVUkwmIGYKICAgICBpZiAoTlNBcnJheSAqY29va2llcyA9IGNvb2tpZXNJ blBhcnRpdGlvbkZvclVSTChzZXNzaW9uLCBmaXJzdFBhcnR5LCB1cmwpKQogICAgICAgICByZXR1 cm4gY29va2llczsKICNlbmRpZgotICAgIHJldHVybiB3a0hUVFBDb29raWVzRm9yVVJMKHNlc3Np b24uY29va2llU3RvcmFnZSgpLmdldCgpLCBmaXJzdFBhcnR5LCB1cmwpOworICAgIHJldHVybiBo dHRwQ29va2llc0ZvclVSTChzZXNzaW9uLmNvb2tpZVN0b3JhZ2UoKS5nZXQoKSwgZmlyc3RQYXJ0 eSwgdXJsKTsKIH0KIAogZW51bSBJbmNsdWRlSFRUUE9ubHlPck5vdCB7IERvTm90SW5jbHVkZUhU VFBPbmx5LCBJbmNsdWRlSFRUUE9ubHkgfTsKQEAgLTIzMiw3ICsyNTAsNyBAQCB2b2lkIGRlbGV0 ZUNvb2tpZShjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYg dXJsLCBjb25zdCBTdAogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIAogICAgIFJl dGFpblB0cjxDRkhUVFBDb29raWVTdG9yYWdlUmVmPiBjb29raWVTdG9yYWdlID0gc2Vzc2lvbi5j b29raWVTdG9yYWdlKCk7Ci0gICAgTlNBcnJheSAqY29va2llcyA9IHdrSFRUUENvb2tpZXNGb3JV UkwoY29va2llU3RvcmFnZS5nZXQoKSwgMCwgdXJsKTsKKyAgICBOU0FycmF5ICpjb29raWVzID0g aHR0cENvb2tpZXNGb3JVUkwoY29va2llU3RvcmFnZS5nZXQoKSwgMCwgdXJsKTsKIAogICAgIE5T U3RyaW5nICpjb29raWVOYW1lU3RyaW5nID0gY29va2llTmFtZTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vc3BpL2NmL0NGTmV0d29ya1NQSS5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vc3BpL2NmL0NGTmV0d29ya1NQSS5oCmluZGV4IDgwMzZiMmI4N2ExZGJiMzQ5 NDYyZjE0ZmQ5M2M0MTc2YzFjMmQ4NDguLmNiOTJhZWMzNzU2ODA5ZWU5NGRkYjQwODAzZDNlNmJh NzBkNzJmNmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jZi9DRk5l dHdvcmtTUEkuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY2YvQ0ZOZXR3b3Jr U1BJLmgKQEAgLTE3OCw2ICsxNzgsNyBAQCBFWFRFUk5fQyBDRkRpY3Rpb25hcnlSZWYgX0NGVVJM UmVzcG9uc2VHZXRTU0xDZXJ0aWZpY2F0ZUNvbnRleHQoQ0ZVUkxSZXNwb25zZVJlZgogRVhURVJO X0MgQ0ZVUkxSZWYgQ0ZVUkxSZXNwb25zZUdldFVSTChDRlVSTFJlc3BvbnNlUmVmKTsKIEVYVEVS Tl9DIHZvaWQgQ0ZVUkxSZXNwb25zZVNldE1JTUVUeXBlKENGVVJMUmVzcG9uc2VSZWYsIENGU3Ry aW5nUmVmKTsKIEVYVEVSTl9DIENGSFRUUENvb2tpZVN0b3JhZ2VSZWYgX0NGVVJMU3RvcmFnZVNl c3Npb25Db3B5Q29va2llU3RvcmFnZShDRkFsbG9jYXRvclJlZiwgQ0ZVUkxTdG9yYWdlU2Vzc2lv blJlZik7CitFWFRFUk5fQyBDRkFycmF5UmVmIF9DRkhUVFBDb29raWVTdG9yYWdlQ29weUNvb2tp ZXNGb3JVUkxXaXRoTWFpbkRvY3VtZW50VVJMKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYgaW5Db29r aWVTdG9yYWdlLCBDRlVSTFJlZiBpblVSTCwgQ0ZVUkxSZWYgaW5NYWluRG9jdW1lbnRVUkwsIEJv b2xlYW4gc2VuZFNlY3VyZUNvb2tpZXMpOwogCiAvLyBGSVhNRTogV2Ugc2hvdWxkIG9ubHkgZm9y d2FyZCBkZWNsYXJlIHRoaXMgU1BJIHdoZW4gYnVpbGRpbmcgZm9yIGlPUyB3aXRob3V0IHRoZSBB cHBsZSBJbnRlcm5hbCBTREsuCiAvLyBBcyBhIHdvcmthcm91bmQgZm9yIDxyZGFyOi8vcHJvYmxl bS8xOTAyNTAxNj4sIHdlIG11c3QgZm9yd2FyZCBkZWNsYXJlIHRoaXMgU1BJIHJlZ2FyZGxlc3Mg b2Ygd2hldGhlcgpAQCAtMjE2LDExICsyMTcsMTIgQEAgRVhURVJOX0MgQ0ZBcnJheVJlZiBfQ0ZI VFRQUGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkcyhDRkFsbG9jYXRvclJlZgog CiAjaWYgZGVmaW5lZChfX09CSkNfXykKIAotI2lmIFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1Nf WF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDExMDAKIEBpbnRlcmZhY2UgTlNIVFRQQ29va2ll ICgpCisjaWYgUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVE ID49IDEwMTEwMAogKyAoTlNBcnJheSAqKV9wYXJzZWRDb29raWVzV2l0aFJlc3BvbnNlSGVhZGVy RmllbGRzOihOU0RpY3Rpb25hcnkgKiloZWFkZXJGaWVsZHMgZm9yVVJMOihOU1VSTCAqKWFVUkw7 Ci1AZW5kCiAjZW5kaWYKKysgKE5TQXJyYXkqKV9jZjJuc0Nvb2tpZXM6KENGQXJyYXlSZWYpY2ZD b29raWVzOworQGVuZAogCiAjaWYgIVVTRShBUFBMRV9JTlRFUk5BTF9TREspCiBAaW50ZXJmYWNl IE5TSFRUUENvb2tpZVN0b3JhZ2UgKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dl YkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbQppbmRleCBhODhkYzM1NjNkYzc4YzU3 ZTFjOGY2MzRkOTBjYmJiOTk5ZWJlNmE5Li44MTNhZWU4ZmVmNWQzMWRiNmYzZDI2OGYzM2MxODcz OWIzZDkxOTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJTeXN0ZW1JbnRlcmZhY2UubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBv cnQvV2ViU3lzdGVtSW50ZXJmYWNlLm1tCkBAIC0xMTMsNyArMTEzLDYgQEAgdm9pZCBJbml0V2Vi Q29yZVN5c3RlbUludGVyZmFjZSh2b2lkKQogICAgIElOSVQoQ29weVJlcXVlc3RXaXRoU3RvcmFn ZVNlc3Npb24pOwogICAgIElOSVQoR2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeSk7CiAgICAgSU5J VChIVFRQQ29va2llcyk7Ci0gICAgSU5JVChIVFRQQ29va2llc0ZvclVSTCk7CiAgICAgSU5JVChT ZXRIVFRQQ29va2llc0ZvclVSTCk7CiAgICAgSU5JVChEZWxldGVBbGxIVFRQQ29va2llcyk7CiAg ICAgSU5JVChEZWxldGVIVFRQQ29va2llKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlN5c3RlbUludGVyZmFjZS5tbSBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFjL1dlYlN5c3RlbUludGVyZmFj ZS5tbQppbmRleCAzYWI1OTBkMzA0YWFkODljNTFmNDBkMmVlZTEwNDE4YWE5NjIwYjdhLi4zNWMz NzllZmI4Y2Y0NzYzODMzMWViNDgwYjlkZGU1NDFhYmI3YTY2IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJTeXN0ZW1JbnRlcmZhY2Uu bW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9tYWMvV2Vi U3lzdGVtSW50ZXJmYWNlLm1tCkBAIC04Myw3ICs4Myw2IEBAIHZvaWQgSW5pdFdlYkNvcmVTeXN0 ZW1JbnRlcmZhY2Uodm9pZCkKICAgICAgICAgSU5JVChDb3B5UmVxdWVzdFdpdGhTdG9yYWdlU2Vz c2lvbik7CiAgICAgICAgIElOSVQoR2V0SFRUUENvb2tpZUFjY2VwdFBvbGljeSk7CiAgICAgICAg IElOSVQoSFRUUENvb2tpZXMpOwotICAgICAgICBJTklUKEhUVFBDb29raWVzRm9yVVJMKTsKICAg ICAgICAgSU5JVChTZXRIVFRQQ29va2llc0ZvclVSTCk7CiAgICAgICAgIElOSVQoRGVsZXRlQWxs SFRUUENvb2tpZXMpOwogICAgICAgICBJTklUKERlbGV0ZUhUVFBDb29raWUpOwo= 281755 2016-06-21 09:49:40 -0700 2016-06-21 10:20:18 -0700 Patch bug-158967-20160621094937.patch text/plain 10453 aalavi U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxNTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggN2MwN2YxYjY1NWM1MWFh M2ZhNzg5ODkzNzA0MTVlY2FlNDg3ZDM3Mi4uYWI1NjQ1MGRjYTgwMGU2NjhmMDk4YWQzZGJlYmMy ZjQ2NWI1ZDE2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTA2LTIwICBBbWly IEFsYXZpICA8YWFsYXZpQGFwcGxlLmNvbT4KKworICAgICAgICBVcHN0cmVhbSBXS0hUVFBDb29r aWVzRm9yVVJMIGZyb20gV2ViS2l0U3lzdGVtSW50ZXJmYWNlIHRvIE9wZW5Tb3VyY2UKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1ODk2NworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vaW9z L1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2VJT1MubW06CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dl YkNvcmVTeXN0ZW1JbnRlcmZhY2UuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViQ29yZVN5 c3RlbUludGVyZmFjZS5tbToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL21hYy9Db29raWVK YXJNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpodHRwQ29va2llc0ZvclVSTCk6IFVwc3RyZWFt ZWQgZnJvbSBXZWJLaXRTeXN0ZW1JbnRlcmZhY2UuCisgICAgICAgIChXZWJDb3JlOjpjb29raWVz Rm9yVVJMKTogQ2hhbmdlZCB0byBjYWxsIGh0dHBDb29raWVzRm9yVVJMLgorICAgICAgICAoV2Vi Q29yZTo6ZGVsZXRlQ29va2llKTogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vc3BpL2NmL0NG TmV0d29ya1NQSS5oOgorCiAyMDE2LTA2LTAxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVu c2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IG51bGwgZGVyZWZlcmVuY2luZyBpbiBSZXNv dXJjZVRpbWluZ0luZm9ybWF0aW9uOjphZGRSZXNvdXJjZVRpbWluZwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmlu ZGV4IDlkMWYxN2RiMDI4ZmEyODU3MWFlN2UwOWZlYTVmNjQ0NTE1MDdkZjYuLmMyZWQ3OWEwMDA1 NmMyNjAwZWYwYWIwZjMzZGE1ZGFjZDk5NWI2ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv bWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMyBAQAorMjAxNi0wNi0yMCAgQW1pciBBbGF2aSAgPGFhbGF2aUBhcHBsZS5jb20+CisKKyAg ICAgICAgVXBzdHJlYW0gV0tIVFRQQ29va2llc0ZvclVSTCBmcm9tIFdlYktpdFN5c3RlbUludGVy ZmFjZSB0byBPcGVuU291cmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNTg5NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbToKKyAgICAg ICAgKEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKTogRGVsZXRlZC4KKwogMjAxNi0wNS0zMSAg WXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmll d2VkLCByb2xsIG91dCByMjAxNDgxLCByMjAxNTIzOiAwLjMlIHJlZ3Jlc3Npb24gaW4gT2N0YW5l IGNvZGUtbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGI4ZjZkNGVmY2U5MTI1MWVlYTdlMWIwZGMyZjE4NTY2 YzJiYzZjZDkuLmMwNzdiOTBlNjYyZjhmZjRjNTc4YzY1OTNlMzQ2YjUyMDM0YTE1NWUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxNi0wNi0yMCAgQW1pciBBbGF2aSAgPGFhbGF2aUBh cHBsZS5jb20+CisKKyAgICAgICAgVXBzdHJlYW0gV0tIVFRQQ29va2llc0ZvclVSTCBmcm9tIFdl YktpdFN5c3RlbUludGVyZmFjZSB0byBPcGVuU291cmNlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTg5NjcKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvbWFj L1dlYlN5c3RlbUludGVyZmFjZS5tbToKKyAgICAgICAgKEluaXRXZWJDb3JlU3lzdGVtSW50ZXJm YWNlKTogRGVsZXRlZC4KKwogMjAxNi0wNS0zMSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVh QGdtYWlsLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsIG91dCByMjAxNDgxLCByMjAx NTIzOiAwLjMlIHJlZ3Jlc3Npb24gaW4gT2N0YW5lIGNvZGUtbG9hZApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2VJT1MubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQpp bmRleCAzNWM3NGY1Nzc0ZTc3MWI2NTA1MTI3NDRmNDdmMDhlZjJhZDBhNDAyLi42NDU1ODE5N2Rh OTUxZThmYmM2MDVmYTBmNWIwNmZiZTM2ZTA2YTVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViQ29yZVN5c3RlbUludGVyZmFjZUlPUy5tbQpAQCAtNDMs NyArNDMsNiBAQCBXRUJDT1JFX0VYUE9SVCBDRlVSTFN0b3JhZ2VTZXNzaW9uUmVmICgqd2tDcmVh dGVQcml2YXRlU3RvcmFnZVNlc3Npb24pKENGU3RyaW5nUgogV0VCQ09SRV9FWFBPUlQgTlNVUkxS ZXF1ZXN0KiAoKndrQ29weVJlcXVlc3RXaXRoU3RvcmFnZVNlc3Npb24pKENGVVJMU3RvcmFnZVNl c3Npb25SZWYsIE5TVVJMUmVxdWVzdCopOwogV0VCQ09SRV9FWFBPUlQgdW5zaWduZWQgKCp3a0dl dEhUVFBDb29raWVBY2NlcHRQb2xpY3kpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYpOwogV0VCQ09S RV9FWFBPUlQgTlNBcnJheSAqKCp3a0hUVFBDb29raWVzKShDRkhUVFBDb29raWVTdG9yYWdlUmVm KTsKLVdFQkNPUkVfRVhQT1JUIE5TQXJyYXkgKigqd2tIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQ Q29va2llU3RvcmFnZVJlZiwgTlNVUkwgKiwgTlNVUkwgKik7CiBXRUJDT1JFX0VYUE9SVCB2b2lk ICgqd2tTZXRIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiwgTlNBcnJh eSAqLCBOU1VSTCAqLCBOU1VSTCAqKTsKIFdFQkNPUkVfRVhQT1JUIHZvaWQgKCp3a0RlbGV0ZUFs bEhUVFBDb29raWVzKShDRkhUVFBDb29raWVTdG9yYWdlUmVmKTsKIFdFQkNPUkVfRVhQT1JUIHZv aWQgKCp3a0RlbGV0ZUhUVFBDb29raWUpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYsIE5TSFRUUENv b2tpZSAqKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3Jl U3lzdGVtSW50ZXJmYWNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5 c3RlbUludGVyZmFjZS5oCmluZGV4IGE5ZmFjYjRmMmE5MzY1YjllZDBmZWQ1ZTk2YTE5Yzk3MGE1 YThkYTYuLmY0Y2MyNzBlNDUwYjFlNDIyYzljNWFiN2I5NTc3YmFkNmVmOWNiMGEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJDb3JlU3lzdGVtSW50ZXJmYWNlLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2Uu aApAQCAtMjIyLDcgKzIyMiw2IEBAIGV4dGVybiBOU1VSTFJlcXVlc3QqICgqd2tDb3B5UmVxdWVz dFdpdGhTdG9yYWdlU2Vzc2lvbikoQ0ZVUkxTdG9yYWdlU2Vzc2lvblJlZiwKIHR5cGVkZWYgc3Ry dWN0IE9wYXF1ZUNGSFRUUENvb2tpZVN0b3JhZ2UqIENGSFRUUENvb2tpZVN0b3JhZ2VSZWY7CiBl eHRlcm4gdW5zaWduZWQgKCp3a0dldEhUVFBDb29raWVBY2NlcHRQb2xpY3kpKENGSFRUUENvb2tp ZVN0b3JhZ2VSZWYpOwogZXh0ZXJuIE5TQXJyYXkgKigqd2tIVFRQQ29va2llcykoQ0ZIVFRQQ29v a2llU3RvcmFnZVJlZik7Ci1leHRlcm4gTlNBcnJheSAqKCp3a0hUVFBDb29raWVzRm9yVVJMKShD RkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU1VSTCAqLCBOU1VSTCAqKTsKIGV4dGVybiB2b2lkICgq d2tTZXRIVFRQQ29va2llc0ZvclVSTCkoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZiwgTlNBcnJheSAq LCBOU1VSTCAqLCBOU1VSTCAqKTsKIGV4dGVybiB2b2lkICgqd2tEZWxldGVIVFRQQ29va2llKShD RkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU0hUVFBDb29raWUgKik7CiBleHRlcm4gdm9pZCAoKndr RGVsZXRlQWxsSFRUUENvb2tpZXMpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYkNvcmVTeXN0ZW1JbnRlcmZhY2UubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQpp bmRleCBjMzljYzllMjg1MmJlNTlmZTI4NzgzYWY2NjIzYmQ3MTgwMzRmNTcxLi5jYjU1MjU2NzI3 N2EzNDg0Mzc4MTI5MTk0MzRmMWU1YzU3NGYzY2U2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvV2ViQ29yZVN5c3RlbUludGVyZmFjZS5tbQpAQCAtOTksNyArOTks NiBAQCBDRlVSTFN0b3JhZ2VTZXNzaW9uUmVmICgqd2tDcmVhdGVQcml2YXRlU3RvcmFnZVNlc3Np b24pKENGU3RyaW5nUmVmKTsKIE5TVVJMUmVxdWVzdCogKCp3a0NvcHlSZXF1ZXN0V2l0aFN0b3Jh Z2VTZXNzaW9uKShDRlVSTFN0b3JhZ2VTZXNzaW9uUmVmLCBOU1VSTFJlcXVlc3QqKTsKIHVuc2ln bmVkICgqd2tHZXRIVFRQQ29va2llQWNjZXB0UG9saWN5KShDRkhUVFBDb29raWVTdG9yYWdlUmVm KTsKIE5TQXJyYXkgKigqd2tIVFRQQ29va2llcykoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7Ci1O U0FycmF5ICooKndrSFRUUENvb2tpZXNGb3JVUkwpKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYsIE5T VVJMICosIE5TVVJMICopOwogdm9pZCAoKndrU2V0SFRUUENvb2tpZXNGb3JVUkwpKENGSFRUUENv b2tpZVN0b3JhZ2VSZWYsIE5TQXJyYXkgKiwgTlNVUkwgKiwgTlNVUkwgKik7CiB2b2lkICgqd2tE ZWxldGVBbGxIVFRQQ29va2llcykoQ0ZIVFRQQ29va2llU3RvcmFnZVJlZik7CiB2b2lkICgqd2tE ZWxldGVIVFRQQ29va2llKShDRkhUVFBDb29raWVTdG9yYWdlUmVmLCBOU0hUVFBDb29raWUgKik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9Db29raWVK YXJNYWMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9Db29raWVKYXJN YWMubW0KaW5kZXggNWVjOTk4MDkzYjM3MWZiMDNmNTAwMGUxODc2NTc1YTg5N2JkZWM2ZC4uMmJj NzI4ZWQzZDY5MDMwNWQ1YTM1YWMyNjAxZGVjZTIzNTFkYzY2ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFyTWFjLm1tCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFjL0Nvb2tpZUphck1hYy5tbQpAQCAtNDUsNiAr NDUsMjIgQEAgc3RhdGljIE5TSFRUUENvb2tpZVN0b3JhZ2UgKmNvb2tpZVN0b3JhZ2UoY29uc3Qg TmV0d29ya1N0b3JhZ2VTZXNzaW9uJik7CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorc3RhdGlj IE5TQXJyYXkgKmh0dHBDb29raWVzRm9yVVJMKENGSFRUUENvb2tpZVN0b3JhZ2VSZWYgY29va2ll U3RvcmFnZSwgTlNVUkwgKmZpcnN0UGFydHksIE5TVVJMICp1cmwpCit7CisgICAgaWYgKCFjb29r aWVTdG9yYWdlKSB7CisgICAgICAgIC8vIEZJWE1FOiBUaGUgZmFsbGJhY2sgdG8gTlNIVFRQQ29v a2llU3RvcmFnZSBzaG91bGQgbm90IGJlIHByZXNlbnQgd2hlbiBVU0UoQ0ZORVRXT1JLKSBpcyBk ZWZpbmVkLgorICAgICAgICByZXR1cm4gW1tOU0hUVFBDb29raWVTdG9yYWdlIHNoYXJlZEhUVFBD b29raWVTdG9yYWdlXSBjb29raWVzRm9yVVJMOnVybF07CisgICAgfQorCisgICAgYm9vbCBzZWN1 cmUgPSAhW1t1cmwgc2NoZW1lXSBjYXNlSW5zZW5zaXRpdmVDb21wYXJlOkAiaHR0cHMiXTsKKyAg ICAKKyAgICBhdXRvIGNvb2tpZXMgPSBhZG9wdENGKF9DRkhUVFBDb29raWVTdG9yYWdlQ29weUNv b2tpZXNGb3JVUkxXaXRoTWFpbkRvY3VtZW50VVJMKGNvb2tpZVN0b3JhZ2UsIHN0YXRpY19jYXN0 PENGVVJMUmVmPih1cmwpLCBzdGF0aWNfY2FzdDxDRlVSTFJlZj4oZmlyc3RQYXJ0eSksIHNlY3Vy ZSkpOworICAgIE5TQXJyYXkgKm5zQ29va2llcyA9IFtOU0hUVFBDb29raWUgX2NmMm5zQ29va2ll czpjb29raWVzLmdldCgpXTsKKworICAgIHJldHVybiBuc0Nvb2tpZXM7Cit9CisKKyAgICAKIHN0 YXRpYyBSZXRhaW5QdHI8TlNBcnJheT4gZmlsdGVyQ29va2llcyhOU0FycmF5ICp1bmZpbHRlcmVk Q29va2llcykKIHsKICAgICBOU1VJbnRlZ2VyIGNvdW50ID0gW3VuZmlsdGVyZWRDb29raWVzIGNv dW50XTsKQEAgLTExOCw3ICsxMzQsNyBAQCBzdGF0aWMgTlNBcnJheSAqY29va2llc0ZvclVSTChj b25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24sIGNvbnN0IFVSTCYgZgogICAgIGlm IChOU0FycmF5ICpjb29raWVzID0gY29va2llc0luUGFydGl0aW9uRm9yVVJMKHNlc3Npb24sIGZp cnN0UGFydHksIHVybCkpCiAgICAgICAgIHJldHVybiBjb29raWVzOwogI2VuZGlmCi0gICAgcmV0 dXJuIHdrSFRUUENvb2tpZXNGb3JVUkwoc2Vzc2lvbi5jb29raWVTdG9yYWdlKCkuZ2V0KCksIGZp cnN0UGFydHksIHVybCk7CisgICAgcmV0dXJuIGh0dHBDb29raWVzRm9yVVJMKHNlc3Npb24uY29v a2llU3RvcmFnZSgpLmdldCgpLCBmaXJzdFBhcnR5LCB1cmwpOwogfQogCiBlbnVtIEluY2x1ZGVI VFRQT25seU9yTm90IHsgRG9Ob3RJbmNsdWRlSFRUUE9ubHksIEluY2x1ZGVIVFRQT25seSB9OwpA QCAtMjMyLDcgKzI0OCw3IEBAIHZvaWQgZGVsZXRlQ29va2llKGNvbnN0IE5ldHdvcmtTdG9yYWdl U2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0CiAgICAgQkVHSU5fQkxP Q0tfT0JKQ19FWENFUFRJT05TOwogCiAgICAgUmV0YWluUHRyPENGSFRUUENvb2tpZVN0b3JhZ2VS ZWY+IGNvb2tpZVN0b3JhZ2UgPSBzZXNzaW9uLmNvb2tpZVN0b3JhZ2UoKTsKLSAgICBOU0FycmF5 ICpjb29raWVzID0gd2tIVFRQQ29va2llc0ZvclVSTChjb29raWVTdG9yYWdlLmdldCgpLCAwLCB1 cmwpOworICAgIE5TQXJyYXkgKmNvb2tpZXMgPSBodHRwQ29va2llc0ZvclVSTChjb29raWVTdG9y YWdlLmdldCgpLCBuaWwsIHVybCk7CiAKICAgICBOU1N0cmluZyAqY29va2llTmFtZVN0cmluZyA9 IGNvb2tpZU5hbWU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9j Zi9DRk5ldHdvcmtTUEkuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jZi9DRk5ldHdv cmtTUEkuaAppbmRleCA4MDM2YjJiODdhMWRiYjM0OTQ2MmYxNGZkOTNjNDE3NmMxYzJkODQ4Li41 ODI3NDIxMTJjZjA4NTM0MjI0YTZjNmQ3NzEwN2JiMjBlYTIxYmYxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9zcGkvY2YvQ0ZOZXR3b3JrU1BJLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vc3BpL2NmL0NGTmV0d29ya1NQSS5oCkBAIC0xNzgsNiArMTc4LDcgQEAg RVhURVJOX0MgQ0ZEaWN0aW9uYXJ5UmVmIF9DRlVSTFJlc3BvbnNlR2V0U1NMQ2VydGlmaWNhdGVD b250ZXh0KENGVVJMUmVzcG9uc2VSZWYKIEVYVEVSTl9DIENGVVJMUmVmIENGVVJMUmVzcG9uc2VH ZXRVUkwoQ0ZVUkxSZXNwb25zZVJlZik7CiBFWFRFUk5fQyB2b2lkIENGVVJMUmVzcG9uc2VTZXRN SU1FVHlwZShDRlVSTFJlc3BvbnNlUmVmLCBDRlN0cmluZ1JlZik7CiBFWFRFUk5fQyBDRkhUVFBD b29raWVTdG9yYWdlUmVmIF9DRlVSTFN0b3JhZ2VTZXNzaW9uQ29weUNvb2tpZVN0b3JhZ2UoQ0ZB bGxvY2F0b3JSZWYsIENGVVJMU3RvcmFnZVNlc3Npb25SZWYpOworRVhURVJOX0MgQ0ZBcnJheVJl ZiBfQ0ZIVFRQQ29va2llU3RvcmFnZUNvcHlDb29raWVzRm9yVVJMV2l0aE1haW5Eb2N1bWVudFVS TChDRkhUVFBDb29raWVTdG9yYWdlUmVmIGluQ29va2llU3RvcmFnZSwgQ0ZVUkxSZWYgaW5VUkws IENGVVJMUmVmIGluTWFpbkRvY3VtZW50VVJMLCBCb29sZWFuIHNlbmRTZWN1cmVDb29raWVzKTsK IAogLy8gRklYTUU6IFdlIHNob3VsZCBvbmx5IGZvcndhcmQgZGVjbGFyZSB0aGlzIFNQSSB3aGVu IGJ1aWxkaW5nIGZvciBpT1Mgd2l0aG91dCB0aGUgQXBwbGUgSW50ZXJuYWwgU0RLLgogLy8gQXMg YSB3b3JrYXJvdW5kIGZvciA8cmRhcjovL3Byb2JsZW0vMTkwMjUwMTY+LCB3ZSBtdXN0IGZvcndh cmQgZGVjbGFyZSB0aGlzIFNQSSByZWdhcmRsZXNzIG9mIHdoZXRoZXIKQEAgLTIxNiwxMSArMjE3 LDEyIEBAIEVYVEVSTl9DIENGQXJyYXlSZWYgX0NGSFRUUFBhcnNlZENvb2tpZXNXaXRoUmVzcG9u c2VIZWFkZXJGaWVsZHMoQ0ZBbGxvY2F0b3JSZWYKIAogI2lmIGRlZmluZWQoX19PQkpDX18pCiAK LSNpZiBQTEFURk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0g MTAxMTAwCiBAaW50ZXJmYWNlIE5TSFRUUENvb2tpZSAoKQorI2lmIFBMQVRGT1JNKE1BQykgJiYg X19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMDExMDAKICsgKE5TQXJyYXkgKilf cGFyc2VkQ29va2llc1dpdGhSZXNwb25zZUhlYWRlckZpZWxkczooTlNEaWN0aW9uYXJ5ICopaGVh ZGVyRmllbGRzIGZvclVSTDooTlNVUkwgKilhVVJMOwotQGVuZAogI2VuZGlmCisrIChOU0FycmF5 ICopX2NmMm5zQ29va2llczooQ0ZBcnJheVJlZiljZkNvb2tpZXM7CitAZW5kCiAKICNpZiAhVVNF KEFQUExFX0lOVEVSTkFMX1NESykKIEBpbnRlcmZhY2UgTlNIVFRQQ29va2llU3RvcmFnZSAoKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViU3lzdGVtSW50 ZXJmYWNlLm1tIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViU3lzdGVtSW50 ZXJmYWNlLm1tCmluZGV4IGE4OGRjMzU2M2RjNzhjNTdlMWM4ZjYzNGQ5MGNiYmI5OTllYmU2YTku LjgxM2FlZThmZWY1ZDMxZGI2ZjNkMjY4ZjMzYzE4NzM5YjNkOTE5MTMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYlN5c3RlbUludGVyZmFjZS5tbQorKysg Yi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJTeXN0ZW1JbnRlcmZhY2UubW0K QEAgLTExMyw3ICsxMTMsNiBAQCB2b2lkIEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKHZvaWQp CiAgICAgSU5JVChDb3B5UmVxdWVzdFdpdGhTdG9yYWdlU2Vzc2lvbik7CiAgICAgSU5JVChHZXRI VFRQQ29va2llQWNjZXB0UG9saWN5KTsKICAgICBJTklUKEhUVFBDb29raWVzKTsKLSAgICBJTklU KEhUVFBDb29raWVzRm9yVVJMKTsKICAgICBJTklUKFNldEhUVFBDb29raWVzRm9yVVJMKTsKICAg ICBJTklUKERlbGV0ZUFsbEhUVFBDb29raWVzKTsKICAgICBJTklUKERlbGV0ZUhUVFBDb29raWUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9t YWMvV2ViU3lzdGVtSW50ZXJmYWNlLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9tYWMvV2ViU3lzdGVtSW50ZXJmYWNlLm1tCmluZGV4IDNhYjU5MGQzMDRhYWQ4 OWM1MWY0MGQyZWVlMTA0MThhYTk2MjBiN2EuLjM1YzM3OWVmYjhjZjQ3NjM4MzMxZWI0ODBiOWRk ZTU0MWFiYjdhNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29y ZVN1cHBvcnQvbWFjL1dlYlN5c3RlbUludGVyZmFjZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L21hYy9XZWJTeXN0ZW1JbnRlcmZhY2UubW0KQEAgLTgz LDcgKzgzLDYgQEAgdm9pZCBJbml0V2ViQ29yZVN5c3RlbUludGVyZmFjZSh2b2lkKQogICAgICAg ICBJTklUKENvcHlSZXF1ZXN0V2l0aFN0b3JhZ2VTZXNzaW9uKTsKICAgICAgICAgSU5JVChHZXRI VFRQQ29va2llQWNjZXB0UG9saWN5KTsKICAgICAgICAgSU5JVChIVFRQQ29va2llcyk7Ci0gICAg ICAgIElOSVQoSFRUUENvb2tpZXNGb3JVUkwpOwogICAgICAgICBJTklUKFNldEhUVFBDb29raWVz Rm9yVVJMKTsKICAgICAgICAgSU5JVChEZWxldGVBbGxIVFRQQ29va2llcyk7CiAgICAgICAgIElO SVQoRGVsZXRlSFRUUENvb2tpZSk7Cg==