42875 2010-07-23 00:11:12 -0700 Atomize strings used by the HTML5 tree builder 2010-07-24 18:03:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 abarth abarth commit-queue eric hyatt oldest_to_newest 255228 0 abarth 2010-07-23 00:11:12 -0700 Atomize strings used by the HTML5 tree builder 255229 1 62385 abarth 2010-07-23 00:12:15 -0700 Created attachment 62385 Patch 255230 2 abarth 2010-07-23 00:12:56 -0700 These numbers are from my laptop on battery, so they're not as rock solid as usual. Your milage may vary: == pre == Running 20 times Ignoring warm-up run (4940) 4330 4334 4304 4390 4409 4338 4331 4353 4349 4360 4364 4368 4378 4379 4378 4399 4416 4396 4429 4468 avg 4373.65 stdev 38.241698445545005 == post == Running 20 times Ignoring warm-up run (4825) 4251 4298 4262 4262 4282 4312 4346 4312 4304 4327 4325 4319 4342 4343 4337 4379 4352 4358 4376 4363 avg 4322.5 stdev 36.51232668565508 255350 3 62385 commit-queue 2010-07-23 06:38:31 -0700 Comment on attachment 62385 Patch Rejecting patch 62385 from commit-queue. Failed to run "['WebKitTools/Scripts/run-webkit-tests', '--no-launch-safari', '--exit-after-n-failures=1', '--ignore-tests', 'compositing', '--quiet']" exit_code: 1 Running build-dumprendertree Compiling Java tests make: Nothing to be done for `default'. Running tests from /Users/eseidel/Projects/CommitQueue/LayoutTests Testing 20713 test cases. html5lib/runner.html -> failed Exiting early after 1 failures. 15522 tests run. 318.97s total testing time 15521 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 26 test cases (<1%) had stderr output Full output: http://queues.webkit.org/results/3566399 255448 4 abarth 2010-07-23 10:04:29 -0700 I don't understand how this patch affected the old tree builder. For example, the bgsound element no longer appears in the DOM... 255487 5 62452 abarth 2010-07-23 11:39:02 -0700 Created attachment 62452 Patch 255489 6 abarth 2010-07-23 11:40:10 -0700 Eric, please take another look. The fix for this issue is kind of goofy. :( 255507 7 62452 eric 2010-07-23 12:19:24 -0700 Comment on attachment 62452 Patch That's just crazy. I wonder how many other tags like this that we're "recognizing" and not supposed to. I don't understand why this is the correct fix. Why haven't we had trouble when we added <video> and <audio> etc? 255532 8 abarth 2010-07-23 13:28:14 -0700 It looks like some of the other conditional tags are in the static HashSet<AtomicStringImpl*>* inlineTagList() However, not all of them have their conditions, which leads me to believe those builds are broken. It's also unclear to me whether we parse HTML the same when you change these compile flags. I'll be glad to get rid of this mess. At the moment, the attached patch appears to be the most expedient. 255537 9 eric 2010-07-23 13:43:48 -0700 OK. I'll look at the patch again this evening. I just want to make sure we're not completely pooping on the old tree builder. I'm certainly not going to ask you to re-arch it or anything, but I'd like to stare at how the other tags are working before r+ing this. 255649 10 62452 darin 2010-07-23 21:23:15 -0700 Comment on attachment 62452 Patch > + if (*tags[i] == HTMLNames::bgsoundTag Why not "using namespace HTMLNames" at the top of this file? r=me 255718 11 abarth 2010-07-24 08:32:41 -0700 > Why not "using namespace HTMLNames" at the top of this file? Will do. 255724 12 62506 abarth 2010-07-24 09:54:05 -0700 Created attachment 62506 Patch for landing 255776 13 62506 commit-queue 2010-07-24 18:03:27 -0700 Comment on attachment 62506 Patch for landing Clearing flags on attachment: 62506 Committed r64018: <http://trac.webkit.org/changeset/64018> 255777 14 commit-queue 2010-07-24 18:03:32 -0700 All reviewed patches have been landed. Closing bug. 62385 2010-07-23 00:12:15 -0700 2010-07-23 11:38:56 -0700 Patch bug-42875-20100723001214.patch text/plain 7965 abarth ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWZkYTlmZDcyZGQ0NDA2YzNiYTRkZjJhMDJkZjdiZWUwNzhlMDg4Ni4uYzZhNjI2MGY4OGVhYjEy ZDI1MDhhYTBkNGE2YmI1YzQ3N2IwMTJlNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wNy0yMyAgQWRh bSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEF0b21pemUgc3RyaW5ncyB1c2VkIGJ5IHRoZSBIVE1MNSB0 cmVlIGJ1aWxkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTQyODc1CisKKyAgICAgICAgVGhpcyBpcyBhYm91dCBhIDElIGltcHJvdmVtZW50IHRvIHRo ZSBwYXJzaW5nIGJlbmNobWFyay4KKworICAgICAgICAqIGh0bWwvSFRNTFRhZ05hbWVzLmluOgor ICAgICAgICAqIGh0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9ySW5Cb2R5KToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKToKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0VuZFRhZ0ZvckluQm9keSk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluSGVhZCk6CisKIDIwMTAt MDctMjIgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVGFnTmFt ZXMuaW4gYi9XZWJDb3JlL2h0bWwvSFRNTFRhZ05hbWVzLmluCmluZGV4IDljNjZhOTU3NGE4ZGE3 NjllOGNlNGJhZGFjYTU1ODNiZGZhNDFjODMuLjk0ODIzMzE2MDg1OGRiNjI1MTk1NDM0MmEwYWUz NDllYTEwMzQyNjAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVGFnTmFtZXMuaW4KKysr IGIvV2ViQ29yZS9odG1sL0hUTUxUYWdOYW1lcy5pbgpAQCAtMTUsNiArMTUsNyBAQCBiIGludGVy ZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGJhc2UKIGJhc2Vmb250IGludGVyZmFjZU5hbWU9SFRNTEJh c2VGb250RWxlbWVudAogYmRvIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKK2Jnc291bmQgaW50 ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogYmlnIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGJs b2NrcXVvdGUKIGJvZHkKQEAgLTI3LDYgKzI4LDcgQEAgY2l0ZSBpbnRlcmZhY2VOYW1lPUhUTUxF bGVtZW50CiBjb2RlIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGNvbCBpbnRlcmZhY2VOYW1l PUhUTUxUYWJsZUNvbEVsZW1lbnQKIGNvbGdyb3VwIGludGVyZmFjZU5hbWU9SFRNTFRhYmxlQ29s RWxlbWVudAorY29tbWFuZCBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBkYXRhZ3JpZCBpbnRl cmZhY2VOYW1lPUhUTUxEYXRhR3JpZEVsZW1lbnQsIGNvbmRpdGlvbmFsPURBVEFHUklECiBkYXRh bGlzdCBpbnRlcmZhY2VOYW1lPUhUTUxEYXRhTGlzdEVsZW1lbnQsIGNvbmRpdGlvbmFsPURBVEFM SVNUCiBkY2VsbCBpbnRlcmZhY2VOYW1lPUhUTUxEYXRhR3JpZENlbGxFbGVtZW50LCBjb25kaXRp b25hbD1EQVRBR1JJRApAQCAtMzQsNiArMzYsNyBAQCBkY29sIGludGVyZmFjZU5hbWU9SFRNTERh dGFHcmlkQ29sRWxlbWVudCwgY29uZGl0aW9uYWw9REFUQUdSSUQKIGRyb3cgaW50ZXJmYWNlTmFt ZT1IVE1MRGF0YUdyaWRSb3dFbGVtZW50LCBjb25kaXRpb25hbD1EQVRBR1JJRAogZGQgaW50ZXJm YWNlTmFtZT1IVE1MRWxlbWVudAogZGVsIGludGVyZmFjZU5hbWU9SFRNTE1vZEVsZW1lbnQKK2Rl dGFpbHMgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogZGZuIGludGVyZmFjZU5hbWU9SFRNTEVs ZW1lbnQKIGRpciBpbnRlcmZhY2VOYW1lPUhUTUxEaXJlY3RvcnlFbGVtZW50CiBkaXYKQEAgLTQy LDYgKzQ1LDggQEAgZHQgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogZW0gaW50ZXJmYWNlTmFt ZT1IVE1MRWxlbWVudAogZW1iZWQKIGZpZWxkc2V0IGludGVyZmFjZU5hbWU9SFRNTEZpZWxkU2V0 RWxlbWVudCwgY29uc3RydWN0b3JOZWVkc0Zvcm1FbGVtZW50CitmaWdjYXB0aW9uIGludGVyZmFj ZU5hbWU9SFRNTEVsZW1lbnQKK2ZpZ3VyZSBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBmb250 CiBmb290ZXIgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogZm9ybQpAQCAtMTA5LDYgKzExNCw3 IEBAIHN0cmlrZSBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBzdHJvbmcgaW50ZXJmYWNlTmFt ZT1IVE1MRWxlbWVudAogc3R5bGUgY29uc3RydWN0b3JOZWVkc0NyZWF0ZWRCeVBhcnNlcgogc3Vi IGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKK3N1bW1hcnkgaW50ZXJmYWNlTmFtZT1IVE1MRWxl bWVudAogc3VwIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIHRhYmxlCiB0Ym9keSBpbnRlcmZh Y2VOYW1lPUhUTUxUYWJsZVNlY3Rpb25FbGVtZW50CkBAIC0xMTksNiArMTI1LDggQEAgdGggaW50 ZXJmYWNlTmFtZT1IVE1MVGFibGVDZWxsRWxlbWVudAogdGhlYWQgaW50ZXJmYWNlTmFtZT1IVE1M VGFibGVTZWN0aW9uRWxlbWVudAogdGl0bGUKIHRyIGludGVyZmFjZU5hbWU9SFRNTFRhYmxlUm93 RWxlbWVudAordHJhY2sgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAordHQgaW50ZXJmYWNlTmFt ZT1IVE1MRWxlbWVudAogdHQgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogdSBpbnRlcmZhY2VO YW1lPUhUTUxFbGVtZW50CiB1bCBpbnRlcmZhY2VOYW1lPUhUTUxVTGlzdEVsZW1lbnQKZGlmZiAt LWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVHJlZUJ1aWxkZXIuY3BwIGIvV2ViQ29yZS9odG1sL0hU TUxUcmVlQnVpbGRlci5jcHAKaW5kZXggNjBhYWJhZDg3MDc0YWVlNGFmNThhOTM5NDE2ZTllMDRh YjY1Y2EyYi4uYWU5M2IzYTI4NmRhMjYzYTU3ZWJlMTgyODdjOTI5ZWFiMDdhMDU1MiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUcmVlQnVpbGRlci5jcHAKKysrIGIvV2ViQ29yZS9odG1s L0hUTUxUcmVlQnVpbGRlci5jcHAKQEAgLTEyMCw3ICsxMjAsNyBAQCBib29sIGlzU3BlY2lhbFRh Zyhjb25zdCBBdG9taWNTdHJpbmcmIHRhZ05hbWUpCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gYXNp ZGVUYWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBiYXNlVGFnCiAgICAgICAgIHx8IHRhZ05hbWUg PT0gYmFzZWZvbnRUYWcKLSAgICAgICAgfHwgdGFnTmFtZSA9PSAiYmdzb3VuZCIKKyAgICAgICAg fHwgdGFnTmFtZSA9PSBiZ3NvdW5kVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gYmxvY2txdW90 ZVRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGJvZHlUYWcKICAgICAgICAgfHwgdGFnTmFtZSA9 PSBiclRhZwpAQCAtMTI4LDE2ICsxMjgsMTYgQEAgYm9vbCBpc1NwZWNpYWxUYWcoY29uc3QgQXRv bWljU3RyaW5nJiB0YWdOYW1lKQogICAgICAgICB8fCB0YWdOYW1lID09IGNlbnRlclRhZwogICAg ICAgICB8fCB0YWdOYW1lID09IGNvbFRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGNvbGdyb3Vw VGFnCi0gICAgICAgIHx8IHRhZ05hbWUgPT0gImNvbW1hbmQiCisgICAgICAgIHx8IHRhZ05hbWUg PT0gY29tbWFuZFRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGRkVGFnCi0gICAgICAgIHx8IHRh Z05hbWUgPT0gImRldGFpbHMiCisgICAgICAgIHx8IHRhZ05hbWUgPT0gZGV0YWlsc1RhZwogICAg ICAgICB8fCB0YWdOYW1lID09IGRpclRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGRpdlRhZwog ICAgICAgICB8fCB0YWdOYW1lID09IGRsVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZHRUYWcK ICAgICAgICAgfHwgdGFnTmFtZSA9PSBlbWJlZFRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGZp ZWxkc2V0VGFnCi0gICAgICAgIHx8IHRhZ05hbWUgPT0gImZpZ3VyZSIKKyAgICAgICAgfHwgdGFn TmFtZSA9PSBmaWd1cmVUYWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBmb290ZXJUYWcKICAgICAg ICAgfHwgdGFnTmFtZSA9PSBmb3JtVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZnJhbWVUYWcK QEAgLTc3MSw4ICs3NzEsOCBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFn Rm9ySW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgfQogICAgIGlmICh0b2tlbi5u YW1lKCkgPT0gYmFzZVRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmFzZWZvbnRUYWcK LSAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09ICJiZ3NvdW5kIgotICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gImNvbW1hbmQiCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBiZ3NvdW5kVGFn CisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBjb21tYW5kVGFnCiAgICAgICAgIHx8IHRva2Vu Lm5hbWUoKSA9PSBsaW5rVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBtZXRhVGFnCiAg ICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBub2ZyYW1lc1RhZwpAQCAtODA3LDEzICs4MDcsMTMg QEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZ0ZvckluQm9keShBdG9taWNI VE1MVG9rZW4mIHRva2VuKQogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYXNpZGVUYWcKICAg ICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGJsb2NrcXVvdGVUYWcKICAgICAgICAgfHwgdG9rZW4u bmFtZSgpID09IGNlbnRlclRhZwotICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImRldGFpbHMi CisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBkZXRhaWxzVGFnCiAgICAgICAgIHx8IHRva2Vu Lm5hbWUoKSA9PSBkaXJUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGRpdlRhZwogICAg ICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZGxUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09 IGZpZWxkc2V0VGFnCi0gICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSAiZmlnY2FwdGlvbiIKLSAg ICAgICAgfHwgdG9rZW4ubmFtZSgpID09ICJmaWd1cmUiCisgICAgICAgIHx8IHRva2VuLm5hbWUo KSA9PSBmaWdjYXB0aW9uVGFnCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBmaWd1cmVUYWcK ICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGZvb3RlclRhZwogICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gaGVhZGVyVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBoZ3JvdXBUYWcK QEAgLTgyMiw3ICs4MjIsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFn Rm9ySW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIHx8IHRva2VuLm5hbWUo KSA9PSBvbFRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gcFRhZwogICAgICAgICB8fCB0 b2tlbi5uYW1lKCkgPT0gc2VjdGlvblRhZwotICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gInN1 bW1hcnkiCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBzdW1tYXJ5VGFnCiAgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSB1bFRhZykgewogICAgICAgICBwcm9jZXNzRmFrZVBFbmRUYWdJZlBJ bkJ1dHRvblNjb3BlKCk7CiAgICAgICAgIG1fdHJlZS5pbnNlcnRIVE1MRWxlbWVudCh0b2tlbik7 CkBAIC05NDQsNyArOTQ0LDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRh Z0ZvckluQm9keShBdG9taWNIVE1MVG9rZW4mIHRva2VuKQogICAgIH0KICAgICBpZiAodG9rZW4u bmFtZSgpID09IHBhcmFtVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBzb3VyY2VUYWcK LSAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09ICJ0cmFjayIpIHsKKyAgICAgICAgfHwgdG9rZW4u bmFtZSgpID09IHRyYWNrVGFnKSB7CiAgICAgICAgIG1fdHJlZS5pbnNlcnRTZWxmQ2xvc2luZ0hU TUxFbGVtZW50KHRva2VuKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTEyMzQsNyArMTIz NCw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXRvbWljSFRNTFRv a2VuJiB0b2tlbikKICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJhc2VU YWcKICAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBiYXNlZm9udFRhZwotICAgICAgICAg ICAgfHwgdG9rZW4ubmFtZSgpID09ICJiZ3NvdW5kIgorICAgICAgICAgICAgfHwgdG9rZW4ubmFt ZSgpID09IGJnc291bmRUYWcKICAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBsaW5rVGFn CiAgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gbWV0YVRhZwogICAgICAgICAgICAgfHwg dG9rZW4ubmFtZSgpID09IG5vZnJhbWVzVGFnCkBAIC0xMzgxLDcgKzEzODEsNyBAQCB2b2lkIEhU TUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnKEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgaWYgKHRva2VuLm5hbWUoKSA9 PSBiYXNlZm9udFRhZwotICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09ICJiZ3NvdW5kIgor ICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGJnc291bmRUYWcKICAgICAgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSBsaW5rVGFnCiAgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g bWV0YVRhZwogICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG5vZnJhbWVzVGFnCkBAIC0x OTQxLDEyICsxOTQxLDEyIEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzRW5kVGFnRm9y SW5Cb2R5KEF0b21pY0hUTUxUb2tlbiYgdG9rZW4pCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9 PSBibG9ja3F1b3RlVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBidXR0b25UYWcKICAg ICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGNlbnRlclRhZwotICAgICAgICB8fCB0b2tlbi5uYW1l KCkgPT0gImRldGFpbHMiCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBkZXRhaWxzVGFnCiAg ICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBkaXJUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgp ID09IGRpdlRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZGxUYWcKICAgICAgICAgfHwg dG9rZW4ubmFtZSgpID09IGZpZWxkc2V0VGFnCi0gICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSAi ZmlndXJlIgorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZmlndXJlVGFnCiAgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSBmb290ZXJUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGhl YWRlclRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gaGdyb3VwVGFnCkBAIC0yNzQxLDEx ICsyNzQxLDEwIEBAIGJvb2wgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3JJbkhl YWQoQXRvbWljSFRNTFRva2VuJiB0b2tlbikKICAgICAgICAgbV90cmVlLmluc2VydEhUTUxIdG1s U3RhcnRUYWdJbkJvZHkodG9rZW4pOwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9Ci0gICAg Ly8gRklYTUU6IEF0b21pemUgImNvbW1hbmQiLgogICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gYmFz ZVRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmFzZWZvbnRUYWcKLSAgICAgICAgfHwg dG9rZW4ubmFtZSgpID09ICJiZ3NvdW5kIgotICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImNv bW1hbmQiCisgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBiZ3NvdW5kVGFnCisgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSBjb21tYW5kVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBs aW5rVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBtZXRhVGFnKSB7CiAgICAgICAgIG1f dHJlZS5pbnNlcnRTZWxmQ2xvc2luZ0hUTUxFbGVtZW50KHRva2VuKTsK 62452 2010-07-23 11:39:02 -0700 2010-07-24 09:53:53 -0700 Patch bug-42875-20100723113859.patch text/plain 8860 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzk4OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDctMjMgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KKworICAgICAgICBBdG9taXpl IHN0cmluZ3MgdXNlZCBieSB0aGUgSFRNTDUgdHJlZSBidWlsZGVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mjg3NQorCisgICAgICAgIFRoaXMgaXMg YWJvdXQgYSAxJSBpbXByb3ZlbWVudCB0byB0aGUgcGFyc2luZyBiZW5jaG1hcmsuCisKKyAgICAg ICAgKiBodG1sL0hUTUxUYWdOYW1lcy5pbjoKKyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRh Z0ZvckluQm9keSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NT dGFydFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRU YWdGb3JJbkJvZHkpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNz U3RhcnRUYWdGb3JJbkhlYWQpOgorCiAyMDEwLTA3LTIzICBSYWZhZWwgQW50b2dub2xsaSAgPGFu dG9nbm9sbGlAcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQW50b25pbyBH b21lcy4KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcAkocmV2aXNpb24gNjM5ODgpCisrKyBXZWJDb3Jl L2h0bWwvSFRNTEVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03ODgsOCArNzg4LDIxIEBA IGJvb2wgSFRNTEVsZW1lbnQ6OmlzUmVjb2duaXplZFRhZ05hbWUoY28KICAgICBpZiAodGFnTGlz dC5pc0VtcHR5KCkpIHsKICAgICAgICAgc2l6ZV90IHRhZ0NvdW50ID0gMDsKICAgICAgICAgV2Vi Q29yZTo6UXVhbGlmaWVkTmFtZSoqIHRhZ3MgPSBIVE1MTmFtZXM6OmdldEhUTUxUYWdzKCZ0YWdD b3VudCk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgdGFnQ291bnQ7IGkrKykKKyAg ICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0YWdDb3VudDsgaSsrKSB7CisgICAgICAgICAg ICBpZiAoKnRhZ3NbaV0gPT0gSFRNTE5hbWVzOjpiZ3NvdW5kVGFnCisgICAgICAgICAgICAgICAg fHwgKnRhZ3NbaV0gPT0gSFRNTE5hbWVzOjpjb21tYW5kVGFnCisgICAgICAgICAgICAgICAgfHwg KnRhZ3NbaV0gPT0gSFRNTE5hbWVzOjpkZXRhaWxzVGFnCisgICAgICAgICAgICAgICAgfHwgKnRh Z3NbaV0gPT0gSFRNTE5hbWVzOjpmaWdjYXB0aW9uVGFnCisgICAgICAgICAgICAgICAgfHwgKnRh Z3NbaV0gPT0gSFRNTE5hbWVzOjpmaWd1cmVUYWcKKyAgICAgICAgICAgICAgICB8fCAqdGFnc1tp XSA9PSBIVE1MTmFtZXM6OnN1bW1hcnlUYWcKKyAgICAgICAgICAgICAgICB8fCAqdGFnc1tpXSA9 PSBIVE1MTmFtZXM6OnRyYWNrVGFnKSB7CisgICAgICAgICAgICAgICAgLy8gRXZlbiB0aG91Z2gg d2UgaGF2ZSBhdG9tcyBmb3IgdGhlc2UgdGFncywgd2UgZG9uJ3Qgd2FudCB0bworICAgICAgICAg ICAgICAgIC8vIHRyZWF0IHRoZW0gYXMgInJlY29nbml6ZWQgdGFncyIgZm9yIHRoZSBwdXJwb3Nl IG9mIHBhcnNpbmcKKyAgICAgICAgICAgICAgICAvLyBiZWNhdXNlIHRoYXQgY2hhbmdlcyBob3cg d2UgcGFyc2UgZG9jdW1lbnRzLgorICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAg ICAgfQogICAgICAgICAgICAgdGFnTGlzdC5hZGQodGFnc1tpXS0+bG9jYWxOYW1lKCkuaW1wbCgp KTsKKyAgICAgICAgfQogICAgIH0KICAgICByZXR1cm4gdGFnTGlzdC5jb250YWlucyh0YWdOYW1l LmxvY2FsTmFtZSgpLmltcGwoKSk7CiB9CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFRhZ05hbWVz LmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MVGFnTmFtZXMuaW4JKHJldmlzaW9u IDYzOTg4KQorKysgV2ViQ29yZS9odG1sL0hUTUxUYWdOYW1lcy5pbgkod29ya2luZyBjb3B5KQpA QCAtMTUsNiArMTUsNyBAQCBiIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGJhc2UKIGJhc2Vm b250IGludGVyZmFjZU5hbWU9SFRNTEJhc2VGb250RWxlbWVudAogYmRvIGludGVyZmFjZU5hbWU9 SFRNTEVsZW1lbnQKK2Jnc291bmQgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogYmlnIGludGVy ZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGJsb2NrcXVvdGUKIGJvZHkKQEAgLTI3LDYgKzI4LDcgQEAg Y2l0ZSBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBjb2RlIGludGVyZmFjZU5hbWU9SFRNTEVs ZW1lbnQKIGNvbCBpbnRlcmZhY2VOYW1lPUhUTUxUYWJsZUNvbEVsZW1lbnQKIGNvbGdyb3VwIGlu dGVyZmFjZU5hbWU9SFRNTFRhYmxlQ29sRWxlbWVudAorY29tbWFuZCBpbnRlcmZhY2VOYW1lPUhU TUxFbGVtZW50CiBkYXRhZ3JpZCBpbnRlcmZhY2VOYW1lPUhUTUxEYXRhR3JpZEVsZW1lbnQsIGNv bmRpdGlvbmFsPURBVEFHUklECiBkYXRhbGlzdCBpbnRlcmZhY2VOYW1lPUhUTUxEYXRhTGlzdEVs ZW1lbnQsIGNvbmRpdGlvbmFsPURBVEFMSVNUCiBkY2VsbCBpbnRlcmZhY2VOYW1lPUhUTUxEYXRh R3JpZENlbGxFbGVtZW50LCBjb25kaXRpb25hbD1EQVRBR1JJRApAQCAtMzQsNiArMzYsNyBAQCBk Y29sIGludGVyZmFjZU5hbWU9SFRNTERhdGFHcmlkQ29sRWxlbWVuCiBkcm93IGludGVyZmFjZU5h bWU9SFRNTERhdGFHcmlkUm93RWxlbWVudCwgY29uZGl0aW9uYWw9REFUQUdSSUQKIGRkIGludGVy ZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGRlbCBpbnRlcmZhY2VOYW1lPUhUTUxNb2RFbGVtZW50Citk ZXRhaWxzIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGRmbiBpbnRlcmZhY2VOYW1lPUhUTUxF bGVtZW50CiBkaXIgaW50ZXJmYWNlTmFtZT1IVE1MRGlyZWN0b3J5RWxlbWVudAogZGl2CkBAIC00 Miw2ICs0NSw4IEBAIGR0IGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGVtIGludGVyZmFjZU5h bWU9SFRNTEVsZW1lbnQKIGVtYmVkCiBmaWVsZHNldCBpbnRlcmZhY2VOYW1lPUhUTUxGaWVsZFNl dEVsZW1lbnQsIGNvbnN0cnVjdG9yTmVlZHNGb3JtRWxlbWVudAorZmlnY2FwdGlvbiBpbnRlcmZh Y2VOYW1lPUhUTUxFbGVtZW50CitmaWd1cmUgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogZm9u dAogZm9vdGVyIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGZvcm0KQEAgLTEwOSw2ICsxMTQs NyBAQCBzdHJpa2UgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogc3Ryb25nIGludGVyZmFjZU5h bWU9SFRNTEVsZW1lbnQKIHN0eWxlIGNvbnN0cnVjdG9yTmVlZHNDcmVhdGVkQnlQYXJzZXIKIHN1 YiBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CitzdW1tYXJ5IGludGVyZmFjZU5hbWU9SFRNTEVs ZW1lbnQKIHN1cCBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiB0YWJsZQogdGJvZHkgaW50ZXJm YWNlTmFtZT1IVE1MVGFibGVTZWN0aW9uRWxlbWVudApAQCAtMTE5LDYgKzEyNSw3IEBAIHRoIGlu dGVyZmFjZU5hbWU9SFRNTFRhYmxlQ2VsbEVsZW1lbnQKIHRoZWFkIGludGVyZmFjZU5hbWU9SFRN TFRhYmxlU2VjdGlvbkVsZW1lbnQKIHRpdGxlCiB0ciBpbnRlcmZhY2VOYW1lPUhUTUxUYWJsZVJv d0VsZW1lbnQKK3RyYWNrIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIHR0IGludGVyZmFjZU5h bWU9SFRNTEVsZW1lbnQKIHUgaW50ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogdWwgaW50ZXJmYWNl TmFtZT1IVE1MVUxpc3RFbGVtZW50CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVy LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAkocmV2 aXNpb24gNjM5ODgpCisrKyBXZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMTE5LDcgKzExOSw3IEBAIGJvb2wgaXNTcGVjaWFsVGFnKGNvbnN0IEF0b21p Y1N0cmluZyYgdGEKICAgICAgICAgfHwgdGFnTmFtZSA9PSBhc2lkZVRhZwogICAgICAgICB8fCB0 YWdOYW1lID09IGJhc2VUYWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBiYXNlZm9udFRhZwotICAg ICAgICB8fCB0YWdOYW1lID09ICJiZ3NvdW5kIgorICAgICAgICB8fCB0YWdOYW1lID09IGJnc291 bmRUYWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBibG9ja3F1b3RlVGFnCiAgICAgICAgIHx8IHRh Z05hbWUgPT0gYm9keVRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGJyVGFnCkBAIC0xMjcsMTYg KzEyNywxNiBAQCBib29sIGlzU3BlY2lhbFRhZyhjb25zdCBBdG9taWNTdHJpbmcmIHRhCiAgICAg ICAgIHx8IHRhZ05hbWUgPT0gY2VudGVyVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gY29sVGFn CiAgICAgICAgIHx8IHRhZ05hbWUgPT0gY29sZ3JvdXBUYWcKLSAgICAgICAgfHwgdGFnTmFtZSA9 PSAiY29tbWFuZCIKKyAgICAgICAgfHwgdGFnTmFtZSA9PSBjb21tYW5kVGFnCiAgICAgICAgIHx8 IHRhZ05hbWUgPT0gZGRUYWcKLSAgICAgICAgfHwgdGFnTmFtZSA9PSAiZGV0YWlscyIKKyAgICAg ICAgfHwgdGFnTmFtZSA9PSBkZXRhaWxzVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZGlyVGFn CiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZGl2VGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZGxU YWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBkdFRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGVt YmVkVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZmllbGRzZXRUYWcKLSAgICAgICAgfHwgdGFn TmFtZSA9PSAiZmlndXJlIgorICAgICAgICB8fCB0YWdOYW1lID09IGZpZ3VyZVRhZwogICAgICAg ICB8fCB0YWdOYW1lID09IGZvb3RlclRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGZvcm1UYWcK ICAgICAgICAgfHwgdGFnTmFtZSA9PSBmcmFtZVRhZwpAQCAtNzcwLDggKzc3MCw4IEBAIHZvaWQg SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3IKICAgICB9CiAgICAgaWYgKHRva2Vu Lm5hbWUoKSA9PSBiYXNlVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBiYXNlZm9udFRh ZwotICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImJnc291bmQiCi0gICAgICAgIHx8IHRva2Vu Lm5hbWUoKSA9PSAiY29tbWFuZCIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGJnc291bmRU YWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGNvbW1hbmRUYWcKICAgICAgICAgfHwgdG9r ZW4ubmFtZSgpID09IGxpbmtUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG1ldGFUYWcK ICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG5vZnJhbWVzVGFnCkBAIC04MDYsMTMgKzgwNiwx MyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9yCiAgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSBhc2lkZVRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmxv Y2txdW90ZVRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gY2VudGVyVGFnCi0gICAgICAg IHx8IHRva2VuLm5hbWUoKSA9PSAiZGV0YWlscyIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09 IGRldGFpbHNUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGRpclRhZwogICAgICAgICB8 fCB0b2tlbi5uYW1lKCkgPT0gZGl2VGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBkbFRh ZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZmllbGRzZXRUYWcKLSAgICAgICAgfHwgdG9r ZW4ubmFtZSgpID09ICJmaWdjYXB0aW9uIgotICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImZp Z3VyZSIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGZpZ2NhcHRpb25UYWcKKyAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IGZpZ3VyZVRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g Zm9vdGVyVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBoZWFkZXJUYWcKICAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IGhncm91cFRhZwpAQCAtODIxLDcgKzgyMSw3IEBAIHZvaWQgSFRN TFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdGb3IKICAgICAgICAgfHwgdG9rZW4ubmFtZSgp ID09IG9sVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBwVGFnCiAgICAgICAgIHx8IHRv a2VuLm5hbWUoKSA9PSBzZWN0aW9uVGFnCi0gICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSAic3Vt bWFyeSIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHN1bW1hcnlUYWcKICAgICAgICAgfHwg dG9rZW4ubmFtZSgpID09IHVsVGFnKSB7CiAgICAgICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUElu QnV0dG9uU2NvcGUoKTsKICAgICAgICAgbV90cmVlLmluc2VydEhUTUxFbGVtZW50KHRva2VuKTsK QEAgLTk0Myw3ICs5NDMsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFn Rm9yCiAgICAgfQogICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gcGFyYW1UYWcKICAgICAgICAgfHwg dG9rZW4ubmFtZSgpID09IHNvdXJjZVRhZwotICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gInRy YWNrIikgeworICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gdHJhY2tUYWcpIHsKICAgICAgICAg bV90cmVlLmluc2VydFNlbGZDbG9zaW5nSFRNTEVsZW1lbnQodG9rZW4pOwogICAgICAgICByZXR1 cm47CiAgICAgfQpAQCAtMTIzMyw3ICsxMjMzLDcgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnBy b2Nlc3NTdGFydFRhZyhBdAogICAgICAgICB9CiAgICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0g YmFzZVRhZwogICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGJhc2Vmb250VGFnCi0gICAg ICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImJnc291bmQiCisgICAgICAgICAgICB8fCB0b2tl bi5uYW1lKCkgPT0gYmdzb3VuZFRhZwogICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGxp bmtUYWcKICAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBtZXRhVGFnCiAgICAgICAgICAg ICB8fCB0b2tlbi5uYW1lKCkgPT0gbm9mcmFtZXNUYWcKQEAgLTEzODAsNyArMTM4MCw3IEBAIHZv aWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWcoQXQKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQogICAgICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJhc2Vmb250VGFnCi0g ICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImJnc291bmQiCisgICAgICAgICAgICB8fCB0 b2tlbi5uYW1lKCkgPT0gYmdzb3VuZFRhZwogICAgICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09 IGxpbmtUYWcKICAgICAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBtZXRhVGFnCiAgICAgICAg ICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gbm9mcmFtZXNUYWcKQEAgLTE5NDAsMTIgKzE5NDAsMTIg QEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRUYWdGb3JJbgogICAgICAgICB8fCB0 b2tlbi5uYW1lKCkgPT0gYmxvY2txdW90ZVRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g YnV0dG9uVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBjZW50ZXJUYWcKLSAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09ICJkZXRhaWxzIgorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g ZGV0YWlsc1RhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZGlyVGFnCiAgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSBkaXZUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGRsVGFn CiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBmaWVsZHNldFRhZwotICAgICAgICB8fCB0b2tl bi5uYW1lKCkgPT0gImZpZ3VyZSIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGZpZ3VyZVRh ZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZm9vdGVyVGFnCiAgICAgICAgIHx8IHRva2Vu Lm5hbWUoKSA9PSBoZWFkZXJUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGhncm91cFRh ZwpAQCAtMjc0MCwxMSArMjc0MCwxMCBAQCBib29sIEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0 YXJ0VGFnRm9yCiAgICAgICAgIG1fdHJlZS5pbnNlcnRIVE1MSHRtbFN0YXJ0VGFnSW5Cb2R5KHRv a2VuKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQotICAgIC8vIEZJWE1FOiBBdG9taXpl ICJjb21tYW5kIi4KICAgICBpZiAodG9rZW4ubmFtZSgpID09IGJhc2VUYWcKICAgICAgICAgfHwg dG9rZW4ubmFtZSgpID09IGJhc2Vmb250VGFnCi0gICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSAi Ymdzb3VuZCIKLSAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09ICJjb21tYW5kIgorICAgICAgICB8 fCB0b2tlbi5uYW1lKCkgPT0gYmdzb3VuZFRhZworICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g Y29tbWFuZFRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gbGlua1RhZwogICAgICAgICB8 fCB0b2tlbi5uYW1lKCkgPT0gbWV0YVRhZykgewogICAgICAgICBtX3RyZWUuaW5zZXJ0U2VsZkNs b3NpbmdIVE1MRWxlbWVudCh0b2tlbik7Cg== 62506 2010-07-24 09:54:05 -0700 2010-07-24 18:03:27 -0700 Patch for landing bug-42875-20100724095404.patch text/plain 8773 abarth SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2NDAwOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDctMjQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRlbC4KKworICAgICAgICBBdG9taXpl IHN0cmluZ3MgdXNlZCBieSB0aGUgSFRNTDUgdHJlZSBidWlsZGVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Mjg3NQorCisgICAgICAgIFRoaXMgaXMg YWJvdXQgYSAxJSBpbXByb3ZlbWVudCB0byB0aGUgcGFyc2luZyBiZW5jaG1hcmsuCisKKyAgICAg ICAgKiBodG1sL0hUTUxUYWdOYW1lcy5pbjoKKyAgICAgICAgKiBodG1sL0hUTUxUcmVlQnVpbGRl ci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRh Z0ZvckluQm9keSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NT dGFydFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NFbmRU YWdGb3JJbkJvZHkpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNz U3RhcnRUYWdGb3JJbkhlYWQpOgorCiAyMDEwLTA3LTIzICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBh cm9nYUBwYXJvZ2EuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRl eDogV2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0 bWwvSFRNTEVsZW1lbnQuY3BwCShyZXZpc2lvbiA2NDAwOSkKKysrIFdlYkNvcmUvaHRtbC9IVE1M RWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTc4OCw4ICs3ODgsMjEgQEAgYm9vbCBIVE1M RWxlbWVudDo6aXNSZWNvZ25pemVkVGFnTmFtZShjbwogICAgIGlmICh0YWdMaXN0LmlzRW1wdHko KSkgewogICAgICAgICBzaXplX3QgdGFnQ291bnQgPSAwOwogICAgICAgICBXZWJDb3JlOjpRdWFs aWZpZWROYW1lKiogdGFncyA9IEhUTUxOYW1lczo6Z2V0SFRNTFRhZ3MoJnRhZ0NvdW50KTsKLSAg ICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCB0YWdDb3VudDsgaSsrKQorICAgICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IHRhZ0NvdW50OyBpKyspIHsKKyAgICAgICAgICAgIGlmICgqdGFn c1tpXSA9PSBiZ3NvdW5kVGFnCisgICAgICAgICAgICAgICAgfHwgKnRhZ3NbaV0gPT0gY29tbWFu ZFRhZworICAgICAgICAgICAgICAgIHx8ICp0YWdzW2ldID09IGRldGFpbHNUYWcKKyAgICAgICAg ICAgICAgICB8fCAqdGFnc1tpXSA9PSBmaWdjYXB0aW9uVGFnCisgICAgICAgICAgICAgICAgfHwg KnRhZ3NbaV0gPT0gZmlndXJlVGFnCisgICAgICAgICAgICAgICAgfHwgKnRhZ3NbaV0gPT0gc3Vt bWFyeVRhZworICAgICAgICAgICAgICAgIHx8ICp0YWdzW2ldID09IHRyYWNrVGFnKSB7CisgICAg ICAgICAgICAgICAgLy8gRXZlbiB0aG91Z2ggd2UgaGF2ZSBhdG9tcyBmb3IgdGhlc2UgdGFncywg d2UgZG9uJ3Qgd2FudCB0bworICAgICAgICAgICAgICAgIC8vIHRyZWF0IHRoZW0gYXMgInJlY29n bml6ZWQgdGFncyIgZm9yIHRoZSBwdXJwb3NlIG9mIHBhcnNpbmcKKyAgICAgICAgICAgICAgICAv LyBiZWNhdXNlIHRoYXQgY2hhbmdlcyBob3cgd2UgcGFyc2UgZG9jdW1lbnRzLgorICAgICAgICAg ICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQogICAgICAgICAgICAgdGFnTGlzdC5hZGQo dGFnc1tpXS0+bG9jYWxOYW1lKCkuaW1wbCgpKTsKKyAgICAgICAgfQogICAgIH0KICAgICByZXR1 cm4gdGFnTGlzdC5jb250YWlucyh0YWdOYW1lLmxvY2FsTmFtZSgpLmltcGwoKSk7CiB9CkluZGV4 OiBXZWJDb3JlL2h0bWwvSFRNTFRhZ05hbWVzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRt bC9IVE1MVGFnTmFtZXMuaW4JKHJldmlzaW9uIDY0MDA5KQorKysgV2ViQ29yZS9odG1sL0hUTUxU YWdOYW1lcy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTUsNiArMTUsNyBAQCBiIGludGVyZmFjZU5h bWU9SFRNTEVsZW1lbnQKIGJhc2UKIGJhc2Vmb250IGludGVyZmFjZU5hbWU9SFRNTEJhc2VGb250 RWxlbWVudAogYmRvIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKK2Jnc291bmQgaW50ZXJmYWNl TmFtZT1IVE1MRWxlbWVudAogYmlnIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGJsb2NrcXVv dGUKIGJvZHkKQEAgLTI3LDYgKzI4LDcgQEAgY2l0ZSBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50 CiBjb2RlIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGNvbCBpbnRlcmZhY2VOYW1lPUhUTUxU YWJsZUNvbEVsZW1lbnQKIGNvbGdyb3VwIGludGVyZmFjZU5hbWU9SFRNTFRhYmxlQ29sRWxlbWVu dAorY29tbWFuZCBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBkYXRhZ3JpZCBpbnRlcmZhY2VO YW1lPUhUTUxEYXRhR3JpZEVsZW1lbnQsIGNvbmRpdGlvbmFsPURBVEFHUklECiBkYXRhbGlzdCBp bnRlcmZhY2VOYW1lPUhUTUxEYXRhTGlzdEVsZW1lbnQsIGNvbmRpdGlvbmFsPURBVEFMSVNUCiBk Y2VsbCBpbnRlcmZhY2VOYW1lPUhUTUxEYXRhR3JpZENlbGxFbGVtZW50LCBjb25kaXRpb25hbD1E QVRBR1JJRApAQCAtMzQsNiArMzYsNyBAQCBkY29sIGludGVyZmFjZU5hbWU9SFRNTERhdGFHcmlk Q29sRWxlbWVuCiBkcm93IGludGVyZmFjZU5hbWU9SFRNTERhdGFHcmlkUm93RWxlbWVudCwgY29u ZGl0aW9uYWw9REFUQUdSSUQKIGRkIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGRlbCBpbnRl cmZhY2VOYW1lPUhUTUxNb2RFbGVtZW50CitkZXRhaWxzIGludGVyZmFjZU5hbWU9SFRNTEVsZW1l bnQKIGRmbiBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CiBkaXIgaW50ZXJmYWNlTmFtZT1IVE1M RGlyZWN0b3J5RWxlbWVudAogZGl2CkBAIC00Miw2ICs0NSw4IEBAIGR0IGludGVyZmFjZU5hbWU9 SFRNTEVsZW1lbnQKIGVtIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIGVtYmVkCiBmaWVsZHNl dCBpbnRlcmZhY2VOYW1lPUhUTUxGaWVsZFNldEVsZW1lbnQsIGNvbnN0cnVjdG9yTmVlZHNGb3Jt RWxlbWVudAorZmlnY2FwdGlvbiBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50CitmaWd1cmUgaW50 ZXJmYWNlTmFtZT1IVE1MRWxlbWVudAogZm9udAogZm9vdGVyIGludGVyZmFjZU5hbWU9SFRNTEVs ZW1lbnQKIGZvcm0KQEAgLTEwOSw2ICsxMTQsNyBAQCBzdHJpa2UgaW50ZXJmYWNlTmFtZT1IVE1M RWxlbWVudAogc3Ryb25nIGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIHN0eWxlIGNvbnN0cnVj dG9yTmVlZHNDcmVhdGVkQnlQYXJzZXIKIHN1YiBpbnRlcmZhY2VOYW1lPUhUTUxFbGVtZW50Citz dW1tYXJ5IGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIHN1cCBpbnRlcmZhY2VOYW1lPUhUTUxF bGVtZW50CiB0YWJsZQogdGJvZHkgaW50ZXJmYWNlTmFtZT1IVE1MVGFibGVTZWN0aW9uRWxlbWVu dApAQCAtMTE5LDYgKzEyNSw3IEBAIHRoIGludGVyZmFjZU5hbWU9SFRNTFRhYmxlQ2VsbEVsZW1l bnQKIHRoZWFkIGludGVyZmFjZU5hbWU9SFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQKIHRpdGxlCiB0 ciBpbnRlcmZhY2VOYW1lPUhUTUxUYWJsZVJvd0VsZW1lbnQKK3RyYWNrIGludGVyZmFjZU5hbWU9 SFRNTEVsZW1lbnQKIHR0IGludGVyZmFjZU5hbWU9SFRNTEVsZW1lbnQKIHUgaW50ZXJmYWNlTmFt ZT1IVE1MRWxlbWVudAogdWwgaW50ZXJmYWNlTmFtZT1IVE1MVUxpc3RFbGVtZW50CkluZGV4OiBX ZWJDb3JlL2h0bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2h0 bWwvSFRNTFRyZWVCdWlsZGVyLmNwcAkocmV2aXNpb24gNjQwMDkpCisrKyBXZWJDb3JlL2h0bWwv SFRNTFRyZWVCdWlsZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE5LDcgKzExOSw3IEBAIGJv b2wgaXNTcGVjaWFsVGFnKGNvbnN0IEF0b21pY1N0cmluZyYgdGEKICAgICAgICAgfHwgdGFnTmFt ZSA9PSBhc2lkZVRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGJhc2VUYWcKICAgICAgICAgfHwg dGFnTmFtZSA9PSBiYXNlZm9udFRhZwotICAgICAgICB8fCB0YWdOYW1lID09ICJiZ3NvdW5kIgor ICAgICAgICB8fCB0YWdOYW1lID09IGJnc291bmRUYWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBi bG9ja3F1b3RlVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gYm9keVRhZwogICAgICAgICB8fCB0 YWdOYW1lID09IGJyVGFnCkBAIC0xMjcsMTYgKzEyNywxNiBAQCBib29sIGlzU3BlY2lhbFRhZyhj b25zdCBBdG9taWNTdHJpbmcmIHRhCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gY2VudGVyVGFnCiAg ICAgICAgIHx8IHRhZ05hbWUgPT0gY29sVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gY29sZ3Jv dXBUYWcKLSAgICAgICAgfHwgdGFnTmFtZSA9PSAiY29tbWFuZCIKKyAgICAgICAgfHwgdGFnTmFt ZSA9PSBjb21tYW5kVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZGRUYWcKLSAgICAgICAgfHwg dGFnTmFtZSA9PSAiZGV0YWlscyIKKyAgICAgICAgfHwgdGFnTmFtZSA9PSBkZXRhaWxzVGFnCiAg ICAgICAgIHx8IHRhZ05hbWUgPT0gZGlyVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZGl2VGFn CiAgICAgICAgIHx8IHRhZ05hbWUgPT0gZGxUYWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBkdFRh ZwogICAgICAgICB8fCB0YWdOYW1lID09IGVtYmVkVGFnCiAgICAgICAgIHx8IHRhZ05hbWUgPT0g ZmllbGRzZXRUYWcKLSAgICAgICAgfHwgdGFnTmFtZSA9PSAiZmlndXJlIgorICAgICAgICB8fCB0 YWdOYW1lID09IGZpZ3VyZVRhZwogICAgICAgICB8fCB0YWdOYW1lID09IGZvb3RlclRhZwogICAg ICAgICB8fCB0YWdOYW1lID09IGZvcm1UYWcKICAgICAgICAgfHwgdGFnTmFtZSA9PSBmcmFtZVRh ZwpAQCAtNzcwLDggKzc3MCw4IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRU YWdGb3IKICAgICB9CiAgICAgaWYgKHRva2VuLm5hbWUoKSA9PSBiYXNlVGFnCiAgICAgICAgIHx8 IHRva2VuLm5hbWUoKSA9PSBiYXNlZm9udFRhZwotICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g ImJnc291bmQiCi0gICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSAiY29tbWFuZCIKKyAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IGJnc291bmRUYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09 IGNvbW1hbmRUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGxpbmtUYWcKICAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IG1ldGFUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG5v ZnJhbWVzVGFnCkBAIC04MDYsMTMgKzgwNiwxMyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6cHJv Y2Vzc1N0YXJ0VGFnRm9yCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBhc2lkZVRhZwogICAg ICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmxvY2txdW90ZVRhZwogICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gY2VudGVyVGFnCi0gICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSAiZGV0YWlscyIK KyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGRldGFpbHNUYWcKICAgICAgICAgfHwgdG9rZW4u bmFtZSgpID09IGRpclRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZGl2VGFnCiAgICAg ICAgIHx8IHRva2VuLm5hbWUoKSA9PSBkbFRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g ZmllbGRzZXRUYWcKLSAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09ICJmaWdjYXB0aW9uIgotICAg ICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImZpZ3VyZSIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgp ID09IGZpZ2NhcHRpb25UYWcKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGZpZ3VyZVRhZwog ICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZm9vdGVyVGFnCiAgICAgICAgIHx8IHRva2VuLm5h bWUoKSA9PSBoZWFkZXJUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGhncm91cFRhZwpA QCAtODIxLDcgKzgyMSw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3RhcnRUYWdG b3IKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IG9sVGFnCiAgICAgICAgIHx8IHRva2VuLm5h bWUoKSA9PSBwVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBzZWN0aW9uVGFnCi0gICAg ICAgIHx8IHRva2VuLm5hbWUoKSA9PSAic3VtbWFyeSIKKyAgICAgICAgfHwgdG9rZW4ubmFtZSgp ID09IHN1bW1hcnlUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHVsVGFnKSB7CiAgICAg ICAgIHByb2Nlc3NGYWtlUEVuZFRhZ0lmUEluQnV0dG9uU2NvcGUoKTsKICAgICAgICAgbV90cmVl Lmluc2VydEhUTUxFbGVtZW50KHRva2VuKTsKQEAgLTk0Myw3ICs5NDMsNyBAQCB2b2lkIEhUTUxU cmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9yCiAgICAgfQogICAgIGlmICh0b2tlbi5uYW1l KCkgPT0gcGFyYW1UYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IHNvdXJjZVRhZwotICAg ICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gInRyYWNrIikgeworICAgICAgICB8fCB0b2tlbi5uYW1l KCkgPT0gdHJhY2tUYWcpIHsKICAgICAgICAgbV90cmVlLmluc2VydFNlbGZDbG9zaW5nSFRNTEVs ZW1lbnQodG9rZW4pOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTIzMyw3ICsxMjMzLDcg QEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyhBdAogICAgICAgICB9CiAg ICAgICAgIGlmICh0b2tlbi5uYW1lKCkgPT0gYmFzZVRhZwogICAgICAgICAgICAgfHwgdG9rZW4u bmFtZSgpID09IGJhc2Vmb250VGFnCi0gICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImJn c291bmQiCisgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmdzb3VuZFRhZwogICAgICAg ICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGxpbmtUYWcKICAgICAgICAgICAgIHx8IHRva2VuLm5h bWUoKSA9PSBtZXRhVGFnCiAgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gbm9mcmFtZXNU YWcKQEAgLTEzODAsNyArMTM4MCw3IEBAIHZvaWQgSFRNTFRyZWVCdWlsZGVyOjpwcm9jZXNzU3Rh cnRUYWcoQXQKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQogICAgICAgICBpZiAodG9r ZW4ubmFtZSgpID09IGJhc2Vmb250VGFnCi0gICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g ImJnc291bmQiCisgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmdzb3VuZFRhZwogICAg ICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGxpbmtUYWcKICAgICAgICAgICAgIHx8IHRva2Vu Lm5hbWUoKSA9PSBtZXRhVGFnCiAgICAgICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gbm9mcmFt ZXNUYWcKQEAgLTE5NDAsMTIgKzE5NDAsMTIgQEAgdm9pZCBIVE1MVHJlZUJ1aWxkZXI6OnByb2Nl c3NFbmRUYWdGb3JJbgogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmxvY2txdW90ZVRhZwog ICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYnV0dG9uVGFnCiAgICAgICAgIHx8IHRva2VuLm5h bWUoKSA9PSBjZW50ZXJUYWcKLSAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09ICJkZXRhaWxzIgor ICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gZGV0YWlsc1RhZwogICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gZGlyVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBkaXZUYWcKICAgICAg ICAgfHwgdG9rZW4ubmFtZSgpID09IGRsVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBm aWVsZHNldFRhZwotICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gImZpZ3VyZSIKKyAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IGZpZ3VyZVRhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0g Zm9vdGVyVGFnCiAgICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSBoZWFkZXJUYWcKICAgICAgICAg fHwgdG9rZW4ubmFtZSgpID09IGhncm91cFRhZwpAQCAtMjczNiwxMSArMjczNiwxMCBAQCBib29s IEhUTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc1N0YXJ0VGFnRm9yCiAgICAgICAgIG1fdHJlZS5pbnNl cnRIVE1MSHRtbFN0YXJ0VGFnSW5Cb2R5KHRva2VuKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfQotICAgIC8vIEZJWE1FOiBBdG9taXplICJjb21tYW5kIi4KICAgICBpZiAodG9rZW4ubmFt ZSgpID09IGJhc2VUYWcKICAgICAgICAgfHwgdG9rZW4ubmFtZSgpID09IGJhc2Vmb250VGFnCi0g ICAgICAgIHx8IHRva2VuLm5hbWUoKSA9PSAiYmdzb3VuZCIKLSAgICAgICAgfHwgdG9rZW4ubmFt ZSgpID09ICJjb21tYW5kIgorICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gYmdzb3VuZFRhZwor ICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gY29tbWFuZFRhZwogICAgICAgICB8fCB0b2tlbi5u YW1lKCkgPT0gbGlua1RhZwogICAgICAgICB8fCB0b2tlbi5uYW1lKCkgPT0gbWV0YVRhZykgewog ICAgICAgICBtX3RyZWUuaW5zZXJ0U2VsZkNsb3NpbmdIVE1MRWxlbWVudCh0b2tlbik7Cg==