40312 2010-06-08 10:52:08 -0700 [chromium] Track state for whether a ResourceRequest is fetched via a proxy 2010-08-10 22:49:55 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mbelshe mbelshe abarth ap commit-queue levin noam oldest_to_newest 235351 0 mbelshe 2010-06-08 10:52:08 -0700 Track whether a page is fetched via a proxy. 235609 1 58204 mbelshe 2010-06-08 17:59:07 -0700 Created attachment 58204 Simple patch - chromium specific. 235613 2 levin 2010-06-08 18:08:20 -0700 Not sure if it matters but these fields will not be copied across threads (see PassOwnPtr<CrossThreadResourceRequestData> copyData() const;). This is called when workers do resource requests. Other: The reviewer typically isn't filled in until someone has r+'ed it. 235617 3 mbelshe 2010-06-08 18:32:00 -0700 Yes, CrossThreadResourceRequestData can't deal with platform specific flags. So this is no change. re the Reviewer: I know. I take a crap-shoot at the reviewer. If Dimitry reviews it, then I don't need to regenerate a patch. A better fix would be to get rid of ChangeLogs, but I think that is an issue for the Office of Redundancy to tackle... 235621 4 levin 2010-06-08 19:50:03 -0700 (In reply to comment #3) > Yes, CrossThreadResourceRequestData can't deal with platform specific flags. So this is no change. Well, it doesn't at present. I suppose it should be modified to handle platform specific flags if they matter (when it is called). Specifically, this method is called when workers do resource requests. Do these fields matter for that case? 235858 5 mbelshe 2010-06-09 10:24:01 -0700 (In reply to comment #4) > Specifically, this method is called when workers do resource requests. Do these fields matter for that case? We're trying to track at a page-load-level whether a page is "proxied or not". This already has room for error, because some resources on a page could be proxied, and others may not. We use the base-page as the trigger for how to label the page load. Since we're only looking at page loads, not resources loaded by XHR, workers, etc, it doesn't matter for workers. 235861 6 levin 2010-06-09 10:35:28 -0700 (In reply to comment #5) > (In reply to comment #4) > > Specifically, this method is called when workers do resource requests. Do these fields matter for that case? > > We're trying to track at a page-load-level whether a page is "proxied or not". This already has room for error, because some resources on a page could be proxied, and others may not. We use the base-page as the trigger for how to label the page load. Since we're only looking at page loads, not resources loaded by XHR, workers, etc, it doesn't matter for workers. Thanks! 235922 7 58269 mbelshe 2010-06-09 11:58:56 -0700 Created attachment 58269 Update the reviewer field . 235924 8 58271 mbelshe 2010-06-09 12:00:21 -0700 Created attachment 58271 One more try, without tagalong fixes. 236342 9 58271 commit-queue 2010-06-10 06:56:25 -0700 Comment on attachment 58271 One more try, without tagalong fixes. Clearing flags on attachment: 58271 Committed r60955: <http://trac.webkit.org/changeset/60955> 257731 10 noam 2010-07-29 09:34:01 -0700 *** Bug 43011 has been marked as a duplicate of this bug. *** 263036 11 abarth 2010-08-10 22:49:55 -0700 This patch claims to have been landed. 58204 2010-06-08 17:59:07 -0700 2010-06-11 15:42:39 -0700 Simple patch - chromium specific. bug40312.patch text/plain 4612 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYwODUyKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNi0wOCAgTWlrZSBCZWxzaGUgIDxtYmVsc2hlQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJ5IEdsYXprb3YKKworICAgICAg ICBUcmFjayB3aGV0aGVyIGEgcmVzb3VyY2UgaXMgbG9hZGVkIHZpYSBhIHByb3h5LgorCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00MDMxMgorCisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmg6CisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjp3YXNGZXRjaGVkVmlhUHJveHkpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6c2V0V2FzRmV0Y2hlZFZpYVByb3h5KToK KwogMjAxMC0wNi0wOCAgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4gIDxrZW5uZXRoLmNocmlz dGlhbnNlbkBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQgQnVpbGRib3QgZml4 LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9u c2UuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQ0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9S ZXNvdXJjZVJlc3BvbnNlLmgJKHJldmlzaW9uIDYwODAwKQorKysgV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAkod29ya2luZyBjb3B5KQpAQCAtNDEs NiArNDEsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1faXNNdWx0aXBh cnRQYXlsb2FkKGZhbHNlKQogICAgICAgICAgICAgLCBtX3dhc0ZldGNoZWRWaWFTUERZKGZhbHNl KQogICAgICAgICAgICAgLCBtX3dhc05wbk5lZ290aWF0ZWQoZmFsc2UpCisgICAgICAgICAgICAs IG1fd2FzRmV0Y2hlZFZpYVByb3h5KGZhbHNlKQogICAgICAgICAgICAgLCBtX3Jlc3BvbnNlVGlt ZSgwKQogICAgICAgICB7CiAgICAgICAgIH0KQEAgLTUyLDYgKzUzLDcgQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICAgICAgLCBtX2lzTXVsdGlwYXJ0UGF5bG9hZChmYWxzZSkKICAgICAg ICAgICAgICwgbV93YXNGZXRjaGVkVmlhU1BEWShmYWxzZSkKICAgICAgICAgICAgICwgbV93YXNO cG5OZWdvdGlhdGVkKGZhbHNlKQorICAgICAgICAgICAgLCBtX3dhc0ZldGNoZWRWaWFQcm94eShm YWxzZSkKICAgICAgICAgICAgICwgbV9yZXNwb25zZVRpbWUoMCkKICAgICAgICAgewogICAgICAg ICB9CkBAIC03NCw2ICs3Niw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCB3 YXNOcG5OZWdvdGlhdGVkKCkgY29uc3QgeyByZXR1cm4gbV93YXNOcG5OZWdvdGlhdGVkOyB9CiAg ICAgICAgIHZvaWQgc2V0V2FzTnBuTmVnb3RpYXRlZChib29sIHZhbHVlKSB7IG1fd2FzTnBuTmVn b3RpYXRlZCA9IHZhbHVlOyB9CiAKKyAgICAgICAgYm9vbCB3YXNGZXRjaGVkVmlhUHJveHkoKSBj b25zdCB7IHJldHVybiBtX3dhc0ZldGNoZWRWaWFQcm94eTsgfQorICAgICAgICB2b2lkIHNldFdh c0ZldGNoZWRWaWFQcm94eShib29sIHZhbHVlKSB7IG1fd2FzRmV0Y2hlZFZpYVByb3h5ID0gdmFs dWU7IH0KKwogICAgICAgICBib29sIGlzTXVsdGlwYXJ0UGF5bG9hZCgpIGNvbnN0IHsgcmV0dXJu IG1faXNNdWx0aXBhcnRQYXlsb2FkOyB9CiAgICAgICAgIHZvaWQgc2V0SXNNdWx0aXBhcnRQYXls b2FkKGJvb2wgdmFsdWUpIHsgbV9pc011bHRpcGFydFBheWxvYWQgPSB2YWx1ZTsgfQogCkBAIC0x MTQsNiArMTE5LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyBXYXMgdGhlIHJl c291cmNlIGZldGNoZWQgb3ZlciBhIGNoYW5uZWwgd2hpY2ggdXNlZCBUTFMvTmV4dC1Qcm90b2Nv bC1OZWdvdGlhdGlvbiAoYWxzbyBTUERZIHJlbGF0ZWQpLgogICAgICAgICBib29sIG1fd2FzTnBu TmVnb3RpYXRlZDsKIAorICAgICAgICAvLyBXYXMgdGhlIHJlc291cmNlIGZldGNoZWQgb3ZlciBh biBleHBsaWNpdCBwcm94eSAoSFRUUCwgU09DS1MsIGV0YykuCisgICAgICAgIGJvb2wgbV93YXNG ZXRjaGVkVmlhUHJveHk7CisKICAgICAgICAgLy8gVGhlIHRpbWUgYXQgd2hpY2ggdGhlIHJlc3Bv bnNlIGhlYWRlcnMgd2VyZSByZWNlaXZlZC4gIEZvciBjYWNoZWQKICAgICAgICAgLy8gcmVzcG9u c2VzLCB0aGlzIHRpbWUgY291bGQgYmUgImZhciIgaW4gdGhlIHBhc3QuCiAgICAgICAgIGRvdWJs ZSBtX3Jlc3BvbnNlVGltZTsKSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cNCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiA2MDg1MikKKysr IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNiBA QAorMjAxMC0wNi0wOCAgTWlrZSBCZWxzaGUgIDxtYmVsc2hlQGdvb2dsZS5jb20+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgRGltaXRyeSBHbGF6a292CisKKyAgICAgICAgVHJhY2sgd2hldGhlciBh IHJlc291cmNlIGlzIGxvYWRlZCB2aWEgYSBwcm94eS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzMTIKKworICAgICAgICAqIHB1YmxpYy9XZWJV UkxSZXNwb25zZS5oOgorICAgICAgICAqIHNyYy9XZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlVSTFJlc3BvbnNlOjp3YXNGZXRjaGVkVmlhUHJveHkpOgorICAgICAgICAo V2ViS2l0OjpXZWJVUkxSZXNwb25zZTo6c2V0V2FzRmV0Y2hlZFZpYVByb3h5KToKKwogMjAxMC0w Ni0wOCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJVUkxSZXNwb25zZS5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9X ZWJVUkxSZXNwb25zZS5oCShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViVVJMUmVzcG9uc2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTMxLDYgKzEzMSwxMCBAQCBw dWJsaWM6CiAgICAgV0VCS0lUX0FQSSBib29sIHdhc05wbk5lZ290aWF0ZWQoKSBjb25zdDsKICAg ICBXRUJLSVRfQVBJIHZvaWQgc2V0V2FzTnBuTmVnb3RpYXRlZChib29sKTsKIAorICAgIC8vIEZs YWcgd2hldGhlciB0aGlzIHJlcXVlc3Qgd2FzIGxvYWRlZCB2aWEgYW4gZXhwbGljaXQgcHJveHkg KEhUVFAsIFNPQ0tTLCBldGMpLgorICAgIFdFQktJVF9BUEkgYm9vbCB3YXNGZXRjaGVkVmlhUHJv eHkoKSBjb25zdDsKKyAgICBXRUJLSVRfQVBJIHZvaWQgc2V0V2FzRmV0Y2hlZFZpYVByb3h5KGJv b2wpOworCiAgICAgLy8gRmxhZyB3aGV0aGVyIHRoaXMgcmVxdWVzdCBpcyBwYXJ0IG9mIGEgbXVs dGlwYXJ0IHJlc3BvbnNlLgogICAgIFdFQktJVF9BUEkgYm9vbCBpc011bHRpcGFydFBheWxvYWQo KSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0SXNNdWx0aXBhcnRQYXlsb2FkKGJvb2wp OwpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHANCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0NCi0tLSBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAkocmV2aXNpb24g NjA4MDApCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjg3LDYgKzI4NywxNiBAQCB2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXRXYXNO cG5OZWdvdGlhdGVkCiAgICAgbV9wcml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2UtPnNldFdhc05w bk5lZ290aWF0ZWQodmFsdWUpOwogfQogCitib29sIFdlYlVSTFJlc3BvbnNlOjp3YXNGZXRjaGVk VmlhUHJveHkoKSBjb25zdAoreworICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNw b25zZS0+d2FzRmV0Y2hlZFZpYVByb3h5KCk7Cit9CisKK3ZvaWQgV2ViVVJMUmVzcG9uc2U6OnNl dFdhc0ZldGNoZWRWaWFQcm94eShib29sIHZhbHVlKQoreworICAgIG1fcHJpdmF0ZS0+bV9yZXNv dXJjZVJlc3BvbnNlLT5zZXRXYXNGZXRjaGVkVmlhUHJveHkodmFsdWUpOworfQorCiBib29sIFdl YlVSTFJlc3BvbnNlOjppc011bHRpcGFydFBheWxvYWQoKSBjb25zdAogewogICAgIHJldHVybiBt X3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+aXNNdWx0aXBhcnRQYXlsb2FkKCk7Cg== 58269 2010-06-09 11:58:56 -0700 2010-06-09 11:59:22 -0700 Update the reviewer field . bug40312.patch2 text/plain 5389 mbelshe SW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9GYXN0TWFsbG9jLmNwcA0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0t IEphdmFTY3JpcHRDb3JlL3d0Zi9GYXN0TWFsbG9jLmNwcAkocmV2aXNpb24gNjA4MDApCisrKyBK YXZhU2NyaXB0Q29yZS93dGYvRmFzdE1hbGxvYy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5Mzks NyArMjkzOSwxMSBAQCBpbmxpbmUgVENNYWxsb2NfVGhyZWFkQ2FjaGUqIFRDTWFsbG9jX1RoCiAg IGlmIChLZXJuZWxTdXBwb3J0c1RMUygpKQogICAgIHJldHVybiB0aHJlYWRsb2NhbF9oZWFwOwog I2VsaWYgQ09NUElMRVIoTVNWQykKLSAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VENNYWxsb2NfVGhy ZWFkQ2FjaGUqPihUbHNHZXRWYWx1ZSh0bHNJbmRleCkpOworICAgIC8vIFRsc0dldFZhbHVlIHJl c2V0cyBHZXRMYXN0RXJyb3IoKS4gIFNlZSBodHRwOi8vbXNkbi5taWNyb3NvZnQuY29tL2VuLXVz L2xpYnJhcnkvbXM2ODY4MTIoVlMuODUpLmFzcHgKKyAgICBEV09SRCBlcnIgPSBHZXRMYXN0RXJy b3IoKTsKKyAgICB2b2lkKiBydiA9IFRsc0dldFZhbHVlKHRsc0luZGV4KTsKKyAgICBTZXRMYXN0 RXJyb3IoZXJyKTsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8VENNYWxsb2NfVGhyZWFkQ2FjaGUq Pihydik7CiAjZWxzZQogICAgIHJldHVybiBzdGF0aWNfY2FzdDxUQ01hbGxvY19UaHJlYWRDYWNo ZSo+KHB0aHJlYWRfZ2V0c3BlY2lmaWMoaGVhcF9rZXkpKTsKICNlbmRpZgpJbmRleDogV2ViQ29y ZS9DaGFuZ2VMb2cNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24g NjA4NTIpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1 IEBACisyMDEwLTA2LTA4ICBNaWtlIEJlbHNoZSAgPG1iZWxzaGVAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluCisKKyAgICAgICAgVHJhY2sgd2hldGhlciBh IHJlc291cmNlIGlzIGxvYWRlZCB2aWEgYSBwcm94eS4KKworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDAzMTIKKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZTo6d2FzRmV0Y2hlZFZpYVByb3h5KToKKyAgICAgICAgKFdlYkNvcmU6OlJl c291cmNlUmVzcG9uc2U6OnNldFdhc0ZldGNoZWRWaWFQcm94eSk6CisKIDIwMTAtMDYtMDggIEtl bm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuICA8a2VubmV0aC5jaHJpc3RpYW5zZW5Ab3BlbmJvc3Nh Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIEJ1aWxkYm90IGZpeC4KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgNCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0N Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5o CShyZXZpc2lvbiA2MDgwMCkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9S ZXNvdXJjZVJlc3BvbnNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxLDYgKzQxLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX2lzTXVsdGlwYXJ0UGF5bG9hZChmYWxzZSkK ICAgICAgICAgICAgICwgbV93YXNGZXRjaGVkVmlhU1BEWShmYWxzZSkKICAgICAgICAgICAgICwg bV93YXNOcG5OZWdvdGlhdGVkKGZhbHNlKQorICAgICAgICAgICAgLCBtX3dhc0ZldGNoZWRWaWFQ cm94eShmYWxzZSkKICAgICAgICAgICAgICwgbV9yZXNwb25zZVRpbWUoMCkKICAgICAgICAgewog ICAgICAgICB9CkBAIC01Miw2ICs1Myw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAg ICAgICwgbV9pc011bHRpcGFydFBheWxvYWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1fd2FzRmV0 Y2hlZFZpYVNQRFkoZmFsc2UpCiAgICAgICAgICAgICAsIG1fd2FzTnBuTmVnb3RpYXRlZChmYWxz ZSkKKyAgICAgICAgICAgICwgbV93YXNGZXRjaGVkVmlhUHJveHkoZmFsc2UpCiAgICAgICAgICAg ICAsIG1fcmVzcG9uc2VUaW1lKDApCiAgICAgICAgIHsKICAgICAgICAgfQpAQCAtNzQsNiArNzYs OSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgd2FzTnBuTmVnb3RpYXRlZCgp IGNvbnN0IHsgcmV0dXJuIG1fd2FzTnBuTmVnb3RpYXRlZDsgfQogICAgICAgICB2b2lkIHNldFdh c05wbk5lZ290aWF0ZWQoYm9vbCB2YWx1ZSkgeyBtX3dhc05wbk5lZ290aWF0ZWQgPSB2YWx1ZTsg fQogCisgICAgICAgIGJvb2wgd2FzRmV0Y2hlZFZpYVByb3h5KCkgY29uc3QgeyByZXR1cm4gbV93 YXNGZXRjaGVkVmlhUHJveHk7IH0KKyAgICAgICAgdm9pZCBzZXRXYXNGZXRjaGVkVmlhUHJveHko Ym9vbCB2YWx1ZSkgeyBtX3dhc0ZldGNoZWRWaWFQcm94eSA9IHZhbHVlOyB9CisKICAgICAgICAg Ym9vbCBpc011bHRpcGFydFBheWxvYWQoKSBjb25zdCB7IHJldHVybiBtX2lzTXVsdGlwYXJ0UGF5 bG9hZDsgfQogICAgICAgICB2b2lkIHNldElzTXVsdGlwYXJ0UGF5bG9hZChib29sIHZhbHVlKSB7 IG1faXNNdWx0aXBhcnRQYXlsb2FkID0gdmFsdWU7IH0KIApAQCAtMTE0LDYgKzExOSw5IEBAIG5h bWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gV2FzIHRoZSByZXNvdXJjZSBmZXRjaGVkIG92 ZXIgYSBjaGFubmVsIHdoaWNoIHVzZWQgVExTL05leHQtUHJvdG9jb2wtTmVnb3RpYXRpb24gKGFs c28gU1BEWSByZWxhdGVkKS4KICAgICAgICAgYm9vbCBtX3dhc05wbk5lZ290aWF0ZWQ7CiAKKyAg ICAgICAgLy8gV2FzIHRoZSByZXNvdXJjZSBmZXRjaGVkIG92ZXIgYW4gZXhwbGljaXQgcHJveHkg KEhUVFAsIFNPQ0tTLCBldGMpLgorICAgICAgICBib29sIG1fd2FzRmV0Y2hlZFZpYVByb3h5Owor CiAgICAgICAgIC8vIFRoZSB0aW1lIGF0IHdoaWNoIHRoZSByZXNwb25zZSBoZWFkZXJzIHdlcmUg cmVjZWl2ZWQuICBGb3IgY2FjaGVkCiAgICAgICAgIC8vIHJlc3BvbnNlcywgdGhpcyB0aW1lIGNv dWxkIGJlICJmYXIiIGluIHRoZSBwYXN0LgogICAgICAgICBkb3VibGUgbV9yZXNwb25zZVRpbWU7 CkluZGV4OiBXZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNjA4NTIpCisrKyBXZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTAtMDYtMDggIE1p a2UgQmVsc2hlICA8bWJlbHNoZUBnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IERh dmlkIExldmluCisKKyAgICAgICAgVHJhY2sgd2hldGhlciBhIHJlc291cmNlIGlzIGxvYWRlZCB2 aWEgYSBwcm94eS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NDAzMTIKKworICAgICAgICAqIHB1YmxpYy9XZWJVUkxSZXNwb25zZS5oOgorICAgICAg ICAqIHNyYy9XZWJVUkxSZXNwb25zZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlVSTFJlc3Bv bnNlOjp3YXNGZXRjaGVkVmlhUHJveHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJVUkxSZXNwb25z ZTo6c2V0V2FzRmV0Y2hlZFZpYVByb3h5KToKKwogMjAxMC0wNi0wOCAgWXVyeSBTZW1pa2hhdHNr eSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxk bWFuLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oDQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9XZWJVUkxSZXNwb25zZS5oCShyZXZp c2lvbiA2MDgwMCkKKysrIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVzcG9uc2UuaAko d29ya2luZyBjb3B5KQpAQCAtMTMxLDYgKzEzMSwxMCBAQCBwdWJsaWM6CiAgICAgV0VCS0lUX0FQ SSBib29sIHdhc05wbk5lZ290aWF0ZWQoKSBjb25zdDsKICAgICBXRUJLSVRfQVBJIHZvaWQgc2V0 V2FzTnBuTmVnb3RpYXRlZChib29sKTsKIAorICAgIC8vIEZsYWcgd2hldGhlciB0aGlzIHJlcXVl c3Qgd2FzIGxvYWRlZCB2aWEgYW4gZXhwbGljaXQgcHJveHkgKEhUVFAsIFNPQ0tTLCBldGMpLgor ICAgIFdFQktJVF9BUEkgYm9vbCB3YXNGZXRjaGVkVmlhUHJveHkoKSBjb25zdDsKKyAgICBXRUJL SVRfQVBJIHZvaWQgc2V0V2FzRmV0Y2hlZFZpYVByb3h5KGJvb2wpOworCiAgICAgLy8gRmxhZyB3 aGV0aGVyIHRoaXMgcmVxdWVzdCBpcyBwYXJ0IG9mIGEgbXVsdGlwYXJ0IHJlc3BvbnNlLgogICAg IFdFQktJVF9BUEkgYm9vbCBpc011bHRpcGFydFBheWxvYWQoKSBjb25zdDsKICAgICBXRUJLSVRf QVBJIHZvaWQgc2V0SXNNdWx0aXBhcnRQYXlsb2FkKGJvb2wpOwpJbmRleDogV2ViS2l0L2Nocm9t aXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBXZWJLaXQvY2hyb21p dW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAkocmV2aXNpb24gNjA4MDApCisrKyBXZWJLaXQvY2hy b21pdW0vc3JjL1dlYlVSTFJlc3BvbnNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjg3LDYgKzI4 NywxNiBAQCB2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXRXYXNOcG5OZWdvdGlhdGVkCiAgICAgbV9w cml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2UtPnNldFdhc05wbk5lZ290aWF0ZWQodmFsdWUpOwog fQogCitib29sIFdlYlVSTFJlc3BvbnNlOjp3YXNGZXRjaGVkVmlhUHJveHkoKSBjb25zdAorewor ICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNwb25zZS0+d2FzRmV0Y2hlZFZpYVBy b3h5KCk7Cit9CisKK3ZvaWQgV2ViVVJMUmVzcG9uc2U6OnNldFdhc0ZldGNoZWRWaWFQcm94eShi b29sIHZhbHVlKQoreworICAgIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRXYXNG ZXRjaGVkVmlhUHJveHkodmFsdWUpOworfQorCiBib29sIFdlYlVSTFJlc3BvbnNlOjppc011bHRp cGFydFBheWxvYWQoKSBjb25zdAogewogICAgIHJldHVybiBtX3ByaXZhdGUtPm1fcmVzb3VyY2VS ZXNwb25zZS0+aXNNdWx0aXBhcnRQYXlsb2FkKCk7Cg== 58271 2010-06-09 12:00:21 -0700 2010-06-10 06:56:25 -0700 One more try, without tagalong fixes. bug40312.patch2 text/plain 4604 mbelshe SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9DaGFuZ2VM b2cJKHJldmlzaW9uIDYwODUyKQorKysgV2ViQ29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxNSBAQAorMjAxMC0wNi0wOCAgTWlrZSBCZWxzaGUgIDxtYmVsc2hlQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbgorCisgICAgICAgIFRy YWNrIHdoZXRoZXIgYSByZXNvdXJjZSBpcyBsb2FkZWQgdmlhIGEgcHJveHkuCisKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwMzEyCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaDoKKyAgICAgICAg KFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6Ondhc0ZldGNoZWRWaWFQcm94eSk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpzZXRXYXNGZXRjaGVkVmlhUHJveHkpOgorCiAy MDEwLTA2LTA4ICBLZW5uZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGguY2hyaXN0aWFu c2VuQG9wZW5ib3NzYS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBCdWlsZGJvdCBmaXguCklu ZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5o DQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09DQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291 cmNlUmVzcG9uc2UuaAkocmV2aXNpb24gNjA4MDApCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00MSw2ICs0 MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9pc011bHRpcGFydFBh eWxvYWQoZmFsc2UpCiAgICAgICAgICAgICAsIG1fd2FzRmV0Y2hlZFZpYVNQRFkoZmFsc2UpCiAg ICAgICAgICAgICAsIG1fd2FzTnBuTmVnb3RpYXRlZChmYWxzZSkKKyAgICAgICAgICAgICwgbV93 YXNGZXRjaGVkVmlhUHJveHkoZmFsc2UpCiAgICAgICAgICAgICAsIG1fcmVzcG9uc2VUaW1lKDAp CiAgICAgICAgIHsKICAgICAgICAgfQpAQCAtNTIsNiArNTMsNyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgICAgICAgICAsIG1faXNNdWx0aXBhcnRQYXlsb2FkKGZhbHNlKQogICAgICAgICAg ICAgLCBtX3dhc0ZldGNoZWRWaWFTUERZKGZhbHNlKQogICAgICAgICAgICAgLCBtX3dhc05wbk5l Z290aWF0ZWQoZmFsc2UpCisgICAgICAgICAgICAsIG1fd2FzRmV0Y2hlZFZpYVByb3h5KGZhbHNl KQogICAgICAgICAgICAgLCBtX3Jlc3BvbnNlVGltZSgwKQogICAgICAgICB7CiAgICAgICAgIH0K QEAgLTc0LDYgKzc2LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIHdhc05w bk5lZ290aWF0ZWQoKSBjb25zdCB7IHJldHVybiBtX3dhc05wbk5lZ290aWF0ZWQ7IH0KICAgICAg ICAgdm9pZCBzZXRXYXNOcG5OZWdvdGlhdGVkKGJvb2wgdmFsdWUpIHsgbV93YXNOcG5OZWdvdGlh dGVkID0gdmFsdWU7IH0KIAorICAgICAgICBib29sIHdhc0ZldGNoZWRWaWFQcm94eSgpIGNvbnN0 IHsgcmV0dXJuIG1fd2FzRmV0Y2hlZFZpYVByb3h5OyB9CisgICAgICAgIHZvaWQgc2V0V2FzRmV0 Y2hlZFZpYVByb3h5KGJvb2wgdmFsdWUpIHsgbV93YXNGZXRjaGVkVmlhUHJveHkgPSB2YWx1ZTsg fQorCiAgICAgICAgIGJvb2wgaXNNdWx0aXBhcnRQYXlsb2FkKCkgY29uc3QgeyByZXR1cm4gbV9p c011bHRpcGFydFBheWxvYWQ7IH0KICAgICAgICAgdm9pZCBzZXRJc011bHRpcGFydFBheWxvYWQo Ym9vbCB2YWx1ZSkgeyBtX2lzTXVsdGlwYXJ0UGF5bG9hZCA9IHZhbHVlOyB9CiAKQEAgLTExNCw2 ICsxMTksOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIFdhcyB0aGUgcmVzb3Vy Y2UgZmV0Y2hlZCBvdmVyIGEgY2hhbm5lbCB3aGljaCB1c2VkIFRMUy9OZXh0LVByb3RvY29sLU5l Z290aWF0aW9uIChhbHNvIFNQRFkgcmVsYXRlZCkuCiAgICAgICAgIGJvb2wgbV93YXNOcG5OZWdv dGlhdGVkOwogCisgICAgICAgIC8vIFdhcyB0aGUgcmVzb3VyY2UgZmV0Y2hlZCBvdmVyIGFuIGV4 cGxpY2l0IHByb3h5IChIVFRQLCBTT0NLUywgZXRjKS4KKyAgICAgICAgYm9vbCBtX3dhc0ZldGNo ZWRWaWFQcm94eTsKKwogICAgICAgICAvLyBUaGUgdGltZSBhdCB3aGljaCB0aGUgcmVzcG9uc2Ug aGVhZGVycyB3ZXJlIHJlY2VpdmVkLiAgRm9yIGNhY2hlZAogICAgICAgICAvLyByZXNwb25zZXMs IHRoaXMgdGltZSBjb3VsZCBiZSAiZmFyIiBpbiB0aGUgcGFzdC4KICAgICAgICAgZG91YmxlIG1f cmVzcG9uc2VUaW1lOwpJbmRleDogV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZw0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cJKHJldmlzaW9uIDYwODUyKQorKysgV2Vi S2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisy MDEwLTA2LTA4ICBNaWtlIEJlbHNoZSAgPG1iZWxzaGVAZ29vZ2xlLmNvbT4KKworICAgICAgICBS ZXZpZXdlZCBieSBEYXZpZCBMZXZpbgorCisgICAgICAgIFRyYWNrIHdoZXRoZXIgYSByZXNvdXJj ZSBpcyBsb2FkZWQgdmlhIGEgcHJveHkuCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTQwMzEyCisKKyAgICAgICAgKiBwdWJsaWMvV2ViVVJMUmVzcG9u c2UuaDoKKyAgICAgICAgKiBzcmMvV2ViVVJMUmVzcG9uc2UuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJVUkxSZXNwb25zZTo6d2FzRmV0Y2hlZFZpYVByb3h5KToKKyAgICAgICAgKFdlYktpdDo6 V2ViVVJMUmVzcG9uc2U6OnNldFdhc0ZldGNoZWRWaWFQcm94eSk6CisKIDIwMTAtMDYtMDggIFl1 cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgUGF2ZWwgRmVsZG1hbi4KSW5kZXg6IFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVz cG9uc2UuaA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9wdWJsaWMvV2ViVVJMUmVz cG9uc2UuaAkocmV2aXNpb24gNjA4MDApCisrKyBXZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYlVS TFJlc3BvbnNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTEzMSw2ICsxMzEsMTAgQEAgcHVibGljOgog ICAgIFdFQktJVF9BUEkgYm9vbCB3YXNOcG5OZWdvdGlhdGVkKCkgY29uc3Q7CiAgICAgV0VCS0lU X0FQSSB2b2lkIHNldFdhc05wbk5lZ290aWF0ZWQoYm9vbCk7CiAKKyAgICAvLyBGbGFnIHdoZXRo ZXIgdGhpcyByZXF1ZXN0IHdhcyBsb2FkZWQgdmlhIGFuIGV4cGxpY2l0IHByb3h5IChIVFRQLCBT T0NLUywgZXRjKS4KKyAgICBXRUJLSVRfQVBJIGJvb2wgd2FzRmV0Y2hlZFZpYVByb3h5KCkgY29u c3Q7CisgICAgV0VCS0lUX0FQSSB2b2lkIHNldFdhc0ZldGNoZWRWaWFQcm94eShib29sKTsKKwog ICAgIC8vIEZsYWcgd2hldGhlciB0aGlzIHJlcXVlc3QgaXMgcGFydCBvZiBhIG11bHRpcGFydCBy ZXNwb25zZS4KICAgICBXRUJLSVRfQVBJIGJvb2wgaXNNdWx0aXBhcnRQYXlsb2FkKCkgY29uc3Q7 CiAgICAgV0VCS0lUX0FQSSB2b2lkIHNldElzTXVsdGlwYXJ0UGF5bG9hZChib29sKTsKSW5kZXg6 IFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVVJMUmVzcG9uc2UuY3BwDQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g V2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJKHJldmlzaW9uIDYwODAwKQor KysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJVUkxSZXNwb25zZS5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI4Nyw2ICsyODcsMTYgQEAgdm9pZCBXZWJVUkxSZXNwb25zZTo6c2V0V2FzTnBuTmVnb3Rp YXRlZAogICAgIG1fcHJpdmF0ZS0+bV9yZXNvdXJjZVJlc3BvbnNlLT5zZXRXYXNOcG5OZWdvdGlh dGVkKHZhbHVlKTsKIH0KIAorYm9vbCBXZWJVUkxSZXNwb25zZTo6d2FzRmV0Y2hlZFZpYVByb3h5 KCkgY29uc3QKK3sKKyAgICByZXR1cm4gbV9wcml2YXRlLT5tX3Jlc291cmNlUmVzcG9uc2UtPndh c0ZldGNoZWRWaWFQcm94eSgpOworfQorCit2b2lkIFdlYlVSTFJlc3BvbnNlOjpzZXRXYXNGZXRj aGVkVmlhUHJveHkoYm9vbCB2YWx1ZSkKK3sKKyAgICBtX3ByaXZhdGUtPm1fcmVzb3VyY2VSZXNw b25zZS0+c2V0V2FzRmV0Y2hlZFZpYVByb3h5KHZhbHVlKTsKK30KKwogYm9vbCBXZWJVUkxSZXNw b25zZTo6aXNNdWx0aXBhcnRQYXlsb2FkKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9wcml2YXRl LT5tX3Jlc291cmNlUmVzcG9uc2UtPmlzTXVsdGlwYXJ0UGF5bG9hZCgpOwo=