181876 2018-01-19 13:10:29 -0800 [Curl] Add timeout support to XMLHttpRequest 2018-01-19 14:34:23 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 117300 1 basuke basuke achristensen basuke commit-queue don.olmstead ews-watchlist galpeter webkit-bug-importer oldest_to_newest 1391126 0 basuke 2018-01-19 13:10:29 -0800 Add timeout support to XMLHttpRequest 1391130 1 331775 basuke 2018-01-19 13:15:21 -0800 Created attachment 331775 Patch 1391144 2 331775 achristensen 2018-01-19 13:22:10 -0800 Comment on attachment 331775 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=331775&action=review > Source/WebCore/platform/network/ResourceRequestBase.cpp:36 > -#if !USE(SOUP) && (!PLATFORM(MAC) || USE(CFURLCONNECTION)) > +#if !USE(SOUP) && (!PLATFORM(MAC) || USE(CFURLCONNECTION)) && !USE(CURL) Let's change this to #if PLATFORM(IOS) || USE(CFURLCONNECTION) 1391153 3 331782 basuke 2018-01-19 13:27:35 -0800 Created attachment 331782 Fixed Okay, change the ifdef condition much simpler 1391189 4 331782 commit-queue 2018-01-19 14:33:56 -0800 Comment on attachment 331782 Fixed Clearing flags on attachment: 331782 Committed r227237: <https://trac.webkit.org/changeset/227237> 1391190 5 commit-queue 2018-01-19 14:33:57 -0800 All reviewed patches have been landed. Closing bug. 1391191 6 webkit-bug-importer 2018-01-19 14:34:23 -0800 <rdar://problem/36671458> 331775 2018-01-19 13:15:21 -0800 2018-01-19 13:27:35 -0800 Patch 181876.diff text/plain 5734 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZjMwODRhNjk2My4uNzU2ZThlYTllMDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxOC0wMS0xOSAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEFkZCB0aW1lb3V0IHN1cHBvcnQgdG8gWE1MSHR0cFJl cXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 MTg3NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RCYXNlLmNwcDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3Vy bEhhbmRsZTo6c2V0VGltZW91dCk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1 cmxDb250ZXh0Lmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0OjpzZXR1cFRyYW5zZmVyKToKKyAg ICAgICAgKFdlYkNvcmU6OkN1cmxSZXF1ZXN0OjpkaWRDb21wbGV0ZVRyYW5zZmVyKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VFcnJvci5oOgorICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yQ3VybC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZUVycm9yOjpodHRwRXJyb3IpOgorCiAyMDE4LTAxLTE4ICBBbnR0aSBLb2l2 aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyMjU2NTApOiBU aGUgc2NvcmVzIG9mIE1vdGlvbk1hcmsgdGVzdHMgTXVsdGlwbHkgYW5kIExlYXZlcyBkcm9wcGVk IGJ5IDglCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291 cmNlUmVxdWVzdEJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNv dXJjZVJlcXVlc3RCYXNlLmNwcAppbmRleCAyNTJiZjdjOGM5NC4uZTdlYWI2MGNiMzcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFz ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVl c3RCYXNlLmNwcApAQCAtMzMsNyArMzMsNyBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSNp ZiAhVVNFKFNPVVApICYmICghUExBVEZPUk0oTUFDKSB8fCBVU0UoQ0ZVUkxDT05ORUNUSU9OKSkK KyNpZiAhVVNFKFNPVVApICYmICghUExBVEZPUk0oTUFDKSB8fCBVU0UoQ0ZVUkxDT05ORUNUSU9O KSkgJiYgIVVTRShDVVJMKQogZG91YmxlIFJlc291cmNlUmVxdWVzdEJhc2U6OnNfZGVmYXVsdFRp bWVvdXRJbnRlcnZhbCA9IElOVF9NQVg7CiAjZWxzZQogLy8gV2lsbCB1c2UgTlNVUkxSZXF1ZXN0 IGRlZmF1bHQgdGltZW91dCB1bmxlc3Mgc2V0IHRvIGEgbm9uLXplcm8gdmFsdWUgd2l0aCBzZXRE ZWZhdWx0VGltZW91dEludGVydmFsKCkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmNwcAppbmRleCBkNGVjNTM3Y2U4My4uZDU0YjEy YzkyYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9D dXJsQ29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJs L0N1cmxDb250ZXh0LmNwcApAQCAtNTIwLDYgKzUyMCwxMSBAQCB2b2lkIEN1cmxIYW5kbGU6OmVu YWJsZVRpbWVvdXQoKQogICAgIGN1cmxfZWFzeV9zZXRvcHQobV9oYW5kbGUsIENVUkxPUFRfRE5T X0NBQ0hFX1RJTUVPVVQsIGRuc0NhY2hlVGltZW91dCk7CiB9CiAKK3ZvaWQgQ3VybEhhbmRsZTo6 c2V0VGltZW91dChsb25nIHRpbWVvdXRNaWxsaXNlY29uZHMpCit7CisgICAgY3VybF9lYXN5X3Nl dG9wdChtX2hhbmRsZSwgQ1VSTE9QVF9USU1FT1VUX01TLCB0aW1lb3V0TWlsbGlzZWNvbmRzKTsK K30KKwogdm9pZCBDdXJsSGFuZGxlOjpzZXRIZWFkZXJDYWxsYmFja0Z1bmN0aW9uKGN1cmxfd3Jp dGVfY2FsbGJhY2sgY2FsbGJhY2tGdW5jLCB2b2lkKiB1c2VyRGF0YSkKIHsKICAgICBjdXJsX2Vh c3lfc2V0b3B0KG1faGFuZGxlLCBDVVJMT1BUX0hFQURFUkZVTkNUSU9OLCBjYWxsYmFja0Z1bmMp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxD b250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRl eHQuaAppbmRleCA1OWMwNWQyY2FkNi4uNDg4MDg1ZWIyZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5oCkBAIC0yNjMsNiArMjYz LDcgQEAgcHVibGljOgogICAgIHZvaWQgZW5hYmxlUHJveHlJZkV4aXN0cygpOwogCiAgICAgdm9p ZCBlbmFibGVUaW1lb3V0KCk7CisgICAgdm9pZCBzZXRUaW1lb3V0KGxvbmcgdGltZW91dE1pbGxp c2Vjb25kcyk7CiAKICAgICAvLyBDYWxsYmFjayBmdW5jdGlvbgogICAgIHZvaWQgc2V0SGVhZGVy Q2FsbGJhY2tGdW5jdGlvbihjdXJsX3dyaXRlX2NhbGxiYWNrLCB2b2lkKik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVlc3QuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmNwcAppbmRl eCA3ODZjNmEzOTRiYi4uNDZiYjM0Y2EzODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxSZXF1ZXN0LmNwcApAQCAtMTkyLDYgKzE5Miw5IEBA IENVUkwqIEN1cmxSZXF1ZXN0OjpzZXR1cFRyYW5zZmVyKCkKICAgICBtX2N1cmxIYW5kbGUtPmVu YWJsZUFjY2VwdEVuY29kaW5nKCk7CiAgICAgbV9jdXJsSGFuZGxlLT5lbmFibGVUaW1lb3V0KCk7 CiAKKyAgICBsb25nIHRpbWVvdXRNaWxsaXNlY29uZHMgPSAobV9yZXF1ZXN0LnRpbWVvdXRJbnRl cnZhbCgpID4gMC4wKSA/IHN0YXRpY19jYXN0PGxvbmc+KG1fcmVxdWVzdC50aW1lb3V0SW50ZXJ2 YWwoKSAqIDEwMDAuMCkgOiAwOworICAgIG1fY3VybEhhbmRsZS0+c2V0VGltZW91dCh0aW1lb3V0 TWlsbGlzZWNvbmRzKTsKKwogICAgIG1fY3VybEhhbmRsZS0+ZW5hYmxlUHJveHlJZkV4aXN0cygp OwogICAgIG1fY3VybEhhbmRsZS0+ZW5hYmxlQ29va2llSmFySWZFeGlzdHMoKTsKIApAQCAtNDIx LDcgKzQyNCw4IEBAIHZvaWQgQ3VybFJlcXVlc3Q6OmRpZENvbXBsZXRlVHJhbnNmZXIoQ1VSTGNv ZGUgcmVzdWx0KQogICAgICAgICAgICAgfSk7CiAgICAgICAgIH0KICAgICB9IGVsc2UgewotICAg ICAgICBhdXRvIHJlc291cmNlRXJyb3IgPSBSZXNvdXJjZUVycm9yOjpodHRwRXJyb3IocmVzdWx0 LCBtX3JlcXVlc3QudXJsKCkpOworICAgICAgICBhdXRvIHR5cGUgPSAocmVzdWx0ID09IENVUkxF X09QRVJBVElPTl9USU1FRE9VVCAmJiBtX3JlcXVlc3QudGltZW91dEludGVydmFsKCkgPiAwLjAp ID8gUmVzb3VyY2VFcnJvcjo6VHlwZTo6VGltZW91dCA6IFJlc291cmNlRXJyb3I6OlR5cGU6Okdl bmVyYWw7CisgICAgICAgIGF1dG8gcmVzb3VyY2VFcnJvciA9IFJlc291cmNlRXJyb3I6Omh0dHBF cnJvcihyZXN1bHQsIG1fcmVxdWVzdC51cmwoKSwgdHlwZSk7CiAgICAgICAgIGlmIChtX3NzbFZl cmlmaWVyLnNzbEVycm9ycygpKQogICAgICAgICAgICAgcmVzb3VyY2VFcnJvci5zZXRTc2xFcnJv cnMobV9zc2xWZXJpZmllci5zc2xFcnJvcnMoKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yLmggYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VFcnJvci5oCmluZGV4IGNhMmMwNTk2M2Uw Li4xMzEwZmY5N2JkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlRXJyb3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL2N1cmwvUmVzb3VyY2VFcnJvci5oCkBAIC00NCw3ICs0NCw3IEBAIHB1YmxpYzoKICAgICB7 CiAgICAgfQogCi0gICAgc3RhdGljIFJlc291cmNlRXJyb3IgaHR0cEVycm9yKGludCBlcnJvckNv ZGUsIGNvbnN0IFVSTCYgZmFpbGluZ1VSTCk7CisgICAgc3RhdGljIFJlc291cmNlRXJyb3IgaHR0 cEVycm9yKGludCBlcnJvckNvZGUsIGNvbnN0IFVSTCYgZmFpbGluZ1VSTCwgVHlwZSA9IFR5cGU6 OkdlbmVyYWwpOwogICAgIHN0YXRpYyBSZXNvdXJjZUVycm9yIHNzbEVycm9yKGludCBlcnJvckNv ZGUsIHVuc2lnbmVkIHNzbEVycm9ycywgY29uc3QgVVJMJiBmYWlsaW5nVVJMKTsKIAogICAgIHVu c2lnbmVkIHNzbEVycm9ycygpIGNvbnN0IHsgcmV0dXJuIG1fc3NsRXJyb3JzOyB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VFcnJvckN1 cmwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlRXJy b3JDdXJsLmNwcAppbmRleCBlNzAwNTdkMzc2NS4uZWE1N2U5NWQ1NDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yQ3VybC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3JD dXJsLmNwcApAQCAtMzQsOSArMzQsOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNvbnN0IGNo YXIqIGNvbnN0IFJlc291cmNlRXJyb3I6OmN1cmxFcnJvckRvbWFpbiA9ICJDdXJsRXJyb3JEb21h aW4iOwogCi1SZXNvdXJjZUVycm9yIFJlc291cmNlRXJyb3I6Omh0dHBFcnJvcihpbnQgZXJyb3JD b2RlLCBjb25zdCBVUkwmIGZhaWxpbmdVUkwpCitSZXNvdXJjZUVycm9yIFJlc291cmNlRXJyb3I6 Omh0dHBFcnJvcihpbnQgZXJyb3JDb2RlLCBjb25zdCBVUkwmIGZhaWxpbmdVUkwsIFR5cGUgdHlw ZSkKIHsKLSAgICByZXR1cm4gUmVzb3VyY2VFcnJvcihjdXJsRXJyb3JEb21haW4sIGVycm9yQ29k ZSwgZmFpbGluZ1VSTCwgQ3VybEhhbmRsZTo6ZXJyb3JEZXNjcmlwdGlvbihzdGF0aWNfY2FzdDxD VVJMY29kZT4oZXJyb3JDb2RlKSkpOworICAgIHJldHVybiBSZXNvdXJjZUVycm9yKGN1cmxFcnJv ckRvbWFpbiwgZXJyb3JDb2RlLCBmYWlsaW5nVVJMLCBDdXJsSGFuZGxlOjplcnJvckRlc2NyaXB0 aW9uKHN0YXRpY19jYXN0PENVUkxjb2RlPihlcnJvckNvZGUpKSwgdHlwZSk7CiB9CiAKIFJlc291 cmNlRXJyb3IgUmVzb3VyY2VFcnJvcjo6c3NsRXJyb3IoaW50IGVycm9yQ29kZSwgdW5zaWduZWQg c3NsRXJyb3JzLCBjb25zdCBVUkwmIGZhaWxpbmdVUkwpCg== 331782 2018-01-19 13:27:35 -0800 2018-01-19 14:33:56 -0800 Fixed 181876.diff text/plain 5705 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2ZjMwODRhNjk2My4uNzU2ZThlYTllMDYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxOC0wMS0xOSAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIEFkZCB0aW1lb3V0IHN1cHBvcnQgdG8gWE1MSHR0cFJl cXVlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4 MTg3NgorCisgICAgICAgIFJldmlld2VkIGJ5IEFsZXggQ2hyaXN0ZW5zZW4gCisKKyAgICAgICAg KiBwbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuY3BwOgorICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpD dXJsSGFuZGxlOjpzZXRUaW1lb3V0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwv Q3VybENvbnRleHQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVl c3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6OnNldHVwVHJhbnNmZXIpOgor ICAgICAgICAoV2ViQ29yZTo6Q3VybFJlcXVlc3Q6OmRpZENvbXBsZXRlVHJhbnNmZXIpOgorICAg ICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yLmg6CisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3JDdXJsLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJlc291cmNlRXJyb3I6Omh0dHBFcnJvcik6CisKIDIwMTgtMDEtMTggIEFudHRpIEtv aXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIyNTY1MCk6 IFRoZSBzY29yZXMgb2YgTW90aW9uTWFyayB0ZXN0cyBNdWx0aXBseSBhbmQgTGVhdmVzIGRyb3Bw ZWQgYnkgOCUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVz b3VyY2VSZXF1ZXN0QmFzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlUmVxdWVzdEJhc2UuY3BwCmluZGV4IDI1MmJmN2M4Yzk0Li5lN2VhYjYwY2IzNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlcXVlc3RC YXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVx dWVzdEJhc2UuY3BwCkBAIC0zMyw3ICszMyw3IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAot I2lmICFVU0UoU09VUCkgJiYgKCFQTEFURk9STShNQUMpIHx8IFVTRShDRlVSTENPTk5FQ1RJT04p KQorI2lmIFBMQVRGT1JNKElPUykgfHwgVVNFKENGVVJMQ09OTkVDVElPTikKIGRvdWJsZSBSZXNv dXJjZVJlcXVlc3RCYXNlOjpzX2RlZmF1bHRUaW1lb3V0SW50ZXJ2YWwgPSBJTlRfTUFYOwogI2Vs c2UKIC8vIFdpbGwgdXNlIE5TVVJMUmVxdWVzdCBkZWZhdWx0IHRpbWVvdXQgdW5sZXNzIHNldCB0 byBhIG5vbi16ZXJvIHZhbHVlIHdpdGggc2V0RGVmYXVsdFRpbWVvdXRJbnRlcnZhbCgpLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0 LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5j cHAKaW5kZXggZDRlYzUzN2NlODMuLmQ1NGIxMmM5MmM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5jcHAKQEAgLTUyMCw2ICs1 MjAsMTEgQEAgdm9pZCBDdXJsSGFuZGxlOjplbmFibGVUaW1lb3V0KCkKICAgICBjdXJsX2Vhc3lf c2V0b3B0KG1faGFuZGxlLCBDVVJMT1BUX0ROU19DQUNIRV9USU1FT1VULCBkbnNDYWNoZVRpbWVv dXQpOwogfQogCit2b2lkIEN1cmxIYW5kbGU6OnNldFRpbWVvdXQobG9uZyB0aW1lb3V0TWlsbGlz ZWNvbmRzKQoreworICAgIGN1cmxfZWFzeV9zZXRvcHQobV9oYW5kbGUsIENVUkxPUFRfVElNRU9V VF9NUywgdGltZW91dE1pbGxpc2Vjb25kcyk7Cit9CisKIHZvaWQgQ3VybEhhbmRsZTo6c2V0SGVh ZGVyQ2FsbGJhY2tGdW5jdGlvbihjdXJsX3dyaXRlX2NhbGxiYWNrIGNhbGxiYWNrRnVuYywgdm9p ZCogdXNlckRhdGEpCiB7CiAgICAgY3VybF9lYXN5X3NldG9wdChtX2hhbmRsZSwgQ1VSTE9QVF9I RUFERVJGVU5DVElPTiwgY2FsbGJhY2tGdW5jKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmgKaW5kZXggNTljMDVkMmNhZDYuLjQ4ODA4 NWViMmQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv Q3VybENvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwv Q3VybENvbnRleHQuaApAQCAtMjYzLDYgKzI2Myw3IEBAIHB1YmxpYzoKICAgICB2b2lkIGVuYWJs ZVByb3h5SWZFeGlzdHMoKTsKIAogICAgIHZvaWQgZW5hYmxlVGltZW91dCgpOworICAgIHZvaWQg c2V0VGltZW91dChsb25nIHRpbWVvdXRNaWxsaXNlY29uZHMpOwogCiAgICAgLy8gQ2FsbGJhY2sg ZnVuY3Rpb24KICAgICB2b2lkIHNldEhlYWRlckNhbGxiYWNrRnVuY3Rpb24oY3VybF93cml0ZV9j YWxsYmFjaywgdm9pZCopOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9jdXJsL0N1cmxSZXF1ZXN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY3VybC9DdXJsUmVxdWVzdC5jcHAKaW5kZXggNzg2YzZhMzk0YmIuLjQ2YmIzNGNhMzg2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybFJlcXVl c3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsUmVx dWVzdC5jcHAKQEAgLTE5Miw2ICsxOTIsOSBAQCBDVVJMKiBDdXJsUmVxdWVzdDo6c2V0dXBUcmFu c2ZlcigpCiAgICAgbV9jdXJsSGFuZGxlLT5lbmFibGVBY2NlcHRFbmNvZGluZygpOwogICAgIG1f Y3VybEhhbmRsZS0+ZW5hYmxlVGltZW91dCgpOwogCisgICAgbG9uZyB0aW1lb3V0TWlsbGlzZWNv bmRzID0gKG1fcmVxdWVzdC50aW1lb3V0SW50ZXJ2YWwoKSA+IDAuMCkgPyBzdGF0aWNfY2FzdDxs b25nPihtX3JlcXVlc3QudGltZW91dEludGVydmFsKCkgKiAxMDAwLjApIDogMDsKKyAgICBtX2N1 cmxIYW5kbGUtPnNldFRpbWVvdXQodGltZW91dE1pbGxpc2Vjb25kcyk7CisKICAgICBtX2N1cmxI YW5kbGUtPmVuYWJsZVByb3h5SWZFeGlzdHMoKTsKICAgICBtX2N1cmxIYW5kbGUtPmVuYWJsZUNv b2tpZUphcklmRXhpc3RzKCk7CiAKQEAgLTQyMSw3ICs0MjQsOCBAQCB2b2lkIEN1cmxSZXF1ZXN0 OjpkaWRDb21wbGV0ZVRyYW5zZmVyKENVUkxjb2RlIHJlc3VsdCkKICAgICAgICAgICAgIH0pOwog ICAgICAgICB9CiAgICAgfSBlbHNlIHsKLSAgICAgICAgYXV0byByZXNvdXJjZUVycm9yID0gUmVz b3VyY2VFcnJvcjo6aHR0cEVycm9yKHJlc3VsdCwgbV9yZXF1ZXN0LnVybCgpKTsKKyAgICAgICAg YXV0byB0eXBlID0gKHJlc3VsdCA9PSBDVVJMRV9PUEVSQVRJT05fVElNRURPVVQgJiYgbV9yZXF1 ZXN0LnRpbWVvdXRJbnRlcnZhbCgpID4gMC4wKSA/IFJlc291cmNlRXJyb3I6OlR5cGU6OlRpbWVv dXQgOiBSZXNvdXJjZUVycm9yOjpUeXBlOjpHZW5lcmFsOworICAgICAgICBhdXRvIHJlc291cmNl RXJyb3IgPSBSZXNvdXJjZUVycm9yOjpodHRwRXJyb3IocmVzdWx0LCBtX3JlcXVlc3QudXJsKCks IHR5cGUpOwogICAgICAgICBpZiAobV9zc2xWZXJpZmllci5zc2xFcnJvcnMoKSkKICAgICAgICAg ICAgIHJlc291cmNlRXJyb3Iuc2V0U3NsRXJyb3JzKG1fc3NsVmVyaWZpZXIuc3NsRXJyb3JzKCkp OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVz b3VyY2VFcnJvci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291 cmNlRXJyb3IuaAppbmRleCBjYTJjMDU5NjNlMC4uMTMxMGZmOTdiZDUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3IuaApAQCAt NDQsNyArNDQsNyBAQCBwdWJsaWM6CiAgICAgewogICAgIH0KIAotICAgIHN0YXRpYyBSZXNvdXJj ZUVycm9yIGh0dHBFcnJvcihpbnQgZXJyb3JDb2RlLCBjb25zdCBVUkwmIGZhaWxpbmdVUkwpOwor ICAgIHN0YXRpYyBSZXNvdXJjZUVycm9yIGh0dHBFcnJvcihpbnQgZXJyb3JDb2RlLCBjb25zdCBV UkwmIGZhaWxpbmdVUkwsIFR5cGUgPSBUeXBlOjpHZW5lcmFsKTsKICAgICBzdGF0aWMgUmVzb3Vy Y2VFcnJvciBzc2xFcnJvcihpbnQgZXJyb3JDb2RlLCB1bnNpZ25lZCBzc2xFcnJvcnMsIGNvbnN0 IFVSTCYgZmFpbGluZ1VSTCk7CiAKICAgICB1bnNpZ25lZCBzc2xFcnJvcnMoKSBjb25zdCB7IHJl dHVybiBtX3NzbEVycm9yczsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3JDdXJsLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yQ3VybC5jcHAKaW5kZXggZTcwMDU3ZDM3NjUu LmVhNTdlOTVkNTQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2N1cmwvUmVzb3VyY2VFcnJvckN1cmwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yQ3VybC5jcHAKQEAgLTM0LDkgKzM0LDkgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiBjb25zdCBjaGFyKiBjb25zdCBSZXNvdXJjZUVycm9yOjpjdXJs RXJyb3JEb21haW4gPSAiQ3VybEVycm9yRG9tYWluIjsKIAotUmVzb3VyY2VFcnJvciBSZXNvdXJj ZUVycm9yOjpodHRwRXJyb3IoaW50IGVycm9yQ29kZSwgY29uc3QgVVJMJiBmYWlsaW5nVVJMKQor UmVzb3VyY2VFcnJvciBSZXNvdXJjZUVycm9yOjpodHRwRXJyb3IoaW50IGVycm9yQ29kZSwgY29u c3QgVVJMJiBmYWlsaW5nVVJMLCBUeXBlIHR5cGUpCiB7Ci0gICAgcmV0dXJuIFJlc291cmNlRXJy b3IoY3VybEVycm9yRG9tYWluLCBlcnJvckNvZGUsIGZhaWxpbmdVUkwsIEN1cmxIYW5kbGU6OmVy cm9yRGVzY3JpcHRpb24oc3RhdGljX2Nhc3Q8Q1VSTGNvZGU+KGVycm9yQ29kZSkpKTsKKyAgICBy ZXR1cm4gUmVzb3VyY2VFcnJvcihjdXJsRXJyb3JEb21haW4sIGVycm9yQ29kZSwgZmFpbGluZ1VS TCwgQ3VybEhhbmRsZTo6ZXJyb3JEZXNjcmlwdGlvbihzdGF0aWNfY2FzdDxDVVJMY29kZT4oZXJy b3JDb2RlKSksIHR5cGUpOwogfQogCiBSZXNvdXJjZUVycm9yIFJlc291cmNlRXJyb3I6OnNzbEVy cm9yKGludCBlcnJvckNvZGUsIHVuc2lnbmVkIHNzbEVycm9ycywgY29uc3QgVVJMJiBmYWlsaW5n VVJMKQo=