56951 2011-03-23 12:31:41 -0700 Web Inspector: Inspector does not show correct transfer size for synchronous requests 2011-03-24 14:18:20 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik webkit-unassigned commit-queue pfeldman webkit.review.bot oldest_to_newest 372349 0 vsevik 2011-03-23 12:31:41 -0700 Resolution of https://bugs.webkit.org/show_bug.cgi?id=56691 caused regression for synchronous requests. 372368 1 86671 vsevik 2011-03-23 12:46:45 -0700 Created attachment 86671 Patch 372371 2 webkit.review.bot 2011-03-23 12:50:59 -0700 Attachment 86671 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/plat..." exit_code: 1 LayoutTests/platform/chromium/test_expectations.txt:668: Path does not exist. http/tests/inspector/network/network-size-sync.html [test/expectations] [2] Total errors found: 1 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 372374 3 86673 vsevik 2011-03-23 12:55:15 -0700 Created attachment 86673 Patch with test 372375 4 86674 vsevik 2011-03-23 12:57:21 -0700 Created attachment 86674 Patch with fixed test 372757 5 86674 yurys 2011-03-24 05:49:58 -0700 Comment on attachment 86674 Patch with fixed test View in context: https://bugs.webkit.org/attachment.cgi?id=86674&action=review > LayoutTests/platform/chromium/test_expectations.txt:668 > +BUG_VSEVIK SKIP : http/tests/inspector/network/network-size-sync.html = FAIL This new test is skipped on all platform so what's the point in adding it? 372759 6 86674 vsevik 2011-03-24 05:54:56 -0700 Comment on attachment 86674 Patch with fixed test View in context: https://bugs.webkit.org/attachment.cgi?id=86674&action=review >> LayoutTests/platform/chromium/test_expectations.txt:668 >> +BUG_VSEVIK SKIP : http/tests/inspector/network/network-size-sync.html = FAIL > > This new test is skipped on all platform so what's the point in adding it? It will be enabled once this works in at least one port. The patch for chromium port will follow soon. 372962 7 86674 commit-queue 2011-03-24 11:26:44 -0700 Comment on attachment 86674 Patch with fixed test Rejecting attachment 86674 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-4', 'apply-..." exit_code: 2 Last 500 characters of output: bCore/loader/FrameLoader.cpp Hunk #1 succeeded at 1543 (offset 4 lines). Hunk #2 succeeded at 1960 (offset 4 lines). Hunk #3 succeeded at 2816 (offset 6 lines). Hunk #4 succeeded at 3109 (offset 6 lines). patching file Source/WebCore/loader/ResourceLoadNotifier.cpp Hunk #1 succeeded at 152 (offset -2 lines). patching file Source/WebCore/loader/ResourceLoadNotifier.h Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--reviewer', u'Pavel Feldman', u'--fo..." exit_code: 1 Full output: http://queues.webkit.org/results/8233649 372970 8 86805 vsevik 2011-03-24 11:36:52 -0700 Created attachment 86805 Patch with merge conflicts fixes 373090 9 86805 commit-queue 2011-03-24 14:18:15 -0700 Comment on attachment 86805 Patch with merge conflicts fixes Clearing flags on attachment: 86805 Committed r81897: <http://trac.webkit.org/changeset/81897> 373091 10 commit-queue 2011-03-24 14:18:20 -0700 All reviewed patches have been landed. Closing bug. 86671 2011-03-23 12:46:45 -0700 2011-03-23 12:55:15 -0700 Patch sync_git text/plain 8599 vsevik ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzOGYyNzdkLi40MTQyYmExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTEtMDMt MjMgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVj dG9yIGRvZXMgbm90IHNob3cgY29ycmVjdCB0cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyBy ZXF1ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5NTEKKworICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4 dDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9t YWMvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9Ta2lwcGVkOgorICAgICAgICAqIHBs YXRmb3JtL3dpbi9Ta2lwcGVkOgorCiAyMDExLTAzLTIzICBDc2FiYSBPc3p0cm9nb27DoWMgIDxv c3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBVcGRhdGUgZXhwZWN0ZWQgZmlsZXMgYWZ0 ZXIgcjgxNjg0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVz dF9leHBlY3RhdGlvbnMudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9l eHBlY3RhdGlvbnMudHh0CmluZGV4IDExY2JiYmEuLjlhZGIwMmEgMTAwNzU1Ci0tLSBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKQEAgLTY2NSw2 ICs2NjUsNyBAQCBCVUdfUEZFTERNQU4gU0tJUCA6IGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdv cmsvbmV0d29yay1zaXplLmh0bWwgPSBGQUlMCiAKIC8vIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD01NjYwMgogQlVHX1ZTRVZJSyBTS0lQIDogaHR0cC90ZXN0cy9pbnNw ZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtY2h1bmtlZC5odG1sID0gRkFJTAorQlVHX1ZTRVZJ SyBTS0lQIDogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtc3luYy5o dG1sID0gRkFJTAogCiBCVUdKQU1FU1IgV0lOIExJTlVYIDogaW5zcGVjdG9yL3N0eWxlcy9zdHls ZXMtZGlzYWJsZS10aGVuLWRlbGV0ZS5odG1sID0gVElNRU9VVCBQQVNTCiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL1NraXBwZWQKaW5kZXggNDUzNzE3Yy4uMDY0NTQzMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Nr aXBwZWQKQEAgLTEzMzYsNSArMTMzNiw2IEBAIHN2Zy9XM0MtSTE4Ti90c3Bhbi1kaXJMVFItdWJP dmVycmlkZS1pbi1ydGwtY29udGV4dC5zdmcKIAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTY2OTEKIGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29y ay1zaXplLWNodW5rZWQuaHRtbAoraHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3Jr LXNpemUtc3luYy5odG1sCiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6 ZS5odG1sCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKaW5kZXggODI3ZGZiMS4uNTNhZWI5ZCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKKysrIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKQEAgLTMyMCwzICszMjAsNCBAQCB3ZWJhcmNoaXZl L3Rlc3QtbGluay1yZWwtaWNvbi5odG1sCiAKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU2NjkxCiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmst c2l6ZS1jaHVua2VkLmh0bWwKK2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1z aXplLXN5bmMuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBl ZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKaW5kZXggODQ4ZjdjZS4uMWY3Mjk5 ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAorKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCkBAIC0zMjQzLDMgKzMyNDMsNCBAQCBodHRwL3Rl c3RzL2FwcGNhY2hlL29yaWdpbnMtd2l0aC1hcHBjYWNoZS5odG1sCiAKICMgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NjkxCiBodHRwL3Rlc3RzL2luc3BlY3Rvci9u ZXR3b3JrL25ldHdvcmstc2l6ZS1jaHVua2VkLmh0bWwKK2h0dHAvdGVzdHMvaW5zcGVjdG9yL25l dHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vd2luL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZAppbmRl eCBiOTgzNGVhLi5mZGU1NWE4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4v U2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZApAQCAtNTAsNiAr NTAsNyBAQCBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstdGltaW5nLmh0bWwK IAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk3OTMKIGh0dHAv dGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLWNodW5rZWQuaHRtbAoraHR0cC90 ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtc3luYy5odG1sCiAKICMgRmFpbHMg PHJkYXI6Ly9wcm9ibGVtLzU2NzQyODk+CiBtZWRpYS92aWRlby1zZWVrLXBhc3QtZW5kLXBhdXNl ZC5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggOGJkM2NkZi4uMThhMTExYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE5IEBACisyMDExLTAzLTIzICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YiBJbnNwZWN0b3I6IEluc3BlY3RvciBkb2VzIG5vdCBzaG93IGNvcnJlY3QgdHJhbnNmZXIgc2l6 ZSBmb3Igc3luY2hyb25vdXMgcmVxdWVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU2OTUxCisKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OndpbGxMb2FkTWVkaWFFbGVtZW50 VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExv YWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNocm9u b3VzbHkpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmxvYWRlZFJlc291cmNlRnJv bU1lbW9yeUNhY2hlKToKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkTm90aWZpZXI6OnNlbmRSZW1haW5pbmdE ZWxlZ2F0ZU1lc3NhZ2VzKToKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIu aDoKKwogMjAxMS0wMy0yMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9G cmFtZUxvYWRlci5jcHAKaW5kZXggOTAxMTg4Ni4uMTFmZTkzMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0xNTM5LDcgKzE1MzksNyBAQCBib29sIEZyYW1lTG9hZGVy Ojp3aWxsTG9hZE1lZGlhRWxlbWVudFVSTChLVVJMJiB1cmwpCiAgICAgdW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyOwogICAgIFJlc291cmNlRXJyb3IgZXJyb3I7CiAgICAgcmVxdWVzdEZyb21EZWxl Z2F0ZShyZXF1ZXN0LCBpZGVudGlmaWVyLCBlcnJvcik7Ci0gICAgbm90aWZpZXIoKS0+c2VuZFJl bWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMobV9kb2N1bWVudExvYWRlci5nZXQoKSwgaWRlbnRpZmll ciwgUmVzb3VyY2VSZXNwb25zZSh1cmwsIFN0cmluZygpLCAtMSwgU3RyaW5nKCksIFN0cmluZygp KSwgLTEsIGVycm9yKTsKKyAgICBub3RpZmllcigpLT5zZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNz YWdlcyhtX2RvY3VtZW50TG9hZGVyLmdldCgpLCBpZGVudGlmaWVyLCBSZXNvdXJjZVJlc3BvbnNl KHVybCwgU3RyaW5nKCksIC0xLCBTdHJpbmcoKSwgU3RyaW5nKCkpLCAtMSwgLTEsIGVycm9yKTsK IAogICAgIHVybCA9IHJlcXVlc3QudXJsKCk7CiAKQEAgLTE5NTYsNyArMTk1Niw3IEBAIHZvaWQg RnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCgpCiAgICAgICAgICAgICAvLyBGSVhN RTogSWYgd2UgZ2V0IGEgcmVzb3VyY2Ugd2l0aCBtb3JlIHRoYW4gMkIgYnl0ZXMsIHRoaXMgY29k ZSB3b24ndCBkbyB0aGUgcmlnaHQgdGhpbmcuCiAgICAgICAgICAgICAvLyBIb3dldmVyLCB3aXRo IHRvZGF5J3MgY29tcHV0ZXJzIGFuZCBuZXR3b3JraW5nIHNwZWVkcywgdGhpcyB3b24ndCBoYXBw ZW4gaW4gcHJhY3RpY2UuCiAgICAgICAgICAgICAvLyBDb3VsZCBiZSBhbiBpc3N1ZSB3aXRoIGEg Z2lhbnQgbG9jYWwgZmlsZS4KLSAgICAgICAgICAgIG5vdGlmaWVyKCktPnNlbmRSZW1haW5pbmdE ZWxlZ2F0ZU1lc3NhZ2VzKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIGlkZW50aWZpZXIsIHJlc3Bv bnNlLCBzdGF0aWNfY2FzdDxpbnQ+KHJlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpKSwg ZXJyb3IpOworICAgICAgICAgICAgbm90aWZpZXIoKS0+c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVz c2FnZXMobV9kb2N1bWVudExvYWRlci5nZXQoKSwgaWRlbnRpZmllciwgcmVzcG9uc2UsIHN0YXRp Y19jYXN0PGludD4ocmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCkpLCAwLCBlcnJvcik7 CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIHBhZ2VDYWNoZSgpLT5yZW1vdmUoaGlzdG9y eSgpLT5jdXJyZW50SXRlbSgpKTsKQEAgLTI4MTAsOCArMjgxMCw3IEBAIHVuc2lnbmVkIGxvbmcg RnJhbWVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiByZXF1CiAgICAgICAgIH0KICNlbmRpZgogICAgIH0KLQotICAgIG5vdGlmaWVyKCktPnNl bmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIGlkZW50 aWZpZXIsIHJlc3BvbnNlLCBkYXRhLnNpemUoKSwgZXJyb3IpOworICAgIG5vdGlmaWVyKCktPnNl bmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIGlkZW50 aWZpZXIsIHJlc3BvbnNlLCBkYXRhLnNpemUoKSwgc3RhdGljX2Nhc3Q8aW50PihyZXNwb25zZS5l eHBlY3RlZENvbnRlbnRMZW5ndGgoKSksIGVycm9yKTsKICAgICByZXR1cm4gaWRlbnRpZmllcjsK IH0KIApAQCAtMzEwNCw3ICszMTAzLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3Vy Y2VGcm9tTWVtb3J5Q2FjaGUoY29uc3QgQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQogICAgIFJl c291cmNlRXJyb3IgZXJyb3I7CiAgICAgcmVxdWVzdEZyb21EZWxlZ2F0ZShyZXF1ZXN0LCBpZGVu dGlmaWVyLCBlcnJvcik7CiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjptYXJrUmVzb3Vy Y2VBc0NhY2hlZChwYWdlLCBpZGVudGlmaWVyKTsKLSAgICBub3RpZmllcigpLT5zZW5kUmVtYWlu aW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3VtZW50TG9hZGVyLmdldCgpLCBpZGVudGlmaWVyLCBy ZXNvdXJjZS0+cmVzcG9uc2UoKSwgcmVzb3VyY2UtPmVuY29kZWRTaXplKCksIGVycm9yKTsKKyAg ICBub3RpZmllcigpLT5zZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3VtZW50TG9h ZGVyLmdldCgpLCBpZGVudGlmaWVyLCByZXNvdXJjZS0+cmVzcG9uc2UoKSwgcmVzb3VyY2UtPmVu Y29kZWRTaXplKCksIDAsIGVycm9yKTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6YXBwbHlVc2Vy QWdlbnQoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHAKaW5kZXggNGQ2Y2U0YS4uNTExZDllMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwCkBAIC0xNTQs MTMgKzE1NCwxMyBAQCB2b2lkIFJlc291cmNlTG9hZE5vdGlmaWVyOjpkaXNwYXRjaFRyYW5zZmVy TG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UodW5zaWduZWQgbG9uZwogICAgIG9sZFBhZ2UtPnByb2dy ZXNzKCktPmNvbXBsZXRlUHJvZ3Jlc3MoaWRlbnRpZmllcik7CiB9CiAKLXZvaWQgUmVzb3VyY2VM b2FkTm90aWZpZXI6OnNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKERvY3VtZW50TG9hZGVy KiBsb2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYgcmVzcG9uc2UsIGludCBsZW5ndGgsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQordm9p ZCBSZXNvdXJjZUxvYWROb3RpZmllcjo6c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMoRG9j dW1lbnRMb2FkZXIqIGxvYWRlciwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNv dXJjZVJlc3BvbnNlJiByZXNwb25zZSwgaW50IGRhdGFMZW5ndGgsIGludCBsZW5ndGhSZWNlaXZl ZCwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3IpCiB7CiAgICAgaWYgKCFyZXNwb25zZS5pc051 bGwoKSkKICAgICAgICAgZGlzcGF0Y2hEaWRSZWNlaXZlUmVzcG9uc2UobG9hZGVyLCBpZGVudGlm aWVyLCByZXNwb25zZSk7CiAKLSAgICBpZiAobGVuZ3RoID4gMCkKLSAgICAgICAgZGlzcGF0Y2hE aWRSZWNlaXZlQ29udGVudExlbmd0aChsb2FkZXIsIGlkZW50aWZpZXIsIGxlbmd0aCwgMCk7Cisg ICAgaWYgKGRhdGFMZW5ndGggPiAwKQorICAgICAgICBkaXNwYXRjaERpZFJlY2VpdmVDb250ZW50 TGVuZ3RoKGxvYWRlciwgaWRlbnRpZmllciwgZGF0YUxlbmd0aCwgbGVuZ3RoUmVjZWl2ZWQpOwog CiAgICAgaWYgKGVycm9yLmlzTnVsbCgpKQogICAgICAgICBkaXNwYXRjaERpZEZpbmlzaExvYWRp bmcobG9hZGVyLCBpZGVudGlmaWVyLCAwKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZE5vdGlmaWVyLmgKaW5kZXggZjAzZWZhMy4uNTc1M2MyOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmgKQEAgLTY0LDcgKzY0LDcgQEAgcHVi bGljOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRGaW5pc2hMb2FkaW5nKERvY3VtZW50TG9hZGVyKiwg dW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBkb3VibGUgZmluaXNoVGltZSk7CiAgICAgdm9pZCBk aXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UodW5zaWduZWQgbG9uZywgRG9j dW1lbnRMb2FkZXIqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmLCBQYWdlKik7CiAKLSAgICB2b2lk IHNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQg bG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgaW50IGxlbmd0aCwgY29u c3QgUmVzb3VyY2VFcnJvciYpOworICAgIHZvaWQgc2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2Fn ZXMoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291 cmNlUmVzcG9uc2UmLCBpbnQgZGF0YUxlbmd0aCwgaW50IGxlbmd0aFJlY2VpdmVkLCBjb25zdCBS ZXNvdXJjZUVycm9yJik7CiAKIHByaXZhdGU6CiAgICAgRnJhbWUqIG1fZnJhbWU7Cg== 86673 2011-03-23 12:55:15 -0700 2011-03-23 12:57:21 -0700 Patch with test sync_git text/plain 10958 vsevik ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzOGYyNzdkLi4zYjhkNzk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMt MjMgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVj dG9yIGRvZXMgbm90IHNob3cgY29ycmVjdCB0cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyBy ZXF1ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5NTEKKworICAgICAgICBGaXhlZCB0cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyBsb2Fk LgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUt c3luYy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9y L25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgorICAgICAgICAqIHBsYXRmb3JtL2d0 ay9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9Ta2lwcGVkOgorICAgICAgICAqIHBs YXRmb3JtL3F0L1NraXBwZWQ6CisgICAgICAgICogcGxhdGZvcm0vd2luL1NraXBwZWQ6CisKIDIw MTEtMDMtMjMgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAg ICBbUXRdIFVwZGF0ZSBleHBlY3RlZCBmaWxlcyBhZnRlciByODE2ODQuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5j LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsv bmV0d29yay1zaXplLXN5bmMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLmZmODgxMmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDggQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAxOTogRG9uZS4KK1Rlc3RzIG5ldHdv cmsgcmVzb3VyY2Ugc2l6ZSByZXBvcnRpbmcgZm9yIHN5bmNocm9ub3VzIHJlcXVlc3RzLgorCisK K2h0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvcmVzb3Vy Y2UucGhwP3R5cGU9aW1hZ2Umc2l6ZT01MDAmZ3ppcD10cnVlJmNodW5rZWQ9dHJ1ZQorcmVzb3Vy Y2VTaXplOiA1MDAKK3RyYW5zZmVyU2l6ZTogMjE5CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbCBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi42MTBhZTBkCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3 b3JrLXNpemUtc3luYy5odG1sCkBAIC0wLDAgKzEsNDUgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2Ny aXB0IHNyYz0iLi4vaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0 aW9uIGxvYWREYXRhKCkKK3sKKyAgICB2YXIgeGhyID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7Cisg ICAgeGhyLm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlm ICh4aHIucmVhZHlTdGF0ZSAgPT0gNCkKKyAgICAgICAgICAgIHJlc291cmNlTG9hZGVkKCk7Cisg ICAgfTsKKyAgICB4aHIub3BlbignR0VUJywgJ3Jlc291cmNlcy9yZXNvdXJjZS5waHA/dHlwZT1p bWFnZSZzaXplPTUwMCZnemlwPXRydWUmY2h1bmtlZD10cnVlJywgZmFsc2UpOworICAgIHhoci5z ZW5kKG51bGwpOworfQorCitmdW5jdGlvbiByZXNvdXJjZUxvYWRlZCgpCit7CisgIHdpbmRvdy5z ZXRUaW1lb3V0KGZ1bmN0aW9uKCkKKyAgeworICAgICAgY29uc29sZS5sb2coIkRvbmUuIik7Cisg IH0sIDEwMDApOworfQorCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0LmFk ZFNuaWZmZXIoV2ViSW5zcGVjdG9yLkNvbnNvbGVWaWV3LnByb3RvdHlwZSwgImFkZE1lc3NhZ2Ui LCBzdGVwMik7CisgICAgSW5zcGVjdG9yVGVzdC5ldmFsdWF0ZUluUGFnZSgibG9hZERhdGEoKSIp OworCisgICAgZnVuY3Rpb24gc3RlcDIoKQorICAgIHsKKyAgICAgICAgdmFyIHJlc291cmNlMSA9 IFdlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5yZXNvdXJjZXNbV2ViSW5zcGVjdG9yLnBhbmVs cy5uZXR3b3JrLnJlc291cmNlcy5sZW5ndGggLSAxXTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5h ZGRSZXN1bHQocmVzb3VyY2UxLnVybCk7CisgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0 KCJyZXNvdXJjZVNpemU6ICIgKyByZXNvdXJjZTEucmVzb3VyY2VTaXplKTsKKyAgICAgICAgSW5z cGVjdG9yVGVzdC5hZGRSZXN1bHQoInRyYW5zZmVyU2l6ZTogIiArIHJlc291cmNlMS50cmFuc2Zl clNpemUpOworCisgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVUZXN0KCk7CisgICAgfQor fQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InJ1blRlc3QoKSI+Cis8cD5UZXN0 cyBuZXR3b3JrIHJlc291cmNlIHNpemUgcmVwb3J0aW5nIGZvciBzeW5jaHJvbm91cyByZXF1ZXN0 cy48L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9j aHJvbWl1bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKaW5kZXggMTFjYmJiYS4uOWFkYjAyYSAxMDA3 NTUKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMu dHh0CisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25z LnR4dApAQCAtNjY1LDYgKzY2NSw3IEBAIEJVR19QRkVMRE1BTiBTS0lQIDogaHR0cC90ZXN0cy9p bnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUuaHRtbCA9IEZBSUwKIAogLy8gaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NjAyCiBCVUdfVlNFVklLIFNLSVAgOiBo dHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1jaHVua2VkLmh0bWwgPSBG QUlMCitCVUdfVlNFVklLIFNLSVAgOiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdv cmstc2l6ZS1zeW5jLmh0bWwgPSBGQUlMCiAKIEJVR0pBTUVTUiBXSU4gTElOVVggOiBpbnNwZWN0 b3Ivc3R5bGVzL3N0eWxlcy1kaXNhYmxlLXRoZW4tZGVsZXRlLmh0bWwgPSBUSU1FT1VUIFBBU1MK IApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAppbmRleCA0NTM3MTdjLi4wNjQ1NDMwIDEwMDY0NAot LS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9ndGsvU2tpcHBlZApAQCAtMTMzNiw1ICsxMzM2LDYgQEAgc3ZnL1czQy1JMThOL3Rz cGFuLWRpckxUUi11Yk92ZXJyaWRlLWluLXJ0bC1jb250ZXh0LnN2ZwogCiAjIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjY5MQogaHR0cC90ZXN0cy9pbnNwZWN0b3Iv bmV0d29yay9uZXR3b3JrLXNpemUtY2h1bmtlZC5odG1sCitodHRwL3Rlc3RzL2luc3BlY3Rvci9u ZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0bWwKIGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdv cmsvbmV0d29yay1zaXplLmh0bWwKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZAppbmRleCA4Mjdk ZmIxLi41M2FlYjlkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBl ZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvU2tpcHBlZApAQCAtMzIwLDMgKzMyMCw0 IEBAIHdlYmFyY2hpdmUvdGVzdC1saW5rLXJlbC1pY29uLmh0bWwKIAogIyBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY2OTEKIGh0dHAvdGVzdHMvaW5zcGVjdG9yL25l dHdvcmsvbmV0d29yay1zaXplLWNodW5rZWQuaHRtbAoraHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0 d29yay9uZXR3b3JrLXNpemUtc3luYy5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAppbmRleCA4 NDhmN2NlLi4xZjcyOTllIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lw cGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKQEAgLTMyNDMsMyArMzI0 Myw0IEBAIGh0dHAvdGVzdHMvYXBwY2FjaGUvb3JpZ2lucy13aXRoLWFwcGNhY2hlLmh0bWwKIAog IyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY2OTEKIGh0dHAvdGVz dHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLWNodW5rZWQuaHRtbAoraHR0cC90ZXN0 cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtc3luYy5odG1sCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dp bi9Ta2lwcGVkCmluZGV4IGI5ODM0ZWEuLmZkZTU1YTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL3dpbi9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lw cGVkCkBAIC01MCw2ICs1MCw3IEBAIGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29y ay10aW1pbmcuaHRtbAogCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xOTc5MwogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtY2h1bmtl ZC5odG1sCitodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0 bWwKIAogIyBGYWlscyA8cmRhcjovL3Byb2JsZW0vNTY3NDI4OT4KIG1lZGlhL3ZpZGVvLXNlZWst cGFzdC1lbmQtcGF1c2VkLmh0bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4YmQzY2RmLi4zOTc5OWM2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEtMDMtMjMgIFZzZXZvbG9kIFZsYXNvdiAgPHZz ZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVjdG9yIGRvZXMgbm90IHNob3cgY29ycmVj dCB0cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyByZXF1ZXN0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY5NTEKKworICAgICAgICBGaXhlZCB0 cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyBsb2FkLgorCisgICAgICAgIFRlc3Q6IGh0dHAv dGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbAorCisgICAgICAg ICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVy Ojp3aWxsTG9hZE1lZGlhRWxlbWVudFVSTCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6Y29tbWl0UHJvdmlzaW9uYWxMb2FkKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVy Ojpsb2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9h ZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6CisgICAgICAgICogbG9hZGVyL1Jl c291cmNlTG9hZE5vdGlmaWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE5v dGlmaWVyOjpzZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyk6CisgICAgICAgICogbG9hZGVy L1Jlc291cmNlTG9hZE5vdGlmaWVyLmg6CisKIDIwMTEtMDMtMjMgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgUGF2ZWwgRmVsZG1h bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDkwMTE4ODYuLjExZmU5 MzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTUzOSw3ICsxNTM5 LDcgQEAgYm9vbCBGcmFtZUxvYWRlcjo6d2lsbExvYWRNZWRpYUVsZW1lbnRVUkwoS1VSTCYgdXJs KQogICAgIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllcjsKICAgICBSZXNvdXJjZUVycm9yIGVycm9y OwogICAgIHJlcXVlc3RGcm9tRGVsZWdhdGUocmVxdWVzdCwgaWRlbnRpZmllciwgZXJyb3IpOwot ICAgIG5vdGlmaWVyKCktPnNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1fZG9jdW1lbnRM b2FkZXIuZ2V0KCksIGlkZW50aWZpZXIsIFJlc291cmNlUmVzcG9uc2UodXJsLCBTdHJpbmcoKSwg LTEsIFN0cmluZygpLCBTdHJpbmcoKSksIC0xLCBlcnJvcik7CisgICAgbm90aWZpZXIoKS0+c2Vu ZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMobV9kb2N1bWVudExvYWRlci5nZXQoKSwgaWRlbnRp ZmllciwgUmVzb3VyY2VSZXNwb25zZSh1cmwsIFN0cmluZygpLCAtMSwgU3RyaW5nKCksIFN0cmlu ZygpKSwgLTEsIC0xLCBlcnJvcik7CiAKICAgICB1cmwgPSByZXF1ZXN0LnVybCgpOwogCkBAIC0x OTU2LDcgKzE5NTYsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQo KQogICAgICAgICAgICAgLy8gRklYTUU6IElmIHdlIGdldCBhIHJlc291cmNlIHdpdGggbW9yZSB0 aGFuIDJCIGJ5dGVzLCB0aGlzIGNvZGUgd29uJ3QgZG8gdGhlIHJpZ2h0IHRoaW5nLgogICAgICAg ICAgICAgLy8gSG93ZXZlciwgd2l0aCB0b2RheSdzIGNvbXB1dGVycyBhbmQgbmV0d29ya2luZyBz cGVlZHMsIHRoaXMgd29uJ3QgaGFwcGVuIGluIHByYWN0aWNlLgogICAgICAgICAgICAgLy8gQ291 bGQgYmUgYW4gaXNzdWUgd2l0aCBhIGdpYW50IGxvY2FsIGZpbGUuCi0gICAgICAgICAgICBub3Rp ZmllcigpLT5zZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3VtZW50TG9hZGVyLmdl dCgpLCBpZGVudGlmaWVyLCByZXNwb25zZSwgc3RhdGljX2Nhc3Q8aW50PihyZXNwb25zZS5leHBl Y3RlZENvbnRlbnRMZW5ndGgoKSksIGVycm9yKTsKKyAgICAgICAgICAgIG5vdGlmaWVyKCktPnNl bmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIGlkZW50 aWZpZXIsIHJlc3BvbnNlLCBzdGF0aWNfY2FzdDxpbnQ+KHJlc3BvbnNlLmV4cGVjdGVkQ29udGVu dExlbmd0aCgpKSwgMCwgZXJyb3IpOwogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBwYWdl Q2FjaGUoKS0+cmVtb3ZlKGhpc3RvcnkoKS0+Y3VycmVudEl0ZW0oKSk7CkBAIC0yODEwLDggKzI4 MTAsNyBAQCB1bnNpZ25lZCBsb25nIEZyYW1lTG9hZGVyOjpsb2FkUmVzb3VyY2VTeW5jaHJvbm91 c2x5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdQogICAgICAgICB9CiAjZW5kaWYKICAgICB9 Ci0KLSAgICBub3RpZmllcigpLT5zZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3Vt ZW50TG9hZGVyLmdldCgpLCBpZGVudGlmaWVyLCByZXNwb25zZSwgZGF0YS5zaXplKCksIGVycm9y KTsKKyAgICBub3RpZmllcigpLT5zZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3Vt ZW50TG9hZGVyLmdldCgpLCBpZGVudGlmaWVyLCByZXNwb25zZSwgZGF0YS5zaXplKCksIHN0YXRp Y19jYXN0PGludD4ocmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50TGVuZ3RoKCkpLCBlcnJvcik7CiAg ICAgcmV0dXJuIGlkZW50aWZpZXI7CiB9CiAKQEAgLTMxMDQsNyArMzEwMyw3IEBAIHZvaWQgRnJh bWVMb2FkZXI6OmxvYWRlZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKGNvbnN0IENhY2hlZFJlc291 cmNlKiByZXNvdXJjZSkKICAgICBSZXNvdXJjZUVycm9yIGVycm9yOwogICAgIHJlcXVlc3RGcm9t RGVsZWdhdGUocmVxdWVzdCwgaWRlbnRpZmllciwgZXJyb3IpOwogICAgIEluc3BlY3Rvckluc3Ry dW1lbnRhdGlvbjo6bWFya1Jlc291cmNlQXNDYWNoZWQocGFnZSwgaWRlbnRpZmllcik7Ci0gICAg bm90aWZpZXIoKS0+c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMobV9kb2N1bWVudExvYWRl ci5nZXQoKSwgaWRlbnRpZmllciwgcmVzb3VyY2UtPnJlc3BvbnNlKCksIHJlc291cmNlLT5lbmNv ZGVkU2l6ZSgpLCBlcnJvcik7CisgICAgbm90aWZpZXIoKS0+c2VuZFJlbWFpbmluZ0RlbGVnYXRl TWVzc2FnZXMobV9kb2N1bWVudExvYWRlci5nZXQoKSwgaWRlbnRpZmllciwgcmVzb3VyY2UtPnJl c3BvbnNlKCksIHJlc291cmNlLT5lbmNvZGVkU2l6ZSgpLCAwLCBlcnJvcik7CiB9CiAKIHZvaWQg RnJhbWVMb2FkZXI6OmFwcGx5VXNlckFnZW50KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwCmluZGV4IDRk NmNlNGEuLjUxMWQ5ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJj ZUxvYWROb3RpZmllci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZE5vdGlmaWVyLmNwcApAQCAtMTU0LDEzICsxNTQsMTMgQEAgdm9pZCBSZXNvdXJjZUxvYWROb3Rp Zmllcjo6ZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21QYWdlKHVuc2lnbmVkIGxv bmcKICAgICBvbGRQYWdlLT5wcm9ncmVzcygpLT5jb21wbGV0ZVByb2dyZXNzKGlkZW50aWZpZXIp OwogfQogCi12b2lkIFJlc291cmNlTG9hZE5vdGlmaWVyOjpzZW5kUmVtYWluaW5nRGVsZWdhdGVN ZXNzYWdlcyhEb2N1bWVudExvYWRlciogbG9hZGVyLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBpbnQgbGVuZ3RoLCBjb25zdCBSZXNv dXJjZUVycm9yJiBlcnJvcikKK3ZvaWQgUmVzb3VyY2VMb2FkTm90aWZpZXI6OnNlbmRSZW1haW5p bmdEZWxlZ2F0ZU1lc3NhZ2VzKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGludCBkYXRhTGVu Z3RoLCBpbnQgbGVuZ3RoUmVjZWl2ZWQsIGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogewog ICAgIGlmICghcmVzcG9uc2UuaXNOdWxsKCkpCiAgICAgICAgIGRpc3BhdGNoRGlkUmVjZWl2ZVJl c3BvbnNlKGxvYWRlciwgaWRlbnRpZmllciwgcmVzcG9uc2UpOwogCi0gICAgaWYgKGxlbmd0aCA+ IDApCi0gICAgICAgIGRpc3BhdGNoRGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGgobG9hZGVyLCBpZGVu dGlmaWVyLCBsZW5ndGgsIDApOworICAgIGlmIChkYXRhTGVuZ3RoID4gMCkKKyAgICAgICAgZGlz cGF0Y2hEaWRSZWNlaXZlQ29udGVudExlbmd0aChsb2FkZXIsIGlkZW50aWZpZXIsIGRhdGFMZW5n dGgsIGxlbmd0aFJlY2VpdmVkKTsKIAogICAgIGlmIChlcnJvci5pc051bGwoKSkKICAgICAgICAg ZGlzcGF0Y2hEaWRGaW5pc2hMb2FkaW5nKGxvYWRlciwgaWRlbnRpZmllciwgMCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5oCmluZGV4IGYwM2VmYTMuLjU3 NTNjMjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3Rp Zmllci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5o CkBAIC02NCw3ICs2NCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc3BhdGNoRGlkRmluaXNoTG9h ZGluZyhEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgZG91YmxlIGZp bmlzaFRpbWUpOwogICAgIHZvaWQgZGlzcGF0Y2hUcmFuc2ZlckxvYWRpbmdSZXNvdXJjZUZyb21Q YWdlKHVuc2lnbmVkIGxvbmcsIERvY3VtZW50TG9hZGVyKiwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JiwgUGFnZSopOwogCi0gICAgdm9pZCBzZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhEb2N1 bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYsIGludCBsZW5ndGgsIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKKyAgICB2b2lkIHNlbmRS ZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiwgaW50IGRhdGFMZW5ndGgsIGludCBs ZW5ndGhSZWNlaXZlZCwgY29uc3QgUmVzb3VyY2VFcnJvciYpOwogCiBwcml2YXRlOgogICAgIEZy YW1lKiBtX2ZyYW1lOwo= 86674 2011-03-23 12:57:21 -0700 2011-03-24 11:36:52 -0700 Patch with fixed test sync_git text/plain 10906 vsevik ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzOGYyNzdkLi4zYjhkNzk5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMt MjMgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVj dG9yIGRvZXMgbm90IHNob3cgY29ycmVjdCB0cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyBy ZXF1ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5NTEKKworICAgICAgICBGaXhlZCB0cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyBsb2Fk LgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUt c3luYy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9y L25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgorICAgICAgICAqIHBsYXRmb3JtL2d0 ay9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9Ta2lwcGVkOgorICAgICAgICAqIHBs YXRmb3JtL3F0L1NraXBwZWQ6CisgICAgICAgICogcGxhdGZvcm0vd2luL1NraXBwZWQ6CisKIDIw MTEtMDMtMjMgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAg ICBbUXRdIFVwZGF0ZSBleHBlY3RlZCBmaWxlcyBhZnRlciByODE2ODQuCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5j LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsv bmV0d29yay1zaXplLXN5bmMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAuLmZmODgxMmQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLWV4cGVjdGVkLnR4dApAQCAt MCwwICsxLDggQEAKK0NPTlNPTEUgTUVTU0FHRTogbGluZSAxOTogRG9uZS4KK1Rlc3RzIG5ldHdv cmsgcmVzb3VyY2Ugc2l6ZSByZXBvcnRpbmcgZm9yIHN5bmNocm9ub3VzIHJlcXVlc3RzLgorCisK K2h0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvcmVzb3Vy Y2UucGhwP3R5cGU9aW1hZ2Umc2l6ZT01MDAmZ3ppcD10cnVlJmNodW5rZWQ9dHJ1ZQorcmVzb3Vy Y2VTaXplOiA1MDAKK3RyYW5zZmVyU2l6ZTogMjE5CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbCBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5hNWQ2YjU4Ci0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3 b3JrLXNpemUtc3luYy5odG1sCkBAIC0wLDAgKzEsNDIgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2Ny aXB0IHNyYz0iLi4vaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdD4KK2Z1bmN0 aW9uIGxvYWREYXRhKCkKK3sKKyAgICB2YXIgeGhyID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7Cisg ICAgeGhyLm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGlm ICh4aHIucmVhZHlTdGF0ZSAgPT0gNCkKKyAgICAgICAgICAgIHJlc291cmNlTG9hZGVkKCk7Cisg ICAgfTsKKyAgICB4aHIub3BlbignR0VUJywgJ3Jlc291cmNlcy9yZXNvdXJjZS5waHA/dHlwZT1p bWFnZSZzaXplPTUwMCZnemlwPXRydWUmY2h1bmtlZD10cnVlJywgZmFsc2UpOworICAgIHhoci5z ZW5kKG51bGwpOworfQorCitmdW5jdGlvbiByZXNvdXJjZUxvYWRlZCgpCit7CisgICAgY29uc29s ZS5sb2coIkRvbmUuIik7Cit9CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIEluc3BlY3RvclRl c3QuYWRkU25pZmZlcihXZWJJbnNwZWN0b3IuQ29uc29sZVZpZXcucHJvdG90eXBlLCAiYWRkTWVz c2FnZSIsIHN0ZXAyKTsKKyAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5QYWdlKCJsb2FkRGF0 YSgpIik7CisKKyAgICBmdW5jdGlvbiBzdGVwMigpCisgICAgeworICAgICAgICB2YXIgcmVzb3Vy Y2UxID0gV2ViSW5zcGVjdG9yLnBhbmVscy5uZXR3b3JrLnJlc291cmNlc1tXZWJJbnNwZWN0b3Iu cGFuZWxzLm5ldHdvcmsucmVzb3VyY2VzLmxlbmd0aCAtIDFdOworICAgICAgICBJbnNwZWN0b3JU ZXN0LmFkZFJlc3VsdChyZXNvdXJjZTEudXJsKTsKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRS ZXN1bHQoInJlc291cmNlU2l6ZTogIiArIHJlc291cmNlMS5yZXNvdXJjZVNpemUpOworICAgICAg ICBJbnNwZWN0b3JUZXN0LmFkZFJlc3VsdCgidHJhbnNmZXJTaXplOiAiICsgcmVzb3VyY2UxLnRy YW5zZmVyU2l6ZSk7CisKKyAgICAgICAgSW5zcGVjdG9yVGVzdC5jb21wbGV0ZVRlc3QoKTsKKyAg ICB9Cit9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzxw PlRlc3RzIG5ldHdvcmsgcmVzb3VyY2Ugc2l6ZSByZXBvcnRpbmcgZm9yIHN5bmNocm9ub3VzIHJl cXVlc3RzLjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dCBiL0xheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAppbmRleCAxMWNiYmJhLi45YWRiMDJh IDEwMDc1NQotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0 aW9ucy50eHQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3Rh dGlvbnMudHh0CkBAIC02NjUsNiArNjY1LDcgQEAgQlVHX1BGRUxETUFOIFNLSVAgOiBodHRwL3Rl c3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS5odG1sID0gRkFJTAogCiAvLyBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTY2MDIKIEJVR19WU0VWSUsgU0tJ UCA6IGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLWNodW5rZWQuaHRt bCA9IEZBSUwKK0JVR19WU0VWSUsgU0tJUCA6IGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsv bmV0d29yay1zaXplLXN5bmMuaHRtbCA9IEZBSUwKIAogQlVHSkFNRVNSIFdJTiBMSU5VWCA6IGlu c3BlY3Rvci9zdHlsZXMvc3R5bGVzLWRpc2FibGUtdGhlbi1kZWxldGUuaHRtbCA9IFRJTUVPVVQg UEFTUwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCBiL0xh eW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCmluZGV4IDQ1MzcxN2MuLjA2NDU0MzAgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91dFRl c3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC0xMzM2LDUgKzEzMzYsNiBAQCBzdmcvVzNDLUkx OE4vdHNwYW4tZGlyTFRSLXViT3ZlcnJpZGUtaW4tcnRsLWNvbnRleHQuc3ZnCiAKICMgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NjkxCiBodHRwL3Rlc3RzL2luc3Bl Y3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1jaHVua2VkLmh0bWwKK2h0dHAvdGVzdHMvaW5zcGVj dG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbAogaHR0cC90ZXN0cy9pbnNwZWN0b3Iv bmV0d29yay9uZXR3b3JrLXNpemUuaHRtbAogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9tYWMvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkCmluZGV4 IDgyN2RmYjEuLjUzYWViOWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9T a2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9Ta2lwcGVkCkBAIC0zMjAsMyAr MzIwLDQgQEAgd2ViYXJjaGl2ZS90ZXN0LWxpbmstcmVsLWljb24uaHRtbAogCiAjIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjY5MQogaHR0cC90ZXN0cy9pbnNwZWN0 b3IvbmV0d29yay9uZXR3b3JrLXNpemUtY2h1bmtlZC5odG1sCitodHRwL3Rlc3RzL2luc3BlY3Rv ci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0bWwKZGlmZiAtLWdpdCBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL3F0L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCmlu ZGV4IDg0OGY3Y2UuLjFmNzI5OWUgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0 L1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApAQCAtMzI0Mywz ICszMjQzLDQgQEAgaHR0cC90ZXN0cy9hcHBjYWNoZS9vcmlnaW5zLXdpdGgtYXBwY2FjaGUuaHRt bAogCiAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjY5MQogaHR0 cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtY2h1bmtlZC5odG1sCitodHRw L3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0bWwKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2luL1NraXBwZWQKaW5kZXggYjk4MzRlYS4uZmRlNTVhOCAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vd2lu L1NraXBwZWQKQEAgLTUwLDYgKzUwLDcgQEAgaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9u ZXR3b3JrLXRpbWluZy5odG1sCiAKICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE5NzkzCiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1j aHVua2VkLmh0bWwKK2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5 bmMuaHRtbAogCiAjIEZhaWxzIDxyZGFyOi8vcHJvYmxlbS81Njc0Mjg5PgogbWVkaWEvdmlkZW8t c2Vlay1wYXN0LWVuZC1wYXVzZWQuaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDhiZDNjZGYuLjM5Nzk5YzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMS0wMy0yMyAgVnNldm9sb2QgVmxhc292 ICA8dnNldmlrQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBJbnNwZWN0b3IgZG9lcyBub3Qgc2hvdyBj b3JyZWN0IHRyYW5zZmVyIHNpemUgZm9yIHN5bmNocm9ub3VzIHJlcXVlc3RzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Njk1MQorCisgICAgICAgIEZp eGVkIHRyYW5zZmVyIHNpemUgZm9yIHN5bmNocm9ub3VzIGxvYWQuCisKKyAgICAgICAgVGVzdDog aHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtc3luYy5odG1sCisKKyAg ICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXI6OndpbGxMb2FkTWVkaWFFbGVtZW50VVJMKToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l TG9hZGVyOjpjb21taXRQcm92aXNpb25hbExvYWQpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVM b2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNocm9ub3VzbHkpOgorICAgICAgICAoV2ViQ29yZTo6RnJh bWVMb2FkZXI6OmxvYWRlZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKToKKyAgICAgICAgKiBsb2Fk ZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VM b2FkTm90aWZpZXI6OnNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKToKKyAgICAgICAgKiBs b2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuaDoKKwogMjAxMS0wMy0yMyAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBG ZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKaW5kZXggOTAxMTg4Ni4u MTFmZTkzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0xNTM5LDcg KzE1MzksNyBAQCBib29sIEZyYW1lTG9hZGVyOjp3aWxsTG9hZE1lZGlhRWxlbWVudFVSTChLVVJM JiB1cmwpCiAgICAgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyOwogICAgIFJlc291cmNlRXJyb3Ig ZXJyb3I7CiAgICAgcmVxdWVzdEZyb21EZWxlZ2F0ZShyZXF1ZXN0LCBpZGVudGlmaWVyLCBlcnJv cik7Ci0gICAgbm90aWZpZXIoKS0+c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMobV9kb2N1 bWVudExvYWRlci5nZXQoKSwgaWRlbnRpZmllciwgUmVzb3VyY2VSZXNwb25zZSh1cmwsIFN0cmlu ZygpLCAtMSwgU3RyaW5nKCksIFN0cmluZygpKSwgLTEsIGVycm9yKTsKKyAgICBub3RpZmllcigp LT5zZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3VtZW50TG9hZGVyLmdldCgpLCBp ZGVudGlmaWVyLCBSZXNvdXJjZVJlc3BvbnNlKHVybCwgU3RyaW5nKCksIC0xLCBTdHJpbmcoKSwg U3RyaW5nKCkpLCAtMSwgLTEsIGVycm9yKTsKIAogICAgIHVybCA9IHJlcXVlc3QudXJsKCk7CiAK QEAgLTE5NTYsNyArMTk1Niw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNvbW1pdFByb3Zpc2lvbmFs TG9hZCgpCiAgICAgICAgICAgICAvLyBGSVhNRTogSWYgd2UgZ2V0IGEgcmVzb3VyY2Ugd2l0aCBt b3JlIHRoYW4gMkIgYnl0ZXMsIHRoaXMgY29kZSB3b24ndCBkbyB0aGUgcmlnaHQgdGhpbmcuCiAg ICAgICAgICAgICAvLyBIb3dldmVyLCB3aXRoIHRvZGF5J3MgY29tcHV0ZXJzIGFuZCBuZXR3b3Jr aW5nIHNwZWVkcywgdGhpcyB3b24ndCBoYXBwZW4gaW4gcHJhY3RpY2UuCiAgICAgICAgICAgICAv LyBDb3VsZCBiZSBhbiBpc3N1ZSB3aXRoIGEgZ2lhbnQgbG9jYWwgZmlsZS4KLSAgICAgICAgICAg IG5vdGlmaWVyKCktPnNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1fZG9jdW1lbnRMb2Fk ZXIuZ2V0KCksIGlkZW50aWZpZXIsIHJlc3BvbnNlLCBzdGF0aWNfY2FzdDxpbnQ+KHJlc3BvbnNl LmV4cGVjdGVkQ29udGVudExlbmd0aCgpKSwgZXJyb3IpOworICAgICAgICAgICAgbm90aWZpZXIo KS0+c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMobV9kb2N1bWVudExvYWRlci5nZXQoKSwg aWRlbnRpZmllciwgcmVzcG9uc2UsIHN0YXRpY19jYXN0PGludD4ocmVzcG9uc2UuZXhwZWN0ZWRD b250ZW50TGVuZ3RoKCkpLCAwLCBlcnJvcik7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAg IHBhZ2VDYWNoZSgpLT5yZW1vdmUoaGlzdG9yeSgpLT5jdXJyZW50SXRlbSgpKTsKQEAgLTI4MTAs OCArMjgxMCw3IEBAIHVuc2lnbmVkIGxvbmcgRnJhbWVMb2FkZXI6OmxvYWRSZXNvdXJjZVN5bmNo cm9ub3VzbHkoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1CiAgICAgICAgIH0KICNlbmRpZgog ICAgIH0KLQotICAgIG5vdGlmaWVyKCktPnNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1f ZG9jdW1lbnRMb2FkZXIuZ2V0KCksIGlkZW50aWZpZXIsIHJlc3BvbnNlLCBkYXRhLnNpemUoKSwg ZXJyb3IpOworICAgIG5vdGlmaWVyKCktPnNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1f ZG9jdW1lbnRMb2FkZXIuZ2V0KCksIGlkZW50aWZpZXIsIHJlc3BvbnNlLCBkYXRhLnNpemUoKSwg c3RhdGljX2Nhc3Q8aW50PihyZXNwb25zZS5leHBlY3RlZENvbnRlbnRMZW5ndGgoKSksIGVycm9y KTsKICAgICByZXR1cm4gaWRlbnRpZmllcjsKIH0KIApAQCAtMzEwNCw3ICszMTAzLDcgQEAgdm9p ZCBGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUoY29uc3QgQ2FjaGVk UmVzb3VyY2UqIHJlc291cmNlKQogICAgIFJlc291cmNlRXJyb3IgZXJyb3I7CiAgICAgcmVxdWVz dEZyb21EZWxlZ2F0ZShyZXF1ZXN0LCBpZGVudGlmaWVyLCBlcnJvcik7CiAgICAgSW5zcGVjdG9y SW5zdHJ1bWVudGF0aW9uOjptYXJrUmVzb3VyY2VBc0NhY2hlZChwYWdlLCBpZGVudGlmaWVyKTsK LSAgICBub3RpZmllcigpLT5zZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3VtZW50 TG9hZGVyLmdldCgpLCBpZGVudGlmaWVyLCByZXNvdXJjZS0+cmVzcG9uc2UoKSwgcmVzb3VyY2Ut PmVuY29kZWRTaXplKCksIGVycm9yKTsKKyAgICBub3RpZmllcigpLT5zZW5kUmVtYWluaW5nRGVs ZWdhdGVNZXNzYWdlcyhtX2RvY3VtZW50TG9hZGVyLmdldCgpLCBpZGVudGlmaWVyLCByZXNvdXJj ZS0+cmVzcG9uc2UoKSwgcmVzb3VyY2UtPmVuY29kZWRTaXplKCksIDAsIGVycm9yKTsKIH0KIAog dm9pZCBGcmFtZUxvYWRlcjo6YXBwbHlVc2VyQWdlbnQoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHAKaW5k ZXggNGQ2Y2U0YS4uNTExZDllMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZE5vdGlmaWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkTm90aWZpZXIuY3BwCkBAIC0xNTQsMTMgKzE1NCwxMyBAQCB2b2lkIFJlc291cmNlTG9h ZE5vdGlmaWVyOjpkaXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNlRnJvbVBhZ2UodW5zaWdu ZWQgbG9uZwogICAgIG9sZFBhZ2UtPnByb2dyZXNzKCktPmNvbXBsZXRlUHJvZ3Jlc3MoaWRlbnRp Zmllcik7CiB9CiAKLXZvaWQgUmVzb3VyY2VMb2FkTm90aWZpZXI6OnNlbmRSZW1haW5pbmdEZWxl Z2F0ZU1lc3NhZ2VzKERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVzcG9uc2UsIGludCBsZW5ndGgsIGNvbnN0 IFJlc291cmNlRXJyb3ImIGVycm9yKQordm9pZCBSZXNvdXJjZUxvYWROb3RpZmllcjo6c2VuZFJl bWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgdW5zaWduZWQg bG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgaW50IGRh dGFMZW5ndGgsIGludCBsZW5ndGhSZWNlaXZlZCwgY29uc3QgUmVzb3VyY2VFcnJvciYgZXJyb3Ip CiB7CiAgICAgaWYgKCFyZXNwb25zZS5pc051bGwoKSkKICAgICAgICAgZGlzcGF0Y2hEaWRSZWNl aXZlUmVzcG9uc2UobG9hZGVyLCBpZGVudGlmaWVyLCByZXNwb25zZSk7CiAKLSAgICBpZiAobGVu Z3RoID4gMCkKLSAgICAgICAgZGlzcGF0Y2hEaWRSZWNlaXZlQ29udGVudExlbmd0aChsb2FkZXIs IGlkZW50aWZpZXIsIGxlbmd0aCwgMCk7CisgICAgaWYgKGRhdGFMZW5ndGggPiAwKQorICAgICAg ICBkaXNwYXRjaERpZFJlY2VpdmVDb250ZW50TGVuZ3RoKGxvYWRlciwgaWRlbnRpZmllciwgZGF0 YUxlbmd0aCwgbGVuZ3RoUmVjZWl2ZWQpOwogCiAgICAgaWYgKGVycm9yLmlzTnVsbCgpKQogICAg ICAgICBkaXNwYXRjaERpZEZpbmlzaExvYWRpbmcobG9hZGVyLCBpZGVudGlmaWVyLCAwKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5oIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmgKaW5kZXggZjAzZWZh My4uNTc1M2MyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9h ZE5vdGlmaWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlm aWVyLmgKQEAgLTY0LDcgKzY0LDcgQEAgcHVibGljOgogICAgIHZvaWQgZGlzcGF0Y2hEaWRGaW5p c2hMb2FkaW5nKERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBkb3Vi bGUgZmluaXNoVGltZSk7CiAgICAgdm9pZCBkaXNwYXRjaFRyYW5zZmVyTG9hZGluZ1Jlc291cmNl RnJvbVBhZ2UodW5zaWduZWQgbG9uZywgRG9jdW1lbnRMb2FkZXIqLCBjb25zdCBSZXNvdXJjZVJl cXVlc3QmLCBQYWdlKik7CiAKLSAgICB2b2lkIHNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2Vz KERvY3VtZW50TG9hZGVyKiwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiwgaW50IGxlbmd0aCwgY29uc3QgUmVzb3VyY2VFcnJvciYpOworICAgIHZvaWQg c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBs b25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBpbnQgZGF0YUxlbmd0aCwg aW50IGxlbmd0aFJlY2VpdmVkLCBjb25zdCBSZXNvdXJjZUVycm9yJik7CiAKIHByaXZhdGU6CiAg ICAgRnJhbWUqIG1fZnJhbWU7Cg== 86805 2011-03-24 11:36:52 -0700 2011-03-24 14:18:14 -0700 Patch with merge conflicts fixes sync_git text/plain 11073 vsevik ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjYjk0YTY4Li43MDIyZmM4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDMt MjMgIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogSW5zcGVj dG9yIGRvZXMgbm90IHNob3cgY29ycmVjdCB0cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyBy ZXF1ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NTY5NTEKKworICAgICAgICBGaXhlZCB0cmFuc2ZlciBzaXplIGZvciBzeW5jaHJvbm91cyBsb2Fk LgorCisgICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUt c3luYy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9y L25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZv cm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0OgorICAgICAgICAqIHBsYXRmb3JtL2d0 ay9Ta2lwcGVkOgorICAgICAgICAqIHBsYXRmb3JtL21hYy9Ta2lwcGVkOgorICAgICAgICAqIHBs YXRmb3JtL3F0L1NraXBwZWQ6CisgICAgICAgICogcGxhdGZvcm0vd2luL1NraXBwZWQ6CisKIDIw MTEtMDMtMjQgIEFkYW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBz b21lIGZsYWt5IHRlc3RzIHRvIHRoZSBtYWMtd2syIGFuZCB3aW4td2syIFNraXBwZWQgZmlsZXMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0 d29yay1zaXplLXN5bmMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNw ZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtc3luYy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZmY4ODEyZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsOCBAQAorQ09OU09MRSBNRVNTQUdFOiBsaW5lIDE5OiBEb25l LgorVGVzdHMgbmV0d29yayByZXNvdXJjZSBzaXplIHJlcG9ydGluZyBmb3Igc3luY2hyb25vdXMg cmVxdWVzdHMuCisKKworaHR0cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rvci9uZXR3b3JrL3Jl c291cmNlcy9yZXNvdXJjZS5waHA/dHlwZT1pbWFnZSZzaXplPTUwMCZnemlwPXRydWUmY2h1bmtl ZD10cnVlCityZXNvdXJjZVNpemU6IDUwMAordHJhbnNmZXJTaXplOiAyMTkKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUt c3luYy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3 b3JrLXNpemUtc3luYy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE1 ZDZiNTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0bWwKQEAgLTAsMCArMSw0MiBAQAorPGh0bWw+ Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8 c2NyaXB0PgorZnVuY3Rpb24gbG9hZERhdGEoKQoreworICAgIHZhciB4aHIgPSBuZXcgWE1MSHR0 cFJlcXVlc3QoKTsKKyAgICB4aHIub25yZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24oKQorICAg IHsKKyAgICAgICAgaWYgKHhoci5yZWFkeVN0YXRlICA9PSA0KQorICAgICAgICAgICAgcmVzb3Vy Y2VMb2FkZWQoKTsKKyAgICB9OworICAgIHhoci5vcGVuKCdHRVQnLCAncmVzb3VyY2VzL3Jlc291 cmNlLnBocD90eXBlPWltYWdlJnNpemU9NTAwJmd6aXA9dHJ1ZSZjaHVua2VkPXRydWUnLCBmYWxz ZSk7CisgICAgeGhyLnNlbmQobnVsbCk7Cit9CisKK2Z1bmN0aW9uIHJlc291cmNlTG9hZGVkKCkK K3sKKyAgICBjb25zb2xlLmxvZygiRG9uZS4iKTsKK30KKworZnVuY3Rpb24gdGVzdCgpCit7Cisg ICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKFdlYkluc3BlY3Rvci5Db25zb2xlVmlldy5wcm90 b3R5cGUsICJhZGRNZXNzYWdlIiwgc3RlcDIpOworICAgIEluc3BlY3RvclRlc3QuZXZhbHVhdGVJ blBhZ2UoImxvYWREYXRhKCkiKTsKKworICAgIGZ1bmN0aW9uIHN0ZXAyKCkKKyAgICB7CisgICAg ICAgIHZhciByZXNvdXJjZTEgPSBXZWJJbnNwZWN0b3IucGFuZWxzLm5ldHdvcmsucmVzb3VyY2Vz W1dlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5yZXNvdXJjZXMubGVuZ3RoIC0gMV07CisgICAg ICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KHJlc291cmNlMS51cmwpOworICAgICAgICBJbnNw ZWN0b3JUZXN0LmFkZFJlc3VsdCgicmVzb3VyY2VTaXplOiAiICsgcmVzb3VyY2UxLnJlc291cmNl U2l6ZSk7CisgICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCJ0cmFuc2ZlclNpemU6ICIg KyByZXNvdXJjZTEudHJhbnNmZXJTaXplKTsKKworICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBs ZXRlVGVzdCgpOworICAgIH0KK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJy dW5UZXN0KCkiPgorPHA+VGVzdHMgbmV0d29yayByZXNvdXJjZSBzaXplIHJlcG9ydGluZyBmb3Ig c3luY2hyb25vdXMgcmVxdWVzdHMuPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0IGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVzdF9leHBlY3RhdGlvbnMudHh0CmluZGV4IDU0 MmFjYWIuLmYxNmVkZGQgMTAwNzU1Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Nocm9taXVt L3Rlc3RfZXhwZWN0YXRpb25zLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1 bS90ZXN0X2V4cGVjdGF0aW9ucy50eHQKQEAgLTY2Myw2ICs2NjMsNyBAQCBCVUdXSzU2NDU0IFdJ TiBMSU5VWCA6IGluc3BlY3Rvci9lbGVtZW50cy9tdXRhdGUtdW5rbm93bi1ub2RlLmh0bWwgPSBQ QVNTIFRFWFQKIEJVR1dLNTY2MDIgU0tJUCA6IGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsv bmV0d29yay10aW1pbmcuaHRtbCA9IEZBSUwKIEJVR1dLNTY2MDIgU0tJUCA6IGh0dHAvdGVzdHMv aW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLmh0bWwgPSBGQUlMCiBCVUdXSzU2NjAyIFNL SVAgOiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1jaHVua2VkLmh0 bWwgPSBGQUlMCitCVUdXSzU2NjAyIFNLSVAgOiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3Jr L25ldHdvcmstc2l6ZS1zeW5jLmh0bWwgPSBGQUlMCiAKIEJVR0pBTUVTUiBXSU4gTElOVVggOiBp bnNwZWN0b3Ivc3R5bGVzL3N0eWxlcy1kaXNhYmxlLXRoZW4tZGVsZXRlLmh0bWwgPSBUSU1FT1VU IFBBU1MKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAppbmRleCBlZGEzYzE0Li5mMDNkYWI2IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZApAQCAtMTM0MSw2ICsxMzQxLDcgQEAgc3ZnL1czQy1J MThOL3RzcGFuLWRpckxUUi11Yk92ZXJyaWRlLWluLXJ0bC1jb250ZXh0LnN2ZwogCiAjIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NjY5MQogaHR0cC90ZXN0cy9pbnNw ZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtY2h1bmtlZC5odG1sCitodHRwL3Rlc3RzL2luc3Bl Y3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0bWwKIGh0dHAvdGVzdHMvaW5zcGVjdG9y L25ldHdvcmsvbmV0d29yay1zaXplLmh0bWwKIAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTY5NjYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKaW5kZXggYmU0MTQw ZS4uMWNiYThjZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQK KysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1NraXBwZWQKQEAgLTMyMSwzICszMjEsNCBA QCB3ZWJhcmNoaXZlL3Rlc3QtbGluay1yZWwtaWNvbi5odG1sCiAKICMgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NjkxCiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3 b3JrL25ldHdvcmstc2l6ZS1jaHVua2VkLmh0bWwKK2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdv cmsvbmV0d29yay1zaXplLXN5bmMuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZv cm0vcXQvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQKaW5kZXggNTMz NzJmOC4uNTI3ZDIyZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBl ZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCkBAIC0zMjM1LDMgKzMyMzUs NCBAQCBodHRwL3Rlc3RzL2FwcGNhY2hlL29yaWdpbnMtd2l0aC1hcHBjYWNoZS5odG1sCiAKICMg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2NjkxCiBodHRwL3Rlc3Rz L2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1jaHVua2VkLmh0bWwKK2h0dHAvdGVzdHMv aW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLXN5bmMuaHRtbApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4v U2tpcHBlZAppbmRleCA4ZjE2OTI3Li45YWViYzAyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS93aW4vU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS93aW4vU2tpcHBl ZApAQCAtNTAsNiArNTAsNyBAQCBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmst dGltaW5nLmh0bWwKIAogIyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTk3OTMKIGh0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1zaXplLWNodW5rZWQu aHRtbAoraHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXNpemUtc3luYy5odG1s CiAKICMgRmFpbHMgPHJkYXI6Ly9wcm9ibGVtLzU2NzQyODk+CiBtZWRpYS92aWRlby1zZWVrLXBh c3QtZW5kLXBhdXNlZC5odG1sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdhMzVmNC4uNjgxNTE4NSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDExLTAzLTIzICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2 aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IEluc3BlY3RvciBkb2VzIG5vdCBzaG93IGNvcnJlY3Qg dHJhbnNmZXIgc2l6ZSBmb3Igc3luY2hyb25vdXMgcmVxdWVzdHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU2OTUxCisKKyAgICAgICAgRml4ZWQgdHJh bnNmZXIgc2l6ZSBmb3Igc3luY2hyb25vdXMgbG9hZC4KKworICAgICAgICBUZXN0OiBodHRwL3Rl c3RzL2luc3BlY3Rvci9uZXR3b3JrL25ldHdvcmstc2l6ZS1zeW5jLmh0bWwKKworICAgICAgICAq IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 d2lsbExvYWRNZWRpYUVsZW1lbnRVUkwpOgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6 OmNvbW1pdFByb3Zpc2lvbmFsTG9hZCk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 bG9hZFJlc291cmNlU3luY2hyb25vdXNseSk6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRl cjo6bG9hZGVkUmVzb3VyY2VGcm9tTWVtb3J5Q2FjaGUpOgorICAgICAgICAqIGxvYWRlci9SZXNv dXJjZUxvYWROb3RpZmllci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWROb3Rp Zmllcjo6c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMpOgorICAgICAgICAqIGxvYWRlci9S ZXNvdXJjZUxvYWROb3RpZmllci5oOgorCiAyMDExLTAzLTI0ICBQYXZlbCBGZWxkbWFuICA8cGZl bGRtYW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRz a3kuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAzYmY3ZDgxLi41Y2Nl NWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTE1NDMsNyArMTU0 Myw3IEBAIGJvb2wgRnJhbWVMb2FkZXI6OndpbGxMb2FkTWVkaWFFbGVtZW50VVJMKEtVUkwmIHVy bCkKICAgICB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXI7CiAgICAgUmVzb3VyY2VFcnJvciBlcnJv cjsKICAgICByZXF1ZXN0RnJvbURlbGVnYXRlKHJlcXVlc3QsIGlkZW50aWZpZXIsIGVycm9yKTsK LSAgICBub3RpZmllcigpLT5zZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3VtZW50 TG9hZGVyLmdldCgpLCBpZGVudGlmaWVyLCBSZXNvdXJjZVJlc3BvbnNlKHVybCwgU3RyaW5nKCks IC0xLCBTdHJpbmcoKSwgU3RyaW5nKCkpLCAtMSwgZXJyb3IpOworICAgIG5vdGlmaWVyKCktPnNl bmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIGlkZW50 aWZpZXIsIFJlc291cmNlUmVzcG9uc2UodXJsLCBTdHJpbmcoKSwgLTEsIFN0cmluZygpLCBTdHJp bmcoKSksIC0xLCAtMSwgZXJyb3IpOwogCiAgICAgdXJsID0gcmVxdWVzdC51cmwoKTsKIApAQCAt MTk2MCw3ICsxOTYwLDcgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y29tbWl0UHJvdmlzaW9uYWxMb2Fk KCkKICAgICAgICAgICAgIC8vIEZJWE1FOiBJZiB3ZSBnZXQgYSByZXNvdXJjZSB3aXRoIG1vcmUg dGhhbiAyQiBieXRlcywgdGhpcyBjb2RlIHdvbid0IGRvIHRoZSByaWdodCB0aGluZy4KICAgICAg ICAgICAgIC8vIEhvd2V2ZXIsIHdpdGggdG9kYXkncyBjb21wdXRlcnMgYW5kIG5ldHdvcmtpbmcg c3BlZWRzLCB0aGlzIHdvbid0IGhhcHBlbiBpbiBwcmFjdGljZS4KICAgICAgICAgICAgIC8vIENv dWxkIGJlIGFuIGlzc3VlIHdpdGggYSBnaWFudCBsb2NhbCBmaWxlLgotICAgICAgICAgICAgbm90 aWZpZXIoKS0+c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMobV9kb2N1bWVudExvYWRlci5n ZXQoKSwgaWRlbnRpZmllciwgcmVzcG9uc2UsIHN0YXRpY19jYXN0PGludD4ocmVzcG9uc2UuZXhw ZWN0ZWRDb250ZW50TGVuZ3RoKCkpLCBlcnJvcik7CisgICAgICAgICAgICBub3RpZmllcigpLT5z ZW5kUmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhtX2RvY3VtZW50TG9hZGVyLmdldCgpLCBpZGVu dGlmaWVyLCByZXNwb25zZSwgc3RhdGljX2Nhc3Q8aW50PihyZXNwb25zZS5leHBlY3RlZENvbnRl bnRMZW5ndGgoKSksIDAsIGVycm9yKTsKICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgcGFn ZUNhY2hlKCktPnJlbW92ZShoaXN0b3J5KCktPmN1cnJlbnRJdGVtKCkpOwpAQCAtMjgxNiw4ICsy ODE2LDcgQEAgdW5zaWduZWQgbG9uZyBGcmFtZUxvYWRlcjo6bG9hZFJlc291cmNlU3luY2hyb25v dXNseShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXUKICAgICAgICAgfQogI2VuZGlmCiAgICAg fQotCi0gICAgbm90aWZpZXIoKS0+c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMobV9kb2N1 bWVudExvYWRlci5nZXQoKSwgaWRlbnRpZmllciwgcmVzcG9uc2UsIGRhdGEuc2l6ZSgpLCBlcnJv cik7CisgICAgbm90aWZpZXIoKS0+c2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMobV9kb2N1 bWVudExvYWRlci5nZXQoKSwgaWRlbnRpZmllciwgcmVzcG9uc2UsIGRhdGEuc2l6ZSgpLCBzdGF0 aWNfY2FzdDxpbnQ+KHJlc3BvbnNlLmV4cGVjdGVkQ29udGVudExlbmd0aCgpKSwgZXJyb3IpOwog ICAgIHJldHVybiBpZGVudGlmaWVyOwogfQogCkBAIC0zMTEwLDcgKzMxMDksNyBAQCB2b2lkIEZy YW1lTG9hZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShjb25zdCBDYWNoZWRSZXNv dXJjZSogcmVzb3VyY2UpCiAgICAgUmVzb3VyY2VFcnJvciBlcnJvcjsKICAgICByZXF1ZXN0RnJv bURlbGVnYXRlKHJlcXVlc3QsIGlkZW50aWZpZXIsIGVycm9yKTsKICAgICBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246Om1hcmtSZXNvdXJjZUFzQ2FjaGVkKHBhZ2UsIGlkZW50aWZpZXIpOwotICAg IG5vdGlmaWVyKCktPnNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2VzKG1fZG9jdW1lbnRMb2Fk ZXIuZ2V0KCksIGlkZW50aWZpZXIsIHJlc291cmNlLT5yZXNwb25zZSgpLCByZXNvdXJjZS0+ZW5j b2RlZFNpemUoKSwgZXJyb3IpOworICAgIG5vdGlmaWVyKCktPnNlbmRSZW1haW5pbmdEZWxlZ2F0 ZU1lc3NhZ2VzKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIGlkZW50aWZpZXIsIHJlc291cmNlLT5y ZXNwb25zZSgpLCByZXNvdXJjZS0+ZW5jb2RlZFNpemUoKSwgMCwgZXJyb3IpOwogfQogCiB2b2lk IEZyYW1lTG9hZGVyOjphcHBseVVzZXJBZ2VudChSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3Bw IGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNwcAppbmRleCAw ODk2ZTA0Li4zYTAyYWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkTm90aWZpZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxv YWROb3RpZmllci5jcHAKQEAgLTE1MiwxMyArMTUyLDEzIEBAIHZvaWQgUmVzb3VyY2VMb2FkTm90 aWZpZXI6OmRpc3BhdGNoVHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VGcm9tUGFnZSh1bnNpZ25lZCBs b25nCiAgICAgb2xkUGFnZS0+cHJvZ3Jlc3MoKS0+Y29tcGxldGVQcm9ncmVzcyhpZGVudGlmaWVy KTsKIH0KIAotdm9pZCBSZXNvdXJjZUxvYWROb3RpZmllcjo6c2VuZFJlbWFpbmluZ0RlbGVnYXRl TWVzc2FnZXMoRG9jdW1lbnRMb2FkZXIqIGxvYWRlciwgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVy LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwgaW50IGxlbmd0aCwgY29uc3QgUmVz b3VyY2VFcnJvciYgZXJyb3IpCit2b2lkIFJlc291cmNlTG9hZE5vdGlmaWVyOjpzZW5kUmVtYWlu aW5nRGVsZWdhdGVNZXNzYWdlcyhEb2N1bWVudExvYWRlciogbG9hZGVyLCB1bnNpZ25lZCBsb25n IGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJlc3BvbnNlLCBpbnQgZGF0YUxl bmd0aCwgaW50IGxlbmd0aFJlY2VpdmVkLCBjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsK ICAgICBpZiAoIXJlc3BvbnNlLmlzTnVsbCgpKQogICAgICAgICBkaXNwYXRjaERpZFJlY2VpdmVS ZXNwb25zZShsb2FkZXIsIGlkZW50aWZpZXIsIHJlc3BvbnNlKTsKIAotICAgIGlmIChsZW5ndGgg PiAwKQotICAgICAgICBkaXNwYXRjaERpZFJlY2VpdmVDb250ZW50TGVuZ3RoKGxvYWRlciwgaWRl bnRpZmllciwgbGVuZ3RoLCAwKTsKKyAgICBpZiAoZGF0YUxlbmd0aCA+IDApCisgICAgICAgIGRp c3BhdGNoRGlkUmVjZWl2ZUNvbnRlbnRMZW5ndGgobG9hZGVyLCBpZGVudGlmaWVyLCBkYXRhTGVu Z3RoLCBsZW5ndGhSZWNlaXZlZCk7CiAKICAgICBpZiAoZXJyb3IuaXNOdWxsKCkpCiAgICAgICAg IGRpc3BhdGNoRGlkRmluaXNoTG9hZGluZyhsb2FkZXIsIGlkZW50aWZpZXIsIDApOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuaAppbmRleCBmMDNlZmEzLi41 NzUzYzI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90 aWZpZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIu aApAQCAtNjQsNyArNjQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkaXNwYXRjaERpZEZpbmlzaExv YWRpbmcoRG9jdW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGRvdWJsZSBm aW5pc2hUaW1lKTsKICAgICB2b2lkIGRpc3BhdGNoVHJhbnNmZXJMb2FkaW5nUmVzb3VyY2VGcm9t UGFnZSh1bnNpZ25lZCBsb25nLCBEb2N1bWVudExvYWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVz dCYsIFBhZ2UqKTsKIAotICAgIHZvaWQgc2VuZFJlbWFpbmluZ0RlbGVnYXRlTWVzc2FnZXMoRG9j dW1lbnRMb2FkZXIqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFJlc291cmNlUmVz cG9uc2UmLCBpbnQgbGVuZ3RoLCBjb25zdCBSZXNvdXJjZUVycm9yJik7CisgICAgdm9pZCBzZW5k UmVtYWluaW5nRGVsZWdhdGVNZXNzYWdlcyhEb2N1bWVudExvYWRlciosIHVuc2lnbmVkIGxvbmcg aWRlbnRpZmllciwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIGludCBkYXRhTGVuZ3RoLCBpbnQg bGVuZ3RoUmVjZWl2ZWQsIGNvbnN0IFJlc291cmNlRXJyb3ImKTsKIAogcHJpdmF0ZToKICAgICBG cmFtZSogbV9mcmFtZTsK