152716 2016-01-04 15:34:24 -0800 Progress towards implementing downloads with NetworkSession 2016-01-04 16:23:03 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen commit-queue oldest_to_newest 1152549 0 achristensen 2016-01-04 15:34:24 -0800 Progress towards implementing downloads with NetworkSession 1152552 1 268243 achristensen 2016-01-04 15:41:16 -0800 Created attachment 268243 Patch 1152560 2 achristensen 2016-01-04 16:06:24 -0800 r194562 268243 2016-01-04 15:41:16 -0800 2016-01-04 16:05:46 -0800 Patch bug-152716-20160104154043.patch text/plain 13105 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NDU2MSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDUzIEBACisyMDE2LTAxLTA0ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUHJvZ3Jlc3Mg dG93YXJkcyBpbXBsZW1lbnRpbmcgZG93bmxvYWRzIHdpdGggTmV0d29ya1Nlc3Npb24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjcxNgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvRG93bmxvYWRzL0Rvd25sb2FkLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvRG93bmxv YWRzL0Rvd25sb2FkSUQuaDoKKyAgICAgICAgKFdlYktpdDo6RG93bmxvYWRJRDo6RG93bmxvYWRJ RCk6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkSUQ6Om9wZXJhdG9yPT0pOgorICAgICAgICAo V2ViS2l0OjpEb3dubG9hZElEOjpvcGVyYXRvciE9KToKKyAgICAgICAgKFdlYktpdDo6RG93bmxv YWRJRDo6ZG93bmxvYWRJRCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rv d25sb2FkTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkRvd25sb2FkTWFuYWdlcjo6c3Rh cnREb3dubG9hZCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2Fk TWFuYWdlci5oOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZE1hbmFnZXI6OmRvd25sb2FkKToK KyAgICAgICAgKFdlYktpdDo6RG93bmxvYWRNYW5hZ2VyOjppc0Rvd25sb2FkaW5nKToKKyAgICAg ICAgKiBOZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvY29jb2EvRG93bmxvYWRDb2NvYS5tbToKKyAg ICAgICAgKFdlYktpdDo6RG93bmxvYWQ6OnJlc3VtZSk6CisgICAgICAgIChXZWJLaXQ6OkRvd25s b2FkOjpwbGF0Zm9ybUludmFsaWRhdGUpOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZDo6cGxh dGZvcm1EaWRGaW5pc2gpOgorICAgICAgICAoV2ViS2l0OjpEb3dubG9hZDo6c3RhcnQpOiBEZWxl dGVkLgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmg6CisgICAgICAg ICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbToKKyAgICAgICAg KC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246dGFzazp3aWxsUGVyZm9ybUhU VFBSZWRpcmVjdGlvbjpuZXdSZXF1ZXN0OmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAo LVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOmRpZFJlY2VpdmVDaGFs bGVuZ2U6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25E ZWxlZ2F0ZSBVUkxTZXNzaW9uOnRhc2s6ZGlkQ29tcGxldGVXaXRoRXJyb3I6XSk6CisgICAgICAg ICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZFJlY2Vp dmVSZXNwb25zZTpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vz c2lvbkRlbGVnYXRlIFVSTFNlc3Npb246ZGF0YVRhc2s6ZGlkUmVjZWl2ZURhdGE6XSk6CisgICAg ICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOmRvd25sb2FkVGFzazpk aWRGaW5pc2hEb3dubG9hZGluZ1RvVVJMOl0pOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9u RGVsZWdhdGUgVVJMU2Vzc2lvbjpkb3dubG9hZFRhc2s6ZGlkV3JpdGVEYXRhOnRvdGFsQnl0ZXNX cml0dGVuOnRvdGFsQnl0ZXNFeHBlY3RlZFRvV3JpdGU6XSk6CisgICAgICAgICgtW1dLTmV0d29y a1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOmRvd25sb2FkVGFzazpkaWRSZXN1bWVBdE9mZnNl dDpleHBlY3RlZFRvdGFsQnl0ZXM6XSk6CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxl Z2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZEJlY29tZURvd25sb2FkVGFzazpdKToKKworICAg ICAgICBXaGVuIHVzaW5nIE5TVVJMU2Vzc2lvbiwgYSBkYXRhIHRhc2sgaXMgY29udmVydGVkIHRv IGEgZG93bmxvYWQgdGFzayBhZnRlciB0aGUgY29ubmVjdGlvbiBoYXMgYWxyZWFkeQorICAgICAg ICBiZWVuIGVzdGFibGlzaGVkLCB0aGUgaGVhZGVycyBoYXZlIGJlZW4gcmVjZWl2ZWQsIGFuZCBX ZWJDb3JlIGxvb2tzIGF0IHRoZSByZXNwb25zZSBhbmQgZGVjaWRlcyB0aGF0CisgICAgICAgIHRo aXMgY29ubmVjdGlvbiBzaG91bGQgYmVjb21lIGEgZG93bmxvYWQuICBXZSBjYWxsIHRoZSBkaWRS ZWNlaXZlUmVzcG9uc2UgdG8gbWF0Y2ggdGhlIGJlaGF2aW9yIG9mIAorICAgICAgICBOU1VSTERv d25sb2FkLCBidXQgdGhpcyBjb3VsZCBiZSBjbGVhbmVkIHVwIGxhdGVyIHRvIG1hdGNoIHdoYXQg aXMgYWN0dWFsbHkgaGFwcGVuaW5nLiAgV2UgYWxzbyBkbyBub3QKKyAgICAgICAgbmVlZCB0byB0 ZWxsIHRoZSBkb3dubG9hZCB0byBzdGFydCBiZWNhdXNlIGl0IGhhcyBhbHJlYWR5IHN0YXJ0ZWQu CisKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246OmRhdGFUYXNrRm9ySWRlbnRpZmll cik6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uOjphZGREb3dubG9hZElEKToKKyAg ICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246OmRvd25sb2FkSUQpOgorICAgICAgICAoV2Vi S2l0OjpOZXR3b3JrU2Vzc2lvbjo6dGFrZURvd25sb2FkSUQpOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrRGF0YVRhc2s6Ok5ldHdvcmtEYXRhVGFzayk6CisKKyAgICAgICAgTlNVUkxTZXNzaW9u RG93bmxvYWRUYXNrIHRhc2tJZGVudGlmaWVycyBhcmUgdW5pcXVlIHRvIHRoYXQgTlNVUkxTZXNz aW9uLCBidXQgd2UgaGF2ZSBvbmUgZ2xvYmFsIERvd25sb2FkTWFuYWdlcgorICAgICAgICBpbiB0 aGUgTmV0d29ya1Byb2Nlc3MuICBXZSBuZWVkIHRvIGhhdmUgZWFjaCBOZXR3b3JrU2Vzc2lvbiBr ZWVwIGEgbWFwIG9mIHRhc2tJZGVudGlmaWVycyB0byBnbG9iYWwgRG93bmxvYWRJRC4KKwogMjAx Ni0wMS0wNCAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAg ICBUdXJuIG9uIGdlc3R1cmUgZXZlbnRzIHdoZW4gYnVpbGRpbmcgZm9yIFlvc2VtaXRlCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmgJKHJl dmlzaW9uIDE5NDUzNikKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtT ZXNzaW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyNyw2ICsxMjcsMTAgQEAgcHVibGljOgogCiAg ICAgTmV0d29ya0RhdGFUYXNrKiBkYXRhVGFza0ZvcklkZW50aWZpZXIoTmV0d29ya0RhdGFUYXNr OjpUYXNrSWRlbnRpZmllcik7CiAKKyAgICB2b2lkIGFkZERvd25sb2FkSUQoTmV0d29ya0RhdGFU YXNrOjpUYXNrSWRlbnRpZmllciwgRG93bmxvYWRJRCk7CisgICAgRG93bmxvYWRJRCBkb3dubG9h ZElEKE5ldHdvcmtEYXRhVGFzazo6VGFza0lkZW50aWZpZXIpOworICAgIERvd25sb2FkSUQgdGFr ZURvd25sb2FkSUQoTmV0d29ya0RhdGFUYXNrOjpUYXNrSWRlbnRpZmllcik7CisgICAgCiBwcml2 YXRlOgogICAgIFdlYkNvcmU6OlNlc3Npb25JRCBtX3Nlc3Npb25JRDsKICAgICBIYXNoTWFwPE5l dHdvcmtEYXRhVGFzazo6VGFza0lkZW50aWZpZXIsIE5ldHdvcmtEYXRhVGFzayo+IG1fZGF0YVRh c2tNYXA7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMvRG93 bmxvYWQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3du bG9hZHMvRG93bmxvYWQuaAkocmV2aXNpb24gMTk0NTM2KQorKysgU291cmNlL1dlYktpdDIvTmV0 d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkLmgJKHdvcmtpbmcgY29weSkKQEAgLTgzLDEw ICs4MywxMCBAQCBwdWJsaWM6CiAjZW5kaWYKICAgICB+RG93bmxvYWQoKTsKIAotICAgIHZvaWQg c3RhcnQoKTsKICNpZiBVU0UoTkVUV09SS19TRVNTSU9OKSAmJiBQTEFURk9STShDT0NPQSkKICAg ICB2b2lkIGRhdGFUYXNrRGlkQmVjb21lRG93bmxvYWRUYXNrKGNvbnN0IE5ldHdvcmtTZXNzaW9u JiwgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbkRvd25sb2FkVGFzaz4mJik7CiAjZWxzZQorICAgIHZv aWQgc3RhcnQoKTsKICAgICB2b2lkIHN0YXJ0V2l0aEhhbmRsZShXZWJDb3JlOjpSZXNvdXJjZUhh bmRsZSosIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKTsKICNlbmRpZgogICAgIHZv aWQgcmVzdW1lKGNvbnN0IElQQzo6RGF0YVJlZmVyZW5jZSYgcmVzdW1lRGF0YSwgY29uc3QgU3Ry aW5nJiBwYXRoLCBjb25zdCBTYW5kYm94RXh0ZW5zaW9uOjpIYW5kbGUmKTsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZElELmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkSUQu aAkocmV2aXNpb24gMTk0NTM1KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93 bmxvYWRzL0Rvd25sb2FkSUQuaAkod29ya2luZyBjb3B5KQpAQCAtNDUsNiArNDUsNyBAQCBwdWJs aWM6CiAgICAgfQogCiAgICAgYm9vbCBvcGVyYXRvcj09KERvd25sb2FkSUQgb3RoZXIpIGNvbnN0 IHsgcmV0dXJuIG1fZG93bmxvYWRJRCA9PSBvdGhlci5tX2Rvd25sb2FkSUQ7IH0KKyAgICBib29s IG9wZXJhdG9yIT0oRG93bmxvYWRJRCBvdGhlcikgY29uc3QgeyByZXR1cm4gbV9kb3dubG9hZElE ICE9IG90aGVyLm1fZG93bmxvYWRJRDsgfQogCiAgICAgdWludDY0X3QgZG93bmxvYWRJRCgpIGNv bnN0IHsgcmV0dXJuIG1fZG93bmxvYWRJRDsgfQogcHJpdmF0ZToKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1hbmFnZXIuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9Eb3dubG9hZE1h bmFnZXIuY3BwCShyZXZpc2lvbiAxOTQ1MzgpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJv Y2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTEs OCArNTEsOCBAQCB2b2lkIERvd25sb2FkTWFuYWdlcjo6c3RhcnREb3dubG9hZChTZXNzCiAgICAg ZG93bmxvYWQtPmRpZFN0YXJ0KHJlcXVlc3QpOwogI2Vsc2UKICAgICBhdXRvIGRvd25sb2FkID0g c3RkOjptYWtlX3VuaXF1ZTxEb3dubG9hZD4oKnRoaXMsIGRvd25sb2FkSUQsIHJlcXVlc3QpOwot I2VuZGlmCiAgICAgZG93bmxvYWQtPnN0YXJ0KCk7CisjZW5kaWYKIAogICAgIEFTU0VSVCghbV9k b3dubG9hZHMuY29udGFpbnMoZG93bmxvYWRJRCkpOwogICAgIG1fZG93bmxvYWRzLmFkZChkb3du bG9hZElELCBXVEZNb3ZlKGRvd25sb2FkKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3Jr UHJvY2Vzcy9Eb3dubG9hZHMvRG93bmxvYWRNYW5hZ2VyLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL0Rvd25sb2FkTWFuYWdlci5oCShyZXZp c2lvbiAxOTQ1MzYpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9Eb3dubG9hZHMv RG93bmxvYWRNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTgwLDYgKzgwLDggQEAgcHVibGlj OgogICAgIHZvaWQgcmVzdW1lRG93bmxvYWQoV2ViQ29yZTo6U2Vzc2lvbklELCBEb3dubG9hZElE LCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIHJlc3VtZURhdGEsIGNvbnN0IFN0cmluZyYgcGF0 aCwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJik7CiAKICAgICB2b2lkIGNhbmNlbERv d25sb2FkKERvd25sb2FkSUQpOworICAgIAorICAgIERvd25sb2FkKiBkb3dubG9hZChEb3dubG9h ZElEIGRvd25sb2FkSUQpIHsgcmV0dXJuIG1fZG93bmxvYWRzLmdldChkb3dubG9hZElEKTsgfQog CiAgICAgdm9pZCBkb3dubG9hZEZpbmlzaGVkKERvd25sb2FkKik7CiAgICAgYm9vbCBpc0Rvd25s b2FkaW5nKCkgY29uc3QgeyByZXR1cm4gIW1fZG93bmxvYWRzLmlzRW1wdHkoKTsgfQpJbmRleDog U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxvYWRzL2NvY29hL0Rvd25sb2FkQ29j b2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvRG93bmxv YWRzL2NvY29hL0Rvd25sb2FkQ29jb2EubW0JKHJldmlzaW9uIDE5NDUzNSkKKysrIFNvdXJjZS9X ZWJLaXQyL05ldHdvcmtQcm9jZXNzL0Rvd25sb2Fkcy9jb2NvYS9Eb3dubG9hZENvY29hLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0zMiwxMSArMzIsNiBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAot dm9pZCBEb3dubG9hZDo6c3RhcnQoKQotewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci19Ci0KIHZv aWQgRG93bmxvYWQ6OnJlc3VtZShjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmIHJlc3VtZURhdGEs IGNvbnN0IFN0cmluZyYgcGF0aCwgY29uc3QgU2FuZGJveEV4dGVuc2lvbjo6SGFuZGxlJiBzYW5k Ym94RXh0ZW5zaW9uSGFuZGxlKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CkBAIC01Miw2ICs0 NywxMCBAQCB2b2lkIERvd25sb2FkOjpwbGF0Zm9ybUludmFsaWRhdGUoKQogICAgIG5vdEltcGxl bWVudGVkKCk7CiB9CiAKK3ZvaWQgRG93bmxvYWQ6OnBsYXRmb3JtRGlkRmluaXNoKCkKK3sKK30K KyAgICAKIH0KIAogI2VuZGlmIC8vIFVTRShORVRXT1JLX1NFU1NJT04pCkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNz aW9uQ29jb2EubW0JKHJldmlzaW9uIDE5NDUzOCkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTk0 LDggKzk0LDYgQEAgLSAoaWQpaW5pdFdpdGhOZXR3b3JrU2Vzc2lvbjooV2ViS2l0OjpOZQogCiAt ICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3Npb24gdGFzazooTlNVUkxTZXNz aW9uVGFzayAqKXRhc2sgd2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb246KE5TSFRUUFVSTFJlc3Bv bnNlICopcmVzcG9uc2UgbmV3UmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdCBjb21wbGV0 aW9uSGFuZGxlcjoodm9pZCAoXikoTlNVUkxSZXF1ZXN0ICopKWNvbXBsZXRpb25IYW5kbGVyCiB7 Ci0gICAgVU5VU0VEX1BBUkFNKHNlc3Npb24pOwotCiAgICAgaWYgKGF1dG8qIG5ldHdvcmtpbmdU YXNrID0gX3Nlc3Npb24tPmRhdGFUYXNrRm9ySWRlbnRpZmllcih0YXNrLnRhc2tJZGVudGlmaWVy KSkgewogICAgICAgICBpZiAoYXV0byogY2xpZW50ID0gbmV0d29ya2luZ1Rhc2stPmNsaWVudCgp KSB7CiAgICAgICAgICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyQ29weSA9IEJsb2NrX2NvcHko Y29tcGxldGlvbkhhbmRsZXIpOwpAQCAtMTExLDggKzEwOSw2IEBAIC0gKHZvaWQpVVJMU2Vzc2lv bjooTlNVUkxTZXNzaW9uICopc2Vzc2kKIAogLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Np b24gKilzZXNzaW9uIHRhc2s6KE5TVVJMU2Vzc2lvblRhc2sgKil0YXNrIGRpZFJlY2VpdmVDaGFs bGVuZ2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2UgY29tcGxldGlv bkhhbmRsZXI6KHZvaWQgKF4pKE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VEaXNwb3NpdGlvbiBk aXNwb3NpdGlvbiwgTlNVUkxDcmVkZW50aWFsICpjcmVkZW50aWFsKSljb21wbGV0aW9uSGFuZGxl cgogewotICAgIFVOVVNFRF9QQVJBTShzZXNzaW9uKTsKLQogICAgIGlmIChhdXRvKiBuZXR3b3Jr aW5nVGFzayA9IF9zZXNzaW9uLT5kYXRhVGFza0ZvcklkZW50aWZpZXIodGFzay50YXNrSWRlbnRp ZmllcikpIHsKICAgICAgICAgaWYgKGF1dG8qIGNsaWVudCA9IG5ldHdvcmtpbmdUYXNrLT5jbGll bnQoKSkgewogICAgICAgICAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19j b3B5KGNvbXBsZXRpb25IYW5kbGVyKTsKQEAgLTEyOCw4ICsxMjQsNiBAQCAtICh2b2lkKVVSTFNl c3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3NpCiAKIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxT ZXNzaW9uICopc2Vzc2lvbiB0YXNrOihOU1VSTFNlc3Npb25UYXNrICopdGFzayBkaWRDb21wbGV0 ZVdpdGhFcnJvcjooTlNFcnJvciAqKWVycm9yCiB7Ci0gICAgVU5VU0VEX1BBUkFNKHNlc3Npb24p OwotCiAgICAgaWYgKGF1dG8qIG5ldHdvcmtpbmdUYXNrID0gX3Nlc3Npb24tPmRhdGFUYXNrRm9y SWRlbnRpZmllcih0YXNrLnRhc2tJZGVudGlmaWVyKSkgewogICAgICAgICBpZiAoYXV0byogY2xp ZW50ID0gbmV0d29ya2luZ1Rhc2stPmNsaWVudCgpKQogICAgICAgICAgICAgY2xpZW50LT5kaWRD b21wbGV0ZVdpdGhFcnJvcihlcnJvcik7CkBAIC0xMzgsOCArMTMyLDYgQEAgLSAodm9pZClVUkxT ZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaQogCiAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJM U2Vzc2lvbiAqKXNlc3Npb24gZGF0YVRhc2s6KE5TVVJMU2Vzc2lvbkRhdGFUYXNrICopZGF0YVRh c2sgZGlkUmVjZWl2ZVJlc3BvbnNlOihOU1VSTFJlc3BvbnNlICopcmVzcG9uc2UgY29tcGxldGlv bkhhbmRsZXI6KHZvaWQgKF4pKE5TVVJMU2Vzc2lvblJlc3BvbnNlRGlzcG9zaXRpb24gZGlzcG9z aXRpb24pKWNvbXBsZXRpb25IYW5kbGVyCiB7Ci0gICAgVU5VU0VEX1BBUkFNKHNlc3Npb24pOwot CiAgICAgaWYgKGF1dG8qIG5ldHdvcmtpbmdUYXNrID0gX3Nlc3Npb24tPmRhdGFUYXNrRm9ySWRl bnRpZmllcihkYXRhVGFzay50YXNrSWRlbnRpZmllcikpIHsKICAgICAgICAgaWYgKGF1dG8qIGNs aWVudCA9IG5ldHdvcmtpbmdUYXNrLT5jbGllbnQoKSkgewogICAgICAgICAgICAgQVNTRVJUKGlz TWFpblRocmVhZCgpKTsKQEAgLTE1OCw4ICsxNTAsNiBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5T VVJMU2Vzc2lvbiAqKXNlc3NpCiAKIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICop c2Vzc2lvbiBkYXRhVGFzazooTlNVUkxTZXNzaW9uRGF0YVRhc2sgKilkYXRhVGFzayBkaWRSZWNl aXZlRGF0YTooTlNEYXRhICopZGF0YQogewotICAgIFVOVVNFRF9QQVJBTShzZXNzaW9uKTsKLQog ICAgIGlmIChhdXRvKiBuZXR3b3JraW5nVGFzayA9IF9zZXNzaW9uLT5kYXRhVGFza0ZvcklkZW50 aWZpZXIoZGF0YVRhc2sudGFza0lkZW50aWZpZXIpKSB7CiAgICAgICAgIGlmIChhdXRvKiBjbGll bnQgPSBuZXR3b3JraW5nVGFzay0+Y2xpZW50KCkpCiAgICAgICAgICAgICBjbGllbnQtPmRpZFJl Y2VpdmVEYXRhKFdlYkNvcmU6OlNoYXJlZEJ1ZmZlcjo6d3JhcE5TRGF0YShkYXRhKSk7CkBAIC0x NjgsMTMgKzE1OCwxOSBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3Np CiAKIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lvbiBkb3dubG9hZFRh c2s6KE5TVVJMU2Vzc2lvbkRvd25sb2FkVGFzayAqKWRvd25sb2FkVGFzayBkaWRGaW5pc2hEb3du bG9hZGluZ1RvVVJMOihOU1VSTCAqKWxvY2F0aW9uCiB7CisgICAgYXV0byBkb3dubG9hZElEID0g X3Nlc3Npb24tPnRha2VEb3dubG9hZElEKFtkb3dubG9hZFRhc2sgdGFza0lkZW50aWZpZXJdKTsK ICAgICBub3RJbXBsZW1lbnRlZCgpOworICAgIGlmIChhdXRvKiBkb3dubG9hZCA9IFdlYktpdDo6 TmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmRvd25sb2FkTWFuYWdlcigpLmRvd25sb2FkKGRv d25sb2FkSUQpKQorICAgICAgICBkb3dubG9hZC0+ZGlkRmluaXNoKCk7CiB9CiAKIC0gKHZvaWQp VVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lvbiBkb3dubG9hZFRhc2s6KE5TVVJMU2Vz c2lvbkRvd25sb2FkVGFzayAqKWRvd25sb2FkVGFzayBkaWRXcml0ZURhdGE6KGludDY0X3QpYnl0 ZXNXcml0dGVuIHRvdGFsQnl0ZXNXcml0dGVuOihpbnQ2NF90KXRvdGFsQnl0ZXNXcml0dGVuIHRv dGFsQnl0ZXNFeHBlY3RlZFRvV3JpdGU6KGludDY0X3QpdG90YWxCeXRlc0V4cGVjdGVkVG9Xcml0 ZQogewogICAgIEFTU0VSVF9XSVRIX01FU1NBR0UoIV9zZXNzaW9uLT5kYXRhVGFza0ZvcklkZW50 aWZpZXIoW2Rvd25sb2FkVGFzayB0YXNrSWRlbnRpZmllcl0pLCAiVGhlIE5ldHdvcmtEYXRhVGFz ayBzaG91bGQgYmUgZGVzdHJveWVkIGltbWVkaWF0ZWx5IGFmdGVyIGRpZEJlY29tZURvd25sb2Fk VGFzayByZXR1cm5zIik7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKworICAgIGF1dG8gZG93bmxv YWRJRCA9IF9zZXNzaW9uLT5kb3dubG9hZElEKFtkb3dubG9hZFRhc2sgdGFza0lkZW50aWZpZXJd KTsKKyAgICBpZiAoYXV0byogZG93bmxvYWQgPSBXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjpzaW5n bGV0b24oKS5kb3dubG9hZE1hbmFnZXIoKS5kb3dubG9hZChkb3dubG9hZElEKSkKKyAgICAgICAg ZG93bmxvYWQtPmRpZFJlY2VpdmVEYXRhKGJ5dGVzV3JpdHRlbik7CiB9CiAKIC0gKHZvaWQpVVJM U2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lvbiBkb3dubG9hZFRhc2s6KE5TVVJMU2Vzc2lv bkRvd25sb2FkVGFzayAqKWRvd25sb2FkVGFzayBkaWRSZXN1bWVBdE9mZnNldDooaW50NjRfdClm aWxlT2Zmc2V0IGV4cGVjdGVkVG90YWxCeXRlczooaW50NjRfdClleHBlY3RlZFRvdGFsQnl0ZXMK QEAgLTE4OSwxMCArMTg1LDEzIEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICop c2Vzc2kKICAgICAgICAgYXV0byYgZG93bmxvYWRNYW5hZ2VyID0gV2ViS2l0OjpOZXR3b3JrUHJv Y2Vzczo6c2luZ2xldG9uKCkuZG93bmxvYWRNYW5hZ2VyKCk7CiAgICAgICAgIGF1dG8gZG93bmxv YWQgPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYktpdDo6RG93bmxvYWQ+KGRvd25sb2FkTWFuYWdlciwg Kl9zZXNzaW9uLCBkb3dubG9hZElEKTsKICAgICAgICAgZG93bmxvYWQtPmRpZFN0YXJ0KFtkb3du bG9hZFRhc2sgY3VycmVudFJlcXVlc3RdKTsKKyAgICAgICAgZG93bmxvYWQtPmRpZFJlY2VpdmVS ZXNwb25zZShbZG93bmxvYWRUYXNrIHJlc3BvbnNlXSk7CiAgICAgICAgIGRvd25sb2FkTWFuYWdl ci5kYXRhVGFza0JlY2FtZURvd25sb2FkVGFzayhkb3dubG9hZElELCBXVEZNb3ZlKGRvd25sb2Fk KSk7CiAKICAgICAgICAgaWYgKGF1dG8qIGNsaWVudCA9IG5ldHdvcmtEYXRhVGFzay0+Y2xpZW50 KCkpCiAgICAgICAgICAgICBjbGllbnQtPmRpZEJlY29tZURvd25sb2FkKCk7CisKKyAgICAgICAg X3Nlc3Npb24tPmFkZERvd25sb2FkSUQoW2Rvd25sb2FkVGFzayB0YXNrSWRlbnRpZmllcl0sIGRv d25sb2FkSUQpOwogICAgIH0KIH0KIApAQCAtMjUzLDYgKzI1MiwyOSBAQCBOZXR3b3JrRGF0YVRh c2sqIE5ldHdvcmtTZXNzaW9uOjpkYXRhVGFzCiAgICAgcmV0dXJuIG1fZGF0YVRhc2tNYXAuZ2V0 KHRhc2tJZGVudGlmaWVyKTsKIH0KIAordm9pZCBOZXR3b3JrU2Vzc2lvbjo6YWRkRG93bmxvYWRJ RChOZXR3b3JrRGF0YVRhc2s6OlRhc2tJZGVudGlmaWVyIHRhc2tJZGVudGlmaWVyLCBEb3dubG9h ZElEIGRvd25sb2FkSUQpCit7CisjaWZuZGVmIE5ERUJVRworICAgIEFTU0VSVCghbV9kb3dubG9h ZE1hcC5jb250YWlucyh0YXNrSWRlbnRpZmllcikpOworICAgIGZvciAoYXV0byBpZEluTWFwIDog bV9kb3dubG9hZE1hcC52YWx1ZXMoKSkKKyAgICAgICAgQVNTRVJUKGlkSW5NYXAgIT0gZG93bmxv YWRJRCk7CisjZW5kaWYKKyAgICBtX2Rvd25sb2FkTWFwLmFkZCh0YXNrSWRlbnRpZmllciwgZG93 bmxvYWRJRCk7Cit9CisKK0Rvd25sb2FkSUQgTmV0d29ya1Nlc3Npb246OmRvd25sb2FkSUQoTmV0 d29ya0RhdGFUYXNrOjpUYXNrSWRlbnRpZmllciB0YXNrSWRlbnRpZmllcikKK3sKKyAgICBBU1NF UlQobV9kb3dubG9hZE1hcC5nZXQodGFza0lkZW50aWZpZXIpLmRvd25sb2FkSUQoKSk7CisgICAg cmV0dXJuIG1fZG93bmxvYWRNYXAuZ2V0KHRhc2tJZGVudGlmaWVyKTsKK30KKworRG93bmxvYWRJ RCBOZXR3b3JrU2Vzc2lvbjo6dGFrZURvd25sb2FkSUQoTmV0d29ya0RhdGFUYXNrOjpUYXNrSWRl bnRpZmllciB0YXNrSWRlbnRpZmllcikKK3sKKyAgICBhdXRvIGRvd25sb2FkSUQgPSBtX2Rvd25s b2FkTWFwLnRha2UodGFza0lkZW50aWZpZXIpOworICAgIEFTU0VSVChkb3dubG9hZElELmRvd25s b2FkSUQoKSk7CisgICAgcmV0dXJuIGRvd25sb2FkSUQ7Cit9CisKIE5ldHdvcmtEYXRhVGFzazo6 TmV0d29ya0RhdGFUYXNrKE5ldHdvcmtTZXNzaW9uJiBzZXNzaW9uLCBOZXR3b3JrU2Vzc2lvblRh c2tDbGllbnQmIGNsaWVudCwgUmV0YWluUHRyPE5TVVJMU2Vzc2lvbkRhdGFUYXNrPiYmIHRhc2sp CiAgICAgOiBtX3Nlc3Npb24oc2Vzc2lvbikKICAgICAsIG1fY2xpZW50KCZjbGllbnQpCg==