154261 2016-02-15 14:59:05 -0800 Implement content sniffing check with NetworkSession 2016-02-15 16:20:58 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen aestes beidson oldest_to_newest 1164910 0 achristensen 2016-02-15 14:59:05 -0800 Implement content sniffing check with NetworkSession 1164912 1 271376 achristensen 2016-02-15 15:01:48 -0800 Created attachment 271376 Patch 1164922 2 271381 achristensen 2016-02-15 15:41:38 -0800 Created attachment 271381 Patch 1164943 3 achristensen 2016-02-15 16:20:58 -0800 http://trac.webkit.org/changeset/196609 271376 2016-02-15 15:01:48 -0800 2016-02-15 15:41:36 -0800 Patch bug-154261-20160215150128.patch text/plain 5813 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjYwMykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTAyLTE1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IGNvbnRlbnQgc25pZmZpbmcgY2hlY2sgd2l0aCBOZXR3b3JrU2Vzc2lvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MjYxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBmaXhlcyBodHRwL3Rlc3Rz L3htbGh0dHByZXF1ZXN0L3NtYWxsLWNodW5rcy1yZXNwb25zZS10ZXh0Lmh0bWwgd2hlbiB1c2lu ZyBOZXR3b3JrU2Vzc2lvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRh VGFzay5oOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2s6OmNyZWF0ZSk6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrTG9hZDo6TmV0d29ya0xvYWQpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtEYXRhVGFza0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRh c2s6Ok5ldHdvcmtEYXRhVGFzayk6CisgICAgICAgIENvbnRlbnQgc25pZmZpbmcgaXMgZW5hYmxl ZCBieSBkZWZhdWx0LiAgRGlzYWJsZSBpdCBpZiB0aGUgTmV0d29ya0xvYWRQYXJhbWV0ZXJzIHNh eSBub3QgdG8uCisgICAgICAgIFRoaXMgaXMgYW5hbG9nb3VzIHRvIGJlaGF2aW9yIGluIFJlc291 cmNlSGFuZGxlOjpjcmVhdGVDRlVSTENvbm5lY3Rpb24uCisKIDIwMTYtMDItMTUgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIERvd25s b2FkIGF1dGhlbnRpY2F0aW9uIGNvZGUgdG8gQXV0aGVudGljYXRpb25NYW5hZ2VyCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0YVRhc2suaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0YVRhc2suaAkocmV2 aXNpb24gMTk2NTk4KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Rh dGFUYXNrLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgPFdl YkNvcmUvRnJhbWVMb2FkZXJUeXBlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VIYW5k bGVUeXBlcy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkZXJPcHRpb25zLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9UaW1lci5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTc5LDkgKzgwLDkgQEAgcHVibGljOgog Y2xhc3MgTmV0d29ya0RhdGFUYXNrIDogcHVibGljIFJlZkNvdW50ZWQ8TmV0d29ya0RhdGFUYXNr PiB7CiAgICAgZnJpZW5kIGNsYXNzIE5ldHdvcmtTZXNzaW9uOwogcHVibGljOgotICAgIHN0YXRp YyBSZWY8TmV0d29ya0RhdGFUYXNrPiBjcmVhdGUoTmV0d29ya1Nlc3Npb24mIHNlc3Npb24sIE5l dHdvcmtEYXRhVGFza0NsaWVudCYgY2xpZW50LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzIHN0b3JlZENyZWRlbnRpYWxz KQorICAgIHN0YXRpYyBSZWY8TmV0d29ya0RhdGFUYXNrPiBjcmVhdGUoTmV0d29ya1Nlc3Npb24m IHNlc3Npb24sIE5ldHdvcmtEYXRhVGFza0NsaWVudCYgY2xpZW50LCBjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzIHN0b3Jl ZENyZWRlbnRpYWxzLCBXZWJDb3JlOjpDb250ZW50U25pZmZpbmdQb2xpY3kgc2hvdWxkQ29udGVu dFNuaWZmKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTmV0d29ya0RhdGFU YXNrKHNlc3Npb24sIGNsaWVudCwgcmVxdWVzdCwgc3RvcmVkQ3JlZGVudGlhbHMpKTsKKyAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTmV0d29ya0RhdGFUYXNrKHNlc3Npb24sIGNsaWVudCwg cmVxdWVzdCwgc3RvcmVkQ3JlZGVudGlhbHMsIHNob3VsZENvbnRlbnRTbmlmZikpOwogICAgIH0K ICAgICAKICAgICB2b2lkIHN1c3BlbmQoKTsKQEAgLTExMSw3ICsxMTIsNyBAQCBwdWJsaWM6CiAg ICAgYm9vbCB0cnlQYXNzd29yZEJhc2VkQXV0aGVudGljYXRpb24oY29uc3QgV2ViQ29yZTo6QXV0 aGVudGljYXRpb25DaGFsbGVuZ2UmLCBDaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlcik7CiAgICAg CiBwcml2YXRlOgotICAgIE5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYsIE5ldHdvcmtE YXRhVGFza0NsaWVudCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFdlYkNvcmU6 OlN0b3JlZENyZWRlbnRpYWxzKTsKKyAgICBOZXR3b3JrRGF0YVRhc2soTmV0d29ya1Nlc3Npb24m LCBOZXR3b3JrRGF0YVRhc2tDbGllbnQmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm LCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFscywgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9s aWN5KTsKICAgICAKICAgICBlbnVtIEZhaWx1cmVUeXBlIHsKICAgICAgICAgTm9GYWlsdXJlLApJ bmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcAko cmV2aXNpb24gMTk2NTk4KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a0xvYWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIE5ldHdvcmtMb2FkOjpO ZXR3b3JrTG9hZChOZXR3b3JrTG9hZENsaWUKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBp ZiAoYXV0byogbmV0d29ya1Nlc3Npb24gPSBTZXNzaW9uVHJhY2tlcjo6bmV0d29ya1Nlc3Npb24o cGFyYW1ldGVycy5zZXNzaW9uSUQpKSB7Ci0gICAgICAgIG1fdGFzayA9IE5ldHdvcmtEYXRhVGFz azo6Y3JlYXRlKCpuZXR3b3JrU2Vzc2lvbiwgKnRoaXMsIHBhcmFtZXRlcnMucmVxdWVzdCwgcGFy YW1ldGVycy5hbGxvd1N0b3JlZENyZWRlbnRpYWxzKTsKKyAgICAgICAgbV90YXNrID0gTmV0d29y a0RhdGFUYXNrOjpjcmVhdGUoKm5ldHdvcmtTZXNzaW9uLCAqdGhpcywgcGFyYW1ldGVycy5yZXF1 ZXN0LCBwYXJhbWV0ZXJzLmFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIHBhcmFtZXRlcnMuY29udGVu dFNuaWZmaW5nUG9saWN5KTsKICAgICAgICAgaWYgKCFwYXJhbWV0ZXJzLmRlZmVyc0xvYWRpbmcp CiAgICAgICAgICAgICBtX3Rhc2stPnJlc3VtZSgpOwogICAgIH0gZWxzZQpJbmRleDogU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0Rh dGFUYXNrQ29jb2EubW0JKHJldmlzaW9uIDE5NjU5OCkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0yOSwxMiArMjksMTMgQEAKICNpZiBVU0UoTkVUV09SS19TRVNTSU9OKQogCiAjaW1wb3J0IDxX ZWJDb3JlL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLmg+CisjaW1wb3J0IDxXZWJDb3JlL0NGTmV0 d29ya1NQSS5oPgogI2ltcG9ydCA8V2ViQ29yZS9SZXNvdXJjZVJlcXVlc3QuaD4KICNpbXBvcnQg PHd0Zi9NYWluVGhyZWFkLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1OZXR3b3JrRGF0YVRh c2s6Ok5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFU YXNrQ2xpZW50JiBjbGllbnQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVz dFdpdGhDcmVkZW50aWFscywgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHMgc3RvcmVkQ3JlZGVu dGlhbHMpCitOZXR3b3JrRGF0YVRhc2s6Ok5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYg c2Vzc2lvbiwgTmV0d29ya0RhdGFUYXNrQ2xpZW50JiBjbGllbnQsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYgcmVxdWVzdFdpdGhDcmVkZW50aWFscywgV2ViQ29yZTo6U3RvcmVkQ3Jl ZGVudGlhbHMgc3RvcmVkQ3JlZGVudGlhbHMsIFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGlj eSBzaG91bGRDb250ZW50U25pZmYpCiAgICAgOiBtX2ZhaWx1cmVUaW1lcigqdGhpcywgJk5ldHdv cmtEYXRhVGFzazo6ZmFpbHVyZVRpbWVyRmlyZWQpCiAgICAgLCBtX3Nlc3Npb24oc2Vzc2lvbikK ICAgICAsIG1fY2xpZW50KGNsaWVudCkKQEAgLTU2LDEwICs1NywxNCBAQCBOZXR3b3JrRGF0YVRh c2s6Ok5ldHdvcmtEYXRhVGFzayhOZXR3b3JrCiAgICAgbV9wYXNzd29yZCA9IHJlcXVlc3QudXJs KCkucGFzcygpOwogICAgIHJlcXVlc3QucmVtb3ZlQ3JlZGVudGlhbHMoKTsKICAgICAKKyAgICBO U1VSTFJlcXVlc3QgKm5zUmVxdWVzdCA9IHJlcXVlc3QubnNVUkxSZXF1ZXN0KFdlYkNvcmU6OlVw ZGF0ZUhUVFBCb2R5KTsKKyAgICBpZiAoc2hvdWxkQ29udGVudFNuaWZmID09IFdlYkNvcmU6OkRv Tm90U25pZmZDb250ZW50KQorICAgICAgICBfQ0ZVUkxSZXF1ZXN0U2V0UHJvdG9jb2xQcm9wZXJ0 eShbbnNSZXF1ZXN0IF9DRlVSTFJlcXVlc3RdLCBfa0NGVVJMQ29ubmVjdGlvblByb3BlcnR5U2hv dWxkU25pZmYsIGtDRkJvb2xlYW5GYWxzZSk7CisgICAgCiAgICAgaWYgKHN0b3JlZENyZWRlbnRp YWxzID09IFdlYkNvcmU6OkFsbG93U3RvcmVkQ3JlZGVudGlhbHMpCi0gICAgICAgIG1fdGFzayA9 IFttX3Nlc3Npb24ubV9zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlIGRhdGFUYXNrV2l0aFJl cXVlc3Q6cmVxdWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6VXBkYXRlSFRUUEJvZHkpXTsKKyAg ICAgICAgbV90YXNrID0gW21fc2Vzc2lvbi5tX3Nlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2Ug ZGF0YVRhc2tXaXRoUmVxdWVzdDpuc1JlcXVlc3RdOwogICAgIGVsc2UKLSAgICAgICAgbV90YXNr ID0gW21fc2Vzc2lvbi5tX3Nlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2UgZGF0YVRhc2tX aXRoUmVxdWVzdDpyZXF1ZXN0Lm5zVVJMUmVxdWVzdChXZWJDb3JlOjpVcGRhdGVIVFRQQm9keSld OworICAgICAgICBtX3Rhc2sgPSBbbV9zZXNzaW9uLm1fc2Vzc2lvbldpdGhvdXRDcmVkZW50aWFs U3RvcmFnZSBkYXRhVGFza1dpdGhSZXF1ZXN0Om5zUmVxdWVzdF07CiAgICAgCiAgICAgQVNTRVJU KCFtX3Nlc3Npb24ubV9kYXRhVGFza01hcC5jb250YWlucyh0YXNrSWRlbnRpZmllcigpKSk7CiAg ICAgbV9zZXNzaW9uLm1fZGF0YVRhc2tNYXAuYWRkKHRhc2tJZGVudGlmaWVyKCksIHRoaXMpOwo= 271381 2016-02-15 15:41:38 -0800 2016-02-15 16:18:34 -0800 Patch bug-154261-20160215154118.patch text/plain 5918 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE5NjYwMykKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE2LTAyLTE1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgSW1wbGVtZW50 IGNvbnRlbnQgc25pZmZpbmcgY2hlY2sgd2l0aCBOZXR3b3JrU2Vzc2lvbgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU0MjYxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhpcyBmaXhlcyBodHRwL3Rlc3Rz L3htbGh0dHByZXF1ZXN0L3NtYWxsLWNodW5rcy1yZXNwb25zZS10ZXh0Lmh0bWwgd2hlbiB1c2lu ZyBOZXR3b3JrU2Vzc2lvbi4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtEYXRh VGFzay5oOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRhc2s6OmNyZWF0ZSk6CisgICAg ICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwOgorICAgICAgICAoV2ViS2l0OjpO ZXR3b3JrTG9hZDo6TmV0d29ya0xvYWQpOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29h L05ldHdvcmtEYXRhVGFza0NvY29hLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrRGF0YVRh c2s6Ok5ldHdvcmtEYXRhVGFzayk6CisgICAgICAgIENvbnRlbnQgc25pZmZpbmcgaXMgZW5hYmxl ZCBieSBkZWZhdWx0LiAgRGlzYWJsZSBpdCBpZiB0aGUgTmV0d29ya0xvYWRQYXJhbWV0ZXJzIHNh eSBub3QgdG8uCisgICAgICAgIFRoaXMgaXMgYW5hbG9nb3VzIHRvIGJlaGF2aW9yIGluIFJlc291 cmNlSGFuZGxlOjpjcmVhdGVOU1VSTENvbm5lY3Rpb24uCisKIDIwMTYtMDItMTUgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIERvd25s b2FkIGF1dGhlbnRpY2F0aW9uIGNvZGUgdG8gQXV0aGVudGljYXRpb25NYW5hZ2VyCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0YVRhc2suaAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrRGF0YVRhc2suaAkocmV2 aXNpb24gMTk2NTk4KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Rh dGFUYXNrLmgJKHdvcmtpbmcgY29weSkKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2luY2x1ZGUgPFdl YkNvcmUvRnJhbWVMb2FkZXJUeXBlcy5oPgogI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VIYW5k bGVUeXBlcy5oPgorI2luY2x1ZGUgPFdlYkNvcmUvUmVzb3VyY2VMb2FkZXJPcHRpb25zLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9UaW1lci5oPgogI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNp bmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KQEAgLTc5LDkgKzgwLDkgQEAgcHVibGljOgog Y2xhc3MgTmV0d29ya0RhdGFUYXNrIDogcHVibGljIFJlZkNvdW50ZWQ8TmV0d29ya0RhdGFUYXNr PiB7CiAgICAgZnJpZW5kIGNsYXNzIE5ldHdvcmtTZXNzaW9uOwogcHVibGljOgotICAgIHN0YXRp YyBSZWY8TmV0d29ya0RhdGFUYXNrPiBjcmVhdGUoTmV0d29ya1Nlc3Npb24mIHNlc3Npb24sIE5l dHdvcmtEYXRhVGFza0NsaWVudCYgY2xpZW50LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzIHN0b3JlZENyZWRlbnRpYWxz KQorICAgIHN0YXRpYyBSZWY8TmV0d29ya0RhdGFUYXNrPiBjcmVhdGUoTmV0d29ya1Nlc3Npb24m IHNlc3Npb24sIE5ldHdvcmtEYXRhVGFza0NsaWVudCYgY2xpZW50LCBjb25zdCBXZWJDb3JlOjpS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzIHN0b3Jl ZENyZWRlbnRpYWxzLCBXZWJDb3JlOjpDb250ZW50U25pZmZpbmdQb2xpY3kgc2hvdWxkQ29udGVu dFNuaWZmKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTmV0d29ya0RhdGFU YXNrKHNlc3Npb24sIGNsaWVudCwgcmVxdWVzdCwgc3RvcmVkQ3JlZGVudGlhbHMpKTsKKyAgICAg ICAgcmV0dXJuIGFkb3B0UmVmKCpuZXcgTmV0d29ya0RhdGFUYXNrKHNlc3Npb24sIGNsaWVudCwg cmVxdWVzdCwgc3RvcmVkQ3JlZGVudGlhbHMsIHNob3VsZENvbnRlbnRTbmlmZikpOwogICAgIH0K ICAgICAKICAgICB2b2lkIHN1c3BlbmQoKTsKQEAgLTExMSw3ICsxMTIsNyBAQCBwdWJsaWM6CiAg ICAgYm9vbCB0cnlQYXNzd29yZEJhc2VkQXV0aGVudGljYXRpb24oY29uc3QgV2ViQ29yZTo6QXV0 aGVudGljYXRpb25DaGFsbGVuZ2UmLCBDaGFsbGVuZ2VDb21wbGV0aW9uSGFuZGxlcik7CiAgICAg CiBwcml2YXRlOgotICAgIE5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYsIE5ldHdvcmtE YXRhVGFza0NsaWVudCYsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIFdlYkNvcmU6 OlN0b3JlZENyZWRlbnRpYWxzKTsKKyAgICBOZXR3b3JrRGF0YVRhc2soTmV0d29ya1Nlc3Npb24m LCBOZXR3b3JrRGF0YVRhc2tDbGllbnQmLCBjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Qm LCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFscywgV2ViQ29yZTo6Q29udGVudFNuaWZmaW5nUG9s aWN5KTsKICAgICAKICAgICBlbnVtIEZhaWx1cmVUeXBlIHsKICAgICAgICAgTm9GYWlsdXJlLApJ bmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWQuY3BwCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtMb2FkLmNwcAko cmV2aXNpb24gMTk2NTk4KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvTmV0d29y a0xvYWQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01NCw3ICs1NCw3IEBAIE5ldHdvcmtMb2FkOjpO ZXR3b3JrTG9hZChOZXR3b3JrTG9hZENsaWUKICAgICAgICAgcmV0dXJuOwogICAgIH0KICAgICBp ZiAoYXV0byogbmV0d29ya1Nlc3Npb24gPSBTZXNzaW9uVHJhY2tlcjo6bmV0d29ya1Nlc3Npb24o cGFyYW1ldGVycy5zZXNzaW9uSUQpKSB7Ci0gICAgICAgIG1fdGFzayA9IE5ldHdvcmtEYXRhVGFz azo6Y3JlYXRlKCpuZXR3b3JrU2Vzc2lvbiwgKnRoaXMsIHBhcmFtZXRlcnMucmVxdWVzdCwgcGFy YW1ldGVycy5hbGxvd1N0b3JlZENyZWRlbnRpYWxzKTsKKyAgICAgICAgbV90YXNrID0gTmV0d29y a0RhdGFUYXNrOjpjcmVhdGUoKm5ldHdvcmtTZXNzaW9uLCAqdGhpcywgcGFyYW1ldGVycy5yZXF1 ZXN0LCBwYXJhbWV0ZXJzLmFsbG93U3RvcmVkQ3JlZGVudGlhbHMsIHBhcmFtZXRlcnMuY29udGVu dFNuaWZmaW5nUG9saWN5KTsKICAgICAgICAgaWYgKCFwYXJhbWV0ZXJzLmRlZmVyc0xvYWRpbmcp CiAgICAgICAgICAgICBtX3Rhc2stPnJlc3VtZSgpOwogICAgIH0gZWxzZQpJbmRleDogU291cmNl L1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya0Rh dGFUYXNrQ29jb2EubW0JKHJldmlzaW9uIDE5NjU5OCkKKysrIFNvdXJjZS9XZWJLaXQyL05ldHdv cmtQcm9jZXNzL2NvY29hL05ldHdvcmtEYXRhVGFza0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBA IC0yOSwxMiArMjksMTMgQEAKICNpZiBVU0UoTkVUV09SS19TRVNTSU9OKQogCiAjaW1wb3J0IDxX ZWJDb3JlL0F1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlLmg+CisjaW1wb3J0IDxXZWJDb3JlL0NGTmV0 d29ya1NQSS5oPgogI2ltcG9ydCA8V2ViQ29yZS9SZXNvdXJjZVJlcXVlc3QuaD4KICNpbXBvcnQg PHd0Zi9NYWluVGhyZWFkLmg+CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1OZXR3b3JrRGF0YVRh c2s6Ok5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYgc2Vzc2lvbiwgTmV0d29ya0RhdGFU YXNrQ2xpZW50JiBjbGllbnQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVz dFdpdGhDcmVkZW50aWFscywgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHMgc3RvcmVkQ3JlZGVu dGlhbHMpCitOZXR3b3JrRGF0YVRhc2s6Ok5ldHdvcmtEYXRhVGFzayhOZXR3b3JrU2Vzc2lvbiYg c2Vzc2lvbiwgTmV0d29ya0RhdGFUYXNrQ2xpZW50JiBjbGllbnQsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVxdWVzdCYgcmVxdWVzdFdpdGhDcmVkZW50aWFscywgV2ViQ29yZTo6U3RvcmVkQ3Jl ZGVudGlhbHMgc3RvcmVkQ3JlZGVudGlhbHMsIFdlYkNvcmU6OkNvbnRlbnRTbmlmZmluZ1BvbGlj eSBzaG91bGRDb250ZW50U25pZmYpCiAgICAgOiBtX2ZhaWx1cmVUaW1lcigqdGhpcywgJk5ldHdv cmtEYXRhVGFzazo6ZmFpbHVyZVRpbWVyRmlyZWQpCiAgICAgLCBtX3Nlc3Npb24oc2Vzc2lvbikK ICAgICAsIG1fY2xpZW50KGNsaWVudCkKQEAgLTU2LDEwICs1NywxNyBAQCBOZXR3b3JrRGF0YVRh c2s6Ok5ldHdvcmtEYXRhVGFzayhOZXR3b3JrCiAgICAgbV9wYXNzd29yZCA9IHJlcXVlc3QudXJs KCkucGFzcygpOwogICAgIHJlcXVlc3QucmVtb3ZlQ3JlZGVudGlhbHMoKTsKICAgICAKKyAgICBO U1VSTFJlcXVlc3QgKm5zUmVxdWVzdCA9IHJlcXVlc3QubnNVUkxSZXF1ZXN0KFdlYkNvcmU6OlVw ZGF0ZUhUVFBCb2R5KTsKKyAgICBpZiAoc2hvdWxkQ29udGVudFNuaWZmID09IFdlYkNvcmU6OkRv Tm90U25pZmZDb250ZW50KSB7CisgICAgICAgIE5TTXV0YWJsZVVSTFJlcXVlc3QgKm11dGFibGVS ZXF1ZXN0ID0gW1tuc1JlcXVlc3QgbXV0YWJsZUNvcHldIGF1dG9yZWxlYXNlXTsKKyAgICAgICAg W211dGFibGVSZXF1ZXN0IF9zZXRQcm9wZXJ0eTpAKE5PKSBmb3JLZXk6KE5TU3RyaW5nICopX2tD RlVSTENvbm5lY3Rpb25Qcm9wZXJ0eVNob3VsZFNuaWZmXTsKKyAgICAgICAgbnNSZXF1ZXN0ID0g bXV0YWJsZVJlcXVlc3Q7CisgICAgfQorCiAgICAgaWYgKHN0b3JlZENyZWRlbnRpYWxzID09IFdl YkNvcmU6OkFsbG93U3RvcmVkQ3JlZGVudGlhbHMpCi0gICAgICAgIG1fdGFzayA9IFttX3Nlc3Np b24ubV9zZXNzaW9uV2l0aENyZWRlbnRpYWxTdG9yYWdlIGRhdGFUYXNrV2l0aFJlcXVlc3Q6cmVx dWVzdC5uc1VSTFJlcXVlc3QoV2ViQ29yZTo6VXBkYXRlSFRUUEJvZHkpXTsKKyAgICAgICAgbV90 YXNrID0gW21fc2Vzc2lvbi5tX3Nlc3Npb25XaXRoQ3JlZGVudGlhbFN0b3JhZ2UgZGF0YVRhc2tX aXRoUmVxdWVzdDpuc1JlcXVlc3RdOwogICAgIGVsc2UKLSAgICAgICAgbV90YXNrID0gW21fc2Vz c2lvbi5tX3Nlc3Npb25XaXRob3V0Q3JlZGVudGlhbFN0b3JhZ2UgZGF0YVRhc2tXaXRoUmVxdWVz dDpyZXF1ZXN0Lm5zVVJMUmVxdWVzdChXZWJDb3JlOjpVcGRhdGVIVFRQQm9keSldOworICAgICAg ICBtX3Rhc2sgPSBbbV9zZXNzaW9uLm1fc2Vzc2lvbldpdGhvdXRDcmVkZW50aWFsU3RvcmFnZSBk YXRhVGFza1dpdGhSZXF1ZXN0Om5zUmVxdWVzdF07CiAgICAgCiAgICAgQVNTRVJUKCFtX3Nlc3Np b24ubV9kYXRhVGFza01hcC5jb250YWlucyh0YXNrSWRlbnRpZmllcigpKSk7CiAgICAgbV9zZXNz aW9uLm1fZGF0YVRhc2tNYXAuYWRkKHRhc2tJZGVudGlmaWVyKCksIHRoaXMpOwo=