54196 2011-02-10 05:37:01 -0800 Add some fields to ResourceRequest and ResourceResponse 2011-02-10 13:33:00 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 53925 0 bbudge webkit-unassigned commit-queue levin webkit.review.bot oldest_to_newest 348982 0 81958 bbudge 2011-02-10 05:37:01 -0800 Created attachment 81958 Proposed patch Some fields are needed on ResourceRequest and ResourceResponse so that WebURLResponse and WebURLRequest data is passed down to the client supplied URLLoader. This is in preparation for a later patch to add CORS support to AssociatedURLLoader. 348983 1 webkit.review.bot 2011-02-10 05:40:06 -0800 Attachment 81958 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/platform/network/chromium/ResourceResponse.h:101: Tab found; better to use spaces [whitespace/tab] [1] Source/WebCore/platform/network/chromium/ResourceResponse.h:156: Tab found; better to use spaces [whitespace/tab] [1] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 348989 2 81960 bbudge 2011-02-10 05:45:38 -0800 Created attachment 81960 Proposed patch Found some style errors 349057 3 81960 levin 2011-02-10 07:36:19 -0800 Comment on attachment 81960 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=81960&action=review The change looks great an I was tempted to r+/cq+ it but I'm curious about why these fields are needed in order to add CORS support to AssociatedURLLoader. Would you just give a short explanation of this? (I don't need anything in depth just something to give me the idea.) > Source/WebCore/ChangeLog:1 > +2011-02-10 billbudge <bbudge@chromium.org> Is "billbudge" instead of "Bill Budge" intentional? 349070 4 bbudge 2011-02-10 07:59:35 -0800 These fields are needed because the WebURLRequest and WebURLResponse classes have these, and they need to get transferred down through the WebCore layers to reach the actual WebURLLoader that the WebKitClient::createURLLoader() method provides. Without this change, .nexe loading didn't work. 349145 5 81996 bbudge 2011-02-10 09:52:10 -0800 Created attachment 81996 Proposed Patch Fix my name on the ChangeLog 349242 6 81996 commit-queue 2011-02-10 11:50:49 -0800 Comment on attachment 81996 Proposed Patch Clearing flags on attachment: 81996 Committed r78253: <http://trac.webkit.org/changeset/78253> 349244 7 commit-queue 2011-02-10 11:50:54 -0800 All reviewed patches have been landed. Closing bug. 81958 2011-02-10 05:37:01 -0800 2011-02-10 07:36:34 -0800 Proposed patch cors1.txt text/plain 6540 bbudge SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4MjA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDItMTAgIGJpbGxidWRn ZSAgPGJidWRnZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGZpZWxkcyB0byBSZXNvdXJjZVJlcXVlc3QgYW5kIFJlc291 cmNlUmVzcG9uc2UgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBDT1JTIHN1cHBvcnQgdG8gQXNz b2NpYXRlZFVSTExvYWRlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUzOTI1CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jl c291cmNlUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmRv UGxhdGZvcm1Db3B5RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmRv UGxhdGZvcm1BZG9wdCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNv dXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6UmVzb3Vy Y2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6ZG93bmxvYWRU b0ZpbGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpzZXREb3dubG9hZFRv RmlsZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3Bv bnNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OmRvUGxhdGZvcm1D b3B5RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpkb1BsYXRmb3Jt QWRvcHQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNw b25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6ZG93bmxvYWRGaWxl UGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpzZXREb3dubG9hZEZp bGVQYXRoKToKKwogMjAxMS0wMi0xMCAgdGFrYW5vIHRha3VtaSAgPHRha2Fub0BhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4gCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJj ZVJlcXVlc3QuY3BwCShyZXZpc2lvbiA3NzgzMykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDMsNiArNDMsNyBAQCBQYXNzT3duUHRyPENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0CiAg ICAgZGF0YS0+bV9yZXF1ZXN0b3JQcm9jZXNzSUQgPSBtX3JlcXVlc3RvclByb2Nlc3NJRDsKICAg ICBkYXRhLT5tX2FwcENhY2hlSG9zdElEID0gbV9hcHBDYWNoZUhvc3RJRDsKICAgICBkYXRhLT5t X2hhc1VzZXJHZXN0dXJlID0gbV9oYXNVc2VyR2VzdHVyZTsKKyAgICBkYXRhLT5tX2Rvd25sb2Fk VG9GaWxlID0gbV9kb3dubG9hZFRvRmlsZTsKICAgICByZXR1cm4gZGF0YTsKIH0KIApAQCAtNTIs NiArNTMsNyBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9QbGF0Zm9ybUFkb3B0KFBhCiAgICAg bV9yZXF1ZXN0b3JQcm9jZXNzSUQgPSBkYXRhLT5tX3JlcXVlc3RvclByb2Nlc3NJRDsKICAgICBt X2FwcENhY2hlSG9zdElEID0gZGF0YS0+bV9hcHBDYWNoZUhvc3RJRDsKICAgICBtX2hhc1VzZXJH ZXN0dXJlID0gZGF0YS0+bV9oYXNVc2VyR2VzdHVyZTsKKyAgICBtX2Rvd25sb2FkVG9GaWxlID0g ZGF0YS0+bV9kb3dubG9hZFRvRmlsZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVl c3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9t aXVtL1Jlc291cmNlUmVxdWVzdC5oCShyZXZpc2lvbiA3NzgzMykKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTQyLDYgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBt X3JlcXVlc3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX2FwcENhY2hlSG9zdElEKDAp CiAgICAgICAgICAgICAsIG1faGFzVXNlckdlc3R1cmUoZmFsc2UpCisgICAgICAgICAgICAsIG1f ZG93bmxvYWRUb0ZpbGUoZmFsc2UpCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC01MSw2ICs1 Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9j ZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQogICAgICAgICAgICAg LCBtX2hhc1VzZXJHZXN0dXJlKGZhbHNlKQorICAgICAgICAgICAgLCBtX2Rvd25sb2FkVG9GaWxl KGZhbHNlKQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtNjAsNiArNjIsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAg ICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKICAgICAgICAgICAgICwgbV9oYXNVc2VyR2Vz dHVyZShmYWxzZSkKKyAgICAgICAgICAgICwgbV9kb3dubG9hZFRvRmlsZShmYWxzZSkKICAgICAg ICAgewogICAgICAgICAgICAgc2V0SFRUUFJlZmVycmVyKHJlZmVycmVyKTsKICAgICAgICAgfQpA QCAtNzAsNiArNzMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVx dWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKICAg ICAgICAgICAgICwgbV9oYXNVc2VyR2VzdHVyZShmYWxzZSkKKyAgICAgICAgICAgICwgbV9kb3du bG9hZFRvRmlsZShmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTkyLDYgKzk2LDEw IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBoYXNVc2VyR2VzdHVyZSgpIGNv bnN0IHsgcmV0dXJuIG1faGFzVXNlckdlc3R1cmU7IH0KICAgICAgICAgdm9pZCBzZXRIYXNVc2Vy R2VzdHVyZShib29sIGhhc1VzZXJHZXN0dXJlKSB7IG1faGFzVXNlckdlc3R1cmUgPSBoYXNVc2Vy R2VzdHVyZTsgfQogCisgICAgICAgIC8vIFRydWUgaWYgcmVxdWVzdCBzaG91bGQgYmUgZG93bmxv YWRlZCB0byBmaWxlLgorICAgICAgICBib29sIGRvd25sb2FkVG9GaWxlKCkgY29uc3QgeyByZXR1 cm4gbV9kb3dubG9hZFRvRmlsZTsgfQorICAgICAgICB2b2lkIHNldERvd25sb2FkVG9GaWxlKGJv b2wgZG93bmxvYWRUb0ZpbGUpIHsgbV9kb3dubG9hZFRvRmlsZSA9IGRvd25sb2FkVG9GaWxlOyB9 CisKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0QmFz ZTsKIApAQCAtMTA1LDYgKzExMyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50 IG1fcmVxdWVzdG9yUHJvY2Vzc0lEOwogICAgICAgICBpbnQgbV9hcHBDYWNoZUhvc3RJRDsKICAg ICAgICAgYm9vbCBtX2hhc1VzZXJHZXN0dXJlOworICAgICAgICBib29sIG1fZG93bmxvYWRUb0Zp bGU7CiAgICAgfTsKIAogICAgIHN0cnVjdCBDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGEg OiBwdWJsaWMgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVlc3REYXRhQmFzZSB7CkBAIC0xMTIsNiAr MTIxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBpbnQgbV9yZXF1ZXN0b3JQcm9j ZXNzSUQ7CiAgICAgICAgIGludCBtX2FwcENhY2hlSG9zdElEOwogICAgICAgICBib29sIG1faGFz VXNlckdlc3R1cmU7CisgICAgICAgIGJvb2wgbV9kb3dubG9hZFRvRmlsZTsKICAgICB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5jcHAJKHJl dmlzaW9uIDc3ODMzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1 bS9SZXNvdXJjZVJlc3BvbnNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAsNiArNDAsNyBAQCBQ YXNzT3duUHRyPENyb3NzVGhyZWFkUmVzb3VyY2VSZXNwb25zZURhCiAgICAgZGF0YS0+bV93YXNG ZXRjaGVkVmlhUHJveHkgPSBtX3dhc0ZldGNoZWRWaWFQcm94eTsKICAgICBkYXRhLT5tX3Jlc3Bv bnNlVGltZSA9IG1fcmVzcG9uc2VUaW1lOwogICAgIGRhdGEtPm1fc29ja2V0QWRkcmVzcyA9IG1f c29ja2V0QWRkcmVzczsKKyAgICBkYXRhLT5tX2Rvd25sb2FkRmlsZVBhdGggPSBtX2Rvd25sb2Fk RmlsZVBhdGg7CiAgICAgcmV0dXJuIGRhdGE7CiB9CiAKQEAgLTU1LDYgKzU2LDcgQEAgdm9pZCBS ZXNvdXJjZVJlc3BvbnNlOjpkb1BsYXRmb3JtQWRvcHQoUAogICAgIG1fd2FzRmV0Y2hlZFZpYVBy b3h5ID0gZGF0YS0+bV93YXNGZXRjaGVkVmlhUHJveHk7CiAgICAgbV9yZXNwb25zZVRpbWUgPSBk YXRhLT5tX3Jlc3BvbnNlVGltZTsKICAgICBtX3NvY2tldEFkZHJlc3MgPSBkYXRhLT5tX3NvY2tl dEFkZHJlc3M7CisgICAgbV9kb3dubG9hZEZpbGVQYXRoID0gZGF0YS0+bV9kb3dubG9hZEZpbGVQ YXRoOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9u c2UuaAkocmV2aXNpb24gNzc4MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAkod29ya2luZyBjb3B5KQpAQCAtOTgsNiArOTgs OSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgY29uc3QgU3RyaW5nJiBzb2NrZXRB ZGRyZXNzKCkgY29uc3QgeyByZXR1cm4gbV9zb2NrZXRBZGRyZXNzOyB9CiAgICAgICAgIHZvaWQg c2V0U29ja2V0QWRkcmVzcyhjb25zdCBTdHJpbmcmIHZhbHVlKSB7IG1fc29ja2V0QWRkcmVzcyA9 IHZhbHVlOyB9CisJCQorICAgICAgICBjb25zdCBTdHJpbmcmIGRvd25sb2FkRmlsZVBhdGgoKSBj b25zdCB7IHJldHVybiBtX2Rvd25sb2FkRmlsZVBhdGg7IH0KKyAgICAgICAgdm9pZCBzZXREb3du bG9hZEZpbGVQYXRoKGNvbnN0IFN0cmluZyYgZG93bmxvYWRGaWxlUGF0aCkgeyBtX2Rvd25sb2Fk RmlsZVBhdGggPSBkb3dubG9hZEZpbGVQYXRoOyB9CiAKICAgICBwcml2YXRlOgogICAgICAgICBm cmllbmQgY2xhc3MgUmVzb3VyY2VSZXNwb25zZUJhc2U7CkBAIC0xNTAsNiArMTUzLDkgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyBSZW1vdGUgYWRkcmVzcyBvZiB0aGUgc29ja2V0 IHdoaWNoIGZldGNoZWQgdGhpcyByZXNvdXJjZSwgZm9yIHByZXNlbnRpbmcKICAgICAgICAgLy8g dG8gaW5xdWlzaXRpdmUgdXNlcnMuICBDYW4gYmUgImlwdjQ6cG9ydCIsICJbaXB2Nl06cG9ydCIs IG9yIGVtcHR5LgogICAgICAgICBTdHJpbmcgbV9zb2NrZXRBZGRyZXNzOworCQkKKyAgICAgICAg Ly8gVGhlIHBhdGggdG8gdGhlIGRvd25sb2FkZWQgZmlsZS4KKyAgICAgICAgU3RyaW5nIG1fZG93 bmxvYWRGaWxlUGF0aDsKICAgICB9OwogCiAgICAgc3RydWN0IENyb3NzVGhyZWFkUmVzb3VyY2VS ZXNwb25zZURhdGEgOiBwdWJsaWMgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlc3BvbnNlRGF0YUJhc2Ug ewpAQCAtMTYzLDYgKzE2OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBt X3dhc0ZldGNoZWRWaWFQcm94eTsKICAgICAgICAgZG91YmxlIG1fcmVzcG9uc2VUaW1lOwogICAg ICAgICBTdHJpbmcgbV9zb2NrZXRBZGRyZXNzOworICAgICAgICBTdHJpbmcgbV9kb3dubG9hZEZp bGVQYXRoOwogICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK 81960 2011-02-10 05:45:38 -0800 2011-02-10 09:54:01 -0800 Proposed patch cors1.txt text/plain 6536 bbudge SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4MjA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDItMTAgIGJpbGxidWRn ZSAgPGJidWRnZUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIGZpZWxkcyB0byBSZXNvdXJjZVJlcXVlc3QgYW5kIFJlc291 cmNlUmVzcG9uc2UgaW4gcHJlcGFyYXRpb24gZm9yIGFkZGluZyBDT1JTIHN1cHBvcnQgdG8gQXNz b2NpYXRlZFVSTExvYWRlci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTUzOTI1CisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jl c291cmNlUmVxdWVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmRv UGxhdGZvcm1Db3B5RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmRv UGxhdGZvcm1BZG9wdCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNv dXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6UmVzb3Vy Y2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6ZG93bmxvYWRU b0ZpbGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpzZXREb3dubG9hZFRv RmlsZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3Bv bnNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OmRvUGxhdGZvcm1D b3B5RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpkb1BsYXRmb3Jt QWRvcHQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNw b25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6ZG93bmxvYWRGaWxl UGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpzZXREb3dubG9hZEZp bGVQYXRoKToKKwogMjAxMS0wMi0xMCAgdGFrYW5vIHRha3VtaSAgPHRha2Fub0BhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4gCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJj ZVJlcXVlc3QuY3BwCShyZXZpc2lvbiA3NzgzMykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAt NDMsNiArNDMsNyBAQCBQYXNzT3duUHRyPENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0CiAg ICAgZGF0YS0+bV9yZXF1ZXN0b3JQcm9jZXNzSUQgPSBtX3JlcXVlc3RvclByb2Nlc3NJRDsKICAg ICBkYXRhLT5tX2FwcENhY2hlSG9zdElEID0gbV9hcHBDYWNoZUhvc3RJRDsKICAgICBkYXRhLT5t X2hhc1VzZXJHZXN0dXJlID0gbV9oYXNVc2VyR2VzdHVyZTsKKyAgICBkYXRhLT5tX2Rvd25sb2Fk VG9GaWxlID0gbV9kb3dubG9hZFRvRmlsZTsKICAgICByZXR1cm4gZGF0YTsKIH0KIApAQCAtNTIs NiArNTMsNyBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9QbGF0Zm9ybUFkb3B0KFBhCiAgICAg bV9yZXF1ZXN0b3JQcm9jZXNzSUQgPSBkYXRhLT5tX3JlcXVlc3RvclByb2Nlc3NJRDsKICAgICBt X2FwcENhY2hlSG9zdElEID0gZGF0YS0+bV9hcHBDYWNoZUhvc3RJRDsKICAgICBtX2hhc1VzZXJH ZXN0dXJlID0gZGF0YS0+bV9oYXNVc2VyR2VzdHVyZTsKKyAgICBtX2Rvd25sb2FkVG9GaWxlID0g ZGF0YS0+bV9kb3dubG9hZFRvRmlsZTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVl c3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9t aXVtL1Jlc291cmNlUmVxdWVzdC5oCShyZXZpc2lvbiA3NzgzMykKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgJKHdvcmtpbmcgY29w eSkKQEAgLTQyLDYgKzQyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBt X3JlcXVlc3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX2FwcENhY2hlSG9zdElEKDAp CiAgICAgICAgICAgICAsIG1faGFzVXNlckdlc3R1cmUoZmFsc2UpCisgICAgICAgICAgICAsIG1f ZG93bmxvYWRUb0ZpbGUoZmFsc2UpCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC01MSw2ICs1 Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9j ZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgwKQogICAgICAgICAgICAg LCBtX2hhc1VzZXJHZXN0dXJlKGZhbHNlKQorICAgICAgICAgICAgLCBtX2Rvd25sb2FkVG9GaWxl KGZhbHNlKQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtNjAsNiArNjIsNyBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCiAgICAg ICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKICAgICAgICAgICAgICwgbV9oYXNVc2VyR2Vz dHVyZShmYWxzZSkKKyAgICAgICAgICAgICwgbV9kb3dubG9hZFRvRmlsZShmYWxzZSkKICAgICAg ICAgewogICAgICAgICAgICAgc2V0SFRUUFJlZmVycmVyKHJlZmVycmVyKTsKICAgICAgICAgfQpA QCAtNzAsNiArNzMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVx dWVzdG9yUHJvY2Vzc0lEKDApCiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKICAg ICAgICAgICAgICwgbV9oYXNVc2VyR2VzdHVyZShmYWxzZSkKKyAgICAgICAgICAgICwgbV9kb3du bG9hZFRvRmlsZShmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTkyLDYgKzk2LDEw IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBoYXNVc2VyR2VzdHVyZSgpIGNv bnN0IHsgcmV0dXJuIG1faGFzVXNlckdlc3R1cmU7IH0KICAgICAgICAgdm9pZCBzZXRIYXNVc2Vy R2VzdHVyZShib29sIGhhc1VzZXJHZXN0dXJlKSB7IG1faGFzVXNlckdlc3R1cmUgPSBoYXNVc2Vy R2VzdHVyZTsgfQogCisgICAgICAgIC8vIFRydWUgaWYgcmVxdWVzdCBzaG91bGQgYmUgZG93bmxv YWRlZCB0byBmaWxlLgorICAgICAgICBib29sIGRvd25sb2FkVG9GaWxlKCkgY29uc3QgeyByZXR1 cm4gbV9kb3dubG9hZFRvRmlsZTsgfQorICAgICAgICB2b2lkIHNldERvd25sb2FkVG9GaWxlKGJv b2wgZG93bmxvYWRUb0ZpbGUpIHsgbV9kb3dubG9hZFRvRmlsZSA9IGRvd25sb2FkVG9GaWxlOyB9 CisKICAgICBwcml2YXRlOgogICAgICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXF1ZXN0QmFz ZTsKIApAQCAtMTA1LDYgKzExMyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50 IG1fcmVxdWVzdG9yUHJvY2Vzc0lEOwogICAgICAgICBpbnQgbV9hcHBDYWNoZUhvc3RJRDsKICAg ICAgICAgYm9vbCBtX2hhc1VzZXJHZXN0dXJlOworICAgICAgICBib29sIG1fZG93bmxvYWRUb0Zp bGU7CiAgICAgfTsKIAogICAgIHN0cnVjdCBDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdGEg OiBwdWJsaWMgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVlc3REYXRhQmFzZSB7CkBAIC0xMTIsNiAr MTIxLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBpbnQgbV9yZXF1ZXN0b3JQcm9j ZXNzSUQ7CiAgICAgICAgIGludCBtX2FwcENhY2hlSG9zdElEOwogICAgICAgICBib29sIG1faGFz VXNlckdlc3R1cmU7CisgICAgICAgIGJvb2wgbV9kb3dubG9hZFRvRmlsZTsKICAgICB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5jcHAJKHJl dmlzaW9uIDc3ODMzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1 bS9SZXNvdXJjZVJlc3BvbnNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAsNiArNDAsNyBAQCBQ YXNzT3duUHRyPENyb3NzVGhyZWFkUmVzb3VyY2VSZXNwb25zZURhCiAgICAgZGF0YS0+bV93YXNG ZXRjaGVkVmlhUHJveHkgPSBtX3dhc0ZldGNoZWRWaWFQcm94eTsKICAgICBkYXRhLT5tX3Jlc3Bv bnNlVGltZSA9IG1fcmVzcG9uc2VUaW1lOwogICAgIGRhdGEtPm1fc29ja2V0QWRkcmVzcyA9IG1f c29ja2V0QWRkcmVzczsKKyAgICBkYXRhLT5tX2Rvd25sb2FkRmlsZVBhdGggPSBtX2Rvd25sb2Fk RmlsZVBhdGg7CiAgICAgcmV0dXJuIGRhdGE7CiB9CiAKQEAgLTU1LDYgKzU2LDcgQEAgdm9pZCBS ZXNvdXJjZVJlc3BvbnNlOjpkb1BsYXRmb3JtQWRvcHQoUAogICAgIG1fd2FzRmV0Y2hlZFZpYVBy b3h5ID0gZGF0YS0+bV93YXNGZXRjaGVkVmlhUHJveHk7CiAgICAgbV9yZXNwb25zZVRpbWUgPSBk YXRhLT5tX3Jlc3BvbnNlVGltZTsKICAgICBtX3NvY2tldEFkZHJlc3MgPSBkYXRhLT5tX3NvY2tl dEFkZHJlc3M7CisgICAgbV9kb3dubG9hZEZpbGVQYXRoID0gZGF0YS0+bV9kb3dubG9hZEZpbGVQ YXRoOwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9u c2UuaAkocmV2aXNpb24gNzc4MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAkod29ya2luZyBjb3B5KQpAQCAtOTksNiArOTks OSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGNvbnN0IFN0cmluZyYgc29ja2V0QWRk cmVzcygpIGNvbnN0IHsgcmV0dXJuIG1fc29ja2V0QWRkcmVzczsgfQogICAgICAgICB2b2lkIHNl dFNvY2tldEFkZHJlc3MoY29uc3QgU3RyaW5nJiB2YWx1ZSkgeyBtX3NvY2tldEFkZHJlc3MgPSB2 YWx1ZTsgfQogCisgICAgICAgIGNvbnN0IFN0cmluZyYgZG93bmxvYWRGaWxlUGF0aCgpIGNvbnN0 IHsgcmV0dXJuIG1fZG93bmxvYWRGaWxlUGF0aDsgfQorICAgICAgICB2b2lkIHNldERvd25sb2Fk RmlsZVBhdGgoY29uc3QgU3RyaW5nJiBkb3dubG9hZEZpbGVQYXRoKSB7IG1fZG93bmxvYWRGaWxl UGF0aCA9IGRvd25sb2FkRmlsZVBhdGg7IH0KKwogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVu ZCBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlQmFzZTsKIApAQCAtMTUwLDYgKzE1Myw5IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgLy8gUmVtb3RlIGFkZHJlc3Mgb2YgdGhlIHNvY2tldCB3 aGljaCBmZXRjaGVkIHRoaXMgcmVzb3VyY2UsIGZvciBwcmVzZW50aW5nCiAgICAgICAgIC8vIHRv IGlucXVpc2l0aXZlIHVzZXJzLiAgQ2FuIGJlICJpcHY0OnBvcnQiLCAiW2lwdjZdOnBvcnQiLCBv ciBlbXB0eS4KICAgICAgICAgU3RyaW5nIG1fc29ja2V0QWRkcmVzczsKKworICAgICAgICAvLyBU aGUgcGF0aCB0byB0aGUgZG93bmxvYWRlZCBmaWxlLgorICAgICAgICBTdHJpbmcgbV9kb3dubG9h ZEZpbGVQYXRoOwogICAgIH07CiAKICAgICBzdHJ1Y3QgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlc3Bv bnNlRGF0YSA6IHB1YmxpYyBDcm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VEYXRhQmFzZSB7CkBA IC0xNjMsNiArMTY5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fd2Fz RmV0Y2hlZFZpYVByb3h5OwogICAgICAgICBkb3VibGUgbV9yZXNwb25zZVRpbWU7CiAgICAgICAg IFN0cmluZyBtX3NvY2tldEFkZHJlc3M7CisgICAgICAgIFN0cmluZyBtX2Rvd25sb2FkRmlsZVBh dGg7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 81996 2011-02-10 09:52:10 -0800 2011-02-10 11:50:49 -0800 Proposed Patch cors1.txt text/plain 6537 bbudge SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc4MjA4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjQgQEAKKzIwMTEtMDItMTAgIEJpbGwgQnVk Z2UgIDxiYnVkZ2VAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEFkZCBmaWVsZHMgdG8gUmVzb3VyY2VSZXF1ZXN0IGFuZCBSZXNv dXJjZVJlc3BvbnNlIGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgQ09SUyBzdXBwb3J0IHRvIEFz c29jaWF0ZWRVUkxMb2FkZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD01MzkyNQorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9S ZXNvdXJjZVJlcXVlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpk b1BsYXRmb3JtQ29weURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpk b1BsYXRmb3JtQWRvcHQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVz b3VyY2VSZXF1ZXN0Lmg6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OlJlc291 cmNlUmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmRvd25sb2Fk VG9GaWxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdDo6c2V0RG93bmxvYWRU b0ZpbGUpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNw b25zZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpkb1BsYXRmb3Jt Q29weURhdGEpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6ZG9QbGF0Zm9y bUFkb3B0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVz cG9uc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OmRvd25sb2FkRmls ZVBhdGgpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6c2V0RG93bmxvYWRG aWxlUGF0aCk6CisKIDIwMTEtMDItMTAgIHRha2FubyB0YWt1bWkgIDx0YWthbm9AYXBwbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uIApJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3Vy Y2VSZXF1ZXN0LmNwcAkocmV2aXNpb24gNzc4MzMpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQzLDYgKzQzLDcgQEAgUGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVxdWVzdERhdAog ICAgIGRhdGEtPm1fcmVxdWVzdG9yUHJvY2Vzc0lEID0gbV9yZXF1ZXN0b3JQcm9jZXNzSUQ7CiAg ICAgZGF0YS0+bV9hcHBDYWNoZUhvc3RJRCA9IG1fYXBwQ2FjaGVIb3N0SUQ7CiAgICAgZGF0YS0+ bV9oYXNVc2VyR2VzdHVyZSA9IG1faGFzVXNlckdlc3R1cmU7CisgICAgZGF0YS0+bV9kb3dubG9h ZFRvRmlsZSA9IG1fZG93bmxvYWRUb0ZpbGU7CiAgICAgcmV0dXJuIGRhdGE7CiB9CiAKQEAgLTUy LDYgKzUzLDcgQEAgdm9pZCBSZXNvdXJjZVJlcXVlc3Q6OmRvUGxhdGZvcm1BZG9wdChQYQogICAg IG1fcmVxdWVzdG9yUHJvY2Vzc0lEID0gZGF0YS0+bV9yZXF1ZXN0b3JQcm9jZXNzSUQ7CiAgICAg bV9hcHBDYWNoZUhvc3RJRCA9IGRhdGEtPm1fYXBwQ2FjaGVIb3N0SUQ7CiAgICAgbV9oYXNVc2Vy R2VzdHVyZSA9IGRhdGEtPm1faGFzVXNlckdlc3R1cmU7CisgICAgbV9kb3dubG9hZFRvRmlsZSA9 IGRhdGEtPm1fZG93bmxvYWRUb0ZpbGU7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1 ZXN0LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJv bWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNzc4MzMpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCSh3b3JraW5nIGNv cHkpCkBAIC00Miw2ICs0Miw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgICwg bV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKICAgICAgICAgICAgICwgbV9hcHBDYWNoZUhvc3RJRCgw KQogICAgICAgICAgICAgLCBtX2hhc1VzZXJHZXN0dXJlKGZhbHNlKQorICAgICAgICAgICAgLCBt X2Rvd25sb2FkVG9GaWxlKGZhbHNlKQogICAgICAgICB7CiAgICAgICAgIH0KIApAQCAtNTEsNiAr NTIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJv Y2Vzc0lEKDApCiAgICAgICAgICAgICAsIG1fYXBwQ2FjaGVIb3N0SUQoMCkKICAgICAgICAgICAg ICwgbV9oYXNVc2VyR2VzdHVyZShmYWxzZSkKKyAgICAgICAgICAgICwgbV9kb3dubG9hZFRvRmls ZShmYWxzZSkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTYwLDYgKzYyLDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX3JlcXVlc3RvclByb2Nlc3NJRCgwKQogICAg ICAgICAgICAgLCBtX2FwcENhY2hlSG9zdElEKDApCiAgICAgICAgICAgICAsIG1faGFzVXNlckdl c3R1cmUoZmFsc2UpCisgICAgICAgICAgICAsIG1fZG93bmxvYWRUb0ZpbGUoZmFsc2UpCiAgICAg ICAgIHsKICAgICAgICAgICAgIHNldEhUVFBSZWZlcnJlcihyZWZlcnJlcik7CiAgICAgICAgIH0K QEAgLTcwLDYgKzczLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgLCBtX3Jl cXVlc3RvclByb2Nlc3NJRCgwKQogICAgICAgICAgICAgLCBtX2FwcENhY2hlSG9zdElEKDApCiAg ICAgICAgICAgICAsIG1faGFzVXNlckdlc3R1cmUoZmFsc2UpCisgICAgICAgICAgICAsIG1fZG93 bmxvYWRUb0ZpbGUoZmFsc2UpCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC05Miw2ICs5Niwx MCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgaGFzVXNlckdlc3R1cmUoKSBj b25zdCB7IHJldHVybiBtX2hhc1VzZXJHZXN0dXJlOyB9CiAgICAgICAgIHZvaWQgc2V0SGFzVXNl ckdlc3R1cmUoYm9vbCBoYXNVc2VyR2VzdHVyZSkgeyBtX2hhc1VzZXJHZXN0dXJlID0gaGFzVXNl ckdlc3R1cmU7IH0KIAorICAgICAgICAvLyBUcnVlIGlmIHJlcXVlc3Qgc2hvdWxkIGJlIGRvd25s b2FkZWQgdG8gZmlsZS4KKyAgICAgICAgYm9vbCBkb3dubG9hZFRvRmlsZSgpIGNvbnN0IHsgcmV0 dXJuIG1fZG93bmxvYWRUb0ZpbGU7IH0KKyAgICAgICAgdm9pZCBzZXREb3dubG9hZFRvRmlsZShi b29sIGRvd25sb2FkVG9GaWxlKSB7IG1fZG93bmxvYWRUb0ZpbGUgPSBkb3dubG9hZFRvRmlsZTsg fQorCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5kIGNsYXNzIFJlc291cmNlUmVxdWVzdEJh c2U7CiAKQEAgLTEwNSw2ICsxMTMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGlu dCBtX3JlcXVlc3RvclByb2Nlc3NJRDsKICAgICAgICAgaW50IG1fYXBwQ2FjaGVIb3N0SUQ7CiAg ICAgICAgIGJvb2wgbV9oYXNVc2VyR2VzdHVyZTsKKyAgICAgICAgYm9vbCBtX2Rvd25sb2FkVG9G aWxlOwogICAgIH07CiAKICAgICBzdHJ1Y3QgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlcXVlc3REYXRh IDogcHVibGljIENyb3NzVGhyZWFkUmVzb3VyY2VSZXF1ZXN0RGF0YUJhc2UgewpAQCAtMTEyLDYg KzEyMSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50IG1fcmVxdWVzdG9yUHJv Y2Vzc0lEOwogICAgICAgICBpbnQgbV9hcHBDYWNoZUhvc3RJRDsKICAgICAgICAgYm9vbCBtX2hh c1VzZXJHZXN0dXJlOworICAgICAgICBib29sIG1fZG93bmxvYWRUb0ZpbGU7CiAgICAgfTsKIAog fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuY3BwCShy ZXZpc2lvbiA3NzgzMykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21p dW0vUmVzb3VyY2VSZXNwb25zZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcgQEAg UGFzc093blB0cjxDcm9zc1RocmVhZFJlc291cmNlUmVzcG9uc2VEYQogICAgIGRhdGEtPm1fd2Fz RmV0Y2hlZFZpYVByb3h5ID0gbV93YXNGZXRjaGVkVmlhUHJveHk7CiAgICAgZGF0YS0+bV9yZXNw b25zZVRpbWUgPSBtX3Jlc3BvbnNlVGltZTsKICAgICBkYXRhLT5tX3NvY2tldEFkZHJlc3MgPSBt X3NvY2tldEFkZHJlc3M7CisgICAgZGF0YS0+bV9kb3dubG9hZEZpbGVQYXRoID0gbV9kb3dubG9h ZEZpbGVQYXRoOwogICAgIHJldHVybiBkYXRhOwogfQogCkBAIC01NSw2ICs1Niw3IEBAIHZvaWQg UmVzb3VyY2VSZXNwb25zZTo6ZG9QbGF0Zm9ybUFkb3B0KFAKICAgICBtX3dhc0ZldGNoZWRWaWFQ cm94eSA9IGRhdGEtPm1fd2FzRmV0Y2hlZFZpYVByb3h5OwogICAgIG1fcmVzcG9uc2VUaW1lID0g ZGF0YS0+bV9yZXNwb25zZVRpbWU7CiAgICAgbV9zb2NrZXRBZGRyZXNzID0gZGF0YS0+bV9zb2Nr ZXRBZGRyZXNzOworICAgIG1fZG93bmxvYWRGaWxlUGF0aCA9IGRhdGEtPm1fZG93bmxvYWRGaWxl UGF0aDsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3Bv bnNlLmgJKHJldmlzaW9uIDc3ODMzKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTk5LDYgKzk5 LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBjb25zdCBTdHJpbmcmIHNvY2tldEFk ZHJlc3MoKSBjb25zdCB7IHJldHVybiBtX3NvY2tldEFkZHJlc3M7IH0KICAgICAgICAgdm9pZCBz ZXRTb2NrZXRBZGRyZXNzKGNvbnN0IFN0cmluZyYgdmFsdWUpIHsgbV9zb2NrZXRBZGRyZXNzID0g dmFsdWU7IH0KIAorICAgICAgICBjb25zdCBTdHJpbmcmIGRvd25sb2FkRmlsZVBhdGgoKSBjb25z dCB7IHJldHVybiBtX2Rvd25sb2FkRmlsZVBhdGg7IH0KKyAgICAgICAgdm9pZCBzZXREb3dubG9h ZEZpbGVQYXRoKGNvbnN0IFN0cmluZyYgZG93bmxvYWRGaWxlUGF0aCkgeyBtX2Rvd25sb2FkRmls ZVBhdGggPSBkb3dubG9hZEZpbGVQYXRoOyB9CisKICAgICBwcml2YXRlOgogICAgICAgICBmcmll bmQgY2xhc3MgUmVzb3VyY2VSZXNwb25zZUJhc2U7CiAKQEAgLTE1MCw2ICsxNTMsOSBAQCBuYW1l c3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIC8vIFJlbW90ZSBhZGRyZXNzIG9mIHRoZSBzb2NrZXQg d2hpY2ggZmV0Y2hlZCB0aGlzIHJlc291cmNlLCBmb3IgcHJlc2VudGluZwogICAgICAgICAvLyB0 byBpbnF1aXNpdGl2ZSB1c2Vycy4gIENhbiBiZSAiaXB2NDpwb3J0IiwgIltpcHY2XTpwb3J0Iiwg b3IgZW1wdHkuCiAgICAgICAgIFN0cmluZyBtX3NvY2tldEFkZHJlc3M7CisKKyAgICAgICAgLy8g VGhlIHBhdGggdG8gdGhlIGRvd25sb2FkZWQgZmlsZS4KKyAgICAgICAgU3RyaW5nIG1fZG93bmxv YWRGaWxlUGF0aDsKICAgICB9OwogCiAgICAgc3RydWN0IENyb3NzVGhyZWFkUmVzb3VyY2VSZXNw b25zZURhdGEgOiBwdWJsaWMgQ3Jvc3NUaHJlYWRSZXNvdXJjZVJlc3BvbnNlRGF0YUJhc2UgewpA QCAtMTYzLDYgKzE2OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX3dh c0ZldGNoZWRWaWFQcm94eTsKICAgICAgICAgZG91YmxlIG1fcmVzcG9uc2VUaW1lOwogICAgICAg ICBTdHJpbmcgbV9zb2NrZXRBZGRyZXNzOworICAgICAgICBTdHJpbmcgbV9kb3dubG9hZEZpbGVQ YXRoOwogICAgIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUK