54685 2011-02-17 13:38:28 -0800 Remove flakiness from media/video-poster.html (in service of http://crbug.com/60845) 2011-02-22 14:59:22 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 0 fischman webkit-unassigned commit-queue eric.carlson eric jer.noble scherkus tkent oldest_to_newest 353149 0 fischman 2011-02-17 13:38:28 -0800 Remove flakiness from media/video-poster.html 353150 1 82856 fischman 2011-02-17 13:38:54 -0800 Created attachment 82856 Patch 354332 2 83110 fischman 2011-02-20 17:05:53 -0800 Created attachment 83110 Patch Updated patch to reflect r78778 354346 3 83110 tkent 2011-02-20 17:45:29 -0800 Comment on attachment 83110 Patch ok 354355 4 83110 commit-queue 2011-02-20 18:21:09 -0800 Comment on attachment 83110 Patch Clearing flags on attachment: 83110 Committed r79161: <http://trac.webkit.org/changeset/79161> 354356 5 commit-queue 2011-02-20 18:21:13 -0800 All reviewed patches have been landed. Closing bug. 354807 6 83110 eric.carlson 2011-02-21 14:33:45 -0800 Comment on attachment 83110 Patch > LayoutTests/media/video-poster.html:90 > + video.addEventListener("load", function() { testPoster(); }); > + video.addEventListener("error", function() { testPoster(); }); This is bad is several ways and should not work at all, read the 'poster' section of the spec: http://www.w3.org/TR/html5/video.html#attr-video-poster. As per the spec, a <video> element should NEVER fire a 'load' event, and should not fire an 'error' event if a poster fails to load. It is a bug that we fire these events, it looks we do as a side effect of using HTMLImageLoader to load the poster. 354811 7 eric.carlson 2011-02-21 14:38:42 -0800 Filed https://bugs.webkit.org/show_bug.cgi?id=54908 about the events fired for the poster. 354814 8 eric.carlson 2011-02-21 14:40:13 -0800 Re-opening this bug as the new test is wrong. 354912 9 83241 fischman 2011-02-21 17:03:26 -0800 Created attachment 83241 Patch Stop relying on buggy events not mentioned in the spec. 354914 10 fischman 2011-02-21 17:05:23 -0800 Thanks for the heads-up, Eric! Attached patch replaces the listen-for-unspecified-events with a sleep loop, which is a bit icky, but I couldn't find another way to listen directly for the change being tested. If you have suggestions on that I'm happy to hear them. 355298 11 83241 eric.carlson 2011-02-22 08:40:17 -0800 Comment on attachment 83241 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=83241&action=review Thanks for the quick response! It looks like this diff is against r78778, not TOT, so I don't think the commit bot will work. Noted stylistic changes it would be good to have as long as this needs to be revised anyway. > LayoutTests/media/video-poster.html:50 > + if (video.clientWidth == expectedWidth && > + video.clientHeight == expectedHeight) { I don't think it helps readability to break the test into two lines > LayoutTests/media/video-poster.html:53 > + callback(); > + return; > + } An early return when the rest of the function only has one line seems unnecessary, I think an "else" would be easier to follow. > LayoutTests/media/video-poster.html:57 > + window.setTimeout(listenForWidthAndHeight, 20, > + expectedWidth, expectedHeight, callback); No need to break the function onto two lines. > LayoutTests/media/video-poster.html:59 > + As long as you are editing the file, can you kill this extra white-space? > LayoutTests/media/video-poster.html:89 > + listenForWidthAndHeight( > + currentPoster.width, currentPoster.height, testPoster); No line break please. 355319 12 83328 fischman 2011-02-22 09:08:34 -0800 Created attachment 83328 Patch 355320 13 fischman 2011-02-22 09:09:49 -0800 Thanks for the quick review. Re-based diff & all style comments addressed (I thought there was at least a "soft" 80-column rule in this codebase, hence the commented-upon newlines). 355335 14 83328 eric.carlson 2011-02-22 09:23:30 -0800 Comment on attachment 83328 Patch Thanks for the quick turn-around on this! 355614 15 83328 eric.carlson 2011-02-22 14:33:05 -0800 Comment on attachment 83328 Patch Removing cq+, I will land this. 355616 16 83328 eric.carlson 2011-02-22 14:35:55 -0800 Comment on attachment 83328 Patch Clearing flags, landed in http://trac.webkit.org/changeset/79363 355636 17 eric 2011-02-22 14:59:22 -0800 The cq is (currently) unable to land patches while the tree is red. In this case another media test has the SL bot red, so the CQ constantly attempts but fails to land patches like these. :) 82856 2011-02-17 13:38:54 -0800 2011-02-20 17:05:50 -0800 Patch bug-54685-20110217133853.patch text/plain 5004 fischman U3VidmVyc2lvbiBSZXZpc2lvbjogNzg3MDMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjZWE4ZWMxY2ZmNzU1MzU4NzI0Yjlm NzFkNGZkMmIxYzZlMjMxOTUxLi42MDQxOTBkMjUxNGVhZjkxYWI5ODI1ZmFkMWM1YmFhYWU5ZTcw ZWI1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDItMTcgIEFtaSBGaXNjaG1hbiAgPGZp c2NobWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBSZW1vdmUgZmxha2luZXNzIGZyb20gbWVkaWEvdmlkZW8tcG9zdGVyLmh0 bWwgYnkgdXNpbmcgZXZlbnQgY2FsbGJhY2tzCisgICAgICAgIGluc3RlYWQgb2YgMTAwbXMgdGlt ZW91dHMgYW5kIGhvcGluZyB0aGF0IHN0YXRlcyBoYXZlIHRyYW5zaXRpb25lZCBpbgorICAgICAg ICB0aW1lICghKS4KKyAgICAgICAgUmVtb3ZlZCBzZWVtaW5nbHktb3V0ZGF0ZWQgQlVHX0RSVCBh bm5vdGF0aW9uIGZyb20gdGVzdF9leHBlY3RhdGlvbi4KKworICAgICAgICAqIG1lZGlhL3ZpZGVv LXBvc3Rlci5odG1sOgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRp b25zLnR4dDoKKwogMjAxMS0wMi0xNiAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL21lZGlhL3ZpZGVvLXBvc3Rlci5odG1sIGIvTGF5b3V0VGVzdHMvbWVkaWEvdmlk ZW8tcG9zdGVyLmh0bWwKaW5kZXggMTg4Y2YyZGNkMzBlZTJhY2Y5NzRmYjFhYmVhNzljNzhjOWEx YjMxMS4uMDA3YTk1MGIyZGMzODJiNmRmODhkY2RmY2E3NDEzNDMxZWZkYWQwYiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tcG9zdGVyLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMv bWVkaWEvdmlkZW8tcG9zdGVyLmh0bWwKQEAgLTEsNiArMSw3IEBACiA8aHRtbD4KICAgICA8aGVh ZD4KICAgICAgICAgPHRpdGxlPiZsdDt2aWRlbyZndDsgZWxlbWVudCB3aXRoIHBvc3RlciBzaXpl IHRlc3Q8L3RpdGxlPgorICAgICAgICA8c2NyaXB0IHNyYz0iLi4vaHR0cC90ZXN0cy9tZWRpYS9t ZWRpYS1maWxlLmpzIj48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdCBzcmM9dmlkZW8tdGVzdC5q cz48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KICAgICAgICAgICAgIHZhciBwb3N0ZXJJbmZv ID0gCkBAIC00MywyMiArNDQsNiBAQAogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH07 CiAKLSAgICAgICAgICAgIGZ1bmN0aW9uIG9wZW5OZXh0UG9zdGVyKCkKLSAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoIiIpOwotICAgICAgICAgICAgICAgIGlmIChw b3N0ZXJJbmZvLmN1cnJlbnQgPj0gcG9zdGVySW5mby5wb3N0ZXJzLmxlbmd0aCkKLSAgICAgICAg ICAgICAgICB7Ci0gICAgICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKLSAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOwotICAgICAgICAgICAgICAgIH0KLQotICAgICAgICAgICAgICAgIHZhciB1 cmwgPSBwb3N0ZXJJbmZvLnBvc3RlcnNbcG9zdGVySW5mby5jdXJyZW50XS51cmw7Ci0gICAgICAg ICAgICAgICAgdmFyIGRlc2MgPSAiPGI+U2V0dGluZyBwb3N0ZXIgdG8gPGVtPlwiIisgdXJsICsg IlwiPC9lbT48L2I+IjsKLSAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoZGVzYyk7Ci0gICAg ICAgICAgICAgICAgdmlkZW8ucG9zdGVyID0gdXJsOwotICAgICAgICAgICAgICAgIHNldFRpbWVv dXQodGVzdFBvc3RlciwgMTAwKTsKLSAgICAgICAgICAgIH0KLQogICAgICAgICAgICAgZnVuY3Rp b24gdGVzdFBvc3RlcigpCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgdmFyIHRlbXAg PSBkb2N1bWVudC5ib2R5Lm9mZnNldFdpZHRoOwpAQCAtODAsMjMgKzY1LDMzIEBACiAgICAgICAg ICAgICAgICAgaWYgKHZpZGVvLmhlaWdodCkKICAgICAgICAgICAgICAgICAgICAgdmlkZW8ucmVt b3ZlQXR0cmlidXRlKCdoZWlnaHQnKTsKIAotICAgICAgICAgICAgICAgIHBvc3RlckluZm8uY3Vy cmVudCsrOwotICAgICAgICAgICAgICAgIG9wZW5OZXh0UG9zdGVyKCk7Ci0gICAgICAgICAgICB9 CisgICAgICAgICAgICAgICAgaWYgKHBvc3RlckluZm8uY3VycmVudCsrID09IDApIHsKKyAgICAg ICAgICAgICAgICAgIHZpZGVvLmFkZEV2ZW50TGlzdGVuZXIoImxvYWQiLCBmdW5jdGlvbigpIHsg dGVzdFBvc3RlcigpOyB9KTsKKyAgICAgICAgICAgICAgICAgIHZpZGVvLmFkZEV2ZW50TGlzdGVu ZXIoImVycm9yIiwgZnVuY3Rpb24oKSB7IHRlc3RQb3N0ZXIoKTsgfSk7CisgICAgICAgICAgICAg ICAgfQogCi0gICAgICAgICAgICBmdW5jdGlvbiB0ZXN0KCkKLSAgICAgICAgICAgIHsKLSAgICAg ICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAgICAgICAgICAgICAgY29uc29sZVdy aXRlKCIiKTsKKyAgICAgICAgICAgICAgICBpZiAocG9zdGVySW5mby5jdXJyZW50ID49IHBvc3Rl ckluZm8ucG9zdGVycy5sZW5ndGgpIHsKKyAgICAgICAgICAgICAgICAgICAgZW5kVGVzdCgpOwor ICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICAgICAgdGVzdFBvc3RlcigpOworICAgICAgICAgICAgICAgIHZhciB1cmwgPSBwb3N0ZXJJ bmZvLnBvc3RlcnNbcG9zdGVySW5mby5jdXJyZW50XS51cmw7CisgICAgICAgICAgICAgICAgdmFy IGRlc2MgPSAiPGI+U2V0dGluZyBwb3N0ZXIgdG8gPGVtPlwiIisgdXJsICsgIlwiPC9lbT48L2I+ IjsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoZGVzYyk7CisgICAgICAgICAgICAgICAg dmlkZW8ucG9zdGVyID0gdXJsOworICAgICAgICAgICAgICAgIC8vIFRoaXMgaXMgaWNreSBidXQg bmVjZXNzYXJ5IHNpbmNlIG5vIGV2ZW50IGZpcmVzIG9uIHNldHRpbmcgdmlkZW8ucG9zdGVyPSIi LgorICAgICAgICAgICAgICAgIGlmICh1cmwgPT0gIiIpIHNldFRpbWVvdXQodGVzdFBvc3Rlciwg MCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIDwvc2NyaXB0PgogICAgIDwvaGVhZD4KIAotICAg IDxib2R5IG9ubG9hZD0ic2V0VGltZW91dCh0ZXN0LCAxMDApIj4KLQorICAgIDxib2R5PgogICAg ICAgICA8dmlkZW8gY29udHJvbHMgd2lkdGg9MzIwIGhlaWdodD0yNDA+PC92aWRlbz4KICAgICAg ICAgPHA+VGVzdCAmbHQ7dmlkZW8mZ3Q7IGVsZW1lbnQgd2l0aCBhbmQgd2l0aG91dCBhIHBvc3Rl ci48L3A+Ci0KKyAgICAgICAgPHNjcmlwdD4KKyAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVt ZW50KCk7CisgICAgICAgICAgICAgICAgdGVzdFBvc3RlcigpOworICAgICAgICA8L3NjcmlwdD4K ICAgICA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKaW5kZXggNGFmNDUxNmMwNGFhMWFlZDY1OWU3YmY0 NzA4MDc2NTMxNThlODVlMy4uYjEzYjAxYzIzMTk0YzI4ODYwMmY1OWJjYWEwNDg0MmQwOTI2NWMz ZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3Rh dGlvbnMudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0 YXRpb25zLnR4dApAQCAtMjQ0OCw5ICsyNDQ4LDYgQEAgQlVHV0s0NTczNyBERUJVRyBTTE9XIDog ZmFzdC9mcmFtZXMvZnJhbWUtbGltaXQuaHRtbCA9IFBBU1MKIEJVR0RQUkFOS0UgV0lOIExJTlVY IERFQlVHIDogZmFzdC9mb3Jtcy9zZWxlY3Qtc2V0LWxlbmd0aC13aXRoLW11dGF0aW9uLXJlbW92 ZS5odG1sID0gVElNRU9VVCBQQVNTCiBCVUdEUFJBTktFIExJTlVYIERFQlVHIDogaHR0cC90ZXN0 cy9pbmNyZW1lbnRhbC9zbG93LXV0ZjgtdGV4dC5wbCA9IFRJTUVPVVQgUEFTUwogCi0vLyBCVUdD UjYwODQ1IDogQWRkaW5nIHRoZSBzbGVlcCAgbWF5IGltcHJvdmVzIHRoZSBzdGFibGlsaXR5Ci1C VUdDUjYwODQ1IFdJTiBMSU5VWCA6IG1lZGlhL3ZpZGVvLXBvc3Rlci5odG1sID0gUEFTUyBURVhU Ci0KIEJVR1dFQkdMIDogZmFzdC9jYW52YXMvd2ViZ2wvY3NzLXdlYmtpdC1jYW52YXMtcmVwYWlu dC5odG1sID0gSU1BR0UKIEJVR1dFQkdMIDogZmFzdC9jYW52YXMvd2ViZ2wvY3NzLXdlYmtpdC1j YW52YXMuaHRtbCA9IElNQUdFCiBCVUdXRUJHTCBXSU4gOiBmYXN0L2NhbnZhcy93ZWJnbC90ZXgt aW1hZ2UtYW5kLXN1Yi1pbWFnZS0yZC13aXRoLWFycmF5LWJ1ZmZlci12aWV3Lmh0bWwgPSBDUkFT SCBQQVNTCkBAIC0yNzkwLDcgKzI3ODcsNiBAQCBCVUdfRFJUIExJTlVYIDogZmFzdC90ZXh0L2Zp bmQtc29mdC1oeXBoZW4uaHRtbCA9IENSQVNIIFBBU1MKIEJVR19EUlQgTElOVVggOiBmYXN0L3Rl eHQvanVzdGlmaWNhdGlvbi1wYWRkaW5nLW1pZC13b3JkLmh0bWwgPSBQQVNTIENSQVNICiBCVUdf RFJUIE1BQyBMSU5VWCA6IGh0dHAvdGVzdHMvcGx1Z2lucy9wb3N0LXVybC1maWxlLmh0bWwgPSBU SU1FT1VUCiBCVUdfRFJUIEJVR0NSODcyOSBNQUMgTElOVVggOiBodHRwL3Rlc3RzL211bHRpcGFy dC9pbnZhbGlkLWltYWdlLWRhdGEuaHRtbCA9IElNQUdFIFBBU1MKLUJVR19EUlQgTUFDIDogbWVk aWEvdmlkZW8tcG9zdGVyLmh0bWwgPSBURVhUIFBBU1MKIC8vIENyYXNoZXMgd2l0aCBEUlQgYW5k IGlzIGEgdGV4dCBmYWlsdXJlIHdpdGggVGVzdFNoZWxsCiBCVUdfRFJUIDogcGxhdGZvcm0vZ3Rr L2Zhc3QvZm9ybXMvbWVudWxpc3QtdHlwZWFoZWFkLWZpbmQuaHRtbCA9IENSQVNIIFRFWFQKIEJV R19EUlQgOiBzdG9yYWdlL2RvbXN0b3JhZ2UvcXVvdGEuaHRtbCA9IFRFWFQK 83110 2011-02-20 17:05:53 -0800 2011-02-21 17:03:23 -0800 Patch bug-54685-20110220170551.patch text/plain 5004 fischman U3VidmVyc2lvbiBSZXZpc2lvbjogNzkxMTEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA5OTFlMjcxN2JlMDM1OWRiYTE0ZDJi ZGM1ZWRlYjBmNzBmNjZlMDc2Li4xMTZmMzJjNjNmZjg1NGYzNWY2OTE4NmI0NWZlYTUyMGViYjJi OWZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTEtMDItMjAgIEFtaSBGaXNjaG1hbiAgPGZp c2NobWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBSZW1vdmUgZmxha2luZXNzIGZyb20gbWVkaWEvdmlkZW8tcG9zdGVyLmh0 bWwgYnkgdXNpbmcgZXZlbnQgY2FsbGJhY2tzCisgICAgICAgIGluc3RlYWQgb2YgMTAwbXMgdGlt ZW91dHMgYW5kIGhvcGluZyB0aGF0IHN0YXRlcyBoYXZlIHRyYW5zaXRpb25lZCBpbgorICAgICAg ICB0aW1lICghKS4KKyAgICAgICAgUmVtb3ZlZCBzZWVtaW5nbHktb3V0ZGF0ZWQgQlVHX0RSVCBh bm5vdGF0aW9uIGZyb20gdGVzdF9leHBlY3RhdGlvbi4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ2ODUKKyAgICAgICAgaHR0cDovL2NyYnVnLmNv bS82MDg0NQorCisgICAgICAgICogbWVkaWEvdmlkZW8tcG9zdGVyLmh0bWw6CisgICAgICAgICog cGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgorCiAyMDExLTAyLTE5ICBB bmRyZXcgV2lsc29uICA8YXR3aWxzb25AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVwZGF0ZWQg dGVzdCBleHBlY3RhdGlvbnMgKG1vcmUgZmFsbG91dCBmcm9tIHI3ODg0NikuCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wb3N0ZXIuaHRtbCBiL0xheW91dFRlc3RzL21lZGlh L3ZpZGVvLXBvc3Rlci5odG1sCmluZGV4IDY0ZTY1NWQ2NGI2YmFjZTY0ZmY2MTUwYjE2Y2FhOTBl NDFkNjliMjEuLjg2Mjg2ZWMxY2Y5OWRjMmFlNmJjN2U5YmU5OWVmMDgwNzYxMjhhZGYgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBvc3Rlci5odG1sCisrKyBiL0xheW91dFRl c3RzL21lZGlhL3ZpZGVvLXBvc3Rlci5odG1sCkBAIC0xLDYgKzEsNyBAQAogPGh0bWw+CiAgICAg PGhlYWQ+CiAgICAgICAgIDx0aXRsZT4mbHQ7dmlkZW8mZ3Q7IGVsZW1lbnQgd2l0aCBwb3N0ZXIg c2l6ZSB0ZXN0PC90aXRsZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9Li4vaHR0cC90ZXN0cy9tZWRp YS9tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgogICAgICAgICA8c2NyaXB0IHNyYz0uLi9odHRwL3Rl c3RzL21lZGlhL3ZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+CiAgICAgICAgIDxzY3JpcHQ+CiAgICAg ICAgICAgICB2YXIgcG9zdGVySW5mbyA9IApAQCAtNDMsMjIgKzQ0LDYgQEAKICAgICAgICAgICAg ICAgICBdCiAgICAgICAgICAgICB9OwogCi0gICAgICAgICAgICBmdW5jdGlvbiBvcGVuTmV4dFBv c3RlcigpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsK LSAgICAgICAgICAgICAgICBpZiAocG9zdGVySW5mby5jdXJyZW50ID49IHBvc3RlckluZm8ucG9z dGVycy5sZW5ndGgpCi0gICAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgICAgICBlbmRU ZXN0KCk7Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgICAgICAgICB9Ci0K LSAgICAgICAgICAgICAgICB2YXIgdXJsID0gcG9zdGVySW5mby5wb3N0ZXJzW3Bvc3RlckluZm8u Y3VycmVudF0udXJsOwotICAgICAgICAgICAgICAgIHZhciBkZXNjID0gIjxiPlNldHRpbmcgcG9z dGVyIHRvIDxlbT5cIiIrIHVybCArICJcIjwvZW0+PC9iPiI7Ci0gICAgICAgICAgICAgICAgY29u c29sZVdyaXRlKGRlc2MpOwotICAgICAgICAgICAgICAgIHZpZGVvLnBvc3RlciA9IHVybDsKLSAg ICAgICAgICAgICAgICBzZXRUaW1lb3V0KHRlc3RQb3N0ZXIsIDEwMCk7Ci0gICAgICAgICAgICB9 Ci0KICAgICAgICAgICAgIGZ1bmN0aW9uIHRlc3RQb3N0ZXIoKQogICAgICAgICAgICAgewogICAg ICAgICAgICAgICAgIHZhciB0ZW1wID0gZG9jdW1lbnQuYm9keS5vZmZzZXRXaWR0aDsKQEAgLTgx LDIyICs2NiwyOSBAQAogICAgICAgICAgICAgICAgICAgICB2aWRlby5yZW1vdmVBdHRyaWJ1dGUo J2hlaWdodCcpOwogCiAgICAgICAgICAgICAgICAgcG9zdGVySW5mby5jdXJyZW50Kys7Ci0gICAg ICAgICAgICAgICAgb3Blbk5leHRQb3N0ZXIoKTsKLSAgICAgICAgICAgIH0KLQotICAgICAgICAg ICAgZnVuY3Rpb24gdGVzdCgpCi0gICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgZmluZE1l ZGlhRWxlbWVudCgpOwotCi0gICAgICAgICAgICAgICAgdGVzdFBvc3RlcigpOworICAgICAgICAg ICAgICAgIGNvbnNvbGVXcml0ZSgiIik7CisgICAgICAgICAgICAgICAgaWYgKHBvc3RlckluZm8u Y3VycmVudCA+PSBwb3N0ZXJJbmZvLnBvc3RlcnMubGVuZ3RoKSB7CisgICAgICAgICAgICAgICAg ICBlbmRUZXN0KCk7CisgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAg fQorICAgICAgICAgICAgICAgIHZhciB1cmwgPSBwb3N0ZXJJbmZvLnBvc3RlcnNbcG9zdGVySW5m by5jdXJyZW50XS51cmw7CisgICAgICAgICAgICAgICAgdmFyIGRlc2MgPSAiPGI+U2V0dGluZyBw b3N0ZXIgdG8gPGVtPlwiIisgdXJsICsgIlwiPC9lbT48L2I+IjsKKyAgICAgICAgICAgICAgICBj b25zb2xlV3JpdGUoZGVzYyk7CisgICAgICAgICAgICAgICAgdmlkZW8ucG9zdGVyID0gdXJsOwor ICAgICAgICAgICAgICAgIC8vIFRoaXMgaXMgaWNreSBidXQgbmVjZXNzYXJ5IHNpbmNlIG5vIGV2 ZW50IGZpcmVzIG9uIHNldHRpbmcgdmlkZW8ucG9zdGVyPSIiLgorICAgICAgICAgICAgICAgIGlm ICh1cmwgPT0gIiIpIHNldFRpbWVvdXQodGVzdFBvc3RlciwgMCk7CiAgICAgICAgICAgICB9CiAg ICAgICAgIDwvc2NyaXB0PgogICAgIDwvaGVhZD4KIAotICAgIDxib2R5IG9ubG9hZD0ic2V0VGlt ZW91dCh0ZXN0LCAxMDApIj4KLQorICAgIDxib2R5PgogICAgICAgICA8dmlkZW8gY29udHJvbHMg d2lkdGg9MzIwIGhlaWdodD0yNDA+PC92aWRlbz4KICAgICAgICAgPHA+VGVzdCAmbHQ7dmlkZW8m Z3Q7IGVsZW1lbnQgd2l0aCBhbmQgd2l0aG91dCBhIHBvc3Rlci48L3A+Ci0KKyAgICAgICAgPHNj cmlwdD4KKyAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7CisgICAgICAgICAgdmlkZW8uYWRk RXZlbnRMaXN0ZW5lcigibG9hZCIsIGZ1bmN0aW9uKCkgeyB0ZXN0UG9zdGVyKCk7IH0pOworICAg ICAgICAgIHZpZGVvLmFkZEV2ZW50TGlzdGVuZXIoImVycm9yIiwgZnVuY3Rpb24oKSB7IHRlc3RQ b3N0ZXIoKTsgfSk7CisgICAgICAgICAgdGVzdFBvc3RlcigpOworICAgICAgICA8L3NjcmlwdD4K ICAgICA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJv bWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKaW5kZXggMmM2OThkNjVjNjQ3YmVhNWVjMzM1NmVm N2Q5YTNjMTA0MzI1MjEyNS4uZWVhMDNkMWM0Y2NjNjkwODU4NGFkMDI5MjEzYmM0MjViNzJkNGI5 MyAxMDA3NTUKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3Rh dGlvbnMudHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0 YXRpb25zLnR4dApAQCAtMjQ0NSw5ICsyNDQ1LDYgQEAgQlVHV0s0NTczNyBERUJVRyBTTE9XIDog ZmFzdC9mcmFtZXMvZnJhbWUtbGltaXQuaHRtbCA9IFBBU1MKIEJVR0RQUkFOS0UgV0lOIExJTlVY IERFQlVHIDogZmFzdC9mb3Jtcy9zZWxlY3Qtc2V0LWxlbmd0aC13aXRoLW11dGF0aW9uLXJlbW92 ZS5odG1sID0gVElNRU9VVCBQQVNTCiBCVUdEUFJBTktFIExJTlVYIERFQlVHIDogaHR0cC90ZXN0 cy9pbmNyZW1lbnRhbC9zbG93LXV0ZjgtdGV4dC5wbCA9IFRJTUVPVVQgUEFTUwogCi0vLyBCVUdD UjYwODQ1IDogQWRkaW5nIHRoZSBzbGVlcCAgbWF5IGltcHJvdmVzIHRoZSBzdGFibGlsaXR5Ci1C VUdDUjYwODQ1IFdJTiBMSU5VWCA6IG1lZGlhL3ZpZGVvLXBvc3Rlci5odG1sID0gUEFTUyBURVhU Ci0KIEJVR1dFQkdMIDogZmFzdC9jYW52YXMvd2ViZ2wvY3NzLXdlYmtpdC1jYW52YXMtcmVwYWlu dC5odG1sID0gSU1BR0UKIEJVR1dFQkdMIDogZmFzdC9jYW52YXMvd2ViZ2wvY3NzLXdlYmtpdC1j YW52YXMuaHRtbCA9IElNQUdFCiBCVUdXRUJHTCBXSU4gOiBmYXN0L2NhbnZhcy93ZWJnbC90ZXgt aW1hZ2UtYW5kLXN1Yi1pbWFnZS0yZC13aXRoLWFycmF5LWJ1ZmZlci12aWV3Lmh0bWwgPSBDUkFT SCBQQVNTCkBAIC0yNzg2LDcgKzI3ODMsNiBAQCBCVUdfRFJUIExJTlVYIDogZmFzdC90ZXh0L2Zp bmQtc29mdC1oeXBoZW4uaHRtbCA9IENSQVNIIFBBU1MKIEJVR19EUlQgTElOVVggOiBmYXN0L3Rl eHQvanVzdGlmaWNhdGlvbi1wYWRkaW5nLW1pZC13b3JkLmh0bWwgPSBQQVNTIENSQVNICiBCVUdf RFJUIE1BQyBMSU5VWCA6IGh0dHAvdGVzdHMvcGx1Z2lucy9wb3N0LXVybC1maWxlLmh0bWwgPSBU SU1FT1VUCiBCVUdfRFJUIEJVR0NSODcyOSBNQUMgTElOVVggOiBodHRwL3Rlc3RzL211bHRpcGFy dC9pbnZhbGlkLWltYWdlLWRhdGEuaHRtbCA9IElNQUdFIFBBU1MKLUJVR19EUlQgTUFDIDogbWVk aWEvdmlkZW8tcG9zdGVyLmh0bWwgPSBURVhUIFBBU1MKIC8vIENyYXNoZXMgd2l0aCBEUlQgYW5k IGlzIGEgdGV4dCBmYWlsdXJlIHdpdGggVGVzdFNoZWxsCiBCVUdfRFJUIDogcGxhdGZvcm0vZ3Rr L2Zhc3QvZm9ybXMvbWVudWxpc3QtdHlwZWFoZWFkLWZpbmQuaHRtbCA9IENSQVNIIFRFWFQKIEJV R19EUlQgOiBzdG9yYWdlL2RvbXN0b3JhZ2UvcXVvdGEuaHRtbCA9IFRFWFQK 83241 2011-02-21 17:03:26 -0800 2011-02-22 09:08:29 -0800 Patch bug-54685-20110221170324.patch text/plain 4026 fischman U3VidmVyc2lvbiBSZXZpc2lvbjogNzkxMjcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzNTAxODU3YTUwNDZjOTMxNjhhODIy NjZlNzkwZDBjYjhkMDA0Y2ZmLi5iODJiZTYzN2I4ZTAyZGExMTQyMjQ3ODFkYmZlZWJjZGQ5MDQ3 YmNjIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDItMjEgIEFtaSBGaXNjaG1hbiAgPGZp c2NobWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24u CisKKyAgICAgICAgU2Vjb25kIGF0dGVtcHQgYXQgcmVtb3ZpbmcgZmxha2luZXNzIGZyb20gbWVk aWEvdmlkZW8tcG9zdGVyLmh0bWwgKGluCisgICAgICAgIHNlcnZpY2Ugb2YgaHR0cDovL2NyYnVn LmNvbS82MDg0NSkuICBGaXJzdCBhdHRlbXB0IChyNzkxNjEpCisgICAgICAgIHJlbGllZCBvbiBs b2FkICYgZXJyb3IgZXZlbnRzIGZpcmluZyBvbiB0aGUgdmlkZW8gZWxlbWVudCBmb3IKKyAgICAg ICAgcG9zdGVyLXJlbGF0ZWQgZXZlbnRzLCB3aGljaCB0aGUgc3RhbmRhcmQgZG9lcyBub3Qgc3Bl Y2lmeSAoYW5kCisgICAgICAgIGFyZSB0aHVzIGEgYnVnKS4gIFRoaXMgY2hhbmdlIGluc3RlYWQg cmVsaWVzIG9uIGEgMjBtcyBzbGVlcCBsb29wIHRvCisgICAgICAgIG9ic2VydmUgdGhlIG5ldyBl eHBlY3RlZCBkaW1lbnNpb25zIChhbmQgcmVsaWVzIG9uIHRoZSB0ZXN0CisgICAgICAgIHJ1bm5l ciB0byB0aW1lIG91dCBpZiB0aGUgZXhwZWN0YXRpb25zIGZhaWwgdG8gYmUgbWV0KS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ2ODUKKworICAg ICAgICAqIG1lZGlhL3ZpZGVvLXBvc3Rlci5odG1sOgorCiAyMDExLTAyLTE5ICBBbGVqYW5kcm8g Ry4gQ2FzdHJvICA8YWxleEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGZpeGVk IHR5cG8gaW4gdGhlIEdUSysgc2tpcHBlZCBmaWxlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv bWVkaWEvdmlkZW8tcG9zdGVyLmh0bWwgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRlby1wb3N0ZXIu aHRtbAppbmRleCA2NGU2NTVkNjRiNmJhY2U2NGZmNjE1MGIxNmNhYTkwZTQxZDY5YjIxLi5hNTAy ZjNhNTdlODU4NjI2NWNlNjZjZGZjZjNlNjE5MzZhOTIwMTcwIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9tZWRpYS92aWRlby1wb3N0ZXIuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS92aWRl by1wb3N0ZXIuaHRtbApAQCAtNDMsMjIgKzQzLDIwIEBACiAgICAgICAgICAgICAgICAgXQogICAg ICAgICAgICAgfTsKIAotICAgICAgICAgICAgZnVuY3Rpb24gb3Blbk5leHRQb3N0ZXIoKQotICAg ICAgICAgICAgewotICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZSgiIik7Ci0gICAgICAgICAg ICAgICAgaWYgKHBvc3RlckluZm8uY3VycmVudCA+PSBwb3N0ZXJJbmZvLnBvc3RlcnMubGVuZ3Ro KQotICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgZW5kVGVzdCgpOwotICAg ICAgICAgICAgICAgICAgICByZXR1cm47Ci0gICAgICAgICAgICAgICAgfQotCi0gICAgICAgICAg ICAgICAgdmFyIHVybCA9IHBvc3RlckluZm8ucG9zdGVyc1twb3N0ZXJJbmZvLmN1cnJlbnRdLnVy bDsKLSAgICAgICAgICAgICAgICB2YXIgZGVzYyA9ICI8Yj5TZXR0aW5nIHBvc3RlciB0byA8ZW0+ XCIiKyB1cmwgKyAiXCI8L2VtPjwvYj4iOwotICAgICAgICAgICAgICAgIGNvbnNvbGVXcml0ZShk ZXNjKTsKLSAgICAgICAgICAgICAgICB2aWRlby5wb3N0ZXIgPSB1cmw7Ci0gICAgICAgICAgICAg ICAgc2V0VGltZW91dCh0ZXN0UG9zdGVyLCAxMDApOworICAgICAgICAgICAgLy8gV2FpdCBmb3Ig fHZpZGVvfCB0byBoYXZlIHRoZSB8ZXhwZWN0ZWRXaWR0aHwgYW5kIHxleHBlY3RlZEhlaWdodHwK KyAgICAgICAgICAgIC8vIGFuZCBpbnZva2UgfGNhbGxiYWNrKCl8LgorICAgICAgICAgICAgZnVu Y3Rpb24gbGlzdGVuRm9yV2lkdGhBbmRIZWlnaHQoZXhwZWN0ZWRXaWR0aCwgZXhwZWN0ZWRIZWln aHQsIGNhbGxiYWNrKSB7CisgICAgICAgICAgICAgIGlmICh2aWRlby5jbGllbnRXaWR0aCA9PSBl eHBlY3RlZFdpZHRoICYmIAorICAgICAgICAgICAgICAgICAgdmlkZW8uY2xpZW50SGVpZ2h0ID09 IGV4cGVjdGVkSGVpZ2h0KSB7CisgICAgICAgICAgICAgICAgY2FsbGJhY2soKTsKKyAgICAgICAg ICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgLy8gVGhpcyB1 c2VzIGEgMjBtcyBzbGVlcCBsb29wIHRvIGFjY29tcGxpc2ggdGhlIHdhaXQsIHNpbmNlIHRoZQor ICAgICAgICAgICAgICAvLyBzdGFuZGFyZCBzcGVjaWZpZXMgbm8gZXZlbnRzIHRoYXQgZmlyZSBv biBwb3N0ZXIgbG9hZCBvciBlcnJvci4KKyAgICAgICAgICAgICAgd2luZG93LnNldFRpbWVvdXQo bGlzdGVuRm9yV2lkdGhBbmRIZWlnaHQsIDIwLCAKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgZXhwZWN0ZWRXaWR0aCwgZXhwZWN0ZWRIZWlnaHQsIGNhbGxiYWNrKTsKICAgICAgICAg ICAgIH0KLQorICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgZnVuY3Rpb24gdGVzdFBvc3Rl cigpCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgdmFyIHRlbXAgPSBkb2N1bWVudC5i b2R5Lm9mZnNldFdpZHRoOwpAQCAtODEsMjIgKzc5LDI4IEBACiAgICAgICAgICAgICAgICAgICAg IHZpZGVvLnJlbW92ZUF0dHJpYnV0ZSgnaGVpZ2h0Jyk7CiAKICAgICAgICAgICAgICAgICBwb3N0 ZXJJbmZvLmN1cnJlbnQrKzsKLSAgICAgICAgICAgICAgICBvcGVuTmV4dFBvc3RlcigpOwotICAg ICAgICAgICAgfQotCi0gICAgICAgICAgICBmdW5jdGlvbiB0ZXN0KCkKLSAgICAgICAgICAgIHsK LSAgICAgICAgICAgICAgICBmaW5kTWVkaWFFbGVtZW50KCk7Ci0KLSAgICAgICAgICAgICAgICB0 ZXN0UG9zdGVyKCk7CisgICAgICAgICAgICAgICAgY29uc29sZVdyaXRlKCIiKTsKKyAgICAgICAg ICAgICAgICBpZiAocG9zdGVySW5mby5jdXJyZW50ID49IHBvc3RlckluZm8ucG9zdGVycy5sZW5n dGgpIHsKKyAgICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgdmFyIGN1cnJlbnRQb3N0 ZXIgPSBwb3N0ZXJJbmZvLnBvc3RlcnNbcG9zdGVySW5mby5jdXJyZW50XTsKKyAgICAgICAgICAg ICAgICBsaXN0ZW5Gb3JXaWR0aEFuZEhlaWdodCgKKyAgICAgICAgICAgICAgICAgIGN1cnJlbnRQ b3N0ZXIud2lkdGgsIGN1cnJlbnRQb3N0ZXIuaGVpZ2h0LCB0ZXN0UG9zdGVyKTsKKyAgICAgICAg ICAgICAgICB2YXIgdXJsID0gY3VycmVudFBvc3Rlci51cmw7CisgICAgICAgICAgICAgICAgdmFy IGRlc2MgPSAiPGI+U2V0dGluZyBwb3N0ZXIgdG8gPGVtPlwiIisgdXJsICsgIlwiPC9lbT48L2I+ IjsKKyAgICAgICAgICAgICAgICBjb25zb2xlV3JpdGUoZGVzYyk7CisgICAgICAgICAgICAgICAg dmlkZW8ucG9zdGVyID0gdXJsOwogICAgICAgICAgICAgfQogICAgICAgICA8L3NjcmlwdD4KICAg ICA8L2hlYWQ+CiAKLSAgICA8Ym9keSBvbmxvYWQ9InNldFRpbWVvdXQodGVzdCwgMTAwKSI+Ci0K LSAgICAgICAgPHZpZGVvIGNvbnRyb2xzIHdpZHRoPTMyMCBoZWlnaHQ9MjQwPjwvdmlkZW8+Cisg ICAgPGJvZHk+IAorICAgICAgICA8dmlkZW8gaWQ9InZpZGVvIiBjb250cm9scyB3aWR0aD0zMjAg aGVpZ2h0PTI0MD48L3ZpZGVvPgogICAgICAgICA8cD5UZXN0ICZsdDt2aWRlbyZndDsgZWxlbWVu dCB3aXRoIGFuZCB3aXRob3V0IGEgcG9zdGVyLjwvcD4KLQorICAgICAgICA8c2NyaXB0PgorICAg ICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKyAgICAgICAgICB0ZXN0UG9zdGVyKCk7CisgICAg ICAgIDwvc2NyaXB0PgogICAgIDwvYm9keT4KIDwvaHRtbD4K 83328 2011-02-22 09:08:34 -0800 2011-02-22 14:35:55 -0800 Patch bug-54685-20110222090832.patch text/plain 3517 fischman U3VidmVyc2lvbiBSZXZpc2lvbjogNzkxMjcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA0Mzg5N2FjNzA2NGVmYjQ5MTk5OGU4 NjkyZjdlYTljYTE3MjViZjhmLi43NDQyODE1Yzg3NDM5OTg0YjM3YmRiZjY4Mjg5YTQ2M2UzYmQ4 OTMyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDItMjEgIEFtaSBGaXNjaG1hbiAgPGZp c2NobWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24u CisKKyAgICAgICAgU2Vjb25kIGF0dGVtcHQgYXQgcmVtb3ZpbmcgZmxha2luZXNzIGZyb20gbWVk aWEvdmlkZW8tcG9zdGVyLmh0bWwgKGluCisgICAgICAgIHNlcnZpY2Ugb2YgaHR0cDovL2NyYnVn LmNvbS82MDg0NSkuICBGaXJzdCBhdHRlbXB0IChyNzkxNjEpCisgICAgICAgIHJlbGllZCBvbiBs b2FkICYgZXJyb3IgZXZlbnRzIGZpcmluZyBvbiB0aGUgdmlkZW8gZWxlbWVudCBmb3IKKyAgICAg ICAgcG9zdGVyLXJlbGF0ZWQgZXZlbnRzLCB3aGljaCB0aGUgc3RhbmRhcmQgZG9lcyBub3Qgc3Bl Y2lmeSAoYW5kCisgICAgICAgIGFyZSB0aHVzIGEgYnVnKS4gIFRoaXMgY2hhbmdlIGluc3RlYWQg cmVsaWVzIG9uIGEgMjBtcyBzbGVlcCBsb29wIHRvCisgICAgICAgIG9ic2VydmUgdGhlIG5ldyBl eHBlY3RlZCBkaW1lbnNpb25zIChhbmQgcmVsaWVzIG9uIHRoZSB0ZXN0CisgICAgICAgIHJ1bm5l ciB0byB0aW1lIG91dCBpZiB0aGUgZXhwZWN0YXRpb25zIGZhaWwgdG8gYmUgbWV0KS4KKworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ2ODUKKworICAg ICAgICAqIG1lZGlhL3ZpZGVvLXBvc3Rlci5odG1sOgorCiAyMDExLTAyLTIyIE1PUklUQSBIYWpp bWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CiAgICAgICAgIAogICAgICAgICBVbnJldmlld2VkIHRl c3RfZXhwZWN0YXRpb24udHh0IHVwZGF0ZS4gCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRp YS92aWRlby1wb3N0ZXIuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBvc3Rlci5odG1s CmluZGV4IDg2Mjg2ZWMxY2Y5OWRjMmFlNmJjN2U5YmU5OWVmMDgwNzYxMjhhZGYuLjVmOWQwNzI4 NmMzMjA2NGQ1NjAzMzhlM2Y5NmVkOTM1ZGRjMTM1NDMgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L21lZGlhL3ZpZGVvLXBvc3Rlci5odG1sCisrKyBiL0xheW91dFRlc3RzL21lZGlhL3ZpZGVvLXBv c3Rlci5odG1sCkBAIC0xLDcgKzEsNiBAQAogPGh0bWw+CiAgICAgPGhlYWQ+CiAgICAgICAgIDx0 aXRsZT4mbHQ7dmlkZW8mZ3Q7IGVsZW1lbnQgd2l0aCBwb3N0ZXIgc2l6ZSB0ZXN0PC90aXRsZT4K LSAgICAgICAgPHNjcmlwdCBzcmM9Li4vaHR0cC90ZXN0cy9tZWRpYS9tZWRpYS1maWxlLmpzPjwv c2NyaXB0PgogICAgICAgICA8c2NyaXB0IHNyYz0uLi9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLXRl c3QuanM+PC9zY3JpcHQ+CiAgICAgICAgIDxzY3JpcHQ+CiAgICAgICAgICAgICB2YXIgcG9zdGVy SW5mbyA9IApAQCAtNDQsNiArNDMsMTggQEAKICAgICAgICAgICAgICAgICBdCiAgICAgICAgICAg ICB9OwogCisgICAgICAgICAgICAvLyBXYWl0IGZvciB8dmlkZW98IHRvIGhhdmUgdGhlIHxleHBl Y3RlZFdpZHRofCBhbmQgfGV4cGVjdGVkSGVpZ2h0fAorICAgICAgICAgICAgLy8gYW5kIGludm9r ZSB8Y2FsbGJhY2soKXwuCisgICAgICAgICAgICBmdW5jdGlvbiBsaXN0ZW5Gb3JXaWR0aEFuZEhl aWdodChleHBlY3RlZFdpZHRoLCBleHBlY3RlZEhlaWdodCwgY2FsbGJhY2spIHsKKyAgICAgICAg ICAgICAgaWYgKHZpZGVvLmNsaWVudFdpZHRoID09IGV4cGVjdGVkV2lkdGggJiYgdmlkZW8uY2xp ZW50SGVpZ2h0ID09IGV4cGVjdGVkSGVpZ2h0KSB7CisgICAgICAgICAgICAgICAgY2FsbGJhY2so KTsKKyAgICAgICAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgICAgICAvLyBUaGlzIHVzZXMg YSAyMG1zIHNsZWVwIGxvb3AgdG8gYWNjb21wbGlzaCB0aGUgd2FpdCwgc2luY2UgdGhlCisgICAg ICAgICAgICAgICAgLy8gc3RhbmRhcmQgc3BlY2lmaWVzIG5vIGV2ZW50cyB0aGF0IGZpcmUgb24g cG9zdGVyIGxvYWQgb3IgZXJyb3IuCisgICAgICAgICAgICAgICAgd2luZG93LnNldFRpbWVvdXQo bGlzdGVuRm9yV2lkdGhBbmRIZWlnaHQsIDIwLCBleHBlY3RlZFdpZHRoLCBleHBlY3RlZEhlaWdo dCwgY2FsbGJhY2spOworICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisKICAgICAgICAg ICAgIGZ1bmN0aW9uIHRlc3RQb3N0ZXIoKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAg IHZhciB0ZW1wID0gZG9jdW1lbnQuYm9keS5vZmZzZXRXaWR0aDsKQEAgLTcxLDEyICs4MiwxMiBA QAogICAgICAgICAgICAgICAgICAgZW5kVGVzdCgpOwogICAgICAgICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICB2YXIgdXJsID0gcG9zdGVySW5m by5wb3N0ZXJzW3Bvc3RlckluZm8uY3VycmVudF0udXJsOworICAgICAgICAgICAgICAgIHZhciBj dXJyZW50UG9zdGVyID0gcG9zdGVySW5mby5wb3N0ZXJzW3Bvc3RlckluZm8uY3VycmVudF07Cisg ICAgICAgICAgICAgICAgbGlzdGVuRm9yV2lkdGhBbmRIZWlnaHQoY3VycmVudFBvc3Rlci53aWR0 aCwgY3VycmVudFBvc3Rlci5oZWlnaHQsIHRlc3RQb3N0ZXIpOworICAgICAgICAgICAgICAgIHZh ciB1cmwgPSBjdXJyZW50UG9zdGVyLnVybDsKICAgICAgICAgICAgICAgICB2YXIgZGVzYyA9ICI8 Yj5TZXR0aW5nIHBvc3RlciB0byA8ZW0+XCIiKyB1cmwgKyAiXCI8L2VtPjwvYj4iOwogICAgICAg ICAgICAgICAgIGNvbnNvbGVXcml0ZShkZXNjKTsKICAgICAgICAgICAgICAgICB2aWRlby5wb3N0 ZXIgPSB1cmw7Ci0gICAgICAgICAgICAgICAgLy8gVGhpcyBpcyBpY2t5IGJ1dCBuZWNlc3Nhcnkg c2luY2Ugbm8gZXZlbnQgZmlyZXMgb24gc2V0dGluZyB2aWRlby5wb3N0ZXI9IiIuCi0gICAgICAg ICAgICAgICAgaWYgKHVybCA9PSAiIikgc2V0VGltZW91dCh0ZXN0UG9zdGVyLCAwKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgPC9zY3JpcHQ+CiAgICAgPC9oZWFkPgpAQCAtODYsOCArOTcsNiBA QAogICAgICAgICA8cD5UZXN0ICZsdDt2aWRlbyZndDsgZWxlbWVudCB3aXRoIGFuZCB3aXRob3V0 IGEgcG9zdGVyLjwvcD4KICAgICAgICAgPHNjcmlwdD4KICAgICAgICAgICBmaW5kTWVkaWFFbGVt ZW50KCk7Ci0gICAgICAgICAgdmlkZW8uYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIGZ1bmN0aW9u KCkgeyB0ZXN0UG9zdGVyKCk7IH0pOwotICAgICAgICAgIHZpZGVvLmFkZEV2ZW50TGlzdGVuZXIo ImVycm9yIiwgZnVuY3Rpb24oKSB7IHRlc3RQb3N0ZXIoKTsgfSk7CiAgICAgICAgICAgdGVzdFBv c3RlcigpOwogICAgICAgICA8L3NjcmlwdD4KICAgICA8L2JvZHk+Cg==