146458 2015-06-30 09:40:43 -0700 [Streams API] Remove ReadableStream and Reader cancel() custom binding 2015-07-03 00:29:11 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 youennf youennf commit-queue oldest_to_newest 1105696 0 youennf 2015-06-30 09:40:43 -0700 We should remove as much custom binding as possible 1106028 1 255911 youennf 2015-07-01 01:56:49 -0700 Created attachment 255911 Patch 1106379 2 256007 youennf 2015-07-02 06:44:51 -0700 Created attachment 256007 Using Default in IDL 1106408 3 256007 youennf 2015-07-02 10:47:32 -0700 Comment on attachment 256007 Using Default in IDL View in context: https://bugs.webkit.org/attachment.cgi?id=256007&action=review > Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:3246 > + push @optionalCallbackArguments, GenerateReturnParameters($function); With the use of Default=Undefined, the binding generator changes are not needed anymore to support cancel custom removal. But they are still useful in theory, hence why I kept it in this patch. I can remove these changes if needed or add a specific binding expectation test for it. 1106483 4 256007 darin 2015-07-02 15:05:26 -0700 Comment on attachment 256007 Using Default in IDL View in context: https://bugs.webkit.org/attachment.cgi?id=256007&action=review > Source/WebCore/Modules/streams/ReadableStream.idl:35 > + [RaisesException] Promise cancel([Default=Undefined] optional any reason); What default do we get if we don’t specify [Default=Undefined]? JavaScript null? C++ nullptr? >> Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:3246 >> + push @optionalCallbackArguments, GenerateReturnParameters($function); > > With the use of Default=Undefined, the binding generator changes are not needed anymore to support cancel custom removal. > But they are still useful in theory, hence why I kept it in this patch. > I can remove these changes if needed or add a specific binding expectation test for it. Definitely should add a bindings test for this if you are keeping it. 1106635 5 256007 youennf 2015-07-02 23:30:43 -0700 Comment on attachment 256007 Using Default in IDL View in context: https://bugs.webkit.org/attachment.cgi?id=256007&action=review >> Source/WebCore/Modules/streams/ReadableStream.idl:35 >> + [RaisesException] Promise cancel([Default=Undefined] optional any reason); > > What default do we get if we don’t specify [Default=Undefined]? JavaScript null? C++ nullptr? If no default is specified, the DOM class must provide methods with and without the argument, meaning in that case the two following methods: ReadableStream::cancel(JSPromiseDeferred*, ExceptionCode&); ReadableStream::cancel(JSC::JSValue, JSPromiseDeferred*, ExceptionCode&); >>> Source/WebCore/bindings/scripts/CodeGeneratorJS.pm:3246 >>> + push @optionalCallbackArguments, GenerateReturnParameters($function); >> >> With the use of Default=Undefined, the binding generator changes are not needed anymore to support cancel custom removal. >> But they are still useful in theory, hence why I kept it in this patch. >> I can remove these changes if needed or add a specific binding expectation test for it. > > Definitely should add a bindings test for this if you are keeping it. OK 1106636 6 256082 youennf 2015-07-02 23:31:46 -0700 Created attachment 256082 Patch for landing 1106648 7 256082 commit-queue 2015-07-03 00:29:08 -0700 Comment on attachment 256082 Patch for landing Clearing flags on attachment: 256082 Committed r186257: <http://trac.webkit.org/changeset/186257> 1106649 8 commit-queue 2015-07-03 00:29:11 -0700 All reviewed patches have been landed. Closing bug. 255911 2015-07-01 01:56:49 -0700 2015-07-02 06:44:14 -0700 Patch bug-146458-20150701105556.patch text/plain 8489 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2MTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmY2YjEwYTU1ZTBlYWE4 ODQ4YjQ0NDdlM2NmYTIzM2U4MTY4MzA3YS4uYjdkM2I1NzExMTdiYThlNDZlNmYxOTVhMjVhY2Y3 MGZkOWUzNTVjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE1LTA3LTAxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgW1N0cmVh bXMgQVBJXSBSZW1vdmUgUmVhZGFibGVTdHJlYW0gYW5kIFJlYWRlciBjYW5jZWwoKSBjdXN0b20g YmluZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2NDU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlZCBzdHJlYW0gYW5kIHJlYWRlciBjYW5jZWwgY3VzdG9tIGJpbmRpbmcuCisgICAgICAg IFVwZGF0ZWQgYmluZGluZyBnZW5lcmF0b3IgdG8gY29ycmVjdGx5IGhhbmRsZSBwcm9taXNlLWJh c2VkIEFQSXMgd2l0aCBvcHRpb25hbCBwYXJhbWV0ZXJzLgorCisgICAgICAgIE5vIGJlaGF2aW9y IGNoYW5nZXMuCisKKyAgICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uaDoK KyAgICAgICAgKFdlYkNvcmU6OlJlYWRhYmxlU3RyZWFtOjpjYW5jZWwpOiBIYW5kbGluZyBvZiBv cHRpb25hbCBjYW5jZWwgcmVhc29uLgorICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9SZWFkYWJs ZVN0cmVhbS5pZGw6IFJlbW92ZWQgY3VzdG9tCisgICAgICAgICogTW9kdWxlcy9zdHJlYW1zL1Jl YWRhYmxlU3RyZWFtUmVhZGVyLmg6CisgICAgICAgIChXZWJDb3JlOjpSZWFkYWJsZVN0cmVhbVJl YWRlcjo6Y2FuY2VsKTogSGFuZGxpbmcgb2Ygb3B0aW9uYWwgY2FuY2VsIHJlYXNvbi4KKyAgICAg ICAgKiBNb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1SZWFkZXIuaWRsOiBSZW1vdmVkIGN1 c3RvbS4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1JlYWRhYmxlU3RyZWFtQ3VzdG9tLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkpTUmVhZGFibGVTdHJlYW06OmNhbmNlbCk6IERlbGV0ZWQuCisg ICAgICAgICogYmluZGluZ3MvanMvSlNSZWFkYWJsZVN0cmVhbVJlYWRlckN1c3RvbS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpKU1JlYWRhYmxlU3RyZWFtUmVhZGVyOjpjYW5jZWwpOiBEZWxldGVk LgorICAgICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOiBIYW5kbGlu ZyBvZiBwcm9taXNlIHBhcmFtZXRlciBpbiBjYXNlIG9mIG9wdGlvbmFsIGFyZ3VtZW50cy4KKyAg ICAgICAgKEdlbmVyYXRlUGFyYW1ldGVyc0NoZWNrKToKKyAgICAgICAgKEdlbmVyYXRlUmV0dXJu UGFyYW1ldGVycyk6IFV0aWxpdHkgZnVuY3Rpb24gdG8gZ2VuZXJhdGUgcmV0dXJuIHBhcmFtZXRl cnMgKGV4Y2VwdGlvbiBhbmQgcHJvbWlzZSkuCisKIDIwMTUtMDYtMzAgIFlvdWVubiBGYWJsZXQg IDx5b3Vlbm4uZmFibGV0QGNyZi5jYW5vbi5mcj4gYW5kIFhhYmllciBSb2RyaWd1ZXogQ2FsdmFy ICA8Y2FsdmFyaXNAaWdhbGlhLmNvbT4KIAogICAgICAgICBbU3RyZWFtcyBBUEldIEZpbmlzaCBw dWxsaW5nIG11c3QgYWx3YXlzIGJlIGRvbmUgYXN5bmNocm9ub3VzbHkgYXMgaXQgaXMgdGhlIGV4 cGVjdGVkIHByb21pc2UgYmVoYXZpb3IgKGFjY29yZGluZyB0byB0aGUgc3BlYykKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbS5oIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtLmgKaW5kZXggYzUxNGYy NjFjOTc5MGU0MTM5ODZmNDFlNTdmOTM0ZjgzZjU5ZjEzYS4uYzUyNTg0MWY0YTI0Y2Q1NWY3MDQ1 ZGUyZDIyOTI5NzcwMjViOWJjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9z dHJlYW1zL1JlYWRhYmxlU3RyZWFtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJl YW1zL1JlYWRhYmxlU3RyZWFtLmgKQEAgLTkwLDYgKzkwLDcgQEAgcHVibGljOgogICAgIHR5cGVk ZWYgc3RkOjpmdW5jdGlvbjx2b2lkKEpTQzo6SlNWYWx1ZSk+IEZhaWx1cmVDYWxsYmFjazsKIAog ICAgIHR5cGVkZWYgRE9NUHJvbWlzZTxzdGQ6Om51bGxwdHJfdCwgSlNDOjpKU1ZhbHVlPiBDYW5j ZWxQcm9taXNlOworICAgIHZvaWQgY2FuY2VsKENhbmNlbFByb21pc2UmJiBwcm9taXNlLCBFeGNl cHRpb25Db2RlJiBlYykgeyByZXR1cm4gY2FuY2VsKEpTQzo6anNVbmRlZmluZWQoKSwgV1RGOjpt b3ZlKHByb21pc2UpLCBlYyk7IH0KICAgICB2b2lkIGNhbmNlbChKU0M6OkpTVmFsdWUsIENhbmNl bFByb21pc2UmJiwgRXhjZXB0aW9uQ29kZSYpOwogICAgIHZvaWQgY2FuY2VsTm9DaGVjayhKU0M6 OkpTVmFsdWUsIENhbmNlbFByb21pc2UmJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbS5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uaWRsCmluZGV4IGJiY2I1ODk0OWQzNjRmNDkxY2Vh ZGUyYzNiNGJhMjQ0YjU5OGExZTQuLjUwNmEyNTU3NjgyYzQ1NDhmNjdkYTU2NzU4NjBlZTllZDZh NTU0ZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJs ZVN0cmVhbS5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxl U3RyZWFtLmlkbApAQCAtMzIsNyArMzIsNyBAQAogICAgIENvbmRpdGlvbmFsPVNUUkVBTVNfQVBJ LAogICAgIFNraXBWVGFibGVWYWxpZGF0aW9uCiBdIGludGVyZmFjZSBSZWFkYWJsZVN0cmVhbSB7 Ci0gICAgW0N1c3RvbV0gUHJvbWlzZSBjYW5jZWwoYW55IHJlYXNvbik7CisgICAgW1JhaXNlc0V4 Y2VwdGlvbl0gUHJvbWlzZSBjYW5jZWwob3B0aW9uYWwgYW55IHJlYXNvbik7CiAgICAgW1JhaXNl c0V4Y2VwdGlvbl0gUmVhZGFibGVTdHJlYW1SZWFkZXIgZ2V0UmVhZGVyKCk7CiAgICAgW0N1c3Rv bV0gUHJvbWlzZSBwaXBlVG8oYW55IHN0cmVhbXMsIGFueSBvcHRpb25zKTsKICAgICBbQ3VzdG9t XSBPYmplY3QgcGlwZVRocm91Z2goYW55IGRlc3QsIGFueSBvcHRpb25zKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbVJlYWRlci5oIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtUmVhZGVyLmgKaW5k ZXggNjZmMzVmNzBjZDJmZGJiMmUwN2Q5YTk5ZTZiMzhlNDI2MDU4ZmZmZi4uYTUyYWJhZDVlZWNi MjdjZTBiYzIyZDBmMDM1N2YyZWFmZjQ0NWMwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv TW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtUmVhZGVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtUmVhZGVyLmgKQEAgLTUzLDYgKzUzLDcg QEAgcHVibGljOgogICAgIFJlYWRhYmxlU3RyZWFtUmVhZGVyKFJlYWRhYmxlU3RyZWFtJiBzdHJl YW0pCiAgICAgICAgIDogbV9zdHJlYW0oc3RyZWFtKSB7IH0KIAorICAgIHZvaWQgY2FuY2VsKFJl YWRhYmxlU3RyZWFtOjpDYW5jZWxQcm9taXNlJiYgcHJvbWlzZSkgeyByZXR1cm4gY2FuY2VsKEpT Qzo6anNVbmRlZmluZWQoKSwgV1RGOjptb3ZlKHByb21pc2UpKTsgfQogICAgIHZvaWQgY2FuY2Vs KEpTQzo6SlNWYWx1ZSwgUmVhZGFibGVTdHJlYW06OkNhbmNlbFByb21pc2UmJik7CiAgICAgdm9p ZCBjbG9zZWQoUmVhZGFibGVTdHJlYW06OkNsb3NlZFByb21pc2UmJik7CiAgICAgdm9pZCByZWFk KFJlYWRhYmxlU3RyZWFtOjpSZWFkU3VjY2Vzc0NhbGxiYWNrJiYsIFJlYWRhYmxlU3RyZWFtOjpS ZWFkRW5kQ2FsbGJhY2smJiwgUmVhZGFibGVTdHJlYW06OkZhaWx1cmVDYWxsYmFjayYmKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbVJl YWRlci5pZGwgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1S ZWFkZXIuaWRsCmluZGV4IDRhMGY0NWU1MzJhMzYzYzQ1YjM4NDA1YTVmMWU2NjU2MTliOTgyYjcu LjkwYjNmYzhjOGJlZjIyYTJmMzNjY2IwMzhiNGU0MTA2ZWRkOWQ1MDEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbVJlYWRlci5pZGwKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtUmVhZGVyLmlk bApAQCAtMzQsNyArMzQsNyBAQAogICAgIFNraXBWVGFibGVWYWxpZGF0aW9uCiBdIGludGVyZmFj ZSBSZWFkYWJsZVN0cmVhbVJlYWRlciB7CiAgICAgW0N1c3RvbV0gT2JqZWN0IHJlYWQoKTsKLSAg ICBbQ3VzdG9tXSBQcm9taXNlIGNhbmNlbChhbnkgcmVhc29uKTsKKyAgICBQcm9taXNlIGNhbmNl bChvcHRpb25hbCBhbnkgcmVhc29uKTsKICAgICBbUmFpc2VzRXhjZXB0aW9uXSB2b2lkIHJlbGVh c2VMb2NrKCk7CiAKICAgICBbQ3VzdG9tR2V0dGVyXSByZWFkb25seSBhdHRyaWJ1dGUgUHJvbWlz ZSBjbG9zZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1JlYWRh YmxlU3RyZWFtQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUmVhZGFi bGVTdHJlYW1DdXN0b20uY3BwCmluZGV4IDFkMjNmNjJhZDUyYjhhMzA1MzE3NGE3Y2Q1MmQ2NDNh ZWRmN2NmZDkuLjI5OGZmOGRiM2U4OGRlZDc5Zjk5OGFlMTI5ZmYzNGI3MDA2ZTExMjcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJlYW1DdXN0b20u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJlYW1DdXN0 b20uY3BwCkBAIC00NywxOSArNDcsNiBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwogCiBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKLUpTVmFsdWUgSlNSZWFkYWJsZVN0cmVhbTo6Y2FuY2VsKEV4ZWNTdGF0 ZSogZXhlYykKLXsKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8gcmVtb3ZlIHRo aXMgY3VzdG9tIGJpbmRpbmcsIG9uY2Ugd2UgY2FuIHBhc3MgYSBKU1ZhbHVlIG9yIGEgU2NyaXB0 VmFsdWUuCi0gICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7Ci0gICAgSlNQcm9taXNlRGVmZXJyZWQm IHByb21pc2VEZWZlcnJlZCA9ICpKU1Byb21pc2VEZWZlcnJlZDo6Y3JlYXRlKGV4ZWMsIGdsb2Jh bE9iamVjdCgpKTsKLSAgICBpbXBsKCkuY2FuY2VsKGV4ZWMtPmFyZ3VtZW50KDApLCBEZWZlcnJl ZFdyYXBwZXIoZXhlYywgZ2xvYmFsT2JqZWN0KCksICZwcm9taXNlRGVmZXJyZWQpLCBlYyk7Ci0K LSAgICBpZiAoZWMpCi0gICAgICAgIERlZmVycmVkV3JhcHBlcihleGVjLCBnbG9iYWxPYmplY3Qo KSwgJnByb21pc2VEZWZlcnJlZCkucmVqZWN0KGVjKTsKLQotICAgIHJldHVybiBwcm9taXNlRGVm ZXJyZWQucHJvbWlzZSgpOwotfQotCiBKU1ZhbHVlIEpTUmVhZGFibGVTdHJlYW06OnBpcGVUbyhF eGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgSlNWYWx1ZSBlcnJvciA9IGNyZWF0ZUVycm9yKGV4ZWMs IEFTQ0lJTGl0ZXJhbCgicGlwZVRvIGlzIG5vdCBpbXBsZW1lbnRlZCIpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJlYW1SZWFkZXJDdXN0b20u Y3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNSZWFkYWJsZVN0cmVhbVJlYWRlckN1 c3RvbS5jcHAKaW5kZXggYWEyYmY1NGI5M2VlZDQ3OThjZDk1NDkxODQxMjRmYjUyOTFhM2M3Yy4u MjAyZWUxNjY5NjY0ZTI5ZGE0ZTljMjgyMDFhMDEyZmEyNmZhYjdjMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNSZWFkYWJsZVN0cmVhbVJlYWRlckN1c3RvbS5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNSZWFkYWJsZVN0cmVhbVJlYWRlckN1 c3RvbS5jcHAKQEAgLTc3LDE0ICs3Nyw2IEBAIEpTVmFsdWUgSlNSZWFkYWJsZVN0cmVhbVJlYWRl cjo6Y2xvc2VkKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKICAgICByZXR1cm4gbV9jbG9zZWRQcm9t aXNlRGVmZXJyZWQtPnByb21pc2UoKTsKIH0KIAotSlNWYWx1ZSBKU1JlYWRhYmxlU3RyZWFtUmVh ZGVyOjpjYW5jZWwoRXhlY1N0YXRlKiBleGVjKQotewotICAgIC8vIEZJWE1FOiBXZSBzaG91bGQg YmUgYWJsZSB0byByZW1vdmUgdGhpcyBjdXN0b20gYmluZGluZywgb25jZSB3ZSBjYW4gcGFzcyBh IEpTVmFsdWUgb3IgYSBTY3JpcHRWYWx1ZS4KLSAgICBKU1Byb21pc2VEZWZlcnJlZCYgcHJvbWlz ZURlZmVycmVkID0gKkpTUHJvbWlzZURlZmVycmVkOjpjcmVhdGUoZXhlYywgZ2xvYmFsT2JqZWN0 KCkpOwotICAgIGltcGwoKS5jYW5jZWwoZXhlYy0+YXJndW1lbnQoMCksIERlZmVycmVkV3JhcHBl cihleGVjLCBnbG9iYWxPYmplY3QoKSwgJnByb21pc2VEZWZlcnJlZCkpOwotICAgIHJldHVybiBw cm9taXNlRGVmZXJyZWQucHJvbWlzZSgpOwotfQotCiBFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9D QUxMIGNvbnN0cnVjdEpTUmVhZGFibGVTdHJlYW1SZWFkZXIoRXhlY1N0YXRlKiBleGVjKQogewog ICAgIGlmICghZXhlYy0+YXJndW1lbnRDb3VudCgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0gYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQppbmRleCBlOGNiMjQ1MzJmMTk3MTQ0 YzNiY2JjZjA0MjVmNGMzMTNjZGU4OTM4Li5jMjQ1YTM1NDJiMTc3MjUwN2ViOWVhNzRiYjczY2Q4 NzAxOWI0OGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0Nv ZGVHZW5lcmF0b3JKUy5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0Nv ZGVHZW5lcmF0b3JKUy5wbQpAQCAtMzI0Myw3ICszMjQzLDcgQEAgc3ViIEdlbmVyYXRlUGFyYW1l dGVyc0NoZWNrCiAgICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgaWYgKGFyZ3ND b3VudCA8PSAkYXJnc0luZGV4KSB7XG4iKTsKIAogICAgICAgICAgICAgbXkgQG9wdGlvbmFsQ2Fs bGJhY2tBcmd1bWVudHMgPSBAYXJndW1lbnRzOwotICAgICAgICAgICAgcHVzaChAb3B0aW9uYWxD YWxsYmFja0FyZ3VtZW50cywgImVjIikgaWYgJHJhaXNlc0V4Y2VwdGlvbjsKKyAgICAgICAgICAg IHB1c2ggQG9wdGlvbmFsQ2FsbGJhY2tBcmd1bWVudHMsIEdlbmVyYXRlUmV0dXJuUGFyYW1ldGVy cygkZnVuY3Rpb24pOwogICAgICAgICAgICAgbXkgJGZ1bmN0aW9uU3RyaW5nID0gIiRmdW5jdGlv bk5hbWUoIiAuIGpvaW4oIiwgIiwgQG9wdGlvbmFsQ2FsbGJhY2tBcmd1bWVudHMpIC4gIikiOwog ICAgICAgICAgICAgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbkZ1bmN0aW9uQ2FsbCgkZnVuY3Rpb24s ICRmdW5jdGlvblN0cmluZywgIiAgICAiIHggMiwgJHN2Z1Byb3BlcnR5VHlwZSwgJGludGVyZmFj ZU5hbWUpOwogICAgICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgIH1cblxuIik7CkBA IC0zNDExLDEzICszNDExLDIxIEBAIHN1YiBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVjawogICAgICAg ICAkYXJnc0luZGV4Kys7CiAgICAgfQogCi0gICAgcHVzaChAYXJndW1lbnRzLCAiRGVmZXJyZWRX cmFwcGVyKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpLCBwcm9taXNlRGVmZXJyZWQp IikgaWYgSXNSZXR1cm5pbmdQcm9taXNlKCRmdW5jdGlvbik7Ci0KLSAgICBwdXNoKEBhcmd1bWVu dHMsICJlYyIpIGlmICRyYWlzZXNFeGNlcHRpb247CisgICAgcHVzaCBAYXJndW1lbnRzLCBHZW5l cmF0ZVJldHVyblBhcmFtZXRlcnMoJGZ1bmN0aW9uKTsKIAogICAgIHJldHVybiAoIiRmdW5jdGlv bk5hbWUoIiAuIGpvaW4oIiwgIiwgQGFyZ3VtZW50cykgLiAiKSIsIHNjYWxhciBAYXJndW1lbnRz KTsKIH0KIAorc3ViIEdlbmVyYXRlUmV0dXJuUGFyYW1ldGVycworeworICAgIG15ICRmdW5jdGlv biA9IHNoaWZ0OworICAgIG15IEBhcmd1bWVudHM7CisKKyAgICBwdXNoKEBhcmd1bWVudHMsICJE ZWZlcnJlZFdyYXBwZXIoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCksIHByb21pc2VE ZWZlcnJlZCkiKSBpZiBJc1JldHVybmluZ1Byb21pc2UoJGZ1bmN0aW9uKTsKKyAgICBwdXNoKEBh cmd1bWVudHMsICJlYyIpIGlmICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRlZEF0dHJpYnV0 ZXMtPnsiUmFpc2VzRXhjZXB0aW9uIn07CisgICAgcmV0dXJuIEBhcmd1bWVudHM7Cit9CisKIHN1 YiBHZW5lcmF0ZUNhbGxiYWNrSGVhZGVyCiB7CiAgICAgbXkgJG9iamVjdCA9IHNoaWZ0Owo= 256007 2015-07-02 06:44:51 -0700 2015-07-02 23:31:41 -0700 Using Default in IDL bug-146458-20150702154356.patch text/plain 6645 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2MjE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjY2MDIxMWVkNjIxZmE1 MjAwODgwMGY1ZGZiNWZjYTEzZDAwNTA1Yy4uZjJlZmQwOTkxZWE3NDM2OTQzOGViNTZlZWFmYTZj MDZkNTY3MDM1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE1LTA3LTAyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgW1N0cmVh bXMgQVBJXSBSZW1vdmUgUmVhZGFibGVTdHJlYW0gYW5kIFJlYWRlciBjYW5jZWwoKSBjdXN0b20g YmluZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2NDU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg UmVtb3ZlZCBzdHJlYW0gYW5kIHJlYWRlciBjYW5jZWwgY3VzdG9tIGJpbmRpbmcuCisgICAgICAg IFVwZGF0ZWQgYmluZGluZyBnZW5lcmF0b3IgdG8gY29ycmVjdGx5IGhhbmRsZSBwcm9taXNlLWJh c2VkIEFQSXMgd2l0aCBvcHRpb25hbCBwYXJhbWV0ZXJzLgorCisgICAgICAgIE5vIGJlaGF2aW9y IGNoYW5nZXMuCisKKyAgICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uaWRs OiBSZW1vdmVkIGN1c3RvbQorICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVh bVJlYWRlci5pZGw6IERpdHRvLgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJl YW1DdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNSZWFkYWJsZVN0cmVhbTo6Y2FuY2Vs KTogRGVsZXRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1JlYWRhYmxlU3RyZWFtUmVhZGVy Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTUmVhZGFibGVTdHJlYW1SZWFkZXI6OmNh bmNlbCk6IERlbGV0ZWQuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9y SlMucG06IEhhbmRsaW5nIG9mIHByb21pc2UgcGFyYW1ldGVyIGluIGNhc2Ugb2Ygb3B0aW9uYWwg YXJndW1lbnRzLgorICAgICAgICAoR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgorICAgICAgICAo R2VuZXJhdGVSZXR1cm5QYXJhbWV0ZXJzKTogVXRpbGl0eSBmdW5jdGlvbiB0byBnZW5lcmF0ZSBy ZXR1cm4gcGFyYW1ldGVycyAoZXhjZXB0aW9uIGFuZCBwcm9taXNlKS4KKwogMjAxNS0wNy0wMSAg Sm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IEFnZ3JlZ2F0ZSBwcm9maWxlIGNhbGwgaW5mb3JtYXRpb24gb24gdGhlIGJhY2tlbmQg dG8gZHJhc3RpY2FsbHkgcmVkdWNlIHByb2ZpbGUgc2l6ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbS5pZGwgYi9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uaWRsCmluZGV4IGJiY2I1ODk0OWQzNjRm NDkxY2VhZGUyYzNiNGJhMjQ0YjU5OGExZTQuLjA2NjM1YzM5YzBlMGM1OWZhOTQ5NjMxODRmMmNk ZjZiMDhhNmJlMWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9S ZWFkYWJsZVN0cmVhbS5pZGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1Jl YWRhYmxlU3RyZWFtLmlkbApAQCAtMzIsNyArMzIsNyBAQAogICAgIENvbmRpdGlvbmFsPVNUUkVB TVNfQVBJLAogICAgIFNraXBWVGFibGVWYWxpZGF0aW9uCiBdIGludGVyZmFjZSBSZWFkYWJsZVN0 cmVhbSB7Ci0gICAgW0N1c3RvbV0gUHJvbWlzZSBjYW5jZWwoYW55IHJlYXNvbik7CisgICAgW1Jh aXNlc0V4Y2VwdGlvbl0gUHJvbWlzZSBjYW5jZWwoW0RlZmF1bHQ9VW5kZWZpbmVkXSBvcHRpb25h bCBhbnkgcmVhc29uKTsKICAgICBbUmFpc2VzRXhjZXB0aW9uXSBSZWFkYWJsZVN0cmVhbVJlYWRl ciBnZXRSZWFkZXIoKTsKICAgICBbQ3VzdG9tXSBQcm9taXNlIHBpcGVUbyhhbnkgc3RyZWFtcywg YW55IG9wdGlvbnMpOwogICAgIFtDdXN0b21dIE9iamVjdCBwaXBlVGhyb3VnaChhbnkgZGVzdCwg YW55IG9wdGlvbnMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1z L1JlYWRhYmxlU3RyZWFtUmVhZGVyLmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFt cy9SZWFkYWJsZVN0cmVhbVJlYWRlci5pZGwKaW5kZXggNGEwZjQ1ZTUzMmEzNjNjNDViMzg0MDVh NWYxZTY2NTYxOWI5ODJiNy4uNzgzOGI2MmMyMmVjMzhlM2RkNWZmMmViOTI3ZWEzZmFmMjFlZDVm ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3Ry ZWFtUmVhZGVyLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFi bGVTdHJlYW1SZWFkZXIuaWRsCkBAIC0zNCw3ICszNCw3IEBACiAgICAgU2tpcFZUYWJsZVZhbGlk YXRpb24KIF0gaW50ZXJmYWNlIFJlYWRhYmxlU3RyZWFtUmVhZGVyIHsKICAgICBbQ3VzdG9tXSBP YmplY3QgcmVhZCgpOwotICAgIFtDdXN0b21dIFByb21pc2UgY2FuY2VsKGFueSByZWFzb24pOwor ICAgIFByb21pc2UgY2FuY2VsKFtEZWZhdWx0PVVuZGVmaW5lZF0gb3B0aW9uYWwgYW55IHJlYXNv bik7CiAgICAgW1JhaXNlc0V4Y2VwdGlvbl0gdm9pZCByZWxlYXNlTG9jaygpOwogCiAgICAgW0N1 c3RvbUdldHRlcl0gcmVhZG9ubHkgYXR0cmlidXRlIFByb21pc2UgY2xvc2VkOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNSZWFkYWJsZVN0cmVhbUN1c3RvbS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU1JlYWRhYmxlU3RyZWFtQ3VzdG9tLmNwcApp bmRleCAxZDIzZjYyYWQ1MmI4YTMwNTMxNzRhN2NkNTJkNjQzYWVkZjdjZmQ5Li4yOThmZjhkYjNl ODhkZWQ3OWY5OThhZTEyOWZmMzRiNzAwNmUxMTI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy9qcy9KU1JlYWRhYmxlU3RyZWFtQ3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9qcy9KU1JlYWRhYmxlU3RyZWFtQ3VzdG9tLmNwcApAQCAtNDcsMTkgKzQ3 LDYgQEAgdXNpbmcgbmFtZXNwYWNlIEpTQzsKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1KU1Zh bHVlIEpTUmVhZGFibGVTdHJlYW06OmNhbmNlbChFeGVjU3RhdGUqIGV4ZWMpCi17Ci0gICAgLy8g RklYTUU6IFdlIHNob3VsZCBiZSBhYmxlIHRvIHJlbW92ZSB0aGlzIGN1c3RvbSBiaW5kaW5nLCBv bmNlIHdlIGNhbiBwYXNzIGEgSlNWYWx1ZSBvciBhIFNjcmlwdFZhbHVlLgotICAgIEV4Y2VwdGlv bkNvZGUgZWMgPSAwOwotICAgIEpTUHJvbWlzZURlZmVycmVkJiBwcm9taXNlRGVmZXJyZWQgPSAq SlNQcm9taXNlRGVmZXJyZWQ6OmNyZWF0ZShleGVjLCBnbG9iYWxPYmplY3QoKSk7Ci0gICAgaW1w bCgpLmNhbmNlbChleGVjLT5hcmd1bWVudCgwKSwgRGVmZXJyZWRXcmFwcGVyKGV4ZWMsIGdsb2Jh bE9iamVjdCgpLCAmcHJvbWlzZURlZmVycmVkKSwgZWMpOwotCi0gICAgaWYgKGVjKQotICAgICAg ICBEZWZlcnJlZFdyYXBwZXIoZXhlYywgZ2xvYmFsT2JqZWN0KCksICZwcm9taXNlRGVmZXJyZWQp LnJlamVjdChlYyk7Ci0KLSAgICByZXR1cm4gcHJvbWlzZURlZmVycmVkLnByb21pc2UoKTsKLX0K LQogSlNWYWx1ZSBKU1JlYWRhYmxlU3RyZWFtOjpwaXBlVG8oRXhlY1N0YXRlKiBleGVjKQogewog ICAgIEpTVmFsdWUgZXJyb3IgPSBjcmVhdGVFcnJvcihleGVjLCBBU0NJSUxpdGVyYWwoInBpcGVU byBpcyBub3QgaW1wbGVtZW50ZWQiKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5k aW5ncy9qcy9KU1JlYWRhYmxlU3RyZWFtUmVhZGVyQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJlYW1SZWFkZXJDdXN0b20uY3BwCmluZGV4IGFhMmJm NTRiOTNlZWQ0Nzk4Y2Q5NTQ5MTg0MTI0ZmI1MjkxYTNjN2MuLjIwMmVlMTY2OTY2NGUyOWRhNGU5 YzI4MjAxYTAxMmZhMjZmYWI3YzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdz L2pzL0pTUmVhZGFibGVTdHJlYW1SZWFkZXJDdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJlYW1SZWFkZXJDdXN0b20uY3BwCkBAIC03NywxNCAr NzcsNiBAQCBKU1ZhbHVlIEpTUmVhZGFibGVTdHJlYW1SZWFkZXI6OmNsb3NlZChFeGVjU3RhdGUq IGV4ZWMpIGNvbnN0CiAgICAgcmV0dXJuIG1fY2xvc2VkUHJvbWlzZURlZmVycmVkLT5wcm9taXNl KCk7CiB9CiAKLUpTVmFsdWUgSlNSZWFkYWJsZVN0cmVhbVJlYWRlcjo6Y2FuY2VsKEV4ZWNTdGF0 ZSogZXhlYykKLXsKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8gcmVtb3ZlIHRo aXMgY3VzdG9tIGJpbmRpbmcsIG9uY2Ugd2UgY2FuIHBhc3MgYSBKU1ZhbHVlIG9yIGEgU2NyaXB0 VmFsdWUuCi0gICAgSlNQcm9taXNlRGVmZXJyZWQmIHByb21pc2VEZWZlcnJlZCA9ICpKU1Byb21p c2VEZWZlcnJlZDo6Y3JlYXRlKGV4ZWMsIGdsb2JhbE9iamVjdCgpKTsKLSAgICBpbXBsKCkuY2Fu Y2VsKGV4ZWMtPmFyZ3VtZW50KDApLCBEZWZlcnJlZFdyYXBwZXIoZXhlYywgZ2xvYmFsT2JqZWN0 KCksICZwcm9taXNlRGVmZXJyZWQpKTsKLSAgICByZXR1cm4gcHJvbWlzZURlZmVycmVkLnByb21p c2UoKTsKLX0KLQogRW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBjb25zdHJ1Y3RKU1JlYWRh YmxlU3RyZWFtUmVhZGVyKEV4ZWNTdGF0ZSogZXhlYykKIHsKICAgICBpZiAoIWV4ZWMtPmFyZ3Vt ZW50Q291bnQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMv Q29kZUdlbmVyYXRvckpTLnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2Rl R2VuZXJhdG9ySlMucG0KaW5kZXggZThjYjI0NTMyZjE5NzE0NGMzYmNiY2YwNDI1ZjRjMzEzY2Rl ODkzOC4uYzI0NWEzNTQyYjE3NzI1MDdlYjllYTc0YmI3M2NkODcwMTliNDhiYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0KQEAg LTMyNDMsNyArMzI0Myw3IEBAIHN1YiBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVjawogICAgICAgICAg ICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgIGlmIChhcmdzQ291bnQgPD0gJGFyZ3NJbmRleCkg e1xuIik7CiAKICAgICAgICAgICAgIG15IEBvcHRpb25hbENhbGxiYWNrQXJndW1lbnRzID0gQGFy Z3VtZW50czsKLSAgICAgICAgICAgIHB1c2goQG9wdGlvbmFsQ2FsbGJhY2tBcmd1bWVudHMsICJl YyIpIGlmICRyYWlzZXNFeGNlcHRpb247CisgICAgICAgICAgICBwdXNoIEBvcHRpb25hbENhbGxi YWNrQXJndW1lbnRzLCBHZW5lcmF0ZVJldHVyblBhcmFtZXRlcnMoJGZ1bmN0aW9uKTsKICAgICAg ICAgICAgIG15ICRmdW5jdGlvblN0cmluZyA9ICIkZnVuY3Rpb25OYW1lKCIgLiBqb2luKCIsICIs IEBvcHRpb25hbENhbGxiYWNrQXJndW1lbnRzKSAuICIpIjsKICAgICAgICAgICAgIEdlbmVyYXRl SW1wbGVtZW50YXRpb25GdW5jdGlvbkNhbGwoJGZ1bmN0aW9uLCAkZnVuY3Rpb25TdHJpbmcsICIg ICAgIiB4IDIsICRzdmdQcm9wZXJ0eVR5cGUsICRpbnRlcmZhY2VOYW1lKTsKICAgICAgICAgICAg IHB1c2goQCRvdXRwdXRBcnJheSwgIiAgICB9XG5cbiIpOwpAQCAtMzQxMSwxMyArMzQxMSwyMSBA QCBzdWIgR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2sKICAgICAgICAgJGFyZ3NJbmRleCsrOwogICAg IH0KIAotICAgIHB1c2goQGFyZ3VtZW50cywgIkRlZmVycmVkV3JhcHBlcihleGVjLCBjYXN0ZWRU aGlzLT5nbG9iYWxPYmplY3QoKSwgcHJvbWlzZURlZmVycmVkKSIpIGlmIElzUmV0dXJuaW5nUHJv bWlzZSgkZnVuY3Rpb24pOwotCi0gICAgcHVzaChAYXJndW1lbnRzLCAiZWMiKSBpZiAkcmFpc2Vz RXhjZXB0aW9uOworICAgIHB1c2ggQGFyZ3VtZW50cywgR2VuZXJhdGVSZXR1cm5QYXJhbWV0ZXJz KCRmdW5jdGlvbik7CiAKICAgICByZXR1cm4gKCIkZnVuY3Rpb25OYW1lKCIgLiBqb2luKCIsICIs IEBhcmd1bWVudHMpIC4gIikiLCBzY2FsYXIgQGFyZ3VtZW50cyk7CiB9CiAKK3N1YiBHZW5lcmF0 ZVJldHVyblBhcmFtZXRlcnMKK3sKKyAgICBteSAkZnVuY3Rpb24gPSBzaGlmdDsKKyAgICBteSBA YXJndW1lbnRzOworCisgICAgcHVzaChAYXJndW1lbnRzLCAiRGVmZXJyZWRXcmFwcGVyKGV4ZWMs IGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpLCBwcm9taXNlRGVmZXJyZWQpIikgaWYgSXNSZXR1 cm5pbmdQcm9taXNlKCRmdW5jdGlvbik7CisgICAgcHVzaChAYXJndW1lbnRzLCAiZWMiKSBpZiAk ZnVuY3Rpb24tPnNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlJhaXNlc0V4Y2VwdGlv biJ9OworICAgIHJldHVybiBAYXJndW1lbnRzOworfQorCiBzdWIgR2VuZXJhdGVDYWxsYmFja0hl YWRlcgogewogICAgIG15ICRvYmplY3QgPSBzaGlmdDsK 256082 2015-07-02 23:31:46 -0700 2015-07-03 00:29:08 -0700 Patch for landing bug-146458-20150703083051.patch text/plain 11310 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTg2MjU2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzNiYmEwYmY3MzM5YzU5 YmE2NmRkMmQxNWNiNDU1Y2ExZWNjNjVlZS4uZjUwZDM2N2JiZDUxNDBlZTY0Njk3Y2FmMDYxYjdh N2QxYjg2ZTZkYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE1LTA3LTAyICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uLmZhYmxldEBjcmYuY2Fub24uZnI+CisKKyAgICAgICAgW1N0cmVh bXMgQVBJXSBSZW1vdmUgUmVhZGFibGVTdHJlYW0gYW5kIFJlYWRlciBjYW5jZWwoKSBjdXN0b20g YmluZGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTQ2NDU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgUmVt b3ZlZCBzdHJlYW0gYW5kIHJlYWRlciBjYW5jZWwgY3VzdG9tIGJpbmRpbmcuCisgICAgICAgIFVw ZGF0ZWQgYmluZGluZyBnZW5lcmF0b3IgdG8gY29ycmVjdGx5IGhhbmRsZSBwcm9taXNlLWJhc2Vk IEFQSXMgd2l0aCBvcHRpb25hbCBwYXJhbWV0ZXJzLgorCisgICAgICAgIE5vIGJlaGF2aW9yIGNo YW5nZXMuCisKKyAgICAgICAgKiBNb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uaWRsOiBS ZW1vdmVkIGN1c3RvbQorICAgICAgICAqIE1vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbVJl YWRlci5pZGw6IERpdHRvLgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJlYW1D dXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SlNSZWFkYWJsZVN0cmVhbTo6Y2FuY2VsKTog RGVsZXRlZC4KKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU1JlYWRhYmxlU3RyZWFtUmVhZGVyQ3Vz dG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkpTUmVhZGFibGVTdHJlYW1SZWFkZXI6OmNhbmNl bCk6IERlbGV0ZWQuCisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMu cG06IEhhbmRsaW5nIG9mIHByb21pc2UgcGFyYW1ldGVyIGluIGNhc2Ugb2Ygb3B0aW9uYWwgYXJn dW1lbnRzLgorICAgICAgICAoR2VuZXJhdGVQYXJhbWV0ZXJzQ2hlY2spOgorICAgICAgICAoR2Vu ZXJhdGVSZXR1cm5QYXJhbWV0ZXJzKTogVXRpbGl0eSBmdW5jdGlvbiB0byBnZW5lcmF0ZSByZXR1 cm4gcGFyYW1ldGVycyAoZXhjZXB0aW9uIGFuZCBwcm9taXNlKS4KKyAgICAgICAgKiBiaW5kaW5n cy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVz dE9ialByb3RvdHlwZUZ1bmN0aW9uVGVzdFByb21pc2VGdW5jdGlvbldpdGhPcHRpb25hbEludEFy Z3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OmpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uVGVz dFByb21pc2VGdW5jdGlvbldpdGhPcHRpb25hbEludEFyZ3VtZW50UHJvbWlzZSk6CisgICAgICAg ICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsOgorCisKIDIwMTUtMDctMDIgIERv dWcgUnVzc2VsbCAgPGRfcnVzc2VsbEBhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IFNlbGVjdGlv biBjaGFuZ2UgYXMgYSByZXN1bHQgb2YgZm9jdXNpbmcgYW4gZWxlbWVudCBzaG91bGQgaW5jbHVk ZSB0aGF0IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRh YmxlU3RyZWFtLmlkbCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0 cmVhbS5pZGwKaW5kZXggYmJjYjU4OTQ5ZDM2NGY0OTFjZWFkZTJjM2I0YmEyNDRiNTk4YTFlNC4u MDY2MzVjMzljMGUwYzU5ZmE5NDk2MzE4NGYyY2RmNmIwOGE2YmUxYyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtLmlkbAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW0uaWRsCkBAIC0zMiw3ICsz Miw3IEBACiAgICAgQ29uZGl0aW9uYWw9U1RSRUFNU19BUEksCiAgICAgU2tpcFZUYWJsZVZhbGlk YXRpb24KIF0gaW50ZXJmYWNlIFJlYWRhYmxlU3RyZWFtIHsKLSAgICBbQ3VzdG9tXSBQcm9taXNl IGNhbmNlbChhbnkgcmVhc29uKTsKKyAgICBbUmFpc2VzRXhjZXB0aW9uXSBQcm9taXNlIGNhbmNl bChbRGVmYXVsdD1VbmRlZmluZWRdIG9wdGlvbmFsIGFueSByZWFzb24pOwogICAgIFtSYWlzZXNF eGNlcHRpb25dIFJlYWRhYmxlU3RyZWFtUmVhZGVyIGdldFJlYWRlcigpOwogICAgIFtDdXN0b21d IFByb21pc2UgcGlwZVRvKGFueSBzdHJlYW1zLCBhbnkgb3B0aW9ucyk7CiAgICAgW0N1c3RvbV0g T2JqZWN0IHBpcGVUaHJvdWdoKGFueSBkZXN0LCBhbnkgb3B0aW9ucyk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1SZWFkZXIuaWRsIGIv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9zdHJlYW1zL1JlYWRhYmxlU3RyZWFtUmVhZGVyLmlkbApp bmRleCA0YTBmNDVlNTMyYTM2M2M0NWIzODQwNWE1ZjFlNjY1NjE5Yjk4MmI3Li43ODM4YjYyYzIy ZWMzOGUzZGQ1ZmYyZWI5MjdlYTNmYWYyMWVkNWZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9Nb2R1bGVzL3N0cmVhbXMvUmVhZGFibGVTdHJlYW1SZWFkZXIuaWRsCisrKyBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvc3RyZWFtcy9SZWFkYWJsZVN0cmVhbVJlYWRlci5pZGwKQEAgLTM0LDcg KzM0LDcgQEAKICAgICBTa2lwVlRhYmxlVmFsaWRhdGlvbgogXSBpbnRlcmZhY2UgUmVhZGFibGVT dHJlYW1SZWFkZXIgewogICAgIFtDdXN0b21dIE9iamVjdCByZWFkKCk7Ci0gICAgW0N1c3RvbV0g UHJvbWlzZSBjYW5jZWwoYW55IHJlYXNvbik7CisgICAgUHJvbWlzZSBjYW5jZWwoW0RlZmF1bHQ9 VW5kZWZpbmVkXSBvcHRpb25hbCBhbnkgcmVhc29uKTsKICAgICBbUmFpc2VzRXhjZXB0aW9uXSB2 b2lkIHJlbGVhc2VMb2NrKCk7CiAKICAgICBbQ3VzdG9tR2V0dGVyXSByZWFkb25seSBhdHRyaWJ1 dGUgUHJvbWlzZSBjbG9zZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9q cy9KU1JlYWRhYmxlU3RyZWFtQ3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pz L0pTUmVhZGFibGVTdHJlYW1DdXN0b20uY3BwCmluZGV4IDFkMjNmNjJhZDUyYjhhMzA1MzE3NGE3 Y2Q1MmQ2NDNhZWRmN2NmZDkuLjI5OGZmOGRiM2U4OGRlZDc5Zjk5OGFlMTI5ZmYzNGI3MDA2ZTEx MjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJl YW1DdXN0b20uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUmVhZGFibGVT dHJlYW1DdXN0b20uY3BwCkBAIC00NywxOSArNDcsNiBAQCB1c2luZyBuYW1lc3BhY2UgSlNDOwog CiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLUpTVmFsdWUgSlNSZWFkYWJsZVN0cmVhbTo6Y2FuY2Vs KEV4ZWNTdGF0ZSogZXhlYykKLXsKLSAgICAvLyBGSVhNRTogV2Ugc2hvdWxkIGJlIGFibGUgdG8g cmVtb3ZlIHRoaXMgY3VzdG9tIGJpbmRpbmcsIG9uY2Ugd2UgY2FuIHBhc3MgYSBKU1ZhbHVlIG9y IGEgU2NyaXB0VmFsdWUuCi0gICAgRXhjZXB0aW9uQ29kZSBlYyA9IDA7Ci0gICAgSlNQcm9taXNl RGVmZXJyZWQmIHByb21pc2VEZWZlcnJlZCA9ICpKU1Byb21pc2VEZWZlcnJlZDo6Y3JlYXRlKGV4 ZWMsIGdsb2JhbE9iamVjdCgpKTsKLSAgICBpbXBsKCkuY2FuY2VsKGV4ZWMtPmFyZ3VtZW50KDAp LCBEZWZlcnJlZFdyYXBwZXIoZXhlYywgZ2xvYmFsT2JqZWN0KCksICZwcm9taXNlRGVmZXJyZWQp LCBlYyk7Ci0KLSAgICBpZiAoZWMpCi0gICAgICAgIERlZmVycmVkV3JhcHBlcihleGVjLCBnbG9i YWxPYmplY3QoKSwgJnByb21pc2VEZWZlcnJlZCkucmVqZWN0KGVjKTsKLQotICAgIHJldHVybiBw cm9taXNlRGVmZXJyZWQucHJvbWlzZSgpOwotfQotCiBKU1ZhbHVlIEpTUmVhZGFibGVTdHJlYW06 OnBpcGVUbyhFeGVjU3RhdGUqIGV4ZWMpCiB7CiAgICAgSlNWYWx1ZSBlcnJvciA9IGNyZWF0ZUVy cm9yKGV4ZWMsIEFTQ0lJTGl0ZXJhbCgicGlwZVRvIGlzIG5vdCBpbXBsZW1lbnRlZCIpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTUmVhZGFibGVTdHJlYW1SZWFk ZXJDdXN0b20uY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNSZWFkYWJsZVN0cmVh bVJlYWRlckN1c3RvbS5jcHAKaW5kZXggYWEyYmY1NGI5M2VlZDQ3OThjZDk1NDkxODQxMjRmYjUy OTFhM2M3Yy4uMjAyZWUxNjY5NjY0ZTI5ZGE0ZTljMjgyMDFhMDEyZmEyNmZhYjdjMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNSZWFkYWJsZVN0cmVhbVJlYWRlckN1 c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNSZWFkYWJsZVN0cmVh bVJlYWRlckN1c3RvbS5jcHAKQEAgLTc3LDE0ICs3Nyw2IEBAIEpTVmFsdWUgSlNSZWFkYWJsZVN0 cmVhbVJlYWRlcjo6Y2xvc2VkKEV4ZWNTdGF0ZSogZXhlYykgY29uc3QKICAgICByZXR1cm4gbV9j bG9zZWRQcm9taXNlRGVmZXJyZWQtPnByb21pc2UoKTsKIH0KIAotSlNWYWx1ZSBKU1JlYWRhYmxl U3RyZWFtUmVhZGVyOjpjYW5jZWwoRXhlY1N0YXRlKiBleGVjKQotewotICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgYmUgYWJsZSB0byByZW1vdmUgdGhpcyBjdXN0b20gYmluZGluZywgb25jZSB3ZSBj YW4gcGFzcyBhIEpTVmFsdWUgb3IgYSBTY3JpcHRWYWx1ZS4KLSAgICBKU1Byb21pc2VEZWZlcnJl ZCYgcHJvbWlzZURlZmVycmVkID0gKkpTUHJvbWlzZURlZmVycmVkOjpjcmVhdGUoZXhlYywgZ2xv YmFsT2JqZWN0KCkpOwotICAgIGltcGwoKS5jYW5jZWwoZXhlYy0+YXJndW1lbnQoMCksIERlZmVy cmVkV3JhcHBlcihleGVjLCBnbG9iYWxPYmplY3QoKSwgJnByb21pc2VEZWZlcnJlZCkpOwotICAg IHJldHVybiBwcm9taXNlRGVmZXJyZWQucHJvbWlzZSgpOwotfQotCiBFbmNvZGVkSlNWYWx1ZSBK U0NfSE9TVF9DQUxMIGNvbnN0cnVjdEpTUmVhZGFibGVTdHJlYW1SZWFkZXIoRXhlY1N0YXRlKiBl eGVjKQogewogICAgIGlmICghZXhlYy0+YXJndW1lbnRDb3VudCgpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9ySlMucG0gYi9Tb3VyY2Uv V2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQppbmRleCBlOGNiMjQ1 MzJmMTk3MTQ0YzNiY2JjZjA0MjVmNGMzMTNjZGU4OTM4Li5jMjQ1YTM1NDJiMTc3MjUwN2ViOWVh NzRiYjczY2Q4NzAxOWI0OGJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9z Y3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQpAQCAtMzI0Myw3ICszMjQzLDcgQEAgc3ViIEdlbmVy YXRlUGFyYW1ldGVyc0NoZWNrCiAgICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAg aWYgKGFyZ3NDb3VudCA8PSAkYXJnc0luZGV4KSB7XG4iKTsKIAogICAgICAgICAgICAgbXkgQG9w dGlvbmFsQ2FsbGJhY2tBcmd1bWVudHMgPSBAYXJndW1lbnRzOwotICAgICAgICAgICAgcHVzaChA b3B0aW9uYWxDYWxsYmFja0FyZ3VtZW50cywgImVjIikgaWYgJHJhaXNlc0V4Y2VwdGlvbjsKKyAg ICAgICAgICAgIHB1c2ggQG9wdGlvbmFsQ2FsbGJhY2tBcmd1bWVudHMsIEdlbmVyYXRlUmV0dXJu UGFyYW1ldGVycygkZnVuY3Rpb24pOwogICAgICAgICAgICAgbXkgJGZ1bmN0aW9uU3RyaW5nID0g IiRmdW5jdGlvbk5hbWUoIiAuIGpvaW4oIiwgIiwgQG9wdGlvbmFsQ2FsbGJhY2tBcmd1bWVudHMp IC4gIikiOwogICAgICAgICAgICAgR2VuZXJhdGVJbXBsZW1lbnRhdGlvbkZ1bmN0aW9uQ2FsbCgk ZnVuY3Rpb24sICRmdW5jdGlvblN0cmluZywgIiAgICAiIHggMiwgJHN2Z1Byb3BlcnR5VHlwZSwg JGludGVyZmFjZU5hbWUpOwogICAgICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgIH1c blxuIik7CkBAIC0zNDExLDEzICszNDExLDIxIEBAIHN1YiBHZW5lcmF0ZVBhcmFtZXRlcnNDaGVj awogICAgICAgICAkYXJnc0luZGV4Kys7CiAgICAgfQogCi0gICAgcHVzaChAYXJndW1lbnRzLCAi RGVmZXJyZWRXcmFwcGVyKGV4ZWMsIGNhc3RlZFRoaXMtPmdsb2JhbE9iamVjdCgpLCBwcm9taXNl RGVmZXJyZWQpIikgaWYgSXNSZXR1cm5pbmdQcm9taXNlKCRmdW5jdGlvbik7Ci0KLSAgICBwdXNo KEBhcmd1bWVudHMsICJlYyIpIGlmICRyYWlzZXNFeGNlcHRpb247CisgICAgcHVzaCBAYXJndW1l bnRzLCBHZW5lcmF0ZVJldHVyblBhcmFtZXRlcnMoJGZ1bmN0aW9uKTsKIAogICAgIHJldHVybiAo IiRmdW5jdGlvbk5hbWUoIiAuIGpvaW4oIiwgIiwgQGFyZ3VtZW50cykgLiAiKSIsIHNjYWxhciBA YXJndW1lbnRzKTsKIH0KIAorc3ViIEdlbmVyYXRlUmV0dXJuUGFyYW1ldGVycworeworICAgIG15 ICRmdW5jdGlvbiA9IHNoaWZ0OworICAgIG15IEBhcmd1bWVudHM7CisKKyAgICBwdXNoKEBhcmd1 bWVudHMsICJEZWZlcnJlZFdyYXBwZXIoZXhlYywgY2FzdGVkVGhpcy0+Z2xvYmFsT2JqZWN0KCks IHByb21pc2VEZWZlcnJlZCkiKSBpZiBJc1JldHVybmluZ1Byb21pc2UoJGZ1bmN0aW9uKTsKKyAg ICBwdXNoKEBhcmd1bWVudHMsICJlYyIpIGlmICRmdW5jdGlvbi0+c2lnbmF0dXJlLT5leHRlbmRl ZEF0dHJpYnV0ZXMtPnsiUmFpc2VzRXhjZXB0aW9uIn07CisgICAgcmV0dXJuIEBhcmd1bWVudHM7 Cit9CisKIHN1YiBHZW5lcmF0ZUNhbGxiYWNrSGVhZGVyCiB7CiAgICAgbXkgJG9iamVjdCA9IHNo aWZ0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L0pT L0pTVGVzdE9iai5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMv SlNUZXN0T2JqLmNwcAppbmRleCBhOTQ2MTljMjMxMzU5MmVkMGNlZjMyNGI0NDEyNzAyMThlMjVh MzNmLi42NWFmNmEwZTJhMzQ0NWRlZTQ2MzZiODY0ZjllOGUwNjYzM2E2NzNjIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvSlMvSlNUZXN0T2JqLmNw cApAQCAtMTU5LDYgKzE1OSw3IEBAIEpTQzo6RW5jb2RlZEpTVmFsdWUgSlNDX0hPU1RfQ0FMTCBq c1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvbkFueShKU0M6OkV4ZWNTdGF0ZSopCiBKU0M6OkVuY29k ZWRKU1ZhbHVlIEpTQ19IT1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25UZXN0UHJv bWlzZUZ1bmN0aW9uKEpTQzo6RXhlY1N0YXRlKik7CiBKU0M6OkVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25UZXN0UHJvbWlzZUZ1bmN0aW9uV2l0 aEZsb2F0QXJndW1lbnQoSlNDOjpFeGVjU3RhdGUqKTsKIEpTQzo6RW5jb2RlZEpTVmFsdWUgSlND X0hPU1RfQ0FMTCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvblRlc3RQcm9taXNlRnVuY3Rpb25X aXRoRXhjZXB0aW9uKEpTQzo6RXhlY1N0YXRlKik7CitKU0M6OkVuY29kZWRKU1ZhbHVlIEpTQ19I T1NUX0NBTEwganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25UZXN0UHJvbWlzZUZ1bmN0aW9uV2l0 aE9wdGlvbmFsSW50QXJndW1lbnQoSlNDOjpFeGVjU3RhdGUqKTsKIAogLy8gQXR0cmlidXRlcwog CkBAIC02NTYsNiArNjU3LDcgQEAgc3RhdGljIGNvbnN0IEhhc2hUYWJsZVZhbHVlIEpTVGVzdE9i alByb3RvdHlwZVRhYmxlVmFsdWVzW10gPQogICAgIHsgInRlc3RQcm9taXNlRnVuY3Rpb24iLCBK U0M6OkZ1bmN0aW9uLCBOb0ludHJpbnNpYywgKGludHB0cl90KXN0YXRpY19jYXN0PE5hdGl2ZUZ1 bmN0aW9uPihqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvblRlc3RQcm9taXNlRnVuY3Rpb24pLCAo aW50cHRyX3QpICgwKSB9LAogICAgIHsgInRlc3RQcm9taXNlRnVuY3Rpb25XaXRoRmxvYXRBcmd1 bWVudCIsIEpTQzo6RnVuY3Rpb24sIE5vSW50cmluc2ljLCAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8 TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uVGVzdFByb21pc2VGdW5j dGlvbldpdGhGbG9hdEFyZ3VtZW50KSwgKGludHB0cl90KSAoMSkgfSwKICAgICB7ICJ0ZXN0UHJv bWlzZUZ1bmN0aW9uV2l0aEV4Y2VwdGlvbiIsIEpTQzo6RnVuY3Rpb24sIE5vSW50cmluc2ljLCAo aW50cHRyX3Qpc3RhdGljX2Nhc3Q8TmF0aXZlRnVuY3Rpb24+KGpzVGVzdE9ialByb3RvdHlwZUZ1 bmN0aW9uVGVzdFByb21pc2VGdW5jdGlvbldpdGhFeGNlcHRpb24pLCAoaW50cHRyX3QpICgwKSB9 LAorICAgIHsgInRlc3RQcm9taXNlRnVuY3Rpb25XaXRoT3B0aW9uYWxJbnRBcmd1bWVudCIsIEpT Qzo6RnVuY3Rpb24sIE5vSW50cmluc2ljLCAoaW50cHRyX3Qpc3RhdGljX2Nhc3Q8TmF0aXZlRnVu Y3Rpb24+KGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uVGVzdFByb21pc2VGdW5jdGlvbldpdGhP cHRpb25hbEludEFyZ3VtZW50KSwgKGludHB0cl90KSAoMCkgfSwKIH07CiAKIGNvbnN0IENsYXNz SW5mbyBKU1Rlc3RPYmpQcm90b3R5cGU6OnNfaW5mbyA9IHsgIlRlc3RPYmplY3RQcm90b3R5cGUi LCAmQmFzZTo6c19pbmZvLCAwLCBDUkVBVEVfTUVUSE9EX1RBQkxFKEpTVGVzdE9ialByb3RvdHlw ZSkgfTsKQEAgLTQ0OTYsNiArNDQ5OCwzNCBAQCBzdGF0aWMgaW5saW5lIEVuY29kZWRKU1ZhbHVl IGpzVGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uVGVzdFByb21pc2VGdW5jdGlvbldpdGhFeAogICAg IHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CiB9CiAKK3N0YXRpYyBpbmxp bmUgRW5jb2RlZEpTVmFsdWUganNUZXN0T2JqUHJvdG90eXBlRnVuY3Rpb25UZXN0UHJvbWlzZUZ1 bmN0aW9uV2l0aE9wdGlvbmFsSW50QXJndW1lbnRQcm9taXNlKEV4ZWNTdGF0ZSosIEpTVGVzdE9i aiosIEpTUHJvbWlzZURlZmVycmVkKik7CitFbmNvZGVkSlNWYWx1ZSBKU0NfSE9TVF9DQUxMIGpz VGVzdE9ialByb3RvdHlwZUZ1bmN0aW9uVGVzdFByb21pc2VGdW5jdGlvbldpdGhPcHRpb25hbElu dEFyZ3VtZW50KEV4ZWNTdGF0ZSogZXhlYykKK3sKKyAgICBKU1ZhbHVlIHRoaXNWYWx1ZSA9IGV4 ZWMtPnRoaXNWYWx1ZSgpOworICAgIEpTVGVzdE9iaiogY2FzdGVkVGhpcyA9IGpzRHluYW1pY0Nh c3Q8SlNUZXN0T2JqKj4odGhpc1ZhbHVlKTsKKyAgICBpZiAoVU5MSUtFTFkoIWNhc3RlZFRoaXMp KQorICAgICAgICByZXR1cm4gdGhyb3dUaGlzVHlwZUVycm9yKCpleGVjLCAiVGVzdE9iaiIsICJ0 ZXN0UHJvbWlzZUZ1bmN0aW9uV2l0aE9wdGlvbmFsSW50QXJndW1lbnQiKTsKKyAgICBBU1NFUlRf R0NfT0JKRUNUX0lOSEVSSVRTKGNhc3RlZFRoaXMsIEpTVGVzdE9iajo6aW5mbygpKTsKKyAgICBy ZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGNhbGxQcm9taXNlRnVuY3Rpb24oKmV4ZWMsICpjYXN0ZWRU aGlzLCBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvblRlc3RQcm9taXNlRnVuY3Rpb25XaXRoT3B0 aW9uYWxJbnRBcmd1bWVudFByb21pc2UpKTsKK30KKworc3RhdGljIGlubGluZSBFbmNvZGVkSlNW YWx1ZSBqc1Rlc3RPYmpQcm90b3R5cGVGdW5jdGlvblRlc3RQcm9taXNlRnVuY3Rpb25XaXRoT3B0 aW9uYWxJbnRBcmd1bWVudFByb21pc2UoRXhlY1N0YXRlKiBleGVjLCBKU1Rlc3RPYmoqIGNhc3Rl ZFRoaXMsIEpTUHJvbWlzZURlZmVycmVkKiBwcm9taXNlRGVmZXJyZWQpCit7CisgICAgYXV0byYg aW1wbCA9IGNhc3RlZFRoaXMtPmltcGwoKTsKKworICAgIHNpemVfdCBhcmdzQ291bnQgPSBleGVj LT5hcmd1bWVudENvdW50KCk7CisgICAgaWYgKGFyZ3NDb3VudCA8PSAwKSB7CisgICAgICAgIGlt cGwudGVzdFByb21pc2VGdW5jdGlvbldpdGhPcHRpb25hbEludEFyZ3VtZW50KERlZmVycmVkV3Jh cHBlcihleGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSwgcHJvbWlzZURlZmVycmVkKSk7 CisgICAgICAgIHJldHVybiBKU1ZhbHVlOjplbmNvZGUoanNVbmRlZmluZWQoKSk7CisgICAgfQor CisgICAgaW50IGEgPSB0b0ludDMyKGV4ZWMsIGV4ZWMtPmFyZ3VtZW50KDApLCBOb3JtYWxDb252 ZXJzaW9uKTsKKyAgICBpZiAoVU5MSUtFTFkoZXhlYy0+aGFkRXhjZXB0aW9uKCkpKQorICAgICAg ICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOworICAgIGltcGwudGVzdFBy b21pc2VGdW5jdGlvbldpdGhPcHRpb25hbEludEFyZ3VtZW50KGEsIERlZmVycmVkV3JhcHBlcihl eGVjLCBjYXN0ZWRUaGlzLT5nbG9iYWxPYmplY3QoKSwgcHJvbWlzZURlZmVycmVkKSk7CisgICAg cmV0dXJuIEpTVmFsdWU6OmVuY29kZShqc1VuZGVmaW5lZCgpKTsKK30KKwogdm9pZCBKU1Rlc3RP Ymo6OnZpc2l0Q2hpbGRyZW4oSlNDZWxsKiBjZWxsLCBTbG90VmlzaXRvciYgdmlzaXRvcikKIHsK ICAgICBhdXRvKiB0aGlzT2JqZWN0ID0ganNDYXN0PEpTVGVzdE9iaio+KGNlbGwpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsIGIv U291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Rlc3RPYmouaWRsCmluZGV4IDIy NmQwMDY1YmVmNTU5MWRjMmYzNzk0ZmEwNDk5MzI2YjlhODU2YjIuLmNlODA0MmZjMDQwNTQyNjcy NTljNmE5N2Y0ZGUyNWM2MzViM2UzZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9UZXN0T2JqLmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvVGVzdE9iai5pZGwKQEAgLTI3OCw2ICsyNzgsNyBAQCBlbnVtIF9vcHRp b25hbCB7ICIiLCAiT3B0aW9uYWxWYWx1ZTEiLCAiT3B0aW9uYWxWYWx1ZTIiLCAiT3B0aW9uYWxW YWx1ZTMiIH07CiAgICAgUHJvbWlzZSB0ZXN0UHJvbWlzZUZ1bmN0aW9uKCk7CiAgICAgUHJvbWlz ZSB0ZXN0UHJvbWlzZUZ1bmN0aW9uV2l0aEZsb2F0QXJndW1lbnQoZmxvYXQgYSk7CiAgICAgW1Jh aXNlc0V4Y2VwdGlvbl0gUHJvbWlzZSB0ZXN0UHJvbWlzZUZ1bmN0aW9uV2l0aEV4Y2VwdGlvbigp OworICAgIFByb21pc2UgdGVzdFByb21pc2VGdW5jdGlvbldpdGhPcHRpb25hbEludEFyZ3VtZW50 KG9wdGlvbmFsIGxvbmcgYSk7CiB9OwogCiAvLyBUaGUgZm9sbG93aW5nIGNvbW1lbnQgc2hvdWxk IG5vdCBnZW5lcmF0ZSBhbnkgY29kZS4K