117827 2013-06-20 05:14:40 -0700 [BlackBerry] Handle testRunner.setWillSendRequestReturnsNull() in DRT 2013-06-20 10:14:58 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cgarcia webkit-unassigned commit-queue rwlbuis xan.lopez oldest_to_newest 902094 0 cgarcia 2013-06-20 05:14:40 -0700 It's not currently handled making some tests that use it fail. 902095 1 205074 cgarcia 2013-06-20 05:21:17 -0700 Created attachment 205074 Patch 902152 2 205074 rwlbuis 2013-06-20 07:46:45 -0700 Comment on attachment 205074 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=205074&action=review > Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp:630 > + } Could this method just return bool? Is it possible for request to be null coming in? Also if the above two blocks can be combined you don't need the return. 902169 3 205097 cgarcia 2013-06-20 09:07:34 -0700 Created attachment 205097 Updated patch 902175 4 205097 rwlbuis 2013-06-20 09:09:32 -0700 Comment on attachment 205097 Updated patch LGTM. 902197 5 205097 commit-queue 2013-06-20 10:14:56 -0700 Comment on attachment 205097 Updated patch Clearing flags on attachment: 205097 Committed r151780: <http://trac.webkit.org/changeset/151780> 902198 6 commit-queue 2013-06-20 10:14:58 -0700 All reviewed patches have been landed. Closing bug. 205074 2013-06-20 05:21:17 -0700 2013-06-20 09:07:34 -0700 Patch bb-drt-will-send-request.diff text/plain 5944 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvRHVtcFJlbmRlclRyZWVD bGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvRHVtcFJlbmRlclRyZWVDbGll bnQuaAppbmRleCBlMDM4NWQxLi5hYjg2ZWRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL0R1bXBSZW5kZXJUcmVlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9EdW1wUmVuZGVyVHJlZUNsaWVudC5oCkBAIC00Niw2ICs0Niw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcnVuVGVzdHMoKSA9IDA7CiAKICAgICAvLyBGcmFtZUxv YWRlckNsaWVudCBkZWxlZ2F0ZXMKKyAgICB2aXJ0dWFsIHZvaWQgd2lsbFNlbmRSZXF1ZXN0Rm9y RnJhbWUoV2ViQ29yZTo6RnJhbWUqLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRTdGFy dFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdlYkNvcmU6OkZyYW1lKikgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2VGb3JGcmFtZShXZWJDb3JlOjpGcmFtZSosIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENv bW1pdExvYWRGb3JGcmFtZShXZWJDb3JlOjpGcmFtZSopID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv Q2hhbmdlTG9nCmluZGV4IGMwMWI2YmQuLjA0YjMzZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA2LTIwICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gSGFuZGxlIHRl c3RSdW5uZXIuc2V0V2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGwoKSBpbiBEUlQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzgyNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBEdW1wUmVuZGVyVHJl ZUNsaWVudDo6d2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUoKSB0byBoYW5kbGUKKyAgICAgICAgZGlz cGF0Y2hXaWxsU2VuZFJlcXVlc3QoKSBpbiBEUlQuCisKKyAgICAgICAgRml4ZXMgdGVzdHMKKyAg ICAgICAgZmFzdC9sb2FkZXIvb25sb2FkLXdpbGxTZW5kUmVxdWVzdC1udWxsLWZvci1zY3JpcHQu aHRtbCBhbmQKKyAgICAgICAgZmFzdC9sb2FkZXIvd2lsbFNlbmRSZXF1ZXN0LW51bGwtZm9yLXBy ZWxvYWQuaHRtbC4KKworICAgICAgICAqIEFwaS9EdW1wUmVuZGVyVHJlZUNsaWVudC5oOgorICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNoV2ls bFNlbmRSZXF1ZXN0KToKKwogMjAxMy0wNi0xNyAgVGlhbmNoZW5nIEppYW5nICA8dGlqaWFuZ0By aW0uY29tPgogCiAgICAgICAgIENhY2hlIEZhdEZpbmdlciBUZXh0IFJlc3VsdC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggOWViMTRjZS4uZDdmNjk2 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTk2 MCw3ICs5NjAsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6ZGV0YWNoZWRG cm9tUGFyZW50MigpCiAgICAgbV93ZWJQYWdlUHJpdmF0ZSA9IDA7CiB9CiAKLXZvaWQgRnJhbWVM b2FkZXJDbGllbnRCbGFja0JlcnJ5OjpkaXNwYXRjaFdpbGxTZW5kUmVxdWVzdChEb2N1bWVudExv YWRlciogZG9jTG9hZGVyLCBsb25nIHVuc2lnbmVkLCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKQordm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnk6OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBkb2NMb2FkZXIsIGxv bmcgdW5zaWduZWQsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVkaXJlY3RSZXNwb25zZSkKIHsKICAgICAvLyBJZiB0aGUgcmVxdWVzdCBpcyBiZWlu ZyBsb2FkZWQgYnkgdGhlIHByb3Zpc2lvbmFsIGRvY3VtZW50IGxvYWRlciwgdGhlbgogICAgIC8v IGl0IGlzIGEgbmV3IHRvcCBsZXZlbCByZXF1ZXN0IHdoaWNoIGhhcyBub3QgYmVlbiBjb21taXRl ZC4KQEAgLTk4MCw2ICs5ODAsMTMgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6 OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBkb2NMb2EKICAgICAgICAg QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyBoZWFkZXJWYWx1ZVN0cmluZyA9IGl0LT5zZWNv bmQ7CiAgICAgICAgIHJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkKFN0cmluZzo6ZnJvbVVURjhX aXRoTGF0aW4xRmFsbGJhY2soaGVhZGVyU3RyaW5nLmRhdGEoKSwgaGVhZGVyU3RyaW5nLmxlbmd0 aCgpKSwgU3RyaW5nOjpmcm9tVVRGOFdpdGhMYXRpbjFGYWxsYmFjayhoZWFkZXJWYWx1ZVN0cmlu Zy5kYXRhKCksIGhlYWRlclZhbHVlU3RyaW5nLmxlbmd0aCgpKSk7CiAgICAgfQorCisgICAgaWYg KG1fd2ViUGFnZVByaXZhdGUtPm1fZHVtcFJlbmRlclRyZWUpIHsKKyAgICAgICAgbV93ZWJQYWdl UHJpdmF0ZS0+bV9kdW1wUmVuZGVyVHJlZS0+d2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUobV9mcmFt ZSwgcmVxdWVzdCwgcmVkaXJlY3RSZXNwb25zZSk7CisgICAgICAgIGlmIChyZXF1ZXN0LmlzTnVs bCgpKQorICAgICAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmICghaXNNYWluUmVzb3Vy Y2VMb2FkKSB7CiAgICAgICAgIC8vIERvIG5vdGhpbmcgZm9yIG5vdy4KICAgICAgICAgLy8gQW55 IHByb2Nlc3Npbmcgd2hpY2ggaXMgZG9uZSBvbmx5IGZvciBzdWJyZXNvdXJjZXMgc2hvdWxkIGdv IGhlcmUuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5k ZXggOWFjNTM5ZC4uMmFjYjM2YSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rv b2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTA2LTIwICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gSGFu ZGxlIHRlc3RSdW5uZXIuc2V0V2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGwoKSBpbiBEUlQKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzgyNworCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc2V0IHRoZSBw YXNzZWQgaW4gcmVxdWVzdCBpZiB3aWxsU2VuZFJlcXVlc3RSZXR1cm5zTnVsbCgpIGlzCisgICAg ICAgIHRydWUgb3Igd2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGxPblJlZGlyZWN0KCkgaXMgdHJ1 ZSBhbmQgaXQncyBhCisgICAgICAgIHJlZGlyZWN0aW9uLgorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZS5jcHA6CisgICAgICAgIChCbGFja0JlcnJ5 OjpXZWJLaXQ6OkR1bXBSZW5kZXJUcmVlOjp3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZSk6CisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZUJsYWNrQmVycnku aDoKKwogMjAxMy0wNi0xOCAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkBhcHBsZS5j b20+CiAKICAgICAgICAgV29ya2luZyBvbiBjb3ZlcmFnZSBzY3JpcHQsIGFkZGVkIHhtbCB0byBq c29uIGRhdGEgZXh0cmFjdGlvbiBzY3JpcHQuCmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVl L2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWUuY3BwCmluZGV4IGVjNWJkOTYuLmExMGRiMWQgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWUu Y3BwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWUu Y3BwCkBAIC02MTcsNiArNjE3LDE5IEBAIHZvaWQgRHVtcFJlbmRlclRyZWU6OmxvY2F0aW9uQ2hh bmdlRm9yRnJhbWUoV2ViQ29yZTo6RnJhbWUqIGZyYW1lKQogfQogCiAvLyBGcmFtZUxvYWRDbGll bnQgZGVsZWdhdGVzLgordm9pZCBEdW1wUmVuZGVyVHJlZTo6d2lsbFNlbmRSZXF1ZXN0Rm9yRnJh bWUoV2ViQ29yZTo6RnJhbWUqLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIGNv bnN0IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmIHJlZGlyZWN0UmVzcG9uc2UpCit7CisgICAg aWYgKCF0ZXN0RG9uZSAmJiBnVGVzdFJ1bm5lci0+d2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGwo KSkgeworICAgICAgICByZXF1ZXN0ID0gV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0KCk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoIXRlc3REb25lICYmIGdUZXN0UnVubmVyLT53 aWxsU2VuZFJlcXVlc3RSZXR1cm5zTnVsbE9uUmVkaXJlY3QoKSAmJiAhcmVkaXJlY3RSZXNwb25z ZS5pc051bGwoKSkgeworICAgICAgICByZXF1ZXN0ID0gV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0 KCk7CisgICAgICAgIHJldHVybjsKKyAgICB9Cit9CisKIHZvaWQgRHVtcFJlbmRlclRyZWU6OmRp ZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2ViQ29yZTo6RnJhbWUqIGZyYW1lKQogewog ICAgIGlmICghdGVzdERvbmUgJiYgZ1Rlc3RSdW5uZXItPmR1bXBGcmFtZUxvYWRDYWxsYmFja3Mo KSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRl clRyZWVCbGFja0JlcnJ5LmggYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0R1bXBS ZW5kZXJUcmVlQmxhY2tCZXJyeS5oCmluZGV4IDI2N2M0ZGMuLjdmMjBkM2IgMTAwNjQ0Ci0tLSBh L1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWVCbGFja0JlcnJ5 LmgKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZUJs YWNrQmVycnkuaApAQCAtNjMsNiArNjMsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBsb2FkRmluaXNo ZWQoKSBjb25zdCB7IHJldHVybiBtX2xvYWRGaW5pc2hlZDsgfQogCiAgICAgLy8gRnJhbWVMb2Fk ZXJDbGllbnQgZGVsZWdhdGVzCisgICAgdm9pZCB3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZShXZWJD b3JlOjpGcmFtZSosIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCYsIGNvbnN0IFdlYkNvcmU6OlJl c291cmNlUmVzcG9uc2UmKTsKICAgICB2b2lkIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUoV2ViQ29yZTo6RnJhbWUqKTsKICAgICB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZShXZWJD b3JlOjpGcmFtZSopOwogICAgIHZvaWQgZGlkRmFpbFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdl YkNvcmU6OkZyYW1lKik7Cg== 205097 2013-06-20 09:07:34 -0700 2013-06-20 10:14:56 -0700 Updated patch bb-drt-will-send-request2.diff text/plain 5859 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvRHVtcFJlbmRlclRyZWVD bGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9BcGkvRHVtcFJlbmRlclRyZWVDbGll bnQuaAppbmRleCBlMDM4NWQxLi41NDAzMThmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Js YWNrYmVycnkvQXBpL0R1bXBSZW5kZXJUcmVlQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYktpdC9i bGFja2JlcnJ5L0FwaS9EdW1wUmVuZGVyVHJlZUNsaWVudC5oCkBAIC00Niw2ICs0Niw3IEBAIHB1 YmxpYzoKICAgICB2aXJ0dWFsIHZvaWQgcnVuVGVzdHMoKSA9IDA7CiAKICAgICAvLyBGcmFtZUxv YWRlckNsaWVudCBkZWxlZ2F0ZXMKKyAgICB2aXJ0dWFsIGJvb2wgd2lsbFNlbmRSZXF1ZXN0Rm9y RnJhbWUoV2ViQ29yZTo6RnJhbWUqLCBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3QmLCBjb25zdCBX ZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlJikgPSAwOwogICAgIHZpcnR1YWwgdm9pZCBkaWRTdGFy dFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdlYkNvcmU6OkZyYW1lKikgPSAwOwogICAgIHZpcnR1 YWwgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2VGb3JGcmFtZShXZWJDb3JlOjpGcmFtZSosIGNvbnN0 IFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2UmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENv bW1pdExvYWRGb3JGcmFtZShXZWJDb3JlOjpGcmFtZSopID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2JsYWNrYmVycnkv Q2hhbmdlTG9nCmluZGV4IGMwMWI2YmQuLjA0YjMzZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvYmxhY2tiZXJyeS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L0No YW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTA2LTIwICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBbQmxhY2tCZXJyeV0gSGFuZGxlIHRl c3RSdW5uZXIuc2V0V2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGwoKSBpbiBEUlQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNzgyNworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBEdW1wUmVuZGVyVHJl ZUNsaWVudDo6d2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUoKSB0byBoYW5kbGUKKyAgICAgICAgZGlz cGF0Y2hXaWxsU2VuZFJlcXVlc3QoKSBpbiBEUlQuCisKKyAgICAgICAgRml4ZXMgdGVzdHMKKyAg ICAgICAgZmFzdC9sb2FkZXIvb25sb2FkLXdpbGxTZW5kUmVxdWVzdC1udWxsLWZvci1zY3JpcHQu aHRtbCBhbmQKKyAgICAgICAgZmFzdC9sb2FkZXIvd2lsbFNlbmRSZXF1ZXN0LW51bGwtZm9yLXBy ZWxvYWQuaHRtbC4KKworICAgICAgICAqIEFwaS9EdW1wUmVuZGVyVHJlZUNsaWVudC5oOgorICAg ICAgICAqIFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6OmRpc3BhdGNoV2ls bFNlbmRSZXF1ZXN0KToKKwogMjAxMy0wNi0xNyAgVGlhbmNoZW5nIEppYW5nICA8dGlqaWFuZ0By aW0uY29tPgogCiAgICAgICAgIENhY2hlIEZhdEZpbmdlciBUZXh0IFJlc3VsdC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvYmxhY2tiZXJyeS9XZWJDb3JlU3VwcG9ydC9GcmFtZUxvYWRlckNs aWVudEJsYWNrQmVycnkuY3BwIGIvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBw b3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKaW5kZXggOWViMTRjZS4uNGJiODdl YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ibGFja2JlcnJ5L1dlYkNvcmVTdXBwb3J0L0Zy YW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9ibGFja2Jl cnJ5L1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeS5jcHAKQEAgLTk2 MCw3ICs5NjAsNyBAQCB2b2lkIEZyYW1lTG9hZGVyQ2xpZW50QmxhY2tCZXJyeTo6ZGV0YWNoZWRG cm9tUGFyZW50MigpCiAgICAgbV93ZWJQYWdlUHJpdmF0ZSA9IDA7CiB9CiAKLXZvaWQgRnJhbWVM b2FkZXJDbGllbnRCbGFja0JlcnJ5OjpkaXNwYXRjaFdpbGxTZW5kUmVxdWVzdChEb2N1bWVudExv YWRlciogZG9jTG9hZGVyLCBsb25nIHVuc2lnbmVkLCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IGNvbnN0IFJlc291cmNlUmVzcG9uc2UmKQordm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVy cnk6OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBkb2NMb2FkZXIsIGxv bmcgdW5zaWduZWQsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNw b25zZSYgcmVkaXJlY3RSZXNwb25zZSkKIHsKICAgICAvLyBJZiB0aGUgcmVxdWVzdCBpcyBiZWlu ZyBsb2FkZWQgYnkgdGhlIHByb3Zpc2lvbmFsIGRvY3VtZW50IGxvYWRlciwgdGhlbgogICAgIC8v IGl0IGlzIGEgbmV3IHRvcCBsZXZlbCByZXF1ZXN0IHdoaWNoIGhhcyBub3QgYmVlbiBjb21taXRl ZC4KQEAgLTk4MCw2ICs5ODAsMTIgQEAgdm9pZCBGcmFtZUxvYWRlckNsaWVudEJsYWNrQmVycnk6 OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBkb2NMb2EKICAgICAgICAg QmxhY2tCZXJyeTo6UGxhdGZvcm06OlN0cmluZyBoZWFkZXJWYWx1ZVN0cmluZyA9IGl0LT5zZWNv bmQ7CiAgICAgICAgIHJlcXVlc3Quc2V0SFRUUEhlYWRlckZpZWxkKFN0cmluZzo6ZnJvbVVURjhX aXRoTGF0aW4xRmFsbGJhY2soaGVhZGVyU3RyaW5nLmRhdGEoKSwgaGVhZGVyU3RyaW5nLmxlbmd0 aCgpKSwgU3RyaW5nOjpmcm9tVVRGOFdpdGhMYXRpbjFGYWxsYmFjayhoZWFkZXJWYWx1ZVN0cmlu Zy5kYXRhKCksIGhlYWRlclZhbHVlU3RyaW5nLmxlbmd0aCgpKSk7CiAgICAgfQorCisgICAgaWYg KG1fd2ViUGFnZVByaXZhdGUtPm1fZHVtcFJlbmRlclRyZWUpIHsKKyAgICAgICAgaWYgKCFtX3dl YlBhZ2VQcml2YXRlLT5tX2R1bXBSZW5kZXJUcmVlLT53aWxsU2VuZFJlcXVlc3RGb3JGcmFtZSht X2ZyYW1lLCByZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlKSkKKyAgICAgICAgICAgIHJldHVybjsK KyAgICB9CisKICAgICBpZiAoIWlzTWFpblJlc291cmNlTG9hZCkgewogICAgICAgICAvLyBEbyBu b3RoaW5nIGZvciBub3cuCiAgICAgICAgIC8vIEFueSBwcm9jZXNzaW5nIHdoaWNoIGlzIGRvbmUg b25seSBmb3Igc3VicmVzb3VyY2VzIHNob3VsZCBnbyBoZXJlLgpkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDlhYzUzOWQuLjJhY2IzNmEgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx OCBAQAorMjAxMy0wNi0yMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEhhbmRsZSB0ZXN0UnVubmVyLnNldFdpbGxTZW5k UmVxdWVzdFJldHVybnNOdWxsKCkgaW4gRFJUCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xMTc4MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZXNldCB0aGUgcGFzc2VkIGluIHJlcXVlc3QgaWYgd2lsbFNl bmRSZXF1ZXN0UmV0dXJuc051bGwoKSBpcworICAgICAgICB0cnVlIG9yIHdpbGxTZW5kUmVxdWVz dFJldHVybnNOdWxsT25SZWRpcmVjdCgpIGlzIHRydWUgYW5kIGl0J3MgYQorICAgICAgICByZWRp cmVjdGlvbi4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRl clRyZWUuY3BwOgorICAgICAgICAoQmxhY2tCZXJyeTo6V2ViS2l0OjpEdW1wUmVuZGVyVHJlZTo6 d2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2JsYWNr YmVycnkvRHVtcFJlbmRlclRyZWVCbGFja0JlcnJ5Lmg6CisKIDIwMTMtMDYtMTggIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5AYXBwbGUuY29tPgogCiAgICAgICAgIFdvcmtpbmcgb24g Y292ZXJhZ2Ugc2NyaXB0LCBhZGRlZCB4bWwgdG8ganNvbiBkYXRhIGV4dHJhY3Rpb24gc2NyaXB0 LgpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVy VHJlZS5jcHAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVl LmNwcAppbmRleCBlYzViZDk2Li5kN2ExMWViIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVy VHJlZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNjE3LDYgKzYxNywxNiBAQCB2 b2lkIER1bXBSZW5kZXJUcmVlOjpsb2NhdGlvbkNoYW5nZUZvckZyYW1lKFdlYkNvcmU6OkZyYW1l KiBmcmFtZSkKIH0KIAogLy8gRnJhbWVMb2FkQ2xpZW50IGRlbGVnYXRlcy4KK2Jvb2wgRHVtcFJl bmRlclRyZWU6OndpbGxTZW5kUmVxdWVzdEZvckZyYW1lKFdlYkNvcmU6OkZyYW1lKiBmcmFtZSwg V2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBXZWJDb3JlOjpSZXNvdXJj ZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQoreworICAgIGlmICghdGVzdERvbmUgJiYgKGdU ZXN0UnVubmVyLT53aWxsU2VuZFJlcXVlc3RSZXR1cm5zTnVsbCgpIHx8IChnVGVzdFJ1bm5lci0+ d2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGxPblJlZGlyZWN0KCkgJiYgIXJlZGlyZWN0UmVzcG9u c2UuaXNOdWxsKCkpKSkgeworICAgICAgICByZXF1ZXN0ID0gV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0KCk7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9CisKKyAgICByZXR1cm4gdHJ1ZTsK K30KKwogdm9pZCBEdW1wUmVuZGVyVHJlZTo6ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFt ZShXZWJDb3JlOjpGcmFtZSogZnJhbWUpCiB7CiAgICAgaWYgKCF0ZXN0RG9uZSAmJiBnVGVzdFJ1 bm5lci0+ZHVtcEZyYW1lTG9hZENhbGxiYWNrcygpKQpkaWZmIC0tZ2l0IGEvVG9vbHMvRHVtcFJl bmRlclRyZWUvYmxhY2tiZXJyeS9EdW1wUmVuZGVyVHJlZUJsYWNrQmVycnkuaCBiL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL2JsYWNrYmVycnkvRHVtcFJlbmRlclRyZWVCbGFja0JlcnJ5LmgKaW5kZXgg MjY3YzRkYy4uMGNiNmJjMCAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvYmxhY2ti ZXJyeS9EdW1wUmVuZGVyVHJlZUJsYWNrQmVycnkuaAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJl ZS9ibGFja2JlcnJ5L0R1bXBSZW5kZXJUcmVlQmxhY2tCZXJyeS5oCkBAIC02Myw2ICs2Myw3IEBA IHB1YmxpYzoKICAgICBib29sIGxvYWRGaW5pc2hlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbG9hZEZp bmlzaGVkOyB9CiAKICAgICAvLyBGcmFtZUxvYWRlckNsaWVudCBkZWxlZ2F0ZXMKKyAgICBib29s IHdpbGxTZW5kUmVxdWVzdEZvckZyYW1lKFdlYkNvcmU6OkZyYW1lKiwgV2ViQ29yZTo6UmVzb3Vy Y2VSZXF1ZXN0JiwgY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZSYpOwogICAgIHZvaWQg ZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZShXZWJDb3JlOjpGcmFtZSopOwogICAgIHZv aWQgZGlkQ29tbWl0TG9hZEZvckZyYW1lKFdlYkNvcmU6OkZyYW1lKik7CiAgICAgdm9pZCBkaWRG YWlsUHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV2ViQ29yZTo6RnJhbWUqKTsK