59291 2011-04-23 21:36:22 -0700 Update Content-Security-Policy syntax to match new version of spec 2011-04-24 11:37:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 53572 1 abarth abarth commit-queue eric oldest_to_newest 391531 0 abarth 2011-04-23 21:36:22 -0700 Update Content-Security-Policy syntax to match new version of spec 391533 1 90868 abarth 2011-04-23 21:38:42 -0700 Created attachment 90868 Patch 391598 2 90868 eric 2011-04-24 06:28:39 -0700 Comment on attachment 90868 Patch OK. 391614 3 90868 commit-queue 2011-04-24 11:37:07 -0700 Comment on attachment 90868 Patch Clearing flags on attachment: 90868 Committed r84758: <http://trac.webkit.org/changeset/84758> 391615 4 commit-queue 2011-04-24 11:37:12 -0700 All reviewed patches have been landed. Closing bug. 90868 2011-04-23 21:38:42 -0700 2011-04-24 11:37:07 -0700 Patch bug-59291-20110423213840.patch text/plain 18581 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogODQ3NDkKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxYjg2NjI0YmM1MjEwM2YyZGE3NjFh YmQyY2RlOWZhMzA0NDcxMzJkLi40N2UwZTI2YzE2NzE1NzdkM2U2NTRkOWMwMThjYWQ5ZTRkM2M3 YWQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDQtMjMgIEFkYW0gQmFydGggIDxhYmFy dGhAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBVcGRhdGUgQ29udGVudC1TZWN1cml0eS1Qb2xpY3kgc3ludGF4IHRvIG1hdGNoIG5l dyB2ZXJzaW9uIG9mIHNwZWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU5MjkxCisKKyAgICAgICAgVXBkYXRlIHRlc3RzIHRvIHVzZSB0aGUgbmV3IHN5 bnRheC4KKworICAgICAgICAqIGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s aWN5L2V2YWwtc2NyaXB0cy1zZXRJbnRlcnZhbC1hbGxvd2VkLmh0bWw6CisgICAgICAgICogaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZXZhbC1zY3JpcHRzLXNldElu dGVydmFsLWJsb2NrZWQuaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRl bnRTZWN1cml0eVBvbGljeS9ldmFsLXNjcmlwdHMtc2V0VGltZW91dC1hbGxvd2VkLmh0bWw6Cisg ICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZXZhbC1z Y3JpcHRzLXNldFRpbWVvdXQtYmxvY2tlZC5odG1sOgorICAgICAgICAqIGh0dHAvdGVzdHMvc2Vj dXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2ltYWdlLWFsbG93ZWQuaHRtbDoKKyAgICAgICAg KiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9pbWFnZS1ibG9ja2Vk Lmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xp Y3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWw6CisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1 cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvc3R5bGUtYWxsb3dlZC5odG1sOgorICAgICAgICAq IGh0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L3N0eWxlLWJsb2NrZWQu aHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGlj eS94c2wtYWxsb3dlZC5waHA6CisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50 U2VjdXJpdHlQb2xpY3kveHNsLWJsb2NrZWQucGhwOgorCiAyMDExLTA0LTIzICBEb21pbmljIENv b25leSAgPGRvbWluaWNjQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaW1p dHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L2NvbnRlbnRTZWN1cml0eVBvbGljeS9ldmFsLXNjcmlwdHMtc2V0SW50ZXJ2YWwtYWxsb3dlZC5o dG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xp Y3kvZXZhbC1zY3JpcHRzLXNldEludGVydmFsLWFsbG93ZWQuaHRtbAppbmRleCA1ZmYxNzU4YjM1 MjIyMDZiMjZlMjk5NmZmYTg3YTY1NWEyNzg0MTMzLi4xZTE0YmMyYjVjNGNhMzk1MWY0NjdiMGY1 NDM0NzkxMGE4ZGQwZDJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3Vy aXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9ldmFsLXNjcmlwdHMtc2V0SW50ZXJ2YWwtYWxsb3dl ZC5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3Vy aXR5UG9saWN5L2V2YWwtc2NyaXB0cy1zZXRJbnRlcnZhbC1hbGxvd2VkLmh0bWwKQEAgLTEsNyAr MSw3IEBACiA8IURPQ1RZUEUgaHRtbD4KIDxodG1sPgogPGhlYWQ+Ci08bWV0YSBodHRwLWVxdWl2 PSJYLVdlYktpdC1DU1AiIGNvbnRlbnQ9InNjcmlwdC1zcmMgJ25vbmUnOyBvcHRpb25zIGRpc2Fi bGUteHNzLXByb3RlY3Rpb24gZXZhbC1zY3JpcHQiPgorPG1ldGEgaHR0cC1lcXVpdj0iWC1XZWJL aXQtQ1NQIiBjb250ZW50PSJzY3JpcHQtc3JjICd1bnNhZmUtaW5saW5lJyAndW5zYWZlLWV2YWwn Ij4KIDwvaGVhZD4KIDxwcmU+CiA8c2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZXZhbC1zY3JpcHRzLXNldElu dGVydmFsLWJsb2NrZWQuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29u dGVudFNlY3VyaXR5UG9saWN5L2V2YWwtc2NyaXB0cy1zZXRJbnRlcnZhbC1ibG9ja2VkLmh0bWwK aW5kZXggM2QxNTY2ZTVkMGU1M2IwNzc4OTA0NmU0NWM1YTRmNzdiM2M4OWRlZi4uZmM0ZWFhZDhk YjRjMTEwYzNkZmE5ZjM1MWU0MGZiZDQ4MmVkYmE2MiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZXZhbC1zY3JpcHRzLXNl dEludGVydmFsLWJsb2NrZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3Vy aXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9ldmFsLXNjcmlwdHMtc2V0SW50ZXJ2YWwtYmxvY2tl ZC5odG1sCkBAIC0xLDcgKzEsNyBAQAogPCFET0NUWVBFIGh0bWw+CiA8aHRtbD4KIDxoZWFkPgot PG1ldGEgaHR0cC1lcXVpdj0iWC1XZWJLaXQtQ1NQIiBjb250ZW50PSJzY3JpcHQtc3JjICdub25l Jzsgb3B0aW9ucyBkaXNhYmxlLXhzcy1wcm90ZWN0aW9uIj4KKzxtZXRhIGh0dHAtZXF1aXY9Ilgt V2ViS2l0LUNTUCIgY29udGVudD0ic2NyaXB0LXNyYyAndW5zYWZlLWlubGluZSciPgogPC9oZWFk PgogPHByZT4KIDxzY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3Nl Y3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9ldmFsLXNjcmlwdHMtc2V0VGltZW91dC1hbGxv d2VkLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0 eVBvbGljeS9ldmFsLXNjcmlwdHMtc2V0VGltZW91dC1hbGxvd2VkLmh0bWwKaW5kZXggZGY3NGUx YjA2ZmFhZGNiYzU4NjE1MzY4OTZkOTljYTE3OTg4NTFiNS4uNzJjNDE1YmViM2E0OWQyZDlhN2Jl OWVmOWEwYThkMjc1N2ZlYTc3MCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9z ZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZXZhbC1zY3JpcHRzLXNldFRpbWVvdXQtYWxs b3dlZC5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNl Y3VyaXR5UG9saWN5L2V2YWwtc2NyaXB0cy1zZXRUaW1lb3V0LWFsbG93ZWQuaHRtbApAQCAtMSw3 ICsxLDcgQEAKIDwhRE9DVFlQRSBodG1sPgogPGh0bWw+CiA8aGVhZD4KLTxtZXRhIGh0dHAtZXF1 aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0ic2NyaXB0LXNyYyAnbm9uZSc7IG9wdGlvbnMgZGlz YWJsZS14c3MtcHJvdGVjdGlvbiBldmFsLXNjcmlwdCI+Cis8bWV0YSBodHRwLWVxdWl2PSJYLVdl YktpdC1DU1AiIGNvbnRlbnQ9InNjcmlwdC1zcmMgJ3Vuc2FmZS1pbmxpbmUnICd1bnNhZmUtZXZh bCciPgogPC9oZWFkPgogPHByZT4KIDxzY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9ldmFsLXNjcmlwdHMtc2V0 VGltZW91dC1ibG9ja2VkLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2Nv bnRlbnRTZWN1cml0eVBvbGljeS9ldmFsLXNjcmlwdHMtc2V0VGltZW91dC1ibG9ja2VkLmh0bWwK aW5kZXggYWEyYTdlYjcwYWRkZmYxNjI2YTA0ZjE4OGE1NjU4MTUyZGI0ZTUxZC4uOTg2NGU2NTQ5 OGRiZjQ3NDVjODAxZWUwZjQ3M2YxMWNlOTIyODRlYyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvZXZhbC1zY3JpcHRzLXNl dFRpbWVvdXQtYmxvY2tlZC5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJp dHkvY29udGVudFNlY3VyaXR5UG9saWN5L2V2YWwtc2NyaXB0cy1zZXRUaW1lb3V0LWJsb2NrZWQu aHRtbApAQCAtMSw3ICsxLDcgQEAKIDwhRE9DVFlQRSBodG1sPgogPGh0bWw+CiA8aGVhZD4KLTxt ZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0ic2NyaXB0LXNyYyAnbm9uZSc7 IG9wdGlvbnMgZGlzYWJsZS14c3MtcHJvdGVjdGlvbiI+Cis8bWV0YSBodHRwLWVxdWl2PSJYLVdl YktpdC1DU1AiIGNvbnRlbnQ9InNjcmlwdC1zcmMgJ3Vuc2FmZS1pbmxpbmUnIj4KIDwvaGVhZD4K IDxwcmU+CiA8c2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1 cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW1hZ2UtYWxsb3dlZC5odG1sIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW1hZ2UtYWxsb3dl ZC5odG1sCmluZGV4IDJhZjkwYjg0YWI2ZDU5NTg1MTYzYWUwMGRlNDcyYTgzYmNhYTljOWYuLjA5 NDBjMTE4ZWU3ZGMxMzYwYzQwNjJmODgyMjMyOTcwZTBjZDZlMWUgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2ltYWdlLWFs bG93ZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRT ZWN1cml0eVBvbGljeS9pbWFnZS1hbGxvd2VkLmh0bWwKQEAgLTEsNyArMSw3IEBACiA8IURPQ1RZ UEUgaHRtbD4KIDxodG1sPgogPGhlYWQ+Ci08bWV0YSBodHRwLWVxdWl2PSJYLVdlYktpdC1DU1Ai IGNvbnRlbnQ9ImltZy1zcmMgKjsgc2NyaXB0LXNyYyAnbm9uZSc7IG9wdGlvbnMgZGlzYWJsZS14 c3MtcHJvdGVjdGlvbiI+Cis8bWV0YSBodHRwLWVxdWl2PSJYLVdlYktpdC1DU1AiIGNvbnRlbnQ9 ImltZy1zcmMgKjsgc2NyaXB0LXNyYyAndW5zYWZlLWlubGluZSciPgogPHNjcmlwdD4KIGlmICh3 aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCiAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVt cEFzVGV4dCgpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9j b250ZW50U2VjdXJpdHlQb2xpY3kvaW1hZ2UtYmxvY2tlZC5odG1sIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW1hZ2UtYmxvY2tlZC5odG1s CmluZGV4IGNhMzcyMjZmNTNkN2Q4ODRiNDYxZTcxN2M3OTVhZTUyZDIxNjFjMzcuLjQyZDQ4NjFl ZDIzNjFkOTk0YzM3ZGI0MjJlZmYwZjE4ODgwM2RmZDYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9saWN5L2ltYWdlLWJsb2NrZWQu aHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0 eVBvbGljeS9pbWFnZS1ibG9ja2VkLmh0bWwKQEAgLTEsNyArMSw3IEBACiA8IURPQ1RZUEUgaHRt bD4KIDxodG1sPgogPGhlYWQ+Ci08bWV0YSBodHRwLWVxdWl2PSJYLVdlYktpdC1DU1AiIGNvbnRl bnQ9ImltZy1zcmMgJ25vbmUnOyBzY3JpcHQtc3JjICdub25lJzsgb3B0aW9ucyBkaXNhYmxlLXhz cy1wcm90ZWN0aW9uIj4KKzxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0i aW1nLXNyYyAnbm9uZSc7IHNjcmlwdC1zcmMgJ3Vuc2FmZS1pbmxpbmUnIj4KIDxzY3JpcHQ+CiBp ZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQogICAgIGxheW91dFRlc3RDb250cm9sbGVy LmR1bXBBc1RleHQoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJp dHkvY29udGVudFNlY3VyaXR5UG9saWN5L2lubGluZS1zY3JpcHQtYWxsb3dlZC5odG1sIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5l LXNjcmlwdC1hbGxvd2VkLmh0bWwKaW5kZXggYjA3NDMxZTI2NTNmMzdkZmQxY2M2ZTIzN2E2MTM1 MWJkM2Y1Mzk4OC4uNDVmYmY2YzRlOWQ5MjE3ZWU0ZmY1NDMzZGU2Mjk0MGIxODI2OWNlYyAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQ b2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2VkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvaW5saW5lLXNjcmlwdC1hbGxvd2Vk Lmh0bWwKQEAgLTEsNyArMSw3IEBACiA8IURPQ1RZUEUgaHRtbD4KIDxodG1sPgogPGhlYWQ+Ci08 bWV0YSBodHRwLWVxdWl2PSJYLVdlYktpdC1DU1AiIGNvbnRlbnQ9InNjcmlwdC1zcmMgaHR0cDov LzEyNy4wLjAuMToqOyBvcHRpb25zIGRpc2FibGUteHNzLXByb3RlY3Rpb24iPgorPG1ldGEgaHR0 cC1lcXVpdj0iWC1XZWJLaXQtQ1NQIiBjb250ZW50PSJzY3JpcHQtc3JjIGh0dHA6Ly8xMjcuMC4w LjE6KiAndW5zYWZlLWlubGluZSciPgogPHNjcmlwdCBzcmM9InJlc291cmNlcy9kdW1wLWFzLXRl eHQuanMiPjwvc2NyaXB0PgogPC9oZWFkPgogPGJvZHkgb25sb2FkPSJhbGVydCgnUEFTUyAzIG9m IDMnKSI+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRl bnRTZWN1cml0eVBvbGljeS9zdHlsZS1hbGxvd2VkLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9zdHlsZS1hbGxvd2VkLmh0bWwKaW5k ZXggZGFjNzZhY2Q4ZDBhZjljMTA4ZGNiODYyYzg5NGNkZTNhNzFhYTdlZi4uMDY0ZjYwNzhkMzNi YmFkYjRhMTJiMzUzNTUxOWY5MzE0MTIwMGQ5MyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvc3R5bGUtYWxsb3dlZC5odG1s CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s aWN5L3N0eWxlLWFsbG93ZWQuaHRtbApAQCAtMSw3ICsxLDcgQEAKIDwhRE9DVFlQRSBodG1sPgog PGh0bWw+CiA8aGVhZD4KLTxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIgY29udGVudD0i c3R5bGUtc3JjICo7IHNjcmlwdC1zcmMgJ25vbmUnOyBvcHRpb25zIGRpc2FibGUteHNzLXByb3Rl Y3Rpb24iPgorPG1ldGEgaHR0cC1lcXVpdj0iWC1XZWJLaXQtQ1NQIiBjb250ZW50PSJzdHlsZS1z cmMgKjsgc2NyaXB0LXNyYyAndW5zYWZlLWlubGluZSciPgogPGxpbmsgcmVsPSJzdHlsZXNoZWV0 IiBocmVmPSJyZXNvdXJjZXMvYmx1ZS5jc3MiPgogPHNjcmlwdD4KIGlmICh3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3Vy aXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9zdHlsZS1ibG9ja2VkLmh0bWwgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS9zdHlsZS1ibG9ja2Vk Lmh0bWwKaW5kZXggZTM4MzRlZGEyOGNiZmJhN2ZiYTBkYmEzYzVjNzM1Y2ZhZTBmYmY0NS4uZjY5 NjAxMDk3ZTE5YzVhZTMzMjM5MjJmZjY1MzE1YzU5YzIyZWZiYSAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kvc3R5bGUtYmxv Y2tlZC5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNl Y3VyaXR5UG9saWN5L3N0eWxlLWJsb2NrZWQuaHRtbApAQCAtMSw3ICsxLDcgQEAKIDwhRE9DVFlQ RSBodG1sPgogPGh0bWw+CiA8aGVhZD4KLTxtZXRhIGh0dHAtZXF1aXY9IlgtV2ViS2l0LUNTUCIg Y29udGVudD0ic3R5bGUtc3JjICdub25lJzsgc2NyaXB0LXNyYyAnbm9uZSc7IG9wdGlvbnMgZGlz YWJsZS14c3MtcHJvdGVjdGlvbiI+Cis8bWV0YSBodHRwLWVxdWl2PSJYLVdlYktpdC1DU1AiIGNv bnRlbnQ9InN0eWxlLXNyYyAnbm9uZSc7IHNjcmlwdC1zcmMgJ3Vuc2FmZS1pbmxpbmUnIj4KIDxs aW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0icmVzb3VyY2VzL2JsdWUuY3NzIj4KIDxzY3JpcHQ+ CiBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kveHNsLWFsbG93ZWQu cGhwIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xp Y3kveHNsLWFsbG93ZWQucGhwCmluZGV4IGUzYWEwOWVmNzY5ZmJiMDc4MmYzMDMyMmRhMGJiNTA5 NWI1MzUwMjIuLjY0MDE2MzcyNjI4ZGEzZjYwYWJhZTMxZTk3N2UzNjE3YTc0NDEwOTQgMTAwNjQ0 Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNlY3VyaXR5UG9s aWN5L3hzbC1hbGxvd2VkLnBocAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L2NvbnRlbnRTZWN1cml0eVBvbGljeS94c2wtYWxsb3dlZC5waHAKQEAgLTEsNiArMSw2IEBACiA8 P3BocAogaGVhZGVyKCJDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3hodG1sK3htbCIpOwotaGVh ZGVyKCJYLVdlYktpdC1DU1A6IHN0eWxlLXNyYyAqOyBzY3JpcHQtc3JjICdub25lJzsgb3B0aW9u cyBkaXNhYmxlLXhzcy1wcm90ZWN0aW9uIik7CitoZWFkZXIoIlgtV2ViS2l0LUNTUDogc3R5bGUt c3JjICo7IHNjcmlwdC1zcmMgJ3Vuc2FmZS1pbmxpbmUnIik7CiAKIGVjaG8gJzw/eG1sIHZlcnNp b249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+JzsKIGVjaG8gJzw/eG1sLXN0eWxlc2hlZXQgdHlw ZT0idGV4dC94c2wiIGhyZWY9InJlc291cmNlcy9zdHlsZS54c2wiPz4nOwpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2VjdXJpdHlQb2xpY3kveHNs LWJsb2NrZWQucGhwIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS9jb250ZW50U2Vj dXJpdHlQb2xpY3kveHNsLWJsb2NrZWQucGhwCmluZGV4IGU2ZTllNTk3YTBiZTcwOTlkMTdiYzYw NDVjOThhM2VlZGJhNGQzMGEuLjMxY2I2ZTYyMzIwZWViOWYxMjQ5NGU5N2MzNGE3NGU1NDVkYWZh NjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvY29udGVudFNl Y3VyaXR5UG9saWN5L3hzbC1ibG9ja2VkLnBocAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3NlY3VyaXR5L2NvbnRlbnRTZWN1cml0eVBvbGljeS94c2wtYmxvY2tlZC5waHAKQEAgLTEsNiAr MSw2IEBACiA8P3BocAogaGVhZGVyKCJDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3hodG1sK3ht bCIpOwotaGVhZGVyKCJYLVdlYktpdC1DU1A6IHN0eWxlLXNyYyAnbm9uZSc7IHNjcmlwdC1zcmMg Kjsgb3B0aW9ucyBkaXNhYmxlLXhzcy1wcm90ZWN0aW9uIik7CitoZWFkZXIoIlgtV2ViS2l0LUNT UDogc3R5bGUtc3JjICdub25lJzsgc2NyaXB0LXNyYyAndW5zYWZlLWlubGluZSciKTsKIAogZWNo byAnPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4nOwogZWNobyAnPD94bWwt c3R5bGVzaGVldCB0eXBlPSJ0ZXh0L3hzbCIgaHJlZj0icmVzb3VyY2VzL3N0eWxlLnhzbCI/Pic7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKaW5kZXggYTgwMDg0OGYyMzNmNzMyZjUzNTQ3NTQxNTVjMzczYWZjYmY0ZGU3Yy4u ZTI1NGVjZTA0Zjg5ZWNmZWI2YWFiMDNiZjVkY2ZmMThjZWQwMGVjMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDMwIEBACisyMDExLTA0LTIzICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBkYXRl IENvbnRlbnQtU2VjdXJpdHktUG9saWN5IHN5bnRheCB0byBtYXRjaCBuZXcgdmVyc2lvbiBvZiBz cGVjCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTI5 MQorCisgICAgICAgIEJyYW5kb24gcmVtb3ZlZCBkaXNhYmxlLXhzcy1wcm90ZWN0aW9uIGluIGZh dm9yIG9mIHVuc2FmZS1pbmxpbmUgYW5kCisgICAgICAgIGFsbG93LWV2YWwgaW4gZmF2b3Igb2Yg dW5zYWZlLWV2YWwuICBUaGlzIGNoYW5nZSBpbiBzeW50YXggYWxzbyBtZWFucworICAgICAgICB0 aGUgb3B0aW9ucyBkaXJlY3RpdmUgbm8gbG9uZ2VyIGV4aXN0cy4KKworICAgICAgICAqIHBhZ2Uv Q29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTUFNvdXJjZUxp c3Q6OmFsbG93SW5saW5lKToKKyAgICAgICAgKFdlYkNvcmU6OkNTUFNvdXJjZUxpc3Q6OmFsbG93 RXZhbCk6CisgICAgICAgIChXZWJDb3JlOjpDU1BTb3VyY2VMaXN0OjpDU1BTb3VyY2VMaXN0KToK KyAgICAgICAgKFdlYkNvcmU6OkNTUFNvdXJjZUxpc3Q6OnBhcnNlU291cmNlKToKKyAgICAgICAg KFdlYkNvcmU6OkNTUFNvdXJjZUxpc3Q6OmFkZFNvdXJjZVVuc2FmZUlubGluZSk6CisgICAgICAg IChXZWJDb3JlOjpDU1BTb3VyY2VMaXN0OjphZGRTb3VyY2VVbnNhZmVFdmFsKToKKyAgICAgICAg KFdlYkNvcmU6OkNTUERpcmVjdGl2ZTo6YWxsb3dJbmxpbmUpOgorICAgICAgICAoV2ViQ29yZTo6 Q1NQRGlyZWN0aXZlOjphbGxvd0V2YWwpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3Vy aXR5UG9saWN5OjphbGxvd0phdmFTY3JpcHRVUkxzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRl bnRTZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVFdmVudEhhbmRsZXJzKToKKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVTY3JpcHQpOgorICAgICAg ICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0V2YWwpOgorICAgICAgICAo V2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjphZGREaXJlY3RpdmUpOgorICAgICAgICAq IHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisKIDIwMTEtMDQtMjMgIERvbWluaWMgQ29v bmV5ICA8ZG9taW5pY2NAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpbWl0 cmkgR2xhemtvdi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3Vy aXR5UG9saWN5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5 LmNwcAppbmRleCA0OTY1NTI5MmMzMDlhNTgyZTNjNmRjMjhkNjQyMTM2ZGYxYWU1NzFiLi5iYTlk ODE1MjVmN2RjMmNkYmMxNzcwZjRkZGYyYWU3OWZkNDgwYTFiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCkBAIC0xNzIsNiArMTcyLDggQEAgcHVi bGljOgogCiAgICAgdm9pZCBwYXJzZShjb25zdCBTdHJpbmcmKTsKICAgICBib29sIG1hdGNoZXMo Y29uc3QgS1VSTCYpOworICAgIGJvb2wgYWxsb3dJbmxpbmUoKSBjb25zdCB7IHJldHVybiBtX2Fs bG93SW5saW5lOyB9CisgICAgYm9vbCBhbGxvd0V2YWwoKSBjb25zdCB7IHJldHVybiBtX2FsbG93 RXZhbDsgfQogCiBwcml2YXRlOgogICAgIHZvaWQgcGFyc2UoY29uc3QgVUNoYXIqIGJlZ2luLCBj b25zdCBVQ2hhciogZW5kKTsKQEAgLTE4MiwxMyArMTg0LDE5IEBAIHByaXZhdGU6CiAgICAgYm9v bCBwYXJzZVBvcnQoY29uc3QgVUNoYXIqIGJlZ2luLCBjb25zdCBVQ2hhciogZW5kLCBpbnQmIHBv cnQsIGJvb2wmIHBvcnRIYXNXaWxkY2FyZCk7CiAKICAgICB2b2lkIGFkZFNvdXJjZVNlbGYoKTsK KyAgICB2b2lkIGFkZFNvdXJjZVVuc2FmZUlubGluZSgpOworICAgIHZvaWQgYWRkU291cmNlVW5z YWZlRXZhbCgpOwogCiAgICAgU2VjdXJpdHlPcmlnaW4qIG1fb3JpZ2luOwogICAgIFZlY3RvcjxD U1BTb3VyY2U+IG1fbGlzdDsKKyAgICBib29sIG1fYWxsb3dJbmxpbmU7CisgICAgYm9vbCBtX2Fs bG93RXZhbDsKIH07CiAKIENTUFNvdXJjZUxpc3Q6OkNTUFNvdXJjZUxpc3QoU2VjdXJpdHlPcmln aW4qIG9yaWdpbikKICAgICA6IG1fb3JpZ2luKG9yaWdpbikKKyAgICAsIG1fYWxsb3dJbmxpbmUo ZmFsc2UpCisgICAgLCBtX2FsbG93RXZhbChmYWxzZSkKIHsKIH0KIApAQCAtMjU0LDYgKzI2Miwx NiBAQCBib29sIENTUFNvdXJjZUxpc3Q6OnBhcnNlU291cmNlKGNvbnN0IFVDaGFyKiBiZWdpbiwg Y29uc3QgVUNoYXIqIGVuZCwKICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgIH0KIAorICAgIGlm IChlcXVhbElnbm9yaW5nQ2FzZSgiJ3Vuc2FmZS1pbmxpbmUnIiwgYmVnaW4sIGVuZCAtIGJlZ2lu KSkgeworICAgICAgICBhZGRTb3VyY2VVbnNhZmVJbmxpbmUoKTsKKyAgICAgICAgcmV0dXJuIGZh bHNlOworICAgIH0KKworICAgIGlmIChlcXVhbElnbm9yaW5nQ2FzZSgiJ3Vuc2FmZS1ldmFsJyIs IGJlZ2luLCBlbmQgLSBiZWdpbikpIHsKKyAgICAgICAgYWRkU291cmNlVW5zYWZlRXZhbCgpOwor ICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQorCiAgICAgY29uc3QgVUNoYXIqIHBvc2l0aW9u ID0gYmVnaW47CiAKICAgICBjb25zdCBVQ2hhciogYmVnaW5Ib3N0ID0gYmVnaW47CkBAIC00MDUs NiArNDIzLDE2IEBAIHZvaWQgQ1NQU291cmNlTGlzdDo6YWRkU291cmNlU2VsZigpCiAgICAgbV9s aXN0LmFwcGVuZChDU1BTb3VyY2UobV9vcmlnaW4tPnByb3RvY29sKCksIG1fb3JpZ2luLT5ob3N0 KCksIG1fb3JpZ2luLT5wb3J0KCksIGZhbHNlLCBmYWxzZSkpOwogfQogCit2b2lkIENTUFNvdXJj ZUxpc3Q6OmFkZFNvdXJjZVVuc2FmZUlubGluZSgpCit7CisgICAgbV9hbGxvd0lubGluZSA9IHRy dWU7Cit9CisKK3ZvaWQgQ1NQU291cmNlTGlzdDo6YWRkU291cmNlVW5zYWZlRXZhbCgpCit7Cisg ICAgbV9hbGxvd0V2YWwgPSB0cnVlOworfQorCiBjbGFzcyBDU1BEaXJlY3RpdmUgewogcHVibGlj OgogICAgIENTUERpcmVjdGl2ZShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFs dWUsIFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCkBAIC00MTksNiArNDQ3LDkgQEAgcHVibGljOgog ICAgICAgICByZXR1cm4gbV9zb3VyY2VMaXN0Lm1hdGNoZXModXJsKTsKICAgICB9CiAKKyAgICBi b29sIGFsbG93SW5saW5lKCkgY29uc3QgeyByZXR1cm4gbV9zb3VyY2VMaXN0LmFsbG93SW5saW5l KCk7IH0KKyAgICBib29sIGFsbG93RXZhbCgpIGNvbnN0IHsgcmV0dXJuIG1fc291cmNlTGlzdC5h bGxvd0V2YWwoKTsgfQorCiAgICAgY29uc3QgU3RyaW5nJiB0ZXh0KCkgeyByZXR1cm4gbV90ZXh0 OyB9CiAKIHByaXZhdGU6CkBAIC00MjYsNTUgKzQ1Nyw2IEBAIHByaXZhdGU6CiAgICAgU3RyaW5n IG1fdGV4dDsKIH07CiAKLWNsYXNzIENTUE9wdGlvbnMgewotcHVibGljOgotICAgIGV4cGxpY2l0 IENTUE9wdGlvbnMoY29uc3QgU3RyaW5nJiB2YWx1ZSkKLSAgICAgICAgOiBtX2Rpc2FibGVYU1NQ cm90ZWN0aW9uKGZhbHNlKQotICAgICAgICAsIG1fZXZhbFNjcmlwdChmYWxzZSkKLSAgICB7Ci0g ICAgICAgIHBhcnNlKHZhbHVlKTsKLSAgICB9Ci0KLSAgICBib29sIGRpc2FibGVYU1NQcm90ZWN0 aW9uKCkgY29uc3QgeyByZXR1cm4gbV9kaXNhYmxlWFNTUHJvdGVjdGlvbjsgfQotICAgIGJvb2wg ZXZhbFNjcmlwdCgpIGNvbnN0IHsgcmV0dXJuIG1fZXZhbFNjcmlwdDsgfQotCi1wcml2YXRlOgot ICAgIHZvaWQgcGFyc2UoY29uc3QgU3RyaW5nJik7Ci0KLSAgICBib29sIG1fZGlzYWJsZVhTU1By b3RlY3Rpb247Ci0gICAgYm9vbCBtX2V2YWxTY3JpcHQ7Ci19OwotCi0vLyBvcHRpb25zICAgICAg ICAgICA9ICJvcHRpb25zIiAqKCAxKldTUCBvcHRpb24tdmFsdWUgKSAqV1NQCi0vLyBvcHRpb24t dmFsdWUgICAgICA9IDEqKCBBTFBIQSAvIERJR0lUIC8gIi0iICkKLS8vCi12b2lkIENTUE9wdGlv bnM6OnBhcnNlKGNvbnN0IFN0cmluZyYgdmFsdWUpCi17Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NB TChTdHJpbmcsIGRpc2FibGVYU1NQcm90ZWN0aW9uLCAoImRpc2FibGUteHNzLXByb3RlY3Rpb24i KSk7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGV2YWxTY3JpcHQsICgiZXZhbC1z Y3JpcHQiKSk7Ci0KLSAgICBjb25zdCBVQ2hhciogcG9zaXRpb24gPSB2YWx1ZS5jaGFyYWN0ZXJz KCk7Ci0gICAgY29uc3QgVUNoYXIqIGVuZCA9IHBvc2l0aW9uICsgdmFsdWUubGVuZ3RoKCk7Ci0K LSAgICB3aGlsZSAocG9zaXRpb24gPCBlbmQpIHsKLSAgICAgICAgc2tpcFdoaWxlPGlzQVNDSUlT cGFjZT4ocG9zaXRpb24sIGVuZCk7Ci0KLSAgICAgICAgY29uc3QgVUNoYXIqIG9wdGlvbnNWYWx1 ZUJlZ2luID0gcG9zaXRpb247Ci0KLSAgICAgICAgaWYgKCFza2lwRXhhY3RseTxpc09wdGlvblZh bHVlQ2hhcmFjdGVyPihwb3NpdGlvbiwgZW5kKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAg ICAgICBza2lwV2hpbGU8aXNPcHRpb25WYWx1ZUNoYXJhY3Rlcj4ocG9zaXRpb24sIGVuZCk7Ci0K LSAgICAgICAgU3RyaW5nIG9wdGlvbnNWYWx1ZShvcHRpb25zVmFsdWVCZWdpbiwgcG9zaXRpb24g LSBvcHRpb25zVmFsdWVCZWdpbik7Ci0KLSAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKG9w dGlvbnNWYWx1ZSwgZGlzYWJsZVhTU1Byb3RlY3Rpb24pKQotICAgICAgICAgICAgbV9kaXNhYmxl WFNTUHJvdGVjdGlvbiA9IHRydWU7Ci0gICAgICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNl KG9wdGlvbnNWYWx1ZSwgZXZhbFNjcmlwdCkpCi0gICAgICAgICAgICBtX2V2YWxTY3JpcHQgPSB0 cnVlOwotICAgIH0KLX0KLQogQ29udGVudFNlY3VyaXR5UG9saWN5OjpDb250ZW50U2VjdXJpdHlQ b2xpY3koRG9jdW1lbnQqIGRvY3VtZW50KQogICAgIDogbV9oYXZlUG9saWN5KGZhbHNlKQogICAg ICwgbV9kb2N1bWVudChkb2N1bWVudCkKQEAgLTUyNiwxNCArNTA4LDkgQEAgdm9pZCBDb250ZW50 U2VjdXJpdHlQb2xpY3k6OnJlcG9ydFZpb2xhdGlvbihjb25zdCBTdHJpbmcmIGRpcmVjdGl2ZVRl eHQsIGNvbnN0IFMKICAgICAgICAgUGluZ0xvYWRlcjo6cmVwb3J0Q29udGVudFNlY3VyaXR5UG9s aWN5VmlvbGF0aW9uKGZyYW1lLCBtX3JlcG9ydFVSTHNbaV0sIHJlcG9ydCk7CiB9CiAKLWJvb2wg Q29udGVudFNlY3VyaXR5UG9saWN5Ojpwcm90ZWN0QWdhaW5zdFhTUygpIGNvbnN0Ci17Ci0gICAg cmV0dXJuIG1fc2NyaXB0U3JjICYmICghbV9vcHRpb25zIHx8ICFtX29wdGlvbnMtPmRpc2FibGVY U1NQcm90ZWN0aW9uKCkpOwotfQotCiBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWxsb3dK YXZhU2NyaXB0VVJMcygpIGNvbnN0CiB7Ci0gICAgaWYgKCFwcm90ZWN0QWdhaW5zdFhTUygpKQor ICAgIGlmICghbV9zY3JpcHRTcmMgfHwgbV9zY3JpcHRTcmMtPmFsbG93SW5saW5lKCkpCiAgICAg ICAgIHJldHVybiB0cnVlOwogCiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNvbnNv bGVNZXNzYWdlLCAoIlJlZnVzZWQgdG8gZXhlY3V0ZSBKYXZhU2NyaXB0IFVSTCBiZWNhdXNlIG9m IENvbnRlbnQtU2VjdXJpdHktUG9saWN5LlxuIikpOwpAQCAtNTQzLDcgKzUyMCw3IEBAIGJvb2wg Q29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0phdmFTY3JpcHRVUkxzKCkgY29uc3QKIAogYm9v bCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFsbG93SW5saW5lRXZlbnRIYW5kbGVycygpIGNvbnN0 CiB7Ci0gICAgaWYgKCFwcm90ZWN0QWdhaW5zdFhTUygpKQorICAgIGlmICghbV9zY3JpcHRTcmMg fHwgbV9zY3JpcHRTcmMtPmFsbG93SW5saW5lKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAg ICAgREVGSU5FX1NUQVRJQ19MT0NBTChTdHJpbmcsIGNvbnNvbGVNZXNzYWdlLCAoIlJlZnVzZWQg dG8gZXhlY3V0ZSBpbmxpbmUgZXZlbnQgaGFuZGxlciBiZWNhdXNlIG9mIENvbnRlbnQtU2VjdXJp dHktUG9saWN5LlxuIikpOwpAQCAtNTUzLDcgKzUzMCw3IEBAIGJvb2wgQ29udGVudFNlY3VyaXR5 UG9saWN5OjphbGxvd0lubGluZUV2ZW50SGFuZGxlcnMoKSBjb25zdAogCiBib29sIENvbnRlbnRT ZWN1cml0eVBvbGljeTo6YWxsb3dJbmxpbmVTY3JpcHQoKSBjb25zdAogewotICAgIGlmICghcHJv dGVjdEFnYWluc3RYU1MoKSkKKyAgICBpZiAoIW1fc2NyaXB0U3JjIHx8IG1fc2NyaXB0U3JjLT5h bGxvd0lubGluZSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIERFRklORV9TVEFUSUNf TE9DQUwoU3RyaW5nLCBjb25zb2xlTWVzc2FnZSwgKCJSZWZ1c2VkIHRvIGV4ZWN1dGUgaW5saW5l IHNjcmlwdCBiZWNhdXNlIG9mIENvbnRlbnQtU2VjdXJpdHktUG9saWN5LlxuIikpOwpAQCAtNTYz LDcgKzU0MCw3IEBAIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0lubGluZVNjcmlw dCgpIGNvbnN0CiAKIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjphbGxvd0V2YWwoKSBjb25z dAogewotICAgIGlmICghbV9zY3JpcHRTcmMgfHwgKG1fb3B0aW9ucyAmJiBtX29wdGlvbnMtPmV2 YWxTY3JpcHQoKSkpCisgICAgaWYgKCFtX3NjcmlwdFNyYyB8fCBtX3NjcmlwdFNyYy0+YWxsb3dF dmFsKCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgREVGSU5FX1NUQVRJQ19MT0NBTChT dHJpbmcsIGNvbnNvbGVNZXNzYWdlLCAoIlJlZnVzZWQgdG8gZXZhbHVhdGUgc2NyaXB0IGJlY2F1 c2Ugb2YgQ29udGVudC1TZWN1cml0eS1Qb2xpY3kuXG4iKSk7CkBAIC03MzgsNyArNzE1LDYgQEAg dm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmFkZERpcmVjdGl2ZShjb25zdCBTdHJpbmcmIG5h bWUsIGNvbnN0IFN0cmluZyYgdmFsdWUKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywg Zm9udFNyYywgKCJmb250LXNyYyIpKTsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmluZywg bWVkaWFTcmMsICgibWVkaWEtc3JjIikpOwogICAgIERFRklORV9TVEFUSUNfTE9DQUwoU3RyaW5n LCByZXBvcnRVUkksICgicmVwb3J0LXVyaSIpKTsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0 cmluZywgb3B0aW9ucywgKCJvcHRpb25zIikpOwogCiAgICAgQVNTRVJUKCFuYW1lLmlzRW1wdHko KSk7CiAKQEAgLTc1OCw4ICs3MzQsNiBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6YWRk RGlyZWN0aXZlKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZQogICAgICAg ICBtX21lZGlhU3JjID0gY3JlYXRlQ1NQRGlyZWN0aXZlKG5hbWUsIHZhbHVlKTsKICAgICBlbHNl IGlmIChtX3JlcG9ydFVSTHMuaXNFbXB0eSgpICYmIGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIHJl cG9ydFVSSSkpCiAgICAgICAgIHBhcnNlUmVwb3J0VVJJKHZhbHVlKTsKLSAgICBlbHNlIGlmICgh bV9vcHRpb25zICYmIGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIG9wdGlvbnMpKQotICAgICAgICBt X29wdGlvbnMgPSBhZG9wdFB0cihuZXcgQ1NQT3B0aW9ucyh2YWx1ZSkpOwogfQogCiB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAppbmRleCBhYzk2MzY3NGVj OTZjOWE5MDhhYjJmYzJjZWEzMDVkN2I0YjkzMDE0Li5mOTQ3ODkzM2UxZWMwYTNkM2EwYTc2YTU3 ZmVmYmNkZDk0NDFiMWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRT ZWN1cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5 UG9saWN5LmgKQEAgLTMyLDcgKzMyLDYgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3Mg Q1NQRGlyZWN0aXZlOwotY2xhc3MgQ1NQT3B0aW9uczsKIGNsYXNzIERvY3VtZW50OwogY2xhc3Mg S1VSTDsKIApAQCAtNjIsOCArNjEsNiBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0 IENvbnRlbnRTZWN1cml0eVBvbGljeShEb2N1bWVudCopOwogCi0gICAgYm9vbCBwcm90ZWN0QWdh aW5zdFhTUygpIGNvbnN0OwotCiAgICAgdm9pZCBwYXJzZShjb25zdCBTdHJpbmcmKTsKICAgICBi b29sIHBhcnNlRGlyZWN0aXZlKGNvbnN0IFVDaGFyKiBiZWdpbiwgY29uc3QgVUNoYXIqIGVuZCwg U3RyaW5nJiBuYW1lLCBTdHJpbmcmIHZhbHVlKTsKICAgICB2b2lkIHBhcnNlUmVwb3J0VVJJKGNv bnN0IFN0cmluZyYpOwpAQCAtODMsNyArODAsNiBAQCBwcml2YXRlOgogICAgIE93blB0cjxDU1BE aXJlY3RpdmU+IG1fc3R5bGVTcmM7CiAgICAgT3duUHRyPENTUERpcmVjdGl2ZT4gbV9mb250U3Jj OwogICAgIE93blB0cjxDU1BEaXJlY3RpdmU+IG1fbWVkaWFTcmM7Ci0gICAgT3duUHRyPENTUE9w dGlvbnM+IG1fb3B0aW9uczsKIAogICAgIFZlY3RvcjxLVVJMPiBtX3JlcG9ydFVSTHM7CiB9Owo=