157996 2016-05-23 13:50:05 -0700 Add logging for NSURLSession calls 2016-05-23 13:53:10 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen oldest_to_newest 1195569 0 achristensen 2016-05-23 13:50:05 -0700 Add logging for NSURLSession calls 1195570 1 279583 achristensen 2016-05-23 13:50:28 -0700 Created attachment 279583 Patch 1195571 2 achristensen 2016-05-23 13:53:10 -0700 http://trac.webkit.org/changeset/201295 279583 2016-05-23 13:50:28 -0700 2016-05-23 13:51:51 -0700 Patch bug-157996-20160523135133.patch text/plain 11716 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMTI5NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE2LTA1LTIzICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgQWRkIGxvZ2dp bmcgZm9yIE5TVVJMU2Vzc2lvbiBjYWxscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTU3OTk2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tD b2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0RhdGFUYXNrOjpOZXR3b3JrRGF0YVRh c2spOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2Eu bW06CisgICAgICAgICh0b05TVVJMU2Vzc2lvblJlc3BvbnNlRGlzcG9zaXRpb24pOgorICAgICAg ICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOndpbGxQZXJmb3Jt SFRUUFJlZGlyZWN0aW9uOm5ld1JlcXVlc3Q6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAg ICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOnRhc2s6X3NjaGVtZVVwZ3Jh ZGVkOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVs ZWdhdGUgVVJMU2Vzc2lvbjpkYXRhVGFzazp3aWxsQ2FjaGVSZXNwb25zZTpjb21wbGV0aW9uSGFu ZGxlcjpdKToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246 dGFzazpkaWRSZWNlaXZlQ2hhbGxlbmdlOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAgICAo LVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lvbjp0YXNrOmRpZENvbXBsZXRlV2l0 aEVycm9yOl0pOgorICAgICAgICAoLVtXS05ldHdvcmtTZXNzaW9uRGVsZWdhdGUgVVJMU2Vzc2lv bjpkYXRhVGFzazpkaWRSZWNlaXZlUmVzcG9uc2U6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAg ICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOmRhdGFUYXNrOmRpZFJl Y2VpdmVEYXRhOl0pOgorICAgICAgICAqIFBsYXRmb3JtL0xvZ2dpbmcuaDoKKwogMjAxNi0wNS0y MyAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBp T1M6IHdoZW4gYnJpbmdpbmcgZm9jdXMgdG8gYSB0ZXh0IGZpZWxkIHdlIG1heSB6b29tIHRoZSBw YWdlIGV2ZW4gaWYgYXV0aG9yIHdhbnRlZCBtYXggc2NhbGUgPSAxCkluZGV4OiBTb3VyY2UvV2Vi S2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRhc2tDb2NvYS5tbQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrRGF0YVRh c2tDb2NvYS5tbQkocmV2aXNpb24gMjAxMjkwKQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya0RhdGFUYXNrQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTMw LDYgKzMwLDcgQEAKIAogI2ltcG9ydCAiRG93bmxvYWQuaCIKICNpbXBvcnQgIkRvd25sb2FkUHJv eHlNZXNzYWdlcy5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgogI2ltcG9ydCAiTmV0d29ya1Byb2Nl c3MuaCIKICNpbXBvcnQgIlNlc3Npb25UcmFja2VyLmgiCiAjaW1wb3J0ICJXZWJDb3JlQXJndW1l bnRDb2RlcnMuaCIKQEAgLTEwOSw2ICsxMTAsNyBAQCBOZXR3b3JrRGF0YVRhc2s6Ok5ldHdvcmtE YXRhVGFzayhOZXR3b3JrCiAgICAgICAgIEFTU0VSVCghbV9zZXNzaW9uLT5tX2RhdGFUYXNrTWFw V2l0aG91dENyZWRlbnRpYWxzLmNvbnRhaW5zKFttX3Rhc2sgdGFza0lkZW50aWZpZXJdKSk7CiAg ICAgICAgIG1fc2Vzc2lvbi0+bV9kYXRhVGFza01hcFdpdGhvdXRDcmVkZW50aWFscy5hZGQoW21f dGFzayB0YXNrSWRlbnRpZmllcl0sIHRoaXMpOwogICAgIH0KKyAgICBMT0coTmV0d29ya1Nlc3Np b24sICIlbGx1IENyZWF0aW5nIE5ldHdvcmtEYXRhVGFzayB3aXRoIFVSTCAlcyIsIFttX3Rhc2sg dGFza0lkZW50aWZpZXJdLCBuc1JlcXVlc3QuVVJMLmFic29sdXRlU3RyaW5nLlVURjhTdHJpbmcp OwogCiAjaWYgSEFWRShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05JTkcpCiAgICAgU3RyaW5n IHN0b3JhZ2VQYXJ0aXRpb24gPSBXZWJDb3JlOjpjb29raWVTdG9yYWdlUGFydGl0aW9uKHJlcXVl c3QpOwpJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nl c3Npb25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCShyZXZpc2lvbiAyMDEyOTApCisrKyBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAjaW1wb3J0ICJDdXN0b21Qcm90b2NvbE1h bmFnZXIuaCIKICNpbXBvcnQgIkRhdGFSZWZlcmVuY2UuaCIKICNpbXBvcnQgIkRvd25sb2FkLmgi CisjaW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJOZXR3b3JrQ2FjaGUuaCIKICNpbXBvcnQg Ik5ldHdvcmtMb2FkLmgiCiAjaW1wb3J0ICJOZXR3b3JrUHJvY2Vzcy5oIgpAQCAtNTEsNiArNTIs OCBAQAogI2ltcG9ydCA8d3RmL01haW5UaHJlYWQuaD4KICNpbXBvcnQgPHd0Zi9OZXZlckRlc3Ry b3llZC5oPgogCit1c2luZyBuYW1lc3BhY2UgV2ViS2l0OworCiBzdGF0aWMgTlNVUkxTZXNzaW9u UmVzcG9uc2VEaXNwb3NpdGlvbiB0b05TVVJMU2Vzc2lvblJlc3BvbnNlRGlzcG9zaXRpb24oV2Vi Q29yZTo6UG9saWN5QWN0aW9uIGRpc3Bvc2l0aW9uKQogewogICAgIHN3aXRjaCAoZGlzcG9zaXRp b24pIHsKQEAgLTExNCwyOCArMTE3LDQwIEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNz aW9uICopc2Vzc2kKIAogLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9u IHRhc2s6KE5TVVJMU2Vzc2lvblRhc2sgKil0YXNrIHdpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9u OihOU0hUVFBVUkxSZXNwb25zZSAqKXJlc3BvbnNlIG5ld1JlcXVlc3Q6KE5TVVJMUmVxdWVzdCAq KXJlcXVlc3QgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TVVJMUmVxdWVzdCAqKSljb21w bGV0aW9uSGFuZGxlcgogeworICAgIGF1dG8gdGFza0lkZW50aWZpZXIgPSB0YXNrLnRhc2tJZGVu dGlmaWVyOworICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIiVsbHUgd2lsbFBlcmZvcm1IVFRQUmVk aXJlY3Rpb24gZnJvbSAlcyB0byAlcyIsIHRhc2tJZGVudGlmaWVyLCByZXNwb25zZS5VUkwuYWJz b2x1dGVTdHJpbmcuVVRGOFN0cmluZywgcmVxdWVzdC5VUkwuYWJzb2x1dGVTdHJpbmcuVVRGOFN0 cmluZyk7CisgICAgCiAgICAgYXV0byBzdG9yZWRDcmVkZW50aWFscyA9IF93aXRoQ3JlZGVudGlh bHMgPyBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsczo6QWxsb3dTdG9yZWRDcmVkZW50aWFscyA6 IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzOjpEb05vdEFsbG93U3RvcmVkQ3JlZGVudGlhbHM7 CiAgICAgaWYgKGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IF9zZXNzaW9uLT5kYXRhVGFza0Zvcklk ZW50aWZpZXIodGFzay50YXNrSWRlbnRpZmllciwgc3RvcmVkQ3JlZGVudGlhbHMpKSB7CiAgICAg ICAgIGF1dG8gY29tcGxldGlvbkhhbmRsZXJDb3B5ID0gQmxvY2tfY29weShjb21wbGV0aW9uSGFu ZGxlcik7Ci0gICAgICAgIG5ldHdvcmtEYXRhVGFzay0+d2lsbFBlcmZvcm1IVFRQUmVkaXJlY3Rp b24ocmVzcG9uc2UsIHJlcXVlc3QsIFtjb21wbGV0aW9uSGFuZGxlckNvcHldKGNvbnN0IFdlYkNv cmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkgeworICAgICAgICBuZXR3b3JrRGF0YVRhc2st PndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uKHJlc3BvbnNlLCByZXF1ZXN0LCBbY29tcGxldGlv bkhhbmRsZXJDb3B5LCB0YXNrSWRlbnRpZmllcl0oY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0JiByZXF1ZXN0KSB7CisgICAgICAgICAgICBMT0coTmV0d29ya1Nlc3Npb24sICIlbGx1IHdp bGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uIGNvbXBsZXRpb25IYW5kbGVyICglcykiLCB0YXNrSWRl bnRpZmllciwgcmVxdWVzdC51cmwoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKICAgICAgICAg ICAgIGNvbXBsZXRpb25IYW5kbGVyQ29weShyZXF1ZXN0Lm5zVVJMUmVxdWVzdChXZWJDb3JlOjpV cGRhdGVIVFRQQm9keSkpOwogICAgICAgICAgICAgQmxvY2tfcmVsZWFzZShjb21wbGV0aW9uSGFu ZGxlckNvcHkpOwogICAgICAgICB9KTsKLSAgICB9IGVsc2UKKyAgICB9IGVsc2UgeworICAgICAg ICBMT0coTmV0d29ya1Nlc3Npb24sICIlbGx1IHdpbGxQZXJmb3JtSFRUUFJlZGlyZWN0aW9uIGNv bXBsZXRpb25IYW5kbGVyIChuaWwpIiwgdGFza0lkZW50aWZpZXIpOwogICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcihuaWwpOworICAgIH0KIH0KIAogLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNl c3Npb24gKilzZXNzaW9uIHRhc2s6KE5TVVJMU2Vzc2lvblRhc2sqKXRhc2sgX3NjaGVtZVVwZ3Jh ZGVkOihOU1VSTFJlcXVlc3QqKXJlcXVlc3QgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5T VVJMUmVxdWVzdCopKWNvbXBsZXRpb25IYW5kbGVyCiB7CisgICAgYXV0byB0YXNrSWRlbnRpZmll ciA9IHRhc2sudGFza0lkZW50aWZpZXI7CisgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWxsdSBf c2NoZW1lVXBncmFkZWQgJXMiLCB0YXNrSWRlbnRpZmllciwgcmVxdWVzdC5VUkwuYWJzb2x1dGVT dHJpbmcuVVRGOFN0cmluZyk7CisgICAgCiAgICAgYXV0byBzdG9yZWRDcmVkZW50aWFscyA9IF93 aXRoQ3JlZGVudGlhbHMgPyBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsczo6QWxsb3dTdG9yZWRD cmVkZW50aWFscyA6IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzOjpEb05vdEFsbG93U3RvcmVk Q3JlZGVudGlhbHM7Ci0gICAgaWYgKGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IF9zZXNzaW9uLT5k YXRhVGFza0ZvcklkZW50aWZpZXIodGFzay50YXNrSWRlbnRpZmllciwgc3RvcmVkQ3JlZGVudGlh bHMpKSB7CisgICAgaWYgKGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IF9zZXNzaW9uLT5kYXRhVGFz a0ZvcklkZW50aWZpZXIodGFza0lkZW50aWZpZXIsIHN0b3JlZENyZWRlbnRpYWxzKSkgewogICAg ICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyQ29weSA9IEJsb2NrX2NvcHkoY29tcGxldGlvbkhh bmRsZXIpOwotICAgICAgICBuZXR3b3JrRGF0YVRhc2stPndpbGxQZXJmb3JtSFRUUFJlZGlyZWN0 aW9uKFdlYkNvcmU6OnN5bnRoZXNpemVSZWRpcmVjdFJlc3BvbnNlSWZOZWNlc3NhcnkoW3Rhc2sg Y3VycmVudFJlcXVlc3RdLCByZXF1ZXN0LCBuaWwpLCByZXF1ZXN0LCBbY29tcGxldGlvbkhhbmRs ZXJDb3B5XShjb25zdCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpIHsKKyAgICAg ICAgbmV0d29ya0RhdGFUYXNrLT53aWxsUGVyZm9ybUhUVFBSZWRpcmVjdGlvbihXZWJDb3JlOjpz eW50aGVzaXplUmVkaXJlY3RSZXNwb25zZUlmTmVjZXNzYXJ5KFt0YXNrIGN1cnJlbnRSZXF1ZXN0 XSwgcmVxdWVzdCwgbmlsKSwgcmVxdWVzdCwgW2NvbXBsZXRpb25IYW5kbGVyQ29weSwgdGFza0lk ZW50aWZpZXJdKGNvbnN0IFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkgeworICAg ICAgICAgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWxsdSBfc2NoZW1lVXBncmFkZWQgY29tcGxl dGlvbkhhbmRsZXIgKCVzKSIsIHRhc2tJZGVudGlmaWVyLCByZXF1ZXN0LnVybCgpLnN0cmluZygp LnV0ZjgoKS5kYXRhKCkpOwogICAgICAgICAgICAgY29tcGxldGlvbkhhbmRsZXJDb3B5KHJlcXVl c3QubnNVUkxSZXF1ZXN0KFdlYkNvcmU6OlVwZGF0ZUhUVFBCb2R5KSk7CiAgICAgICAgICAgICBC bG9ja19yZWxlYXNlKGNvbXBsZXRpb25IYW5kbGVyQ29weSk7CiAgICAgICAgIH0pOwotICAgIH0g ZWxzZQorICAgIH0gZWxzZSB7CisgICAgICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwgIiVsbHUgX3Nj aGVtZVVwZ3JhZGVkIGNvbXBsZXRpb25IYW5kbGVyIChuaWwpIiwgdGFza0lkZW50aWZpZXIpOwog ICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihuaWwpOworICAgIH0KIH0KIAogLSAodm9pZClVUkxT ZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIGRhdGFUYXNrOihOU1VSTFNlc3Npb25EYXRh VGFzayAqKWRhdGFUYXNrIHdpbGxDYWNoZVJlc3BvbnNlOihOU0NhY2hlZFVSTFJlc3BvbnNlICop cHJvcG9zZWRSZXNwb25zZSBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCAoXikoTlNDYWNoZWRVUkxS ZXNwb25zZSAqIF9OdWxsYWJsZSBjYWNoZWRSZXNwb25zZSkpY29tcGxldGlvbkhhbmRsZXIKQEAg LTE1MCwxMyArMTY1LDE3IEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vz c2kKIAogLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24gKilzZXNzaW9uIHRhc2s6KE5T VVJMU2Vzc2lvblRhc2sgKil0YXNrIGRpZFJlY2VpdmVDaGFsbGVuZ2U6KE5TVVJMQXV0aGVudGlj YXRpb25DaGFsbGVuZ2UgKiljaGFsbGVuZ2UgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5T VVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VEaXNwb3NpdGlvbiBkaXNwb3NpdGlvbiwgTlNVUkxDcmVk ZW50aWFsICpjcmVkZW50aWFsKSljb21wbGV0aW9uSGFuZGxlcgogeworICAgIGF1dG8gdGFza0lk ZW50aWZpZXIgPSB0YXNrLnRhc2tJZGVudGlmaWVyOworICAgIExPRyhOZXR3b3JrU2Vzc2lvbiwg IiVsbHUgZGlkUmVjZWl2ZUNoYWxsZW5nZSIsIHRhc2tJZGVudGlmaWVyKTsKKyAgICAKICAgICBh dXRvIHN0b3JlZENyZWRlbnRpYWxzID0gX3dpdGhDcmVkZW50aWFscyA/IFdlYkNvcmU6OlN0b3Jl ZENyZWRlbnRpYWxzOjpBbGxvd1N0b3JlZENyZWRlbnRpYWxzIDogV2ViQ29yZTo6U3RvcmVkQ3Jl ZGVudGlhbHM6OkRvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFsczsKICAgICBpZiAoYXV0byogbmV0 d29ya0RhdGFUYXNrID0gX3Nlc3Npb24tPmRhdGFUYXNrRm9ySWRlbnRpZmllcih0YXNrLnRhc2tJ ZGVudGlmaWVyLCBzdG9yZWRDcmVkZW50aWFscykpIHsKICAgICAgICAgV2ViQ29yZTo6QXV0aGVu dGljYXRpb25DaGFsbGVuZ2UgYXV0aGVudGljYXRpb25DaGFsbGVuZ2UoY2hhbGxlbmdlKTsKICAg ICAgICAgYXV0byBjb21wbGV0aW9uSGFuZGxlckNvcHkgPSBCbG9ja19jb3B5KGNvbXBsZXRpb25I YW5kbGVyKTsKICAgICAgICAgYXV0byBzZXNzaW9uSUQgPSBfc2Vzc2lvbi0+c2Vzc2lvbklEKCk7 Ci0gICAgICAgIGF1dG8gY2hhbGxlbmdlQ29tcGxldGlvbkhhbmRsZXIgPSBbY29tcGxldGlvbkhh bmRsZXJDb3B5LCBzZXNzaW9uSUQsIGF1dGhlbnRpY2F0aW9uQ2hhbGxlbmdlXShXZWJLaXQ6OkF1 dGhlbnRpY2F0aW9uQ2hhbGxlbmdlRGlzcG9zaXRpb24gZGlzcG9zaXRpb24sIGNvbnN0IFdlYkNv cmU6OkNyZWRlbnRpYWwmIGNyZWRlbnRpYWwpCisgICAgICAgIGF1dG8gY2hhbGxlbmdlQ29tcGxl dGlvbkhhbmRsZXIgPSBbY29tcGxldGlvbkhhbmRsZXJDb3B5LCBzZXNzaW9uSUQsIGF1dGhlbnRp Y2F0aW9uQ2hhbGxlbmdlLCB0YXNrSWRlbnRpZmllcl0oV2ViS2l0OjpBdXRoZW50aWNhdGlvbkNo YWxsZW5nZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpDcmVkZW50aWFs JiBjcmVkZW50aWFsKQogICAgICAgICB7CisgICAgICAgICAgICBMT0coTmV0d29ya1Nlc3Npb24s ICIlbGx1IGRpZFJlY2VpdmVDaGFsbGVuZ2UgY29tcGxldGlvbkhhbmRsZXIiLCB0YXNrSWRlbnRp Zmllcik7CiAjaWYgIVVTRShDUkVERU5USUFMX1NUT1JBR0VfV0lUSF9ORVRXT1JLX1NFU1NJT04p CiAgICAgICAgICAgICBVTlVTRURfUEFSQU0oc2Vzc2lvbklEKTsKICAgICAgICAgICAgIFVOVVNF RF9QQVJBTShhdXRoZW50aWNhdGlvbkNoYWxsZW5nZSk7CkBAIC0xNzksMTIgKzE5OCwxNSBAQCAt ICh2b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3NpCiAgICAgICAgICAgICBCbG9j a19yZWxlYXNlKGNvbXBsZXRpb25IYW5kbGVyQ29weSk7CiAgICAgICAgIH07CiAgICAgICAgIG5l dHdvcmtEYXRhVGFzay0+ZGlkUmVjZWl2ZUNoYWxsZW5nZShjaGFsbGVuZ2UsIGNoYWxsZW5nZUNv bXBsZXRpb25IYW5kbGVyKTsKLSAgICB9IGVsc2UKKyAgICB9IGVsc2UgeworICAgICAgICBMT0co TmV0d29ya1Nlc3Npb24sICIlbGx1IGRpZFJlY2VpdmVDaGFsbGVuZ2UgY29tcGxldGlvbkhhbmRs ZXIgKGNhbmNlbCkiLCB0YXNrSWRlbnRpZmllcik7CiAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVy KE5TVVJMU2Vzc2lvbkF1dGhDaGFsbGVuZ2VDYW5jZWxBdXRoZW50aWNhdGlvbkNoYWxsZW5nZSwg bmlsKTsKKyAgICB9CiB9CiAKIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vz c2lvbiB0YXNrOihOU1VSTFNlc3Npb25UYXNrICopdGFzayBkaWRDb21wbGV0ZVdpdGhFcnJvcjoo TlNFcnJvciAqKWVycm9yCiB7CisgICAgTE9HKE5ldHdvcmtTZXNzaW9uLCAiJWxsdSBkaWRDb21w bGV0ZVdpdGhFcnJvciIsIHRhc2sudGFza0lkZW50aWZpZXIpOwogICAgIGF1dG8gc3RvcmVkQ3Jl ZGVudGlhbHMgPSBfd2l0aENyZWRlbnRpYWxzID8gV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6 OkFsbG93U3RvcmVkQ3JlZGVudGlhbHMgOiBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsczo6RG9O b3RBbGxvd1N0b3JlZENyZWRlbnRpYWxzOwogICAgIGlmIChhdXRvKiBuZXR3b3JrRGF0YVRhc2sg PSBfc2Vzc2lvbi0+ZGF0YVRhc2tGb3JJZGVudGlmaWVyKHRhc2sudGFza0lkZW50aWZpZXIsIHN0 b3JlZENyZWRlbnRpYWxzKSkKICAgICAgICAgbmV0d29ya0RhdGFUYXNrLT5kaWRDb21wbGV0ZVdp dGhFcnJvcihlcnJvcik7CkBAIC0yMDksOCArMjMxLDEwIEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjoo TlNVUkxTZXNzaW9uICopc2Vzc2kKIAogLSAodm9pZClVUkxTZXNzaW9uOihOU1VSTFNlc3Npb24g KilzZXNzaW9uIGRhdGFUYXNrOihOU1VSTFNlc3Npb25EYXRhVGFzayAqKWRhdGFUYXNrIGRpZFJl Y2VpdmVSZXNwb25zZTooTlNVUkxSZXNwb25zZSAqKXJlc3BvbnNlIGNvbXBsZXRpb25IYW5kbGVy Oih2b2lkICheKShOU1VSTFNlc3Npb25SZXNwb25zZURpc3Bvc2l0aW9uIGRpc3Bvc2l0aW9uKSlj b21wbGV0aW9uSGFuZGxlcgogeworICAgIGF1dG8gdGFza0lkZW50aWZpZXIgPSBkYXRhVGFzay50 YXNrSWRlbnRpZmllcjsKKyAgICBMT0coTmV0d29ya1Nlc3Npb24sICIlbGx1IGRpZFJlY2VpdmVS ZXNwb25zZSIsIHRhc2tJZGVudGlmaWVyKTsKICAgICBhdXRvIHN0b3JlZENyZWRlbnRpYWxzID0g X3dpdGhDcmVkZW50aWFscyA/IFdlYkNvcmU6OlN0b3JlZENyZWRlbnRpYWxzOjpBbGxvd1N0b3Jl ZENyZWRlbnRpYWxzIDogV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHM6OkRvTm90QWxsb3dTdG9y ZWRDcmVkZW50aWFsczsKLSAgICBpZiAoYXV0byogbmV0d29ya0RhdGFUYXNrID0gX3Nlc3Npb24t PmRhdGFUYXNrRm9ySWRlbnRpZmllcihkYXRhVGFzay50YXNrSWRlbnRpZmllciwgc3RvcmVkQ3Jl ZGVudGlhbHMpKSB7CisgICAgaWYgKGF1dG8qIG5ldHdvcmtEYXRhVGFzayA9IF9zZXNzaW9uLT5k YXRhVGFza0ZvcklkZW50aWZpZXIodGFza0lkZW50aWZpZXIsIHN0b3JlZENyZWRlbnRpYWxzKSkg ewogICAgICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwogICAgICAgICAKICAgICAgICAgLy8g QXZvaWQgTUlNRSB0eXBlIHNuaWZmaW5nIGlmIHRoZSByZXNwb25zZSBjb21lcyBiYWNrIGFzIDMw NCBOb3QgTW9kaWZpZWQuCkBAIC0yMjMsMTIgKzI0NywxNSBAQCAtICh2b2lkKVVSTFNlc3Npb246 KE5TVVJMU2Vzc2lvbiAqKXNlc3NpCiAgICAgICAgIFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2Ug cmVzb3VyY2VSZXNwb25zZShyZXNwb25zZSk7CiAgICAgICAgIGNvcHlUaW1pbmdEYXRhKFtkYXRh VGFzayBfdGltaW5nRGF0YV0sIHJlc291cmNlUmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCkp OwogICAgICAgICBhdXRvIGNvbXBsZXRpb25IYW5kbGVyQ29weSA9IEJsb2NrX2NvcHkoY29tcGxl dGlvbkhhbmRsZXIpOwotICAgICAgICBuZXR3b3JrRGF0YVRhc2stPmRpZFJlY2VpdmVSZXNwb25z ZShyZXNvdXJjZVJlc3BvbnNlLCBbY29tcGxldGlvbkhhbmRsZXJDb3B5XShXZWJDb3JlOjpQb2xp Y3lBY3Rpb24gcG9saWN5QWN0aW9uKSB7CisgICAgICAgIG5ldHdvcmtEYXRhVGFzay0+ZGlkUmVj ZWl2ZVJlc3BvbnNlKHJlc291cmNlUmVzcG9uc2UsIFtjb21wbGV0aW9uSGFuZGxlckNvcHksIHRh c2tJZGVudGlmaWVyXShXZWJDb3JlOjpQb2xpY3lBY3Rpb24gcG9saWN5QWN0aW9uKSB7CisgICAg ICAgICAgICBMT0coTmV0d29ya1Nlc3Npb24sICIlbGx1IGRpZFJlY2VpdmVSZXNwb25zZSBjb21w bGV0aW9uSGFuZGxlciAoY2FuY2VsKSIsIHRhc2tJZGVudGlmaWVyKTsKICAgICAgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyQ29weSh0b05TVVJMU2Vzc2lvblJlc3BvbnNlRGlzcG9zaXRpb24ocG9s aWN5QWN0aW9uKSk7CiAgICAgICAgICAgICBCbG9ja19yZWxlYXNlKGNvbXBsZXRpb25IYW5kbGVy Q29weSk7CiAgICAgICAgIH0pOwotICAgIH0gZWxzZQorICAgIH0gZWxzZSB7CisgICAgICAgIExP RyhOZXR3b3JrU2Vzc2lvbiwgIiVsbHUgZGlkUmVjZWl2ZVJlc3BvbnNlIGNvbXBsZXRpb25IYW5k bGVyIChjYW5jZWwpIiwgdGFza0lkZW50aWZpZXIpOwogICAgICAgICBjb21wbGV0aW9uSGFuZGxl cihOU1VSTFNlc3Npb25SZXNwb25zZUNhbmNlbCk7CisgICAgfQogfQogCiAtICh2b2lkKVVSTFNl c3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3Npb24gZGF0YVRhc2s6KE5TVVJMU2Vzc2lvbkRhdGFU YXNrICopZGF0YVRhc2sgZGlkUmVjZWl2ZURhdGE6KE5TRGF0YSAqKWRhdGEKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL1BsYXRmb3JtL0xvZ2dpbmcuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0 Mi9QbGF0Zm9ybS9Mb2dnaW5nLmgJKHJldmlzaW9uIDIwMTI5MCkKKysrIFNvdXJjZS9XZWJLaXQy L1BsYXRmb3JtL0xvZ2dpbmcuaAkod29ya2luZyBjb3B5KQpAQCAtNDgsNiArNDgsNyBAQCBuYW1l c3BhY2UgV2ViS2l0IHsKICAgICBNKE5ldHdvcmtDYWNoZSkgXAogICAgIE0oTmV0d29ya0NhY2hl U3RvcmFnZSkgXAogICAgIE0oTmV0d29ya0NhY2hlU3BlY3VsYXRpdmVQcmVsb2FkaW5nKSBcCisg ICAgTShOZXR3b3JrU2Vzc2lvbikgXAogICAgIE0oTmV0d29ya1NjaGVkdWxpbmcpIFwKICAgICBN KFBsdWdpbnMpIFwKICAgICBNKFByaW50aW5nKSBcCg==