24897 2009-03-27 14:21:01 -0700 Chromium's ResourceRequest and ResourceResponse structs need some new data members. 2009-04-02 13:00:37 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 michaeln michaeln fishd michaeln oldest_to_newest 115597 0 michaeln 2009-03-27 14:21:01 -0700 Chromium's ResponseRequest and ResourceResponse structs need some new data members... patch soon to follow. 115598 1 29024 michaeln 2009-03-27 14:25:11 -0700 Created attachment 29024 A simple patch 115600 2 michaeln 2009-03-27 14:31:26 -0700 Oh... this has a companion CL in chromium... http://codereview.chromium.org/9712/show 115605 3 fishd 2009-03-27 14:37:19 -0700 Can you add a comment here explaining why these members are needed? 115611 4 michaeln 2009-03-27 14:48:14 -0700 Sure... These fields are needed to facilitate Chromium's implementation of the HTML5 ApplicationCache feature. We need to know what frame(or context) is doing the requesting, and from what cache the resulting resource was retrieved. 115631 5 levin 2009-03-27 15:40:07 -0700 Misc style notes: 1. Don't fill in the requestee field unless only that person can do the review. 2. Do this "<set EMAIL_ADDRESS environment variable>" and fix that in the changelog. 3. Add some explanation of the change to the ChangeLog. 4. Add a link to the bug in the ChangeLog. 5. Remove WARNING: NO TEST CASES ADDED OR CHANGED from the change log and add a test or explain why there shouldn't be one. (For example, if there is no change in functionality, then "No change in functionality, so no test." usually suffices.) 6. Format C++ initializers like this: MyClass::MyClass(Document* doc) : MySuperClass() , m_myMember(0) , m_doc(doc) { } 7. Function definitions: place each brace on its own line. 8. The indent size is 4 spaces. 115635 6 29030 michaeln 2009-03-27 15:55:57 -0700 Created attachment 29030 new patch snapshot #2 Thnx David, new snapshot uploaded. 115869 7 fishd 2009-03-30 12:59:14 -0700 > These fields are needed to facilitate Chromium's implementation of the HTML5 > ApplicationCache feature. We need to know what frame(or context) is doing the > requesting, and from what cache the resulting resource was retrieved. How come the other ports don't need this? I'm trying to understand why we need to be divergent here. 115874 8 michaeln 2009-03-30 13:39:19 -0700 > How come the other ports don't need this? I'm trying to understand why we need > to be divergent here. AFAIK, no other port implements the AppCache functionality in the embedder side of things. Please refer to the companion CL for chromium. http://codereview.chromium.org/9712/show 116092 9 29030 fishd 2009-03-31 16:18:28 -0700 Comment on attachment 29030 new patch snapshot #2 OK. Thanks for adding the reference to the Chromium CL here. That helps others understand this design as well :) >Index: WebCore/ChangeLog >+ Chromium's ResourceRequest and ResourceResponse structs need some new data members. >+ >+ These fields are needed to facilitate Chromium's implementation of the HTML5 >+ ApplicationCache feature. We need to know what frame(or context) is doing the nit: Need a space after "frame" >+ requesting, and from what cache the resulting resource was retrieved. >+ >+ No change in functionality, so no tests. Please include a bug link in your ChangeLog entry. >Index: WebCore/platform/network/chromium/ResourceResponse.h >+ // The id of the appcache this response was retrieved from, >+ // or kNoAppCacheID (0) >+ int64 m_appCacheID; Where is kNoAppCacheID defined? also, how come the contextID is 32-bits but the CacheID is 64-bits? 116093 10 michaeln 2009-03-31 16:26:48 -0700 >+ // The id of the appcache this response was retrieved from, >+ // or kNoAppCacheID (0) >+ int64 m_appCacheID; Where is kNoAppCacheID defined? also, how come the contextID is 32-bits but the CacheID is 64-bits? The kNoAppCacheID constant is defined in chromium's webkit glue, webappcachecontext.h. This id corresponds with a sqlite rowid, its 64 bits to keep full fidelity with how sqlite rowids are defined. >+ ChangeLog edits WIll do... will upload a new patch with changelog mods once we gotten to final edits on the .h file. 116099 11 fishd 2009-03-31 17:04:18 -0700 > The kNoAppCacheID constant is defined in chromium's webkit glue, > webappcachecontext.h. This id corresponds with a sqlite rowid, its 64 bits to > keep full fidelity with how sqlite rowids are defined. Ah, OK. So that violates dependencies. glue can depend on webcore, but webcore cannot depend directly on glue. In other words, webcore (even the chromium port of webcore) needs to stand on its own. 116103 12 michaeln 2009-03-31 17:13:55 -0700 Yes, this is why the symbol kNoAppCacheID does not appear in the ctor of this struct. The value 0 is used directly. 116106 13 michaeln 2009-03-31 17:20:51 -0700 How 'bout I remove the reference to kNoAppCacheID in the comment. I don't see how is this any different than having a requestorID data member that is initialized to zero? What does requestorID mean in webcore (sans chromium) speak? 116326 14 29202 michaeln 2009-04-02 11:23:43 -0700 Created attachment 29202 take 3 New patch uploaded * added bug link the the changelog * removed reference to kNoAppCacheID from comment 116333 15 fishd 2009-04-02 12:51:27 -0700 > I don't see how is this any different than having a requestorID data member > that is initialized to zero? What does requestorID mean in webcore (sans > chromium) speak? It is an identifier that the requestor is free to define. What it means in Chrome-land doesn't matter. 116335 16 29202 fishd 2009-04-02 12:59:12 -0700 Comment on attachment 29202 take 3 >+2009-03-27 michaeln <michaeln@google.com> For future changes, please be sure to have the REAL_NAME environment variable defined so that the ChangeLog includes your full name. It is WebKit convention to do so. 116336 17 fishd 2009-04-02 13:00:37 -0700 Landed as: http://trac.webkit.org/changeset/42180 29024 2009-03-27 14:25:11 -0700 2009-03-27 15:55:57 -0700 A simple patch AppCachePlumbing.patch.txt text/plain 5090 michaeln SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjA0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDMtMjcgIG1pY2hhZWxuICA8c2V0IEVNQUlMX0FERFJFU1Mg ZW52aXJvbm1lbnQgdmFyaWFibGU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV0FSTklORzogTk8gVEVTVCBDQVNFUyBBRERFRCBPUiBDSEFOR0VECisK KyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oOgor ICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXNvdXJjZVJlcXVlc3QpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjphcHBDYWNoZUNvbnRleHRJRCk6CisgICAg ICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OnNldEFwcENhY2hlQ29udGV4dElEKToKKyAg ICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OlJlc291cmNlUmVzcG9uc2UpOgorICAg ICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6Z2V0QXBwQ2FjaGVJRCk6CisgICAgICAg IChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpzZXRBcHBDYWNoZUlEKToKKwogMjAwOS0wMy0y NyAgRGlyayBTY2h1bHplICA8a3JpdEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEVyaWMgU2VpZGVsLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jl c291cmNlUmVxdWVzdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9j aHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNDIwMTYpCisrKyBXZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgJKHdvcmtpbmcgY29weSkK QEAgLTQ5LDYgKzQ5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgOiBSZXNv dXJjZVJlcXVlc3RCYXNlKEtVUkwodXJsKSwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKICAgICAg ICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBtX3JlcXVlc3RvclByb2Nl c3NJRCgwKQorICAgICAgICAgICAgLCBtX2FwcENhY2hlQ29udGV4dElEKDApCiAgICAgICAgICAg ICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAgICAg IH0KQEAgLTU3LDYgKzU4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgOiBS ZXNvdXJjZVJlcXVlc3RCYXNlKHVybCwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKICAgICAgICAg ICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBtX3JlcXVlc3RvclByb2Nlc3NJ RCgwKQorICAgICAgICAgICAgLCBtX2FwcENhY2hlQ29udGV4dElEKDApCiAgICAgICAgICAgICAs IG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICAgICAgLCBtX3NlY3Vy aXR5SW5mbyhzZWN1cml0eUluZm8pCiAgICAgICAgIHsKQEAgLTY2LDYgKzY4LDcgQEAgbmFtZXNw YWNlIFdlYkNvcmUgewogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKHVybCwgVXNl UHJvdG9jb2xDYWNoZVBvbGljeSkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAg ICAgICAgICAgLCBtX3JlcXVlc3RvclByb2Nlc3NJRCgwKQorICAgICAgICAgICAgLCBtX2FwcENh Y2hlQ29udGV4dElEKDApCiAgICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJl c291cmNlKQogICAgICAgICB7CiAgICAgICAgIH0KQEAgLTc0LDYgKzc3LDcgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKHVybCwgcG9saWN5 KQogICAgICAgICAgICAgLCBtX3JlcXVlc3RvcklEKDApCiAgICAgICAgICAgICAsIG1fcmVxdWVz dG9yUHJvY2Vzc0lEKDApCisgICAgICAgICAgICAsIG1fYXBwQ2FjaGVDb250ZXh0SUQoMCkKICAg ICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgIHsK ICAgICAgICAgICAgIHNldEhUVFBSZWZlcnJlcihyZWZlcnJlcik7CkBAIC04Myw2ICs4Nyw3IEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZShL VVJMKCksIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9y SUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKKyAgICAgICAgICAg ICwgbV9hcHBDYWNoZUNvbnRleHRJRCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFy Z2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CkBAIC0xMDYsNiArMTExLDEw IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgaW50IHJlcXVlc3RvclByb2Nlc3NJRCgp IGNvbnN0IHsgcmV0dXJuIG1fcmVxdWVzdG9yUHJvY2Vzc0lEOyB9CiAgICAgICAgIHZvaWQgc2V0 UmVxdWVzdG9yUHJvY2Vzc0lEKGludCByZXF1ZXN0b3JQcm9jZXNzSUQpIHsgbV9yZXF1ZXN0b3JQ cm9jZXNzSUQgPSByZXF1ZXN0b3JQcm9jZXNzSUQ7IH0KIAorICAgICAgICAvLyBBbGxvd3MgdGhl IHJlcXVlc3QgdG8gYmUgbWF0Y2hlZCB1cCB3aXRoIGl0cyBhcHAgY2FjaGUgY29udGV4dC4KKyAg ICAgICAgaW50IGFwcENhY2hlQ29udGV4dElEKCkgY29uc3QgeyByZXR1cm4gbV9hcHBDYWNoZUNv bnRleHRJRDsgfQorICAgICAgICB2b2lkIHNldEFwcENhY2hlQ29udGV4dElEKGludCBpZCkgeyBt X2FwcENhY2hlQ29udGV4dElEID0gaWQ7IH0KKwogICAgICAgICAvLyBPcGFxdWUgYnVmZmVyIHRo YXQgZGVzY3JpYmVzIHRoZSBzZWN1cml0eSBzdGF0ZSAoaW5jbHVkaW5nIFNTTAogICAgICAgICAv LyBjb25uZWN0aW9uIHN0YXRlKSBmb3IgdGhlIHJlc291cmNlIHRoYXQgc2hvdWxkIGJlIHJlcG9y dGVkIHdoZW4gdGhlCiAgICAgICAgIC8vIHJlc291cmNlIGhhcyBiZWVuIGxvYWRlZC4gIFRoaXMg aXMgdXNlZCB0byBzaW11bGF0ZSBzZWN1cmUKQEAgLTEyMyw2ICsxMzIsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKICAgICAgICAgaW50IG1fcmVxdWVzdG9ySUQ7CiAgICAgICAgIGludCBtX3Jl cXVlc3RvclByb2Nlc3NJRDsKKyAgICAgICAgaW50IG1fYXBwQ2FjaGVDb250ZXh0SUQ7CiAgICAg ICAgIFRhcmdldFR5cGUgbV90YXJnZXRUeXBlOwogICAgICAgICBDU3RyaW5nIG1fc2VjdXJpdHlJ bmZvOwogICAgICAgICBLVVJMIG1fcG9saWN5VVJMOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCShyZXZpc2lvbiA0 MjAxNikKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3Bv bnNlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM2LDEzICszNiwxMyBAQCBuYW1lc3BhY2UgV2ViQ29y ZSB7CiAgICAgY2xhc3MgUmVzb3VyY2VSZXNwb25zZSA6IHB1YmxpYyBSZXNvdXJjZVJlc3BvbnNl QmFzZSB7CiAgICAgcHVibGljOgogICAgICAgICBSZXNvdXJjZVJlc3BvbnNlKCkKLSAgICAgICAg ICAgIDogbV9pc0NvbnRlbnRGaWx0ZXJlZChmYWxzZSkKKyAgICAgICAgICAgIDogbV9pc0NvbnRl bnRGaWx0ZXJlZChmYWxzZSksIG1fYXBwQ2FjaGVJRCgwKQogICAgICAgICB7CiAgICAgICAgIH0K IAogICAgICAgICBSZXNvdXJjZVJlc3BvbnNlKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5n JiBtaW1lVHlwZSwgbG9uZyBsb25nIGV4cGVjdGVkTGVuZ3RoLCBjb25zdCBTdHJpbmcmIHRleHRF bmNvZGluZ05hbWUsIGNvbnN0IFN0cmluZyYgZmlsZW5hbWUpCiAgICAgICAgICAgICA6IFJlc291 cmNlUmVzcG9uc2VCYXNlKHVybCwgbWltZVR5cGUsIGV4cGVjdGVkTGVuZ3RoLCB0ZXh0RW5jb2Rp bmdOYW1lLCBmaWxlbmFtZSksCi0gICAgICAgICAgICAgIG1faXNDb250ZW50RmlsdGVyZWQoZmFs c2UpCisgICAgICAgICAgICAgIG1faXNDb250ZW50RmlsdGVyZWQoZmFsc2UpLCBtX2FwcENhY2hl SUQoMCkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTU4LDYgKzU4LDExIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgICAgIG1faXNDb250ZW50RmlsdGVyZWQgPSBpc0NvbnRlbnRG aWx0ZXJlZDsKICAgICAgICAgfQogCisgICAgICAgIGludDY0IGdldEFwcENhY2hlSUQoKSBjb25z dCB7IHJldHVybiBtX2FwcENhY2hlSUQ7IH0KKyAgICAgICAgdm9pZCBzZXRBcHBDYWNoZUlEKGlu dDY0IGlkKSB7CisgICAgICAgICAgbV9hcHBDYWNoZUlEID0gaWQ7CisgICAgICAgIH0KKwogICAg IHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlQmFzZTsKIApA QCAtNzQsNiArNzksMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAvLyBXaGV0aGVy IHRoZSBjb250ZW50cyBmb3IgdGhpcyByZXNwb25zZSBoYXMgYmVlbiBhbHRlcmVkL2Jsb2NrZWQg KHVzdWFsbHkKICAgICAgICAgLy8gZm9yIHNlY3VyaXR5IHJlYXNvbnMuCiAgICAgICAgIGJvb2wg bV9pc0NvbnRlbnRGaWx0ZXJlZDsKKworICAgICAgICAvLyBUaGUgaWQgb2YgdGhlIGFwcGNhY2hl IHRoaXMgcmVzcG9uc2Ugd2FzIHJldHJpZXZlZCBmcm9tLAorICAgICAgICAvLyBvciBrTm9BcHBD YWNoZUlEICgwKQorICAgICAgICBpbnQ2NCBtX2FwcENhY2hlSUQ7CiAgICAgfTsKIAogfSAvLyBu YW1lc3BhY2UgV2ViQ29yZQo= 29030 2009-03-27 15:55:57 -0700 2009-04-02 11:23:43 -0700 new patch snapshot #2 AppCachePlumbing.patch2.txt text/plain 5453 michaeln SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjA0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDktMDMtMjcgIG1pY2hhZWxuICA8bWljaGFlbG5AZ29vZ2xlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaHJv bWl1bSdzIFJlc291cmNlUmVxdWVzdCBhbmQgUmVzb3VyY2VSZXNwb25zZSBzdHJ1Y3RzIG5lZWQg c29tZSBuZXcgZGF0YSBtZW1iZXJzLgorCisgICAgICAgIFRoZXNlIGZpZWxkcyBhcmUgbmVlZGVk IHRvIGZhY2lsaXRhdGUgQ2hyb21pdW0ncyBpbXBsZW1lbnRhdGlvbiBvZiB0aGUgSFRNTDUKKyAg ICAgICAgQXBwbGljYXRpb25DYWNoZSBmZWF0dXJlLiBXZSBuZWVkIHRvIGtub3cgd2hhdCBmcmFt ZShvciBjb250ZXh0KSBpcyBkb2luZyB0aGUKKyAgICAgICAgcmVxdWVzdGluZywgYW5kIGZyb20g d2hhdCBjYWNoZSB0aGUgcmVzdWx0aW5nIHJlc291cmNlIHdhcyByZXRyaWV2ZWQuCisKKyAgICAg ICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHksIHNvIG5vIHRlc3RzLgorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVlc3QuaDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdDo6UmVzb3VyY2VSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdDo6YXBwQ2FjaGVDb250ZXh0SUQpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0OjpzZXRBcHBDYWNoZUNvbnRleHRJRCk6CisgICAgICAgICogcGxh dGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmg6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZVJlc3BvbnNlOjpSZXNvdXJjZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2U6OmdldEFwcENhY2hlSUQpOgorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VSZXNwb25zZTo6c2V0QXBwQ2FjaGVJRCk6CisKIDIwMDktMDMtMjcgIERpcmsgU2No dWx6ZSAgPGtyaXRAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBFcmljIFNlaWRl bC4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlcXVl c3QuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVz b3VyY2VSZXF1ZXN0LmgJKHJldmlzaW9uIDQyMDE2KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oCSh3b3JraW5nIGNvcHkpCkBAIC00OSw2ICs0 OSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0 QmFzZShLVVJMKHVybCksIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCiAgICAgICAgICAgICAsIG1f cmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKKyAg ICAgICAgICAgICwgbV9hcHBDYWNoZUNvbnRleHRJRCgwKQogICAgICAgICAgICAgLCBtX3Rhcmdl dFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgewogICAgICAgICB9CkBAIC01Nyw2 ICs1OCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1 ZXN0QmFzZSh1cmwsIFVzZVByb3RvY29sQ2FjaGVQb2xpY3kpCiAgICAgICAgICAgICAsIG1fcmVx dWVzdG9ySUQoMCkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKKyAgICAg ICAgICAgICwgbV9hcHBDYWNoZUNvbnRleHRJRCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5 cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAgICAgICAgICAgICwgbV9zZWN1cml0eUluZm8oc2Vj dXJpdHlJbmZvKQogICAgICAgICB7CkBAIC02Niw2ICs2OCw3IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1cmwsIFVzZVByb3RvY29sQ2Fj aGVQb2xpY3kpCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAgICAgICAgICwg bV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKKyAgICAgICAgICAgICwgbV9hcHBDYWNoZUNvbnRleHRJ RCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNvdXJjZSkKICAg ICAgICAgewogICAgICAgICB9CkBAIC03NCw2ICs3Nyw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZSh1cmwsIHBvbGljeSkKICAgICAgICAg ICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBtX3JlcXVlc3RvclByb2Nlc3NJ RCgwKQorICAgICAgICAgICAgLCBtX2FwcENhY2hlQ29udGV4dElEKDApCiAgICAgICAgICAgICAs IG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAgICAgICAg ICBzZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwpAQCAtODMsNiArODcsNyBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgICAgICA6IFJlc291cmNlUmVxdWVzdEJhc2UoS1VSTCgpLCBVc2VQ cm90b2NvbENhY2hlUG9saWN5KQogICAgICAgICAgICAgLCBtX3JlcXVlc3RvcklEKDApCiAgICAg ICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lEKDApCisgICAgICAgICAgICAsIG1fYXBwQ2Fj aGVDb250ZXh0SUQoMCkKICAgICAgICAgICAgICwgbV90YXJnZXRUeXBlKFRhcmdldElzU3ViUmVz b3VyY2UpCiAgICAgICAgIHsKICAgICAgICAgfQpAQCAtMTA2LDYgKzExMSwxMCBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAgICAgICAgIGludCByZXF1ZXN0b3JQcm9jZXNzSUQoKSBjb25zdCB7IHJl dHVybiBtX3JlcXVlc3RvclByb2Nlc3NJRDsgfQogICAgICAgICB2b2lkIHNldFJlcXVlc3RvclBy b2Nlc3NJRChpbnQgcmVxdWVzdG9yUHJvY2Vzc0lEKSB7IG1fcmVxdWVzdG9yUHJvY2Vzc0lEID0g cmVxdWVzdG9yUHJvY2Vzc0lEOyB9CiAKKyAgICAgICAgLy8gQWxsb3dzIHRoZSByZXF1ZXN0IHRv IGJlIG1hdGNoZWQgdXAgd2l0aCBpdHMgYXBwIGNhY2hlIGNvbnRleHQuCisgICAgICAgIGludCBh cHBDYWNoZUNvbnRleHRJRCgpIGNvbnN0IHsgcmV0dXJuIG1fYXBwQ2FjaGVDb250ZXh0SUQ7IH0K KyAgICAgICAgdm9pZCBzZXRBcHBDYWNoZUNvbnRleHRJRChpbnQgaWQpIHsgbV9hcHBDYWNoZUNv bnRleHRJRCA9IGlkOyB9CisKICAgICAgICAgLy8gT3BhcXVlIGJ1ZmZlciB0aGF0IGRlc2NyaWJl cyB0aGUgc2VjdXJpdHkgc3RhdGUgKGluY2x1ZGluZyBTU0wKICAgICAgICAgLy8gY29ubmVjdGlv biBzdGF0ZSkgZm9yIHRoZSByZXNvdXJjZSB0aGF0IHNob3VsZCBiZSByZXBvcnRlZCB3aGVuIHRo ZQogICAgICAgICAvLyByZXNvdXJjZSBoYXMgYmVlbiBsb2FkZWQuICBUaGlzIGlzIHVzZWQgdG8g c2ltdWxhdGUgc2VjdXJlCkBAIC0xMjMsNiArMTMyLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog CiAgICAgICAgIGludCBtX3JlcXVlc3RvcklEOwogICAgICAgICBpbnQgbV9yZXF1ZXN0b3JQcm9j ZXNzSUQ7CisgICAgICAgIGludCBtX2FwcENhY2hlQ29udGV4dElEOwogICAgICAgICBUYXJnZXRU eXBlIG1fdGFyZ2V0VHlwZTsKICAgICAgICAgQ1N0cmluZyBtX3NlY3VyaXR5SW5mbzsKICAgICAg ICAgS1VSTCBtX3BvbGljeVVSTDsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJv bWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaAkocmV2aXNpb24gNDIwMTYpCisrKyBX ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0zNywxMiArMzcsMTQgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIHB1 YmxpYzoKICAgICAgICAgUmVzb3VyY2VSZXNwb25zZSgpCiAgICAgICAgICAgICA6IG1faXNDb250 ZW50RmlsdGVyZWQoZmFsc2UpCisgICAgICAgICAgICAsIG1fYXBwQ2FjaGVJRCgwKQogICAgICAg ICB7CiAgICAgICAgIH0KIAogICAgICAgICBSZXNvdXJjZVJlc3BvbnNlKGNvbnN0IEtVUkwmIHVy bCwgY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgbG9uZyBsb25nIGV4cGVjdGVkTGVuZ3RoLCBjb25z dCBTdHJpbmcmIHRleHRFbmNvZGluZ05hbWUsIGNvbnN0IFN0cmluZyYgZmlsZW5hbWUpCi0gICAg ICAgICAgICA6IFJlc291cmNlUmVzcG9uc2VCYXNlKHVybCwgbWltZVR5cGUsIGV4cGVjdGVkTGVu Z3RoLCB0ZXh0RW5jb2RpbmdOYW1lLCBmaWxlbmFtZSksCi0gICAgICAgICAgICAgIG1faXNDb250 ZW50RmlsdGVyZWQoZmFsc2UpCisgICAgICAgICAgICA6IFJlc291cmNlUmVzcG9uc2VCYXNlKHVy bCwgbWltZVR5cGUsIGV4cGVjdGVkTGVuZ3RoLCB0ZXh0RW5jb2RpbmdOYW1lLCBmaWxlbmFtZSkK KyAgICAgICAgICAgICwgbV9pc0NvbnRlbnRGaWx0ZXJlZChmYWxzZSkKKyAgICAgICAgICAgICwg bV9hcHBDYWNoZUlEKDApCiAgICAgICAgIHsKICAgICAgICAgfQogCkBAIC01OCw2ICs2MCwxMiBA QCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgICAgICBtX2lzQ29udGVudEZpbHRlcmVkID0g aXNDb250ZW50RmlsdGVyZWQ7CiAgICAgICAgIH0KIAorICAgICAgICBpbnQ2NCBnZXRBcHBDYWNo ZUlEKCkgY29uc3QgeyByZXR1cm4gbV9hcHBDYWNoZUlEOyB9CisgICAgICAgIHZvaWQgc2V0QXBw Q2FjaGVJRChpbnQ2NCBpZCkKKyAgICAgICAgeworICAgICAgICAgICAgbV9hcHBDYWNoZUlEID0g aWQ7CisgICAgICAgIH0KKwogICAgIHByaXZhdGU6CiAgICAgICAgIGZyaWVuZCBjbGFzcyBSZXNv dXJjZVJlc3BvbnNlQmFzZTsKIApAQCAtNzQsNiArODIsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICAvLyBXaGV0aGVyIHRoZSBjb250ZW50cyBmb3IgdGhpcyByZXNwb25zZSBoYXMg YmVlbiBhbHRlcmVkL2Jsb2NrZWQgKHVzdWFsbHkKICAgICAgICAgLy8gZm9yIHNlY3VyaXR5IHJl YXNvbnMuCiAgICAgICAgIGJvb2wgbV9pc0NvbnRlbnRGaWx0ZXJlZDsKKworICAgICAgICAvLyBU aGUgaWQgb2YgdGhlIGFwcGNhY2hlIHRoaXMgcmVzcG9uc2Ugd2FzIHJldHJpZXZlZCBmcm9tLAor ICAgICAgICAvLyBvciBrTm9BcHBDYWNoZUlEICgwKQorICAgICAgICBpbnQ2NCBtX2FwcENhY2hl SUQ7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQo= 29202 2009-04-02 11:23:43 -0700 2009-04-02 12:52:52 -0700 take 3 AppCachePlumbing.patch3.txt text/plain 5548 michaeln SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0MjA0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjUgQEAKKzIwMDktMDMtMjcgIG1pY2hhZWxuICA8bWljaGFlbG5AZ29vZ2xlLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDaHJv bWl1bSdzIFJlc291cmNlUmVxdWVzdCBhbmQgUmVzb3VyY2VSZXNwb25zZSBzdHJ1Y3RzIG5lZWQg c29tZSBuZXcgZGF0YSBtZW1iZXJzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjQ4OTcKKworICAgICAgICBUaGVzZSBmaWVsZHMgYXJlIG5lZWRlZCB0 byBmYWNpbGl0YXRlIENocm9taXVtJ3MgaW1wbGVtZW50YXRpb24gb2YgdGhlIEhUTUw1CisgICAg ICAgIEFwcGxpY2F0aW9uQ2FjaGUgZmVhdHVyZS4gV2UgbmVlZCB0byBrbm93IHdoYXQgZnJhbWUg KG9yIGNvbnRleHQpIGlzIGRvaW5nIHRoZQorICAgICAgICByZXF1ZXN0aW5nLCBhbmQgZnJvbSB3 aGF0IGNhY2hlIHRoZSByZXN1bHRpbmcgcmVzb3VyY2Ugd2FzIHJldHJpZXZlZC4KKworICAgICAg ICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eSwgc28gbm8gdGVzdHMuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVzdC5oOgorICAgICAgICAoV2Vi Q29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0OjphcHBDYWNoZUNvbnRleHRJRCk6CisgICAgICAgIChXZWJDb3Jl OjpSZXNvdXJjZVJlcXVlc3Q6OnNldEFwcENhY2hlQ29udGV4dElEKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVzcG9uc2UuaDoKKyAgICAgICAgKFdlYkNv cmU6OlJlc291cmNlUmVzcG9uc2U6OlJlc291cmNlUmVzcG9uc2UpOgorICAgICAgICAoV2ViQ29y ZTo6UmVzb3VyY2VSZXNwb25zZTo6Z2V0QXBwQ2FjaGVJRCk6CisgICAgICAgIChXZWJDb3JlOjpS ZXNvdXJjZVJlc3BvbnNlOjpzZXRBcHBDYWNoZUlEKToKKwogMjAwOS0wMy0yNyAgRGlyayBTY2h1 bHplICA8a3JpdEB3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNlUmVxdWVz dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNv dXJjZVJlcXVlc3QuaAkocmV2aXNpb24gNDIwMTYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY2hyb21pdW0vUmVzb3VyY2VSZXF1ZXN0LmgJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDYgKzQ5 LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RC YXNlKEtVUkwodXJsKSwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKICAgICAgICAgICAgICwgbV9y ZXF1ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBtX3JlcXVlc3RvclByb2Nlc3NJRCgwKQorICAg ICAgICAgICAgLCBtX2FwcENhY2hlQ29udGV4dElEKDApCiAgICAgICAgICAgICAsIG1fdGFyZ2V0 VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICB7CiAgICAgICAgIH0KQEAgLTU3LDYg KzU4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVl c3RCYXNlKHVybCwgVXNlUHJvdG9jb2xDYWNoZVBvbGljeSkKICAgICAgICAgICAgICwgbV9yZXF1 ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBtX3JlcXVlc3RvclByb2Nlc3NJRCgwKQorICAgICAg ICAgICAgLCBtX2FwcENhY2hlQ29udGV4dElEKDApCiAgICAgICAgICAgICAsIG1fdGFyZ2V0VHlw ZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAgICAgICAgICAgLCBtX3NlY3VyaXR5SW5mbyhzZWN1 cml0eUluZm8pCiAgICAgICAgIHsKQEAgLTY2LDYgKzY4LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKHVybCwgVXNlUHJvdG9jb2xDYWNo ZVBvbGljeSkKICAgICAgICAgICAgICwgbV9yZXF1ZXN0b3JJRCgwKQogICAgICAgICAgICAgLCBt X3JlcXVlc3RvclByb2Nlc3NJRCgwKQorICAgICAgICAgICAgLCBtX2FwcENhY2hlQ29udGV4dElE KDApCiAgICAgICAgICAgICAsIG1fdGFyZ2V0VHlwZShUYXJnZXRJc1N1YlJlc291cmNlKQogICAg ICAgICB7CiAgICAgICAgIH0KQEAgLTc0LDYgKzc3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICAgICAgOiBSZXNvdXJjZVJlcXVlc3RCYXNlKHVybCwgcG9saWN5KQogICAgICAgICAg ICAgLCBtX3JlcXVlc3RvcklEKDApCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9yUHJvY2Vzc0lE KDApCisgICAgICAgICAgICAsIG1fYXBwQ2FjaGVDb250ZXh0SUQoMCkKICAgICAgICAgICAgICwg bV90YXJnZXRUeXBlKFRhcmdldElzU3ViUmVzb3VyY2UpCiAgICAgICAgIHsKICAgICAgICAgICAg IHNldEhUVFBSZWZlcnJlcihyZWZlcnJlcik7CkBAIC04Myw2ICs4Nyw3IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgICAgIDogUmVzb3VyY2VSZXF1ZXN0QmFzZShLVVJMKCksIFVzZVBy b3RvY29sQ2FjaGVQb2xpY3kpCiAgICAgICAgICAgICAsIG1fcmVxdWVzdG9ySUQoMCkKICAgICAg ICAgICAgICwgbV9yZXF1ZXN0b3JQcm9jZXNzSUQoMCkKKyAgICAgICAgICAgICwgbV9hcHBDYWNo ZUNvbnRleHRJRCgwKQogICAgICAgICAgICAgLCBtX3RhcmdldFR5cGUoVGFyZ2V0SXNTdWJSZXNv dXJjZSkKICAgICAgICAgewogICAgICAgICB9CkBAIC0xMDYsNiArMTExLDEwIEBAIG5hbWVzcGFj ZSBXZWJDb3JlIHsKICAgICAgICAgaW50IHJlcXVlc3RvclByb2Nlc3NJRCgpIGNvbnN0IHsgcmV0 dXJuIG1fcmVxdWVzdG9yUHJvY2Vzc0lEOyB9CiAgICAgICAgIHZvaWQgc2V0UmVxdWVzdG9yUHJv Y2Vzc0lEKGludCByZXF1ZXN0b3JQcm9jZXNzSUQpIHsgbV9yZXF1ZXN0b3JQcm9jZXNzSUQgPSBy ZXF1ZXN0b3JQcm9jZXNzSUQ7IH0KIAorICAgICAgICAvLyBBbGxvd3MgdGhlIHJlcXVlc3QgdG8g YmUgbWF0Y2hlZCB1cCB3aXRoIGl0cyBhcHAgY2FjaGUgY29udGV4dC4KKyAgICAgICAgaW50IGFw cENhY2hlQ29udGV4dElEKCkgY29uc3QgeyByZXR1cm4gbV9hcHBDYWNoZUNvbnRleHRJRDsgfQor ICAgICAgICB2b2lkIHNldEFwcENhY2hlQ29udGV4dElEKGludCBpZCkgeyBtX2FwcENhY2hlQ29u dGV4dElEID0gaWQ7IH0KKwogICAgICAgICAvLyBPcGFxdWUgYnVmZmVyIHRoYXQgZGVzY3JpYmVz IHRoZSBzZWN1cml0eSBzdGF0ZSAoaW5jbHVkaW5nIFNTTAogICAgICAgICAvLyBjb25uZWN0aW9u IHN0YXRlKSBmb3IgdGhlIHJlc291cmNlIHRoYXQgc2hvdWxkIGJlIHJlcG9ydGVkIHdoZW4gdGhl CiAgICAgICAgIC8vIHJlc291cmNlIGhhcyBiZWVuIGxvYWRlZC4gIFRoaXMgaXMgdXNlZCB0byBz aW11bGF0ZSBzZWN1cmUKQEAgLTEyMyw2ICsxMzIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK ICAgICAgICAgaW50IG1fcmVxdWVzdG9ySUQ7CiAgICAgICAgIGludCBtX3JlcXVlc3RvclByb2Nl c3NJRDsKKyAgICAgICAgaW50IG1fYXBwQ2FjaGVDb250ZXh0SUQ7CiAgICAgICAgIFRhcmdldFR5 cGUgbV90YXJnZXRUeXBlOwogICAgICAgICBDU3RyaW5nIG1fc2VjdXJpdHlJbmZvOwogICAgICAg ICBLVVJMIG1fcG9saWN5VVJMOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9t aXVtL1Jlc291cmNlUmVzcG9uc2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvY2hyb21pdW0vUmVzb3VyY2VSZXNwb25zZS5oCShyZXZpc2lvbiA0MjAxNikKKysrIFdl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJjZVJlc3BvbnNlLmgJKHdvcmtp bmcgY29weSkKQEAgLTM3LDEyICszNywxNCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgcHVi bGljOgogICAgICAgICBSZXNvdXJjZVJlc3BvbnNlKCkKICAgICAgICAgICAgIDogbV9pc0NvbnRl bnRGaWx0ZXJlZChmYWxzZSkKKyAgICAgICAgICAgICwgbV9hcHBDYWNoZUlEKDApCiAgICAgICAg IHsKICAgICAgICAgfQogCiAgICAgICAgIFJlc291cmNlUmVzcG9uc2UoY29uc3QgS1VSTCYgdXJs LCBjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBsb25nIGxvbmcgZXhwZWN0ZWRMZW5ndGgsIGNvbnN0 IFN0cmluZyYgdGV4dEVuY29kaW5nTmFtZSwgY29uc3QgU3RyaW5nJiBmaWxlbmFtZSkKLSAgICAg ICAgICAgIDogUmVzb3VyY2VSZXNwb25zZUJhc2UodXJsLCBtaW1lVHlwZSwgZXhwZWN0ZWRMZW5n dGgsIHRleHRFbmNvZGluZ05hbWUsIGZpbGVuYW1lKSwKLSAgICAgICAgICAgICAgbV9pc0NvbnRl bnRGaWx0ZXJlZChmYWxzZSkKKyAgICAgICAgICAgIDogUmVzb3VyY2VSZXNwb25zZUJhc2UodXJs LCBtaW1lVHlwZSwgZXhwZWN0ZWRMZW5ndGgsIHRleHRFbmNvZGluZ05hbWUsIGZpbGVuYW1lKQor ICAgICAgICAgICAgLCBtX2lzQ29udGVudEZpbHRlcmVkKGZhbHNlKQorICAgICAgICAgICAgLCBt X2FwcENhY2hlSUQoMCkKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTU4LDYgKzYwLDEyIEBA IG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgICAgIG1faXNDb250ZW50RmlsdGVyZWQgPSBp c0NvbnRlbnRGaWx0ZXJlZDsKICAgICAgICAgfQogCisgICAgICAgIGludDY0IGdldEFwcENhY2hl SUQoKSBjb25zdCB7IHJldHVybiBtX2FwcENhY2hlSUQ7IH0KKyAgICAgICAgdm9pZCBzZXRBcHBD YWNoZUlEKGludDY0IGlkKQorICAgICAgICB7CisgICAgICAgICAgICBtX2FwcENhY2hlSUQgPSBp ZDsKKyAgICAgICAgfQorCiAgICAgcHJpdmF0ZToKICAgICAgICAgZnJpZW5kIGNsYXNzIFJlc291 cmNlUmVzcG9uc2VCYXNlOwogCkBAIC03NCw2ICs4MiwxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIC8vIFdoZXRoZXIgdGhlIGNvbnRlbnRzIGZvciB0aGlzIHJlc3BvbnNlIGhhcyBi ZWVuIGFsdGVyZWQvYmxvY2tlZCAodXN1YWxseQogICAgICAgICAvLyBmb3Igc2VjdXJpdHkgcmVh c29ucy4KICAgICAgICAgYm9vbCBtX2lzQ29udGVudEZpbHRlcmVkOworCisgICAgICAgIC8vIFRo ZSBpZCBvZiB0aGUgYXBwY2FjaGUgdGhpcyByZXNwb25zZSB3YXMgcmV0cmlldmVkIGZyb20sIG9y IHplcm8gaWYKKyAgICAgICAgLy8gdGhlIHJlc3BvbnNlIHdhcyBub3QgcmV0cmlldmVkIGZyb20g YW4gYXBwY2FjaGUuCisgICAgICAgIGludDY0IG1fYXBwQ2FjaGVJRDsKICAgICB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCg==