65781 2011-08-05 11:26:13 -0700 [NRWT] REGRESSION: Local loader tests are failing on machines that lost /tmp/LayoutTests symlink 2011-09-20 17:47:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P1 Normal --- 64135 64001 67953 67954 1 rniwa eric abarth ap dbates dpranke eric japhet jarred koivisto scottmg webkit.review.bot oldest_to_newest 447306 0 rniwa 2011-08-05 11:26:13 -0700 It seems like there have been some loader regressions. The following tests are failing on Snow Leopard very frequently: fast/loader/local-CSS-from-local.html fast/loader/local-JavaScript-from-local.html fast/loader/local-image-from-local.html http/tests/cookies/third-party-cookie-relaxing.html http/tests/security/contentSecurityPolicy/media-src-allowed.html http/tests/security/local-user-CSS-from-remote.html 447307 1 rniwa 2011-08-05 11:26:26 -0700 e.g. http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r92484%20(32034)/results.html 463478 2 ap 2011-09-07 11:21:08 -0700 > fast/loader/local-CSS-from-local.html > fast/loader/local-JavaScript-from-local.html > fast/loader/local-image-from-local.html > http/tests/security/local-user-CSS-from-remote.html These fail because NRWT doesn't create a symlink from /tmp/LayoutTests to actual LayoutTests directory. It should. > http/tests/security/contentSecurityPolicy/media-src-allowed.html Not sure if that's the same case. > http/tests/cookies/third-party-cookie-relaxing.html Definitely separate, but I'm not sure if this is still happening. Let's make a separate bug if it does. 463484 3 ap 2011-09-07 11:27:04 -0700 I have manually created the symlinks on apple-xserve-5 and apple-xserve-6 for now, but this really needs to be fixed in NRWT soon. 463485 4 eric 2011-09-07 11:27:29 -0700 Will look today. 463495 5 dpranke 2011-09-07 11:31:54 -0700 presumably this is related to bug 64135? I thought we were leaning to fixing this in DRT, not in NRWT. 463501 6 rniwa 2011-09-07 11:37:33 -0700 (In reply to comment #5) > presumably this is related to bug 64135? I thought we were leaning to fixing this in DRT, not in NRWT. It'll be nice if we didn't have to create symlinks but I don't think we should be forcing each port to implement this after the fact. I think we should fix this in NRWT and then slowly migrate to DRT-based solutions in the long term. 463531 7 ap 2011-09-07 11:49:35 -0700 > http/tests/cookies/third-party-cookie-relaxing.html Turns out that there's already bug 64001 for that. > presumably this is related to bug 64135? I thought we were leaning to fixing this in DRT, not in NRWT. That bug is a P2, and it has been languishing for two months. Unless someone is willing to change the tests and all DRT's very soon (and remove symlink creation from ORWT), I think that NRWT should make it easy to have green bots without manually re-creating the symlink. 463553 8 jarred 2011-09-07 12:04:01 -0700 (In reply to comment #7) > > presumably this is related to bug 64135? I thought we were leaning to fixing this in DRT, not in NRWT. > > That bug is a P2, and it has been languishing for two months. Unless someone is willing to change the tests and all DRT's very soon (and remove symlink creation from ORWT), I think that NRWT should make it easy to have green bots without manually re-creating the symlink. None of the tests need to be changed, but DRT implementations would need to happen. I think a stop-gap solution in NRWT is acceptable but ought to be removed when bug #67239 clears - and might as well remove from ORWT when that happens too. Qt's landed today (bug #67254) and Chromium already handles it. 463558 9 rniwa 2011-09-07 12:07:02 -0700 (In reply to comment #8) > None of the tests need to be changed, but DRT implementations would need to happen. I think a stop-gap solution in NRWT is acceptable but ought to be removed when bug #67239 clears - and might as well remove from ORWT when that happens too. Qt's landed today (bug #67254) and Chromium already handles it. Yeah, not having to add symlinks will be really nice, and we should move towards that direction. But in the short term, we probably need this trick be implemented in NRWT. 463749 10 eric 2011-09-07 16:13:17 -0700 Can you help me understand why these tests use absolute file:// paths instead of relative file paths? I'm sure there is a good reason, but I'd like to understand as that will inform my thinking on fixing this bug or bug 67239, etc. 463777 11 ap 2011-09-07 16:50:31 -0700 I'm myself puzzled about fast/loader tests, but it seems necessary for the http one. 463779 12 jarred 2011-09-07 16:52:44 -0700 (In reply to comment #11) > I'm myself puzzled about fast/loader tests, but it seems necessary for the http one. Indeed, particularly the security tests (remote => local origin requests). See comments in bug #67239. 463943 13 rniwa 2011-09-08 00:55:12 -0700 storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html is failing on Snow Leopard Release bot: http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r94746%20(32915)/results.html Is this failure related to this bug? 463995 14 jarred 2011-09-08 05:13:52 -0700 (In reply to comment #13) > storage/domstorage/localstorage/storagetracker/storage-tracker-7-usage.html is failing on Snow Leopard Release bot: > http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r94746%20(32915)/results.html > > Is this failure related to this bug? Doubtful. Does that bot run the tests serially or w/ multiple workers? Those tests are meant to run serially and will be flaky or fail if ran out of order. 464527 15 eric 2011-09-08 17:35:11 -0700 I think this is just a dupe of bug 64135. 464548 16 eric 2011-09-08 18:05:45 -0700 I've decided the proper solution to this is to make the pathToLocalResource magically relative to the test in question. I've written the code for Mac now, if it works it's written in such a fashion as it could be run on any platform and this problem should just go away everywhere w/o us needing the symlink. 464556 17 106824 eric 2011-09-08 18:18:19 -0700 Created attachment 106824 Patch 464587 18 ap 2011-09-08 19:06:38 -0700 No symlink would mean that tests cannot be run in browser though? I'm not sure why most commenters are in agreement that symlink is bad in the long run. 464603 19 jarred 2011-09-08 19:48:09 -0700 @Eric this won't apply to Qt, but Qt can look at the loaded URL and do the same derivation; I may take the time to do it this way. @ap this would be helpful for contributors running windows and vanilla (no cygwin) windows bots running NRWT. If someone needs to test in a browser manually, they can change the path before running the test (in windows) or create the symlink themselves. Note that in Windows, they would have to change the path anyways to run the test in a browser. The only tests that really need an absolute URL are the http ones (http/security, etc.). The rest (fast/loader) can be changed to relative URLs. I think this remapping mechanism will very rarely be needed in future tests, but may come in handy; those few use cases are the whole reason pathToLocalResource exists. Overall, this is a small fish with only a couple of affected tests so we don't want to over engineer around it. But, deriving the absolute path is so simple and arguably more robust that there's no sense in not doing it. Just MHO. I don't mind symlinks, but I also don't dev in Windows :) 464617 20 eric 2011-09-08 20:43:16 -0700 (In reply to comment #18) > No symlink would mean that tests cannot be run in browser though? > > I'm not sure why most commenters are in agreement that symlink is bad in the long run. You would have to create the symlink yourself. It is generally true that many LayoutTests cannot be run in a browser. :) 464624 21 ap 2011-09-08 21:03:23 -0700 We try to make them work in a browser though - that's quite helpful in many respects. 464629 22 rniwa 2011-09-08 21:16:55 -0700 (In reply to comment #21) > We try to make them work in a browser though - that's quite helpful in many respects. Right. But I think pros - less platform dependency - outweigh cons - not being able to run tests - in this case given there are only few tests that require symlink. 464653 23 ap 2011-09-08 22:40:14 -0700 I don't think that it's accurate to describe it this way. You get the symlink and the ability to run the test in browser on Unix platforms, but the test still works on lesser platforms due to the pathToLocalResource() hack. This is why I'm surprised by the general sentiment about symlink somehow being a bad long term direction. 464655 24 rniwa 2011-09-08 22:43:54 -0700 (In reply to comment #23) > I don't think that it's accurate to describe it this way. You get the symlink and the ability to run the test in browser on Unix platforms, but the test still works on lesser platforms due to the pathToLocalResource() hack. > > This is why I'm surprised by the general sentiment about symlink somehow being a bad long term direction. Mn... but you can always create a symlink to run the test manually even after this patch is landed, right? We could even add a script to do that automatically. 464660 25 ap 2011-09-08 23:02:19 -0700 Yes, but this approach also means that all DRTs on Unix platforms have to implement pathToLocalResource(). So, it's more work and less convenience, all for unclear benefit. Not a tremendously big deal either way though. 464711 26 jarred 2011-09-09 03:31:28 -0700 (In reply to comment #25) > Yes, but this approach also means that all DRTs on Unix platforms have to implement pathToLocalResource(). So, it's more work and less convenience, all for unclear benefit. All the ports but Qt load the test URL in a similar manner and can be solved in one patch/place it seems. And, Qt's already working around it. I understand your point, but instead of implementing two fragmented solutions to the same problem (use symlink in NRWT for nix ports, and fix DRT on several other ports) it's nice to solve it in one place. The ugly cygwin registry lookups in the win port can disappear, Qt can run DRT in windows now, etc etc. > > Not a tremendously big deal either way though. Agreed. 464736 27 jarred 2011-09-09 04:42:22 -0700 (In reply to comment #26) > (In reply to comment #25) > The ugly cygwin registry lookups in the win port can disappear Mm, that's actually not true if building and running within a cygwin environment (assuming getcwd is returning a /cygdrive path and python returns a /cygdrive path for module.__file__). But, it might make sense for NRWT, on Windows, to run cygpath and pass the Windows style path to DRT instead. 465737 28 eric 2011-09-12 12:42:44 -0700 I'm hitting this on my personal machine too. I believe this is a good solution to the problem. Can haz review? 465758 29 106824 rniwa 2011-09-12 13:19:51 -0700 Comment on attachment 106824 Patch looks sane to me. 465760 30 106824 ap 2011-09-12 13:22:52 -0700 Comment on attachment 106824 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=106824&action=review r+ with comments addressed. > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:361 > + // The passed in path will be an absolute path to the layout test starting > + // at /tmp/LayoutTests. Historically we created a /tmp/LayoutTests symlink Do you want to assert that the passed path starts with that? For a future improvement, I think that this method shouldn't be making one use the weird /tmp/LayoutTests path, if everyone else still agrees that symlink is bad. > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:365 > + // but not all platforms support symlinks and dependence on such a symlink > + // made it impossible for multiple users to run the layout tests (permission conflicts). > + // Instead we use the absolute path for the test from m_testPathOrURL > + // to create an absolute path for the requested local resource. I think that the amount of history is a bit excessive here. > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:369 > + size_t resourceAsUTF8Length = JSStringGetUTF8CString(localResource, resourceAsUTF8, maxResourceLength); This is wrong - the returned value includes null bytes, so it's not length, but buffer size. As a result, you get a trailing null byte in std:string below - which doesn't cause immediate trouble because the final result is based on c_str, but is very fragile. > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:371 > + std::string resourceAsWString(resourceAsUTF8, resourceAsUTF8Length); What is W in WString? > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:376 > + std::string resolvedResource = m_testPathOrURL.substr(0, testLayoutTestsIndex) + resourceAsWString.substr(resourceLayoutTestsIndex); I'd call this resolvedResourcePath (as well as other path variables here). 465777 31 eric 2011-09-12 13:53:26 -0700 Committed r94976: <http://trac.webkit.org/changeset/94976> 465804 32 rniwa 2011-09-12 14:46:12 -0700 This patch broke a bunch of tests in http/tests/security/: http://build.webkit.org/results/SnowLeopard%20Intel%20Release%20(Tests)/r94976%20(33025)/results.html 468121 33 eric 2011-09-15 15:30:03 -0700 I am able to reproduce the failure locally. Investigating. 468201 34 eric 2011-09-15 18:06:43 -0700 OK, so the code I wrote does the wrong thing for HTTP tests. Example: test: http://127.0.0.1:8000/security/frame-loading-via-document-write.html resolved resource: http://127.0.0.1:8000/security/frame-loading-via-document-write.html/LayoutTests/fast/dom/resources/abe.png Note there is no LayoutTests in the original path (like ap warned about). Will investigate further tomorrow. For now, I need to eat. :) 468706 35 eric 2011-09-16 12:25:52 -0700 I'm not sure how to solve this w/o leaking information about our directory layout into DumpRenderTree. We could add an environment variable to expose some sort of LOCAL_RESOURCE_ROOT, or a flag to DRT. But neither of those quite feel right. The symlink in /tmp/ is problematic for all the reasons stated above, but that may just be the most expedient solution. :( 468713 36 eric 2011-09-16 12:33:45 -0700 Hm... I'm starting to like the LOCAL_RESOURCE_ROOT environment variable option. Basically an absolute path to the LayoutTests directory. 468728 37 jarred 2011-09-16 12:52:50 -0700 (In reply to comment #36) > Hm... I'm starting to like the LOCAL_RESOURCE_ROOT environment variable option. Basically an absolute path to the LayoutTests directory. I think that's good, maybe prefixed DRT_ and of course set by the test harness. 468730 38 dpranke 2011-09-16 12:54:39 -0700 (In reply to comment #36) > Hm... I'm starting to like the LOCAL_RESOURCE_ROOT environment variable option. Basically an absolute path to the LayoutTests directory. Seems reasonable. I tend to prefer command line args over env variables, generally, but I don't know if I have a specific leaning in this case. Did you consider using an arg instead? 468734 39 eric 2011-09-16 12:56:54 -0700 It's possible to do an arg instead. I'm testing the code now and will post. If folks feel strongly about an arg instead of an environment variable I can change things. 468736 40 jarred 2011-09-16 12:57:51 -0700 (In reply to comment #37) > > I think that's good, maybe prefixed DRT_ or something more generic to WebKit as a whole (In reply to comment #38) > > Seems reasonable. I tend to prefer command line args over env variables, generally, but I don't know if I have a specific leaning in this case. Did you consider using an arg instead? Ditto, though I retracted my comment before submitting because it's six one way, half a dozen the other. env vars are easy to grab and use but the naming is a good bike shedding topic :) 468746 41 107711 eric 2011-09-16 13:05:39 -0700 Created attachment 107711 work in progress 468863 42 107740 eric 2011-09-16 16:00:07 -0700 Created attachment 107740 Patch 468897 43 107740 ap 2011-09-16 16:43:52 -0700 Comment on attachment 107740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107740&action=review > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:363 > + size_t utf8StringLength = JSStringGetUTF8CString(jsString, utf8Buffer, maxBufferSize); > + std::string stdString = std::string(utf8Buffer, utf8StringLength); This has the same off-by-one error as before. The string will have an extra null byte at the end. Also, you can get rid of assignment, and just construct stdString directly. > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:375 > + // This fallback approach works for non-http tests and is useful > + // in the case when we're running DRT directly from the command line. I'm still confused why we ever need this machinery for non-http tests. Can't we just modify those tests to have relative paths? 468901 44 107740 rniwa 2011-09-16 16:57:39 -0700 Comment on attachment 107740 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=107740&action=review > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:377 > + size_t indexOfRootNameStart = testPathOrURL.rfind(expectedRootName); I think we should be calling rfind(serachKey) here. > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:406 > + std::string searchKey = "/" + expectedRootName + "/"; > + size_t indexOfRootNameStart = localResourceString.rfind(searchKey); > + if (indexOfRootNameStart == std::string::npos) { > + ASSERT_NOT_REACHED(); > + return localResourceJSString; > + } > + > + size_t indexOfSeparatorAfterRootName = indexOfRootNameStart + searchKey.length() - 1; This code is duplicated in resourceRootAbsolutePath. Can we extract as a function? 468902 45 107740 rniwa 2011-09-16 16:58:13 -0700 Comment on attachment 107740 Patch I'd say r- given ap's & my comments. 470312 46 eric 2011-09-20 14:00:58 -0700 (In reply to comment #43) > (From update of attachment 107740 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=107740&action=review > > > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:363 > > + size_t utf8StringLength = JSStringGetUTF8CString(jsString, utf8Buffer, maxBufferSize); > > + std::string stdString = std::string(utf8Buffer, utf8StringLength); > > This has the same off-by-one error as before. The string will have an extra null byte at the end. Fixed. > Also, you can get rid of assignment, and just construct stdString directly. Fixed. > > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:375 > > + // This fallback approach works for non-http tests and is useful > > + // in the case when we're running DRT directly from the command line. > > I'm still confused why we ever need this machinery for non-http tests. Can't we just modify those tests to have relative paths? It's unclear to me. fast/loader/local-CSS-from-local.html seems to be testing that one file:// url page can load a stylesheet from another file:// url. Unclear if it's trying to test that that URL be absolute or not, or if it could just be changed to be a relative URL and still test whatever it thinks its testing. 470324 47 eric 2011-09-20 14:11:46 -0700 (In reply to comment #44) > (From update of attachment 107740 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=107740&action=review > > > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:377 > > + size_t indexOfRootNameStart = testPathOrURL.rfind(expectedRootName); > > I think we should be calling rfind(serachKey) here. Fixed. > > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:406 > > + std::string searchKey = "/" + expectedRootName + "/"; > > + size_t indexOfRootNameStart = localResourceString.rfind(searchKey); > > + if (indexOfRootNameStart == std::string::npos) { > > + ASSERT_NOT_REACHED(); > > + return localResourceJSString; > > + } > > + > > + size_t indexOfSeparatorAfterRootName = indexOfRootNameStart + searchKey.length() - 1; > > This code is duplicated in resourceRootAbsolutePath. Can we extract as a function? Fixed. That's much nicer! 470341 48 ap 2011-09-20 14:26:53 -0700 > > I'm still confused why we ever need this machinery for non-http tests. Can't we just modify those tests to have relative paths? > > It's unclear to me. fast/loader/local-CSS-from-local.html seems to be testing that one file:// url page can load a stylesheet from another file:// url. Unclear if it's trying to test that that URL be absolute or not, or if it could just be changed to be a relative URL and still test whatever it thinks its testing. Looking at svn logs, it seems that these tests don't care about absolute vs. relative; they only use absolute URLs because they were copy/pasted from http: counterparts. 470344 49 eric 2011-09-20 14:29:29 -0700 (In reply to comment #48) > > > I'm still confused why we ever need this machinery for non-http tests. Can't we just modify those tests to have relative paths? > > > > It's unclear to me. fast/loader/local-CSS-from-local.html seems to be testing that one file:// url page can load a stylesheet from another file:// url. Unclear if it's trying to test that that URL be absolute or not, or if it could just be changed to be a relative URL and still test whatever it thinks its testing. > > Looking at svn logs, it seems that these tests don't care about absolute vs. relative; they only use absolute URLs because they were copy/pasted from http: counterparts. I'm happy to remove all callers of layoutTestController.pathToLocalResource from the file:// based tests and add an ASSERT that tests are always HTTP tests in a second pass? I think that should be separate from this bug however. 470361 50 ap 2011-09-20 14:41:21 -0700 It's fine with me if it's a separate pass. 470376 51 108058 eric 2011-09-20 15:03:31 -0700 Created attachment 108058 Patch 470378 52 eric 2011-09-20 15:04:44 -0700 This has been one hell of a yak shave. :) 470381 53 108058 rniwa 2011-09-20 15:13:58 -0700 Comment on attachment 108058 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=108058&action=review seems sane to me. > Tools/DumpRenderTree/mac/LayoutTestControllerMac.mm:409 > + } else { > + ASSERT_NOT_REACHED(); // pathToLocalResource was passed a path it doesn't know how to map. > + } Nit: curly brackets around a single line statement. 470513 54 108058 webkit.review.bot 2011-09-20 17:47:22 -0700 Comment on attachment 108058 Patch Clearing flags on attachment: 108058 Committed r95588: <http://trac.webkit.org/changeset/95588> 470514 55 webkit.review.bot 2011-09-20 17:47:29 -0700 All reviewed patches have been landed. Closing bug. 106824 2011-09-08 18:18:19 -0700 2011-09-16 13:05:34 -0700 Patch bug-65781-20110908181818.patch text/plain 3259 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTQ4MjIKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwYTNjYWMyMDg5NzJmOWVjZjI2OWIxNjdjOTA3ZGI3MTA0 ZTFiNzEwLi45YmY5ZDA5NDdmNDczZjc1MjlhNzdmMzNiOWY0NWNlMzNiYTIxNDMwIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTEtMDktMDggIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgorCisgICAgICAg IFtOUldUXSBSRUdSRVNTSU9OOiBMb2NhbCBsb2FkZXIgdGVzdHMgYXJlIGZhaWxpbmcgb24gbWFj aGluZXMgdGhhdCBsb3N0IC90bXAvTGF5b3V0VGVzdHMgc3ltbGluaworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU3ODEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIG1ha2luZyBOUldUIGNy ZWF0ZSB0aGUgc3ltbGluaywgSSBqdXN0IG1hZGUgRHVtcFJlbmRlclRyZWUgc21hcnQgZW5vdWdo CisgICAgICAgIHRvIHJlc29sdmUgdGhlIHBhc3NlZCBpbiB1cmwgcmVsYXRpdmUgdG8gdGhlIGFi c29sdXRlIHVybCBmb3IgdGhlIHRlc3QuCisKKyAgICAgICAgSSBiZWxpZXZlIHRoaXMgaXMgYSBi ZXR0ZXIgYXBwcm9hY2ggdGhhbiB0aGUgb24gdXNlZCBpbiB0aGUgUXQgYW5kIENocm9taXVtIERS VCdzCisgICAgICAgICh3aGljaCByZXNvbHZlcyB0aGUgcGF0aCByZWxhdGl2ZSB0byB0aGUgYnVp bHQgbG9jYXRpb24gb2YgdGhlIERSVCBleGVjdXRhYmxlKQorICAgICAgICBhbmQgd2Ugc2hvdWxk IG1vdmUgdGhpcyBuZXcgY29kZSBpbnRvIGEgc2hhcmVkIGxvY2F0aW9uIGluIGEgZm9sbG93LXVw IHBhdGNoLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9s bGVyTWFjLm1tOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdGhUb0xvY2FsUmVz b3VyY2UpOgorCiAyMDExLTA5LTA4ICBCcmlhbiBXZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxl LmNvbT4KIAogICAgICAgICBXZWJLaXQyOiBBc3NlcnRpb24gd2hlbiBjYWxsaW5nIGRpZFBlcmZv cm0qUmVkaXJlY3Qgb24gbnVsbCBzb3VyY2UvZGVzdGluYXRpb24gVVJMIHN0cmluZwpkaWZmIC0t Z2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFjLm1t IGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFjLm1tCmlu ZGV4IGY2ZTU0M2ZhZTU2ZWE4MmEwYzhhYmI5MTMwYTgyMGFlZmY2NWFlMjYuLjY1NTQ5NWE1NjJi Zjg4YWY1MDlkYTA4ZDE1NTE2NDgzZWJlMmJiYzAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbQorKysgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0KQEAgLTM1NSw5ICszNTUsMjcg QEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bm90aWZ5RG9uZSgpCiAgICAgbV93YWl0VG9E dW1wID0gZmFsc2U7CiB9CiAKLUpTU3RyaW5nUmVmIExheW91dFRlc3RDb250cm9sbGVyOjpwYXRo VG9Mb2NhbFJlc291cmNlKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU1N0cmluZ1JlZiB1cmwpCi17 Ci0gICAgcmV0dXJuIEpTU3RyaW5nUmV0YWluKHVybCk7IC8vIERvIG5vdGhpbmcgb24gbWFjLgor SlNTdHJpbmdSZWYgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdGhUb0xvY2FsUmVzb3VyY2UoSlND b250ZXh0UmVmIGNvbnRleHQsIEpTU3RyaW5nUmVmIGxvY2FsUmVzb3VyY2UpCit7CisgICAgLy8g VGhlIHBhc3NlZCBpbiBwYXRoIHdpbGwgYmUgYW4gYWJzb2x1dGUgcGF0aCB0byB0aGUgbGF5b3V0 IHRlc3Qgc3RhcnRpbmcKKyAgICAvLyBhdCAvdG1wL0xheW91dFRlc3RzLiBIaXN0b3JpY2FsbHkg d2UgY3JlYXRlZCBhIC90bXAvTGF5b3V0VGVzdHMgc3ltbGluaworICAgIC8vIGJ1dCBub3QgYWxs IHBsYXRmb3JtcyBzdXBwb3J0IHN5bWxpbmtzIGFuZCBkZXBlbmRlbmNlIG9uIHN1Y2ggYSBzeW1s aW5rCisgICAgLy8gbWFkZSBpdCBpbXBvc3NpYmxlIGZvciBtdWx0aXBsZSB1c2VycyB0byBydW4g dGhlIGxheW91dCB0ZXN0cyAocGVybWlzc2lvbiBjb25mbGljdHMpLgorICAgIC8vIEluc3RlYWQg d2UgdXNlIHRoZSBhYnNvbHV0ZSBwYXRoIGZvciB0aGUgdGVzdCBmcm9tIG1fdGVzdFBhdGhPclVS TAorICAgIC8vIHRvIGNyZWF0ZSBhbiBhYnNvbHV0ZSBwYXRoIGZvciB0aGUgcmVxdWVzdGVkIGxv Y2FsIHJlc291cmNlLgorICAgIC8vIEZJWE1FOiBUaGlzIGNvZGUgc2hvdWxkIHdvcmsgb24gYWxs ICpuaXggcGxhdGZvcm1zIGFuZCBjYW4gYmUgbW92ZWQgaW50byBMYXlvdXRUZXN0Q29udHJvbGxl ci5jcHAuCisgICAgc2l6ZV90IG1heFJlc291cmNlTGVuZ3RoID0gSlNTdHJpbmdHZXRNYXhpbXVt VVRGOENTdHJpbmdTaXplKGxvY2FsUmVzb3VyY2UpOworICAgIGNoYXIqIHJlc291cmNlQXNVVEY4 ID0gbmV3IGNoYXJbbWF4UmVzb3VyY2VMZW5ndGhdOworICAgIHNpemVfdCByZXNvdXJjZUFzVVRG OExlbmd0aCA9IEpTU3RyaW5nR2V0VVRGOENTdHJpbmcobG9jYWxSZXNvdXJjZSwgcmVzb3VyY2VB c1VURjgsIG1heFJlc291cmNlTGVuZ3RoKTsKKworICAgIHN0ZDo6c3RyaW5nIHJlc291cmNlQXNX U3RyaW5nKHJlc291cmNlQXNVVEY4LCByZXNvdXJjZUFzVVRGOExlbmd0aCk7CisgICAgZGVsZXRl W10gcmVzb3VyY2VBc1VURjg7CisKKyAgICBzaXplX3QgcmVzb3VyY2VMYXlvdXRUZXN0c0luZGV4 ID0gcmVzb3VyY2VBc1dTdHJpbmcucmZpbmQoIi9MYXlvdXRUZXN0cy8iKTsKKyAgICBzaXplX3Qg dGVzdExheW91dFRlc3RzSW5kZXggPSBtX3Rlc3RQYXRoT3JVUkwucmZpbmQoIi9MYXlvdXRUZXN0 cy8iKTsKKyAgICBzdGQ6OnN0cmluZyByZXNvbHZlZFJlc291cmNlID0gbV90ZXN0UGF0aE9yVVJM LnN1YnN0cigwLCB0ZXN0TGF5b3V0VGVzdHNJbmRleCkgKyByZXNvdXJjZUFzV1N0cmluZy5zdWJz dHIocmVzb3VyY2VMYXlvdXRUZXN0c0luZGV4KTsKKworICAgIHJldHVybiBKU1N0cmluZ0NyZWF0 ZVdpdGhVVEY4Q1N0cmluZyhyZXNvbHZlZFJlc291cmNlLmNfc3RyKCkpOwogfQogCiB2b2lkIExh eW91dFRlc3RDb250cm9sbGVyOjpxdWV1ZUxvYWQoSlNTdHJpbmdSZWYgdXJsLCBKU1N0cmluZ1Jl ZiB0YXJnZXQpCg== 107711 2011-09-16 13:05:39 -0700 2011-09-16 16:00:02 -0700 work in progress bug-65781-20110916130538.patch text/plain 4924 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTUyMzgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCBmYWE5MGJhMTQ2ZTFkNmIyNGQ1OWQwZmYwOWUwMGM2MDRm MTc1MGM1Li5hZWRiOTU5ZDRlMTJmNjNhY2M2YzFjYWZmNDQyNzNiZTYzZjk2ZmRlIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIg QEAKIDIwMTEtMDktMTUgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCisgICAgICAg IFtOUldUXSBSRUdSRVNTSU9OOiBMb2NhbCBsb2FkZXIgdGVzdHMgYXJlIGZhaWxpbmcgb24gbWFj aGluZXMgdGhhdCBsb3N0IC90bXAvTGF5b3V0VGVzdHMgc3ltbGluaworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU3ODEKKworICAgICAgICBSZXZpZXdl ZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgSW5zdGVhZCBvZiBtYWtpbmcgTlJXVCBjcmVh dGUgdGhlIHN5bWxpbmssIEkganVzdCBtYWRlIER1bXBSZW5kZXJUcmVlIHNtYXJ0IGVub3VnaAor ICAgICAgICB0byByZXNvbHZlIHRoZSBwYXNzZWQgaW4gdXJsIHJlbGF0aXZlIHRvIHRoZSBhYnNv bHV0ZSB1cmwgZm9yIHRoZSB0ZXN0LgorCisgICAgICAgIEkgYmVsaWV2ZSB0aGlzIGlzIGEgYmV0 dGVyIGFwcHJvYWNoIHRoYW4gdGhlIG9uIHVzZWQgaW4gdGhlIFF0IGFuZCBDaHJvbWl1bSBEUlQn cworICAgICAgICAod2hpY2ggcmVzb2x2ZXMgdGhlIHBhdGggcmVsYXRpdmUgdG8gdGhlIGJ1aWx0 IGxvY2F0aW9uIG9mIHRoZSBEUlQgZXhlY3V0YWJsZSkKKyAgICAgICAgYW5kIHdlIHNob3VsZCBt b3ZlIHRoaXMgbmV3IGNvZGUgaW50byBhIHNoYXJlZCBsb2NhdGlvbiBpbiBhIGZvbGxvdy11cCBw YXRjaC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxl ck1hYy5tbToKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpwYXRoVG9Mb2NhbFJlc291 cmNlKToKKworMjAxMS0wOS0xNSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICB3ZWJraXQtcGF0Y2ggc2hv dWxkIGJlIGFibGUgdG8gZmluZCB1c2VycyBhbmQgYWRkIHRoZW0gdG8gYnVnemlsbGEgZ3JvdXBz CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xs ZXJNYWMubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJN YWMubW0KaW5kZXggZjZlNTQzZmFlNTZlYTgyYTBjOGFiYjkxMzBhODIwYWVmZjY1YWUyNi4uNTVl ZWJjYzg3YzM4M2ZhNzY1ZGUzNDQ4ZDQ3NjcyZDM3NTAxZjYzMSAxMDA2NDQKLS0tIGEvVG9vbHMv RHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFjLm1tCisrKyBiL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbQpAQCAtMzU1LDkg KzM1NSw1MSBAQCB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpub3RpZnlEb25lKCkKICAgICBt X3dhaXRUb0R1bXAgPSBmYWxzZTsKIH0KIAotSlNTdHJpbmdSZWYgTGF5b3V0VGVzdENvbnRyb2xs ZXI6OnBhdGhUb0xvY2FsUmVzb3VyY2UoSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTU3RyaW5nUmVm IHVybCkKK3N0YXRpYyBpbmxpbmUgc3RkOjpzdHJpbmcgc3RyaW5nRnJvbUpTU3RyaW5nKEpTU3Ry aW5nUmVmIGpzU3RyaW5nKQogewotICAgIHJldHVybiBKU1N0cmluZ1JldGFpbih1cmwpOyAvLyBE byBub3RoaW5nIG9uIG1hYy4KKyAgICBzaXplX3QgbWF4QnVmZmVyU2l6ZSA9IEpTU3RyaW5nR2V0 TWF4aW11bVVURjhDU3RyaW5nU2l6ZShqc1N0cmluZyk7CisgICAgY2hhciogdXRmOEJ1ZmZlciA9 IG5ldyBjaGFyW21heEJ1ZmZlclNpemVdOworICAgIHNpemVfdCB1dGY4U3RyaW5nTGVuZ3RoID0g SlNTdHJpbmdHZXRVVEY4Q1N0cmluZyhqc1N0cmluZywgdXRmOEJ1ZmZlciwgbWF4QnVmZmVyU2l6 ZSk7CisgICAgc3RkOjpzdHJpbmcgc3RkU3RyaW5nID0gc3RkOjpzdHJpbmcodXRmOEJ1ZmZlciwg dXRmOFN0cmluZ0xlbmd0aCk7CisgICAgZGVsZXRlW10gdXRmOEJ1ZmZlcjsKKyAgICByZXR1cm4g c3RkU3RyaW5nOworfQorCitzdGF0aWMgaW5saW5lIHN0ZDo6c3RyaW5nIHJlc291cmNlUm9vdEFi c29sdXRlUGF0aChjb25zdCBzdGQ6OnN0cmluZyYgdGVzdFBhdGhPclVSTCkKK3sKKyAgICBjaGFy KiBsb2NhbFJlc291cmNlUm9vdEVudiA9IGdldGVudigiTE9DQUxfUkVTT1VSQ0VfUk9PVCIpOwor ICAgIGlmIChsb2NhbFJlc291cmNlUm9vdEVudikKKyAgICAgICAgcmV0dXJuIHN0ZDo6c3RyaW5n KCk7CisKKyAgICAvLyBUaGlzIGZhbGxiYWNrIGFwcHJvYWNoIHdvcmtzIGZvciBub24taHR0cCB0 ZXN0cyBhbmQgaXMgdXNlZnVsCisgICAgLy8gaW4gdGhlIGNhc2Ugd2hlbiB3ZSdyZSBydW5uaW5n IERSVCBkaXJlY3RseSBmcm9tIHRoZSBjb21tYW5kIGxpbmUuCisgICAgc2l6ZV90IHRlc3RMYXlv dXRUZXN0c0luZGV4ID0gdGVzdFBhdGhPclVSTC5yZmluZCgiL0xheW91dFRlc3RzLyIpOworICAg IGlmICh0ZXN0TGF5b3V0VGVzdHNJbmRleCA9PSBzdGQ6OnN0cmluZzo6bnBvcykgeworICAgICAg ICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIHN0ZDo6c3RyaW5nKCk7Cisg ICAgfQorICAgIHJldHVybiB0ZXN0UGF0aE9yVVJMLnN1YnN0cigwLCB0ZXN0TGF5b3V0VGVzdHNJ bmRleCk7Cit9CisKK0pTU3RyaW5nUmVmIExheW91dFRlc3RDb250cm9sbGVyOjpwYXRoVG9Mb2Nh bFJlc291cmNlKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU1N0cmluZ1JlZiBsb2NhbFJlc291cmNl SlNTdHJpbmcpCit7CisgICAgLy8gVGhlIHBhc3NlZCBpbiBwYXRoIHdpbGwgYmUgYW4gYWJzb2x1 dGUgcGF0aCB0byB0aGUgcmVzb3VyY2Ugc3RhcnRpbmcKKyAgICAvLyB3aXRoICIvdG1wL0xheW91 dFRlc3RzIiBvciAiZmlsZTovLy90bXAvTGF5b3V0VGVzdHMiLgorICAgIC8vIFRoaXMgZnVuY3Rp b24gcmUtd3JpdGVzIHRoZSBwYXRoIHVzaW5nIExPQ0FMX1JFU09VUkNFX1JPT1QuCisgICAgLy8g RklYTUU6IFRoaXMgY29kZSBzaG91bGQgd29yayBvbiBhbGwgKm5peCBwbGF0Zm9ybXMgYW5kIGNh biBiZSBtb3ZlZCBpbnRvIExheW91dFRlc3RDb250cm9sbGVyLmNwcC4KKyAgICBzdGQ6OnN0cmlu ZyBhYnNvbHV0ZVBhdGhUb1Jlc291cmNlUm9vdCA9IHJlc291cmNlUm9vdEFic29sdXRlUGF0aCht X3Rlc3RQYXRoT3JVUkwpOworICAgIGlmIChhYnNvbHV0ZVBhdGhUb1Jlc291cmNlUm9vdC5lbXB0 eSgpKQorICAgICAgICByZXR1cm4gbG9jYWxSZXNvdXJjZUpTU3RyaW5nOworICAgIHN0ZDo6c3Ry aW5nIGxvY2FsUmVzb3VyY2VTdHJpbmcgPSBzdHJpbmdGcm9tSlNTdHJpbmcobG9jYWxSZXNvdXJj ZUpTU3RyaW5nKTsKKworICAgIHNpemVfdCByZXNvdXJjZUxheW91dFRlc3RzSW5kZXggPSBsb2Nh bFJlc291cmNlU3RyaW5nLnJmaW5kKCIvTGF5b3V0VGVzdHMvIik7CisgICAgaWYgKHJlc291cmNl TGF5b3V0VGVzdHNJbmRleCA9PSBzdGQ6OnN0cmluZzo6bnBvcykgeworICAgICAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIGxvY2FsUmVzb3VyY2VKU1N0cmluZzsKKyAg ICB9CisgICAgLy8gTm90ZTogVGhlIHJlc29sdmVkIHN0cmluZyBtYXkgbm90IGhhdmUgdGhlIHNh bWUgcHJvY290b2wgYXMgdGhlIG9yaWdpbmFsLgorICAgIHN0ZDo6c3RyaW5nIGFic29sdXRlUGF0 aFRvTG9jYWxSZXNvdXJjZSA9IGFic29sdXRlUGF0aFRvUmVzb3VyY2VSb290ICsgbG9jYWxSZXNv dXJjZVN0cmluZy5zdWJzdHIocmVzb3VyY2VMYXlvdXRUZXN0c0luZGV4KTsKKyAgICByZXR1cm4g SlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoYWJzb2x1dGVQYXRoVG9Mb2NhbFJlc291cmNl LmNfc3RyKCkpOwogfQogCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpxdWV1ZUxvYWQoSlNT dHJpbmdSZWYgdXJsLCBKU1N0cmluZ1JlZiB0YXJnZXQpCmRpZmYgLS1naXQgYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1Rvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IDA4NTA4NzJiNjFmZTZl ZWVjMTBhYWI0ZWM5N2IzNzNmY2MzNGNiNTguLmJkMjFhY2RlMTJjYWNhZTJhYmY3YzAyYWQ5Yzcw ZjRhNTViZTFmYWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvd2Via2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvd2Via2l0LnB5CkBAIC00NDYsNiArNDQ2LDcgQEAgY2xhc3MgV2ViS2l0RHJpdmVy KERyaXZlcik6CiAgICAgICAgIGVudmlyb25tZW50WydEWUxEX0ZSQU1FV09SS19QQVRIJ10gPSBz ZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCkKICAgICAgICAgIyBGSVhNRTogV2UncmUgYXNzdW1pbmcg dGhhdCBXZWJLaXRUZXN0UnVubmVyIGNoZWNrcyB0aGlzIER1bXBSZW5kZXJUcmVlLW5hbWVkIGVu dmlyb25tZW50IHZhcmlhYmxlLgogICAgICAgICBlbnZpcm9ubWVudFsnRFVNUFJFTkRFUlRSRUVf VEVNUCddID0gc3RyKHNlbGYuX2RyaXZlcl90ZW1wZGlyKQorICAgICAgICBlbnZpcm9ubWVudFsn TE9DQUxfUkVTT1VSQ0VfUk9PVCddID0gc2VsZi5fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkKICAg ICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3MgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQcm9jZXNz KHNlbGYuX3BvcnQsIHNlcnZlcl9uYW1lLCBzZWxmLmNtZF9saW5lKCksIGVudmlyb25tZW50KQog CiAgICAgZGVmIHBvbGwoc2VsZik6Cg== 107740 2011-09-16 16:00:07 -0700 2011-09-20 15:03:25 -0700 Patch bug-65781-20110916160006.patch text/plain 6949 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTUzMTQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvc2VjdXJpdHkvbG9jYWwtdXNlci1DU1MtZnJvbS1yZW1vdGUuaHRtbCBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbG9jYWwtdXNlci1DU1MtZnJvbS1yZW1vdGUuaHRtbApp bmRleCA2MGM1Njk5OGM1M2MyMDM1YTkzMzU1NmY5MWYxN2VjNGU2MmVmY2Q5Li5mY2FjZTZiNjJh OTAzZDkwODFkYjE5OWIyYWExNmExZmExMmU3ZDkzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3NlY3VyaXR5L2xvY2FsLXVzZXItQ1NTLWZyb20tcmVtb3RlLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9sb2NhbC11c2VyLUNTUy1mcm9tLXJlbW90 ZS5odG1sCkBAIC04LDcgKzgsOCBAQAogICAgICAgICAvLyBUaGlzIHdvbid0IHdvcmsgb3V0c2lk ZSBvZiBEUlQhCiAgICAgICAgIGlmICh3aW5kb3cubG9jYXRpb24uaGFzaCA9PSAnJykgewogICAg ICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOwotICAgICAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbigiZmlsZTov Ly90bXAvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9yZXNvdXJjZXMvY3NzU3R5bGUu Y3NzIik7CisgICAgICAgICAgICB2YXIgc3R5bGVzaGVldExvY2F0aW9uID0gbGF5b3V0VGVzdENv bnRyb2xsZXIucGF0aFRvTG9jYWxSZXNvdXJjZSgiZmlsZTovLy90bXAvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9yZXNvdXJjZXMvY3NzU3R5bGUuY3NzIik7CisgICAgICAgICAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5zZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKHN0eWxlc2hlZXRM b2NhdGlvbik7CiAgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRVc2VyU3R5bGVT aGVldEVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICBsb2NhdGlvbiArPSAnPyNkb25lJzsKICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDE2YThkMDM3MmIwY2Y3ZjNjOTE1OTZiNGRmZTcxOGNkMzc2M2ZkODEuLjg4MGZjNzNiN2Q4 NDUzOThhMzZjYjdiMzI2ZmI5NWFmZjc4NDM0YTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNCBAQAorMjAxMS0wOS0xNSAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW05SV1RdIFJFR1JFU1NJT046 IExvY2FsIGxvYWRlciB0ZXN0cyBhcmUgZmFpbGluZyBvbiBtYWNoaW5lcyB0aGF0IGxvc3QgL3Rt cC9MYXlvdXRUZXN0cyBzeW1saW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4K KworICAgICAgICBJbnN0ZWFkIG9mIG1ha2luZyBOUldUIGNyZWF0ZSB0aGUgc3ltbGluaywgSSBt YWRlIER1bXBSZW5kZXJUcmVlIHNtYXJ0IGVub3VnaAorICAgICAgICB0byByZXNvbHZlIHRoZSBw YXNzZWQgaW4gdXJsIHJlbGF0aXZlIHRvIHRoZSBhYnNvbHV0ZSB1cmwgZm9yIHRoZSB0ZXN0Lgor ICAgICAgICBGb3IgaHR0cCB0ZXN0cywgc2luY2UgdGhlIHRlc3QgdXJsIGlzIGFuIGh0dHAgdXJs LCB3ZSBjYW4ndCByZXNvbHZlIHJlbGF0aXZlCisgICAgICAgIHRvIHRoZSB0ZXN0IHBhdGgsIGFu ZCB0aHVzIHVzZSBhIG5ldyBMT0NBTF9SRVNPVVJDRV9ST09UIGVudmlyb25tZW50IHZhcmlhYmxl CisgICAgICAgIGZvciByZXNvbHZpbmcuCisKKyAgICAgICAgSSBiZWxpZXZlIHRoaXMgaXMgYSBi ZXR0ZXIgYXBwcm9hY2ggdGhhbiB0aGUgb24gdXNlZCBpbiB0aGUgUXQgYW5kIENocm9taXVtIERS VCdzCisgICAgICAgICh3aGljaCByZXNvbHZlcyB0aGUgcGF0aCByZWxhdGl2ZSB0byB0aGUgYnVp bHQgbG9jYXRpb24gb2YgdGhlIERSVCBleGVjdXRhYmxlKQorICAgICAgICBhbmQgd2Ugc2hvdWxk IG1vdmUgdGhpcyBuZXcgY29kZSBpbnRvIGEgc2hhcmVkIGxvY2F0aW9uIGluIGEgZm9sbG93LXVw IHBhdGNoLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9s bGVyTWFjLm1tOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdGhUb0xvY2FsUmVz b3VyY2UpOgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Vi a2l0LnB5OiBTZXQgTE9DQUxfUkVTT1VSQ0VfUk9PVCBmb3IgdXNlIGJ5IERSVC4KKwogMjAxMS0w OS0xNiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIFRl bXBvcmFyaWx5IHJlbW92ZSB0aGUgV0tIaXRUZXN0UmVzdWx0UmVmIHBhcmFtZXRlciB0byBhdm9p ZCBicmVha2luZyB0aGUgV0syIEFCSS9BUEkKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbSBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbQppbmRleCBmNmU1NDNmYWU1NmVhODJhMGM4 YWJiOTEzMGE4MjBhZWZmNjVhZTI2Li41YTFhYTFlYmFmZTc2ZDkyNzZjMzRlYTM1M2VmZjM5ZWNi ZjMyOTIxIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENv bnRyb2xsZXJNYWMubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RD b250cm9sbGVyTWFjLm1tCkBAIC0zNTUsOSArMzU1LDYyIEBAIHZvaWQgTGF5b3V0VGVzdENvbnRy b2xsZXI6Om5vdGlmeURvbmUoKQogICAgIG1fd2FpdFRvRHVtcCA9IGZhbHNlOwogfQogCi1KU1N0 cmluZ1JlZiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6cGF0aFRvTG9jYWxSZXNvdXJjZShKU0NvbnRl eHRSZWYgY29udGV4dCwgSlNTdHJpbmdSZWYgdXJsKQorc3RhdGljIGlubGluZSBzdGQ6OnN0cmlu ZyBzdHJpbmdGcm9tSlNTdHJpbmcoSlNTdHJpbmdSZWYganNTdHJpbmcpCiB7Ci0gICAgcmV0dXJu IEpTU3RyaW5nUmV0YWluKHVybCk7IC8vIERvIG5vdGhpbmcgb24gbWFjLgorICAgIHNpemVfdCBt YXhCdWZmZXJTaXplID0gSlNTdHJpbmdHZXRNYXhpbXVtVVRGOENTdHJpbmdTaXplKGpzU3RyaW5n KTsKKyAgICBjaGFyKiB1dGY4QnVmZmVyID0gbmV3IGNoYXJbbWF4QnVmZmVyU2l6ZV07CisgICAg c2l6ZV90IHV0ZjhTdHJpbmdMZW5ndGggPSBKU1N0cmluZ0dldFVURjhDU3RyaW5nKGpzU3RyaW5n LCB1dGY4QnVmZmVyLCBtYXhCdWZmZXJTaXplKTsKKyAgICBzdGQ6OnN0cmluZyBzdGRTdHJpbmcg PSBzdGQ6OnN0cmluZyh1dGY4QnVmZmVyLCB1dGY4U3RyaW5nTGVuZ3RoKTsKKyAgICBkZWxldGVb XSB1dGY4QnVmZmVyOworICAgIHJldHVybiBzdGRTdHJpbmc7Cit9CisKK3N0YXRpYyBpbmxpbmUg c3RkOjpzdHJpbmcgcmVzb3VyY2VSb290QWJzb2x1dGVQYXRoKGNvbnN0IHN0ZDo6c3RyaW5nJiB0 ZXN0UGF0aE9yVVJMLCBjb25zdCBzdGQ6OnN0cmluZyYgZXhwZWN0ZWRSb290TmFtZSkKK3sKKyAg ICBjaGFyKiBsb2NhbFJlc291cmNlUm9vdEVudiA9IGdldGVudigiTE9DQUxfUkVTT1VSQ0VfUk9P VCIpOworICAgIGlmIChsb2NhbFJlc291cmNlUm9vdEVudikKKyAgICAgICAgcmV0dXJuIHN0ZDo6 c3RyaW5nKGxvY2FsUmVzb3VyY2VSb290RW52KTsKKworICAgIC8vIFRoaXMgZmFsbGJhY2sgYXBw cm9hY2ggd29ya3MgZm9yIG5vbi1odHRwIHRlc3RzIGFuZCBpcyB1c2VmdWwKKyAgICAvLyBpbiB0 aGUgY2FzZSB3aGVuIHdlJ3JlIHJ1bm5pbmcgRFJUIGRpcmVjdGx5IGZyb20gdGhlIGNvbW1hbmQg bGluZS4KKyAgICBzdGQ6OnN0cmluZyBzZWFyY2hLZXkgPSAiLyIgKyBleHBlY3RlZFJvb3ROYW1l ICsgIi8iOworICAgIHNpemVfdCBpbmRleE9mUm9vdE5hbWVTdGFydCA9IHRlc3RQYXRoT3JVUkwu cmZpbmQoZXhwZWN0ZWRSb290TmFtZSk7CisgICAgaWYgKGluZGV4T2ZSb290TmFtZVN0YXJ0ID09 IHN0ZDo6c3RyaW5nOjpucG9zKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAg ICAgICByZXR1cm4gc3RkOjpzdHJpbmcoKTsKKyAgICB9CisgICAgLy8gQ2FsbGVycyBleHBlY3Qg dGhpcyByZXR1cm4gdmFsdWUgbm90IHRvIGVuZCBpbiAiLyIsIHNvIHNlYXJjaEtleS5sZW5ndGgo KSAtIDEuCisgICAgc2l6ZV90IGluZGV4T2ZTZXBhcmF0b3JBZnRlclJvb3ROYW1lID0gaW5kZXhP ZlJvb3ROYW1lU3RhcnQgKyBzZWFyY2hLZXkubGVuZ3RoKCkgLSAxOworICAgIHJldHVybiB0ZXN0 UGF0aE9yVVJMLnN1YnN0cigwLCBpbmRleE9mU2VwYXJhdG9yQWZ0ZXJSb290TmFtZSk7Cit9CisK K0pTU3RyaW5nUmVmIExheW91dFRlc3RDb250cm9sbGVyOjpwYXRoVG9Mb2NhbFJlc291cmNlKEpT Q29udGV4dFJlZiBjb250ZXh0LCBKU1N0cmluZ1JlZiBsb2NhbFJlc291cmNlSlNTdHJpbmcpCit7 CisgICAgLy8gVGhlIHBhc3NlZCBpbiBwYXRoIHdpbGwgYmUgYW4gYWJzb2x1dGUgcGF0aCB0byB0 aGUgcmVzb3VyY2Ugc3RhcnRpbmcKKyAgICAvLyB3aXRoICIvdG1wL0xheW91dFRlc3RzIiBvciAi ZmlsZTovLy90bXAvTGF5b3V0VGVzdHMiLgorICAgIC8vIFRoaXMgZnVuY3Rpb24gcmUtd3JpdGVz IHRoZSBwYXRoIHVzaW5nIExPQ0FMX1JFU09VUkNFX1JPT1QuCisgICAgLy8gRklYTUU6IFRoaXMg Y29kZSBzaG91bGQgd29yayBvbiBhbGwgKm5peCBwbGF0Zm9ybXMgYW5kIGNhbiBiZSBtb3ZlZCBp bnRvIExheW91dFRlc3RDb250cm9sbGVyLmNwcC4KKyAgICBzdGQ6OnN0cmluZyBleHBlY3RlZFJv b3ROYW1lKCJMYXlvdXRUZXN0cyIpOworICAgIHN0ZDo6c3RyaW5nIGFic29sdXRlUGF0aFRvUmVz b3VyY2VSb290ID0gcmVzb3VyY2VSb290QWJzb2x1dGVQYXRoKG1fdGVzdFBhdGhPclVSTCwgZXhw ZWN0ZWRSb290TmFtZSk7CisgICAgaWYgKGFic29sdXRlUGF0aFRvUmVzb3VyY2VSb290LmVtcHR5 KCkpCisgICAgICAgIHJldHVybiBsb2NhbFJlc291cmNlSlNTdHJpbmc7CisgICAgc3RkOjpzdHJp bmcgbG9jYWxSZXNvdXJjZVN0cmluZyA9IHN0cmluZ0Zyb21KU1N0cmluZyhsb2NhbFJlc291cmNl SlNTdHJpbmcpOworCisgICAgc3RkOjpzdHJpbmcgc2VhcmNoS2V5ID0gIi8iICsgZXhwZWN0ZWRS b290TmFtZSArICIvIjsKKyAgICBzaXplX3QgaW5kZXhPZlJvb3ROYW1lU3RhcnQgPSBsb2NhbFJl c291cmNlU3RyaW5nLnJmaW5kKHNlYXJjaEtleSk7CisgICAgaWYgKGluZGV4T2ZSb290TmFtZVN0 YXJ0ID09IHN0ZDo6c3RyaW5nOjpucG9zKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgp OworICAgICAgICByZXR1cm4gbG9jYWxSZXNvdXJjZUpTU3RyaW5nOworICAgIH0KKworICAgIHNp emVfdCBpbmRleE9mU2VwYXJhdG9yQWZ0ZXJSb290TmFtZSA9IGluZGV4T2ZSb290TmFtZVN0YXJ0 ICsgc2VhcmNoS2V5Lmxlbmd0aCgpIC0gMTsKKyAgICBzdGQ6OnN0cmluZyBhYnNvbHV0ZVBhdGhU b0xvY2FsUmVzb3VyY2UgPSBhYnNvbHV0ZVBhdGhUb1Jlc291cmNlUm9vdCArIGxvY2FsUmVzb3Vy Y2VTdHJpbmcuc3Vic3RyKGluZGV4T2ZTZXBhcmF0b3JBZnRlclJvb3ROYW1lKTsKKyAgICAvLyBO b3RlOiBJdCdzIGltcG9ydGFudCB0aGF0IHdlIGtlZXAgdGhlIGZpbGU6Ly8gb3IgaHR0cCB0ZXN0 cyB3aWxsIGdldCBjb25mdXNlZC4KKyAgICBpZiAobG9jYWxSZXNvdXJjZVN0cmluZy5maW5kKCJm aWxlOi8vIikgIT0gc3RkOjpzdHJpbmc6Om5wb3MpIHsKKyAgICAgICAgQVNTRVJUKGFic29sdXRl UGF0aFRvTG9jYWxSZXNvdXJjZVswXSA9PSAnLycpOworICAgICAgICBhYnNvbHV0ZVBhdGhUb0xv Y2FsUmVzb3VyY2UgPSBzdGQ6OnN0cmluZygiZmlsZTovLyIpICsgYWJzb2x1dGVQYXRoVG9Mb2Nh bFJlc291cmNlOworICAgIH0KKyAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRoVVRGOENTdHJp bmcoYWJzb2x1dGVQYXRoVG9Mb2NhbFJlc291cmNlLmNfc3RyKCkpOwogfQogCiB2b2lkIExheW91 dFRlc3RDb250cm9sbGVyOjpxdWV1ZUxvYWQoSlNTdHJpbmdSZWYgdXJsLCBKU1N0cmluZ1JlZiB0 YXJnZXQpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9w b3J0L3dlYmtpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQv d2Via2l0LnB5CmluZGV4IDA4NTA4NzJiNjFmZTZlZWVjMTBhYWI0ZWM5N2IzNzNmY2MzNGNiNTgu LmJkMjFhY2RlMTJjYWNhZTJhYmY3YzAyYWQ5YzcwZjRhNTViZTFmYWIgMTAwNjQ0Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CisrKyBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CkBAIC00NDYs NiArNDQ2LDcgQEAgY2xhc3MgV2ViS2l0RHJpdmVyKERyaXZlcik6CiAgICAgICAgIGVudmlyb25t ZW50WydEWUxEX0ZSQU1FV09SS19QQVRIJ10gPSBzZWxmLl9wb3J0Ll9idWlsZF9wYXRoKCkKICAg ICAgICAgIyBGSVhNRTogV2UncmUgYXNzdW1pbmcgdGhhdCBXZWJLaXRUZXN0UnVubmVyIGNoZWNr cyB0aGlzIER1bXBSZW5kZXJUcmVlLW5hbWVkIGVudmlyb25tZW50IHZhcmlhYmxlLgogICAgICAg ICBlbnZpcm9ubWVudFsnRFVNUFJFTkRFUlRSRUVfVEVNUCddID0gc3RyKHNlbGYuX2RyaXZlcl90 ZW1wZGlyKQorICAgICAgICBlbnZpcm9ubWVudFsnTE9DQUxfUkVTT1VSQ0VfUk9PVCddID0gc2Vs Zi5fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkKICAgICAgICAgc2VsZi5fc2VydmVyX3Byb2Nlc3Mg PSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzKHNlbGYuX3BvcnQsIHNlcnZlcl9uYW1lLCBz ZWxmLmNtZF9saW5lKCksIGVudmlyb25tZW50KQogCiAgICAgZGVmIHBvbGwoc2VsZik6Cg== 108058 2011-09-20 15:03:31 -0700 2011-09-20 17:47:21 -0700 Patch bug-65781-20110920150330.patch text/plain 7714 eric U3VidmVyc2lvbiBSZXZpc2lvbjogOTUzMTQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvc2VjdXJpdHkvbG9jYWwtdXNlci1DU1MtZnJvbS1yZW1vdGUuaHRtbCBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvbG9jYWwtdXNlci1DU1MtZnJvbS1yZW1vdGUuaHRtbApp bmRleCA2MGM1Njk5OGM1M2MyMDM1YTkzMzU1NmY5MWYxN2VjNGU2MmVmY2Q5Li5mY2FjZTZiNjJh OTAzZDkwODFkYjE5OWIyYWExNmExZmExMmU3ZDkzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3NlY3VyaXR5L2xvY2FsLXVzZXItQ1NTLWZyb20tcmVtb3RlLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9sb2NhbC11c2VyLUNTUy1mcm9tLXJlbW90 ZS5odG1sCkBAIC04LDcgKzgsOCBAQAogICAgICAgICAvLyBUaGlzIHdvbid0IHdvcmsgb3V0c2lk ZSBvZiBEUlQhCiAgICAgICAgIGlmICh3aW5kb3cubG9jYXRpb24uaGFzaCA9PSAnJykgewogICAg ICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIud2FpdFVudGlsRG9uZSgpOwotICAgICAgICAg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0VXNlclN0eWxlU2hlZXRMb2NhdGlvbigiZmlsZTov Ly90bXAvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9yZXNvdXJjZXMvY3NzU3R5bGUu Y3NzIik7CisgICAgICAgICAgICB2YXIgc3R5bGVzaGVldExvY2F0aW9uID0gbGF5b3V0VGVzdENv bnRyb2xsZXIucGF0aFRvTG9jYWxSZXNvdXJjZSgiZmlsZTovLy90bXAvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9yZXNvdXJjZXMvY3NzU3R5bGUuY3NzIik7CisgICAgICAgICAgICBs YXlvdXRUZXN0Q29udHJvbGxlci5zZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uKHN0eWxlc2hlZXRM b2NhdGlvbik7CiAgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRVc2VyU3R5bGVT aGVldEVuYWJsZWQodHJ1ZSk7CiAgICAgICAgICAgICBsb2NhdGlvbiArPSAnPyNkb25lJzsKICAg ICAgICAgfQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IDE2YThkMDM3MmIwY2Y3ZjNjOTE1OTZiNGRmZTcxOGNkMzc2M2ZkODEuLjRlMDM1ZDM5YmY3 Y2VlNDI0MTEyNTk3YWRmODA1MGFjMGU0ZjNjOTYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOSBAQAorMjAxMS0wOS0xNSAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW05SV1RdIFJFR1JFU1NJT046 IExvY2FsIGxvYWRlciB0ZXN0cyBhcmUgZmFpbGluZyBvbiBtYWNoaW5lcyB0aGF0IGxvc3QgL3Rt cC9MYXlvdXRUZXN0cyBzeW1saW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02NTc4MQorCisgICAgICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4K KworICAgICAgICBJbnN0ZWFkIG9mIG1ha2luZyBOUldUIGNyZWF0ZSB0aGUgc3ltbGluaywgSSBt YWRlIER1bXBSZW5kZXJUcmVlIHNtYXJ0IGVub3VnaAorICAgICAgICB0byByZXNvbHZlIHRoZSBw YXNzZWQgaW4gdXJsIHJlbGF0aXZlIHRvIHRoZSBhYnNvbHV0ZSB1cmwgZm9yIHRoZSB0ZXN0Lgor ICAgICAgICBGb3IgaHR0cCB0ZXN0cywgc2luY2UgdGhlIHRlc3QgdXJsIGlzIGFuIGh0dHAgdXJs LCB3ZSBjYW4ndCByZXNvbHZlIHJlbGF0aXZlCisgICAgICAgIHRvIHRoZSB0ZXN0IHBhdGgsIGFu ZCB0aHVzIHVzZSBhIG5ldyBMT0NBTF9SRVNPVVJDRV9ST09UIGVudmlyb25tZW50IHZhcmlhYmxl CisgICAgICAgIGZvciByZXNvbHZpbmcuCisKKyAgICAgICAgSSBiZWxpZXZlIHRoaXMgaXMgYSBi ZXR0ZXIgYXBwcm9hY2ggdGhhbiB0aGUgb24gdXNlZCBpbiB0aGUgUXQgYW5kIENocm9taXVtIERS VCdzCisgICAgICAgICh3aGljaCByZXNvbHZlcyB0aGUgcGF0aCByZWxhdGl2ZSB0byB0aGUgYnVp bHQgbG9jYXRpb24gb2YgdGhlIERSVCBleGVjdXRhYmxlKQorICAgICAgICBhbmQgd2Ugc2hvdWxk IG1vdmUgdGhpcyBuZXcgY29kZSBpbnRvIGEgc2hhcmVkIGxvY2F0aW9uIGluIGEgZm9sbG93LXVw IHBhdGNoLgorCisgICAgICAgIEl0IHR1cm5zIG91dCB0aGF0IHRoZXJlIHdhcyBhIHNlY29uZCB1 c2UgZm9yIHBhdGhUb0xvY2FsUmVzb3VyY2UsIHVzZWQgYnkgb25lCisgICAgICAgIHRlc3QgKGh0 dHAvdGVzdHMvcGx1Z2lucy9wb3N0LXVybC1maWxlLmh0bWwpIHVzZWQgZm9yIGdldHRpbmcgYSBw YXRoIHRvIC90bXAuCisgICAgICAgIFRvIHN1cHBvcnQgdGhpcyB0ZXN0IEkgbWFkZSB0aGUgbmV3 IHBhdGhUb0xvY2FsUmVzb3VyY2Ugc21hcnQgZW5vdWdoIHRvIG1hcAorICAgICAgICAvdG1wIHRv IERVTVBSRU5ERVJUUkVFX1RFTVAgKHdoaWNoIGlzIGFscmVhZHkgZGVmaW5lZCBmb3IgYWxsIHBv cnRzKS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxl ck1hYy5tbToKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjpwYXRoVG9Mb2NhbFJlc291 cmNlKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtp dC5weTogU2V0IExPQ0FMX1JFU09VUkNFX1JPT1QgZm9yIHVzZSBieSBEUlQuCisKIDIwMTEtMDkt MTYgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBUZW1w b3JhcmlseSByZW1vdmUgdGhlIFdLSGl0VGVzdFJlc3VsdFJlZiBwYXJhbWV0ZXIgdG8gYXZvaWQg YnJlYWtpbmcgdGhlIFdLMiBBQkkvQVBJCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJl ZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0gYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9t YWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0KaW5kZXggZjZlNTQzZmFlNTZlYTgyYTBjOGFi YjkxMzBhODIwYWVmZjY1YWUyNi4uMzEwZGFmYTQ1Mzk3ZmZmOTBjOTE4NWQ3MmVjZjA2YmIyZGQ0 NTFhOCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250 cm9sbGVyTWFjLm1tCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29u dHJvbGxlck1hYy5tbQpAQCAtMzU1LDkgKzM1NSw2OCBAQCB2b2lkIExheW91dFRlc3RDb250cm9s bGVyOjpub3RpZnlEb25lKCkKICAgICBtX3dhaXRUb0R1bXAgPSBmYWxzZTsKIH0KIAotSlNTdHJp bmdSZWYgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnBhdGhUb0xvY2FsUmVzb3VyY2UoSlNDb250ZXh0 UmVmIGNvbnRleHQsIEpTU3RyaW5nUmVmIHVybCkKK3N0YXRpYyBpbmxpbmUgc3RkOjpzdHJpbmcg c3RyaW5nRnJvbUpTU3RyaW5nKEpTU3RyaW5nUmVmIGpzU3RyaW5nKQogewotICAgIHJldHVybiBK U1N0cmluZ1JldGFpbih1cmwpOyAvLyBEbyBub3RoaW5nIG9uIG1hYy4KKyAgICBzaXplX3QgbWF4 QnVmZmVyU2l6ZSA9IEpTU3RyaW5nR2V0TWF4aW11bVVURjhDU3RyaW5nU2l6ZShqc1N0cmluZyk7 CisgICAgY2hhciogdXRmOEJ1ZmZlciA9IG5ldyBjaGFyW21heEJ1ZmZlclNpemVdOworICAgIHNp emVfdCBieXRlc1dyaXR0ZW5Ub1VURjhCdWZmZXIgPSBKU1N0cmluZ0dldFVURjhDU3RyaW5nKGpz U3RyaW5nLCB1dGY4QnVmZmVyLCBtYXhCdWZmZXJTaXplKTsKKyAgICBzdGQ6OnN0cmluZyBzdGRT dHJpbmcodXRmOEJ1ZmZlciwgYnl0ZXNXcml0dGVuVG9VVEY4QnVmZmVyIC0gMSk7IC8vIGJ5dGVz V3JpdHRlblRvVVRGOEJ1ZmZlciBpbmNsdWRlcyBhIHRyYWlsaW5nIFwwIHdoaWNoIHN0ZDo6c3Ry aW5nIGRvZXNuJ3QgbmVlZC4KKyAgICBkZWxldGVbXSB1dGY4QnVmZmVyOworICAgIHJldHVybiBz dGRTdHJpbmc7Cit9CisKK3N0YXRpYyBpbmxpbmUgc2l6ZV90IGluZGV4T2ZTZXBhcmF0b3JBZnRl ckRpcmVjdG9yeU5hbWUoY29uc3Qgc3RkOjpzdHJpbmcmIGRpcmVjdG9yeU5hbWUsIGNvbnN0IHN0 ZDo6c3RyaW5nJiBmdWxsUGF0aCkKK3sKKyAgICBzdGQ6OnN0cmluZyBzZWFyY2hLZXkgPSAiLyIg KyBkaXJlY3RvcnlOYW1lICsgIi8iOworICAgIHNpemVfdCBpbmRleE9mU2VhcmNoS2V5U3RhcnQg PSBmdWxsUGF0aC5yZmluZChzZWFyY2hLZXkpOworICAgIGlmIChpbmRleE9mU2VhcmNoS2V5U3Rh cnQgPT0gc3RkOjpzdHJpbmc6Om5wb3MpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgIHJldHVybiAwOworICAgIH0KKyAgICAvLyBDYWxsZXJzIGV4cGVjdCB0aGUgcmV0 dXJuIHZhbHVlIG5vdCB0byBlbmQgaW4gIi8iLCBzbyBzZWFyY2hLZXkubGVuZ3RoKCkgLSAxLgor ICAgIHJldHVybiBpbmRleE9mU2VhcmNoS2V5U3RhcnQgKyBzZWFyY2hLZXkubGVuZ3RoKCkgLSAx OworfQorCitzdGF0aWMgaW5saW5lIHN0ZDo6c3RyaW5nIHJlc291cmNlUm9vdEFic29sdXRlUGF0 aChjb25zdCBzdGQ6OnN0cmluZyYgdGVzdFBhdGhPclVSTCwgY29uc3Qgc3RkOjpzdHJpbmcmIGV4 cGVjdGVkUm9vdE5hbWUpCit7CisgICAgY2hhciogbG9jYWxSZXNvdXJjZVJvb3RFbnYgPSBnZXRl bnYoIkxPQ0FMX1JFU09VUkNFX1JPT1QiKTsKKyAgICBpZiAobG9jYWxSZXNvdXJjZVJvb3RFbnYp CisgICAgICAgIHJldHVybiBzdGQ6OnN0cmluZyhsb2NhbFJlc291cmNlUm9vdEVudik7CisKKyAg ICAvLyBUaGlzIGZhbGxiYWNrIGFwcHJvYWNoIHdvcmtzIGZvciBub24taHR0cCB0ZXN0cyBhbmQg aXMgdXNlZnVsCisgICAgLy8gaW4gdGhlIGNhc2Ugd2hlbiB3ZSdyZSBydW5uaW5nIERSVCBkaXJl Y3RseSBmcm9tIHRoZSBjb21tYW5kIGxpbmUuCisgICAgcmV0dXJuIHRlc3RQYXRoT3JVUkwuc3Vi c3RyKDAsIGluZGV4T2ZTZXBhcmF0b3JBZnRlckRpcmVjdG9yeU5hbWUoZXhwZWN0ZWRSb290TmFt ZSwgdGVzdFBhdGhPclVSTCkpOworfQorCitKU1N0cmluZ1JlZiBMYXlvdXRUZXN0Q29udHJvbGxl cjo6cGF0aFRvTG9jYWxSZXNvdXJjZShKU0NvbnRleHRSZWYgY29udGV4dCwgSlNTdHJpbmdSZWYg bG9jYWxSZXNvdXJjZUpTU3RyaW5nKQoreworICAgIC8vIFRoZSBwYXNzZWQgaW4gcGF0aCB3aWxs IGJlIGFuIGFic29sdXRlIHBhdGggdG8gdGhlIHJlc291cmNlIHN0YXJ0aW5nCisgICAgLy8gd2l0 aCAiL3RtcCIgb3IgIi90bXAvTGF5b3V0VGVzdHMiLCBvcHRpb25hbGx5IHN0YXJ0aW5nIHdpdGgg dGhlIGV4cGxpY2l0IGZpbGU6Ly8gcHJvdG9jb2wuCisgICAgLy8gL3RtcCBtYXBzIHRvIERVTVBS RU5ERVJUUkVFX1RFTVAsIGFuZCAvdG1wL0xheW91dFRlc3RzIG1hcHMgdG8gTE9DQUxfUkVTT1VS Q0VfUk9PVC4KKyAgICAvLyBGSVhNRTogVGhpcyBjb2RlIHNob3VsZCB3b3JrIG9uIGFsbCAqbml4 IHBsYXRmb3JtcyBhbmQgY2FuIGJlIG1vdmVkIGludG8gTGF5b3V0VGVzdENvbnRyb2xsZXIuY3Bw LgorICAgIHN0ZDo6c3RyaW5nIGV4cGVjdGVkUm9vdE5hbWU7CisgICAgc3RkOjpzdHJpbmcgYWJz b2x1dGVQYXRoVG9SZXNvdXJjZVJvb3Q7CisgICAgc3RkOjpzdHJpbmcgbG9jYWxSZXNvdXJjZVN0 cmluZyA9IHN0cmluZ0Zyb21KU1N0cmluZyhsb2NhbFJlc291cmNlSlNTdHJpbmcpOworCisgICAg aWYgKGxvY2FsUmVzb3VyY2VTdHJpbmcuZmluZCgiTGF5b3V0VGVzdHMiKSAhPSBzdGQ6OnN0cmlu Zzo6bnBvcykgeworICAgICAgICBleHBlY3RlZFJvb3ROYW1lID0gIkxheW91dFRlc3RzIjsKKyAg ICAgICAgYWJzb2x1dGVQYXRoVG9SZXNvdXJjZVJvb3QgPSByZXNvdXJjZVJvb3RBYnNvbHV0ZVBh dGgobV90ZXN0UGF0aE9yVVJMLCBleHBlY3RlZFJvb3ROYW1lKTsKKyAgICB9IGVsc2UgaWYgKGxv Y2FsUmVzb3VyY2VTdHJpbmcuZmluZCgidG1wIikgIT0gc3RkOjpzdHJpbmc6Om5wb3MpIHsKKyAg ICAgICAgZXhwZWN0ZWRSb290TmFtZSA9ICJ0bXAiOworICAgICAgICBhYnNvbHV0ZVBhdGhUb1Jl c291cmNlUm9vdCA9IGdldGVudigiRFVNUFJFTkRFUlRSRUVfVEVNUCIpOworICAgIH0gZWxzZSB7 CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyAvLyBwYXRoVG9Mb2NhbFJlc291cmNlIHdh cyBwYXNzZWQgYSBwYXRoIGl0IGRvZXNuJ3Qga25vdyBob3cgdG8gbWFwLgorICAgIH0KKyAgICBB U1NFUlQoIWFic29sdXRlUGF0aFRvUmVzb3VyY2VSb290LmVtcHR5KCkpOworICAgIHNpemVfdCBp bmRleE9mU2VwYXJhdG9yQWZ0ZXJSb290TmFtZSA9IGluZGV4T2ZTZXBhcmF0b3JBZnRlckRpcmVj dG9yeU5hbWUoZXhwZWN0ZWRSb290TmFtZSwgbG9jYWxSZXNvdXJjZVN0cmluZyk7CisgICAgc3Rk OjpzdHJpbmcgYWJzb2x1dGVQYXRoVG9Mb2NhbFJlc291cmNlID0gYWJzb2x1dGVQYXRoVG9SZXNv dXJjZVJvb3QgKyBsb2NhbFJlc291cmNlU3RyaW5nLnN1YnN0cihpbmRleE9mU2VwYXJhdG9yQWZ0 ZXJSb290TmFtZSk7CisKKyAgICAvLyBOb3RlOiBJdCdzIGltcG9ydGFudCB0aGF0IHdlIGtlZXAg dGhlIGZpbGU6Ly8gb3IgaHR0cCB0ZXN0cyB3aWxsIGdldCBjb25mdXNlZC4KKyAgICBpZiAobG9j YWxSZXNvdXJjZVN0cmluZy5maW5kKCJmaWxlOi8vIikgIT0gc3RkOjpzdHJpbmc6Om5wb3MpIHsK KyAgICAgICAgQVNTRVJUKGFic29sdXRlUGF0aFRvTG9jYWxSZXNvdXJjZVswXSA9PSAnLycpOwor ICAgICAgICBhYnNvbHV0ZVBhdGhUb0xvY2FsUmVzb3VyY2UgPSBzdGQ6OnN0cmluZygiZmlsZTov LyIpICsgYWJzb2x1dGVQYXRoVG9Mb2NhbFJlc291cmNlOworICAgIH0KKyAgICByZXR1cm4gSlNT dHJpbmdDcmVhdGVXaXRoVVRGOENTdHJpbmcoYWJzb2x1dGVQYXRoVG9Mb2NhbFJlc291cmNlLmNf c3RyKCkpOwogfQogCiB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpxdWV1ZUxvYWQoSlNTdHJp bmdSZWYgdXJsLCBKU1N0cmluZ1JlZiB0YXJnZXQpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L3dlYmtpdC5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvd2Via2l0LnB5CmluZGV4IDA4NTA4NzJiNjFmZTZlZWVj MTBhYWI0ZWM5N2IzNzNmY2MzNGNiNTguLmJkMjFhY2RlMTJjYWNhZTJhYmY3YzAyYWQ5YzcwZjRh NTViZTFmYWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2Via2l0LnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3Rz L3BvcnQvd2Via2l0LnB5CkBAIC00NDYsNiArNDQ2LDcgQEAgY2xhc3MgV2ViS2l0RHJpdmVyKERy aXZlcik6CiAgICAgICAgIGVudmlyb25tZW50WydEWUxEX0ZSQU1FV09SS19QQVRIJ10gPSBzZWxm Ll9wb3J0Ll9idWlsZF9wYXRoKCkKICAgICAgICAgIyBGSVhNRTogV2UncmUgYXNzdW1pbmcgdGhh dCBXZWJLaXRUZXN0UnVubmVyIGNoZWNrcyB0aGlzIER1bXBSZW5kZXJUcmVlLW5hbWVkIGVudmly b25tZW50IHZhcmlhYmxlLgogICAgICAgICBlbnZpcm9ubWVudFsnRFVNUFJFTkRFUlRSRUVfVEVN UCddID0gc3RyKHNlbGYuX2RyaXZlcl90ZW1wZGlyKQorICAgICAgICBlbnZpcm9ubWVudFsnTE9D QUxfUkVTT1VSQ0VfUk9PVCddID0gc2VsZi5fcG9ydC5sYXlvdXRfdGVzdHNfZGlyKCkKICAgICAg ICAgc2VsZi5fc2VydmVyX3Byb2Nlc3MgPSBzZXJ2ZXJfcHJvY2Vzcy5TZXJ2ZXJQcm9jZXNzKHNl bGYuX3BvcnQsIHNlcnZlcl9uYW1lLCBzZWxmLmNtZF9saW5lKCksIGVudmlyb25tZW50KQogCiAg ICAgZGVmIHBvbGwoc2VsZik6Cg==