115277 2013-04-26 14:26:34 -0700 Downloads need to be converted from the NSURLConnection, not canceled and restarted, when using the NetworkProcess 2013-04-26 14:38:30 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 882029 0 andersca 2013-04-26 14:26:34 -0700 Downloads need to be converted from the NSURLConnection, not canceled and restarted, when using the NetworkProcess 882031 1 199860 andersca 2013-04-26 14:29:04 -0700 Created attachment 199860 Patch 882035 2 andersca 2013-04-26 14:38:30 -0700 Committed r149211: <http://trac.webkit.org/changeset/149211> 199860 2013-04-26 14:29:04 -0700 2013-04-26 14:30:45 -0700 Patch bug-115277-20130426142824.patch text/plain 13792 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5MTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZTRhZDZiNTM3MGRhNDM1 Mjk5NDRiNTNiODcyNmZiOTUzYjJkZTRlYi4uYWMwMzJhNjIzMWU1NDI0ODc2NDhhN2MxZTY4ZmI4 MGU0ZDZlOWYwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ1IEBACisyMDEzLTA0LTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgRG93bmxvYWRzIG5l ZWQgdG8gYmUgY29udmVydGVkIGZyb20gdGhlIE5TVVJMQ29ubmVjdGlvbiwgbm90IGNhbmNlbGVk IGFuZCByZXN0YXJ0ZWQsIHdoZW4gdXNpbmcgdGhlIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUyNzcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzEyODkwMTg0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlBy b2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vz czo6Y29udmVydE1haW5SZXNvdXJjZUxvYWRUb0Rvd25sb2FkKToKKyAgICAgICAgQXNrIHRoZSBk b3dubG9hZCBtYW5hZ2VyIHRvIGNvbnZlcnQgdGhlIG1haW4gcmVzb3VyY2UgbG9hZCB0byBhIGRv d25sb2FkLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3MubWVzc2FnZXMuaW46CisgICAgICAgIEFkZCBuZXcgbWVzc2FnZS4KKworICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5oOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmhhbmRsZSk6CisgICAgICAgIEFkZCBnZXR0ZXIu CisKKyAgICAgICAgKiBTaGFyZWQvRG93bmxvYWRzL21hYy9Eb3dubG9hZE1hYy5tbToKKyAgICAg ICAgKGRpc3BhdGNoT25NYWluVGhyZWFkKToKKyAgICAgICAgSGVscGVyIGZ1bmN0aW9uIHRoYXQg ZW5zdXJlcyB0aGF0IGEgZ2l2ZW4gYmxvY2sgaXMgY2FsbGVkIG9uIHRoZSBtYWluIHRocmVhZC4K KworICAgICAgICAoLVtXS0Rvd25sb2FkQXNEZWxlZ2F0ZSBkb3dubG9hZERpZEJlZ2luOl0pOgor ICAgICAgICAoLVtXS0Rvd25sb2FkQXNEZWxlZ2F0ZSBkb3dubG9hZDpkaWRSZWNlaXZlQXV0aGVu dGljYXRpb25DaGFsbGVuZ2U6XSk6CisgICAgICAgICgtW1dLRG93bmxvYWRBc0RlbGVnYXRlIGRv d25sb2FkOmRpZFJlY2VpdmVSZXNwb25zZTpdKToKKyAgICAgICAgKC1bV0tEb3dubG9hZEFzRGVs ZWdhdGUgZG93bmxvYWQ6ZGlkUmVjZWl2ZURhdGFPZkxlbmd0aDpdKToKKyAgICAgICAgKC1bV0tE b3dubG9hZEFzRGVsZWdhdGUgZG93bmxvYWQ6c2hvdWxkRGVjb2RlU291cmNlRGF0YU9mTUlNRVR5 cGU6XSk6CisgICAgICAgICgtW1dLRG93bmxvYWRBc0RlbGVnYXRlIGRvd25sb2FkOmRlY2lkZURl c3RpbmF0aW9uV2l0aFN1Z2dlc3RlZEZpbGVuYW1lOl0pOgorICAgICAgICAoLVtXS0Rvd25sb2Fk QXNEZWxlZ2F0ZSBkb3dubG9hZDpkaWRDcmVhdGVEZXN0aW5hdGlvbjpdKToKKyAgICAgICAgKC1b V0tEb3dubG9hZEFzRGVsZWdhdGUgZG93bmxvYWREaWRGaW5pc2g6XSk6CisgICAgICAgICgtW1dL RG93bmxvYWRBc0RlbGVnYXRlIGRvd25sb2FkOmRpZEZhaWxXaXRoRXJyb3I6XSk6CisgICAgICAg IFVzZSBkaXNwYXRjaE9uTWFpblRocmVhZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlY2VpdmVkUG9saWN5 RGVjaXNpb24pOgorICAgICAgICBSZW1vdmUgY29kZSB0aGF0IGNhbmNlbHMgdGhlIGN1cnJlbnQg bG9hZCBhbmQgc3RhcnRzIGEgbmV3IGRvd25sb2FkLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYkZyYW1lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWU6OmNvbnZlcnRN YWluUmVzb3VyY2VMb2FkVG9Eb3dubG9hZCk6CisgICAgICAgIFNlbmQgdGhlIENvbnZlcnRNYWlu UmVzb3VyY2VMb2FkVG9Eb3dubG9hZCBtZXNzYWdlIHRvIHRoZSBuZXR3b3JrIHByb2Nlc3MuCisK IDIwMTMtMDQtMjYgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CiAKICAgICAg ICAgQmxvYnMgYXJlIG5vdCBhc3NvY2lhdGVkIHdpdGggY29ubmVjdGlvbiB3aGVuIHRoZXJlIGFy ZSBubyBzYW5kYm94IGV4dGVuc2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAppbmRl eCBiNzViNjBjMWQ2NTg3N2VhMzRlNmM2YTYxY2U3YzhiMTk1MDU3MTlhLi5kNWE0MmNiY2M4ZmQ4 YWQ3NDRjNTA1NWM3OGQwYmFiMjJmZTc3NzBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3Mu Y3BwCkBAIC0xNjMsNiArMTYzLDE1IEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3M6OnN0YXJ0RG93bmxvYWQoYm9vbCBwcml2YXRlQnJvd3NpbmdFbmFibGVkLCB1CiAgICAgTmV0 d29ya1Byb2Nlc3M6OnNoYXJlZCgpLmRvd25sb2FkTWFuYWdlcigpLnN0YXJ0RG93bmxvYWQoZG93 bmxvYWRJRCwgcmVxdWVzdCk7CiB9CiAKK3ZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3M6OmNvbnZlcnRNYWluUmVzb3VyY2VMb2FkVG9Eb3dubG9hZCh1aW50NjRfdCBtYWluUmVzb3Vy Y2VMb2FkSWRlbnRpZmllciwgdWludDY0X3QgZG93bmxvYWRJRCwgY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiByZXF1ZXN0LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKK3sKKyAgICBO ZXR3b3JrUmVzb3VyY2VMb2FkZXIqIGxvYWRlciA9IG1fbmV0d29ya1Jlc291cmNlTG9hZGVycy5n ZXQobWFpblJlc291cmNlTG9hZElkZW50aWZpZXIpLmdldCgpOworICAgIE5ldHdvcmtQcm9jZXNz OjpzaGFyZWQoKS5kb3dubG9hZE1hbmFnZXIoKS5jb252ZXJ0SGFuZGxlVG9Eb3dubG9hZChkb3du bG9hZElELCBsb2FkZXItPmhhbmRsZSgpLCByZXF1ZXN0LCByZXNwb25zZSk7CisKKyAgICAvLyBV bmJsb2NrIHRoZSBVUkwgY29ubmVjdGlvbiBvcGVyYXRpb24gcXVldWUuCisgICAgbG9hZGVyLT5o YW5kbGUoKS0+Y29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UoKTsKK30KKwogdm9pZCBOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y29va2llc0ZvckRPTShib29sIHByaXZhdGVCcm93c2lu Z0VuYWJsZWQsIGNvbnN0IEtVUkwmIGZpcnN0UGFydHksIGNvbnN0IEtVUkwmIHVybCwgU3RyaW5n JiByZXN1bHQpCiB7CiAgICAgcmVzdWx0ID0gV2ViQ29yZTo6Y29va2llc0ZvckRPTShzdG9yYWdl U2Vzc2lvbihwcml2YXRlQnJvd3NpbmdFbmFibGVkKSwgZmlyc3RQYXJ0eSwgdXJsKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzLmggYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVj dGlvblRvV2ViUHJvY2Vzcy5oCmluZGV4IGYwNmM0MmZiMzhmODM2YWM5NWU1OWZiN2Q4OTY1ZDFm MWVkMmUzMTAuLjliZWQ2MzhiMGUyYTk4ZGIzMWM2MTUyMDhlNWNhMzMwZGRjODJhMGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9X ZWJQcm9jZXNzLmgKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3MuaApAQCAtNzcsNiArNzcsOCBAQCBwcml2YXRlOgogICAgIHZv aWQgc2VydmVQZW5kaW5nUmVxdWVzdHModWludDMyX3QgcmVzb3VyY2VMb2FkUHJpb3JpdHkpOwog ICAgIHZvaWQgc2V0U2VyaWFsTG9hZGluZ0VuYWJsZWQoYm9vbCk7CiAgICAgdm9pZCBzdGFydERv d25sb2FkKGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgdWludDY0X3QgZG93bmxvYWRJRCwg Y29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgdm9pZCBjb252ZXJ0TWFpblJl c291cmNlTG9hZFRvRG93bmxvYWQodWludDY0X3QgbWFpblJlc291cmNlTG9hZElkZW50aWZpZXIs IHVpbnQ2NF90IGRvd25sb2FkSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKTsKKwogICAgIHZvaWQgY29va2llc0ZvckRP TShib29sIHByaXZhdGVCcm93c2luZ0VuYWJsZWQsIGNvbnN0IFdlYkNvcmU6OktVUkwmIGZpcnN0 UGFydHksIGNvbnN0IFdlYkNvcmU6OktVUkwmLCBTdHJpbmcmIHJlc3VsdCk7CiAgICAgdm9pZCBz ZXRDb29raWVzRnJvbURPTShib29sIHByaXZhdGVCcm93c2luZ0VuYWJsZWQsIGNvbnN0IFdlYkNv cmU6OktVUkwmIGZpcnN0UGFydHksIGNvbnN0IFdlYkNvcmU6OktVUkwmLCBjb25zdCBTdHJpbmcm KTsKICAgICB2b2lkIGNvb2tpZXNFbmFibGVkKGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwg Y29uc3QgV2ViQ29yZTo6S1VSTCYgZmlyc3RQYXJ0eSwgY29uc3QgV2ViQ29yZTo6S1VSTCYsIGJv b2wmIHJlc3VsdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5tZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQy L05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLm1lc3NhZ2VzLmlu CmluZGV4IDk4ZjViNGYwY2NlZjVjNjBhODBmMGVkNDBhNTkyZmZmZTA1MTNlNzcuLmFmYWUxYTIz MGZhZjM0ZDdhYzhiODIzNDZjYzY1NGY0NDNlNGQ5NDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLm1lc3NhZ2Vz LmluCisrKyBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0aW9u VG9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluCkBAIC0zMyw2ICszMyw3IEBAIG1lc3NhZ2VzIC0+IE5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzIExlZ2FjeVJlY2VpdmVyIHsKICAgICBTZXRTZXJp YWxMb2FkaW5nRW5hYmxlZChib29sIGVuYWJsZWQpIC0+ICgpCiAKICAgICBTdGFydERvd25sb2Fk KGJvb2wgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgdWludDY0X3QgZG93bmxvYWRJRCwgV2ViQ29y ZTo6UmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QpCisgICAgQ29udmVydE1haW5SZXNvdXJjZUxvYWRU b0Rvd25sb2FkKHVpbnQ2NF90IG1haW5SZXNvdXJjZUxvYWRJZGVudGlmaWVyLCB1aW50NjRfdCBk b3dubG9hZElELCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCwgV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZSByZXNwb25zZSkKIAogICAgIENvb2tpZXNGb3JET00oYm9vbCBwcml2YXRl QnJvd3NpbmdFbmFibGVkLCBXZWJDb3JlOjpLVVJMIGZpcnN0UGFydHksIFdlYkNvcmU6OktVUkwg dXJsKSAtPiAoV1RGOjpTdHJpbmcgcmVzdWx0KQogICAgIFNldENvb2tpZXNGcm9tRE9NKGJvb2wg cHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCwgV2ViQ29yZTo6S1VSTCBmaXJzdFBhcnR5LCBXZWJDb3Jl OjpLVVJMIHVybCwgV1RGOjpTdHJpbmcgY29va2llU3RyaW5nKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmggYi9Tb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAppbmRleCA4YTcy YmEzZTU0OTdiZjg4YTM1ZDk5NWUzMjRlMjg2ZTlkNzQwMzE3Li5lZjgzOTU4OWNkM2UwNDBhZDcx YjRkMDIzMzE3N2ZmOTRmNjU2M2RjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaApAQCAtNjAsNyArNjAsOSBAQCBwdWJs aWM6CiAgICAgLy8gVXNlZCBieSBNZXNzYWdlU2VuZGVyLgogICAgIENvcmVJUEM6OkNvbm5lY3Rp b24qIGNvbm5lY3Rpb24oKSBjb25zdDsKICAgICB1aW50NjRfdCBkZXN0aW5hdGlvbklEKCkgY29u c3Q7Ci0gICAgCisKKyAgICBXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZSogaGFuZGxlKCkgY29uc3Qg eyByZXR1cm4gbV9oYW5kbGUuZ2V0KCk7IH0KKwogICAgIHZpcnR1YWwgdm9pZCBzdGFydCgpIE9W RVJSSURFOwogICAgIHZpcnR1YWwgdm9pZCBjb25uZWN0aW9uVG9XZWJQcm9jZXNzRGlkQ2xvc2Uo KSBPVkVSUklERTsKICAgICAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQv RG93bmxvYWRzL21hYy9Eb3dubG9hZE1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Eb3du bG9hZHMvbWFjL0Rvd25sb2FkTWFjLm1tCmluZGV4IDBhNjA5YTE3YTY3NTJmOGM5ODJlZTA3Mjlm Yzk2MzkzOTNjYTk3Y2QuLjJlMzE1OGM2OWIyYzU1ODc0NmM0ZmM1ZWZhY2FmYWI0NGJmNjE2NTcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Eb3dubG9hZHMvbWFjL0Rvd25sb2Fk TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9Eb3dubG9hZHMvbWFjL0Rvd25sb2Fk TWFjLm1tCkBAIC0zMCw2ICszMCw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL0F1dGhlbnRpY2F0aW9u TWFjLmg+CiAjaW1wb3J0IDxXZWJDb3JlL05vdEltcGxlbWVudGVkLmg+CiAjaW1wb3J0IDxXZWJD b3JlL1Jlc291cmNlSGFuZGxlLmg+CisjaW1wb3J0IDxXZWJDb3JlL1Jlc291cmNlSGFuZGxlQ2xp ZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1Jlc291cmNlUmVzcG9uc2UuaD4KICNpbXBvcnQgIkRh dGFSZWZlcmVuY2UuaCIKICNpbXBvcnQgIldlYlBhZ2UuaCIKQEAgLTEyNiw2ICsxMjcsMTcgQEAg dm9pZCBEb3dubG9hZDo6cmVjZWl2ZWRDYW5jZWxsYXRpb24oY29uc3QgQXV0aGVudGljYXRpb25D aGFsbGVuZ2UmIGF1dGhlbnRpY2F0aW8KIAogQGltcGxlbWVudGF0aW9uIFdLRG93bmxvYWRBc0Rl bGVnYXRlCiAKKy8vIEZJWE1FOiBJdCB3b3VsZCBiZSBuaWNlIGlmIHRoZXNlIGNhbGxiYWNrcyB3 b3VsZG4ndCBoYXZlIHRvIGJlIGludm9rZWQgb24gdGhlIG1haW4gdGhyZWFkLgorc3RhdGljIHZv aWQgZGlzcGF0Y2hPbk1haW5UaHJlYWQodm9pZCAoXmJsb2NrKSgpKQoreworICAgIGlmIChpc01h aW5UaHJlYWQoKSkgeworICAgICAgICBibG9jaygpOworICAgICAgICByZXR1cm47CisgICAgfQor CisgICAgZGlzcGF0Y2hfc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBibG9jayk7Cit9 CisKIC0gKGlkKWluaXRXaXRoRG93bmxvYWQ6KFdlYktpdDo6RG93bmxvYWQqKWRvd25sb2FkCiB7 CiAgICAgc2VsZiA9IFtzdXBlciBpbml0XTsKQEAgLTE0Myw4ICsxNTUsMTAgQEAgdm9pZCBEb3du bG9hZDo6cmVjZWl2ZWRDYW5jZWxsYXRpb24oY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2Um IGF1dGhlbnRpY2F0aW8KIAogLSAodm9pZClkb3dubG9hZERpZEJlZ2luOihOU1VSTERvd25sb2Fk ICopZG93bmxvYWQKIHsKLSAgICBpZiAoX2Rvd25sb2FkKQotICAgICAgICBfZG93bmxvYWQtPmRp ZFN0YXJ0KCk7CisgICAgZGlzcGF0Y2hPbk1haW5UaHJlYWQoXnsKKyAgICAgICAgaWYgKF9kb3du bG9hZCkKKyAgICAgICAgICAgIF9kb3dubG9hZC0+ZGlkU3RhcnQoKTsKKyAgICB9KTsKIH0KIAog LSAoTlNVUkxSZXF1ZXN0ICopZG93bmxvYWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG9hZCB3aWxs U2VuZFJlcXVlc3Q6KE5TVVJMUmVxdWVzdCAqKXJlcXVlc3QgcmVkaXJlY3RSZXNwb25zZTooTlNV UkxSZXNwb25zZSAqKXJlZGlyZWN0UmVzcG9uc2UKQEAgLTE2MSw4ICsxNzUsMTAgQEAgdm9pZCBE b3dubG9hZDo6cmVjZWl2ZWRDYW5jZWxsYXRpb24oY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVu Z2UmIGF1dGhlbnRpY2F0aW8KIAogLSAodm9pZClkb3dubG9hZDooTlNVUkxEb3dubG9hZCAqKWRv d25sb2FkIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZTooTlNVUkxBdXRoZW50aWNh dGlvbkNoYWxsZW5nZSAqKWNoYWxsZW5nZQogewotICAgIGlmIChfZG93bmxvYWQpCi0gICAgICAg IF9kb3dubG9hZC0+ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlKGNvcmUoY2hhbGxl bmdlKSk7CisgICAgZGlzcGF0Y2hPbk1haW5UaHJlYWQoXnsKKyAgICAgICAgaWYgKF9kb3dubG9h ZCkKKyAgICAgICAgICAgIF9kb3dubG9hZC0+ZGlkUmVjZWl2ZUF1dGhlbnRpY2F0aW9uQ2hhbGxl bmdlKGNvcmUoY2hhbGxlbmdlKSk7CisgICAgfSk7CiB9CiAKIC0gKHZvaWQpZG93bmxvYWQ6KE5T VVJMRG93bmxvYWQgKilkb3dubG9hZCBkaWRDYW5jZWxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZToo TlNVUkxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSAqKWNoYWxsZW5nZQpAQCAtMTc4LDggKzE5NCwx MCBAQCB2b2lkIERvd25sb2FkOjpyZWNlaXZlZENhbmNlbGxhdGlvbihjb25zdCBBdXRoZW50aWNh dGlvbkNoYWxsZW5nZSYgYXV0aGVudGljYXRpbwogCiAtICh2b2lkKWRvd25sb2FkOihOU1VSTERv d25sb2FkICopZG93bmxvYWQgZGlkUmVjZWl2ZVJlc3BvbnNlOihOU1VSTFJlc3BvbnNlICopcmVz cG9uc2UKIHsKLSAgICBpZiAoX2Rvd25sb2FkKQotICAgICAgICBfZG93bmxvYWQtPmRpZFJlY2Vp dmVSZXNwb25zZShyZXNwb25zZSk7CisgICAgZGlzcGF0Y2hPbk1haW5UaHJlYWQoXnsKKyAgICAg ICAgaWYgKF9kb3dubG9hZCkKKyAgICAgICAgICAgIF9kb3dubG9hZC0+ZGlkUmVjZWl2ZVJlc3Bv bnNlKHJlc3BvbnNlKTsKKyAgICB9KTsKIH0KIAogLSAodm9pZClkb3dubG9hZDooTlNVUkxEb3du bG9hZCAqKWRvd25sb2FkIHdpbGxSZXN1bWVXaXRoUmVzcG9uc2U6KE5TVVJMUmVzcG9uc2UgKily ZXNwb25zZSBmcm9tQnl0ZToobG9uZyBsb25nKXN0YXJ0aW5nQnl0ZQpAQCAtMTkwLDUwICsyMDgs NjUgQEAgdm9pZCBEb3dubG9hZDo6cmVjZWl2ZWRDYW5jZWxsYXRpb24oY29uc3QgQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UmIGF1dGhlbnRpY2F0aW8KIAogLSAodm9pZClkb3dubG9hZDooTlNVUkxE b3dubG9hZCAqKWRvd25sb2FkIGRpZFJlY2VpdmVEYXRhT2ZMZW5ndGg6KE5TVUludGVnZXIpbGVu Z3RoCiB7Ci0gICAgaWYgKF9kb3dubG9hZCkKLSAgICAgICAgX2Rvd25sb2FkLT5kaWRSZWNlaXZl RGF0YShsZW5ndGgpOworICAgIGRpc3BhdGNoT25NYWluVGhyZWFkKF57CisgICAgICAgIGlmIChf ZG93bmxvYWQpCisgICAgICAgICAgICBfZG93bmxvYWQtPmRpZFJlY2VpdmVEYXRhKGxlbmd0aCk7 CisgICAgfSk7CiB9CiAKIC0gKEJPT0wpZG93bmxvYWQ6KE5TVVJMRG93bmxvYWQgKilkb3dubG9h ZCBzaG91bGREZWNvZGVTb3VyY2VEYXRhT2ZNSU1FVHlwZTooTlNTdHJpbmcgKillbmNvZGluZ1R5 cGUKIHsKLSAgICBpZiAoX2Rvd25sb2FkKQotICAgICAgICByZXR1cm4gX2Rvd25sb2FkLT5zaG91 bGREZWNvZGVTb3VyY2VEYXRhT2ZNSU1FVHlwZShlbmNvZGluZ1R5cGUpOwotCi0gICAgcmV0dXJu IFlFUzsKKyAgICBfX2Jsb2NrIEJPT0wgcmV0dXJuVmFsdWU7CisgICAgZGlzcGF0Y2hPbk1haW5U aHJlYWQoXnsKKyAgICAgICAgaWYgKF9kb3dubG9hZCkKKyAgICAgICAgICAgIHJldHVyblZhbHVl ID0gX2Rvd25sb2FkLT5zaG91bGREZWNvZGVTb3VyY2VEYXRhT2ZNSU1FVHlwZShlbmNvZGluZ1R5 cGUpOworICAgICAgICBlbHNlCisgICAgICAgICAgICByZXR1cm5WYWx1ZSA9IFlFUzsKKyAgICB9 KTsKKworICAgIHJldHVybiByZXR1cm5WYWx1ZTs7CiB9CiAKIC0gKHZvaWQpZG93bmxvYWQ6KE5T VVJMRG93bmxvYWQgKilkb3dubG9hZCBkZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxl bmFtZTooTlNTdHJpbmcgKilmaWxlbmFtZQogewotICAgIFN0cmluZyBkZXN0aW5hdGlvbjsKLSAg ICBib29sIGFsbG93T3ZlcndyaXRlOwotICAgIGlmIChfZG93bmxvYWQpCi0gICAgICAgIGRlc3Rp bmF0aW9uID0gX2Rvd25sb2FkLT5kZWNpZGVEZXN0aW5hdGlvbldpdGhTdWdnZXN0ZWRGaWxlbmFt ZShmaWxlbmFtZSwgYWxsb3dPdmVyd3JpdGUpOwotCi0gICAgaWYgKCFkZXN0aW5hdGlvbi5pc051 bGwoKSkKLSAgICAgICAgW2Rvd25sb2FkIHNldERlc3RpbmF0aW9uOmRlc3RpbmF0aW9uIGFsbG93 T3ZlcndyaXRlOmFsbG93T3ZlcndyaXRlXTsKKyAgICBkaXNwYXRjaE9uTWFpblRocmVhZCheewor ICAgICAgICBTdHJpbmcgZGVzdGluYXRpb247CisgICAgICAgIGJvb2wgYWxsb3dPdmVyd3JpdGU7 CisgICAgICAgIGlmIChfZG93bmxvYWQpCisgICAgICAgICAgICBkZXN0aW5hdGlvbiA9IF9kb3du bG9hZC0+ZGVjaWRlRGVzdGluYXRpb25XaXRoU3VnZ2VzdGVkRmlsZW5hbWUoZmlsZW5hbWUsIGFs bG93T3ZlcndyaXRlKTsKKworICAgICAgICBpZiAoIWRlc3RpbmF0aW9uLmlzTnVsbCgpKQorICAg ICAgICAgICAgW2Rvd25sb2FkIHNldERlc3RpbmF0aW9uOmRlc3RpbmF0aW9uIGFsbG93T3Zlcndy aXRlOmFsbG93T3ZlcndyaXRlXTsKKyAgICB9KTsKIH0KIAogLSAodm9pZClkb3dubG9hZDooTlNV UkxEb3dubG9hZCAqKWRvd25sb2FkIGRpZENyZWF0ZURlc3RpbmF0aW9uOihOU1N0cmluZyAqKXBh dGgKIHsKLSAgICBpZiAoX2Rvd25sb2FkKQotICAgICAgICBfZG93bmxvYWQtPmRpZENyZWF0ZURl c3RpbmF0aW9uKHBhdGgpOworICAgIGRpc3BhdGNoT25NYWluVGhyZWFkKF57CisgICAgICAgIGlm IChfZG93bmxvYWQpCisgICAgICAgICAgICBfZG93bmxvYWQtPmRpZENyZWF0ZURlc3RpbmF0aW9u KHBhdGgpOworICAgIH0pOwogfQogCiAtICh2b2lkKWRvd25sb2FkRGlkRmluaXNoOihOU1VSTERv d25sb2FkICopZG93bmxvYWQKIHsKLSAgICBpZiAoX2Rvd25sb2FkKQotICAgICAgICBfZG93bmxv YWQtPmRpZEZpbmlzaCgpOworICAgIGRpc3BhdGNoT25NYWluVGhyZWFkKF57CisgICAgICAgIGlm IChfZG93bmxvYWQpCisgICAgICAgICAgICBfZG93bmxvYWQtPmRpZEZpbmlzaCgpOworICAgIH0p OwogfQogCiAtICh2b2lkKWRvd25sb2FkOihOU1VSTERvd25sb2FkICopZG93bmxvYWQgZGlkRmFp bFdpdGhFcnJvcjooTlNFcnJvciAqKWVycm9yCiB7Ci0gICAgaWYgKCFfZG93bmxvYWQpCi0gICAg ICAgIHJldHVybjsKKyAgICBkaXNwYXRjaE9uTWFpblRocmVhZCheeworICAgICAgICBpZiAoIV9k b3dubG9hZCkKKyAgICAgICAgICAgIHJldHVybjsKIAotICAgIFJldGFpblB0cjxOU0RhdGE+IHJl c3VtZURhdGEgPSBbZG93bmxvYWQgcmVzdW1lRGF0YV07Ci0gICAgQ29yZUlQQzo6RGF0YVJlZmVy ZW5jZSBkYXRhUmVmZXJlbmNlKHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3QgdWludDhfdCo+KFtyZXN1 bWVEYXRhLmdldCgpIGJ5dGVzXSksIFtyZXN1bWVEYXRhLmdldCgpIGxlbmd0aF0pOworICAgICAg ICBSZXRhaW5QdHI8TlNEYXRhPiByZXN1bWVEYXRhID0gW2Rvd25sb2FkIHJlc3VtZURhdGFdOwor ICAgICAgICBDb3JlSVBDOjpEYXRhUmVmZXJlbmNlIGRhdGFSZWZlcmVuY2UocmVpbnRlcnByZXRf Y2FzdDxjb25zdCB1aW50OF90Kj4oW3Jlc3VtZURhdGEuZ2V0KCkgYnl0ZXNdKSwgW3Jlc3VtZURh dGEuZ2V0KCkgbGVuZ3RoXSk7CiAKLSAgICBfZG93bmxvYWQtPmRpZEZhaWwoZXJyb3IsIGRhdGFS ZWZlcmVuY2UpOworICAgICAgICBfZG93bmxvYWQtPmRpZEZhaWwoZXJyb3IsIGRhdGFSZWZlcmVu Y2UpOworICAgIH0pOwogfQogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCmluZGV4IDk3NTNiYTVmNzcxNjczMTkyOWNhZjQ2ZGJlZmM1NGY1Y2QzNTAzZDUu LmU3OTExMTY4ZWMwNDM3YmNiYWU1MTRkZGYxOWUyNGNhMzgwYWY3MTkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0xNDQ2LDE2ICsxNDQ2LDYgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OnJlY2VpdmVkUG9saWN5RGVjaXNpb24oUG9saWN5QWN0aW9uIGFjdGlv biwgV2ViRnJhbWVQcm94eSogZnIKICAgICBpZiAoIWlzVmFsaWQoKSkKICAgICAgICAgcmV0dXJu OwogCi0jaWYgRU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKLSAgICAvLyBGSVhNRSAoTmV0d29ya1By b2Nlc3MpOiBJbnN0ZWFkIG9mIGNhbmNlbGluZyB0aGUgbG9hZCBhbmQgdGhlbiBzdGFydGluZyBh IHNlcGFyYXRlIGRvd25sb2FkLCB3ZSBzaG91bGQKLSAgICAvLyBqdXN0IGNvbnZlcnQgdGhlIGNv bm5lY3Rpb24gdG8gYSBkb3dubG9hZCBjb25uZWN0aW9uLiBTZWUgPHJkYXI6Ly9wcm9ibGVtLzEy ODkwMTg0Pi4KLSAgICBpZiAobV9pbkRlY2lkZVBvbGljeUZvclJlc3BvbnNlU3luYyAmJiBhY3Rp b24gPT0gUG9saWN5RG93bmxvYWQgJiYgbV9wcm9jZXNzLT5jb250ZXh0KCktPnVzZXNOZXR3b3Jr UHJvY2VzcygpKSB7Ci0gICAgICAgIGFjdGlvbiA9IFBvbGljeUlnbm9yZTsKLQotICAgICAgICBt X3Byb2Nlc3MtPmNvbnRleHQoKS0+ZG93bmxvYWQodGhpcywgKm1fZGVjaWRlUG9saWN5Rm9yUmVz cG9uc2VSZXF1ZXN0KTsKLSAgICB9Ci0jZW5kaWYKLQogICAgIGlmIChhY3Rpb24gPT0gUG9saWN5 SWdub3JlKQogICAgICAgICBjbGVhclBlbmRpbmdBUElSZXF1ZXN0VVJMKCk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJGcmFtZS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViRnJhbWUuY3BwCmluZGV4IDhiOTZhYjJk MmU1NTk0YjEyZWRjMzM5NGQ4OWFjNzc0OTk4NjAyMmIuLjFhNGYwOTM0NGRmMzEyNDYyMTg1ZmI4 ZWJlYTk1YzFiYWM2YjkzYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJGcmFtZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYkZyYW1lLmNwcApAQCAtMjU4LDcgKzI1OCw3IEBAIHZvaWQgV2ViRnJhbWU6OmNvbnZl cnRNYWluUmVzb3VyY2VMb2FkVG9Eb3dubG9hZChEb2N1bWVudExvYWRlciogZG9jdW1lbnRMb2Fk ZXIsCiAKICNpZiBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQogICAgIGlmIChXZWJQcm9jZXNzOjpz aGFyZWQoKS51c2VzTmV0d29ya1Byb2Nlc3MoKSkgewotICAgICAgICAvLyBGSVhNRTogSGFuZGxl IHRoaXMgY2FzZS4KKyAgICAgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkubmV0d29ya0Nvbm5lY3Rp b24oKS0+Y29ubmVjdGlvbigpLT5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrQ29ubmVjdGlvblRvV2Vi UHJvY2Vzczo6Q29udmVydE1haW5SZXNvdXJjZUxvYWRUb0Rvd25sb2FkKGRvY3VtZW50TG9hZGVy LT5tYWluUmVzb3VyY2VMb2FkZXIoKS0+aWRlbnRpZmllcigpLCBwb2xpY3lEb3dubG9hZElELCBy ZXF1ZXN0LCByZXNwb25zZSksIDApOwogICAgICAgICByZXR1cm47CiAgICAgfQogI2VuZGlmCg==