154876 2016-03-01 13:56:23 -0800 Correctly keep track of NetworkDataTasks with and without credentials when using NetworkSession 2016-03-01 14:13:34 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen beidson oldest_to_newest 1169565 0 achristensen 2016-03-01 13:56:23 -0800 Correctly keep track of NetworkDataTasks with and without credentials when using NetworkSession 1169566 1 272589 achristensen 2016-03-01 14:05:29 -0800 Created attachment 272589 Patch 1169568 2 achristensen 2016-03-01 14:13:34 -0800 http://trac.webkit.org/changeset/197413 272589 2016-03-01 14:05:29 -0800 2016-03-01 14:11:09 -0800 Patch bug-154876-20160301140513.patch text/plain 15182 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NzQxMikKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDE2LTAzLTAxICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQ29ycmVjdGx5 IGtlZXAgdHJhY2sgb2YgTmV0d29ya0RhdGFUYXNrcyB3aXRoIGFuZCB3aXRob3V0IGNyZWRlbnRp YWxzIHdoZW4gdXNpbmcgTmV0d29ya1Nlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NDg3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEkgd2FzIHNlZWluZyBhbiBhc3NlcnRpb24gZmFpbHVyZSBm cm9tIEFTU0VSVCghbV9zZXNzaW9uLm1fZGF0YVRhc2tNYXAuY29udGFpbnModGFza0lkZW50aWZp ZXIoKSkpCisgICAgICAgIGluIHRoZSBOZXR3b3JrRGF0YVRhc2sgY29uc3RydWN0b3Igc29tZXRp bWVzLiAgVGhpcyBpcyBiZWNhdXNlIGEgdGFzayBpZGVudGlmaWVyIGlzIG5vdCBlbm91Z2ggaW5m b3JtYXRpb24KKyAgICAgICAgdG8gdW5pcXVlbHkgZmluZCBhIE5ldHdvcmtEYXRhVGFzayBpbiBh IE5ldHdvcmtTZXNzaW9uIHNpbmNlIHIxOTYwMzQgYmVjYXVzZSB0aGVyZSBhcmUgdHdvIE5TVVJM U2Vzc2lvbnMKKyAgICAgICAgaW4gYSBOZXR3b3JrU2Vzc2lvbiwgb25lIHdpdGggY3JlZGVudGlh bHMgYW5kIG9uZSB3aXRob3V0LiAgVGhlIGFzc2VydGlvbiB3b3VsZCBmaXJlIGluIGEgY2FzZSBs aWtlIGlmIHdlCisgICAgICAgIG1hZGUgdGhlIGZpcnN0IE5ldHdvcmtEYXRhVGFzayB3aXRoIGNy ZWRlbnRpYWxzICh0YXNrSWRlbnRpZmllciBpcyAxKSBhbmQgdGhlIGZpcnN0IE5ldHdvcmtEYXRh VGFzayAKKyAgICAgICAgd2l0aG91dCBjcmVkZW50aWFscyBiZWZvcmUgdGhlIGZpcnN0IE5ldHdv cmtEYXRhVGFzayB3aXRoIGNyZWRlbnRpYWxzIHdhcyBmaW5pc2hlZC4gIEluIHRoYXQgY2FzZSwg dGhlIAorICAgICAgICB0YXNrSWRlbnRpZmllciB3b3VsZCBhbHNvIGJlIDEsIHdoaWNoIHdvdWxk IGNvbmZsaWN0IHdpdGggdGhlIG90aGVyIHRhc2tJZGVudGlmaWVyLiAgVGhhdCB0YXNrSWRlbnRp ZmllcgorICAgICAgICB3b3VsZCB1bmlxdWVseSBpZGVudGlmeSB0aGUgdGFzayBpbiB0aGUgY29y cmVjdCBOU1VSTFNlc3Npb24sIHRob3VnaCwgc28gdGhlIHNvbHV0aW9uIGlzIHRvIGtlZXAgYSBt YXAKKyAgICAgICAgZm9yIGVhY2ggTlNVUkxTZXNzaW9uIGluIHRoZSBOZXR3b3JrU2Vzc2lvbi4K KworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5oOgorICAgICAgICAq IE5ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nl c3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtEYXRhVGFzazo6TmV0d29ya0RhdGFUYXNrKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Rh dGFUYXNrOjp+TmV0d29ya0RhdGFUYXNrKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFU YXNrOjpzdXNwZW5kKToKKyAgICAgICAgKFdlYktpdDo6c2VydmVyVHJ1c3RDcmVkZW50aWFsKToK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tOgor ICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOmRpZFNl bmRCb2R5RGF0YTp0b3RhbEJ5dGVzU2VudDp0b3RhbEJ5dGVzRXhwZWN0ZWRUb1NlbmQ6XSk6Cisg ICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOnRhc2s6d2lsbFBl cmZvcm1IVFRQUmVkaXJlY3Rpb246bmV3UmVxdWVzdDpjb21wbGV0aW9uSGFuZGxlcjpdKToKKyAg ICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246dGFzazpkaWRSZWNl aXZlQ2hhbGxlbmdlOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoLVtXS05ldHdvcmtT ZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOmRpZENvbXBsZXRlV2l0aEVycm9yOl0pOgor ICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjpkYXRhVGFzazpk aWRSZWNlaXZlUmVzcG9uc2U6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICgtW1dLTmV0 d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZFJlY2VpdmVEYXRhOl0p OgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjpkb3dubG9h ZFRhc2s6ZGlkV3JpdGVEYXRhOnRvdGFsQnl0ZXNXcml0dGVuOnRvdGFsQnl0ZXNFeHBlY3RlZFRv V3JpdGU6XSk6CisgICAgICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9u OmRhdGFUYXNrOmRpZEJlY29tZURvd25sb2FkVGFzazpdKToKKyAgICAgICAgKFdlYktpdDo6TmV0 d29ya1Nlc3Npb246OmNsZWFyQ3JlZGVudGlhbHMpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr U2Vzc2lvbjo6ZGF0YVRhc2tGb3JJZGVudGlmaWVyKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29y a1Nlc3Npb246OmFkZERvd25sb2FkSUQpOgorCiAyMDE2LTAzLTAxICBBbmRyZWFzIEtsaW5nICA8 YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMTU0NjE2KTogQWNjZWxl cmF0ZWQgZHJhd2luZyBpcyBvZmYgZHVyaW5nIHRoZSBpbml0aWFsIGxvYWQKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRhVGFzay5oCShyZXZpc2lv biAxOTc0MDcpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0YVRh c2suaAkod29ya2luZyBjb3B5KQpAQCAtOTMsNyArOTMsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBy ZXN1bWUoKTsKICAgICAKICAgICB0eXBlZGVmIHVpbnQ2NF90IFRhc2tJZGVudGlmaWVyOwotICAg IFRhc2tJZGVudGlmaWVyIHRhc2tJZGVudGlmaWVyKCk7CiAgICAgCiAgICAgfk5ldHdvcmtEYXRh VGFzaygpOwogICAgIApJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a1Nlc3Npb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrU2Vzc2lvbi5oCShyZXZpc2lvbiAxOTc0MDcpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3 b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbi5oCSh3b3JraW5nIGNvcHkpCkBAIC01NywxNCArNTcs MTUgQEAgcHVibGljOgogICAgIHN0YXRpYyBOZXR3b3JrU2Vzc2lvbiYgZGVmYXVsdFNlc3Npb24o KTsKICAgICB2b2lkIGNsZWFyQ3JlZGVudGlhbHMoKTsKIAotICAgIE5ldHdvcmtEYXRhVGFzayog ZGF0YVRhc2tGb3JJZGVudGlmaWVyKE5ldHdvcmtEYXRhVGFzazo6VGFza0lkZW50aWZpZXIpOwor ICAgIE5ldHdvcmtEYXRhVGFzayogZGF0YVRhc2tGb3JJZGVudGlmaWVyKE5ldHdvcmtEYXRhVGFz azo6VGFza0lkZW50aWZpZXIsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzKTsKIAogICAgIHZv aWQgYWRkRG93bmxvYWRJRChOZXR3b3JrRGF0YVRhc2s6OlRhc2tJZGVudGlmaWVyLCBEb3dubG9h ZElEKTsKICAgICBEb3dubG9hZElEIGRvd25sb2FkSUQoTmV0d29ya0RhdGFUYXNrOjpUYXNrSWRl bnRpZmllcik7CiAgICAgRG93bmxvYWRJRCB0YWtlRG93bmxvYWRJRChOZXR3b3JrRGF0YVRhc2s6 OlRhc2tJZGVudGlmaWVyKTsKICAgICAKIHByaXZhdGU6Ci0gICAgSGFzaE1hcDxOZXR3b3JrRGF0 YVRhc2s6OlRhc2tJZGVudGlmaWVyLCBOZXR3b3JrRGF0YVRhc2sqPiBtX2RhdGFUYXNrTWFwOwor ICAgIEhhc2hNYXA8TmV0d29ya0RhdGFUYXNrOjpUYXNrSWRlbnRpZmllciwgTmV0d29ya0RhdGFU YXNrKj4gbV9kYXRhVGFza01hcFdpdGhDcmVkZW50aWFsczsKKyAgICBIYXNoTWFwPE5ldHdvcmtE YXRhVGFzazo6VGFza0lkZW50aWZpZXIsIE5ldHdvcmtEYXRhVGFzayo+IG1fZGF0YVRhc2tNYXBX aXRob3V0Q3JlZGVudGlhbHM7CiAgICAgSGFzaE1hcDxOZXR3b3JrRGF0YVRhc2s6OlRhc2tJZGVu dGlmaWVyLCBEb3dubG9hZElEPiBtX2Rvd25sb2FkTWFwOwogI2lmIFBMQVRGT1JNKENPQ09BKQog ICAgIFJldGFpblB0cjxOU1VSTFNlc3Npb24+IG1fc2Vzc2lvbldpdGhDcmVkZW50aWFsU3RvcmFn ZTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRh VGFza0NvY29hLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCShyZXZpc2lvbiAxOTc0MDcpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQko d29ya2luZyBjb3B5KQpAQCAtNzYsMjIgKzc2LDI4IEBAIE5ldHdvcmtEYXRhVGFzazo6TmV0d29y a0RhdGFUYXNrKE5ldHdvcmsKICAgICAgICAgbnNSZXF1ZXN0ID0gbXV0YWJsZVJlcXVlc3Q7CiAg ICAgfQogCi0gICAgaWYgKHN0b3JlZENyZWRlbnRpYWxzID09IFdlYkNvcmU6OkFsbG93U3RvcmVk Q3JlZGVudGlhbHMpCisgICAgaWYgKHN0b3JlZENyZWRlbnRpYWxzID09IFdlYkNvcmU6OkFsbG93 U3RvcmVkQ3JlZGVudGlhbHMpIHsKICAgICAgICAgbV90YXNrID0gW21fc2Vzc2lvbi5tX3Nlc3Np b25XaXRoQ3JlZGVudGlhbFN0b3JhZ2UgZGF0YVRhc2tXaXRoUmVxdWVzdDpuc1JlcXVlc3RdOwot ICAgIGVsc2UKKyAgICAgICAgQVNTRVJUKCFtX3Nlc3Npb24ubV9kYXRhVGFza01hcFdpdGhDcmVk ZW50aWFscy5jb250YWlucyhbbV90YXNrIHRhc2tJZGVudGlmaWVyXSkpOworICAgICAgICBtX3Nl c3Npb24ubV9kYXRhVGFza01hcFdpdGhDcmVkZW50aWFscy5hZGQoW21fdGFzayB0YXNrSWRlbnRp Zmllcl0sIHRoaXMpOworICAgIH0gZWxzZSB7CiAgICAgICAgIG1fdGFzayA9IFttX3Nlc3Npb24u bV9zZXNzaW9uV2l0aG91dENyZWRlbnRpYWxTdG9yYWdlIGRhdGFUYXNrV2l0aFJlcXVlc3Q6bnNS ZXF1ZXN0XTsKLSAgICAKLSAgICBBU1NFUlQoIW1fc2Vzc2lvbi5tX2RhdGFUYXNrTWFwLmNvbnRh aW5zKHRhc2tJZGVudGlmaWVyKCkpKTsKLSAgICBtX3Nlc3Npb24ubV9kYXRhVGFza01hcC5hZGQo dGFza0lkZW50aWZpZXIoKSwgdGhpcyk7CisgICAgICAgIEFTU0VSVCghbV9zZXNzaW9uLm1fZGF0 YVRhc2tNYXBXaXRob3V0Q3JlZGVudGlhbHMuY29udGFpbnMoW21fdGFzayB0YXNrSWRlbnRpZmll cl0pKTsKKyAgICAgICAgbV9zZXNzaW9uLm1fZGF0YVRhc2tNYXBXaXRob3V0Q3JlZGVudGlhbHMu YWRkKFttX3Rhc2sgdGFza0lkZW50aWZpZXJdLCB0aGlzKTsKKyAgICB9CiB9CiAKIE5ldHdvcmtE YXRhVGFzazo6fk5ldHdvcmtEYXRhVGFzaygpCiB7CisgICAgQVNTRVJUKGlzTWFpblRocmVhZCgp KTsKICAgICBpZiAobV90YXNrKSB7Ci0gICAgICAgIEFTU0VSVChtX3Nlc3Npb24ubV9kYXRhVGFz a01hcC5jb250YWlucyh0YXNrSWRlbnRpZmllcigpKSk7Ci0gICAgICAgIEFTU0VSVChtX3Nlc3Np b24ubV9kYXRhVGFza01hcC5nZXQodGFza0lkZW50aWZpZXIoKSkgPT0gdGhpcyk7Ci0gICAgICAg IEFTU0VSVChpc01haW5UaHJlYWQoKSk7Ci0gICAgICAgIG1fc2Vzc2lvbi5tX2RhdGFUYXNrTWFw LnJlbW92ZSh0YXNrSWRlbnRpZmllcigpKTsKKyAgICAgICAgaWYgKG1fc3RvcmVkQ3JlZGVudGlh bHMgPT0gV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6OkFsbG93U3RvcmVkQ3JlZGVudGlhbHMp IHsKKyAgICAgICAgICAgIEFTU0VSVChtX3Nlc3Npb24ubV9kYXRhVGFza01hcFdpdGhDcmVkZW50 aWFscy5nZXQoW21fdGFzayB0YXNrSWRlbnRpZmllcl0pID09IHRoaXMpOworICAgICAgICAgICAg bV9zZXNzaW9uLm1fZGF0YVRhc2tNYXBXaXRoQ3JlZGVudGlhbHMucmVtb3ZlKFttX3Rhc2sgdGFz a0lkZW50aWZpZXJdKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIEFTU0VSVChtX3Nl c3Npb24ubV9kYXRhVGFza01hcFdpdGhvdXRDcmVkZW50aWFscy5nZXQoW21fdGFzayB0YXNrSWRl bnRpZmllcl0pID09IHRoaXMpOworICAgICAgICAgICAgbV9zZXNzaW9uLm1fZGF0YVRhc2tNYXBX aXRob3V0Q3JlZGVudGlhbHMucmVtb3ZlKFttX3Rhc2sgdGFza0lkZW50aWZpZXJdKTsKKyAgICAg ICAgfQogICAgIH0KIH0KIApAQCAtMjYwLDExICsyNjYsNiBAQCB2b2lkIE5ldHdvcmtEYXRhVGFz azo6c3VzcGVuZCgpCiAgICAgW21fdGFzayBzdXNwZW5kXTsKIH0KIAotYXV0byBOZXR3b3JrRGF0 YVRhc2s6OnRhc2tJZGVudGlmaWVyKCkgLT4gVGFza0lkZW50aWZpZXIKLXsKLSAgICByZXR1cm4g W21fdGFzayB0YXNrSWRlbnRpZmllcl07Ci19Ci0KIFdlYkNvcmU6OkNyZWRlbnRpYWwgc2VydmVy VHJ1c3RDcmVkZW50aWFsKGNvbnN0IFdlYkNvcmU6OkF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlJiBj aGFsbGVuZ2UpCiB7CiAgICAgcmV0dXJuIFdlYkNvcmU6OkNyZWRlbnRpYWwoW05TVVJMQ3JlZGVu dGlhbCBjcmVkZW50aWFsRm9yVHJ1c3Q6Y2hhbGxlbmdlLm5zVVJMQXV0aGVudGljYXRpb25DaGFs bGVuZ2UoKS5wcm90ZWN0aW9uU3BhY2Uuc2VydmVyVHJ1c3RdKTsKSW5kZXg6IFNvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0KPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5tbQkocmV2aXNpb24gMTk3NDA3KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtOTgsMTMg Kzk4LDE1IEBAIC0gKGlkKWluaXRXaXRoTmV0d29ya1Nlc3Npb246KFdlYktpdDo6TmUKIAogLSAo dm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIHRhc2s6KE5TVVJMU2Vzc2lv blRhc2sgKil0YXNrIGRpZFNlbmRCb2R5RGF0YTooaW50NjRfdClieXRlc1NlbnQgdG90YWxCeXRl c1NlbnQ6KGludDY0X3QpdG90YWxCeXRlc1NlbnQgdG90YWxCeXRlc0V4cGVjdGVkVG9TZW5kOihp bnQ2NF90KXRvdGFsQnl0ZXNFeHBlY3RlZFRvU2VuZAogewotICAgIGlmIChhdXRvKiBuZXR3b3Jr RGF0YVRhc2sgPSBfc2Vzc2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVyKHRhc2sudGFza0lkZW50 aWZpZXIpKQorICAgIGF1dG8gc3RvcmVkQ3JlZGVudGlhbHMgPSBzZXNzaW9uLmNvbmZpZ3VyYXRp b24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPyBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsczo6QWxs b3dTdG9yZWRDcmVkZW50aWFscyA6IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzOjpEb05vdEFs bG93U3RvcmVkQ3JlZGVudGlhbHM7CisgICAgaWYgKGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IF9z ZXNzaW9uLT5kYXRhVGFza0ZvcklkZW50aWZpZXIodGFzay50YXNrSWRlbnRpZmllciwgc3RvcmVk Q3JlZGVudGlhbHMpKQogICAgICAgICBuZXR3b3JrRGF0YVRhc2stPmRpZFNlbmREYXRhKHRvdGFs Qnl0ZXNTZW50LCB0b3RhbEJ5dGVzRXhwZWN0ZWRUb1NlbmQpOwogfQogCiAtICh2b2lkKVVSTFNl c3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3Npb24gdGFzazooTlNVUkxTZXNzaW9uVGFzayAqKXRh c2sgd2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rpb246KE5TSFRUUFVSTFJlc3BvbnNlICopcmVzcG9u c2UgbmV3UmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdCBjb21wbGV0aW9uSGFuZGxlcjoo dm9pZCAoXikoTlNVUkxSZXF1ZXN0ICopKWNvbXBsZXRpb25IYW5kbGVyCiB7Ci0gICAgaWYgKGF1 dG8qIG5ldHdvcmtEYXRhVGFzayA9IF9zZXNzaW9uLT5kYXRhVGFza0ZvcklkZW50aWZpZXIodGFz ay50YXNrSWRlbnRpZmllcikpIHsKKyAgICBhdXRvIHN0b3JlZENyZWRlbnRpYWxzID0gc2Vzc2lv bi5jb25maWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID8gV2ViQ29yZTo6U3RvcmVkQ3Jl ZGVudGlhbHM6OkFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBXZWJDb3JlOjpTdG9yZWRDcmVkZW50 aWFsczo6RG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzOworICAgIGlmIChhdXRvKiBuZXR3b3Jr RGF0YVRhc2sgPSBfc2Vzc2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVyKHRhc2sudGFza0lkZW50 aWZpZXIsIHN0b3JlZENyZWRlbnRpYWxzKSkgewogICAgICAgICBhdXRvIGNvbXBsZXRpb25IYW5k bGVyQ29weSA9IEJsb2NrX2NvcHkoY29tcGxldGlvbkhhbmRsZXIpOwogICAgICAgICBuZXR3b3Jr RGF0YVRhc2stPndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKHJlc3BvbnNlLCByZXF1ZXN0LCBb Y29tcGxldGlvbkhhbmRsZXJDb3B5XShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJl cXVlc3QpIHsKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyQ29weShyZXF1ZXN0Lm5zVVJM UmVxdWVzdChXZWJDb3JlOjpVcGRhdGVIVFRQQm9keSkpOwpAQCAtMTE1LDcgKzExNyw4IEBAIC0g KHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2kKIAogLSAodm9pZClVUkxTZXNz aW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIHRhc2s6KE5TVVJMU2Vzc2lvblRhc2sgKil0YXNr IGRpZFJlY2VpdmVDaGFsbGVuZ2U6KE5TVVJMQXV0aGVudGljYXRpb25DaGFsbGVuZ2UgKiljaGFs bGVuZ2UgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVu Z2VEaXNwb3NpdGlvbiBkaXNwb3NpdGlvbiwgTlNVUkxDcmVkZW50aWFsICpjcmVkZW50aWFsKSlj b21wbGV0aW9uSGFuZGxlcgogewotICAgIGlmIChhdXRvKiBuZXR3b3JrRGF0YVRhc2sgPSBfc2Vz c2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVyKHRhc2sudGFza0lkZW50aWZpZXIpKSB7CisgICAg YXV0byBzdG9yZWRDcmVkZW50aWFscyA9IHNlc3Npb24uY29uZmlndXJhdGlvbi5VUkxDcmVkZW50 aWFsU3RvcmFnZSA/IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzOjpBbGxvd1N0b3JlZENyZWRl bnRpYWxzIDogV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6OkRvTm90QWxsb3dTdG9yZWRDcmVk ZW50aWFsczsKKyAgICBpZiAoYXV0byogbmV0d29ya0RhdGFUYXNrID0gX3Nlc3Npb24tPmRhdGFU YXNrRm9ySWRlbnRpZmllcih0YXNrLnRhc2tJZGVudGlmaWVyLCBzdG9yZWRDcmVkZW50aWFscykp IHsKICAgICAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBs ZXRpb25IYW5kbGVyKTsKICAgICAgICAgYXV0byBjaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlciA9 IFtjb21wbGV0aW9uSGFuZGxlckNvcHldKFdlYktpdDo6QXV0aGVudGljYXRpb25DaGFsbGVuZ2VE aXNwb3NpdGlvbiBkaXNwb3NpdGlvbiwgY29uc3QgV2ViQ29yZTo6Q3JlZGVudGlhbCYgY3JlZGVu dGlhbCkKICAgICAgICAgewpAQCAtMTMyLDcgKzEzNSw4IEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjoo TlNVUkxTZXNzaW9uICopc2Vzc2kKIAogLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24g KilzZXNzaW9uIHRhc2s6KE5TVVJMU2Vzc2lvblRhc2sgKil0YXNrIGRpZENvbXBsZXRlV2l0aEVy cm9yOihOU0Vycm9yICopZXJyb3IKIHsKLSAgICBpZiAoYXV0byogbmV0d29ya0RhdGFUYXNrID0g X3Nlc3Npb24tPmRhdGFUYXNrRm9ySWRlbnRpZmllcih0YXNrLnRhc2tJZGVudGlmaWVyKSkKKyAg ICBhdXRvIHN0b3JlZENyZWRlbnRpYWxzID0gc2Vzc2lvbi5jb25maWd1cmF0aW9uLlVSTENyZWRl bnRpYWxTdG9yYWdlID8gV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6OkFsbG93U3RvcmVkQ3Jl ZGVudGlhbHMgOiBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsczo6RG9Ob3RBbGxvd1N0b3JlZENy ZWRlbnRpYWxzOworICAgIGlmIChhdXRvKiBuZXR3b3JrRGF0YVRhc2sgPSBfc2Vzc2lvbi0+ZGF0 YVRhc2tGb3JJZGVudGlmaWVyKHRhc2sudGFza0lkZW50aWZpZXIsIHN0b3JlZENyZWRlbnRpYWxz KSkKICAgICAgICAgbmV0d29ya0RhdGFUYXNrLT5kaWRDb21wbGV0ZVdpdGhFcnJvcihlcnJvcik7 CiAgICAgZWxzZSBpZiAoZXJyb3IpIHsKICAgICAgICAgYXV0byBkb3dubG9hZElEID0gX3Nlc3Np b24tPnRha2VEb3dubG9hZElEKHRhc2sudGFza0lkZW50aWZpZXIpOwpAQCAtMTQ1LDcgKzE0OSw4 IEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2kKIAogLSAodm9pZClV UkxTZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIGRhdGFUYXNrOihOU1VSTFNlc3Npb25E YXRhVGFzayAqKWRhdGFUYXNrIGRpZFJlY2VpdmVSZXNwb25zZTooTlNVUkxSZXNwb25zZSAqKXJl c3BvbnNlIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShOU1VSTFNlc3Npb25SZXNwb25zZURp c3Bvc2l0aW9uIGRpc3Bvc2l0aW9uKSljb21wbGV0aW9uSGFuZGxlcgogewotICAgIGlmIChhdXRv KiBuZXR3b3JrRGF0YVRhc2sgPSBfc2Vzc2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVyKGRhdGFU YXNrLnRhc2tJZGVudGlmaWVyKSkgeworICAgIGF1dG8gc3RvcmVkQ3JlZGVudGlhbHMgPSBzZXNz aW9uLmNvbmZpZ3VyYXRpb24uVVJMQ3JlZGVudGlhbFN0b3JhZ2UgPyBXZWJDb3JlOjpTdG9yZWRD cmVkZW50aWFsczo6QWxsb3dTdG9yZWRDcmVkZW50aWFscyA6IFdlYkNvcmU6OlN0b3JlZENyZWRl bnRpYWxzOjpEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHM7CisgICAgaWYgKGF1dG8qIG5ldHdv cmtEYXRhVGFzayA9IF9zZXNzaW9uLT5kYXRhVGFza0ZvcklkZW50aWZpZXIoZGF0YVRhc2sudGFz a0lkZW50aWZpZXIsIHN0b3JlZENyZWRlbnRpYWxzKSkgewogICAgICAgICBBU1NFUlQoaXNNYWlu VGhyZWFkKCkpOwogICAgICAgICBXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlIHJlc291cmNlUmVz cG9uc2UocmVzcG9uc2UpOwogICAgICAgICBjb3B5VGltaW5nRGF0YShbZGF0YVRhc2sgX3RpbWlu Z0RhdGFdLCByZXNvdXJjZVJlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpKTsKQEAgLTE1OSw3 ICsxNjQsOCBAQCAtICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3NpCiAKIC0g KHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2lvbiBkYXRhVGFzazooTlNVUkxT ZXNzaW9uRGF0YVRhc2sgKilkYXRhVGFzayBkaWRSZWNlaXZlRGF0YTooTlNEYXRhICopZGF0YQog ewotICAgIGlmIChhdXRvKiBuZXR3b3JrRGF0YVRhc2sgPSBfc2Vzc2lvbi0+ZGF0YVRhc2tGb3JJ ZGVudGlmaWVyKGRhdGFUYXNrLnRhc2tJZGVudGlmaWVyKSkKKyAgICBhdXRvIHN0b3JlZENyZWRl bnRpYWxzID0gc2Vzc2lvbi5jb25maWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID8gV2Vi Q29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6OkFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBXZWJDb3Jl OjpTdG9yZWRDcmVkZW50aWFsczo6RG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzOworICAgIGlm IChhdXRvKiBuZXR3b3JrRGF0YVRhc2sgPSBfc2Vzc2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVy KGRhdGFUYXNrLnRhc2tJZGVudGlmaWVyLCBzdG9yZWRDcmVkZW50aWFscykpCiAgICAgICAgIG5l dHdvcmtEYXRhVGFzay0+ZGlkUmVjZWl2ZURhdGEoV2ViQ29yZTo6U2hhcmVkQnVmZmVyOjp3cmFw TlNEYXRhKGRhdGEpKTsKIH0KIApAQCAtMTcyLDcgKzE3OCw4IEBAIC0gKHZvaWQpVVJMU2Vzc2lv bjooTlNVUkxTZXNzaW9uICopc2Vzc2kKIAogLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Np b24gKilzZXNzaW9uIGRvd25sb2FkVGFzazooTlNVUkxTZXNzaW9uRG93bmxvYWRUYXNrICopZG93 bmxvYWRUYXNrIGRpZFdyaXRlRGF0YTooaW50NjRfdClieXRlc1dyaXR0ZW4gdG90YWxCeXRlc1dy aXR0ZW46KGludDY0X3QpdG90YWxCeXRlc1dyaXR0ZW4gdG90YWxCeXRlc0V4cGVjdGVkVG9Xcml0 ZTooaW50NjRfdCl0b3RhbEJ5dGVzRXhwZWN0ZWRUb1dyaXRlCiB7Ci0gICAgQVNTRVJUX1dJVEhf TUVTU0FHRSghX3Nlc3Npb24tPmRhdGFUYXNrRm9ySWRlbnRpZmllcihbZG93bmxvYWRUYXNrIHRh c2tJZGVudGlmaWVyXSksICJUaGUgTmV0d29ya0RhdGFUYXNrIHNob3VsZCBiZSBkZXN0cm95ZWQg aW1tZWRpYXRlbHkgYWZ0ZXIgZGlkQmVjb21lRG93bmxvYWRUYXNrIHJldHVybnMiKTsKKyAgICBh dXRvIHN0b3JlZENyZWRlbnRpYWxzID0gc2Vzc2lvbi5jb25maWd1cmF0aW9uLlVSTENyZWRlbnRp YWxTdG9yYWdlID8gV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6OkFsbG93U3RvcmVkQ3JlZGVu dGlhbHMgOiBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsczo6RG9Ob3RBbGxvd1N0b3JlZENyZWRl bnRpYWxzOworICAgIEFTU0VSVF9XSVRIX01FU1NBR0UoIV9zZXNzaW9uLT5kYXRhVGFza0Zvcklk ZW50aWZpZXIoW2Rvd25sb2FkVGFzayB0YXNrSWRlbnRpZmllcl0sIHN0b3JlZENyZWRlbnRpYWxz KSwgIlRoZSBOZXR3b3JrRGF0YVRhc2sgc2hvdWxkIGJlIGRlc3Ryb3llZCBpbW1lZGlhdGVseSBh ZnRlciBkaWRCZWNvbWVEb3dubG9hZFRhc2sgcmV0dXJucyIpOwogCiAgICAgYXV0byBkb3dubG9h ZElEID0gX3Nlc3Npb24tPmRvd25sb2FkSUQoW2Rvd25sb2FkVGFzayB0YXNrSWRlbnRpZmllcl0p OwogICAgIGlmIChhdXRvKiBkb3dubG9hZCA9IFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnNpbmds ZXRvbigpLmRvd25sb2FkTWFuYWdlcigpLmRvd25sb2FkKGRvd25sb2FkSUQpKQpAQCAtMTg2LDcg KzE5Myw4IEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2kKIAogLSAo dm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIGRhdGFUYXNrOihOU1VSTFNl c3Npb25EYXRhVGFzayAqKWRhdGFUYXNrIGRpZEJlY29tZURvd25sb2FkVGFzazooTlNVUkxTZXNz aW9uRG93bmxvYWRUYXNrICopZG93bmxvYWRUYXNrCiB7Ci0gICAgaWYgKGF1dG8qIG5ldHdvcmtE YXRhVGFzayA9IF9zZXNzaW9uLT5kYXRhVGFza0ZvcklkZW50aWZpZXIoW2RhdGFUYXNrIHRhc2tJ ZGVudGlmaWVyXSkpIHsKKyAgICBhdXRvIHN0b3JlZENyZWRlbnRpYWxzID0gc2Vzc2lvbi5jb25m aWd1cmF0aW9uLlVSTENyZWRlbnRpYWxTdG9yYWdlID8gV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlh bHM6OkFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsczo6 RG9Ob3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzOworICAgIGlmIChhdXRvKiBuZXR3b3JrRGF0YVRh c2sgPSBfc2Vzc2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVyKFtkYXRhVGFzayB0YXNrSWRlbnRp Zmllcl0sIHN0b3JlZENyZWRlbnRpYWxzKSkgewogICAgICAgICBhdXRvIGRvd25sb2FkSUQgPSBu ZXR3b3JrRGF0YVRhc2stPnBlbmRpbmdEb3dubG9hZElEKCk7CiAgICAgICAgIGF1dG8mIGRvd25s b2FkTWFuYWdlciA9IFdlYktpdDo6TmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLmRvd25sb2Fk TWFuYWdlcigpOwogICAgICAgICBhdXRvIGRvd25sb2FkID0gc3RkOjptYWtlX3VuaXF1ZTxXZWJL aXQ6OkRvd25sb2FkPihkb3dubG9hZE1hbmFnZXIsIGRvd25sb2FkSUQpOwpAQCAtMjY2LDE1ICsy NzQsMTggQEAgTmV0d29ya1Nlc3Npb246On5OZXR3b3JrU2Vzc2lvbigpCiAKIHZvaWQgTmV0d29y a1Nlc3Npb246OmNsZWFyQ3JlZGVudGlhbHMoKQogewotICAgIEFTU0VSVChtX2RhdGFUYXNrTWFw LmlzRW1wdHkoKSk7CisgICAgQVNTRVJUKG1fZGF0YVRhc2tNYXBXaXRoQ3JlZGVudGlhbHMuaXNF bXB0eSgpKTsKKyAgICBBU1NFUlQobV9kYXRhVGFza01hcFdpdGhvdXRDcmVkZW50aWFscy5pc0Vt cHR5KCkpOwogICAgIEFTU0VSVChtX2Rvd25sb2FkTWFwLmlzRW1wdHkoKSk7CiAgICAgbV9zZXNz aW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlID0gW05TVVJMU2Vzc2lvbiBzZXNzaW9uV2l0aENvbmZp Z3VyYXRpb246bV9zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlLmdldCgpLmNvbmZpZ3VyYXRp b24gZGVsZWdhdGU6c3RhdGljX2Nhc3Q8aWQ+KG1fc2Vzc2lvbkRlbGVnYXRlLmdldCgpKSBkZWxl Z2F0ZVF1ZXVlOltOU09wZXJhdGlvblF1ZXVlIG1haW5RdWV1ZV1dOwogfQogCi1OZXR3b3JrRGF0 YVRhc2sqIE5ldHdvcmtTZXNzaW9uOjpkYXRhVGFza0ZvcklkZW50aWZpZXIoTmV0d29ya0RhdGFU YXNrOjpUYXNrSWRlbnRpZmllciB0YXNrSWRlbnRpZmllcikKK05ldHdvcmtEYXRhVGFzayogTmV0 d29ya1Nlc3Npb246OmRhdGFUYXNrRm9ySWRlbnRpZmllcihOZXR3b3JrRGF0YVRhc2s6OlRhc2tJ ZGVudGlmaWVyIHRhc2tJZGVudGlmaWVyLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFscyBzdG9y ZWRDcmVkZW50aWFscykKIHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIHJldHVy biBtX2RhdGFUYXNrTWFwLmdldCh0YXNrSWRlbnRpZmllcik7CisgICAgaWYgKHN0b3JlZENyZWRl bnRpYWxzID09IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzOjpBbGxvd1N0b3JlZENyZWRlbnRp YWxzKQorICAgICAgICByZXR1cm4gbV9kYXRhVGFza01hcFdpdGhDcmVkZW50aWFscy5nZXQodGFz a0lkZW50aWZpZXIpOworICAgIHJldHVybiBtX2RhdGFUYXNrTWFwV2l0aG91dENyZWRlbnRpYWxz LmdldCh0YXNrSWRlbnRpZmllcik7CiB9CiAKIHZvaWQgTmV0d29ya1Nlc3Npb246OmFkZERvd25s b2FkSUQoTmV0d29ya0RhdGFUYXNrOjpUYXNrSWRlbnRpZmllciB0YXNrSWRlbnRpZmllciwgRG93 bmxvYWRJRCBkb3dubG9hZElEKQo=