100974 2012-11-01 11:31:35 -0700 Measure the usage of the various CSP headers. 2012-11-02 11:55:14 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mkwst mkwst abarth dglazkov peter+ews webkit.review.bot oldest_to_newest 756480 0 mkwst 2012-11-01 11:31:35 -0700 We're currently using measuring usage of the prefixed CSP header via FeatureObserver (which ends up in the 'WebCore.FeatureObserver' histogram). We've now added support for the unprefixed header, and it would be nice to measure that as well so that we can (at some point in the far future) drop support for the prefixed version. It would also be potentially helpful to measure the uptake of report-only headers vs. blocking headers, as that could help guide some of the discussion for 1.1. Rather than add three new items to the FeatureObserver enum, it might be more clear to move the measurements to a new histogram: "WebCore.ContentSecurityPolicy". WDYT, Adam? 756486 1 abarth 2012-11-01 11:35:47 -0700 One of the nice things about FeatureObserver is that it is normalized across all features (and a benchmark "feature"). Using a separate histogram loses that benefit. It's unlikely that we'll be able to drop X-WebKit-CSP until CSP 1.1 is done, so this might be a bit premature. 756498 2 mkwst 2012-11-01 11:43:20 -0700 (In reply to comment #1) > One of the nice things about FeatureObserver is that it is normalized across all features (and a benchmark "feature"). Using a separate histogram loses that benefit. That's both a benefit and a drawback. I have the feeling that I'm cluttering an already diverse data set by adding another few items to the enum. That said, I'm happy to add it there if it's the right place. That's why I'm asking. :) > It's unlikely that we'll be able to drop X-WebKit-CSP until CSP 1.1 is done, so this might be a bit premature. Quite true; dropping the prefixed header entirely is a long-term goal. Still, starting to measure relative uptake now gives us a baseline for later. It seems worthwhile. 756500 3 mkwst 2012-11-01 11:44:15 -0700 (In reply to comment #2) > That's both a benefit and a drawback. I have the feeling that I'm cluttering an already diverse data set by adding another few items to the enum. Related, I assume reordering the enum to put related items next to each other would be a Bad Thing™? 756502 4 abarth 2012-11-01 11:45:17 -0700 Ok. I wouldn't worry too much about cluttering up FeatureObserver. That's what it is there for. If we run out of bits, we can add 32 more. :) 756505 5 abarth 2012-11-01 11:46:47 -0700 > Related, I assume reordering the enum to put related items next to each other would be a Bad Thing™? We can do that, but it makes it harder to read the data on the server for a while. It's probably not worth the hassle at this point. We'll want to clean it out at some point, and re-ordering might make sense then. 756546 6 171912 mkwst 2012-11-01 12:44:44 -0700 Created attachment 171912 Patch 756578 7 171912 buildbot 2012-11-01 13:40:50 -0700 Comment on attachment 171912 Patch Attachment 171912 did not pass win-ews (win): Output: http://queues.webkit.org/results/14688072 756605 8 171912 peter+ews 2012-11-01 14:11:46 -0700 Comment on attachment 171912 Patch Attachment 171912 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/14675080 757057 9 172023 mkwst 2012-11-02 03:25:59 -0700 Created attachment 172023 Patch 757072 10 172023 peter+ews 2012-11-02 03:46:02 -0700 Comment on attachment 172023 Patch Attachment 172023 did not pass cr-android-ews (chromium-android): Output: http://queues.webkit.org/results/14687787 757100 11 172038 mkwst 2012-11-02 04:52:12 -0700 Created attachment 172038 Patch 757421 12 172038 webkit.review.bot 2012-11-02 11:55:09 -0700 Comment on attachment 172038 Patch Clearing flags on attachment: 172038 Committed r133325: <http://trac.webkit.org/changeset/133325> 757422 13 webkit.review.bot 2012-11-02 11:55:14 -0700 All reviewed patches have been landed. Closing bug. 171912 2012-11-01 12:44:44 -0700 2012-11-02 03:25:55 -0700 Patch bug-100974-20121101204305.patch text/plain 3688 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMjA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTJkZTYxNWZkMDk5ZmEy OWQwMDM5ZWM4ZGI5ZjZhZTIyNzdlZjliYy4uZmJkNmVlNzllZDkwYzNjYzI4YTdjN2U1MjFmNDll MjhhMzJiOGY0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTExLTAxICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWVhc3VyZSB0aGUgdXNhZ2Ug b2YgdGhlIHZhcmlvdXMgQ1NQIGhlYWRlcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA5NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIHdlJ3JlIGNvbGxlY3RpbmcgbWV0cmljcyBy ZWdhcmRpbmcgdXNhZ2Ugb2YgdGhlCisgICAgICAgICdYLVdlYktpdC1DU1AnIGFuZCAnWC1XZWJL aXQtQ1NQLVJlcG9ydC1Pbmx5JyBIVFRQIGhlYWRlcnMuIFdlJ3ZlCisgICAgICAgIHJlY2VudGx5 IGFkZGVkIHN1cHBvcnQgZm9yIHRoZSBjYW5vbmljYWwgJ0NvbnRlbnQtU2VjdXJpdHktUG9saWN5 JworICAgICAgICBhbmQgJ0NvbnRlbnQtU2VjdXJpdHktUG9saWN5LVJlcG9ydC1Pbmx5JyBoZWFk ZXJzLiBUaGlzIHBhdGNoIGFkZHMKKyAgICAgICAgdGhvc2UgaGVhZGVycyBleHBsaWNpdGx5IGlu dG8gdGhlIG1ldHJpY3MsIGdpdmluZyBpbnNpZ2h0IGludG8gdXB0YWtlCisgICAgICAgIG9mIHRo ZSB1bnByZWZpeGVkIGhlYWRlciwgYW5kIGludG8gdXNhZ2Ugb2YgcHVyZSByZXBvcnRpbmcgdnMu CisgICAgICAgIGVuZm9yY2VtZW50LgorCisgICAgICAgIE5vIHZpc2libGUgZnVuY3Rpb25hbGl0 eSBzaG91bGQgY2hhbmdlOyBhbGwgQ29udGVudCBTZWN1cml0eSBQb2xpY3kKKyAgICAgICAgdGVz dHMgc2hvdWxkIGNvbnRpbnVlIHRvIHBhc3MuCisKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6 OmRpZFJlY2VpdmVIZWFkZXIpOgorICAgICAgICAgICAgQ29udmVydCB0aGUgQ1NQIGhlYWRlciB0 eXBlIGludG8gYSBGZWF0dXJlT2JzZXJ2ZXI6OkZlYXR1cmUsIGFuZAorICAgICAgICAgICAgb2Jz ZXJ2ZSBpdC4KKyAgICAgICAgKiBwYWdlL0ZlYXR1cmVPYnNlcnZlci5oOgorICAgICAgICAgICAg QWRkIHRocmVlIG5ldyB2YWx1ZXMgdG8gdGhlIGVudW0gdG8gY292ZXIgdGhlIG5ldyBoZWFkZXIg dHlwZXMuCisKIDIwMTItMTEtMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgW01hY10gQ3Jhc2ggaW4gUmFuZ2U6OmVkaXRpbmdTdGFydFBvc2l0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKaW5kZXggNjI4YWQ2 OWIzNTlkNmY4ODJkNzAyZjExMGY4ZWQ4NGE3ODQ5OGI4MC4uODcyMjFkZDM0MTk5YzU5NzgyNWRm Nzk0MWQ2YWMyOThiMDcxOTllMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250 ZW50U2VjdXJpdHlQb2xpY3kuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNl Y3VyaXR5UG9saWN5LmNwcApAQCAtMTMyOCw4ICsxMzI4LDI0IEBAIHZvaWQgQ29udGVudFNlY3Vy aXR5UG9saWN5OjpkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYgaGVhZGVyLCBIZWFkZXJU eXBlIHR5CiB7CiAgICAgaWYgKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC0+aXNEb2N1bWVudCgp KSB7CiAgICAgICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHN0YXRpY19jYXN0PERvY3VtZW50Kj4o bV9zY3JpcHRFeGVjdXRpb25Db250ZXh0KTsKLSAgICAgICAgaWYgKGRvY3VtZW50LT5kb21XaW5k b3coKSkKLSAgICAgICAgICAgIEZlYXR1cmVPYnNlcnZlcjo6b2JzZXJ2ZShkb2N1bWVudC0+ZG9t V2luZG93KCksIEZlYXR1cmVPYnNlcnZlcjo6UHJlZml4ZWRDb250ZW50U2VjdXJpdHlQb2xpY3kp OworICAgICAgICBpZiAoZG9jdW1lbnQtPmRvbVdpbmRvdygpKSB7CisgICAgICAgICAgICBGZWF0 dXJlT2JzZXJ2ZXI6OkZlYXR1cmUgZmVhdHVyZTsKKyAgICAgICAgICAgIHN3aXRjaCAodHlwZSkg eworICAgICAgICAgICAgY2FzZSBFbmZvcmNlQWxsRGlyZWN0aXZlczoKKyAgICAgICAgICAgICAg ICBmZWF0dXJlID0gRmVhdHVyZU9ic2VydmVyOjpQcmVmaXhlZENvbnRlbnRTZWN1cml0eVBvbGlj eTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgRW5mb3JjZVN0YWJs ZURpcmVjdGl2ZXM6CisgICAgICAgICAgICAgICAgZmVhdHVyZSA9IEZlYXR1cmVPYnNlcnZlcjo6 Q29udGVudFNlY3VyaXR5UG9saWN5OworICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAg ICAgY2FzZSBSZXBvcnRBbGxEaXJlY3RpdmVzOgorICAgICAgICAgICAgICAgIGZlYXR1cmUgPSBG ZWF0dXJlT2JzZXJ2ZXI6OlByZWZpeGVkQ29udGVudFNlY3VyaXR5UG9saWN5UmVwb3J0T25seTsK KyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNhc2UgUmVwb3J0U3RhYmxlRGly ZWN0aXZlczoKKyAgICAgICAgICAgICAgICBmZWF0dXJlID0gRmVhdHVyZU9ic2VydmVyOjpDb250 ZW50U2VjdXJpdHlQb2xpY3lSZXBvcnRPbmx5OworICAgICAgICAgICAgICAgIGJyZWFrOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgRmVhdHVyZU9ic2VydmVyOjpvYnNlcnZlKGRvY3VtZW50 LT5kb21XaW5kb3coKSwgZmVhdHVyZSk7CisgICAgICAgIH0KICAgICB9CiAKICAgICAvLyBSRkMy NjE2LCBzZWN0aW9uIDQuMiBzcGVjaWZpZXMgdGhhdCBoZWFkZXJzIGFwcGVhcmluZyBtdWx0aXBs ZSB0aW1lcyBjYW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRmVhdHVyZU9ic2Vy dmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZlYXR1cmVPYnNlcnZlci5oCmluZGV4IDFiNzlm Njc5MGQ2Mjk2YWE2NmM0YTIzNzEyYmNiNzFlOTllNDQ2NDQuLjUzMWY0NmYzOGQyMWVlNGViZGFh NzA5YjYyNWEyN2Y0NmMzMTk3ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRmVh dHVyZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJlT2JzZXJ2ZXIu aApAQCAtNTQsNiArNTQsOSBAQCBwdWJsaWM6CiAgICAgICAgIExlZ2FjeVRleHROb3RpZmljYXRp b25zLAogICAgICAgICBVbnByZWZpeGVkUmVxdWVzdEFuaW1hdGlvbkZyYW1lLAogICAgICAgICBQ cmVmaXhlZFJlcXVlc3RBbmltYXRpb25GcmFtZSwKKyAgICAgICAgQ29udGVudFNlY3VyaXR5UG9s aWN5LAorICAgICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3lSZXBvcnRPbmx5LAorICAgICAgICBQ cmVmaXhlZENvbnRlbnRTZWN1cml0eVBvbGljeVJlcG9ydE9ubHksCiAgICAgICAgIC8vIEFkZCBu ZXcgZmVhdHVyZXMgYWJvdmUgdGhpcyBsaW5lLgogICAgICAgICBOdW1iZXJPZkZlYXR1cmVzLCAv LyBUaGlzIGVudW0gdmFsdWUgbXVzdCBiZSBsYXN0LgogICAgIH07Cg== 172023 2012-11-02 03:25:59 -0700 2012-11-02 04:52:07 -0700 Patch bug-100974-20121102112419.patch text/plain 3820 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRhMzBjZTE0OGQzNWJl ZTdkNDRkZWIyMzMxMThmZDg3ZDMyMDI4NS4uOWM1OGNhN2U1NTA0ZTM1ZjljMjA3Y2VlNDg4OTFm ZWViNTAzNzlkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTExLTAyICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWVhc3VyZSB0aGUgdXNhZ2Ug b2YgdGhlIHZhcmlvdXMgQ1NQIGhlYWRlcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA5NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIHdlJ3JlIGNvbGxlY3RpbmcgbWV0cmljcyBy ZWdhcmRpbmcgdXNhZ2Ugb2YgdGhlCisgICAgICAgICdYLVdlYktpdC1DU1AnIGFuZCAnWC1XZWJL aXQtQ1NQLVJlcG9ydC1Pbmx5JyBIVFRQIGhlYWRlcnMuIFdlJ3ZlCisgICAgICAgIHJlY2VudGx5 IGFkZGVkIHN1cHBvcnQgZm9yIHRoZSBjYW5vbmljYWwgJ0NvbnRlbnQtU2VjdXJpdHktUG9saWN5 JworICAgICAgICBhbmQgJ0NvbnRlbnQtU2VjdXJpdHktUG9saWN5LVJlcG9ydC1Pbmx5JyBoZWFk ZXJzLiBUaGlzIHBhdGNoIGFkZHMKKyAgICAgICAgdGhvc2UgaGVhZGVycyBleHBsaWNpdGx5IGlu dG8gdGhlIG1ldHJpY3MsIGdpdmluZyBpbnNpZ2h0IGludG8gdXB0YWtlCisgICAgICAgIG9mIHRo ZSB1bnByZWZpeGVkIGhlYWRlciwgYW5kIGludG8gdXNhZ2Ugb2YgcHVyZSByZXBvcnRpbmcgdnMu CisgICAgICAgIGVuZm9yY2VtZW50LgorCisgICAgICAgIE5vIHZpc2libGUgZnVuY3Rpb25hbGl0 eSBzaG91bGQgY2hhbmdlOyBhbGwgQ29udGVudCBTZWN1cml0eSBQb2xpY3kKKyAgICAgICAgdGVz dHMgc2hvdWxkIGNvbnRpbnVlIHRvIHBhc3MuCisKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6 OmRpZFJlY2VpdmVIZWFkZXIpOgorICAgICAgICAgICAgQ29udmVydCB0aGUgQ1NQIGhlYWRlciB0 eXBlIGludG8gYSBGZWF0dXJlT2JzZXJ2ZXI6OkZlYXR1cmUsIGFuZAorICAgICAgICAgICAgb2Jz ZXJ2ZSBpdC4KKyAgICAgICAgKiBwYWdlL0ZlYXR1cmVPYnNlcnZlci5oOgorICAgICAgICAgICAg QWRkIHRocmVlIG5ldyB2YWx1ZXMgdG8gdGhlIGVudW0gdG8gY292ZXIgdGhlIG5ldyBoZWFkZXIg dHlwZXMuCisKIDIwMTItMTEtMDEgIFNoaW55YSBLYXdhbmFrYSAgPHNoaW55YWtAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtTaGFkb3ddIEVsZW1lbnQgc2hvdWxkIGhhdmUgZ2V0dGVyIGFuZCBz ZXR0ZXIgb2YgYXR0cmlidXRlICdwc2V1ZG8nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5jcHAKaW5kZXggNjI4YWQ2OWIzNTlkNmY4ODJkNzAyZjExMGY4ZWQ4 NGE3ODQ5OGI4MC4uYzBmZWNkYWM1NTViNzE4YzE2N2E5MzQ3MDI5NjMwY2NkOTEyNDRiYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcApAQCAtMTQy LDYgKzE0MiwyMCBAQCBib29sIGlzRGlyZWN0aXZlTmFtZShjb25zdCBTdHJpbmcmIG5hbWUpCiAg ICAgKTsKIH0KIAorRmVhdHVyZU9ic2VydmVyOjpGZWF0dXJlIGdldEZlYXR1cmVPYnNlcnZlclR5 cGUoQ29udGVudFNlY3VyaXR5UG9saWN5OjpIZWFkZXJUeXBlIHR5cGUpCit7CisgICAgc3dpdGNo ICh0eXBlKSB7CisgICAgY2FzZSBDb250ZW50U2VjdXJpdHlQb2xpY3k6OkVuZm9yY2VBbGxEaXJl Y3RpdmVzOgorICAgICAgICByZXR1cm4gRmVhdHVyZU9ic2VydmVyOjpQcmVmaXhlZENvbnRlbnRT ZWN1cml0eVBvbGljeTsKKyAgICBjYXNlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6RW5mb3JjZVN0 YWJsZURpcmVjdGl2ZXM6CisgICAgICAgIHJldHVybiBGZWF0dXJlT2JzZXJ2ZXI6OkNvbnRlbnRT ZWN1cml0eVBvbGljeTsKKyAgICBjYXNlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0QWxs RGlyZWN0aXZlczoKKyAgICAgICAgcmV0dXJuIEZlYXR1cmVPYnNlcnZlcjo6UHJlZml4ZWRDb250 ZW50U2VjdXJpdHlQb2xpY3lSZXBvcnRPbmx5OworICAgIGNhc2UgQ29udGVudFNlY3VyaXR5UG9s aWN5OjpSZXBvcnRTdGFibGVEaXJlY3RpdmVzOgorICAgICAgICByZXR1cm4gRmVhdHVyZU9ic2Vy dmVyOjpDb250ZW50U2VjdXJpdHlQb2xpY3lSZXBvcnRPbmx5OworICAgIH0KK30KKwogfSAvLyBu YW1lc3BhY2UKIAogc3RhdGljIGJvb2wgc2tpcEV4YWN0bHkoY29uc3QgVUNoYXIqJiBwb3NpdGlv biwgY29uc3QgVUNoYXIqIGVuZCwgVUNoYXIgZGVsaW1pdGVyKQpAQCAtMTMyOSw3ICsxMzQzLDcg QEAgdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3Ry aW5nJiBoZWFkZXIsIEhlYWRlclR5cGUgdHkKICAgICBpZiAobV9zY3JpcHRFeGVjdXRpb25Db250 ZXh0LT5pc0RvY3VtZW50KCkpIHsKICAgICAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gc3RhdGlj X2Nhc3Q8RG9jdW1lbnQqPihtX3NjcmlwdEV4ZWN1dGlvbkNvbnRleHQpOwogICAgICAgICBpZiAo ZG9jdW1lbnQtPmRvbVdpbmRvdygpKQotICAgICAgICAgICAgRmVhdHVyZU9ic2VydmVyOjpvYnNl cnZlKGRvY3VtZW50LT5kb21XaW5kb3coKSwgRmVhdHVyZU9ic2VydmVyOjpQcmVmaXhlZENvbnRl bnRTZWN1cml0eVBvbGljeSk7CisgICAgICAgICAgICBGZWF0dXJlT2JzZXJ2ZXI6Om9ic2VydmUo ZG9jdW1lbnQtPmRvbVdpbmRvdygpLCBnZXRGZWF0dXJlT2JzZXJ2ZXJUeXBlKHR5cGUpKTsKICAg ICB9CiAKICAgICAvLyBSRkMyNjE2LCBzZWN0aW9uIDQuMiBzcGVjaWZpZXMgdGhhdCBoZWFkZXJz IGFwcGVhcmluZyBtdWx0aXBsZSB0aW1lcyBjYW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRmVhdHVyZU9ic2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZlYXR1cmVPYnNl cnZlci5oCmluZGV4IDFiNzlmNjc5MGQ2Mjk2YWE2NmM0YTIzNzEyYmNiNzFlOTllNDQ2NDQuLjUz MWY0NmYzOGQyMWVlNGViZGFhNzA5YjYyNWEyN2Y0NmMzMTk3ZGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRmVhdHVyZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9GZWF0dXJlT2JzZXJ2ZXIuaApAQCAtNTQsNiArNTQsOSBAQCBwdWJsaWM6CiAgICAgICAgIExl Z2FjeVRleHROb3RpZmljYXRpb25zLAogICAgICAgICBVbnByZWZpeGVkUmVxdWVzdEFuaW1hdGlv bkZyYW1lLAogICAgICAgICBQcmVmaXhlZFJlcXVlc3RBbmltYXRpb25GcmFtZSwKKyAgICAgICAg Q29udGVudFNlY3VyaXR5UG9saWN5LAorICAgICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3lSZXBv cnRPbmx5LAorICAgICAgICBQcmVmaXhlZENvbnRlbnRTZWN1cml0eVBvbGljeVJlcG9ydE9ubHks CiAgICAgICAgIC8vIEFkZCBuZXcgZmVhdHVyZXMgYWJvdmUgdGhpcyBsaW5lLgogICAgICAgICBO dW1iZXJPZkZlYXR1cmVzLCAvLyBUaGlzIGVudW0gdmFsdWUgbXVzdCBiZSBsYXN0LgogICAgIH07 Cg== 172038 2012-11-02 04:52:12 -0700 2012-11-02 11:55:09 -0700 Patch bug-100974-20121102125032.patch text/plain 3894 mkwst U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMjcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRhMzBjZTE0OGQzNWJl ZTdkNDRkZWIyMzMxMThmZDg3ZDMyMDI4NS4uOWM1OGNhN2U1NTA0ZTM1ZjljMjA3Y2VlNDg4OTFm ZWViNTAzNzlkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEyLTExLTAyICBNaWtl IFdlc3QgIDxta3dzdEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgTWVhc3VyZSB0aGUgdXNhZ2Ug b2YgdGhlIHZhcmlvdXMgQ1NQIGhlYWRlcnMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMDA5NzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDdXJyZW50bHksIHdlJ3JlIGNvbGxlY3RpbmcgbWV0cmljcyBy ZWdhcmRpbmcgdXNhZ2Ugb2YgdGhlCisgICAgICAgICdYLVdlYktpdC1DU1AnIGFuZCAnWC1XZWJL aXQtQ1NQLVJlcG9ydC1Pbmx5JyBIVFRQIGhlYWRlcnMuIFdlJ3ZlCisgICAgICAgIHJlY2VudGx5 IGFkZGVkIHN1cHBvcnQgZm9yIHRoZSBjYW5vbmljYWwgJ0NvbnRlbnQtU2VjdXJpdHktUG9saWN5 JworICAgICAgICBhbmQgJ0NvbnRlbnQtU2VjdXJpdHktUG9saWN5LVJlcG9ydC1Pbmx5JyBoZWFk ZXJzLiBUaGlzIHBhdGNoIGFkZHMKKyAgICAgICAgdGhvc2UgaGVhZGVycyBleHBsaWNpdGx5IGlu dG8gdGhlIG1ldHJpY3MsIGdpdmluZyBpbnNpZ2h0IGludG8gdXB0YWtlCisgICAgICAgIG9mIHRo ZSB1bnByZWZpeGVkIGhlYWRlciwgYW5kIGludG8gdXNhZ2Ugb2YgcHVyZSByZXBvcnRpbmcgdnMu CisgICAgICAgIGVuZm9yY2VtZW50LgorCisgICAgICAgIE5vIHZpc2libGUgZnVuY3Rpb25hbGl0 eSBzaG91bGQgY2hhbmdlOyBhbGwgQ29udGVudCBTZWN1cml0eSBQb2xpY3kKKyAgICAgICAgdGVz dHMgc2hvdWxkIGNvbnRpbnVlIHRvIHBhc3MuCisKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6 OmRpZFJlY2VpdmVIZWFkZXIpOgorICAgICAgICAgICAgQ29udmVydCB0aGUgQ1NQIGhlYWRlciB0 eXBlIGludG8gYSBGZWF0dXJlT2JzZXJ2ZXI6OkZlYXR1cmUsIGFuZAorICAgICAgICAgICAgb2Jz ZXJ2ZSBpdC4KKyAgICAgICAgKiBwYWdlL0ZlYXR1cmVPYnNlcnZlci5oOgorICAgICAgICAgICAg QWRkIHRocmVlIG5ldyB2YWx1ZXMgdG8gdGhlIGVudW0gdG8gY292ZXIgdGhlIG5ldyBoZWFkZXIg dHlwZXMuCisKIDIwMTItMTEtMDEgIFNoaW55YSBLYXdhbmFrYSAgPHNoaW55YWtAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtTaGFkb3ddIEVsZW1lbnQgc2hvdWxkIGhhdmUgZ2V0dGVyIGFuZCBz ZXR0ZXIgb2YgYXR0cmlidXRlICdwc2V1ZG8nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5jcHAKaW5kZXggNjI4YWQ2OWIzNTlkNmY4ODJkNzAyZjExMGY4ZWQ4 NGE3ODQ5OGI4MC4uZGRhYTMyOGZkZTgwYTE5ZGEzOGZjYWVlYWY4YjBkMGMwZDRiM2IxZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcApAQCAtMTQy LDYgKzE0MiwyMiBAQCBib29sIGlzRGlyZWN0aXZlTmFtZShjb25zdCBTdHJpbmcmIG5hbWUpCiAg ICAgKTsKIH0KIAorRmVhdHVyZU9ic2VydmVyOjpGZWF0dXJlIGdldEZlYXR1cmVPYnNlcnZlclR5 cGUoQ29udGVudFNlY3VyaXR5UG9saWN5OjpIZWFkZXJUeXBlIHR5cGUpCit7CisgICAgc3dpdGNo ICh0eXBlKSB7CisgICAgY2FzZSBDb250ZW50U2VjdXJpdHlQb2xpY3k6OkVuZm9yY2VBbGxEaXJl Y3RpdmVzOgorICAgICAgICByZXR1cm4gRmVhdHVyZU9ic2VydmVyOjpQcmVmaXhlZENvbnRlbnRT ZWN1cml0eVBvbGljeTsKKyAgICBjYXNlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6RW5mb3JjZVN0 YWJsZURpcmVjdGl2ZXM6CisgICAgICAgIHJldHVybiBGZWF0dXJlT2JzZXJ2ZXI6OkNvbnRlbnRT ZWN1cml0eVBvbGljeTsKKyAgICBjYXNlIENvbnRlbnRTZWN1cml0eVBvbGljeTo6UmVwb3J0QWxs RGlyZWN0aXZlczoKKyAgICAgICAgcmV0dXJuIEZlYXR1cmVPYnNlcnZlcjo6UHJlZml4ZWRDb250 ZW50U2VjdXJpdHlQb2xpY3lSZXBvcnRPbmx5OworICAgIGNhc2UgQ29udGVudFNlY3VyaXR5UG9s aWN5OjpSZXBvcnRTdGFibGVEaXJlY3RpdmVzOgorICAgICAgICByZXR1cm4gRmVhdHVyZU9ic2Vy dmVyOjpDb250ZW50U2VjdXJpdHlQb2xpY3lSZXBvcnRPbmx5OworICAgIH0KKyAgICBBU1NFUlRf Tk9UX1JFQUNIRUQoKTsKKyAgICByZXR1cm4gRmVhdHVyZU9ic2VydmVyOjpOdW1iZXJPZkZlYXR1 cmVzOworfQorCiB9IC8vIG5hbWVzcGFjZQogCiBzdGF0aWMgYm9vbCBza2lwRXhhY3RseShjb25z dCBVQ2hhciomIHBvc2l0aW9uLCBjb25zdCBVQ2hhciogZW5kLCBVQ2hhciBkZWxpbWl0ZXIpCkBA IC0xMzI5LDcgKzEzNDUsNyBAQCB2b2lkIENvbnRlbnRTZWN1cml0eVBvbGljeTo6ZGlkUmVjZWl2 ZUhlYWRlcihjb25zdCBTdHJpbmcmIGhlYWRlciwgSGVhZGVyVHlwZSB0eQogICAgIGlmIChtX3Nj cmlwdEV4ZWN1dGlvbkNvbnRleHQtPmlzRG9jdW1lbnQoKSkgewogICAgICAgICBEb2N1bWVudCog ZG9jdW1lbnQgPSBzdGF0aWNfY2FzdDxEb2N1bWVudCo+KG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCk7CiAgICAgICAgIGlmIChkb2N1bWVudC0+ZG9tV2luZG93KCkpCi0gICAgICAgICAgICBGZWF0 dXJlT2JzZXJ2ZXI6Om9ic2VydmUoZG9jdW1lbnQtPmRvbVdpbmRvdygpLCBGZWF0dXJlT2JzZXJ2 ZXI6OlByZWZpeGVkQ29udGVudFNlY3VyaXR5UG9saWN5KTsKKyAgICAgICAgICAgIEZlYXR1cmVP YnNlcnZlcjo6b2JzZXJ2ZShkb2N1bWVudC0+ZG9tV2luZG93KCksIGdldEZlYXR1cmVPYnNlcnZl clR5cGUodHlwZSkpOwogICAgIH0KIAogICAgIC8vIFJGQzI2MTYsIHNlY3Rpb24gNC4yIHNwZWNp ZmllcyB0aGF0IGhlYWRlcnMgYXBwZWFyaW5nIG11bHRpcGxlIHRpbWVzIGNhbgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJlT2JzZXJ2ZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRmVhdHVyZU9ic2VydmVyLmgKaW5kZXggMWI3OWY2NzkwZDYyOTZhYTY2YzRhMjM3MTJi Y2I3MWU5OWU0NDY0NC4uNTMxZjQ2ZjM4ZDIxZWU0ZWJkYWE3MDliNjI1YTI3ZjQ2YzMxOTdkYyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9GZWF0dXJlT2JzZXJ2ZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0ZlYXR1cmVPYnNlcnZlci5oCkBAIC01NCw2ICs1NCw5IEBAIHB1 YmxpYzoKICAgICAgICAgTGVnYWN5VGV4dE5vdGlmaWNhdGlvbnMsCiAgICAgICAgIFVucHJlZml4 ZWRSZXF1ZXN0QW5pbWF0aW9uRnJhbWUsCiAgICAgICAgIFByZWZpeGVkUmVxdWVzdEFuaW1hdGlv bkZyYW1lLAorICAgICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3ksCisgICAgICAgIENvbnRlbnRT ZWN1cml0eVBvbGljeVJlcG9ydE9ubHksCisgICAgICAgIFByZWZpeGVkQ29udGVudFNlY3VyaXR5 UG9saWN5UmVwb3J0T25seSwKICAgICAgICAgLy8gQWRkIG5ldyBmZWF0dXJlcyBhYm92ZSB0aGlz IGxpbmUuCiAgICAgICAgIE51bWJlck9mRmVhdHVyZXMsIC8vIFRoaXMgZW51bSB2YWx1ZSBtdXN0 IGJlIGxhc3QuCiAgICAgfTsK