48518 2010-10-28 06:22:30 -0700 Convert correctly between GeolocationPosition and Geoposition timestamp formats 2010-11-17 11:59:29 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 49066 39908 40373 45752 0 jknotten webkit-unassigned abarth buildbot commit-queue eric jorlow kling rniwa sam steveblock webkit.review.bot oldest_to_newest 301027 0 jknotten 2010-10-28 06:22:30 -0700 WebCore/Page/Geolocation.cpp creates Geopositions from GeolocationPositions, but incorrect converts the timestamp. The GeolocationPosition timestamp is a floating point number in seconds (a double), and the Geoposition timestamp is a DOMTimestamp which is an integer number of milliseconds (unsigned long long). The fix is to convert seconds to milliseconds by multiplying by 1000. 301031 1 72180 jknotten 2010-10-28 06:32:41 -0700 Created attachment 72180 Patch 302485 2 kling 2010-10-31 13:44:53 -0700 Can you make a layout test for this? 302508 3 72180 abarth 2010-10-31 18:10:52 -0700 Comment on attachment 72180 Patch We need a test. Also, we should have a helper function that does this conversion so we can give it a name. 305247 4 steveblock 2010-11-05 06:47:55 -0700 > We need a test. Also, we should have a helper function that does this > conversion so we can give it a name. Makes sense, but why does GeolocationPosition use anything other than DOMTimeStamp (as used by Geoposition) in the first place? Is it to simplify converting to a WebKit type? I'm surprised there aren't other cases where we convert DOMTimeStamp to a WebKit type? 305258 5 73063 jknotten 2010-11-05 07:08:58 -0700 Created attachment 73063 Patch 305261 6 jknotten 2010-11-05 07:12:25 -0700 It's worth noting that this bug is specific to ENABLE(CLIENT_BASED_GEOLOCATION). The fast/dom/Geolocation/maximum-age.html test fails without the fix, but I have included a new layout test which tests the timestamp conversion much more obviously. Adam Barth suggested using converter functions. I've added a new bug 49066 with a proposal for that. 306128 7 73240 jknotten 2010-11-08 08:18:49 -0800 Created attachment 73240 Patch 306142 8 buildbot 2010-11-08 08:50:53 -0800 Attachment 73240 did not build on win: Build output: http://queues.webkit.org/results/5501031 306709 9 73358 jknotten 2010-11-09 04:46:00 -0800 Created attachment 73358 Patch 309306 10 73358 jorlow 2010-11-15 09:07:20 -0800 Comment on attachment 73358 Patch r=me 309320 11 73358 commit-queue 2010-11-15 09:34:03 -0800 Comment on attachment 73358 Patch Rejecting patch 73358 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=abarth-cq-sl', 'build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']" exit_code: 2 Last 500 characters of output: ast/dom/DOMException .... fast/dom/DOMImplementation ..... fast/dom/Document ................ fast/dom/Document/CaretRangeFromPoint .... fast/dom/Element ................................. fast/dom/EntityReference . fast/dom/Geolocation ................................ fast/dom/Geolocation/timestamp.html -> failed Exiting early after 1 failures. 7085 tests run. 148.68s total testing time 7084 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 4 test cases (<1%) had stderr output Full output: http://queues.webkit.org/results/5977083 309726 12 73995 jknotten 2010-11-16 08:07:44 -0800 Created attachment 73995 Patch 309727 13 73995 jknotten 2010-11-16 08:11:20 -0800 Comment on attachment 73995 Patch The DOMTimeStamp bindings differs between Chromium and Mac WebKit. See bug https://bugs.webkit.org/show_bug.cgi?id=49589 . Change the test so that it does not depend on the actual representation of DOMTimeStamp. Also, adds a new forwarding header to mac DumpRenderTree in order to get a proper timestamp for the event (comparable to Date.getTime). 310326 14 73995 commit-queue 2010-11-17 09:08:51 -0800 Comment on attachment 73995 Patch Clearing flags on attachment: 73995 Committed r72211: <http://trac.webkit.org/changeset/72211> 310327 15 commit-queue 2010-11-17 09:08:58 -0800 All reviewed patches have been landed. Closing bug. 310353 16 webkit.review.bot 2010-11-17 10:00:20 -0800 http://trac.webkit.org/changeset/72211 might have broken GTK Linux 64-bit Debug The following tests are not passing: fast/dom/Geolocation/timestamp.html 310425 17 rniwa 2010-11-17 11:59:29 -0800 This change seems to be responsible for Gtk Linux test brokerage. fast/dom/Geolocation/timestep.html is passing in http://build.webkit.org/results/GTK%20Linux%2032-bit%20Release/r72207%20(7748)/results.html but failing in http://build.webkit.org/results/GTK%20Linux%2032-bit%20Release/r72212%20(7749)/results.html 72180 2010-10-28 06:32:41 -0700 2010-11-05 07:08:52 -0700 Patch bug-48518-20101028143239.patch text/plain 1689 jknotten ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZDQ2NGI5YjQxYzIxZTdmZTYyNjgwZDYxYmY4ZjIyYzllOTUxYjMyOC4uMmE3NmRlZDk5YTEzMmJh MDk1NDUxYmNiZWUxNjI1NDZhNTE5N2IyNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0xMC0yOCAgSm9o biBLbm90dGVuYmVsdCAgPGprbm90dGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IGNvcnJlY3RseSBiZXR3ZWVu IEdlb2xvY2F0aW9uUG9zaXRpb24gYW5kIEdlb3Bvc2l0aW9uCisgICAgICAgIHRpbWVzdGFtcCBm b3JtYXRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDg1MTgKKworICAgICAgICAqIHBhZ2UvR2VvbG9jYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Y3JlYXRlR2VvcG9zaXRpb24pOgorCiAyMDEwLTEwLTI4ICBQYXNjYWwgTWFzc2ltaW5vICA8 cGFzY2FsLm1hc3NpbWlub0BnbWFpbC5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBC YXJ0aC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAgYi9XZWJDb3Jl L3BhZ2UvR2VvbG9jYXRpb24uY3BwCmluZGV4IGQ1Mjc3ZTAwNzhlYjZiMmIzNmFkYTRjOTZhNmE4 OTlkYWYyZTNhNjguLjE0ZGNmMmNkMGY0YjcyYjU1MTI1N2RhMWY1OWEzZmYyZmI4MjZmNDUgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAKKysrIGIvV2ViQ29yZS9wYWdl L0dlb2xvY2F0aW9uLmNwcApAQCAtNjEsNyArNjEsNyBAQCBzdGF0aWMgUGFzc1JlZlB0cjxHZW9w b3NpdGlvbj4gY3JlYXRlR2VvcG9zaXRpb24oR2VvbG9jYXRpb25Qb3NpdGlvbiogcG9zaXRpb24p CiAgICAgUmVmUHRyPENvb3JkaW5hdGVzPiBjb29yZGluYXRlcyA9IENvb3JkaW5hdGVzOjpjcmVh dGUocG9zaXRpb24tPmxhdGl0dWRlKCksIHBvc2l0aW9uLT5sb25naXR1ZGUoKSwgcG9zaXRpb24t PmNhblByb3ZpZGVBbHRpdHVkZSgpLCBwb3NpdGlvbi0+YWx0aXR1ZGUoKSwgCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG9zaXRpb24t PmFjY3VyYWN5KCksIHBvc2l0aW9uLT5jYW5Qcm92aWRlQWx0aXR1ZGVBY2N1cmFjeSgpLCBwb3Np dGlvbi0+YWx0aXR1ZGVBY2N1cmFjeSgpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uLT5jYW5Qcm92aWRlSGVhZGluZygp LCBwb3NpdGlvbi0+aGVhZGluZygpLCBwb3NpdGlvbi0+Y2FuUHJvdmlkZVNwZWVkKCksIHBvc2l0 aW9uLT5zcGVlZCgpKTsKLSAgICByZXR1cm4gR2VvcG9zaXRpb246OmNyZWF0ZShjb29yZGluYXRl cy5yZWxlYXNlKCksIHBvc2l0aW9uLT50aW1lc3RhbXAoKSk7CisgICAgcmV0dXJuIEdlb3Bvc2l0 aW9uOjpjcmVhdGUoY29vcmRpbmF0ZXMucmVsZWFzZSgpLCBwb3NpdGlvbi0+dGltZXN0YW1wKCkg KiAxMDAwKTsKIH0KIAogc3RhdGljIFBhc3NSZWZQdHI8UG9zaXRpb25FcnJvcj4gY3JlYXRlUG9z aXRpb25FcnJvcihHZW9sb2NhdGlvbkVycm9yKiBlcnJvcikK 73063 2010-11-05 07:08:58 -0700 2010-11-08 08:18:43 -0800 Patch bug-48518-20101105140856.patch text/plain 5155 jknotten ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlMDYxMjZmODI1YWU4ZjIxMDM2OGRkMDNlNWQ2MjczMzJlODAxYjcwLi43OWI3OTY0 YWNhZmQ5Yzg4ODAyYTdjZjMxN2I3MDliYTFiYWFlZGU3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTEtMDUgIEpvaG4gS25vdHRlbmJlbHQgIDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbGF5 b3V0IHRlc3QgdG8gY2hlY2sgdGhhdCBHZW9wb3NpdGlvbiB0aW1lc3RhbXBzIGFyZQorICAgICAg ICB3ZWxsLWZvcm1lZC4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00ODUxOAorCisgICAgICAgICogZmFzdC9kb20vR2VvbG9jYXRpb24vc2NyaXB0LXRlc3RzL3Rp bWVzdGFtcC5qczogQWRkZWQuCisgICAgICAgIChjaGVja1Bvc2l0aW9uKToKKyAgICAgICAgKiBm YXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRtbDogQWRkZWQuCisKIDIwMTAt MTEtMDUgIEZ1bWl0b3NoaSBVa2FpICA8dWthaUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZC4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3Nj cmlwdC10ZXN0cy90aW1lc3RhbXAuanMgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlv bi9zY3JpcHQtdGVzdHMvdGltZXN0YW1wLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA4YzBjN2E2NzAwN2UyMjMw MTE3ZWYxNDMwYmUxODg3ZWM4NjM1ODQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L2RvbS9HZW9sb2NhdGlvbi9zY3JpcHQtdGVzdHMvdGltZXN0YW1wLmpzCkBAIC0wLDAgKzEs MzAgQEAKK2Rlc2NyaXB0aW9uKCJUZXN0cyB0aGF0IEdlb3Bvc2l0aW9uIHRpbWVzdGFtcHMgYXJl IHdlbGwtZm9ybWVkIChub24temVybyBhbmQgaW4gdGhlIHNhbWUgdW5pdHMgYXMgRGF0ZS5nZXRU aW1lKS4iKTsKKwordmFyIG1vY2tMYXRpdHVkZSA9IDUxLjQ3ODsKK3ZhciBtb2NrTG9uZ2l0dWRl ID0gLTAuMTY2OwordmFyIG1vY2tBY2N1cmFjeSA9IDEwMC4wOworCitpZiAod2luZG93LmxheW91 dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0R2VvbG9jYXRp b25QZXJtaXNzaW9uKHRydWUpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLnNldE1vY2tHZW9s b2NhdGlvblBvc2l0aW9uKG1vY2tMYXRpdHVkZSwgbW9ja0xvbmdpdHVkZSwgbW9ja0FjY3VyYWN5 KTsKK30KKwordmFyIG5vdyA9IG5ldyBEYXRlKCkuZ2V0VGltZSgpOworc2hvdWxkQmVUcnVlKCdu b3cgIT0gMCcpOwordmFyIHQgPSBudWxsOwordmFyIHRoZW4gPSBudWxsOworCitmdW5jdGlvbiBj aGVja1Bvc2l0aW9uKHApIHsKKyAgICB0ID0gcC50aW1lc3RhbXAuZ2V0VGltZSgpOworICAgIHZh ciBkID0gbmV3IERhdGUoKTsKKyAgICB0aGVuID0gZC5nZXRUaW1lKCk7CisgICAgc2hvdWxkQmVU cnVlKCd0ICE9IDAnKTsKKyAgICBzaG91bGRCZVRydWUoJ3RoZW4gIT0gMCcpOworICAgIHNob3Vs ZEJlVHJ1ZSgnbm93IC0gMSA8PSB0Jyk7IC8vIEF2b2lkIHJvdW5kaW5nIGVycm9ycworICAgIHNo b3VsZEJlVHJ1ZSgndCA8PSB0aGVuICsgMScpOyAvLyBBdm9pZCByb3VuZGluZyBlcnJvcnMKKyAg ICBmaW5pc2hKU1Rlc3QoKTsKK30KKworbmF2aWdhdG9yLmdlb2xvY2F0aW9uLmdldEN1cnJlbnRQ b3NpdGlvbihjaGVja1Bvc2l0aW9uKQord2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOword2lu ZG93LnN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv ZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5l NGU4YzkxODU2NzBiZDA4MGJiOGFjNmUwODM1OWFlNjI1ZTdkMTYxCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDE0IEBACitUZXN0cyB0aGF0IEdlb3Bvc2l0aW9uIHRpbWVzdGFtcHMgYXJl IHdlbGwtZm9ybWVkIChub24temVybyBhbmQgaW4gdGhlIHNhbWUgdW5pdHMgYXMgRGF0ZS5nZXRU aW1lKS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNz YWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mgbm93ICE9IDAgaXMg dHJ1ZQorUEFTUyB0ICE9IDAgaXMgdHJ1ZQorUEFTUyB0aGVuICE9IDAgaXMgdHJ1ZQorUEFTUyBu b3cgLSAxIDw9IHQgaXMgdHJ1ZQorUEFTUyB0IDw9IHRoZW4gKyAxIGlzIHRydWUKK1BBU1Mgc3Vj Y2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3RpbWVzdGFtcC5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmNlMzE5 YTc0OTI5M2M5ZjI5Y2Y0NTIyMTUwNWY1ZjMxYTIzMDYzYmIKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRtbApAQCAtMCwwICsx LDEzIEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL0lFVEYvL0RURCBIVE1MLy9FTiI+Cis8 aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSIuLi8uLi9qcy9yZXNv dXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jlc291cmNl cy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNj cmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0IHNyYz0ic2Ny aXB0LXRlc3RzL3RpbWVzdGFtcC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vanMv cmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRp ZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDY2 NDE5MDM5OTNlOTdkMTRmZjYzMGIwZTU0YWQyZWQ1OTAxNzM2ZGEuLmY1M2YzYTFlODMzYzY1NWM3 Y2Q5MGY3NmNkMjhhZjkyNTllYWVkNjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisr KyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTEtMDUgIEpvaG4g S25vdHRlbmJlbHQgIDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQ29udmVydCBjb3JyZWN0bHkgYmV0d2VlbiBH ZW9sb2NhdGlvblBvc2l0aW9uIGFuZCBHZW9wb3NpdGlvbgorICAgICAgICB0aW1lc3RhbXAgZm9y bWF0cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4 NTE4CisKKyAgICAgICAgVGVzdDogZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLmh0bWwK KworICAgICAgICAqIHBhZ2UvR2VvbG9jYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y3Jl YXRlR2VvcG9zaXRpb24pOgogMjAxMC0xMS0wNSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwIGIvV2ViQ29yZS9wYWdlL0dlb2xv Y2F0aW9uLmNwcAppbmRleCBkNTI3N2UwMDc4ZWI2YjJiMzZhZGE0Yzk2YTZhODk5ZGFmMmUzYTY4 Li4xNGRjZjJjZDBmNGI3MmI1NTEyNTdkYTFmNTlhM2ZmMmZiODI2ZjQ1IDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlv bi5jcHAKQEAgLTYxLDcgKzYxLDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8R2VvcG9zaXRpb24+IGNy ZWF0ZUdlb3Bvc2l0aW9uKEdlb2xvY2F0aW9uUG9zaXRpb24qIHBvc2l0aW9uKQogICAgIFJlZlB0 cjxDb29yZGluYXRlcz4gY29vcmRpbmF0ZXMgPSBDb29yZGluYXRlczo6Y3JlYXRlKHBvc2l0aW9u LT5sYXRpdHVkZSgpLCBwb3NpdGlvbi0+bG9uZ2l0dWRlKCksIHBvc2l0aW9uLT5jYW5Qcm92aWRl QWx0aXR1ZGUoKSwgcG9zaXRpb24tPmFsdGl0dWRlKCksIAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uLT5hY2N1cmFjeSgp LCBwb3NpdGlvbi0+Y2FuUHJvdmlkZUFsdGl0dWRlQWNjdXJhY3koKSwgcG9zaXRpb24tPmFsdGl0 dWRlQWNjdXJhY3koKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwb3NpdGlvbi0+Y2FuUHJvdmlkZUhlYWRpbmcoKSwgcG9zaXRpb24t PmhlYWRpbmcoKSwgcG9zaXRpb24tPmNhblByb3ZpZGVTcGVlZCgpLCBwb3NpdGlvbi0+c3BlZWQo KSk7Ci0gICAgcmV0dXJuIEdlb3Bvc2l0aW9uOjpjcmVhdGUoY29vcmRpbmF0ZXMucmVsZWFzZSgp LCBwb3NpdGlvbi0+dGltZXN0YW1wKCkpOworICAgIHJldHVybiBHZW9wb3NpdGlvbjo6Y3JlYXRl KGNvb3JkaW5hdGVzLnJlbGVhc2UoKSwgcG9zaXRpb24tPnRpbWVzdGFtcCgpICogMTAwMCk7CiB9 CiAKIHN0YXRpYyBQYXNzUmVmUHRyPFBvc2l0aW9uRXJyb3I+IGNyZWF0ZVBvc2l0aW9uRXJyb3Io R2VvbG9jYXRpb25FcnJvciogZXJyb3IpCg== 73240 2010-11-08 08:18:49 -0800 2010-11-09 04:45:52 -0800 Patch bug-48518-20101108161846.patch text/plain 9153 jknotten ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNDdiMTg3OGE0ODk5YzI5ODFlNGZiMWI2N2NhMTA4MTYxZWRkYTEwLi40ZTgzMWFi NzI4MTVmYTQxNzhjYzMzMzIzYmExZWM4ZDhmMDRhZjk2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTEtMDggIEpvaG4gS25vdHRlbmJlbHQgIDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbGF5 b3V0IHRlc3QgdG8gY2hlY2sgdGhhdCBHZW9wb3NpdGlvbiB0aW1lc3RhbXBzIGFyZQorICAgICAg ICB3ZWxsLWZvcm1lZC4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00ODUxOAorCisgICAgICAgICogZmFzdC9kb20vR2VvbG9jYXRpb24vc2NyaXB0LXRlc3RzL3Rp bWVzdGFtcC5qczogQWRkZWQuCisgICAgICAgIChjaGVja1Bvc2l0aW9uKToKKyAgICAgICAgKiBm YXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRtbDogQWRkZWQuCisKIDIwMTAt MTEtMDggIEJhbGF6cyBLZWxlbWVuICA8a2JhbGF6c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJ1 YmJlci1zdGFtcGVkIGJ5IENzYWJhIE9zenRyb2dvbmFjLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvZmFzdC9kb20vR2VvbG9jYXRpb24vc2NyaXB0LXRlc3RzL3RpbWVzdGFtcC5qcyBiL0xheW91 dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3NjcmlwdC10ZXN0cy90aW1lc3RhbXAuanMKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMC4uMDhjMGM3YTY3MDA3ZTIyMzAxMTdlZjE0MzBiZTE4ODdlYzg2MzU4NAotLS0gL2Rl di9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3NjcmlwdC10ZXN0 cy90aW1lc3RhbXAuanMKQEAgLTAsMCArMSwzMCBAQAorZGVzY3JpcHRpb24oIlRlc3RzIHRoYXQg R2VvcG9zaXRpb24gdGltZXN0YW1wcyBhcmUgd2VsbC1mb3JtZWQgKG5vbi16ZXJvIGFuZCBpbiB0 aGUgc2FtZSB1bml0cyBhcyBEYXRlLmdldFRpbWUpLiIpOworCit2YXIgbW9ja0xhdGl0dWRlID0g NTEuNDc4OwordmFyIG1vY2tMb25naXR1ZGUgPSAtMC4xNjY7Cit2YXIgbW9ja0FjY3VyYWN5ID0g MTAwLjA7CisKK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5zZXRHZW9sb2NhdGlvblBlcm1pc3Npb24odHJ1ZSk7CisgICAgbGF5b3V0 VGVzdENvbnRyb2xsZXIuc2V0TW9ja0dlb2xvY2F0aW9uUG9zaXRpb24obW9ja0xhdGl0dWRlLCBt b2NrTG9uZ2l0dWRlLCBtb2NrQWNjdXJhY3kpOworfQorCit2YXIgbm93ID0gbmV3IERhdGUoKS5n ZXRUaW1lKCk7CitzaG91bGRCZVRydWUoJ25vdyAhPSAwJyk7Cit2YXIgdCA9IG51bGw7Cit2YXIg dGhlbiA9IG51bGw7CisKK2Z1bmN0aW9uIGNoZWNrUG9zaXRpb24ocCkgeworICAgIHQgPSBwLnRp bWVzdGFtcC5nZXRUaW1lKCk7CisgICAgdmFyIGQgPSBuZXcgRGF0ZSgpOworICAgIHRoZW4gPSBk LmdldFRpbWUoKTsKKyAgICBzaG91bGRCZVRydWUoJ3QgIT0gMCcpOworICAgIHNob3VsZEJlVHJ1 ZSgndGhlbiAhPSAwJyk7CisgICAgc2hvdWxkQmVUcnVlKCdub3cgLSAxIDw9IHQnKTsgLy8gQXZv aWQgcm91bmRpbmcgZXJyb3JzCisgICAgc2hvdWxkQmVUcnVlKCd0IDw9IHRoZW4gKyAxJyk7IC8v IEF2b2lkIHJvdW5kaW5nIGVycm9ycworICAgIGZpbmlzaEpTVGVzdCgpOworfQorCituYXZpZ2F0 b3IuZ2VvbG9jYXRpb24uZ2V0Q3VycmVudFBvc2l0aW9uKGNoZWNrUG9zaXRpb24pCit3aW5kb3cu anNUZXN0SXNBc3luYyA9IHRydWU7Cit3aW5kb3cuc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3RpbWVzdGFtcC1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAt ZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmU0ZThjOTE4NTY3MGJkMDgwYmI4YWM2ZTA4MzU5YWU2 MjVlN2QxNjEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2Nh dGlvbi90aW1lc3RhbXAtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTQgQEAKK1Rlc3RzIHRoYXQg R2VvcG9zaXRpb24gdGltZXN0YW1wcyBhcmUgd2VsbC1mb3JtZWQgKG5vbi16ZXJvIGFuZCBpbiB0 aGUgc2FtZSB1bml0cyBhcyBEYXRlLmdldFRpbWUpLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBz ZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVU RSIuCisKKworUEFTUyBub3cgIT0gMCBpcyB0cnVlCitQQVNTIHQgIT0gMCBpcyB0cnVlCitQQVNT IHRoZW4gIT0gMCBpcyB0cnVlCitQQVNTIG5vdyAtIDEgPD0gdCBpcyB0cnVlCitQQVNTIHQgPD0g dGhlbiArIDEgaXMgdHJ1ZQorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNU IENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9u L3RpbWVzdGFtcC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZXN0 YW1wLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uY2UzMTlhNzQ5MjkzYzlmMjljZjQ1MjIxNTA1ZjVmMzFhMjMw NjNiYgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9u L3RpbWVzdGFtcC5odG1sCkBAIC0wLDAgKzEsMTMgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAi LS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayByZWw9InN0eWxl c2hlZXQiIGhyZWY9Ii4uLy4uL2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2Ny aXB0IHNyYz0iLi4vLi4vanMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwv aGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xl Ij48L2Rpdj4KKzxzY3JpcHQgc3JjPSJzY3JpcHQtdGVzdHMvdGltZXN0YW1wLmpzIj48L3Njcmlw dD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3Nj cmlwdD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWU0ODY0MzA0YzQ1YTEwMGIzZGE3MjA1NDgxNjA4YjMz YjIzZDJiNi4uZjNjOGQxZTM1ZThkMTAzNzczMjUyZTNlN2JhZmI1MThjNmU4NzUwNyAxMDA2NDQK LS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNiBAQAorMjAxMC0xMS0wOCAgSm9obiBLbm90dGVuYmVsdCAgPGprbm90dGVuQGNocm9taXVt Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBD b252ZXJ0IGNvcnJlY3RseSBiZXR3ZWVuIEdlb2xvY2F0aW9uUG9zaXRpb24gYW5kIEdlb3Bvc2l0 aW9uCisgICAgICAgIHRpbWVzdGFtcCBmb3JtYXRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg1MTgKKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9H ZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRtbAorCisgICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5j cHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVHZW9wb3NpdGlvbik6CisKIDIwMTAtMTEtMDgg IEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdpbmRvd3MgUmVsZWFz ZSBidWlsZCBmaXggYWZ0ZXIgcjcxNTE0CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BhZ2UvR2VvbG9j YXRpb24uY3BwIGIvV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcAppbmRleCBkNTI3N2UwMDc4 ZWI2YjJiMzZhZGE0Yzk2YTZhODk5ZGFmMmUzYTY4Li4zYWI2OTE2Y2M5ZTY0MmYwODRjM2MxMzE2 NDhkZTZlM2MwYzk2MjVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3Bw CisrKyBiL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlvbi5jcHAKQEAgLTIyLDcgKzIyLDcgQEAKICAq IFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9O IEFOWSBUSEVPUlkKICAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNU IExJQUJJTElUWSwgT1IgVE9SVAogICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lT RSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCi0gKiBPRiBUSElTIFNPRlRXQVJF LCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLiAKKyAq IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0Yg U1VDSCBEQU1BR0UuCiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgpAQCAtNTcsMTEgKzU3LDEx IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEdlb3Bvc2l0aW9uPiBjcmVhdGVHZW9wb3NpdGlvbihHZW9s b2NhdGlvblBvc2l0aW9uKiBwb3NpdGlvbikKIHsKICAgICBpZiAoIXBvc2l0aW9uKQogICAgICAg ICByZXR1cm4gMDsKLSAgICAKLSAgICBSZWZQdHI8Q29vcmRpbmF0ZXM+IGNvb3JkaW5hdGVzID0g Q29vcmRpbmF0ZXM6OmNyZWF0ZShwb3NpdGlvbi0+bGF0aXR1ZGUoKSwgcG9zaXRpb24tPmxvbmdp dHVkZSgpLCBwb3NpdGlvbi0+Y2FuUHJvdmlkZUFsdGl0dWRlKCksIHBvc2l0aW9uLT5hbHRpdHVk ZSgpLCAKKworICAgIFJlZlB0cjxDb29yZGluYXRlcz4gY29vcmRpbmF0ZXMgPSBDb29yZGluYXRl czo6Y3JlYXRlKHBvc2l0aW9uLT5sYXRpdHVkZSgpLCBwb3NpdGlvbi0+bG9uZ2l0dWRlKCksIHBv c2l0aW9uLT5jYW5Qcm92aWRlQWx0aXR1ZGUoKSwgcG9zaXRpb24tPmFsdGl0dWRlKCksCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcG9z aXRpb24tPmFjY3VyYWN5KCksIHBvc2l0aW9uLT5jYW5Qcm92aWRlQWx0aXR1ZGVBY2N1cmFjeSgp LCBwb3NpdGlvbi0+YWx0aXR1ZGVBY2N1cmFjeSgpLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uLT5jYW5Qcm92aWRlSGVh ZGluZygpLCBwb3NpdGlvbi0+aGVhZGluZygpLCBwb3NpdGlvbi0+Y2FuUHJvdmlkZVNwZWVkKCks IHBvc2l0aW9uLT5zcGVlZCgpKTsKLSAgICByZXR1cm4gR2VvcG9zaXRpb246OmNyZWF0ZShjb29y ZGluYXRlcy5yZWxlYXNlKCksIHBvc2l0aW9uLT50aW1lc3RhbXAoKSk7CisgICAgcmV0dXJuIEdl b3Bvc2l0aW9uOjpjcmVhdGUoY29vcmRpbmF0ZXMucmVsZWFzZSgpLCBjb252ZXJ0U2Vjb25kc1Rv RE9NVGltZVN0YW1wKHBvc2l0aW9uKSk7CiB9CiAKIHN0YXRpYyBQYXNzUmVmUHRyPFBvc2l0aW9u RXJyb3I+IGNyZWF0ZVBvc2l0aW9uRXJyb3IoR2VvbG9jYXRpb25FcnJvciogZXJyb3IpCkBAIC00 MDAsNyArNDAwLDcgQEAgdm9pZCBHZW9sb2NhdGlvbjo6Y2xlYXJXYXRjaChpbnQgd2F0Y2hJZCkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgbV93YXRjaGVycy5yZW1vdmUod2F0Y2hJZCk7Ci0gICAg CisKICAgICBpZiAoIWhhc0xpc3RlbmVycygpKQogICAgICAgICBzdG9wVXBkYXRpbmcoKTsKIH0K QEAgLTQyNiw3ICs0MjYsNyBAQCB2b2lkIEdlb2xvY2F0aW9uOjpzZXRJc0FsbG93ZWQoYm9vbCBh bGxvd2VkKQogICAgIC8vIFRoaXMgbWF5IGJlIGR1ZSB0byBlaXRoZXIgYSBuZXcgcG9zaXRpb24g ZnJvbSB0aGUgc2VydmljZSwgb3IgYSBjYWNoZWQKICAgICAvLyBwb3NpdGlvbi4KICAgICBtX2Fs bG93R2VvbG9jYXRpb24gPSBhbGxvd2VkID8gWWVzIDogTm87Ci0gICAgCisKICNpZiBVU0UoUFJF RU1QVF9HRU9MT0NBVElPTl9QRVJNSVNTSU9OKQogICAgIC8vIFBlcm1pc3Npb24gcmVxdWVzdCB3 YXMgbWFkZSBkdXJpbmcgdGhlIHN0YXJ0UmVxdWVzdCBwcm9jZXNzCiAgICAgaWYgKCFtX3BlbmRp bmdGb3JQZXJtaXNzaW9uTm90aWZpZXJzLmlzRW1wdHkoKSkgewpAQCAtNDU4LDcgKzQ1OCw3IEBA IHZvaWQgR2VvbG9jYXRpb246OnNlbmRFcnJvcihWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+ JiBub3RpZmllcnMsIFBvc2l0aW9uRXJyCiAgICAgIFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ ID46OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG5vdGlmaWVycy5lbmQoKTsKICAgICAgZm9yIChWZWN0 b3I8UmVmUHRyPEdlb05vdGlmaWVyPiA+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG5vdGlmaWVycy5i ZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpIHsKICAgICAgICAgIFJlZlB0cjxHZW9Ob3RpZmllcj4g bm90aWZpZXIgPSAqaXQ7Ci0gICAgICAgICAKKwogICAgICAgICAgaWYgKG5vdGlmaWVyLT5tX2Vy cm9yQ2FsbGJhY2spCiAgICAgICAgICAgICAgbm90aWZpZXItPm1fZXJyb3JDYWxsYmFjay0+aGFu ZGxlRXZlbnQoZXJyb3IpOwogICAgICB9CkBAIC00NzAsNyArNDcwLDcgQEAgdm9pZCBHZW9sb2Nh dGlvbjo6c2VuZFBvc2l0aW9uKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID4mIG5vdGlmaWVy cywgR2VvcG9zaXQKICAgICBmb3IgKFZlY3RvcjxSZWZQdHI8R2VvTm90aWZpZXI+ID46OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gbm90aWZpZXJzLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewogICAg ICAgICBSZWZQdHI8R2VvTm90aWZpZXI+IG5vdGlmaWVyID0gKml0OwogICAgICAgICBBU1NFUlQo bm90aWZpZXItPm1fc3VjY2Vzc0NhbGxiYWNrKTsKLSAgICAgICAgCisKICAgICAgICAgbm90aWZp ZXItPm1fc3VjY2Vzc0NhbGxiYWNrLT5oYW5kbGVFdmVudChwb3NpdGlvbik7CiAgICAgfQogfQpA QCAtNDg4LDcgKzQ4OCw3IEBAIHZvaWQgR2VvbG9jYXRpb246OnN0b3BUaW1lcnNGb3JPbmVTaG90 cygpCiB7CiAgICAgVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPiBjb3B5OwogICAgIGNvcHlU b1ZlY3RvcihtX29uZVNob3RzLCBjb3B5KTsKLSAgICAKKwogICAgIHN0b3BUaW1lcihjb3B5KTsK IH0KIApAQCAtNDk2LDcgKzQ5Niw3IEBAIHZvaWQgR2VvbG9jYXRpb246OnN0b3BUaW1lcnNGb3JX YXRjaGVycygpCiB7CiAgICAgVmVjdG9yPFJlZlB0cjxHZW9Ob3RpZmllcj4gPiBjb3B5OwogICAg IG1fd2F0Y2hlcnMuZ2V0Tm90aWZpZXJzVmVjdG9yKGNvcHkpOwotICAgIAorCiAgICAgc3RvcFRp bWVyKGNvcHkpOwogfQogCkBAIC01MjUsNyArNTI1LDcgQEAgdm9pZCBHZW9sb2NhdGlvbjo6Y2Fu Y2VsQWxsUmVxdWVzdHMoKQogdm9pZCBHZW9sb2NhdGlvbjo6aGFuZGxlRXJyb3IoUG9zaXRpb25F cnJvciogZXJyb3IpCiB7CiAgICAgQVNTRVJUKGVycm9yKTsKLSAgICAKKwogICAgIFZlY3RvcjxS ZWZQdHI8R2VvTm90aWZpZXI+ID4gb25lU2hvdHNDb3B5OwogICAgIGNvcHlUb1ZlY3RvcihtX29u ZVNob3RzLCBvbmVTaG90c0NvcHkpOwogCkBAIC01ODcsMTMgKzU4NywxMyBAQCB2b2lkIEdlb2xv Y2F0aW9uOjptYWtlU3VjY2Vzc0NhbGxiYWNrcygpCiB7CiAgICAgQVNTRVJUKGxhc3RQb3NpdGlv bigpKTsKICAgICBBU1NFUlQoaXNBbGxvd2VkKCkpOwotICAgIAorCiAgICAgVmVjdG9yPFJlZlB0 cjxHZW9Ob3RpZmllcj4gPiBvbmVTaG90c0NvcHk7CiAgICAgY29weVRvVmVjdG9yKG1fb25lU2hv dHMsIG9uZVNob3RzQ29weSk7Ci0gICAgCisKICAgICBWZWN0b3I8UmVmUHRyPEdlb05vdGlmaWVy PiA+IHdhdGNoZXJzQ29weTsKICAgICBtX3dhdGNoZXJzLmdldE5vdGlmaWVyc1ZlY3Rvcih3YXRj aGVyc0NvcHkpOwotICAgIAorCiAgICAgLy8gQ2xlYXIgdGhlIGxpc3RzIGJlZm9yZSB3ZSBtYWtl IHRoZSBjYWxsYmFja3MsIHRvIGF2b2lkIGNsZWFyaW5nIG5vdGlmaWVycwogICAgIC8vIGFkZGVk IGJ5IGNhbGxzIHRvIEdlb2xvY2F0aW9uIG1ldGhvZHMgZnJvbSB0aGUgY2FsbGJhY2tzLCBhbmQg dG8gcHJldmVudAogICAgIC8vIGZ1cnRoZXIgY2FsbGJhY2tzIHRvIHRoZXNlIG5vdGlmaWVycy4K QEAgLTY3OCw3ICs2NzgsNyBAQCB2b2lkIEdlb2xvY2F0aW9uOjpzdG9wVXBkYXRpbmcoKQogI2lm IFVTRShQUkVFTVBUX0dFT0xPQ0FUSU9OX1BFUk1JU1NJT04pCiB2b2lkIEdlb2xvY2F0aW9uOjpo YW5kbGVQZW5kaW5nUGVybWlzc2lvbk5vdGlmaWVycygpCiB7Ci0gICAgLy8gV2hpbGUgd2UgaXRl cmF0ZSB0aHJvdWdoIHRoZSBsaXN0LCB3ZSBuZWVkIG5vdCB3b3JyeSBhYm91dCBsaXN0IGJlaW5n IG1vZGlmaWVkIGFzIHRoZSBwZXJtaXNzaW9uIAorICAgIC8vIFdoaWxlIHdlIGl0ZXJhdGUgdGhy b3VnaCB0aGUgbGlzdCwgd2UgbmVlZCBub3Qgd29ycnkgYWJvdXQgbGlzdCBiZWluZyBtb2RpZmll ZCBhcyB0aGUgcGVybWlzc2lvbgogICAgIC8vIGlzIGFscmVhZHkgc2V0IHRvIFllcy9ObyBhbmQg bm8gbmV3IGxpc3RlbmVycyB3aWxsIGJlIGFkZGVkIHRvIHRoZSBwZW5kaW5nIGxpc3QKICAgICBH ZW9Ob3RpZmllclNldDo6Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9wZW5kaW5nRm9yUGVybWlzc2lv bk5vdGlmaWVycy5lbmQoKTsKICAgICBmb3IgKEdlb05vdGlmaWVyU2V0Ojpjb25zdF9pdGVyYXRv ciBpdGVyID0gbV9wZW5kaW5nRm9yUGVybWlzc2lvbk5vdGlmaWVycy5iZWdpbigpOyBpdGVyICE9 IGVuZDsgKytpdGVyKSB7CkBAIC03MTQsNSArNzE0LDUgQEAgR2VvbG9jYXRpb246On5HZW9sb2Nh dGlvbigpIHt9CiB2b2lkIEdlb2xvY2F0aW9uOjpzZXRJc0FsbG93ZWQoYm9vbCkge30KIAogfQot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAK KwogI2VuZGlmIC8vIEVOQUJMRShHRU9MT0NBVElPTikK 73358 2010-11-09 04:46:00 -0800 2010-11-16 08:07:38 -0800 Patch bug-48518-20101109124556.patch text/plain 5178 jknotten ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA5MmJhZmQ4ZTI0ZjEzZGU0YjliYmU4MTI4YzgxYjgwNjllMDBmMDNkLi42OGIwNDU5 OWI1ZGY4MDYyN2VlMGViOGRkYjU4ZDcxMGE4OGNmYzE3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTEtMDggIEpvaG4gS25vdHRlbmJlbHQgIDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgbGF5 b3V0IHRlc3QgdG8gY2hlY2sgdGhhdCBHZW9wb3NpdGlvbiB0aW1lc3RhbXBzIGFyZQorICAgICAg ICB3ZWxsLWZvcm1lZC4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD00ODUxOAorCisgICAgICAgICogZmFzdC9kb20vR2VvbG9jYXRpb24vc2NyaXB0LXRlc3RzL3Rp bWVzdGFtcC5qczogQWRkZWQuCisgICAgICAgIChjaGVja1Bvc2l0aW9uKToKKyAgICAgICAgKiBm YXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRtbDogQWRkZWQuCisKIDIwMTAt MTEtMDkgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9kb20vR2VvbG9jYXRpb24v c2NyaXB0LXRlc3RzL3RpbWVzdGFtcC5qcyBiL0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0 aW9uL3NjcmlwdC10ZXN0cy90aW1lc3RhbXAuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDhjMGM3YTY3MDA3ZTIy MzAxMTdlZjE0MzBiZTE4ODdlYzg2MzU4NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3NjcmlwdC10ZXN0cy90aW1lc3RhbXAuanMKQEAgLTAsMCAr MSwzMCBAQAorZGVzY3JpcHRpb24oIlRlc3RzIHRoYXQgR2VvcG9zaXRpb24gdGltZXN0YW1wcyBh cmUgd2VsbC1mb3JtZWQgKG5vbi16ZXJvIGFuZCBpbiB0aGUgc2FtZSB1bml0cyBhcyBEYXRlLmdl dFRpbWUpLiIpOworCit2YXIgbW9ja0xhdGl0dWRlID0gNTEuNDc4OwordmFyIG1vY2tMb25naXR1 ZGUgPSAtMC4xNjY7Cit2YXIgbW9ja0FjY3VyYWN5ID0gMTAwLjA7CisKK2lmICh3aW5kb3cubGF5 b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRHZW9sb2Nh dGlvblBlcm1pc3Npb24odHJ1ZSk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0TW9ja0dl b2xvY2F0aW9uUG9zaXRpb24obW9ja0xhdGl0dWRlLCBtb2NrTG9uZ2l0dWRlLCBtb2NrQWNjdXJh Y3kpOworfQorCit2YXIgbm93ID0gbmV3IERhdGUoKS5nZXRUaW1lKCk7CitzaG91bGRCZVRydWUo J25vdyAhPSAwJyk7Cit2YXIgdCA9IG51bGw7Cit2YXIgdGhlbiA9IG51bGw7CisKK2Z1bmN0aW9u IGNoZWNrUG9zaXRpb24ocCkgeworICAgIHQgPSBwLnRpbWVzdGFtcC5nZXRUaW1lKCk7CisgICAg dmFyIGQgPSBuZXcgRGF0ZSgpOworICAgIHRoZW4gPSBkLmdldFRpbWUoKTsKKyAgICBzaG91bGRC ZVRydWUoJ3QgIT0gMCcpOworICAgIHNob3VsZEJlVHJ1ZSgndGhlbiAhPSAwJyk7CisgICAgc2hv dWxkQmVUcnVlKCdub3cgLSAxIDw9IHQnKTsgLy8gQXZvaWQgcm91bmRpbmcgZXJyb3JzCisgICAg c2hvdWxkQmVUcnVlKCd0IDw9IHRoZW4gKyAxJyk7IC8vIEF2b2lkIHJvdW5kaW5nIGVycm9ycwor ICAgIGZpbmlzaEpTVGVzdCgpOworfQorCituYXZpZ2F0b3IuZ2VvbG9jYXRpb24uZ2V0Q3VycmVu dFBvc2l0aW9uKGNoZWNrUG9zaXRpb24pCit3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7Cit3 aW5kb3cuc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3RpbWVzdGFtcC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0 cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmU0ZThjOTE4NTY3MGJkMDgwYmI4YWM2ZTA4MzU5YWU2MjVlN2QxNjEKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAtZXhwZWN0ZWQu dHh0CkBAIC0wLDAgKzEsMTQgQEAKK1Rlc3RzIHRoYXQgR2VvcG9zaXRpb24gdGltZXN0YW1wcyBh cmUgd2VsbC1mb3JtZWQgKG5vbi16ZXJvIGFuZCBpbiB0aGUgc2FtZSB1bml0cyBhcyBEYXRlLmdl dFRpbWUpLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1l c3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKworUEFTUyBub3cgIT0gMCBp cyB0cnVlCitQQVNTIHQgIT0gMCBpcyB0cnVlCitQQVNTIHRoZW4gIT0gMCBpcyB0cnVlCitQQVNT IG5vdyAtIDEgPD0gdCBpcyB0cnVlCitQQVNTIHQgPD0gdGhlbiArIDEgaXMgdHJ1ZQorUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3RpbWVzdGFtcC5odG1sIGIvTGF5b3V0 VGVzdHMvZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uY2Uz MTlhNzQ5MjkzYzlmMjljZjQ1MjIxNTA1ZjVmMzFhMjMwNjNiYgotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3RpbWVzdGFtcC5odG1sCkBAIC0wLDAg KzEsMTMgQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4K KzxodG1sPgorPGhlYWQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uLy4uL2pzL3Jl c291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNyYz0iLi4vLi4vanMvcmVzb3Vy Y2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRl c2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQgc3JjPSJz Y3JpcHQtdGVzdHMvdGltZXN0YW1wLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi9q cy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YWI4Mjg3YTJiYjY3M2ExNGU2NjZiMGQ1Y2UzNDZhZThhYjc5M2UwMi4uZjRjN2UwNDFmYWYzZGY4 OTNiNjEwMjUyZTRhZWYzNGExZTJmNjRlMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0xMS0wOCAgSm9o biBLbm90dGVuYmVsdCAgPGprbm90dGVuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IGNvcnJlY3RseSBiZXR3ZWVu IEdlb2xvY2F0aW9uUG9zaXRpb24gYW5kIEdlb3Bvc2l0aW9uCisgICAgICAgIHRpbWVzdGFtcCBm b3JtYXRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDg1MTgKKworICAgICAgICBUZXN0OiBmYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRt bAorCisgICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpj cmVhdGVHZW9wb3NpdGlvbik6CisKIDIwMTAtMTEtMDkgIENocmlzIFJvZ2VycyAgPGNyb2dlcnNA Z29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBLZW5uZXRoIFJ1c3NlbGwuCmRpZmYg LS1naXQgYS9XZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwIGIvV2ViQ29yZS9wYWdlL0dlb2xv Y2F0aW9uLmNwcAppbmRleCBiZWQ4ZmI0Y2NhZTQ4YmM2YWZkYTI0OTkyMjg2NzBmYzI4YmEyMDU0 Li4yYTJiNTIyY2VkNjhjZmVlNTMzYWQ0MTdlZDcwNmVmYzMwYzM2YTAzIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24uY3BwCisrKyBiL1dlYkNvcmUvcGFnZS9HZW9sb2NhdGlv bi5jcHAKQEAgLTYxLDcgKzYxLDcgQEAgc3RhdGljIFBhc3NSZWZQdHI8R2VvcG9zaXRpb24+IGNy ZWF0ZUdlb3Bvc2l0aW9uKEdlb2xvY2F0aW9uUG9zaXRpb24qIHBvc2l0aW9uKQogICAgIFJlZlB0 cjxDb29yZGluYXRlcz4gY29vcmRpbmF0ZXMgPSBDb29yZGluYXRlczo6Y3JlYXRlKHBvc2l0aW9u LT5sYXRpdHVkZSgpLCBwb3NpdGlvbi0+bG9uZ2l0dWRlKCksIHBvc2l0aW9uLT5jYW5Qcm92aWRl QWx0aXR1ZGUoKSwgcG9zaXRpb24tPmFsdGl0dWRlKCksIAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBvc2l0aW9uLT5hY2N1cmFjeSgp LCBwb3NpdGlvbi0+Y2FuUHJvdmlkZUFsdGl0dWRlQWNjdXJhY3koKSwgcG9zaXRpb24tPmFsdGl0 dWRlQWNjdXJhY3koKSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBwb3NpdGlvbi0+Y2FuUHJvdmlkZUhlYWRpbmcoKSwgcG9zaXRpb24t PmhlYWRpbmcoKSwgcG9zaXRpb24tPmNhblByb3ZpZGVTcGVlZCgpLCBwb3NpdGlvbi0+c3BlZWQo KSk7Ci0gICAgcmV0dXJuIEdlb3Bvc2l0aW9uOjpjcmVhdGUoY29vcmRpbmF0ZXMucmVsZWFzZSgp LCBwb3NpdGlvbi0+dGltZXN0YW1wKCkpOworICAgIHJldHVybiBHZW9wb3NpdGlvbjo6Y3JlYXRl KGNvb3JkaW5hdGVzLnJlbGVhc2UoKSwgY29udmVydFNlY29uZHNUb0RPTVRpbWVTdGFtcChwb3Np dGlvbi0+dGltZXN0YW1wKCkpKTsKIH0KIAogc3RhdGljIFBhc3NSZWZQdHI8UG9zaXRpb25FcnJv cj4gY3JlYXRlUG9zaXRpb25FcnJvcihHZW9sb2NhdGlvbkVycm9yKiBlcnJvcikK 73995 2010-11-16 08:07:44 -0800 2010-11-17 09:08:51 -0800 Patch bug-48518-20101116160742.patch text/plain 6851 jknotten ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNDM2ZDJlYTZiZDVkMzE4NTc4Y2FhYjI1ODk0OTZiZTRkZWNmZmJkLi4yZWFmMjZl ZmRlZjljOGIwM2MxZDcwM2YwMmJlY2U3MmRjMTZiMWUxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTAtMTEtMDggIEpvaG4gS25vdHRlbmJlbHQgIDxqa25vdHRlbkBjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgSmVyZW15IE9ybG93LgorCisgICAgICAgIEFkZCBhIGxheW91 dCB0ZXN0IHRvIGNoZWNrIHRoYXQgR2VvcG9zaXRpb24gdGltZXN0YW1wcyBhcmUKKyAgICAgICAg d2VsbC1mb3JtZWQuIFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDg1MTgKKworICAgICAgICAqIGZhc3QvZG9tL0dlb2xvY2F0aW9uL3NjcmlwdC10ZXN0cy90aW1l c3RhbXAuanM6IEFkZGVkLgorICAgICAgICAoY2hlY2tQb3NpdGlvbik6CisgICAgICAgICogZmFz dC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAg ICogZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLmh0bWw6IEFkZGVkLgorCiAyMDEwLTEx LTE1ICBBbGV4YW5kZXIgUGF2bG92ICA8YXBhdmxvdkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1hbi4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qv ZG9tL0dlb2xvY2F0aW9uL3NjcmlwdC10ZXN0cy90aW1lc3RhbXAuanMgYi9MYXlvdXRUZXN0cy9m YXN0L2RvbS9HZW9sb2NhdGlvbi9zY3JpcHQtdGVzdHMvdGltZXN0YW1wLmpzCm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu LmI1MWNhNDM0MWY4MDQ5Zjk0MGEzZTU5ZGRmNmZmZDM0OTUxNGYxNjIKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi9zY3JpcHQtdGVzdHMvdGltZXN0 YW1wLmpzCkBAIC0wLDAgKzEsMzQgQEAKK2Rlc2NyaXB0aW9uKCJUZXN0cyB0aGF0IEdlb3Bvc2l0 aW9uIHRpbWVzdGFtcHMgYXJlIHdlbGwtZm9ybWVkIChub24temVybyBhbmQgaW4gdGhlIHNhbWUg dW5pdHMgYXMgRGF0ZS5nZXRUaW1lKS4iKTsKKwordmFyIG1vY2tMYXRpdHVkZSA9IDUxLjQ3ODsK K3ZhciBtb2NrTG9uZ2l0dWRlID0gLTAuMTY2OwordmFyIG1vY2tBY2N1cmFjeSA9IDEwMC4wOwor CitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7CisgICAgbGF5b3V0VGVzdENvbnRy b2xsZXIuc2V0R2VvbG9jYXRpb25QZXJtaXNzaW9uKHRydWUpOworICAgIGxheW91dFRlc3RDb250 cm9sbGVyLnNldE1vY2tHZW9sb2NhdGlvblBvc2l0aW9uKG1vY2tMYXRpdHVkZSwgbW9ja0xvbmdp dHVkZSwgbW9ja0FjY3VyYWN5KTsKK30KKwordmFyIG5vdyA9IG5ldyBEYXRlKCkuZ2V0VGltZSgp Oworc2hvdWxkQmVUcnVlKCdub3cgIT0gMCcpOwordmFyIHQgPSBudWxsOwordmFyIHRoZW4gPSBu dWxsOworCitmdW5jdGlvbiBjaGVja1Bvc2l0aW9uKHApIHsKKyAgICB0ID0gcC50aW1lc3RhbXA7 CisgICAgdmFyIGQgPSBuZXcgRGF0ZSgpOworICAgIHRoZW4gPSBkLmdldFRpbWUoKTsKKyAgICBz aG91bGRCZVRydWUoJ3QgIT0gMCcpOworICAgIHNob3VsZEJlVHJ1ZSgndGhlbiAhPSAwJyk7Cisg ICAgc2hvdWxkQmVUcnVlKCdub3cgLSAxIDw9IHQnKTsgLy8gQXZvaWQgcm91bmRpbmcgZXJyb3Jz CisgICAgaWYgKG5vdyAtIDEgPiB0KSB7CisgICAgICAgIGRlYnVnKCIgIG5vdyAtIDEgPSAiICsg KG5vdy0xKSk7CisgICAgICAgIGRlYnVnKCIgIHQgPSAiICsgdCk7CisgICAgfQorICAgIHNob3Vs ZEJlVHJ1ZSgndCA8PSB0aGVuICsgMScpOyAvLyBBdm9pZCByb3VuZGluZyBlcnJvcnMKKyAgICBm aW5pc2hKU1Rlc3QoKTsKK30KKworbmF2aWdhdG9yLmdlb2xvY2F0aW9uLmdldEN1cnJlbnRQb3Np dGlvbihjaGVja1Bvc2l0aW9uKTsKK3dpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKK3dpbmRv dy5zdWNjZXNzZnVsbHlQYXJzZWQgPSB0cnVlOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFz dC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvZG9tL0dlb2xvY2F0aW9uL3RpbWVzdGFtcC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTRl OGM5MTg1NjcwYmQwODBiYjhhYzZlMDgzNTlhZTYyNWU3ZDE2MQotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZG9tL0dlb2xvY2F0aW9uL3RpbWVzdGFtcC1leHBlY3RlZC50eHQK QEAgLTAsMCArMSwxNCBAQAorVGVzdHMgdGhhdCBHZW9wb3NpdGlvbiB0aW1lc3RhbXBzIGFyZSB3 ZWxsLWZvcm1lZCAobm9uLXplcm8gYW5kIGluIHRoZSBzYW1lIHVuaXRzIGFzIERhdGUuZ2V0VGlt ZSkuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVzc2Fn ZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIG5vdyAhPSAwIGlzIHRy dWUKK1BBU1MgdCAhPSAwIGlzIHRydWUKK1BBU1MgdGhlbiAhPSAwIGlzIHRydWUKK1BBU1Mgbm93 IC0gMSA8PSB0IGlzIHRydWUKK1BBU1MgdCA8PSB0aGVuICsgMSBpcyB0cnVlCitQQVNTIHN1Y2Nl c3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLmh0bWwgYi9MYXlvdXRUZXN0 cy9mYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jZTMxOWE3 NDkyOTNjOWYyOWNmNDUyMjE1MDVmNWYzMWEyMzA2M2JiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZXN0YW1wLmh0bWwKQEAgLTAsMCArMSwx MyBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0 bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vanMvcmVzb3Vy Y2VzL2pzLXRlc3Qtc3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi8uLi9qcy9yZXNvdXJjZXMv anMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cCBpZD0iZGVzY3Jp cHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorPHNjcmlwdCBzcmM9InNjcmlw dC10ZXN0cy90aW1lc3RhbXAuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uL2pzL3Jl c291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1NjA5 NTYwNDIwOGJjYmY2Njc3ZGM1MzE2NTExOTc1NWJlYzRhMjIwLi5iNzY1ZTQzODQxZTYyNThkNWU0 OWFlODAxODEyOTllYzc0N2NkNzUwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEwLTExLTA4ICBKb2huIEtu b3R0ZW5iZWx0ICA8amtub3R0ZW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5 IEplcmVteSBPcmxvdy4KKworICAgICAgICBDb252ZXJ0IGNvcnJlY3RseSBiZXR3ZWVuIEdlb2xv Y2F0aW9uUG9zaXRpb24gYW5kIEdlb3Bvc2l0aW9uCisgICAgICAgIHRpbWVzdGFtcCBmb3JtYXRz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg1MTgK KworICAgICAgICBUZXN0OiBmYXN0L2RvbS9HZW9sb2NhdGlvbi90aW1lc3RhbXAuaHRtbAorCisg ICAgICAgICogcGFnZS9HZW9sb2NhdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVH ZW9wb3NpdGlvbik6CisKIDIwMTAtMTEtMTUgIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNo cm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcCBiL1dlYkNvcmUvcGFnZS9HZW9sb2Nh dGlvbi5jcHAKaW5kZXggYmVkOGZiNGNjYWU0OGJjNmFmZGEyNDk5MjI4NjcwZmMyOGJhMjA1NC4u MmEyYjUyMmNlZDY4Y2ZlZTUzM2FkNDE3ZWQ3MDZlZmMzMGMzNmEwMyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9wYWdlL0dlb2xvY2F0aW9uLmNwcAorKysgYi9XZWJDb3JlL3BhZ2UvR2VvbG9jYXRpb24u Y3BwCkBAIC02MSw3ICs2MSw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEdlb3Bvc2l0aW9uPiBjcmVh dGVHZW9wb3NpdGlvbihHZW9sb2NhdGlvblBvc2l0aW9uKiBwb3NpdGlvbikKICAgICBSZWZQdHI8 Q29vcmRpbmF0ZXM+IGNvb3JkaW5hdGVzID0gQ29vcmRpbmF0ZXM6OmNyZWF0ZShwb3NpdGlvbi0+ bGF0aXR1ZGUoKSwgcG9zaXRpb24tPmxvbmdpdHVkZSgpLCBwb3NpdGlvbi0+Y2FuUHJvdmlkZUFs dGl0dWRlKCksIHBvc2l0aW9uLT5hbHRpdHVkZSgpLCAKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwb3NpdGlvbi0+YWNjdXJhY3koKSwg cG9zaXRpb24tPmNhblByb3ZpZGVBbHRpdHVkZUFjY3VyYWN5KCksIHBvc2l0aW9uLT5hbHRpdHVk ZUFjY3VyYWN5KCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcG9zaXRpb24tPmNhblByb3ZpZGVIZWFkaW5nKCksIHBvc2l0aW9uLT5o ZWFkaW5nKCksIHBvc2l0aW9uLT5jYW5Qcm92aWRlU3BlZWQoKSwgcG9zaXRpb24tPnNwZWVkKCkp OwotICAgIHJldHVybiBHZW9wb3NpdGlvbjo6Y3JlYXRlKGNvb3JkaW5hdGVzLnJlbGVhc2UoKSwg cG9zaXRpb24tPnRpbWVzdGFtcCgpKTsKKyAgICByZXR1cm4gR2VvcG9zaXRpb246OmNyZWF0ZShj b29yZGluYXRlcy5yZWxlYXNlKCksIGNvbnZlcnRTZWNvbmRzVG9ET01UaW1lU3RhbXAocG9zaXRp b24tPnRpbWVzdGFtcCgpKSk7CiB9CiAKIHN0YXRpYyBQYXNzUmVmUHRyPFBvc2l0aW9uRXJyb3I+ IGNyZWF0ZVBvc2l0aW9uRXJyb3IoR2VvbG9jYXRpb25FcnJvciogZXJyb3IpCmRpZmYgLS1naXQg YS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9Gb3J3YXJkaW5nSGVhZGVycy93dGYvQ3VycmVu dFRpbWUuaCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0ZvcndhcmRpbmdIZWFkZXJzL3d0 Zi9DdXJyZW50VGltZS5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmEzMWEyM2QyNTU4MDliZWU3YzlhMzRlODlkMWMz Nzc1M2NlN2Q0NzIKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9Gb3J3YXJkaW5nSGVhZGVycy93dGYvQ3VycmVudFRpbWUuaApAQCAtMCwwICsxIEBACisjaW5j bHVkZSA8SmF2YVNjcmlwdENvcmUvQ3VycmVudFRpbWUuaD4KZGlmZiAtLWdpdCBhL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbSBiL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbQppbmRl eCA0MzFkNGU5MDYyNTEzZDIzNTAxMDJjOWRkOWNiYzk0ZWQ5ZTI2ZGY2Li5lYmQ0Yjk3NmRjZmZh MWIwN2UzZGQxNGExNWUwODdjOWE5YzBmZjA1IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMubW0KKysrIGIvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFjLm1tCkBAIC03MCw2 ICs3MCw3IEBACiAjaW1wb3J0IDxXZWJLaXQvV2ViVmlldy5oPgogI2ltcG9ydCA8V2ViS2l0L1dl YlZpZXdQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV2ViV29ya2Vyc1ByaXZhdGUuaD4KKyNp bXBvcnQgPHd0Zi9DdXJyZW50VGltZS5oPgogI2ltcG9ydCA8d3RmL0hhc2hNYXAuaD4KICNpbXBv cnQgPHd0Zi9SZXRhaW5QdHIuaD4KIApAQCAtMzUyLDcgKzM1Myw3IEBAIHZvaWQgTGF5b3V0VGVz dENvbnRyb2xsZXI6OnNldE1vY2tEZXZpY2VPcmllbnRhdGlvbihib29sIGNhblByb3ZpZGVBbHBo YSwgZG91YmxlCiAKIHZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldE1vY2tHZW9sb2NhdGlv blBvc2l0aW9uKGRvdWJsZSBsYXRpdHVkZSwgZG91YmxlIGxvbmdpdHVkZSwgZG91YmxlIGFjY3Vy YWN5KQogewotICAgIFdlYkdlb2xvY2F0aW9uUG9zaXRpb24gKnBvc2l0aW9uID0gW1tXZWJHZW9s b2NhdGlvblBvc2l0aW9uIGFsbG9jXSBpbml0V2l0aFRpbWVzdGFtcDowIGxhdGl0dWRlOmxhdGl0 dWRlIGxvbmdpdHVkZTpsb25naXR1ZGUgYWNjdXJhY3k6YWNjdXJhY3ldOworICAgIFdlYkdlb2xv Y2F0aW9uUG9zaXRpb24gKnBvc2l0aW9uID0gW1tXZWJHZW9sb2NhdGlvblBvc2l0aW9uIGFsbG9j XSBpbml0V2l0aFRpbWVzdGFtcDpjdXJyZW50VGltZSgpIGxhdGl0dWRlOmxhdGl0dWRlIGxvbmdp dHVkZTpsb25naXR1ZGUgYWNjdXJhY3k6YWNjdXJhY3ldOwogICAgIFtbTW9ja0dlb2xvY2F0aW9u UHJvdmlkZXIgc2hhcmVkXSBzZXRQb3NpdGlvbjpwb3NpdGlvbl07CiAgICAgW3Bvc2l0aW9uIHJl bGVhc2VdOwogfQo=