87582 2012-05-26 15:04:31 -0700 When pages are loaded from AppCache with DeferredLoading, willSendRequest() is never called 2012-05-29 10:24:41 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin ap darin japhet kling psolanki webkit.review.bot oldest_to_newest 634669 0 benjamin 2012-05-26 15:04:31 -0700 When pages are loaded from AppCache with DeferredLoading, willSendRequest() is never called. <rdar://problem/11476505> 634677 1 144208 benjamin 2012-05-26 15:42:30 -0700 Created attachment 144208 Patch 634686 2 144208 darin 2012-05-26 16:55:41 -0700 Comment on attachment 144208 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144208&action=review > Source/WebCore/loader/MainResourceLoader.cpp:701 > + ResourceRequest r(m_initialRequest); > + m_initialRequest = ResourceRequest(); > + loadNow(r); As long as you’re touching this code, it might be nice to use a word or words for the name rather than just a letter. I’d suggest initialRequest or request or localCopyOfRequest. 634785 3 benjamin 2012-05-27 14:32:06 -0700 Committed r118631: <http://trac.webkit.org/changeset/118631> 636188 4 darin 2012-05-29 10:24:41 -0700 After a comment from Alexey I realize this strikes at the question of what “sending” a request is. 144208 2012-05-26 15:42:30 -0700 2012-05-26 16:55:41 -0700 Patch bug-87582-20120526154229.patch text/plain 14576 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4NDUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzYyYzEyZGVhYjQ4MWU3 YWU4Yjk1ZjI5Y2RhY2NlM2EzZjVkMTY5Yy4uMzlmZTQ4OGM4ZTViYzI2MmI4NjdlNTRhMzYzODFi YmRlNTA2MGUwMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA1LTI2ICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFdoZW4gcGFnZXMg YXJlIGxvYWRlZCBmcm9tIEFwcENhY2hlIHdpdGggRGVmZXJyZWRMb2FkaW5nLCB3aWxsU2VuZFJl cXVlc3QoKSBpcyBuZXZlciBjYWxsZWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg3NTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgUHJldmlvdXNseSwgdGhlcmUgd2FzIGEgc2hvcnRjdXQgd2hlbiBhIGRl ZmVycmVkIE1haW5SZXNvdXJjZUxvYWRlciBpcyByZXN1bWVkOiBJZiB0aGUgZGF0YQorICAgICAg ICB3YXMgY29taW5nIGZyb20gQXBwQ2FjaGUgd2UgY291bGQganVtcCBkaXJlY3RseSB0byBzdGFy dERhdGFMb2FkVGltZXIoKS4KKworICAgICAgICBUaGUgcHJvYmxlbSB3aXRoIHRoZSBzaG9ydGN1 dCBpcyB3aWxsU2VuZFJlcXVlc3QoKSBpcyBuZXZlciBjYWxsZWQgaW4gdGhhdCBwYXJ0aWN1bGFy IGNhc2UKKyAgICAgICAgKHN1YnN0aXR1dGVEYXRhICsgZGVmZXJyZWQtcmVzdW1lKS4gVGhlIGlt YmFsYW5jZSBiZXR3ZWVuIHdpbGxTZW5kUmVxdWVzdCgpIGFuZCBkaWRSZWNlaXZlUmVzcG9uc2Uo KQorICAgICAgICBjYXVzZXMgcHJvYmxlbXMuCisKKyAgICAgICAgVGhpcyBwYXRjaCByZW1vdmVz IHRoZSBzaG9ydGN1dCBzbyB0aGF0IE1haW5SZXNvdXJjZUxvYWRlcjo6bG9hZE5vdygpIGlzIHVz ZWQgcmVnYXJkbGVzcyBvZgorICAgICAgICB0aGUgZGVmZXJyZWQgbG9hZGluZy4gVGhlIG1ldGhv ZCBNYWluUmVzb3VyY2VMb2FkZXI6OmxvYWROb3coKSBoYW5kbGUgdGhlIHN1YnN0aXR1dGVEYXRh IGFzIGlmIHRoZSBsb2FkaW5nCisgICAgICAgIHdhcyBub3QgZGVmZXJyZWQuCisKKyAgICAgICAg VGVzdDogaHR0cC90ZXN0cy9hcHBjYWNoZS9sb2FkLWZyb20tYXBwY2FjaGUtZGVmZXItcmVzdW1l LWNyYXNoLmh0bWwKKworICAgICAgICAqIGxvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVyOjpjb250aW51ZUFmdGVyTmF2aWdh dGlvblBvbGljeSk6CisgICAgICAgIChXZWJDb3JlOjpNYWluUmVzb3VyY2VMb2FkZXI6OmhhbmRs ZVN1YnN0aXR1dGVEYXRhTG9hZFNvb24pOgorICAgICAgICBSZW5hbWUgdGhlIG1ldGhvZCB0byBi ZSBjb25zaXN0ZW50IHdpdGggdGhlIGF0dHJpYnV0ZSBpdCB1c2VzLCBtYWtpbmcgdGhlIG5hbWlu ZyBtb3JlIGV4cGxpY2l0LgorICAgICAgICAoV2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVyOjps b2FkTm93KToKKyAgICAgICAgKFdlYkNvcmU6Ok1haW5SZXNvdXJjZUxvYWRlcjo6c2V0RGVmZXJz TG9hZGluZyk6CisgICAgICAgICogbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oOgorICAgICAg ICAoTWFpblJlc291cmNlTG9hZGVyKToKKwogMjAxMi0wNS0yNCAgQW5kZXJzIENhcmxzc29uICA8 YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIENvcnJ1cHRlZCBwYWdlcyByZW5kZXJpbmcg d2hlbiBpbWFnZXMgYXJlIHpvb21lZCBvbiBHb29nbGUrCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IDA1YjQ3MjdmNWQ1ODA2ZjMyNjQ2OWY0YTYz YWQyM2IzMzRkN2VlNTAuLjM4MTI5YzQ5MWRkNzFlYzY5ZDZmOGFjZGQyMzFmZDgxNGQ0ODJmMWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0x NjcsNyArMTY3LDcgQEAgdm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OmNvbnRpbnVlQWZ0ZXJOYXZp Z2F0aW9uUG9saWN5KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmUKICAgICAgICAgLy8gQSByZWRp cmVjdCByZXN1bHRlZCBpbiBsb2FkaW5nIHN1YnN0aXR1dGUgZGF0YS4KICAgICAgICAgQVNTRVJU KGRvY3VtZW50TG9hZGVyKCktPnRpbWluZygpLT5yZWRpcmVjdENvdW50KCkpOwogICAgICAgICBo YW5kbGUoKS0+Y2FuY2VsKCk7Ci0gICAgICAgIGhhbmRsZURhdGFMb2FkU29vbihyZXF1ZXN0KTsK KyAgICAgICAgaGFuZGxlU3Vic3RpdHV0ZURhdGFMb2FkU29vbihyZXF1ZXN0KTsKICAgICB9CiAK ICAgICBkZXJlZigpOyAvLyBiYWxhbmNlcyByZWYgaW4gd2lsbFNlbmRSZXF1ZXN0CkBAIC02MDYs NyArNjA2LDcgQEAgdm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OnN0YXJ0RGF0YUxvYWRUaW1lcigp CiAjZW5kaWYKIH0KIAotdm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OmhhbmRsZURhdGFMb2FkU29v bihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHIpCit2b2lkIE1haW5SZXNvdXJjZUxvYWRlcjo6aGFu ZGxlU3Vic3RpdHV0ZURhdGFMb2FkU29vbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHIpCiB7CiAg ICAgbV9pbml0aWFsUmVxdWVzdCA9IHI7CiAgICAgCkBAIC02NDIsNyArNjQyLDcgQEAgYm9vbCBN YWluUmVzb3VyY2VMb2FkZXI6OmxvYWROb3coUmVzb3VyY2VSZXF1ZXN0JiByKQogCiAgICAgcmVz b3VyY2VMb2FkU2NoZWR1bGVyKCktPmFkZE1haW5SZXNvdXJjZUxvYWQodGhpcyk7CiAgICAgaWYg KG1fc3Vic3RpdHV0ZURhdGEuaXNWYWxpZCgpKSAKLSAgICAgICAgaGFuZGxlRGF0YUxvYWRTb29u KHIpOworICAgICAgICBoYW5kbGVTdWJzdGl0dXRlRGF0YUxvYWRTb29uKHIpOwogICAgIGVsc2Ug aWYgKHNob3VsZExvYWRFbXB0eSB8fCBmcmFtZUxvYWRlcigpLT5jbGllbnQoKS0+cmVwcmVzZW50 YXRpb25FeGlzdHNGb3JVUkxTY2hlbWUodXJsLnByb3RvY29sKCkpKQogICAgICAgICBoYW5kbGVF bXB0eUxvYWQodXJsLCAhc2hvdWxkTG9hZEVtcHR5KTsKICAgICBlbHNlCkBAIC02OTYsMTMgKzY5 Niw5IEBAIHZvaWQgTWFpblJlc291cmNlTG9hZGVyOjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgZGVm ZXJzKQogICAgICAgICBpZiAobV9pbml0aWFsUmVxdWVzdC5pc051bGwoKSkKICAgICAgICAgICAg IHJldHVybjsKIAotICAgICAgICBpZiAobV9zdWJzdGl0dXRlRGF0YS5pc1ZhbGlkKCkgJiYgbV9k b2N1bWVudExvYWRlci0+ZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCgpKQotICAgICAgICAgICAg c3RhcnREYXRhTG9hZFRpbWVyKCk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgUmVzb3Vy Y2VSZXF1ZXN0IHIobV9pbml0aWFsUmVxdWVzdCk7Ci0gICAgICAgICAgICBtX2luaXRpYWxSZXF1 ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0KCk7Ci0gICAgICAgICAgICBsb2FkTm93KHIpOwotICAgICAg ICB9CisgICAgICAgIFJlc291cmNlUmVxdWVzdCByKG1faW5pdGlhbFJlcXVlc3QpOworICAgICAg ICBtX2luaXRpYWxSZXF1ZXN0ID0gUmVzb3VyY2VSZXF1ZXN0KCk7CisgICAgICAgIGxvYWROb3co cik7CiAgICAgfQogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJl c291cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVy LmgKaW5kZXggZTM0MTNjYWI5OGFlMDA2NzZhYzU1YjcwMGM2NTJmNWQ5NzM4MzQ3YS4uMTMxYWJi ZTc2MTY2ZWRjY2QzODkyMWY3YWU1OTllZThmODNkNWFiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9NYWluUmVzb3VyY2VMb2FkZXIuaApAQCAtODQsNyArODQsNyBAQCBuYW1lc3BhY2UgV2Vi Q29yZSB7CiAgICAgICAgIGJvb2wgbG9hZE5vdyhSZXNvdXJjZVJlcXVlc3QmKTsKIAogICAgICAg ICB2b2lkIGhhbmRsZUVtcHR5TG9hZChjb25zdCBLVVJMJiwgYm9vbCBmb3JVUkxTY2hlbWUpOwot ICAgICAgICB2b2lkIGhhbmRsZURhdGFMb2FkU29vbihjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHIp OworICAgICAgICB2b2lkIGhhbmRsZVN1YnN0aXR1dGVEYXRhTG9hZFNvb24oY29uc3QgUmVzb3Vy Y2VSZXF1ZXN0Jik7CiAKICAgICAgICAgdm9pZCBzdGFydERhdGFMb2FkVGltZXIoKTsKICAgICAg ICAgdm9pZCBoYW5kbGVEYXRhTG9hZChSZXNvdXJjZVJlcXVlc3QmKTsKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwYjlkNzFiNDI2ZjA0NTMwMGRm ZTFlZjM5OWFiOTcyOTA2YWE2ODEwLi43NjE5Y2Y1NmM1NmIzNzdmMDI0MmZiNjQ1MjQ4YmI4ZWMw NzMxNWFiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjQgQEAKKzIwMTItMDUtMjYgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFp bkBhcHBsZS5jb20+CisKKyAgICAgICAgV2hlbiBwYWdlcyBhcmUgbG9hZGVkIGZyb20gQXBwQ2Fj aGUgd2l0aCBEZWZlcnJlZExvYWRpbmcsIHdpbGxTZW5kUmVxdWVzdCgpIGlzIG5ldmVyIGNhbGxl ZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc1ODIK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHRlbmQg RHVtcFJlbmRlclRyZWUgdG8gc3VwcG9ydCBsb2FkaW5nIHRoZSBtYWluIHJlc291cmNlIGRlZmVy cmVkIHdpdGggYSBkZWxheS4gVGhpcyBtYWtlcyBpdAorICAgICAgICBwb3NzaWJsZSB0byB0ZXN0 IHBhZ2VzIGluIGEgc2ltaWxhciB3YXkgYXMgdGhleSBhcmUgbG9hZGVkIGluIEJyb3dzZXJzLgor CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwOgorICAg ICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OkxheW91dFRlc3RDb250cm9sbGVyKToKKyAgICAg ICAgKHVzZURlZmVycmVkRnJhbWVMb2FkaW5nQ2FsbGJhY2spOgorICAgICAgICAoTGF5b3V0VGVz dENvbnRyb2xsZXI6OnN0YXRpY0Z1bmN0aW9ucyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUv TGF5b3V0VGVzdENvbnRyb2xsZXIuaDoKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjp1 c2VEZWZlcnJlZEZyYW1lTG9hZGluZyk6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6 c2V0VXNlRGVmZXJyZWRGcmFtZUxvYWRpbmcpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xs ZXIpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9GcmFtZUxvYWREZWxlZ2F0ZS5tbToK KyAgICAgICAgKC1bRnJhbWVMb2FkRGVsZWdhdGUgd2ViVmlldzpkaWRTdGFydFByb3Zpc2lvbmFs TG9hZEZvckZyYW1lOl0pOgorCiAyMDEyLTA1LTI0ICBEaXJrIFByYW5rZSAgPGRwcmFua2VAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIGdhcmRlbi1vLW1hdGljIHNob3VsZCBub3QgZmV0Y2ggZnJv bSBkZWJ1ZyBib3RzIGlmIGl0IGFsc28ga25vd3MgYWJvdXQgdGhlIHJlbGVhc2UgYm90cwpkaWZm IC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwIGIv VG9vbHMvRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IGY5MWM4 NzRkNDAyM2VhY2MzMWI3MzE4NjcyNWNkNGUwZjZmYzNkMzAuLmZkYzIwZTFjMDI3Zjg1ZDIxNjAw ZGRhNmUzNTVkNTBjZWM5MWZkYmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0xh eW91dFRlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRU ZXN0Q29udHJvbGxlci5jcHAKQEAgLTg5LDYgKzg5LDcgQEAgTGF5b3V0VGVzdENvbnRyb2xsZXI6 OkxheW91dFRlc3RDb250cm9sbGVyKGNvbnN0IHN0ZDo6c3RyaW5nJiB0ZXN0UGF0aE9yVVJMLCBj b24KICAgICAsIG1faGFuZGxlc0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlcyhmYWxzZSkKICAgICAs IG1faXNQcmludGluZyhmYWxzZSkKICAgICAsIG1fZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCh0 cnVlKQorICAgICwgbV91c2VEZWZlcnJlZEZyYW1lTG9hZGluZyhmYWxzZSkKICAgICAsIG1fc2hv dWxkUGFpbnRCcm9rZW5JbWFnZSh0cnVlKQogICAgICwgbV9zaG91bGRTdGF5T25QYWdlQWZ0ZXJI YW5kbGluZ0JlZm9yZVVubG9hZChmYWxzZSkKICAgICAsIG1fYXJlRGVza3RvcE5vdGlmaWNhdGlv blBlcm1pc3Npb25SZXF1ZXN0c0lnbm9yZWQoZmFsc2UpCkBAIC0xMjMxLDYgKzEyMzIsMTcgQEAg c3RhdGljIEpTVmFsdWVSZWYgc2V0RGVmZXJzTG9hZGluZ0NhbGxiYWNrKEpTQ29udGV4dFJlZiBj b250ZXh0LCBKU09iamVjdFJlZiBmdW4KICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQo Y29udGV4dCk7CiB9CiAKK3N0YXRpYyBKU1ZhbHVlUmVmIHVzZURlZmVycmVkRnJhbWVMb2FkaW5n Q2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09i amVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJl ZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAgIGlmIChhcmd1bWVu dENvdW50IDwgMSkKKyAgICAgICAgcmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQp OworCisgICAgTGF5b3V0VGVzdENvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBzdGF0aWNfY2FzdDxM YXlvdXRUZXN0Q29udHJvbGxlcio+KEpTT2JqZWN0R2V0UHJpdmF0ZSh0aGlzT2JqZWN0KSk7Cisg ICAgY29udHJvbGxlci0+c2V0VXNlRGVmZXJyZWRGcmFtZUxvYWRpbmcoSlNWYWx1ZVRvQm9vbGVh bihjb250ZXh0LCBhcmd1bWVudHNbMF0pKTsKKworICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVm aW5lZChjb250ZXh0KTsKK30KKwogc3RhdGljIEpTVmFsdWVSZWYgc2V0RG9tYWluUmVsYXhhdGlv bkZvcmJpZGRlbkZvclVSTFNjaGVtZUNhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09i amVjdFJlZiBmdW5jdGlvbiwgSlNPYmplY3RSZWYgdGhpc09iamVjdCwgc2l6ZV90IGFyZ3VtZW50 Q291bnQsIGNvbnN0IEpTVmFsdWVSZWYgYXJndW1lbnRzW10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlv bikKIHsKICAgICAvLyBIYXMgTWFjIGFuZCBXaW5kb3dzIGltcGxlbWVudGF0aW9uCkBAIC0yMzcy LDYgKzIzODQsNyBAQCBKU1N0YXRpY0Z1bmN0aW9uKiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c3Rh dGljRnVuY3Rpb25zKCkKICAgICAgICAgeyAic2V0RGF0YWJhc2VRdW90YSIsIHNldERhdGFiYXNl UXVvdGFDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5 QXR0cmlidXRlRG9udERlbGV0ZSB9LCAKICAgICAgICAgeyAic2V0RGVmZXJNYWluUmVzb3VyY2VE YXRhTG9hZCIsIHNldERlZmVyTWFpblJlc291cmNlRGF0YUxvYWRDYWxsYmFjaywga0pTUHJvcGVy dHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAog ICAgICAgICB7ICJzZXREZWZlcnNMb2FkaW5nIiwgc2V0RGVmZXJzTG9hZGluZ0NhbGxiYWNrLCBr SlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVs ZXRlIH0sCisgICAgICAgIHsgInVzZURlZmVycmVkRnJhbWVMb2FkaW5nIiwgdXNlRGVmZXJyZWRG cmFtZUxvYWRpbmdDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1By b3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJzZXREb21haW5SZWxheGF0 aW9uRm9yYmlkZGVuRm9yVVJMU2NoZW1lIiwgc2V0RG9tYWluUmVsYXhhdGlvbkZvcmJpZGRlbkZv clVSTFNjaGVtZUNhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJv cGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgInNldEZyYW1lRmxhdHRlbmlu Z0VuYWJsZWQiLCBzZXRGcmFtZUZsYXR0ZW5pbmdFbmFibGVkQ2FsbGJhY2ssIGtKU1Byb3BlcnR5 QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAg ICAgICAgeyAic2V0R2VvbG9jYXRpb25QZXJtaXNzaW9uIiwgc2V0R2VvbG9jYXRpb25QZXJtaXNz aW9uQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0 dHJpYnV0ZURvbnREZWxldGUgfSwKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0xh eW91dFRlc3RDb250cm9sbGVyLmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29u dHJvbGxlci5oCmluZGV4IDJiOWY1ZmUyNDlkOGUwZjNmMzdlMGUwOTkyODc2ZmVhOWRlOGIxNTEu LmUyOTdhNGYwYWNkZmIyYjczZGMyYWFmYTYxOTMwNDdjZTdjMmRlZDEgMTAwNjQ0Ci0tLSBhL1Rv b2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmgKKysrIGIvVG9vbHMvRHVt cFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuaApAQCAtMjgyLDYgKzI4Miw5IEBAIHB1 YmxpYzoKICAgICBib29sIGRlZmVyTWFpblJlc291cmNlRGF0YUxvYWQoKSBjb25zdCB7IHJldHVy biBtX2RlZmVyTWFpblJlc291cmNlRGF0YUxvYWQ7IH0KICAgICB2b2lkIHNldERlZmVyTWFpblJl c291cmNlRGF0YUxvYWQoYm9vbCBmbGFnKSB7IG1fZGVmZXJNYWluUmVzb3VyY2VEYXRhTG9hZCA9 IGZsYWc7IH0KIAorICAgIGJvb2wgdXNlRGVmZXJyZWRGcmFtZUxvYWRpbmcoKSBjb25zdCB7IHJl dHVybiBtX3VzZURlZmVycmVkRnJhbWVMb2FkaW5nOyB9CisgICAgdm9pZCBzZXRVc2VEZWZlcnJl ZEZyYW1lTG9hZGluZyhib29sIGZsYWcpIHsgbV91c2VEZWZlcnJlZEZyYW1lTG9hZGluZyA9IGZs YWc7IH0KKwogICAgIGNvbnN0IHN0ZDo6c3RyaW5nJiB0ZXN0UGF0aE9yVVJMKCkgY29uc3QgeyBy ZXR1cm4gbV90ZXN0UGF0aE9yVVJMOyB9CiAgICAgY29uc3Qgc3RkOjpzdHJpbmcmIGV4cGVjdGVk UGl4ZWxIYXNoKCkgY29uc3QgeyByZXR1cm4gbV9leHBlY3RlZFBpeGVsSGFzaDsgfQogCkBAIC00 MTIsNiArNDE1LDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1faGFuZGxlc0F1dGhlbnRpY2F0aW9u Q2hhbGxlbmdlczsKICAgICBib29sIG1faXNQcmludGluZzsKICAgICBib29sIG1fZGVmZXJNYWlu UmVzb3VyY2VEYXRhTG9hZDsKKyAgICBib29sIG1fdXNlRGVmZXJyZWRGcmFtZUxvYWRpbmc7CiAg ICAgYm9vbCBtX3Nob3VsZFBhaW50QnJva2VuSW1hZ2U7CiAgICAgYm9vbCBtX3Nob3VsZFN0YXlP blBhZ2VBZnRlckhhbmRsaW5nQmVmb3JlVW5sb2FkOwogICAgIGJvb2wgbV9hcmVEZXNrdG9wTm90 aWZpY2F0aW9uUGVybWlzc2lvblJlcXVlc3RzSWdub3JlZDsKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL21hYy9GcmFtZUxvYWREZWxlZ2F0ZS5tbSBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL21hYy9GcmFtZUxvYWREZWxlZ2F0ZS5tbQppbmRleCBjODgyOTYyNjI4YTU2Mzk2ZjMwYjNm MDVjNjliNjc5ZDI4ODY2N2EwLi4xYTdjMGYwMGM0MTgyZWZjODQ5MTA0NDU4YjU5ODViNWFmM2Vk M2UwIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRnJhbWVMb2FkRGVsZWdh dGUubW0KKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0ZyYW1lTG9hZERlbGVnYXRlLm1t CkBAIC0xNzMsNiArMTczLDE1IEBACiAgICAgICAgIHByaW50ZiAoIiVzXG4iLCBbc3RyaW5nIFVU RjhTdHJpbmddKTsKICAgICAgICAgW2ZyYW1lIHN0b3BMb2FkaW5nXTsKICAgICB9CisKKyAgICBp ZiAoIWRvbmUgJiYgZ0xheW91dFRlc3RDb250cm9sbGVyLT51c2VEZWZlcnJlZEZyYW1lTG9hZGlu ZygpKSB7CisgICAgICAgIFtzZW5kZXIgc2V0RGVmZXJzQ2FsbGJhY2tzOllFU107CisgICAgICAg IE5TVGltZUludGVydmFsIGRlZmVycmVkV2FpdFRpbWUgPSA1ICogTlNFQ19QRVJfTVNFQzsKKyAg ICAgICAgZGlzcGF0Y2hfdGltZV90IHdoZW4gPSBkaXNwYXRjaF90aW1lKERJU1BBVENIX1RJTUVf Tk9XLCBkZWZlcnJlZFdhaXRUaW1lKTsKKyAgICAgICAgZGlzcGF0Y2hfYWZ0ZXIod2hlbiwgZGlz cGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKKyAgICAgICAgICAgIFtzZW5kZXIgc2V0RGVmZXJz Q2FsbGJhY2tzOk5PXTsKKyAgICAgICAgfSk7CisgICAgfQogfQogCiAtICh2b2lkKXdlYlZpZXc6 KFdlYlZpZXcgKilzZW5kZXIgZGlkQ29tbWl0TG9hZEZvckZyYW1lOihXZWJGcmFtZSAqKWZyYW1l CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggNjY0NGNmMjY5OGQzMzQzNDhmNWY4MDliZDk3NTdjYzY3N2U1MmMwYi4uYWY5ZDNm MzAxMGM2NmQ4MGU2NTIzYTg3ZDA0OTgxNjE2YTY5NWQwMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBA CisyMDEyLTA1LTI2ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisg ICAgICAgIFdoZW4gcGFnZXMgYXJlIGxvYWRlZCBmcm9tIEFwcENhY2hlIHdpdGggRGVmZXJyZWRM b2FkaW5nLCB3aWxsU2VuZFJlcXVlc3QoKSBpcyBuZXZlciBjYWxsZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3NTgyCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2FwcGNhY2hlL2xv YWQtZnJvbS1hcHBjYWNoZS1kZWZlci1yZXN1bWUtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4K KyAgICAgICAgKiBodHRwL3Rlc3RzL2FwcGNhY2hlL2xvYWQtZnJvbS1hcHBjYWNoZS1kZWZlci1y ZXN1bWUtY3Jhc2guaHRtbDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9hcHBjYWNoZS9y ZXNvdXJjZXMvbG9hZC1mcm9tLWFwcGNhY2hlLWRlZmVyLXJlc3VtZS1ib3VuY2UtYmFjay5odG1s OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2FwcGNhY2hlL3Jlc291cmNlcy9sb2FkLWZy b20tYXBwY2FjaGUtZGVmZXItcmVzdW1lLWNyYXNoLm1hbmlmZXN0OiBBZGRlZC4KKwogMjAxMi0w NS0yNCAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBSRUdSRVNT SU9OIChyMTEyMzk5KTogaW5zZXJ0SFRNTCBkb2Vzbid0IHJlc3BlY3QgY3VycmVudCBzZWxlY3Rp b24gcmFuZ2UgYW5kIGluc2VydHMgSFRNTCB0byBpbmNvcnJlY3QgcG9zaXRpb24KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwY2FjaGUvbG9hZC1mcm9tLWFwcGNhY2hlLWRl ZmVyLXJlc3VtZS1jcmFzaC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Fw cGNhY2hlL2xvYWQtZnJvbS1hcHBjYWNoZS1kZWZlci1yZXN1bWUtY3Jhc2gtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjQ4YmU4ODVjMTI4YmM3MjRiODkzY2YxYjY3MzU2NTJhY2Q2NzQwYjUKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcGNhY2hlL2xvYWQtZnJv bS1hcHBjYWNoZS1kZWZlci1yZXN1bWUtY3Jhc2gtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMyBA QAorVGhpcyB0ZXN0IGxvYWRpbmcgdGhlIGRvY3VtZW50IGl0c2VsZiB3aXRoIEFwcGxpY2F0aW9u IENhY2hlLCBhbmQgZGVmZXJyZWQgbG9hZCwgZG9lcyBub3QgY3Jhc2ggV2ViS2l0LiBUaGUgbW9z dCByZWxpYWJsZSB3YXkgdG8gcmVwcm9kdWNlIGlzIGluIERlYnVnIHdoZXJlIHlvdSBoaXQgYXNz ZXJ0aW9ucy4KKworU1VDQ0VTUwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9h cHBjYWNoZS9sb2FkLWZyb20tYXBwY2FjaGUtZGVmZXItcmVzdW1lLWNyYXNoLmh0bWwgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2FwcGNhY2hlL2xvYWQtZnJvbS1hcHBjYWNoZS1kZWZlci1yZXN1 bWUtY3Jhc2guaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wZDU1MjQwNTRmYmNmYThjZTc5YzRlZjhkNzdlOWZh MWI4MTU5YmFkCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHBj YWNoZS9sb2FkLWZyb20tYXBwY2FjaGUtZGVmZXItcmVzdW1lLWNyYXNoLmh0bWwKQEAgLTAsMCAr MSwyNyBAQAorPGh0bWwgbWFuaWZlc3Q9InJlc291cmNlcy9sb2FkLWZyb20tYXBwY2FjaGUtZGVm ZXItcmVzdW1lLWNyYXNoLm1hbmlmZXN0Ij4KKzxoZWFkPgorPHNjcmlwdD4KK2lmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci51c2VEZWZl cnJlZEZyYW1lTG9hZGluZyh0cnVlKQorICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53YWl0VW50aWxEb25lKCk7Cit9CitmdW5j dGlvbiBmaW5pc2hJZk5lZWRlZCgpIHsKKyAgICBpZiAod2luZG93LmxvY2F0aW9uLmhhc2gpIHsK KyAgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdCcpLmlubmVyVGV4dCA9ICJT VUNDRVNTIjsKKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikKKyAgICAg ICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICB9Cit9CitmdW5j dGlvbiBydW4oKSB7CisgICAgd2luZG93LmxvY2F0aW9uID0gInJlc291cmNlcy9sb2FkLWZyb20t YXBwY2FjaGUtZGVmZXItcmVzdW1lLWJvdW5jZS1iYWNrLmh0bWwiOworfQorYXBwbGljYXRpb25D YWNoZS5hZGRFdmVudExpc3RlbmVyKCdjYWNoZWQnLCBydW4sIGZhbHNlKTsKKzwvc2NyaXB0Pgor PC9oZWFkPgorPGJvZHkgb25sb2FkPSJmaW5pc2hJZk5lZWRlZCgpIj4KKzxwPlRoaXMgdGVzdCBs b2FkaW5nIHRoZSBkb2N1bWVudCBpdHNlbGYgd2l0aCBBcHBsaWNhdGlvbiBDYWNoZSwgYW5kIGRl ZmVycmVkIGxvYWQsIGRvZXMgbm90IGNyYXNoIFdlYktpdC4gVGhlIG1vc3QgcmVsaWFibGUgd2F5 IHRvIHJlcHJvZHVjZSBpcyBpbiBEZWJ1ZyB3aGVyZSB5b3UgaGl0IGFzc2VydGlvbnMuPC9wPgor PGRpdiBpZD0icmVzdWx0Ij4KKzwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9hcHBjYWNoZS9yZXNvdXJjZXMvbG9hZC1mcm9tLWFwcGNh Y2hlLWRlZmVyLXJlc3VtZS1ib3VuY2UtYmFjay5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9hcHBjYWNoZS9yZXNvdXJjZXMvbG9hZC1mcm9tLWFwcGNhY2hlLWRlZmVyLXJlc3VtZS1ib3Vu Y2UtYmFjay5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ1YjlhNzY5NTIyMmFhMjUyNzhiNDQwMTg3NDk1OTU5 NzdkNTcxZTEKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2FwcGNh Y2hlL3Jlc291cmNlcy9sb2FkLWZyb20tYXBwY2FjaGUtZGVmZXItcmVzdW1lLWJvdW5jZS1iYWNr Lmh0bWwKQEAgLTAsMCArMSw4IEBACis8aHRtbD4KKzxoZWFkPgorPG1ldGEgaHR0cC1lcXVpdj0i cmVmcmVzaCIgY29udGVudD0iMDsgdXJsPS4uL2xvYWQtZnJvbS1hcHBjYWNoZS1kZWZlci1yZXN1 bWUtY3Jhc2guaHRtbCNoYXNoIj4KKzwvaGVhZD4KKzxib2R5PgorPHA+VGhlIGdvYWwgb2YgdGhp cyBwYWdlIGlzIHRvIGNhdXNlIHRoZSBjYWNoZWQgZG9jdW1lbnQgdG8gYmUgbG9hZGVkIGFzIHRo ZSBtYWluIGRvY3VtZW50IG9mIHRoZSB2aWV3LjwvcD4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvYXBwY2FjaGUvcmVzb3VyY2VzL2xvYWQtZnJv bS1hcHBjYWNoZS1kZWZlci1yZXN1bWUtY3Jhc2gubWFuaWZlc3QgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2FwcGNhY2hlL3Jlc291cmNlcy9sb2FkLWZyb20tYXBwY2FjaGUtZGVmZXItcmVzdW1l LWNyYXNoLm1hbmlmZXN0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmE4MmE3NGQ2OWI5Y2FkYTZkNjM3NmUwNWY2YTJh YTE4MDMxOTFmYTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2Fw cGNhY2hlL3Jlc291cmNlcy9sb2FkLWZyb20tYXBwY2FjaGUtZGVmZXItcmVzdW1lLWNyYXNoLm1h bmlmZXN0CkBAIC0wLDAgKzEsMiBAQAorQ0FDSEUgTUFOSUZFU1QKKwo=