158200 2016-05-30 06:11:05 -0700 [GTK] Test /webkit2/WebKitWebView/geolocation-permission-requests is failing since r201423 2016-05-31 00:21:36 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned bugs-noreply commit-queue lforschler oldest_to_newest 1197590 0 cgarcia 2016-05-30 06:11:05 -0700 /webkit2/WebKitWebView/geolocation-permission-requests: ** ERROR:../../Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:741:void testWebViewGeolocationPermissionRequests(UIClientTest*, gconstpointer): assertion failed (result == "1"): ("2" == "1") FAIL This is because geolocation is no longer allowed for non secure sites, like HTTP. In that case POSITION_UNAVAILABLE ('2') is returned without asking the API layer. We need to update the test to not use HTTP, or even better keep the HTTP case to check that it's indeed returning POSITION_UNAVAILABLE. 1197596 1 280090 cgarcia 2016-05-30 06:15:27 -0700 Created attachment 280090 Patch 1197597 2 commit-queue 2016-05-30 06:16:31 -0700 Attachment 280090 did not pass style-queue: ERROR: Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestUIClient.cpp:285: Declaration has space between type name and * in const char *waitUntilPermissionResultMessageReceived [whitespace/declaration] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1197601 3 280094 cgarcia 2016-05-30 06:23:58 -0700 Created attachment 280094 Fix coding style 1197732 4 cgarcia 2016-05-31 00:21:36 -0700 Committed r201505: <http://trac.webkit.org/changeset/201505> 280090 2016-05-30 06:15:27 -0700 2016-05-30 06:23:58 -0700 Patch wk2-geolocation-test.diff text/plain 6353 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiYmFk M2NjLi4zNDY0ZDI1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTYtMDUtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFRlc3QgL3dlYmtpdDIvV2Vi S2l0V2ViVmlldy9nZW9sb2NhdGlvbi1wZXJtaXNzaW9uLXJlcXVlc3RzIGlzIGZhaWxpbmcgc2lu Y2UgcjIwMTQyMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU4MjAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBpcyBiZWNhdXNlIGdlb2xvY2F0aW9uIGlzIG5vIGxvbmdlciBhbGxvd2VkIGZvciBu b24gc2VjdXJlIHNpdGVzLCBsaWtlIEhUVFAuIEluIHRoYXQgY2FzZQorICAgICAgICBQT1NJVElP Tl9VTkFWQUlMQUJMRSBpcyByZXR1cm5lZCB3aXRob3V0IGFza2luZyB0aGUgQVBJIGxheWVyLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5j cHA6CisgICAgICAgICh0ZXN0V2ViVmlld0dlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RzKTog S2VlcCB0aGUgSFRUUCBjYXNlIHRvIGNoZWNrIHRoYXQgaXQgaW5kZWVkIHJldHVybnMKKyAgICAg ICAgUE9TSVRJT05fVU5BVkFJTEFCTEUgYW5kIHVzZSBIVFRQUyBVUkxzIHRvIGNoZWNrIHBlcm1p c3Npb24gcmVxdWVzdHMgYXJlIGFsbG93ZWQgb3IgZGVuaWVkLiBBbHNvIHN0b3AgdXNpbmcgdGhl CisgICAgICAgIGRvY3VtZW50IHRpdGxlLCBhbmQgdXNlIHVzZXIgc2NyaXB0IG1lc3NhZ2VzIHRo YXQgYXJlIG1vcmUgcmVsaWFibGUgaW5zdGVhZC4KKwogMjAxNi0wNS0yNyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgTmV3IGludGwtbnVtYmVy Zm9ybWF0LmpzIHRlc3QgZmFpbHMgb24gbWFueSBMaW51eCBwbGF0Zm9ybXMKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0VUlDbGllbnQuY3BwIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5jcHAKaW5k ZXggZmM0OGZhNC4uZmEyMmRlMCAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5jcHAKQEAgLTIyNSw4ICsyMjUsMTUgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gVFJVRTsKICAgICB9CiAKKyAgICBzdGF0aWMgdm9pZCBwZXJt aXNzaW9uUmVzdWx0TWVzc2FnZVJlY2VpdmVkQ2FsbGJhY2soV2ViS2l0VXNlckNvbnRlbnRNYW5h Z2VyKiB1c2VyQ29udGVudE1hbmFnZXIsIFdlYktpdEphdmFzY3JpcHRSZXN1bHQqIGphdmFzY3Jp cHRSZXN1bHQsIFVJQ2xpZW50VGVzdCogdGVzdCkKKyAgICB7CisgICAgICAgIHRlc3QtPm1fcGVy bWlzc2lvblJlc3VsdC5yZXNldChXZWJWaWV3VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmlu ZyhqYXZhc2NyaXB0UmVzdWx0KSk7CisgICAgICAgIGdfbWFpbl9sb29wX3F1aXQodGVzdC0+bV9t YWluTG9vcCk7CisgICAgfQorCiAgICAgVUlDbGllbnRUZXN0KCkKLSAgICAgICAgOiBtX3Njcmlw dERpYWxvZ1R5cGUoV0VCS0lUX1NDUklQVF9ESUFMT0dfQUxFUlQpCisgICAgICAgIDogV2ViVmll d1Rlc3Qod2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX25ldygpKQorICAgICAgICAsIG1fc2Ny aXB0RGlhbG9nVHlwZShXRUJLSVRfU0NSSVBUX0RJQUxPR19BTEVSVCkKICAgICAgICAgLCBtX3Nj cmlwdERpYWxvZ0NvbmZpcm1lZCh0cnVlKQogICAgICAgICAsIG1fYWxsb3dQZXJtaXNzaW9uUmVx dWVzdHMoZmFsc2UpCiAgICAgICAgICwgbV92ZXJpZnlNZWRpYVR5cGVzKGZhbHNlKQpAQCAtMjM5 LDExICsyNDYsMTcgQEAgcHVibGljOgogICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2ViVmll dywgInNjcmlwdC1kaWFsb2ciLCBHX0NBTExCQUNLKHNjcmlwdERpYWxvZyksIHRoaXMpOwogICAg ICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2ViVmlldywgIm1vdXNlLXRhcmdldC1jaGFuZ2VkIiwg R19DQUxMQkFDSyhtb3VzZVRhcmdldENoYW5nZWQpLCB0aGlzKTsKICAgICAgICAgZ19zaWduYWxf Y29ubmVjdChtX3dlYlZpZXcsICJwZXJtaXNzaW9uLXJlcXVlc3QiLCBHX0NBTExCQUNLKHBlcm1p c3Npb25SZXF1ZXN0ZWQpLCB0aGlzKTsKKyAgICAgICAgV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2Vy KiBtYW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dldF91c2VyX2NvbnRlbnRfbWFuYWdlcihtX3dl YlZpZXcpOworICAgICAgICB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVnaXN0ZXJfc2Ny aXB0X21lc3NhZ2VfaGFuZGxlcihtYW5hZ2VyLCAicGVybWlzc2lvbiIpOworICAgICAgICBnX3Np Z25hbF9jb25uZWN0KG1hbmFnZXIsICJzY3JpcHQtbWVzc2FnZS1yZWNlaXZlZDo6cGVybWlzc2lv biIsIEdfQ0FMTEJBQ0socGVybWlzc2lvblJlc3VsdE1lc3NhZ2VSZWNlaXZlZENhbGxiYWNrKSwg dGhpcyk7CiAgICAgfQogCiAgICAgflVJQ2xpZW50VGVzdCgpCiAgICAgewogICAgICAgICBnX3Np Z25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQobV93ZWJWaWV3LCBHX1NJR05BTF9NQVRD SF9EQVRBLCAwLCAwLCAwLCAwLCB0aGlzKTsKKyAgICAgICAgV2ViS2l0VXNlckNvbnRlbnRNYW5h Z2VyKiBtYW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dldF91c2VyX2NvbnRlbnRfbWFuYWdlciht X3dlYlZpZXcpOworICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQo bWFuYWdlciwgR19TSUdOQUxfTUFUQ0hfREFUQSwgMCwgMCwgMCwgMCwgdGhpcyk7CisgICAgICAg IHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl91bnJlZ2lzdGVyX3NjcmlwdF9tZXNzYWdlX2hh bmRsZXIobWFuYWdlciwgInBlcm1pc3Npb24iKTsKICAgICB9CiAKICAgICBzdGF0aWMgdm9pZCB0 cnlXZWJWaWV3Q2xvc2VDYWxsYmFjayhVSUNsaWVudFRlc3QqIHRlc3QpCkBAIC0yNjksNiArMjgy LDEzIEBAIHB1YmxpYzoKICAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOwogICAg IH0KIAorICAgIGNvbnN0IGNoYXIgKndhaXRVbnRpbFBlcm1pc3Npb25SZXN1bHRNZXNzYWdlUmVj ZWl2ZWQoKQorICAgIHsKKyAgICAgICAgbV9wZXJtaXNzaW9uUmVzdWx0ID0gbnVsbHB0cjsKKyAg ICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOworICAgICAgICByZXR1cm4gbV9wZXJt aXNzaW9uUmVzdWx0LmdldCgpOworICAgIH0KKwogICAgIHZvaWQgc2V0RXhwZWN0ZWRXaW5kb3dQ cm9wZXJ0aWVzKGNvbnN0IFdpbmRvd1Byb3BlcnRpZXMmIHdpbmRvd1Byb3BlcnRpZXMpCiAgICAg ewogICAgICAgICBtX3dpbmRvd1Byb3BlcnRpZXMgPSB3aW5kb3dQcm9wZXJ0aWVzOwpAQCAtMzM2 LDYgKzM1Niw3IEBAIHB1YmxpYzoKICAgICBIYXNoU2V0PFdURjo6U3RyaW5nPiBtX3dpbmRvd1By b3BlcnRpZXNDaGFuZ2VkOwogICAgIEdSZWZQdHI8V2ViS2l0SGl0VGVzdFJlc3VsdD4gbV9tb3Vz ZVRhcmdldEhpdFRlc3RSZXN1bHQ7CiAgICAgdW5zaWduZWQgbV9tb3VzZVRhcmdldE1vZGlmaWVy czsKKyAgICBHVW5pcXVlUHRyPGNoYXI+IG1fcGVybWlzc2lvblJlc3VsdDsKIH07CiAKIHN0YXRp YyB2b2lkIHRlc3RXZWJWaWV3Q3JlYXRlUmVhZHlDbG9zZShVSUNsaWVudFRlc3QqIHRlc3QsIGdj b25zdHBvaW50ZXIpCkBAIC03MjIsMzEgKzc0MywzMyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmll d0dlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RzKFVJQ2xpZW50VGVzdCogdGVzdCwgZ2NvbnN0 cAogICAgICAgICAiICA8c2NyaXB0PiIKICAgICAgICAgIiAgZnVuY3Rpb24gcnVuVGVzdCgpIgog ICAgICAgICAiICB7IgotICAgICAgICAiICAgIG5hdmlnYXRvci5nZW9sb2NhdGlvbi5nZXRDdXJy ZW50UG9zaXRpb24oZnVuY3Rpb24ocCkgeyBkb2N1bWVudC50aXRsZSA9IFwiT0tcIiB9LCIKLSAg ICAgICAgIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bmN0 aW9uKGUpIHsgZG9jdW1lbnQudGl0bGUgPSBlLmNvZGUgfSk7IgorICAgICAgICAiICAgIG5hdmln YXRvci5nZW9sb2NhdGlvbi5nZXRDdXJyZW50UG9zaXRpb24oZnVuY3Rpb24ocCkgeyB3aW5kb3cu d2Via2l0Lm1lc3NhZ2VIYW5kbGVycy5wZXJtaXNzaW9uLnBvc3RNZXNzYWdlKCdPSycpOyB9LCIK KyAgICAgICAgIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1 bmN0aW9uKGUpIHsgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMucGVybWlzc2lvbi5wb3N0 TWVzc2FnZShlLmNvZGUudG9TdHJpbmcoKSk7IH0pOyIKICAgICAgICAgIiAgfSIKICAgICAgICAg IiAgPC9zY3JpcHQ+IgogICAgICAgICAiICA8Ym9keSBvbmxvYWQ9J3J1blRlc3QoKTsnPjwvYm9k eT4iCiAgICAgICAgICI8L2h0bWw+IjsKIAotICAgIC8vIFRlc3QgZGVueWluZyBhIHBlcm1pc3Np b24gcmVxdWVzdC4KKyAgICAvLyBHZW9sb2NhdGlvbiBpcyBub3QgYWxsb3dlZCBmcm9tIGluc2Vj dXJlIGNvbm5lY3Rpb25zIGxpa2UgSFRUUCwKKyAgICAvLyBQT1NJVElPTl9VTkFWQUlMQUJMRSAo JzInKSBpcyByZXR1cm5lZCBpbiB0aGF0IGNhc2Ugd2l0aG91dCBldmVuCisgICAgLy8gYXNraW5n IHRoZSBBUEkgbGF5ZXIuCiAgICAgdGVzdC0+bV9hbGxvd1Blcm1pc3Npb25SZXF1ZXN0cyA9IGZh bHNlOwogICAgIHRlc3QtPmxvYWRIdG1sKGdlb2xvY2F0aW9uUmVxdWVzdEhUTUwsICJodHRwOi8v Zm9vLmNvbS9iYXIiKTsKLSAgICB0ZXN0LT53YWl0VW50aWxUaXRsZUNoYW5nZWQoKTsKKyAgICBj b25zdCBnY2hhciogcmVzdWx0ID0gdGVzdC0+d2FpdFVudGlsUGVybWlzc2lvblJlc3VsdE1lc3Nh Z2VSZWNlaXZlZCgpOworICAgIGdfYXNzZXJ0X2NtcHN0cihyZXN1bHQsID09LCAiMiIpOwogCi0g ICAgLy8gQWNjb3JkaW5nIHRvIHRoZSBHZW9sb2NhdGlvbiBBUEkgc3BlY2lmaWNhdGlvbiwgJzEn IGlzIHRoZQotICAgIC8vIGVycm9yIGNvZGUgcmV0dXJuZWQgZm9yIHRoZSBQRVJNSVNTSU9OX0RF TklFRCBlcnJvci4KLSAgICAvLyBodHRwOi8vZGV2LnczLm9yZy9nZW8vYXBpL3NwZWMtc291cmNl Lmh0bWwjcG9zaXRpb25fZXJyb3JfaW50ZXJmYWNlCi0gICAgY29uc3QgZ2NoYXIqIHJlc3VsdCA9 IHdlYmtpdF93ZWJfdmlld19nZXRfdGl0bGUodGVzdC0+bV93ZWJWaWV3KTsKKyAgICAvLyBUZXN0 IGRlbnlpbmcgYSBwZXJtaXNzaW9uIHJlcXVlc3QuIFBFUk1JU1NJT05fREVOSUVEICgnMScpIGlz CisgICAgLy8gcmV0dXJuZWQgaW4gdGhpcyBjYXNlLgorICAgIHRlc3QtPm1fYWxsb3dQZXJtaXNz aW9uUmVxdWVzdHMgPSBmYWxzZTsKKyAgICB0ZXN0LT5sb2FkSHRtbChnZW9sb2NhdGlvblJlcXVl c3RIVE1MLCAiaHR0cHM6Ly9mb28uY29tL2JhciIpOworICAgIHJlc3VsdCA9IHRlc3QtPndhaXRV bnRpbFBlcm1pc3Npb25SZXN1bHRNZXNzYWdlUmVjZWl2ZWQoKTsKICAgICBnX2Fzc2VydF9jbXBz dHIocmVzdWx0LCA9PSwgIjEiKTsKIAotICAgIC8vIFRlc3QgYWxsb3dpbmcgYSBwZXJtaXNzaW9u IHJlcXVlc3QuCisgICAgLy8gVGVzdCBhbGxvd2luZyBhIHBlcm1pc3Npb24gcmVxdWVzdC4gUmVz dWx0IHNob3VsZCBiZSBkaWZmZXJlbnQKKyAgICAvLyB0byBQRVJNSVNTSU9OX0RFTklFRCAoJzEn KS4KICAgICB0ZXN0LT5tX2FsbG93UGVybWlzc2lvblJlcXVlc3RzID0gdHJ1ZTsKLSAgICB0ZXN0 LT5sb2FkSHRtbChnZW9sb2NhdGlvblJlcXVlc3RIVE1MLCAwKTsKLSAgICB0ZXN0LT53YWl0VW50 aWxUaXRsZUNoYW5nZWQoKTsKLQotICAgIC8vIENoZWNrIHRoYXQgd2UgZGlkIG5vdCBnZXQgdGhl IFBFUk1JU1NJT05fREVOSUVEIGVycm9yIG5vdy4KLSAgICByZXN1bHQgPSB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X3RpdGxlKHRlc3QtPm1fd2ViVmlldyk7CisgICAgdGVzdC0+bG9hZEh0bWwoZ2VvbG9j YXRpb25SZXF1ZXN0SFRNTCwgImh0dHBzOi8vZm9vLmNvbS9iYXIiKTsKKyAgICByZXN1bHQgPSB0 ZXN0LT53YWl0VW50aWxQZXJtaXNzaW9uUmVzdWx0TWVzc2FnZVJlY2VpdmVkKCk7CiAgICAgZ19h c3NlcnRfY21wc3RyKHJlc3VsdCwgIT0sICIxIik7CiAgICAgdGVzdC0+YWRkTG9nRmF0YWxGbGFn KEdfTE9HX0xFVkVMX1dBUk5JTkcpOwogfQo= 280094 2016-05-30 06:23:58 -0700 2016-05-31 00:18:48 -0700 Fix coding style wk2-geolocation-test.diff text/plain 6353 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiYmFk M2NjLi4zNDY0ZDI1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTYtMDUtMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIFRlc3QgL3dlYmtpdDIvV2Vi S2l0V2ViVmlldy9nZW9sb2NhdGlvbi1wZXJtaXNzaW9uLXJlcXVlc3RzIGlzIGZhaWxpbmcgc2lu Y2UgcjIwMTQyMworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTU4MjAwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBpcyBiZWNhdXNlIGdlb2xvY2F0aW9uIGlzIG5vIGxvbmdlciBhbGxvd2VkIGZvciBu b24gc2VjdXJlIHNpdGVzLCBsaWtlIEhUVFAuIEluIHRoYXQgY2FzZQorICAgICAgICBQT1NJVElP Tl9VTkFWQUlMQUJMRSBpcyByZXR1cm5lZCB3aXRob3V0IGFza2luZyB0aGUgQVBJIGxheWVyLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5j cHA6CisgICAgICAgICh0ZXN0V2ViVmlld0dlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RzKTog S2VlcCB0aGUgSFRUUCBjYXNlIHRvIGNoZWNrIHRoYXQgaXQgaW5kZWVkIHJldHVybnMKKyAgICAg ICAgUE9TSVRJT05fVU5BVkFJTEFCTEUgYW5kIHVzZSBIVFRQUyBVUkxzIHRvIGNoZWNrIHBlcm1p c3Npb24gcmVxdWVzdHMgYXJlIGFsbG93ZWQgb3IgZGVuaWVkLiBBbHNvIHN0b3AgdXNpbmcgdGhl CisgICAgICAgIGRvY3VtZW50IHRpdGxlLCBhbmQgdXNlIHVzZXIgc2NyaXB0IG1lc3NhZ2VzIHRo YXQgYXJlIG1vcmUgcmVsaWFibGUgaW5zdGVhZC4KKwogMjAxNi0wNS0yNyAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgTmV3IGludGwtbnVtYmVy Zm9ybWF0LmpzIHRlc3QgZmFpbHMgb24gbWFueSBMaW51eCBwbGF0Zm9ybXMKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0VUlDbGllbnQuY3BwIGIv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5jcHAKaW5k ZXggZmM0OGZhNC4uNzQyMTdkNyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXQyR3RrL1Rlc3RVSUNsaWVudC5jcHAKQEAgLTIyNSw4ICsyMjUsMTUgQEAgcHVi bGljOgogICAgICAgICByZXR1cm4gVFJVRTsKICAgICB9CiAKKyAgICBzdGF0aWMgdm9pZCBwZXJt aXNzaW9uUmVzdWx0TWVzc2FnZVJlY2VpdmVkQ2FsbGJhY2soV2ViS2l0VXNlckNvbnRlbnRNYW5h Z2VyKiB1c2VyQ29udGVudE1hbmFnZXIsIFdlYktpdEphdmFzY3JpcHRSZXN1bHQqIGphdmFzY3Jp cHRSZXN1bHQsIFVJQ2xpZW50VGVzdCogdGVzdCkKKyAgICB7CisgICAgICAgIHRlc3QtPm1fcGVy bWlzc2lvblJlc3VsdC5yZXNldChXZWJWaWV3VGVzdDo6amF2YXNjcmlwdFJlc3VsdFRvQ1N0cmlu ZyhqYXZhc2NyaXB0UmVzdWx0KSk7CisgICAgICAgIGdfbWFpbl9sb29wX3F1aXQodGVzdC0+bV9t YWluTG9vcCk7CisgICAgfQorCiAgICAgVUlDbGllbnRUZXN0KCkKLSAgICAgICAgOiBtX3Njcmlw dERpYWxvZ1R5cGUoV0VCS0lUX1NDUklQVF9ESUFMT0dfQUxFUlQpCisgICAgICAgIDogV2ViVmll d1Rlc3Qod2Via2l0X3VzZXJfY29udGVudF9tYW5hZ2VyX25ldygpKQorICAgICAgICAsIG1fc2Ny aXB0RGlhbG9nVHlwZShXRUJLSVRfU0NSSVBUX0RJQUxPR19BTEVSVCkKICAgICAgICAgLCBtX3Nj cmlwdERpYWxvZ0NvbmZpcm1lZCh0cnVlKQogICAgICAgICAsIG1fYWxsb3dQZXJtaXNzaW9uUmVx dWVzdHMoZmFsc2UpCiAgICAgICAgICwgbV92ZXJpZnlNZWRpYVR5cGVzKGZhbHNlKQpAQCAtMjM5 LDExICsyNDYsMTcgQEAgcHVibGljOgogICAgICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2ViVmll dywgInNjcmlwdC1kaWFsb2ciLCBHX0NBTExCQUNLKHNjcmlwdERpYWxvZyksIHRoaXMpOwogICAg ICAgICBnX3NpZ25hbF9jb25uZWN0KG1fd2ViVmlldywgIm1vdXNlLXRhcmdldC1jaGFuZ2VkIiwg R19DQUxMQkFDSyhtb3VzZVRhcmdldENoYW5nZWQpLCB0aGlzKTsKICAgICAgICAgZ19zaWduYWxf Y29ubmVjdChtX3dlYlZpZXcsICJwZXJtaXNzaW9uLXJlcXVlc3QiLCBHX0NBTExCQUNLKHBlcm1p c3Npb25SZXF1ZXN0ZWQpLCB0aGlzKTsKKyAgICAgICAgV2ViS2l0VXNlckNvbnRlbnRNYW5hZ2Vy KiBtYW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dldF91c2VyX2NvbnRlbnRfbWFuYWdlcihtX3dl YlZpZXcpOworICAgICAgICB3ZWJraXRfdXNlcl9jb250ZW50X21hbmFnZXJfcmVnaXN0ZXJfc2Ny aXB0X21lc3NhZ2VfaGFuZGxlcihtYW5hZ2VyLCAicGVybWlzc2lvbiIpOworICAgICAgICBnX3Np Z25hbF9jb25uZWN0KG1hbmFnZXIsICJzY3JpcHQtbWVzc2FnZS1yZWNlaXZlZDo6cGVybWlzc2lv biIsIEdfQ0FMTEJBQ0socGVybWlzc2lvblJlc3VsdE1lc3NhZ2VSZWNlaXZlZENhbGxiYWNrKSwg dGhpcyk7CiAgICAgfQogCiAgICAgflVJQ2xpZW50VGVzdCgpCiAgICAgewogICAgICAgICBnX3Np Z25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQobV93ZWJWaWV3LCBHX1NJR05BTF9NQVRD SF9EQVRBLCAwLCAwLCAwLCAwLCB0aGlzKTsKKyAgICAgICAgV2ViS2l0VXNlckNvbnRlbnRNYW5h Z2VyKiBtYW5hZ2VyID0gd2Via2l0X3dlYl92aWV3X2dldF91c2VyX2NvbnRlbnRfbWFuYWdlciht X3dlYlZpZXcpOworICAgICAgICBnX3NpZ25hbF9oYW5kbGVyc19kaXNjb25uZWN0X21hdGNoZWQo bWFuYWdlciwgR19TSUdOQUxfTUFUQ0hfREFUQSwgMCwgMCwgMCwgMCwgdGhpcyk7CisgICAgICAg IHdlYmtpdF91c2VyX2NvbnRlbnRfbWFuYWdlcl91bnJlZ2lzdGVyX3NjcmlwdF9tZXNzYWdlX2hh bmRsZXIobWFuYWdlciwgInBlcm1pc3Npb24iKTsKICAgICB9CiAKICAgICBzdGF0aWMgdm9pZCB0 cnlXZWJWaWV3Q2xvc2VDYWxsYmFjayhVSUNsaWVudFRlc3QqIHRlc3QpCkBAIC0yNjksNiArMjgy LDEzIEBAIHB1YmxpYzoKICAgICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOwogICAg IH0KIAorICAgIGNvbnN0IGNoYXIqIHdhaXRVbnRpbFBlcm1pc3Npb25SZXN1bHRNZXNzYWdlUmVj ZWl2ZWQoKQorICAgIHsKKyAgICAgICAgbV9wZXJtaXNzaW9uUmVzdWx0ID0gbnVsbHB0cjsKKyAg ICAgICAgZ19tYWluX2xvb3BfcnVuKG1fbWFpbkxvb3ApOworICAgICAgICByZXR1cm4gbV9wZXJt aXNzaW9uUmVzdWx0LmdldCgpOworICAgIH0KKwogICAgIHZvaWQgc2V0RXhwZWN0ZWRXaW5kb3dQ cm9wZXJ0aWVzKGNvbnN0IFdpbmRvd1Byb3BlcnRpZXMmIHdpbmRvd1Byb3BlcnRpZXMpCiAgICAg ewogICAgICAgICBtX3dpbmRvd1Byb3BlcnRpZXMgPSB3aW5kb3dQcm9wZXJ0aWVzOwpAQCAtMzM2 LDYgKzM1Niw3IEBAIHB1YmxpYzoKICAgICBIYXNoU2V0PFdURjo6U3RyaW5nPiBtX3dpbmRvd1By b3BlcnRpZXNDaGFuZ2VkOwogICAgIEdSZWZQdHI8V2ViS2l0SGl0VGVzdFJlc3VsdD4gbV9tb3Vz ZVRhcmdldEhpdFRlc3RSZXN1bHQ7CiAgICAgdW5zaWduZWQgbV9tb3VzZVRhcmdldE1vZGlmaWVy czsKKyAgICBHVW5pcXVlUHRyPGNoYXI+IG1fcGVybWlzc2lvblJlc3VsdDsKIH07CiAKIHN0YXRp YyB2b2lkIHRlc3RXZWJWaWV3Q3JlYXRlUmVhZHlDbG9zZShVSUNsaWVudFRlc3QqIHRlc3QsIGdj b25zdHBvaW50ZXIpCkBAIC03MjIsMzEgKzc0MywzMyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmll d0dlb2xvY2F0aW9uUGVybWlzc2lvblJlcXVlc3RzKFVJQ2xpZW50VGVzdCogdGVzdCwgZ2NvbnN0 cAogICAgICAgICAiICA8c2NyaXB0PiIKICAgICAgICAgIiAgZnVuY3Rpb24gcnVuVGVzdCgpIgog ICAgICAgICAiICB7IgotICAgICAgICAiICAgIG5hdmlnYXRvci5nZW9sb2NhdGlvbi5nZXRDdXJy ZW50UG9zaXRpb24oZnVuY3Rpb24ocCkgeyBkb2N1bWVudC50aXRsZSA9IFwiT0tcIiB9LCIKLSAg ICAgICAgIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1bmN0 aW9uKGUpIHsgZG9jdW1lbnQudGl0bGUgPSBlLmNvZGUgfSk7IgorICAgICAgICAiICAgIG5hdmln YXRvci5nZW9sb2NhdGlvbi5nZXRDdXJyZW50UG9zaXRpb24oZnVuY3Rpb24ocCkgeyB3aW5kb3cu d2Via2l0Lm1lc3NhZ2VIYW5kbGVycy5wZXJtaXNzaW9uLnBvc3RNZXNzYWdlKCdPSycpOyB9LCIK KyAgICAgICAgIiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZ1 bmN0aW9uKGUpIHsgd2luZG93LndlYmtpdC5tZXNzYWdlSGFuZGxlcnMucGVybWlzc2lvbi5wb3N0 TWVzc2FnZShlLmNvZGUudG9TdHJpbmcoKSk7IH0pOyIKICAgICAgICAgIiAgfSIKICAgICAgICAg IiAgPC9zY3JpcHQ+IgogICAgICAgICAiICA8Ym9keSBvbmxvYWQ9J3J1blRlc3QoKTsnPjwvYm9k eT4iCiAgICAgICAgICI8L2h0bWw+IjsKIAotICAgIC8vIFRlc3QgZGVueWluZyBhIHBlcm1pc3Np b24gcmVxdWVzdC4KKyAgICAvLyBHZW9sb2NhdGlvbiBpcyBub3QgYWxsb3dlZCBmcm9tIGluc2Vj dXJlIGNvbm5lY3Rpb25zIGxpa2UgSFRUUCwKKyAgICAvLyBQT1NJVElPTl9VTkFWQUlMQUJMRSAo JzInKSBpcyByZXR1cm5lZCBpbiB0aGF0IGNhc2Ugd2l0aG91dCBldmVuCisgICAgLy8gYXNraW5n IHRoZSBBUEkgbGF5ZXIuCiAgICAgdGVzdC0+bV9hbGxvd1Blcm1pc3Npb25SZXF1ZXN0cyA9IGZh bHNlOwogICAgIHRlc3QtPmxvYWRIdG1sKGdlb2xvY2F0aW9uUmVxdWVzdEhUTUwsICJodHRwOi8v Zm9vLmNvbS9iYXIiKTsKLSAgICB0ZXN0LT53YWl0VW50aWxUaXRsZUNoYW5nZWQoKTsKKyAgICBj b25zdCBnY2hhciogcmVzdWx0ID0gdGVzdC0+d2FpdFVudGlsUGVybWlzc2lvblJlc3VsdE1lc3Nh Z2VSZWNlaXZlZCgpOworICAgIGdfYXNzZXJ0X2NtcHN0cihyZXN1bHQsID09LCAiMiIpOwogCi0g ICAgLy8gQWNjb3JkaW5nIHRvIHRoZSBHZW9sb2NhdGlvbiBBUEkgc3BlY2lmaWNhdGlvbiwgJzEn IGlzIHRoZQotICAgIC8vIGVycm9yIGNvZGUgcmV0dXJuZWQgZm9yIHRoZSBQRVJNSVNTSU9OX0RF TklFRCBlcnJvci4KLSAgICAvLyBodHRwOi8vZGV2LnczLm9yZy9nZW8vYXBpL3NwZWMtc291cmNl Lmh0bWwjcG9zaXRpb25fZXJyb3JfaW50ZXJmYWNlCi0gICAgY29uc3QgZ2NoYXIqIHJlc3VsdCA9 IHdlYmtpdF93ZWJfdmlld19nZXRfdGl0bGUodGVzdC0+bV93ZWJWaWV3KTsKKyAgICAvLyBUZXN0 IGRlbnlpbmcgYSBwZXJtaXNzaW9uIHJlcXVlc3QuIFBFUk1JU1NJT05fREVOSUVEICgnMScpIGlz CisgICAgLy8gcmV0dXJuZWQgaW4gdGhpcyBjYXNlLgorICAgIHRlc3QtPm1fYWxsb3dQZXJtaXNz aW9uUmVxdWVzdHMgPSBmYWxzZTsKKyAgICB0ZXN0LT5sb2FkSHRtbChnZW9sb2NhdGlvblJlcXVl c3RIVE1MLCAiaHR0cHM6Ly9mb28uY29tL2JhciIpOworICAgIHJlc3VsdCA9IHRlc3QtPndhaXRV bnRpbFBlcm1pc3Npb25SZXN1bHRNZXNzYWdlUmVjZWl2ZWQoKTsKICAgICBnX2Fzc2VydF9jbXBz dHIocmVzdWx0LCA9PSwgIjEiKTsKIAotICAgIC8vIFRlc3QgYWxsb3dpbmcgYSBwZXJtaXNzaW9u IHJlcXVlc3QuCisgICAgLy8gVGVzdCBhbGxvd2luZyBhIHBlcm1pc3Npb24gcmVxdWVzdC4gUmVz dWx0IHNob3VsZCBiZSBkaWZmZXJlbnQKKyAgICAvLyB0byBQRVJNSVNTSU9OX0RFTklFRCAoJzEn KS4KICAgICB0ZXN0LT5tX2FsbG93UGVybWlzc2lvblJlcXVlc3RzID0gdHJ1ZTsKLSAgICB0ZXN0 LT5sb2FkSHRtbChnZW9sb2NhdGlvblJlcXVlc3RIVE1MLCAwKTsKLSAgICB0ZXN0LT53YWl0VW50 aWxUaXRsZUNoYW5nZWQoKTsKLQotICAgIC8vIENoZWNrIHRoYXQgd2UgZGlkIG5vdCBnZXQgdGhl IFBFUk1JU1NJT05fREVOSUVEIGVycm9yIG5vdy4KLSAgICByZXN1bHQgPSB3ZWJraXRfd2ViX3Zp ZXdfZ2V0X3RpdGxlKHRlc3QtPm1fd2ViVmlldyk7CisgICAgdGVzdC0+bG9hZEh0bWwoZ2VvbG9j YXRpb25SZXF1ZXN0SFRNTCwgImh0dHBzOi8vZm9vLmNvbS9iYXIiKTsKKyAgICByZXN1bHQgPSB0 ZXN0LT53YWl0VW50aWxQZXJtaXNzaW9uUmVzdWx0TWVzc2FnZVJlY2VpdmVkKCk7CiAgICAgZ19h c3NlcnRfY21wc3RyKHJlc3VsdCwgIT0sICIxIik7CiAgICAgdGVzdC0+YWRkTG9nRmF0YWxGbGFn KEdfTE9HX0xFVkVMX1dBUk5JTkcpOwogfQo=