111254 2013-03-02 10:41:47 -0800 CSP 1.1: Support CSP 1.1 directives on the unprefixed header. 2013-03-03 03:08:25 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 85558 1 mkwst mkwst abarth dglazkov esprehn+autocc fishd jamesr japhet mkwst+watchlist ojan.autocc tkent+wkapi webkit.review.bot oldest_to_newest 845833 0 mkwst 2013-03-02 10:41:47 -0800 Rather than locking CSP 1.1 behind a vendor prefix, we should support it on the unprefixed header iff the runtime flag is set. This will have no effect on ports that currently disable the CSP_NEXT flag, and the 'X-WebKit-CSP' headers will continue to function just as they did before on all ports. The goal is simply to not accidentally lock early-adopters users into using a prefixed header for the 1.1 features they'd like to experiment with. 845836 1 191113 mkwst 2013-03-02 11:08:13 -0800 Created attachment 191113 Patch 845837 2 webkit.review.bot 2013-03-02 11:10:55 -0800 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 845993 3 191113 webkit.review.bot 2013-03-03 03:08:20 -0800 Comment on attachment 191113 Patch Clearing flags on attachment: 191113 Committed r144571: <http://trac.webkit.org/changeset/144571> 845994 4 webkit.review.bot 2013-03-03 03:08:25 -0800 All reviewed patches have been landed. Closing bug. 191113 2013-03-02 11:08:13 -0800 2013-03-03 03:08:18 -0800 Patch bug-111254-20130302200417.patch text/plain 14323 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0NTQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDE4NTA0MTE5ODI1ZjA3 YWQxYWQ2YmIxNDU1ZDQ1ZGJjMjAzYjE5ZS4uYmMwYmZkODVjNGUwYmJlYjdjMmRkOGY1YTVlYmI3 YTc3NGIxNDVjMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDEzLTAzLTAyICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQ1NQIDEuMTogU3VwcG9ydCBD U1AgMS4xIGRpcmVjdGl2ZXMgb24gdGhlIHVucHJlZml4ZWQgaGVhZGVyLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMjU0CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UnZCBsaWtlIHRvIGVuc3VyZSB0 aGF0IGVhcmx5IGFkb3B0ZXJzIGRvbid0IGdldCBzdHVjayBvbiBhIHByZWZpeGVkCisgICAgICAg IGhlYWRlcjsgd2hlbiBDU1AgMS4xIGlzIGJha2VkIGVub3VnaCB0byBiZSBzdXBwb3J0ZWQgaW4g bXVsdGlwbGUKKyAgICAgICAgYnJvd3NlcnMsIGV2ZXJ5dGhpbmcgc2hvdWxkIEp1c3QgV29ya+KE oi4KKworICAgICAgICBUaGlzIHBhdGNoIGNoYW5nZXMgV2ViS2l0J3MgYmVoYXZpb3IgcmVnYXJk aW5nIENTUF9ORVhUIGZlYXR1cmVzLgorICAgICAgICBDdXJyZW50bHksIHRoZXkncmUgb25seSBl eHBvc2VkIG9uIHRoZSBwcmVmaXhlZCBoZWFkZXIgKCdYLVdlYktpdC1DU1AnKS4KKyAgICAgICAg VGhpcyBwYXRjaCBleHBvc2VzIHRob3NlIGZlYXR1cmVzIG9uIHRoZSBjYW5vbmljYWwgaGVhZGVy LCBhc3N1bWluZworICAgICAgICB0aGF0IHRoZSBydW50aW1lIGZsYWcgaXMgc2V0LiBUaGlzIHNo b3VsZG4ndCBoYXZlIGFueSBlZmZlY3QgYXQgYWxsIG9uCisgICAgICAgIHBvcnRzIHRoYXQgaGF2 ZW4ndCB5ZXQgZW5hYmxlZCBDU1BfTkVYVCwgYW5kIHdpbGwgc2ltcGx5IGNsZWFyIHRoZSB3YXkK KyAgICAgICAgZm9yIGEgY2xlYW4gZGVwbG95bWVudCB0byBhIHdpZGVyIGF1ZGllbmNlIG9uY2Ug dGhlIHNwZWNpZmljYXRpb24KKyAgICAgICAgcHJvY2VzcyBpcyBmdXJ0aGVyIGFsb25nLgorCisg ICAgICAgIFRoaXMgY2hhbmdlIHNob3VsZG4ndCBoYXZlIGFueSBlZmZlY3Qgb24gdGhlIGV4aXN0 aW5nIHRlc3RzOiB0aGV5CisgICAgICAgIHNob3VsZCBydW4ganVzdCBhcyB0aGV5IGRpZCBiZWZv cmUuIFRoZSBuZXh0IHN0ZXAgd2lsbCBiZSB0byBhZGp1c3QKKyAgICAgICAgdGhlIExheW91dFRl c3RzIGZvciAxLjEgdG8gcHJlZmVyIHRoZSBjYW5vbmljYWwgaGVhZGVyLCBidXQgSSdsbCBkbwor ICAgICAgICB0aGF0IGluIGFub3RoZXIgcGF0Y2ggdG8gcmVkdWNlIGNodXJuLgorCisgICAgICAg IFJlbGF0ZWQsIHRoZSBlbnVtIG5hbWVzIG5vIGxvbmdlciBtYWRlIHNlbnNlOiB0aGUgZGlmZmVy ZW5jZSBiZXR3ZWVuIHRoZQorICAgICAgICBjYW5vbmljYWwgJ0NvbnRlbnQtU2VjdXJpdHktUG9s aWN5JyBoZWFkZXIgYW5kICdYLVdlYktpdC1DU1AnIGlzIHRoZQorICAgICAgICBwcmVmaXgsIG5v dCB0aGUgZnVuY3Rpb25hbGl0eS4gVGhpcyBwYXRjaCByZW5hbWVzIHRoZW0gZm9yIGNsYXJpdHku CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1l bnQ6OnByb2Nlc3NIdHRwRXF1aXYpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVudCk6CisgICAg ICAgICAgICBVc2UgdGhlIG5ldyBlbnVtIG5hbWVzLgorICAgICAgICAqIHBhZ2UvQ29udGVudFNl Y3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKENTUERpcmVjdGl2ZUxpc3QpOgorICAgICAgICAo V2ViQ29yZTo6Q1NQRGlyZWN0aXZlTGlzdDo6Q1NQRGlyZWN0aXZlTGlzdCk6CisgICAgICAgIChX ZWJDb3JlOjpDU1BEaXJlY3RpdmVMaXN0OjphZGREaXJlY3RpdmUpOgorICAgICAgICAgICAgRHJv cCB0aGUgJ21fZXhwZXJpbWVudGFsJyBwcm9wZXJ0eSBmcm9tIENTUERpcmVjdGl2ZUxpc3Q7IHdl J2xsCisgICAgICAgICAgICBjb250cm9sIHRoZSBiZWhhdmlvciB2aWEgdGhlIHJ1bnRpbWUgZmxh ZyBmcm9tIG5vdyBvbi4KKworICAgICAgICAgICAgQWxzbywgdGhpcyBmaXhlcyBhIHNtYWxsIGJ1 ZyBpbiAnYWRkRGlyZWN0aXZlKCknOiB3ZSBuZXZlciB0aHJldworICAgICAgICAgICAgdW5yZWNv Z25pemVkIGRpcmVjdGl2ZSBlcnJvcnMgZm9yIHVzZXJzIHdobyB3ZXJlIHNlbmRpbmcgdGhlCisg ICAgICAgICAgICBwcmVmaXhlZCBoZWFkZXIuIE9vcHMhCisgICAgICAgIChXZWJDb3JlOjpDb250 ZW50U2VjdXJpdHlQb2xpY3k6OmRlcHJlY2F0ZWRIZWFkZXJUeXBlKToKKyAgICAgICAgICAgIFVz ZSB0aGUgbmV3IGVudW0gbmFtZXMuCisgICAgICAgICogcGFnZS9Db250ZW50U2VjdXJpdHlQb2xp Y3kuaDoKKyAgICAgICAgICAgIFJlZGVmaW5lIHRoZSBlbnVtIGZvciBjbGFyaXR5OiAnUHJlZml4 ZWRSZXBvcnQnIGFuZCAnUmVwb3J0JworICAgICAgICAgICAgcmF0aGVyIHRoYW4gJ1JlcG9ydEFs bERpcmVjdGl2ZXMnIGFuZCAnUmVwb3J0U3RhYmxlRGlyZWN0aXZlcycuCisKIDIwMTMtMDMtMDIg IFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgRml4IGEgdHlwbyBp biBteSBwcmV2aW91cyBjb21taXQgKHIxNDQ1MzQpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpp bmRleCA3ZWExYTA0ZmIwMzdmYjIwZjdkY2MxNjFiYTU4NjUyYmM1NjZkZjYxLi42MTNjZGRjYjFj MmRlY2I1ZGQyYzIwMTdkYmI2ZTQxNjUyOTM1OTlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAzLTAyICBNaWtlIFdlc3QgIDxta3dzdEBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgQ1NQIDEuMTogU3VwcG9ydCBDU1AgMS4xIGRpcmVjdGl2ZXMgb24g dGhlIHVucHJlZml4ZWQgaGVhZGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTExMjU0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGhlIGVudW0gbmFtZXMgbm8gbG9uZ2VyIG1hZGUgc2Vuc2U6IHRoZSBk aWZmZXJlbmNlIGJldHdlZW4gdGhlCisgICAgICAgIGNhbm9uaWNhbCAnQ29udGVudC1TZWN1cml0 eS1Qb2xpY3knIGhlYWRlciBhbmQgJ1gtV2ViS2l0LUNTUCcgaXMgdGhlCisgICAgICAgIHByZWZp eCwgbm90IHRoZSBmdW5jdGlvbmFsaXR5LiBUaGlzIHBhdGNoIHJlbmFtZXMgdGhlbSBmb3IgY2xh cml0eS4KKworICAgICAgICAqIHB1YmxpYy9XZWJDb250ZW50U2VjdXJpdHlQb2xpY3kuaDoKKyAg ICAgICAgKiBzcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHA6CisgICAgICAgICAgICBSZW5hbWUg dGhlIENocm9taXVtIHNpZGUgb2YgdGhlIGVudW1zLgorCiAyMDEzLTAyLTI4ICBBbGV4ZXkgUHJv c2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAgIFJlZHVjZSBhbW91bnQgb2YgcmVi dWlsZGluZyB3aGVuIHRvdWNoaW5nIG5ldHdvcmtpbmcgaGVhZGVycwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVu dC5jcHAKaW5kZXggMjgzNWJkMDFlNzc1NTI0YTJiZGNhMmI4Mjc1ZjIyZTEyZTA4MjYwZS4uYWNk ZWJiMWEyZmM1MThiNDgwYjIxNTU0ZjViMTIwMTc3MzI4NTEzZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCkBAIC0yOTAwLDEzICsyOTAwLDEzIEBAIHZvaWQgRG9jdW1lbnQ6OnByb2Nlc3NIdHRw RXF1aXYoY29uc3QgU3RyaW5nJiBlcXVpdiwgY29uc3QgU3RyaW5nJiBjb250ZW50KQogICAgICAg ICAgICAgfQogICAgICAgICB9CiAgICAgfSBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShlcXVp diwgImNvbnRlbnQtc2VjdXJpdHktcG9saWN5IikpCi0gICAgICAgIGNvbnRlbnRTZWN1cml0eVBv bGljeSgpLT5kaWRSZWNlaXZlSGVhZGVyKGNvbnRlbnQsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6 RW5mb3JjZVN0YWJsZURpcmVjdGl2ZXMpOworICAgICAgICBjb250ZW50U2VjdXJpdHlQb2xpY3ko KS0+ZGlkUmVjZWl2ZUhlYWRlcihjb250ZW50LCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OkVuZm9y Y2UpOwogICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGVxdWl2LCAiY29udGVudC1zZWN1 cml0eS1wb2xpY3ktcmVwb3J0LW9ubHkiKSkKLSAgICAgICAgY29udGVudFNlY3VyaXR5UG9saWN5 KCktPmRpZFJlY2VpdmVIZWFkZXIoY29udGVudCwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBv cnRTdGFibGVEaXJlY3RpdmVzKTsKKyAgICAgICAgY29udGVudFNlY3VyaXR5UG9saWN5KCktPmRp ZFJlY2VpdmVIZWFkZXIoY29udGVudCwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBvcnQpOwog ICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGVxdWl2LCAieC13ZWJraXQtY3NwIikpCi0g ICAgICAgIGNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVyKGNvbnRlbnQs IENvbnRlbnRTZWN1cml0eVBvbGljeTo6RW5mb3JjZUFsbERpcmVjdGl2ZXMpOworICAgICAgICBj b250ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcihjb250ZW50LCBDb250ZW50 U2VjdXJpdHlQb2xpY3k6OlByZWZpeGVkRW5mb3JjZSk7CiAgICAgZWxzZSBpZiAoZXF1YWxJZ25v cmluZ0Nhc2UoZXF1aXYsICJ4LXdlYmtpdC1jc3AtcmVwb3J0LW9ubHkiKSkKLSAgICAgICAgY29u dGVudFNlY3VyaXR5UG9saWN5KCktPmRpZFJlY2VpdmVIZWFkZXIoY29udGVudCwgQ29udGVudFNl Y3VyaXR5UG9saWN5OjpSZXBvcnRBbGxEaXJlY3RpdmVzKTsKKyAgICAgICAgY29udGVudFNlY3Vy aXR5UG9saWN5KCktPmRpZFJlY2VpdmVIZWFkZXIoY29udGVudCwgQ29udGVudFNlY3VyaXR5UG9s aWN5OjpQcmVmaXhlZFJlcG9ydCk7CiB9CiAKIC8vIFRob3VnaCBpc3NwYWNlKCkgY29uc2lkZXJz IFx0IGFuZCBcdiB0byBiZSB3aGl0ZXNwYWNlLCBXaW4gSUUgZG9lc24ndC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s b2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDFlNTgyOTRjOGJmOTBiMTI2OWJkYjliOGQ3ZDcx ZTk4M2U2NGZjZmIuLmQ5OWZiNjE3ZmQ2ZjIzZDgzZjg2N2VjNzNlMWUxNzZjNDJmYzRiZjMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtNjU4LDE5ICs2NTgsMTkgQEAg dm9pZCBGcmFtZUxvYWRlcjo6ZGlkQmVnaW5Eb2N1bWVudChib29sIGRpc3BhdGNoKQogCiAgICAg ICAgIFN0cmluZyBwb2xpY3lWYWx1ZSA9IG1fZG9jdW1lbnRMb2FkZXItPnJlc3BvbnNlKCkuaHR0 cEhlYWRlckZpZWxkKCJDb250ZW50LVNlY3VyaXR5LVBvbGljeSIpOwogICAgICAgICBpZiAoIXBv bGljeVZhbHVlLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPmNv bnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVyKHBvbGljeVZhbHVlLCBDb250 ZW50U2VjdXJpdHlQb2xpY3k6OkVuZm9yY2VTdGFibGVEaXJlY3RpdmVzKTsKKyAgICAgICAgICAg IG1fZnJhbWUtPmRvY3VtZW50KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZl SGVhZGVyKHBvbGljeVZhbHVlLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OkVuZm9yY2UpOwogCiAg ICAgICAgIHBvbGljeVZhbHVlID0gbV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5odHRwSGVh ZGVyRmllbGQoIkNvbnRlbnQtU2VjdXJpdHktUG9saWN5LVJlcG9ydC1Pbmx5Iik7CiAgICAgICAg IGlmICghcG9saWN5VmFsdWUuaXNFbXB0eSgpKQotICAgICAgICAgICAgbV9mcmFtZS0+ZG9jdW1l bnQoKS0+Y29udGVudFNlY3VyaXR5UG9saWN5KCktPmRpZFJlY2VpdmVIZWFkZXIocG9saWN5VmFs dWUsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0U3RhYmxlRGlyZWN0aXZlcyk7CisgICAg ICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlk UmVjZWl2ZUhlYWRlcihwb2xpY3lWYWx1ZSwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpSZXBvcnQp OwogCiAgICAgICAgIHBvbGljeVZhbHVlID0gbV9kb2N1bWVudExvYWRlci0+cmVzcG9uc2UoKS5o dHRwSGVhZGVyRmllbGQoIlgtV2ViS2l0LUNTUCIpOwogICAgICAgICBpZiAoIXBvbGljeVZhbHVl LmlzRW1wdHkoKSkKLSAgICAgICAgICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPmNvbnRlbnRTZWN1 cml0eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVyKHBvbGljeVZhbHVlLCBDb250ZW50U2VjdXJp dHlQb2xpY3k6OkVuZm9yY2VBbGxEaXJlY3RpdmVzKTsKKyAgICAgICAgICAgIG1fZnJhbWUtPmRv Y3VtZW50KCktPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVyKHBvbGlj eVZhbHVlLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlByZWZpeGVkRW5mb3JjZSk7CiAKICAgICAg ICAgcG9saWN5VmFsdWUgPSBtX2RvY3VtZW50TG9hZGVyLT5yZXNwb25zZSgpLmh0dHBIZWFkZXJG aWVsZCgiWC1XZWJLaXQtQ1NQLVJlcG9ydC1Pbmx5Iik7CiAgICAgICAgIGlmICghcG9saWN5VmFs dWUuaXNFbXB0eSgpKQotICAgICAgICAgICAgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+Y29udGVudFNl Y3VyaXR5UG9saWN5KCktPmRpZFJlY2VpdmVIZWFkZXIocG9saWN5VmFsdWUsIENvbnRlbnRTZWN1 cml0eVBvbGljeTo6UmVwb3J0QWxsRGlyZWN0aXZlcyk7CisgICAgICAgICAgICBtX2ZyYW1lLT5k b2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRlcihwb2xp Y3lWYWx1ZSwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpQcmVmaXhlZFJlcG9ydCk7CiAKICAgICAg ICAgU3RyaW5nIGhlYWRlckNvbnRlbnRMYW5ndWFnZSA9IG1fZG9jdW1lbnRMb2FkZXItPnJlc3Bv bnNlKCkuaHR0cEhlYWRlckZpZWxkKCJDb250ZW50LUxhbmd1YWdlIik7CiAgICAgICAgIGlmICgh aGVhZGVyQ29udGVudExhbmd1YWdlLmlzRW1wdHkoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IGM0N2ZjNmM4MWQzNDc1M2NhZjRjNTZk NTRlMmI5MGE4YThjYjg1N2EuLjU2ZWY2ZWIxMzc4ZmYzNTZiOWZhNTE0OTFhNzNlZjA1MmI0ZWZk NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAK QEAgLTE0OCwxMyArMTQ4LDEzIEBAIGJvb2wgaXNEaXJlY3RpdmVOYW1lKGNvbnN0IFN0cmluZyYg bmFtZSkKIEZlYXR1cmVPYnNlcnZlcjo6RmVhdHVyZSBnZXRGZWF0dXJlT2JzZXJ2ZXJUeXBlKENv bnRlbnRTZWN1cml0eVBvbGljeTo6SGVhZGVyVHlwZSB0eXBlKQogewogICAgIHN3aXRjaCAodHlw ZSkgewotICAgIGNhc2UgQ29udGVudFNlY3VyaXR5UG9saWN5OjpFbmZvcmNlQWxsRGlyZWN0aXZl czoKKyAgICBjYXNlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UHJlZml4ZWRFbmZvcmNlOgogICAg ICAgICByZXR1cm4gRmVhdHVyZU9ic2VydmVyOjpQcmVmaXhlZENvbnRlbnRTZWN1cml0eVBvbGlj eTsKLSAgICBjYXNlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6RW5mb3JjZVN0YWJsZURpcmVjdGl2 ZXM6CisgICAgY2FzZSBDb250ZW50U2VjdXJpdHlQb2xpY3k6OkVuZm9yY2U6CiAgICAgICAgIHJl dHVybiBGZWF0dXJlT2JzZXJ2ZXI6OkNvbnRlbnRTZWN1cml0eVBvbGljeTsKLSAgICBjYXNlIENv bnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0QWxsRGlyZWN0aXZlczoKKyAgICBjYXNlIENvbnRl bnRTZWN1cml0eVBvbGljeTo6UHJlZml4ZWRSZXBvcnQ6CiAgICAgICAgIHJldHVybiBGZWF0dXJl T2JzZXJ2ZXI6OlByZWZpeGVkQ29udGVudFNlY3VyaXR5UG9saWN5UmVwb3J0T25seTsKLSAgICBj YXNlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0U3RhYmxlRGlyZWN0aXZlczoKKyAgICBj YXNlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0OgogICAgICAgICByZXR1cm4gRmVhdHVy ZU9ic2VydmVyOjpDb250ZW50U2VjdXJpdHlQb2xpY3lSZXBvcnRPbmx5OwogICAgIH0KICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKQEAgLTg4NCw3ICs4ODQsNiBAQCBwcml2YXRlOgogICAgIFN0 cmluZyBtX2hlYWRlcjsKICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3k6OkhlYWRlclR5cGUgbV9o ZWFkZXJUeXBlOwogCi0gICAgYm9vbCBtX2V4cGVyaW1lbnRhbDsKICAgICBib29sIG1fcmVwb3J0 T25seTsKICAgICBib29sIG1faGF2ZVNhbmRib3hQb2xpY3k7CiAgICAgQ29udGVudFNlY3VyaXR5 UG9saWN5OjpSZWZsZWN0ZWRYU1NEaXNwb3NpdGlvbiBtX3JlZmxlY3RlZFhTU0Rpc3Bvc2l0aW9u OwpAQCAtOTEwLDEzICs5MDksMTEgQEAgcHJpdmF0ZToKIENTUERpcmVjdGl2ZUxpc3Q6OkNTUERp cmVjdGl2ZUxpc3QoQ29udGVudFNlY3VyaXR5UG9saWN5KiBwb2xpY3ksIENvbnRlbnRTZWN1cml0 eVBvbGljeTo6SGVhZGVyVHlwZSB0eXBlKQogICAgIDogbV9wb2xpY3kocG9saWN5KQogICAgICwg bV9oZWFkZXJUeXBlKHR5cGUpCi0gICAgLCBtX2V4cGVyaW1lbnRhbChmYWxzZSkKICAgICAsIG1f cmVwb3J0T25seShmYWxzZSkKICAgICAsIG1faGF2ZVNhbmRib3hQb2xpY3koZmFsc2UpCiAgICAg LCBtX3JlZmxlY3RlZFhTU0Rpc3Bvc2l0aW9uKENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVmbGVj dGVkWFNTVW5zZXQpCiB7Ci0gICAgbV9yZXBvcnRPbmx5ID0gKHR5cGUgPT0gQ29udGVudFNlY3Vy aXR5UG9saWN5OjpSZXBvcnRTdGFibGVEaXJlY3RpdmVzIHx8IHR5cGUgPT0gQ29udGVudFNlY3Vy aXR5UG9saWN5OjpSZXBvcnRBbGxEaXJlY3RpdmVzKTsKLSAgICBtX2V4cGVyaW1lbnRhbCA9ICh0 eXBlID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0QWxsRGlyZWN0aXZlcyB8fCB0eXBl ID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6RW5mb3JjZUFsbERpcmVjdGl2ZXMpOworICAgIG1f cmVwb3J0T25seSA9ICh0eXBlID09IENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0IHx8IHR5 cGUgPT0gQ29udGVudFNlY3VyaXR5UG9saWN5OjpQcmVmaXhlZFJlcG9ydCk7CiB9CiAKIFBhc3NP d25QdHI8Q1NQRGlyZWN0aXZlTGlzdD4gQ1NQRGlyZWN0aXZlTGlzdDo6Y3JlYXRlKENvbnRlbnRT ZWN1cml0eVBvbGljeSogcG9saWN5LCBjb25zdCBTdHJpbmcmIGhlYWRlciwgQ29udGVudFNlY3Vy aXR5UG9saWN5OjpIZWFkZXJUeXBlIHR5cGUpCkBAIC0xMzkzLDcgKzEzOTAsNyBAQCB2b2lkIENT UERpcmVjdGl2ZUxpc3Q6OmFkZERpcmVjdGl2ZShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0 cmluZyYgdmFsdWUpCiAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgcmVwb3J0 VVJJKSkKICAgICAgICAgcGFyc2VSZXBvcnRVUkkobmFtZSwgdmFsdWUpOwogI2lmIEVOQUJMRShD U1BfTkVYVCkKLSAgICBlbHNlIGlmIChtX2V4cGVyaW1lbnRhbCAmJiBtX3BvbGljeS0+ZXhwZXJp bWVudGFsRmVhdHVyZXNFbmFibGVkKCkpIHsKKyAgICBlbHNlIGlmIChtX3BvbGljeS0+ZXhwZXJp bWVudGFsRmVhdHVyZXNFbmFibGVkKCkpIHsKICAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNl KG5hbWUsIGZvcm1BY3Rpb24pKQogICAgICAgICAgICAgc2V0Q1NQRGlyZWN0aXZlPFNvdXJjZUxp c3REaXJlY3RpdmU+KG5hbWUsIHZhbHVlLCBtX2Zvcm1BY3Rpb24pOwogICAgICAgICBlbHNlIGlm IChlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCBwbHVnaW5UeXBlcykpCkBAIC0xNDAyLDYgKzEzOTks OCBAQCB2b2lkIENTUERpcmVjdGl2ZUxpc3Q6OmFkZERpcmVjdGl2ZShjb25zdCBTdHJpbmcmIG5h bWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiAgICAgICAgICAgICBzZXRDU1BEaXJlY3RpdmU8Tm9u Y2VEaXJlY3RpdmU+KG5hbWUsIHZhbHVlLCBtX3NjcmlwdE5vbmNlKTsKICAgICAgICAgZWxzZSBp ZiAoZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgcmVmbGVjdGVkWFNTKSkKICAgICAgICAgICAgIHBh cnNlUmVmbGVjdGVkWFNTKG5hbWUsIHZhbHVlKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAg bV9wb2xpY3ktPnJlcG9ydFVuc3VwcG9ydGVkRGlyZWN0aXZlKG5hbWUpOwogICAgIH0KICNlbmRp ZgogICAgIGVsc2UKQEAgLTE0NjgsNyArMTQ2Nyw3IEBAIGNvbnN0IFN0cmluZyYgQ29udGVudFNl Y3VyaXR5UG9saWN5OjpkZXByZWNhdGVkSGVhZGVyKCkgY29uc3QKIAogQ29udGVudFNlY3VyaXR5 UG9saWN5OjpIZWFkZXJUeXBlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6ZGVwcmVjYXRlZEhlYWRl clR5cGUoKSBjb25zdAogewotICAgIHJldHVybiBtX3BvbGljaWVzLmlzRW1wdHkoKSA/IEVuZm9y Y2VTdGFibGVEaXJlY3RpdmVzIDogbV9wb2xpY2llc1swXS0+aGVhZGVyVHlwZSgpOworICAgIHJl dHVybiBtX3BvbGljaWVzLmlzRW1wdHkoKSA/IEVuZm9yY2UgOiBtX3BvbGljaWVzWzBdLT5oZWFk ZXJUeXBlKCk7CiB9CiAKIHRlbXBsYXRlPGJvb2wgKENTUERpcmVjdGl2ZUxpc3Q6OiphbGxvd2Vk KShDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJlcG9ydGluZ1N0YXR1cykgY29uc3Q+CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oIGIvU291cmNl L1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAppbmRleCBlNzZjOTZlYjFmNjMz YzZlZDA4OTFjZWEyMGI2Yzk2ZmJkYzBmNGNkLi5iZmUyODBiYmRlNTE0ODgzOTBjMGMyNGVlYTgx Y2FlZTVlMjMwNjM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9s aWN5LmgKQEAgLTYwLDEwICs2MCwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBjb3B5U3RhdGVGcm9t KGNvbnN0IENvbnRlbnRTZWN1cml0eVBvbGljeSopOwogCiAgICAgZW51bSBIZWFkZXJUeXBlIHsK LSAgICAgICAgUmVwb3J0U3RhYmxlRGlyZWN0aXZlcywKLSAgICAgICAgRW5mb3JjZVN0YWJsZURp cmVjdGl2ZXMsCi0gICAgICAgIFJlcG9ydEFsbERpcmVjdGl2ZXMsCi0gICAgICAgIEVuZm9yY2VB bGxEaXJlY3RpdmVzCisgICAgICAgIFJlcG9ydCwKKyAgICAgICAgRW5mb3JjZSwKKyAgICAgICAg UHJlZml4ZWRSZXBvcnQsCisgICAgICAgIFByZWZpeGVkRW5mb3JjZQogICAgIH07CiAKICAgICBl bnVtIFJlcG9ydGluZ1N0YXR1cyB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3B1YmxpYy9XZWJDb250ZW50U2VjdXJpdHlQb2xpY3kuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vcHVibGljL1dlYkNvbnRlbnRTZWN1cml0eVBvbGljeS5oCmluZGV4IGYxNzhkMWFlOWYyNDA1 MzZlM2JjZDc3YjIxMjRmMWI5YzZmOGI2ZWUuLmFkMWQyOTc0ZjIyMzBkNDdmODIyYmRiM2YxN2Yz MDZkNGMxOWYyOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dl YkNvbnRlbnRTZWN1cml0eVBvbGljeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVi bGljL1dlYkNvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC0zNCwxMCArMzQsMTAgQEAKIG5hbWVz cGFjZSBXZWJLaXQgewogCiBlbnVtIFdlYkNvbnRlbnRTZWN1cml0eVBvbGljeVR5cGUgewotICAg IFdlYkNvbnRlbnRTZWN1cml0eVBvbGljeVR5cGVSZXBvcnRTdGFibGVEaXJlY3RpdmVzLAotICAg IFdlYkNvbnRlbnRTZWN1cml0eVBvbGljeVR5cGVFbmZvcmNlU3RhYmxlRGlyZWN0aXZlcywKLSAg ICBXZWJDb250ZW50U2VjdXJpdHlQb2xpY3lUeXBlUmVwb3J0QWxsRGlyZWN0aXZlcywKLSAgICBX ZWJDb250ZW50U2VjdXJpdHlQb2xpY3lUeXBlRW5mb3JjZUFsbERpcmVjdGl2ZXMsCisgICAgV2Vi Q29udGVudFNlY3VyaXR5UG9saWN5VHlwZVJlcG9ydCwKKyAgICBXZWJDb250ZW50U2VjdXJpdHlQ b2xpY3lUeXBlRW5mb3JjZSwKKyAgICBXZWJDb250ZW50U2VjdXJpdHlQb2xpY3lUeXBlUHJlZml4 ZWRSZXBvcnQsCisgICAgV2ViQ29udGVudFNlY3VyaXR5UG9saWN5VHlwZVByZWZpeGVkRW5mb3Jj ZSwKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9zcmMvQXNzZXJ0TWF0Y2hpbmdFbnVtcy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL3NyYy9Bc3NlcnRNYXRjaGluZ0VudW1zLmNwcAppbmRleCA4ZjQyYzZmZTdmNzVjMjMz ODdhNjQwYjU0MzQ5MWVhZmMzNDllNzI0Li4zYjAzNzk5MzcxZDEwOTQyMzc2ZjY4NDM0NDMxOTQ5 ODg5ZmYxZmU2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRN YXRjaGluZ0VudW1zLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NlcnRN YXRjaGluZ0VudW1zLmNwcApAQCAtNjEyLDEwICs2MTIsMTAgQEAgQ09NUElMRV9BU1NFUlRfTUFU Q0hJTkdfRU5VTShXZWJSZWZlcnJlclBvbGljeURlZmF1bHQsIFJlZmVycmVyUG9saWN5RGVmYXVs dCk7CiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYlJlZmVycmVyUG9saWN5TmV2ZXIs IFJlZmVycmVyUG9saWN5TmV2ZXIpOwogQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJS ZWZlcnJlclBvbGljeU9yaWdpbiwgUmVmZXJyZXJQb2xpY3lPcmlnaW4pOwogCi1DT01QSUxFX0FT U0VSVF9NQVRDSElOR19FTlVNKFdlYkNvbnRlbnRTZWN1cml0eVBvbGljeVR5cGVSZXBvcnRTdGFi bGVEaXJlY3RpdmVzLCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlJlcG9ydFN0YWJsZURpcmVjdGl2 ZXMpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJDb250ZW50U2VjdXJpdHlQb2xp Y3lUeXBlRW5mb3JjZVN0YWJsZURpcmVjdGl2ZXMsIENvbnRlbnRTZWN1cml0eVBvbGljeTo6RW5m b3JjZVN0YWJsZURpcmVjdGl2ZXMpOwotQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5VTShXZWJD b250ZW50U2VjdXJpdHlQb2xpY3lUeXBlUmVwb3J0QWxsRGlyZWN0aXZlcywgQ29udGVudFNlY3Vy aXR5UG9saWN5OjpSZXBvcnRBbGxEaXJlY3RpdmVzKTsKLUNPTVBJTEVfQVNTRVJUX01BVENISU5H X0VOVU0oV2ViQ29udGVudFNlY3VyaXR5UG9saWN5VHlwZUVuZm9yY2VBbGxEaXJlY3RpdmVzLCBD b250ZW50U2VjdXJpdHlQb2xpY3k6OkVuZm9yY2VBbGxEaXJlY3RpdmVzKTsKK0NPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViQ29udGVudFNlY3VyaXR5UG9saWN5VHlwZVJlcG9ydCwgQ29u dGVudFNlY3VyaXR5UG9saWN5OjpSZXBvcnQpOworQ09NUElMRV9BU1NFUlRfTUFUQ0hJTkdfRU5V TShXZWJDb250ZW50U2VjdXJpdHlQb2xpY3lUeXBlRW5mb3JjZSwgQ29udGVudFNlY3VyaXR5UG9s aWN5OjpFbmZvcmNlKTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQ29udGVudFNl Y3VyaXR5UG9saWN5VHlwZVByZWZpeGVkUmVwb3J0LCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OlBy ZWZpeGVkUmVwb3J0KTsKK0NPTVBJTEVfQVNTRVJUX01BVENISU5HX0VOVU0oV2ViQ29udGVudFNl Y3VyaXR5UG9saWN5VHlwZVByZWZpeGVkRW5mb3JjZSwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpQ cmVmaXhlZEVuZm9yY2UpOwogCiBDT01QSUxFX0FTU0VSVF9NQVRDSElOR19FTlVNKFdlYlVSTFJl c3BvbnNlOjpVbmtub3duLCBSZXNvdXJjZVJlc3BvbnNlOjpVbmtub3duKTsKIENPTVBJTEVfQVNT RVJUX01BVENISU5HX0VOVU0oV2ViVVJMUmVzcG9uc2U6OkhUVFBfMF85LCBSZXNvdXJjZVJlc3Bv bnNlOjpIVFRQXzBfOSk7Cg==