158109 2016-05-25 20:19:12 -0700 [GTK][Stable]: Merge r201087 2016-08-22 06:34:59 -0700 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Linux RESOLVED FIXED P2 Normal --- 1 jdiggs webkit-unassigned bugs-noreply cgarcia oldest_to_newest 1196628 0 279861 jdiggs 2016-05-25 20:19:12 -0700 Created attachment 279861 Proposed patch ​https://trac.webkit.org/changeset/201087 [GTK] accessibility/meter-element.html is failing The reason the test was failing is due to lack of implementation. Also, as part of the fix, we are now exposing the aria-valuetext value which had not previously been exposed. Because aria-valuetext is used on a number of ARIA widget roles, and because meters should be accessible, this fix is desirable. Stable-branch-compatible patch attached. 1221848 1 cgarcia 2016-08-22 06:34:59 -0700 Merged in r204708. Thanks! 279861 2016-05-25 20:19:12 -0700 2016-05-25 20:19:12 -0700 Proposed patch 0001-Merge-r201087.patch text/plain 23510 jdiggs RnJvbSBjM2ZkMGY2ZDFjYmRkMDZhYTc1OTVjNzA2YzZlOGM3OWExZjIxMzdiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb2FubWFyaWUgRGlnZ3MgPGpkaWdnc0BpZ2FsaWEuY29tPgpE YXRlOiBXZWQsIDI1IE1heSAyMDE2IDIzOjE2OjIzIC0wNDAwClN1YmplY3Q6IFtQQVRDSF0gTWVy Z2UgcjIwMTA4NwoKLS0tCiBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICB8ICAxNyArKysKIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWV0ZXItZWxl bWVudC5odG1sICAgICAgIHwgIDEyICsrLQogTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RF eHBlY3RhdGlvbnMgICAgICAgICAgfCAgIDIgLQogLi4uL2d0ay9hY2Nlc3NpYmlsaXR5L21ldGVy LWVsZW1lbnQtZXhwZWN0ZWQudHh0ICAgfCAxMTUgKysrKysrKysrKysrKysrKysrKystCiAuLi4v YWNjZXNzaWJpbGl0eS9zcGluYnV0dG9uLXZhbHVlLWV4cGVjdGVkLnR4dCAgICB8ICAgMiArLQog Li4uL21hYy9hY2Nlc3NpYmlsaXR5L21ldGVyLWVsZW1lbnQtZXhwZWN0ZWQudHh0ICAgfCAgNTYg KysrKysrKysrKwogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICAgICAgfCAgMzkgKysrKysrKwogLi4uL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVP YmplY3QuY3BwICAgICAgfCAgMzkgKysrKysrLQogLi4uL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJp bGl0eU5vZGVPYmplY3QuaCAgICAgICAgfCAgIDEgKwogLi4uL0FjY2Vzc2liaWxpdHlQcm9ncmVz c0luZGljYXRvci5jcHAgICAgICAgICAgICAgfCAgMzEgKysrKysrCiAuLi4vYWNjZXNzaWJpbGl0 eS9BY2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3IuaCB8ICAgMSArCiAuLi4vYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCAgICB8ICAgOSArKwogLi4uL2F0ay9X ZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAgICAgICAgICAgICAgfCAgIDcgKy0KIC4uLi9t YWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0gICAgICAgIHwgICA2ICstCiBU b29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAxMyAr KysKIC4uLi9hdGsvQWNjZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHAgICAgICAgICAgICAgIHwg ICA3ICstCiAxNiBmaWxlcyBjaGFuZ2VkLCAzMzggaW5zZXJ0aW9ucygrKSwgMTkgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCmluZGV4IDQ3OTVjMjEuLjc0Mjc3NzcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyMiBAQAogMjAx Ni0wNS0yNSAgSm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGlnYWxpYS5jb20+CiAKKyAgICAgICAg W0dUS10gYWNjZXNzaWJpbGl0eS9tZXRlci1lbGVtZW50Lmh0bWwgaXMgZmFpbGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1NjMzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU2V2ZW4gbmV3IHRlc3Qg Y2FzZXMgd2VyZSBhZGRlZCB0byBtZXRlci1lbGVtZW50Lmh0bWwgZm9yIGFkZGl0aW9uYWwKKyAg ICAgICAgY292ZXJhZ2UuIEFsc28gdXBkYXRlZCB0aGUgQVRLIGV4cGVjdGF0aW9ucyBmb3Igc3Bp bmJ1dHRvbi12YWx1ZS5odG1sCisgICAgICAgIHRvIHJlZmxlY3QgdGhhdCB3ZSBhcmUgbm93IGV4 cG9zaW5nIHRoZSB2YWx1ZSBvZiBhcmlhLXZhbHVldGV4dC4KKworICAgICAgICAqIGFjY2Vzc2li aWxpdHkvbWV0ZXItZWxlbWVudC5odG1sOiBOZXcgdGVzdCBjYXNlcyBhZGRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9uczogVW5za2lwIHRoZSBwcmV2aW91c2x5LWZh aWxpbmcgdGVzdC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9tZXRlci1l bGVtZW50LWV4cGVjdGVkLnR4dDogVXBkYXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvYWNj ZXNzaWJpbGl0eS9zcGluYnV0dG9uLXZhbHVlLWV4cGVjdGVkLnR4dDogVXBkYXRlZC4KKyAgICAg ICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9tZXRlci1lbGVtZW50LWV4cGVjdGVkLnR4 dDogVXBkYXRlZC4KKworMjAxNi0wNS0yNSAgSm9hbm1hcmllIERpZ2dzICA8amRpZ2dzQGlnYWxp YS5jb20+CisKICAgICAgICAgQVg6IExheW91dCB0ZXN0cyByZWxhdGVkIHRvIHRleHQgYWx0ZXJu YXRpdmUgY29tcHV0YXRpb24gbmVlZCB0byBiZSBkb25lIGRpZmZlcmVudGx5CiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTcxODcKIApkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9tZXRlci1lbGVtZW50Lmh0bWwgYi9MYXlvdXRU ZXN0cy9hY2Nlc3NpYmlsaXR5L21ldGVyLWVsZW1lbnQuaHRtbAppbmRleCA5NDY5MDczLi5iY2Ux M2VmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21ldGVyLWVsZW1lbnQu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21ldGVyLWVsZW1lbnQuaHRtbApA QCAtMTEsNiArMTEsMTYgQEAKIDxtZXRlciBpZD0ibWV0ZXI1IiBtaW49MCBtYXg9MTAgdmFsdWU9 Mj4yY208L21ldGVyPgogPG1ldGVyIGlkPSJtZXRlcjYiIG1pbj0wIG1heD0yMCB2YWx1ZT0xMiB0 aXRsZT0iY2VudGltZXRlcnMiPjEyY208L21ldGVyPgogPG1ldGVyIGlkPSJtZXRlcjciIG1pbj0w IG1heD0xMCB2YWx1ZT0yIHRpdGxlPSJjZW50aW1ldGVycyI+MmNtPC9tZXRlcj4KKzxtZXRlciBp ZD0ibWV0ZXI4IiB2YWx1ZT0wLjc1PjxpbWcgYXJpYS1sYWJlbD0iNzUgb3V0IG9mIDEwMCIgc3Jj PSJncmFwaDc1LnBuZyI+PC9tZXRlcj4KKzxtZXRlciBpZD0ibWV0ZXI5IiB2YWx1ZT0wLjc1Pjxp bWcgYXJpYS1sYWJlbD0iNzUgb3V0IG9mIDEwMCIgYXJpYS1sYWJlbGxlZGJ5PSJsYWJlbCIgc3Jj PSJncmFwaDc1LnBuZyI+PC9tZXRlcj4KKzxtZXRlciBpZD0ibWV0ZXIxMCIgdmFsdWU9MC43NT48 aW1nIGFyaWEtbGFiZWxsZWRieT0ibGFiZWwiIHNyYz0iZ3JhcGg3NS5wbmciPjwvbWV0ZXI+Cis8 c3BhbiBpZD0ibGFiZWwiIHN0eWxlPSJjb2xvcjpncmVlbjsiPjc1IHBlcmNlbnQ8L3NwYW4+Cis8 bWV0ZXIgaWQ9Im1ldGVyMTEiIHZhbHVlPTAuNzU+PGltZyBhcmlhLWxhYmVsbGVkYnk9ImxhYmVs MSBsYWJlbDIiIHNyYz0iZ3JhcGg3NS5wbmciPjwvbWV0ZXI+Cis8c3BhbiBpZD0ibGFiZWwxIiBz dHlsZT0iY29sb3I6Z3JlZW47Ij43NTwvc3Bhbj4KKzxzcGFuIGlkPSJsYWJlbDIiIHN0eWxlPSJj b2xvcjpncmVlbjsiPigxMDAgdG90YWwpPC9zcGFuPgorPG1ldGVyIGlkPSJtZXRlcjEyIiB2YWx1 ZT0wLjc1PjxzcGFuIHN0eWxlPSJjb2xvcjpncmVlbjsiPjc1IChvdXQgb2YgMTAwIHRvdGFsKTwv c3Bhbj48L21ldGVyPgorPG1ldGVyIGlkPSJtZXRlcjEzIiB2YWx1ZT0wLjc1PjxkaXY+PHA+PHNw YW4gc3R5bGU9ImNvbG9yOmdyZWVuOyI+NzUgKG91dCBvZiAxMDAgdG90YWwpPC9zcGFuPjwvcD48 L2Rpdj48L21ldGVyPgorPG1ldGVyIGlkPSJtZXRlcjE0IiB2YWx1ZT0wLjYwPjxkaXYgYXJpYS1s YWJlbD0iNyBvZiAxMCI+PHNwYW4gc3R5bGU9ImNvbG9yOmdyZWVuOyI+JiM5NjMyOyYjOTYzMjsm Izk2MzI7JiM5NjMyOyYjOTYzMjsmIzk2MzI7PC9zcGFuPjxzcGFuPiYjOTYzMzsmIzk2MzM7JiM5 NjMzOyYjOTYzMzs8L3NwYW4+PC9kaXY+PC9tZXRlcj4KIDwvZGl2PgogCiA8ZGl2IGlkPSJjb25z b2xlIj48L2Rpdj4KQEAgLTE5LDcgKzI5LDcgQEAKIGRlc2NyaXB0aW9uKCJUaGlzIHRlc3RzIHRo YXQgdGhlIG1ldGVyIGVsZW1lbnQgaXMgYWNjZXNzaWJsZS4iKTsKIAogaWYgKHdpbmRvdy50ZXN0 UnVubmVyICYmIHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxlcikgewotICAgIGZvciAodmFy IGsgPSAxOyBrIDwgODsgaysrKSB7CisgICAgZm9yICh2YXIgayA9IDE7IGsgPCAxNTsgaysrKSB7 CiAgICAgICAgIHZhciBtZXRlciA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVF bGVtZW50QnlJZCgibWV0ZXIiICsgayk7CiAgICAgICAgIGRlYnVnKCJNZXRlciIgKyBrKTsKICAg ICAgICAgZGVidWcobWV0ZXIucm9sZSk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhw ZWN0YXRpb25zCmluZGV4IDU4MWU0ZWMuLjIyMzUwNGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9UZXN0RXhwZWN0YXRpb25zCkBAIC0yMDM2LDggKzIwMzYsNiBAQCB3ZWJraXQub3JnL2Iv MTE1NDM3IGZhc3QvcmVnaW9ucy9yZWdpb24tY29udGVudC1mbG93bi1pbnRvLXJlZ2lvbi5odG1s IFsgSW1hZ2VPbgogCiB3ZWJraXQub3JnL2IvMTE1NDM3IGZhc3QvdGV4dC9jb21wbGV4LWluaXRp YWwtYWR2YW5jZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKLXdlYmtpdC5vcmcvYi8xMTU2 MzMgYWNjZXNzaWJpbGl0eS9tZXRlci1lbGVtZW50Lmh0bWwgWyBGYWlsdXJlIF0KLQogd2Via2l0 Lm9yZy9iLzExNjE1MyBmYXN0L2Nzcy90ZXh0LW92ZXJmbG93LWVsbGlwc2lzLWZ1bGwtdHJ1bmNh dGUtcnRsLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzExNjgwNiBm YXN0L2Nzcy90ZXh0LW92ZXJmbG93LWVsbGlwc2lzLWJlaGluZC1mbG9hdHMuaHRtbCBbIEltYWdl T25seUZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vz c2liaWxpdHkvbWV0ZXItZWxlbWVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvYWNjZXNzaWJpbGl0eS9tZXRlci1lbGVtZW50LWV4cGVjdGVkLnR4dAppbmRleCAwMmI5 ZDNkLi4xOTc0Y2JhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNjZXNz aWJpbGl0eS9tZXRlci1lbGVtZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9tZXRlci1lbGVtZW50LWV4cGVjdGVkLnR4dApAQCAtMSwx MiArMSwxMjEgQEAKLUNPTlNPTEUgTUVTU0FHRTogbGluZSAyNTogVHlwZUVycm9yOiB1bmRlZmlu ZWQgaXMgbm90IGFuIG9iamVjdCAoZXZhbHVhdGluZyAnbWV0ZXIucm9sZScpCi0gICAgICAKIFRo aXMgdGVzdHMgdGhhdCB0aGUgbWV0ZXIgZWxlbWVudCBpcyBhY2Nlc3NpYmxlLgogCiBPbiBzdWNj ZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBi eSAiVEVTVCBDT01QTEVURSIuCiAKIAogTWV0ZXIxCi1GQUlMIHN1Y2Nlc3NmdWxseVBhcnNlZCBz aG91bGQgYmUgdHJ1ZSAob2YgdHlwZSBib29sZWFuKS4gV2FzIHVuZGVmaW5lZCAob2YgdHlwZSB1 bmRlZmluZWQpLgorQVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVz Y3JpcHRpb246IAorQVhWYWx1ZURlc2NyaXB0aW9uOiA2IGJsb2NrcyB1c2VkIChvdXQgb2YgOCB0 b3RhbCkKK0FYVmFsdWVTZXR0YWJsZTogZmFsc2UKKworCitNZXRlcjIKK0FYUm9sZTogQVhQcm9n cmVzc0luZGljYXRvcgorQVhUaXRsZTogCitBWERlc2NyaXB0aW9uOiAKK0FYVmFsdWVEZXNjcmlw dGlvbjogNzUlCitBWFZhbHVlU2V0dGFibGU6IGZhbHNlCisKKworTWV0ZXIzCitBWFJvbGU6IEFY UHJvZ3Jlc3NJbmRpY2F0b3IKK0FYVGl0bGU6IAorQVhEZXNjcmlwdGlvbjogCitBWFZhbHVlRGVz Y3JpcHRpb246IAorQVhWYWx1ZVNldHRhYmxlOiBmYWxzZQorCisKK01ldGVyNAorQVhSb2xlOiBB WFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVzY3JpcHRpb246IAorQVhWYWx1ZURl c2NyaXB0aW9uOiAxMmNtCitBWFZhbHVlU2V0dGFibGU6IGZhbHNlCisKKworTWV0ZXI1CitBWFJv bGU6IEFYUHJvZ3Jlc3NJbmRpY2F0b3IKK0FYVGl0bGU6IAorQVhEZXNjcmlwdGlvbjogCitBWFZh bHVlRGVzY3JpcHRpb246IDJjbQorQVhWYWx1ZVNldHRhYmxlOiBmYWxzZQorCisKK01ldGVyNgor QVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVzY3JpcHRpb246IGNl bnRpbWV0ZXJzCitBWFZhbHVlRGVzY3JpcHRpb246IDEyY20KK0FYVmFsdWVTZXR0YWJsZTogZmFs c2UKKworCitNZXRlcjcKK0FYUm9sZTogQVhQcm9ncmVzc0luZGljYXRvcgorQVhUaXRsZTogCitB WERlc2NyaXB0aW9uOiBjZW50aW1ldGVycworQVhWYWx1ZURlc2NyaXB0aW9uOiAyY20KK0FYVmFs dWVTZXR0YWJsZTogZmFsc2UKKworCitNZXRlcjgKK0FYUm9sZTogQVhQcm9ncmVzc0luZGljYXRv cgorQVhUaXRsZTogCitBWERlc2NyaXB0aW9uOiAKK0FYVmFsdWVEZXNjcmlwdGlvbjogNzUgb3V0 IG9mIDEwMAorQVhWYWx1ZVNldHRhYmxlOiBmYWxzZQorCisKK01ldGVyOQorQVhSb2xlOiBBWFBy b2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVzY3JpcHRpb246IAorQVhWYWx1ZURlc2Ny aXB0aW9uOiA3NSBwZXJjZW50CitBWFZhbHVlU2V0dGFibGU6IGZhbHNlCisKKworTWV0ZXIxMAor QVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVzY3JpcHRpb246IAor QVhWYWx1ZURlc2NyaXB0aW9uOiA3NSBwZXJjZW50CitBWFZhbHVlU2V0dGFibGU6IGZhbHNlCisK KworTWV0ZXIxMQorQVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVz Y3JpcHRpb246IAorQVhWYWx1ZURlc2NyaXB0aW9uOiA3NSAoMTAwIHRvdGFsKQorQVhWYWx1ZVNl dHRhYmxlOiBmYWxzZQorCisKK01ldGVyMTIKK0FYUm9sZTogQVhQcm9ncmVzc0luZGljYXRvcgor QVhUaXRsZTogCitBWERlc2NyaXB0aW9uOiAKK0FYVmFsdWVEZXNjcmlwdGlvbjogNzUgKG91dCBv ZiAxMDAgdG90YWwpCitBWFZhbHVlU2V0dGFibGU6IGZhbHNlCisKKworTWV0ZXIxMworQVhSb2xl OiBBWFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVzY3JpcHRpb246IAorQVhWYWx1 ZURlc2NyaXB0aW9uOiA3NSAob3V0IG9mIDEwMCB0b3RhbCkKK0FYVmFsdWVTZXR0YWJsZTogZmFs c2UKKworCitNZXRlcjE0CitBWFJvbGU6IEFYUHJvZ3Jlc3NJbmRpY2F0b3IKK0FYVGl0bGU6IAor QVhEZXNjcmlwdGlvbjogCitBWFZhbHVlRGVzY3JpcHRpb246IDcgb2YgMTAKK0FYVmFsdWVTZXR0 YWJsZTogZmFsc2UKKworCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCiAKIFRFU1Qg Q09NUExFVEUKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2FjY2Vzc2li aWxpdHkvc3BpbmJ1dHRvbi12YWx1ZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvYWNjZXNzaWJpbGl0eS9zcGluYnV0dG9uLXZhbHVlLWV4cGVjdGVkLnR4dAppbmRleCBh ODRmZGEyLi4wZjBhNDZlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvYWNj ZXNzaWJpbGl0eS9zcGluYnV0dG9uLXZhbHVlLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvYWNjZXNzaWJpbGl0eS9zcGluYnV0dG9uLXZhbHVlLWV4cGVjdGVkLnR4 dApAQCAtOCw3ICs4LDcgQEAgT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQ QVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUKIFBBU1MgZW5kc1dpdGgo YXhTcGluLmludFZhbHVlLCAnNScpIGlzIHRydWUKIFBBU1MgZW5kc1dpdGgoYXhTcGluLm1pblZh bHVlLCAnMScpIGlzIHRydWUKIFBBU1MgZW5kc1dpdGgoYXhTcGluLm1heFZhbHVlLCAnOScpIGlz IHRydWUKLUZBSUwgZW5kc1dpdGgoYXhTcGluLnZhbHVlRGVzY3JpcHRpb24sICc1IG9mIDknKSBz aG91bGQgYmUgdHJ1ZS4gV2FzIGZhbHNlLgorUEFTUyBlbmRzV2l0aChheFNwaW4udmFsdWVEZXNj cmlwdGlvbiwgJzUgb2YgOScpIGlzIHRydWUKIFBBU1MgYXhTcGluLnRpdGxlIGlzIGF4VW50aXRs ZWQudGl0bGUKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKIApkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvbWV0ZXItZWxlbWVudC1leHBl Y3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9tZXRlci1l bGVtZW50LWV4cGVjdGVkLnR4dAppbmRleCAzZGUzNzc0Li5jOTgxNjZlIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9tZXRlci1lbGVtZW50LWV4cGVj dGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9tZXRl ci1lbGVtZW50LWV4cGVjdGVkLnR4dApAQCAtNTksNiArNTksNjIgQEAgQVhWYWx1ZURlc2NyaXB0 aW9uOiAyY20KIEFYVmFsdWVTZXR0YWJsZTogZmFsc2UKIAogCitNZXRlcjgKK0FYUm9sZTogQVhQ cm9ncmVzc0luZGljYXRvcgorQVhUaXRsZTogCitBWERlc2NyaXB0aW9uOiAKK0FYVmFsdWVEZXNj cmlwdGlvbjogNzUgb3V0IG9mIDEwMAorQVhWYWx1ZVNldHRhYmxlOiBmYWxzZQorCisKK01ldGVy OQorQVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVzY3JpcHRpb246 IAorQVhWYWx1ZURlc2NyaXB0aW9uOiA3NSBwZXJjZW50CitBWFZhbHVlU2V0dGFibGU6IGZhbHNl CisKKworTWV0ZXIxMAorQVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FY RGVzY3JpcHRpb246IAorQVhWYWx1ZURlc2NyaXB0aW9uOiA3NSBwZXJjZW50CitBWFZhbHVlU2V0 dGFibGU6IGZhbHNlCisKKworTWV0ZXIxMQorQVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCitB WFRpdGxlOiAKK0FYRGVzY3JpcHRpb246IAorQVhWYWx1ZURlc2NyaXB0aW9uOiA3NSAoMTAwIHRv dGFsKQorQVhWYWx1ZVNldHRhYmxlOiBmYWxzZQorCisKK01ldGVyMTIKK0FYUm9sZTogQVhQcm9n cmVzc0luZGljYXRvcgorQVhUaXRsZTogCitBWERlc2NyaXB0aW9uOiAKK0FYVmFsdWVEZXNjcmlw dGlvbjogNzUgKG91dCBvZiAxMDAgdG90YWwpCitBWFZhbHVlU2V0dGFibGU6IGZhbHNlCisKKwor TWV0ZXIxMworQVhSb2xlOiBBWFByb2dyZXNzSW5kaWNhdG9yCitBWFRpdGxlOiAKK0FYRGVzY3Jp cHRpb246IAorQVhWYWx1ZURlc2NyaXB0aW9uOiA3NSAob3V0IG9mIDEwMCB0b3RhbCkKK0FYVmFs dWVTZXR0YWJsZTogZmFsc2UKKworCitNZXRlcjE0CitBWFJvbGU6IEFYUHJvZ3Jlc3NJbmRpY2F0 b3IKK0FYVGl0bGU6IAorQVhEZXNjcmlwdGlvbjogCitBWFZhbHVlRGVzY3JpcHRpb246IDcgb2Yg MTAKK0FYVmFsdWVTZXR0YWJsZTogZmFsc2UKKworCiBQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBp cyB0cnVlCiAKIFRFU1QgQ09NUExFVEUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmN2UzMTFhLi40MTRhOTljIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsNDQgQEAKIDIwMTYtMDUtMjUgIEpvYW5tYXJpZSBEaWdncyAg PGpkaWdnc0BpZ2FsaWEuY29tPgogCisgICAgICAgIFtHVEtdIGFjY2Vzc2liaWxpdHkvbWV0ZXIt ZWxlbWVudC5odG1sIGlzIGZhaWxpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTExNTYzMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFRoZSBtZXRlcidzIHZhbHVlIGRlc2NyaXB0aW9uIHNob3VsZCBiZSBl eHBvc2VkIGluIHRoZSBzYW1lIGZhc2hpb24KKyAgICAgICAgYXMgKHdlIHNob3VsZCBoYXZlIGJl ZW4gZXhwb3NpbmcpIGFyaWEtdmFsdWV0ZXh0LCBuYW1lbHkgdGhyb3VnaCB0aGUKKyAgICAgICAg InZhbHVldGV4dCIgQXRrT2JqZWN0IGF0dHJpYnV0ZS4gVGhpcyBleHBvc3VyZSBpcyBub3cgaW4g cGxhY2UuIEFsc28KKyAgICAgICAgaW1wbGVtZW50IEFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGlj YXRvcjo6dmFsdWVEZXNjcmlwdGlvbigpIHNvIHRoYXQKKyAgICAgICAgdGhlIHBvcnRzIGRvIG5v dCBoYXZlIHRvIHNwZWNpYWwtY2FzZSBtZXRlciBpbiB0aGUgcGxhdGZvcm0gd3JhcHBlcnMuCisg ICAgICAgIE1hcCB0aGUgbWV0ZXIgZWxlbWVudCB0byB0aGUgY29ycmVjdCByb2xlIChBVEtfUk9M RV9MRVZFTF9CQVIpLCBhbmQKKyAgICAgICAgaWdub3JlIGEgcHJldmlvdXNseS1pbmNsdWRlZCBh Y2Nlc3NpYmxlIG9iamVjdCByZXN1bHRpbmcgZnJvbSB0aGUKKyAgICAgICAgdXNlIG9mIHRoZSB0 aXRsZSBhdHRyaWJ1dGUgb24gYSBtZXRlci4gRmluYWxseSwgZG8gbm90IGV4cG9zZSB0aGUKKyAg ICAgICAgbWV0ZXIncyB0aXRsZSBhcyB0aGUgYWNjZXNzaWJsZSBuYW1lIGJlY2F1c2UgdGhlIEhU TUwgc3BlYyBzdWdnZXN0cworICAgICAgICBhdXRob3JzIGNhbiBzdXBwbHkgdGhlIG51bWVyaWMg dW5pdCBhcyB0aGUgdmFsdWUgb2YgdGl0bGUuCisKKyAgICAgICAgTm8gbmV3IHRlc3QgZmlsZSBh cyB0aGUgZmFpbHVyZSB3YXMgaWRlbnRpZmllZCBieSBtZXRlci1lbGVtZW50Lmh0bWwuCisgICAg ICAgIFNldmVuIG5ldyB0ZXN0IGNhc2VzIHdlcmUgYWRkZWQgZm9yIGFkZGl0aW9uYWwgY292ZXJh Z2UuIEFsc28gdXBkYXRlZAorICAgICAgICB0aGUgQVRLIGV4cGVjdGF0aW9ucyBmb3Igc3BpbmJ1 dHRvbi12YWx1ZS5odG1sIHRvIHJlZmxlY3QgdGhhdCB3ZSBhcmUgbm93CisgICAgICAgIGV4cG9z aW5nIHRoZSB2YWx1ZSBvZiBhcmlhLXZhbHVldGV4dC4KKworICAgICAgICAqIGFjY2Vzc2liaWxp dHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6QWNjZXNz aWJpbGl0eU5vZGVPYmplY3Q6OmhlbHBUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2li aWxpdHlOb2RlT2JqZWN0OjphY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb25Gb3JDaGlsZHJlbik6Cisg ICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6dmlzaWJsZVRleHQpOgor ICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaDoKKyAgICAg ICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvci5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3I6OnZhbHVlRGVz Y3JpcHRpb24pOgorICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVByb2dyZXNz SW5kaWNhdG9yLmg6CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OmNvbXB1dGVBY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5 L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHA6CisgICAgICAgICh3ZWJraXRBY2Nl c3NpYmxlR2V0QXR0cmlidXRlcyk6CisgICAgICAgIChhdGtSb2xlKToKKyAgICAgICAgKiBhY2Nl c3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbToKKyAgICAg ICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXIgYWNjZXNzaWJpbGl0eUF0dHJpYnV0 ZVZhbHVlOl0pOgorCisyMDE2LTA1LTI1ICBKb2FubWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlh LmNvbT4KKwogICAgICAgICBBWDogW0FUS10gVXNlIFdlYkNvcmUgQWNjZXNzaWJpbGl0eSdzIEFj Y2Vzc2liaWxpdHlUZXh0IGZvciBBdGtPYmplY3QgbmFtZSBhbmQgZGVzY3JpcHRpb24KICAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzgyMgogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2Jq ZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVP YmplY3QuY3BwCmluZGV4IDFlM2E5MTUuLjViZTI5NGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuY3BwCkBAIC0x MzU0LDcgKzEzNTQsNiBAQCB2b2lkIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Ojp2aXNpYmxlVGV4 dChWZWN0b3I8QWNjZXNzaWJpbGl0eVRleHQ+JiB0ZXh0T3JkZXIpCiAgICAgY2FzZSBSYWRpb0J1 dHRvblJvbGU6CiAgICAgY2FzZSBTd2l0Y2hSb2xlOgogICAgIGNhc2UgVGFiUm9sZToKLSAgICBj YXNlIFByb2dyZXNzSW5kaWNhdG9yUm9sZToKICAgICAgICAgdXNlVGV4dFVuZGVyRWxlbWVudCA9 IHRydWU7CiAgICAgICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CkBAIC0xMzk1LDkgKzEzOTQsMTcg QEAgdm9pZCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6aGVscFRleHQoVmVjdG9yPEFjY2Vzc2li aWxpdHlUZXh0PiYgdGV4dE9yZGVyKSBjb24KICAgICAgICAgdGV4dE9yZGVyLmFwcGVuZChBY2Nl c3NpYmlsaXR5VGV4dChzdW1tYXJ5LCBTdW1tYXJ5VGV4dCkpOwogCiAgICAgLy8gVGhlIHRpdGxl IGF0dHJpYnV0ZSBzaG91bGQgYmUgdXNlZCBhcyBoZWxwIHRleHQgdW5sZXNzIGl0IGlzIGFscmVh ZHkgYmVpbmcgdXNlZCBhcyBkZXNjcmlwdGl2ZSB0ZXh0LgorICAgIC8vIEhvd2V2ZXIsIHdoZW4g dGhlIHRpdGxlIGF0dHJpYnV0ZSBpcyB0aGUgb25seSB0ZXh0IGFsdGVybmF0aXZlIHByb3ZpZGVk LCBpdCBtYXkgYmUgZXhwb3NlZCBhcyB0aGUKKyAgICAvLyBkZXNjcmlwdGl2ZSB0ZXh0LiBUaGlz IGlzIHByb2JsZW1hdGljIGluIHRoZSBjYXNlIG9mIG1ldGVycyBiZWNhdXNlIHRoZSBIVE1MIHNw ZWMgc3VnZ2VzdHMgYXV0aG9ycworICAgIC8vIGNhbiBleHBvc2UgdW5pdHMgdGhyb3VnaCB0aGlz IGF0dHJpYnV0ZS4gVGhlcmVmb3JlLCBpZiB0aGUgZWxlbWVudCBpcyBhIG1ldGVyLCBjaGFuZ2Ug aXRzIHNvdXJjZQorICAgIC8vIHR5cGUgdG8gSGVscFRleHQuCiAgICAgY29uc3QgQXRvbWljU3Ry aW5nJiB0aXRsZSA9IGdldEF0dHJpYnV0ZSh0aXRsZUF0dHIpOwotICAgIGlmICghdGl0bGUuaXNF bXB0eSgpKQotICAgICAgICB0ZXh0T3JkZXIuYXBwZW5kKEFjY2Vzc2liaWxpdHlUZXh0KHRpdGxl LCBUaXRsZVRhZ1RleHQpKTsKKyAgICBpZiAoIXRpdGxlLmlzRW1wdHkoKSkgeworICAgICAgICBp ZiAoIWlzTWV0ZXIoKSkKKyAgICAgICAgICAgIHRleHRPcmRlci5hcHBlbmQoQWNjZXNzaWJpbGl0 eVRleHQodGl0bGUsIFRpdGxlVGFnVGV4dCkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICB0 ZXh0T3JkZXIuYXBwZW5kKEFjY2Vzc2liaWxpdHlUZXh0KHRpdGxlLCBIZWxwVGV4dCkpOworICAg IH0KIH0KIAogdm9pZCBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdDo6YWNjZXNzaWJpbGl0eVRleHQo VmVjdG9yPEFjY2Vzc2liaWxpdHlUZXh0PiYgdGV4dE9yZGVyKQpAQCAtMTg5Myw2ICsxOTAwLDMy IEBAIHN0YXRpYyBTdHJpbmcgYWNjZXNzaWJsZU5hbWVGb3JOb2RlKE5vZGUqIG5vZGUsIE5vZGUq IGxhYmVsbGVkYnlOb2RlKQogICAgIHJldHVybiBTdHJpbmcoKTsKIH0KIAorU3RyaW5nIEFjY2Vz c2liaWxpdHlOb2RlT2JqZWN0OjphY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb25Gb3JDaGlsZHJlbigp IGNvbnN0Cit7CisgICAgTm9kZSogbm9kZSA9IHRoaXMtPm5vZGUoKTsKKyAgICBpZiAoIW5vZGUp CisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKworICAgIEFYT2JqZWN0Q2FjaGUqIGNhY2hlID0g YXhPYmplY3RDYWNoZSgpOworICAgIGlmICghY2FjaGUpCisgICAgICAgIHJldHVybiBTdHJpbmco KTsKKworICAgIFN0cmluZ0J1aWxkZXIgYnVpbGRlcjsKKyAgICBmb3IgKE5vZGUqIGNoaWxkID0g bm9kZS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+bmV4dFNpYmxpbmcoKSkg eworICAgICAgICBpZiAoIWlzPEVsZW1lbnQ+KGNoaWxkKSkKKyAgICAgICAgICAgIGNvbnRpbnVl OworCisgICAgICAgIGlmIChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBheE9iamVjdCA9IGNhY2hlLT5n ZXRPckNyZWF0ZShjaGlsZCkpIHsKKyAgICAgICAgICAgIFN0cmluZyBkZXNjcmlwdGlvbiA9IGF4 T2JqZWN0LT5hcmlhTGFiZWxlZEJ5QXR0cmlidXRlKCk7CisgICAgICAgICAgICBpZiAoZGVzY3Jp cHRpb24uaXNFbXB0eSgpKQorICAgICAgICAgICAgICAgIGRlc2NyaXB0aW9uID0gYWNjZXNzaWJs ZU5hbWVGb3JOb2RlKGNoaWxkKTsKKyAgICAgICAgICAgIGFwcGVuZE5hbWVUb1N0cmluZ0J1aWxk ZXIoYnVpbGRlciwgZGVzY3JpcHRpb24pOworICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJu IGJ1aWxkZXIudG9TdHJpbmcoKTsKK30KKwogU3RyaW5nIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0 OjphY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb25Gb3JFbGVtZW50cyhWZWN0b3I8RWxlbWVudCo+ICZl bGVtZW50cykgY29uc3QKIHsKICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmgK aW5kZXggNWE5ZjM1MS4uN2I2M2VhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Fj Y2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eU5vZGVPYmplY3QuaApAQCAtMTIzLDYgKzEyMyw3IEBA IHB1YmxpYzoKIAogICAgIHZpcnR1YWwgdW5zaWduZWQgaGllcmFyY2hpY2FsTGV2ZWwoKSBjb25z dCBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFN0cmluZyB0ZXh0VW5kZXJFbGVtZW50KEFjY2Vzc2li aWxpdHlUZXh0VW5kZXJFbGVtZW50TW9kZSA9IEFjY2Vzc2liaWxpdHlUZXh0VW5kZXJFbGVtZW50 TW9kZSgpKSBjb25zdCBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFN0cmluZyBhY2Nlc3NpYmlsaXR5 RGVzY3JpcHRpb25Gb3JDaGlsZHJlbigpIGNvbnN0OwogICAgIHZpcnR1YWwgU3RyaW5nIGFjY2Vz c2liaWxpdHlEZXNjcmlwdGlvbigpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1YWwgU3RyaW5n IGhlbHBUZXh0KCkgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdmlydHVhbCBTdHJpbmcgdGl0bGUoKSBj b25zdCBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yLmNwcAppbmRleCBmM2ExM2Q5 Li4xOTQ4NTM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vz c2liaWxpdHlQcm9ncmVzc0luZGljYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNz aWJpbGl0eS9BY2Nlc3NpYmlsaXR5UHJvZ3Jlc3NJbmRpY2F0b3IuY3BwCkBAIC0yMSw2ICsyMSw3 IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eVByb2dyZXNz SW5kaWNhdG9yLmgiCiAKKyNpbmNsdWRlICJBWE9iamVjdENhY2hlLmgiCiAjaW5jbHVkZSAiRmxv YXRDb252ZXJzaW9uLmgiCiAjaW5jbHVkZSAiSFRNTE1ldGVyRWxlbWVudC5oIgogI2luY2x1ZGUg IkhUTUxOYW1lcy5oIgpAQCAtNjAsNiArNjEsMzYgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UHJvZ3Jl c3NJbmRpY2F0b3I6OmNvbXB1dGVBY2Nlc3NpYmlsaXR5SXNJZ25vcmVkKCkgY29uc3QKICAgICBy ZXR1cm4gYWNjZXNzaWJpbGl0eUlzSWdub3JlZEJ5RGVmYXVsdCgpOwogfQogICAgIAorU3RyaW5n IEFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvcjo6dmFsdWVEZXNjcmlwdGlvbigpIGNvbnN0 Cit7CisgICAgLy8gSWYgdGhlIGF1dGhvciBoYXMgZXhwbGljaXRseSBwcm92aWRlZCBhIHZhbHVl IHRocm91Z2ggYXJpYS12YWx1ZXRleHQsIHVzZSBpdC4KKyAgICBTdHJpbmcgZGVzY3JpcHRpb24g PSBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp2YWx1ZURlc2NyaXB0aW9uKCk7CisgICAgaWYg KCFkZXNjcmlwdGlvbi5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybiBkZXNjcmlwdGlvbjsKKwor I2lmIEVOQUJMRShNRVRFUl9FTEVNRU5UKQorICAgIGlmICghbV9yZW5kZXJlci0+aXNNZXRlcigp KQorICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisKKyAgICBIVE1MTWV0ZXJFbGVtZW50KiBtZXRl ciA9IG1ldGVyRWxlbWVudCgpOworICAgIGlmICghbWV0ZXIpCisgICAgICAgIHJldHVybiBTdHJp bmcoKTsKKworICAgIC8vIFRoZSBIVE1MIHNwZWMgZW5jb3VyYWdlcyBhdXRob3JzIHRvIGluY2x1 ZGUgYSB0ZXh0dWFsIHJlcHJlc2VudGF0aW9uIG9mIHRoZSBtZXRlcidzIHN0YXRlIGluCisgICAg Ly8gdGhlIGVsZW1lbnQncyBjb250ZW50cy4gV2UnbGwgZmFsbCBiYWNrIG9uIHRoYXQgaWYgdGhl cmUgaXMgbm90IGEgbW9yZSBhY2Nlc3NpYmxlIGFsdGVybmF0aXZlLgorICAgIEFjY2Vzc2liaWxp dHlPYmplY3QqIGF4TWV0ZXIgPSBheE9iamVjdENhY2hlKCktPmdldE9yQ3JlYXRlKG1ldGVyKTsK KyAgICBpZiAoaXM8QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q+KGF4TWV0ZXIpKSB7CisgICAgICAg IGRlc2NyaXB0aW9uID0gZG93bmNhc3Q8QWNjZXNzaWJpbGl0eU5vZGVPYmplY3Q+KGF4TWV0ZXIp LT5hY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb25Gb3JDaGlsZHJlbigpOworICAgICAgICBpZiAoIWRl c2NyaXB0aW9uLmlzRW1wdHkoKSkKKyAgICAgICAgICAgIHJldHVybiBkZXNjcmlwdGlvbjsKKyAg ICB9CisKKyAgICByZXR1cm4gbWV0ZXItPnRleHRDb250ZW50KCk7CisjZW5kaWYKKworICAgIHJl dHVybiBTdHJpbmcoKTsKK30KKwogZmxvYXQgQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9y Ojp2YWx1ZUZvclJhbmdlKCkgY29uc3QKIHsKICAgICBpZiAoIW1fcmVuZGVyZXIpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlQcm9ncmVzc0lu ZGljYXRvci5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UHJv Z3Jlc3NJbmRpY2F0b3IuaAppbmRleCBmNThmMzk0Li4zODMzYjJjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVByb2dyZXNz SW5kaWNhdG9yLmgKQEAgLTQ2LDYgKzQ2LDcgQEAgcHJpdmF0ZToKIAogICAgIHZpcnR1YWwgYm9v bCBpc1Byb2dyZXNzSW5kaWNhdG9yKCkgY29uc3Qgb3ZlcnJpZGUgeyByZXR1cm4gdHJ1ZTsgfQog CisgICAgdmlydHVhbCBTdHJpbmcgdmFsdWVEZXNjcmlwdGlvbigpIGNvbnN0IG92ZXJyaWRlOwog ICAgIHZpcnR1YWwgZmxvYXQgdmFsdWVGb3JSYW5nZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZp cnR1YWwgZmxvYXQgbWF4VmFsdWVGb3JSYW5nZSgpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZpcnR1 YWwgZmxvYXQgbWluVmFsdWVGb3JSYW5nZSgpIGNvbnN0IG92ZXJyaWRlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVj dC5jcHAKaW5kZXggNjdkZjgwZS4uZGZmMTJlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0x MzY2LDYgKzEzNjYsMTUgQEAgYm9vbCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojpjb21wdXRl QWNjZXNzaWJpbGl0eUlzSWdub3JlZCgpIGNvbnN0CiAgICAgaWYgKGlzV2ViQXJlYSgpKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgCisjaWYgRU5BQkxFKE1FVEVSX0VMRU1FTlQpCisgICAg Ly8gVGhlIHJlbmRlciB0cmVlIG9mIG1ldGVyIGluY2x1ZGVzIGEgUmVuZGVyQmxvY2sgKG1ldGVy KSBhbmQgYSBSZW5kZXJNZXRlciAoZGl2KS4KKyAgICAvLyBXZSBleHBvc2UgdGhlIGxhdHRlciBh bmQgdGh1cyBzaG91bGQgaWdub3JlIHRoZSBmb3JtZXIuIEhvd2V2ZXIsIGlmIHRoZSBhdXRob3IK KyAgICAvLyBpbmNsdWRlcyBhIHRpdGxlIGF0dHJpYnV0ZSBvbiB0aGUgZWxlbWVudCwgaGFzQXR0 cmlidXRlc1JlcXVpcmVkRm9ySW5jbHVzaW9uKCkKKyAgICAvLyB3aWxsIHJldHVybiB0cnVlLCBw b3RlbnRpYWxseSByZXN1bHRpbmcgaW4gYSByZWR1bmRhbnQgYWNjZXNzaWJsZSBvYmplY3QuCisg ICAgaWYgKGlzPEhUTUxNZXRlckVsZW1lbnQ+KG5vZGUpKQorICAgICAgICByZXR1cm4gdHJ1ZTsK KyNlbmRpZgorCiAgICAgLy8gVXNpbmcgdGhlIHByZXNlbmNlIG9mIGFuIGFjY2Vzc2libGUgbmFt ZSB0byBkZWNpZGUgYW4gZWxlbWVudCdzIHZpc2liaWxpdHkgaXMgbm90CiAgICAgLy8gYXMgZGVm aW5pdGl2ZSBhcyBwcmV2aW91cyBjaGVja3MsIHNvIHRoaXMgc2hvdWxkIHJlbWFpbiBhcyBvbmUg b2YgdGhlIGxhc3QuCiAgICAgaWYgKGhhc0F0dHJpYnV0ZXNSZXF1aXJlZEZvckluY2x1c2lvbigp KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNj ZXNzaWJsZVdyYXBwZXJBdGsuY3BwIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsv V2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCmluZGV4IDQ1MmMzZjAuLjM1M2IwYjEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2li bGVXcmFwcGVyQXRrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9X ZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKQEAgLTQyNyw2ICs0MjcsMTAgQEAgc3RhdGlj IEF0a0F0dHJpYnV0ZVNldCogd2Via2l0QWNjZXNzaWJsZUdldEF0dHJpYnV0ZXMoQXRrT2JqZWN0 KiBvYmplY3QpCiAgICAgaWYgKCFpc1JlYWRPbmx5LmlzRW1wdHkoKSkKICAgICAgICAgYXR0cmli dXRlU2V0ID0gYWRkVG9BdGtBdHRyaWJ1dGVTZXQoYXR0cmlidXRlU2V0LCAicmVhZG9ubHkiLCBp c1JlYWRPbmx5LnV0ZjgoKS5kYXRhKCkpOwogCisgICAgU3RyaW5nIHZhbHVlRGVzY3JpcHRpb24g PSBjb3JlT2JqZWN0LT52YWx1ZURlc2NyaXB0aW9uKCk7CisgICAgaWYgKCF2YWx1ZURlc2NyaXB0 aW9uLmlzRW1wdHkoKSkKKyAgICAgICAgYXR0cmlidXRlU2V0ID0gYWRkVG9BdGtBdHRyaWJ1dGVT ZXQoYXR0cmlidXRlU2V0LCAidmFsdWV0ZXh0IiwgdmFsdWVEZXNjcmlwdGlvbi51dGY4KCkuZGF0 YSgpKTsKKwogICAgIC8vIEFjY29yZGluZyB0byB0aGUgVzNDIENvcmUgQWNjZXNzaWJpbGl0eSBB UEkgTWFwcGluZ3MgMS4xLCBzZWN0aW9uIDUuNC4xIEdlbmVyYWwgUnVsZXM6CiAgICAgLy8gIlVz ZXIgYWdlbnRzIG11c3QgZXhwb3NlIHRoZSBXQUktQVJJQSByb2xlIHN0cmluZyBpZiB0aGUgQVBJ IHN1cHBvcnRzIGEgbWVjaGFuaXNtIHRvIGRvIHNvLiIKICAgICAvLyBJbiB0aGUgY2FzZSBvZiBB VEssIHRoZSBtZWNoYW5pc20gdG8gZG8gc28gaXMgYW4gb2JqZWN0IGF0dHJpYnV0ZSBwYWlyICh4 bWwtcm9sZXM6InN0cmluZyIpLgpAQCAtNTEzLDggKzUxNyw3IEBAIHN0YXRpYyBBdGtSb2xlIGF0 a1JvbGUoQWNjZXNzaWJpbGl0eU9iamVjdCogY29yZU9iamVjdCkKICAgICBjYXNlIEJ1c3lJbmRp Y2F0b3JSb2xlOgogICAgICAgICByZXR1cm4gQVRLX1JPTEVfUFJPR1JFU1NfQkFSOyAvLyBJcyB0 aGlzIHJpZ2h0PwogICAgIGNhc2UgUHJvZ3Jlc3NJbmRpY2F0b3JSb2xlOgotICAgICAgICAvLyBy ZXR1cm4gQVRLX1JPTEVfU1BJTl9CVVRUT047IC8vIFNvbWUgY29uZnVzaW9uIGFib3V0IHRoaXMg cm9sZSBpbiBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAotICAgICAgICByZXR1cm4gQVRL X1JPTEVfUFJPR1JFU1NfQkFSOworICAgICAgICByZXR1cm4gY29yZU9iamVjdC0+aXNNZXRlcigp ID8gQVRLX1JPTEVfTEVWRUxfQkFSIDogQVRLX1JPTEVfUFJPR1JFU1NfQkFSOwogICAgIGNhc2Ug V2luZG93Um9sZToKICAgICAgICAgcmV0dXJuIEFUS19ST0xFX1dJTkRPVzsKICAgICBjYXNlIFBv cFVwQnV0dG9uUm9sZToKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tIGIvU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KaW5k ZXggYzM5NWE3NC4uOWI3Y2RiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW0KKysrIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJN YWMubW0KQEAgLTMxMjYsMTIgKzMxMjYsOCBAQCBzdGF0aWMgTlNTdHJpbmcqIHJvbGVWYWx1ZVRv TlNTdHJpbmcoQWNjZXNzaWJpbGl0eVJvbGUgdmFsdWUpCiAgICAgICAgIHJldHVybiBuaWw7CiAg ICAgfQogICAgIAotICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJpbmc6TlNBY2Nl c3NpYmlsaXR5VmFsdWVEZXNjcmlwdGlvbkF0dHJpYnV0ZV0pIHsKLSAgICAgICAgaWYgKG1fb2Jq ZWN0LT5pc01ldGVyKCkpCi0gICAgICAgICAgICByZXR1cm4gW3NlbGYgYmFzZUFjY2Vzc2liaWxp dHlUaXRsZV07Ci0gICAgICAgIAorICAgIGlmIChbYXR0cmlidXRlTmFtZSBpc0VxdWFsVG9TdHJp bmc6TlNBY2Nlc3NpYmlsaXR5VmFsdWVEZXNjcmlwdGlvbkF0dHJpYnV0ZV0pCiAgICAgICAgIHJl dHVybiBtX29iamVjdC0+dmFsdWVEZXNjcmlwdGlvbigpOwotICAgIH0KICAgICAKICAgICBpZiAo W2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3RyaW5nOk5TQWNjZXNzaWJpbGl0eU9yaWVudGF0aW9u QXR0cmlidXRlXSkgewogICAgICAgICBBY2Nlc3NpYmlsaXR5T3JpZW50YXRpb24gZWxlbWVudE9y aWVudGF0aW9uID0gbV9vYmplY3QtPm9yaWVudGF0aW9uKCk7CmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggM2Y4ODNmNy4uNmY5ZDNlNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4 IEBACiAyMDE2LTA1LTI1ICBKb2FubWFyaWUgRGlnZ3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KIAor ICAgICAgICBbR1RLXSBhY2Nlc3NpYmlsaXR5L21ldGVyLWVsZW1lbnQuaHRtbCBpcyBmYWlsaW5n CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU2MzMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1l bnQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6dmFsdWVEZXNjcmlwdGlvbigpIGFuZCBhZGQgbWFw cGluZworICAgICAgICBmcm9tIEFUS19ST0xFX0xFVkVMX0JBUiB0byBBWFByb2dyZXNzSW5kaWNh dG9yLgorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9hdGsvQWNj ZXNzaWJpbGl0eVVJRWxlbWVudEF0ay5jcHA6CisgICAgICAgIChXVFI6OkFjY2Vzc2liaWxpdHlV SUVsZW1lbnQ6OnZhbHVlRGVzY3JpcHRpb24pOgorCisyMDE2LTA1LTI1ICBKb2FubWFyaWUgRGln Z3MgIDxqZGlnZ3NAaWdhbGlhLmNvbT4KKwogICAgICAgICBBWDogW0FUS10gVXNlIFdlYkNvcmUg QWNjZXNzaWJpbGl0eSdzIEFjY2Vzc2liaWxpdHlUZXh0IGZvciBBdGtPYmplY3QgbmFtZSBhbmQg ZGVzY3JpcHRpb24KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1NzgyMgogCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVk QnVuZGxlL2F0ay9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50QXRrLmNwcCBiL1Rvb2xzL1dlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3Bw CmluZGV4IGYzNzAyODcuLmNhYjlhMjEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5u ZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRBdGsuY3BwCisrKyBi L1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvYXRrL0FjY2Vzc2liaWxpdHlV SUVsZW1lbnRBdGsuY3BwCkBAIC0zNzksNiArMzc5LDggQEAgY29uc3QgZ2NoYXIqIHJvbGVUb1N0 cmluZyhBdGtPYmplY3QqIG9iamVjdCkKICAgICAgICAgcmV0dXJuICJBWEludmFsaWQiOwogICAg IGNhc2UgQVRLX1JPTEVfTEFCRUw6CiAgICAgICAgIHJldHVybiAiQVhMYWJlbCI7CisgICAgY2Fz ZSBBVEtfUk9MRV9MRVZFTF9CQVI6CisgICAgICAgIHJldHVybiAiQVhQcm9ncmVzc0luZGljYXRv ciI7CiAgICAgY2FzZSBBVEtfUk9MRV9MSU5LOgogICAgICAgICByZXR1cm4gIkFYTGluayI7CiAg ICAgY2FzZSBBVEtfUk9MRV9MSVNUOgpAQCAtMTQwMCw4ICsxNDAyLDkgQEAgZG91YmxlIEFjY2Vz c2liaWxpdHlVSUVsZW1lbnQ6Om1heFZhbHVlKCkKIAogSlNSZXRhaW5QdHI8SlNTdHJpbmdSZWY+ IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OnZhbHVlRGVzY3JpcHRpb24oKQogewotICAgIC8vIEZJ WE1FOiBpbXBsZW1lbnQKLSAgICByZXR1cm4gSlNTdHJpbmdDcmVhdGVXaXRoQ2hhcmFjdGVycygw LCAwKTsKKyAgICBTdHJpbmcgdmFsdWVUZXh0ID0gZ2V0QXR0cmlidXRlU2V0VmFsdWVGb3JJZChB VEtfT0JKRUNUKG1fZWxlbWVudC5nZXQoKSksIE9iamVjdEF0dHJpYnV0ZVR5cGUsICJ2YWx1ZXRl eHQiKTsKKyAgICBHVW5pcXVlUHRyPGdjaGFyPiB2YWx1ZURlc2NyaXB0aW9uKGdfc3RyZHVwX3By aW50ZigiQVhWYWx1ZURlc2NyaXB0aW9uOiAlcyIsIHZhbHVlVGV4dC51dGY4KCkuZGF0YSgpKSk7 CisgICAgcmV0dXJuIEpTU3RyaW5nQ3JlYXRlV2l0aFVURjhDU3RyaW5nKHZhbHVlRGVzY3JpcHRp b24uZ2V0KCkpOwogfQogCiBpbnQgQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6aW5zZXJ0aW9uUG9p bnRMaW5lTnVtYmVyKCkKLS0gCjIuNy40Cgo=