76419 2012-01-16 19:20:07 -0800 AssociatedURLLoader doesn't support Access-Control-Expose-Header field in response. 2012-01-17 02:26:50 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 bbudge webkit-unassigned abarth webkit.review.bot oldest_to_newest 536849 0 bbudge 2012-01-16 19:20:07 -0800 AssociatedURLLoader filters all non-whitelisted HTTP response headers when using CORS access control. Add support for the HTTP response header Access-Control-Expose-Header. 536852 1 122704 bbudge 2012-01-16 19:29:06 -0800 Created attachment 122704 Proposed Patch 536853 2 webkit.review.bot 2012-01-16 19:31:13 -0800 Attachment 122704 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/chromium/ChangeLog', u'Sourc..." exit_code: 1 Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp:43: wtf includes should be <wtf/file.h> instead of "wtf/file.h". [build/include] [4] Source/WebKit/chromium/src/AssociatedURLLoader.cpp:107: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 536884 3 122713 bbudge 2012-01-16 21:58:38 -0800 Created attachment 122713 Proposed Patch 536956 4 122713 abarth 2012-01-17 01:18:22 -0800 Comment on attachment 122713 Proposed Patch It's unfortunate that we need to duplicate this logic from XMLHttpRequest. It feels like we're missing some common piece of infrastructure that the two could shard. 536977 5 122713 webkit.review.bot 2012-01-17 02:26:46 -0800 Comment on attachment 122713 Proposed Patch Clearing flags on attachment: 122713 Committed r105134: <http://trac.webkit.org/changeset/105134> 536978 6 webkit.review.bot 2012-01-17 02:26:50 -0800 All reviewed patches have been landed. Closing bug. 122704 2012-01-16 19:29:06 -0800 2012-01-16 21:58:38 -0800 Proposed Patch aaa.txt text/plain 11171 bbudge SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDUxMjApCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTAxLTE2ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KKworICAg ICAgICBBc3NvY2lhdGVkVVJMTG9hZGVyIGFkZHMgc3VwcG9ydCBmb3IgdGhlIEhUVFAgcmVzcG9u c2UgaGVhZGVyIEFjY2Vzcy1Db250cm9sLUV4cG9zZS1IZWFkZXIuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjQxOQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL0Fzc29jaWF0ZWRVUkxMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpBc3NvY2lhdGVkVVJMTG9hZGVyOjpDbGllbnRBZGFwdGVy OjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIHRlc3RzL0Fzc29jaWF0ZWRVUkxMb2Fk ZXJUZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QXNzb2NpYXRlZFVSTExvYWRlclRlc3Q6OkNo ZWNrQWNjZXNzQ29udHJvbEhlYWRlcnMpOgorICAgICAgICAoV2ViS2l0OjpURVNUX0YpOgorCiAy MDEyLTAxLTE2ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBD aGFuZ2VzIEFzc29jaWF0ZWRVUkxMb2FkZXIgdG8gcmVtb3ZlIG5vbi13aGl0ZWxpc3RlZCBIVFRQ IHJlc3BvbnNlIGhlYWRlcnMgZm9yIENPUlMgcmVxdWVzdHMsCkluZGV4OiBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9Bc3NvY2lhdGVkVVJMTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NvY2lhdGVkVVJMTG9hZGVyLmNwcAkocmV2aXNpb24g MTA1MTIwKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQXNzb2NpYXRlZFVSTExvYWRl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDEwLCAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTAsIDIwMTEsIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTUwLDcgKzUwLDcgQEAKICNp bmNsdWRlICJwbGF0Zm9ybS9XZWJVUkxFcnJvci5oIgogI2luY2x1ZGUgInBsYXRmb3JtL1dlYlVS TExvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgInBsYXRmb3JtL1dlYlVSTFJlcXVlc3QuaCIKLSNp bmNsdWRlIDx3dGYvVmVjdG9yLmg+CisjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC03 Miw2ICs3Miw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzU2FmZTsKIH07CiAKK3R5cGVkZWYg SGFzaFNldDxTdHJpbmcsIENhc2VGb2xkaW5nSGFzaD4gSFRUUEhlYWRlclNldDsKKwogdm9pZCBI VFRQUmVxdWVzdEhlYWRlclZhbGlkYXRvcjo6dmlzaXRIZWFkZXIoY29uc3QgV2ViU3RyaW5nJiBu YW1lLCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlKQogewogICAgIG1faXNTYWZlID0gbV9pc1NhZmUg JiYgaXNWYWxpZEhUVFBUb2tlbihuYW1lKSAmJiBYTUxIdHRwUmVxdWVzdDo6aXNBbGxvd2VkSFRU UEhlYWRlcihuYW1lKSAmJiBpc1ZhbGlkSFRUUEhlYWRlclZhbHVlKHZhbHVlKTsKQEAgLTgzLDIx ICs4NSwzOSBAQCBwdWJsaWM6CiAgICAgSFRUUFJlc3BvbnNlSGVhZGVyVmFsaWRhdG9yKGJvb2wg dXNpbmdBY2Nlc3NDb250cm9sKSA6IG1fdXNpbmdBY2Nlc3NDb250cm9sKHVzaW5nQWNjZXNzQ29u dHJvbCkgeyB9CiAKICAgICB2b2lkIHZpc2l0SGVhZGVyKGNvbnN0IFdlYlN0cmluZyYgbmFtZSwg Y29uc3QgV2ViU3RyaW5nJiB2YWx1ZSk7Ci0gICAgY29uc3QgVmVjdG9yPFdlYlN0cmluZz4mIGRp c2FsbG93ZWRIZWFkZXJzKCkgY29uc3QgeyByZXR1cm4gbV9kaXNhbGxvd2VkSGVhZGVyczsgfQor ICAgIGNvbnN0IEhUVFBIZWFkZXJTZXQmIGJsb2NrZWRIZWFkZXJzKCk7CiAKIHByaXZhdGU6Ci0g ICAgVmVjdG9yPFdlYlN0cmluZz4gbV9kaXNhbGxvd2VkSGVhZGVyczsKKyAgICBIVFRQSGVhZGVy U2V0IG1fZXhwb3NlZEhlYWRlcnM7CisgICAgSFRUUEhlYWRlclNldCBtX2Jsb2NrZWRIZWFkZXJz OwogICAgIGJvb2wgbV91c2luZ0FjY2Vzc0NvbnRyb2w7CiB9OwogCiB2b2lkIEhUVFBSZXNwb25z ZUhlYWRlclZhbGlkYXRvcjo6dmlzaXRIZWFkZXIoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25z dCBXZWJTdHJpbmcmIHZhbHVlKQogewogICAgIFN0cmluZyBoZWFkZXJOYW1lKG5hbWUpOwotICAg IC8vIEhpZGUgbm9uLXdoaXRlbGlzdGVkIGhlYWRlcnMgZm9yIENPUlMgcmVxdWVzdHMuCi0gICAg Ly8gSGlkZSBTZXQtQ29va2llIGhlYWRlcnMgZm9yIGFsbCByZXF1ZXN0cy4KLSAgICBpZiAoKG1f dXNpbmdBY2Nlc3NDb250cm9sICYmICFpc09uQWNjZXNzQ29udHJvbFJlc3BvbnNlSGVhZGVyV2hp dGVsaXN0KGhlYWRlck5hbWUpKQotICAgICAgICAgfHwgKGVxdWFsSWdub3JpbmdDYXNlKGhlYWRl ck5hbWUsICJzZXQtY29va2llIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoaGVhZGVyTmFtZSwgInNl dC1jb29raWUyIikpKQotICAgICAgICBtX2Rpc2FsbG93ZWRIZWFkZXJzLmFwcGVuZChuYW1lKTsK KyAgICBpZiAobV91c2luZ0FjY2Vzc0NvbnRyb2wpIHsKKyAgICAgICAgaWYgKGVxdWFsSWdub3Jp bmdDYXNlKGhlYWRlck5hbWUsICJhY2Nlc3MtY29udHJvbC1leHBvc2UtaGVhZGVyIikpCisgICAg ICAgICAgICBwYXJzZUFjY2Vzc0NvbnRyb2xFeHBvc2VIZWFkZXJzQWxsb3dMaXN0KHZhbHVlLCBt X2V4cG9zZWRIZWFkZXJzKTsKKyAgICAgICAgZWxzZSBpZiAoIWlzT25BY2Nlc3NDb250cm9sUmVz cG9uc2VIZWFkZXJXaGl0ZWxpc3QoaGVhZGVyTmFtZSkpCisgICAgICAgICAgICBtX2Jsb2NrZWRI ZWFkZXJzLmFkZChuYW1lKTsKKyAgICB9Cit9CisKK2NvbnN0IEhUVFBIZWFkZXJTZXQmIEhUVFBS ZXNwb25zZUhlYWRlclZhbGlkYXRvcjo6YmxvY2tlZEhlYWRlcnMoKSB7CisgICAgLy8gUmVtb3Zl IGV4cG9zZWQgaGVhZGVycyBmcm9tIHRoZSBibG9ja2VkIHNldC4KKyAgICBpZiAoIW1fZXhwb3Nl ZEhlYWRlcnMuaXNFbXB0eSgpKSB7CisgICAgICAgIC8vIERvbid0IGFsbG93IFNldC1Db29raWUg aGVhZGVycyB0byBiZSBleHBvc2VkLgorICAgICAgICBtX2V4cG9zZWRIZWFkZXJzLnJlbW92ZSgi c2V0LWNvb2tpZSIpOworICAgICAgICBtX2V4cG9zZWRIZWFkZXJzLnJlbW92ZSgic2V0LWNvb2tp ZTIiKTsKKyAgICAgICAgLy8gQmxvY2sgQWNjZXNzLUNvbnRyb2wtRXhwb3NlLUhlYWRlciBpdHNl bGYuIEl0IGNvdWxkIGJlIGV4cG9zZWQgbGF0ZXIuCisgICAgICAgIG1fYmxvY2tlZEhlYWRlcnMu YWRkKCJhY2Nlc3MtY29udHJvbC1leHBvc2UtaGVhZGVyIik7CisgICAgICAgIEhUVFBIZWFkZXJT ZXQ6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fZXhwb3NlZEhlYWRlcnMuZW5kKCk7CisgICAgICAg IGZvciAoSFRUUEhlYWRlclNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX2V4cG9zZWRIZWFkZXJz LmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICAgICAgICAgIG1fYmxvY2tlZEhlYWRlcnMu cmVtb3ZlKCppdCk7CisgICAgfQorCisgICAgcmV0dXJuIG1fYmxvY2tlZEhlYWRlcnM7CiB9CiAK IH0KQEAgLTE4NywxMiArMjA3LDEzIEBAIHZvaWQgQXNzb2NpYXRlZFVSTExvYWRlcjo6Q2xpZW50 QWRhcHRlcjoKICAgICBXZWJVUkxSZXNwb25zZSB2YWxpZGF0ZWRSZXNwb25zZSA9IFdyYXBwZWRS ZXNvdXJjZVJlc3BvbnNlKHJlc3BvbnNlKTsKICAgICBIVFRQUmVzcG9uc2VIZWFkZXJWYWxpZGF0 b3IgdmFsaWRhdG9yKG1fb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQb2xpY3kgPT0gV2ViVVJM TG9hZGVyT3B0aW9uczo6Q3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5VXNlQWNjZXNzQ29udHJvbCk7 CiAgICAgdmFsaWRhdGVkUmVzcG9uc2UudmlzaXRIVFRQSGVhZGVyRmllbGRzKCZ2YWxpZGF0b3Ip OwotICAgIC8vIElmIHRoZXJlIGFyZSBkaXNhbGxvd2VkIGhlYWRlcnMsIGNvcHkgdGhlIHJlc3Bv bnNlIHNvIHdlIGNhbiByZW1vdmUgdGhlbS4KLSAgICBjb25zdCBWZWN0b3I8V2ViU3RyaW5nPiYg ZGlzYWxsb3dlZEhlYWRlcnMgPSB2YWxpZGF0b3IuZGlzYWxsb3dlZEhlYWRlcnMoKTsKLSAgICBp ZiAoIWRpc2FsbG93ZWRIZWFkZXJzLmlzRW1wdHkoKSkgeworICAgIC8vIElmIHRoZXJlIGFyZSBi bG9ja2VkIGhlYWRlcnMsIGNvcHkgdGhlIHJlc3BvbnNlIHNvIHdlIGNhbiByZW1vdmUgdGhlbS4K KyAgICBjb25zdCBIVFRQSGVhZGVyU2V0JiBibG9ja2VkSGVhZGVycyA9IHZhbGlkYXRvci5ibG9j a2VkSGVhZGVycygpOworICAgIGlmICghYmxvY2tlZEhlYWRlcnMuaXNFbXB0eSgpKSB7CiAgICAg ICAgIHZhbGlkYXRlZFJlc3BvbnNlID0gV2ViVVJMUmVzcG9uc2UodmFsaWRhdGVkUmVzcG9uc2Up OwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGRpc2FsbG93ZWRIZWFkZXJzLnNpemUo KTsgKytpKQotICAgICAgICAgICAgdmFsaWRhdGVkUmVzcG9uc2UuY2xlYXJIVFRQSGVhZGVyRmll bGQoZGlzYWxsb3dlZEhlYWRlcnNbaV0pOworICAgICAgICBIVFRQSGVhZGVyU2V0Ojpjb25zdF9p dGVyYXRvciBlbmQgPSBibG9ja2VkSGVhZGVycy5lbmQoKTsKKyAgICAgICAgZm9yIChIVFRQSGVh ZGVyU2V0Ojpjb25zdF9pdGVyYXRvciBpdCA9IGJsb2NrZWRIZWFkZXJzLmJlZ2luKCk7IGl0ICE9 IGVuZDsgKytpdCkKKyAgICAgICAgICAgIHZhbGlkYXRlZFJlc3BvbnNlLmNsZWFySFRUUEhlYWRl ckZpZWxkKCppdCk7CiAgICAgfQogICAgIG1fY2xpZW50LT5kaWRSZWNlaXZlUmVzcG9uc2UobV9s b2FkZXIsIHZhbGlkYXRlZFJlc3BvbnNlKTsKIH0KSW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvQXNzb2NpYXRlZFVSTExvYWRlclRlc3QuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQXNzb2NpYXRlZFVSTExvYWRlclRlc3QuY3BwCShyZXZp c2lvbiAxMDUxMTkpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0Fzc29jaWF0ZWRV UkxMb2FkZXJUZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDAsNiArNDAsNyBAQAogI2luY2x1 ZGUgInBsYXRmb3JtL1dlYlVSTExvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgInBsYXRmb3JtL1dl YlVSTFJlcXVlc3QuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9XZWJVUkxSZXNwb25zZS5oIgorI2lu Y2x1ZGUgInd0Zi90ZXh0L1dURlN0cmluZy5oIgogCiAjaW5jbHVkZSA8Z29vZ2xldXJsL3NyYy9n dXJsLmg+CiAjaW5jbHVkZSA8Z3Rlc3QvZ3Rlc3QuaD4KQEAgLTIyMSw2ICsyMjIsNDIgQEAgcHVi bGljOgogICAgICAgICBFWFBFQ1RfRkFMU0UobV9kaWRSZWNlaXZlUmVzcG9uc2UpOwogICAgIH0K IAorICAgIGJvb2wgQ2hlY2tBY2Nlc3NDb250cm9sSGVhZGVycyhjb25zdCBjaGFyKiBoZWFkZXJO YW1lLCBib29sIGV4cG9zZWQpCisgICAgeworICAgICAgICBzdGQ6OnN0cmluZyBpZCgiaHR0cDov L3d3dy5vdGhlci5jb20vQ2hlY2tBY2Nlc3NDb250cm9sRXhwb3NlSGVhZGVyc18iKTsKKyAgICAg ICAgaWQuYXBwZW5kKGhlYWRlck5hbWUpOworICAgICAgICBpZiAoZXhwb3NlZCkKKyAgICAgICAg ICAgIGlkLmFwcGVuZCgiLUV4cG9zZWQiKTsKKyAgICAgICAgaWQuYXBwZW5kKCIuaHRtbCIpOwor CisgICAgICAgIEdVUkwgdXJsID0gR1VSTChpZCk7CisgICAgICAgIFdlYlVSTFJlcXVlc3QgcmVx dWVzdDsKKyAgICAgICAgcmVxdWVzdC5pbml0aWFsaXplKCk7CisgICAgICAgIHJlcXVlc3Quc2V0 VVJMKHVybCk7CisKKyAgICAgICAgV2ViU3RyaW5nIGhlYWRlck5hbWVTdHJpbmcoV2ViU3RyaW5n Ojpmcm9tVVRGOChoZWFkZXJOYW1lKSk7CisgICAgICAgIG1fZXhwZWN0ZWRSZXNwb25zZSA9IFdl YlVSTFJlc3BvbnNlKCk7CisgICAgICAgIG1fZXhwZWN0ZWRSZXNwb25zZS5pbml0aWFsaXplKCk7 CisgICAgICAgIG1fZXhwZWN0ZWRSZXNwb25zZS5zZXRNSU1FVHlwZSgidGV4dC9odG1sIik7Cisg ICAgICAgIG1fZXhwZWN0ZWRSZXNwb25zZS5hZGRIVFRQSGVhZGVyRmllbGQoIkFjY2Vzcy1Db250 cm9sLUFsbG93LU9yaWdpbiIsICIqIik7CisgICAgICAgIGlmIChleHBvc2VkKQorICAgICAgICAg ICAgbV9leHBlY3RlZFJlc3BvbnNlLmFkZEhUVFBIZWFkZXJGaWVsZCgiYWNjZXNzLWNvbnRyb2wt ZXhwb3NlLWhlYWRlciIsIGhlYWRlck5hbWVTdHJpbmcpOworICAgICAgICBtX2V4cGVjdGVkUmVz cG9uc2UuYWRkSFRUUEhlYWRlckZpZWxkKGhlYWRlck5hbWVTdHJpbmcsICJmb28iKTsKKyAgICAg ICAgd2Via2l0X3N1cHBvcnQ6OlJlZ2lzdGVyTW9ja2VkVVJMKHVybCwgbV9leHBlY3RlZFJlc3Bv bnNlLCBtX2ZyYW1lRmlsZVBhdGgpOworCisgICAgICAgIFdlYlVSTExvYWRlck9wdGlvbnMgb3B0 aW9uczsKKyAgICAgICAgb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQb2xpY3kgPSBXZWJVUkxM b2FkZXJPcHRpb25zOjpDcm9zc09yaWdpblJlcXVlc3RQb2xpY3lVc2VBY2Nlc3NDb250cm9sOwor ICAgICAgICBtX2V4cGVjdGVkTG9hZGVyID0gY3JlYXRlQXNzb2NpYXRlZFVSTExvYWRlcihvcHRp b25zKTsKKyAgICAgICAgRVhQRUNUX1RSVUUobV9leHBlY3RlZExvYWRlcik7CisgICAgICAgIG1f ZXhwZWN0ZWRMb2FkZXItPmxvYWRBc3luY2hyb25vdXNseShyZXF1ZXN0LCB0aGlzKTsKKyAgICAg ICAgc2VydmVSZXF1ZXN0cygpOworICAgICAgICBFWFBFQ1RfVFJVRShtX2RpZFJlY2VpdmVSZXNw b25zZSk7CisgICAgICAgIEVYUEVDVF9UUlVFKG1fZGlkUmVjZWl2ZURhdGEpOworICAgICAgICBF WFBFQ1RfVFJVRShtX2RpZEZpbmlzaExvYWRpbmcpOworCisgICAgICAgIHJldHVybiAhbV9hY3R1 YWxSZXNwb25zZS5odHRwSGVhZGVyRmllbGQoaGVhZGVyTmFtZVN0cmluZykuaXNFbXB0eSgpOwor ICAgIH0KKwogcHJvdGVjdGVkOgogICAgIFdlYlN0cmluZyBtX2ZyYW1lRmlsZVBhdGg7CiAgICAg VGVzdFdlYkZyYW1lQ2xpZW50IG1fd2ViRnJhbWVDbGllbnQ7CkBAIC00ODksNTAgKzUyNiwyOSBA QCBURVNUX0YoQXNzb2NpYXRlZFVSTExvYWRlclRlc3QsIFVudHJ1c3RlCiAgICAgQ2hlY2tIZWFk ZXJGYWlscygiZm9vIiwgImJhclx4MGRceDBheC1jc3JmLXRva2VuOlx4MjB0ZXN0MTIzNCIpOwog fQogCi0vLyBUZXN0IHRoYXQgYSBDT1JTIGxvYWQgb25seSByZXR1cm5zIHdoaXRlbGlzdGVkIGhl YWRlcnMuCisvLyBUZXN0IHRoYXQgdGhlIGxvYWRlciBmaWx0ZXJzIHJlc3BvbnNlIGhlYWRlcnMg YWNjb3JkaW5nIHRvIHRoZSBDT1JTIHN0YW5kYXJkLgogVEVTVF9GKEFzc29jaWF0ZWRVUkxMb2Fk ZXJUZXN0LCBDcm9zc09yaWdpbkhlYWRlcldoaXRlbGlzdGluZykKIHsKLSAgICAvLyBUaGlzIGlz IGNyb3NzLW9yaWdpbiBzaW5jZSB0aGUgZnJhbWUgd2FzIGxvYWRlZCBmcm9tIHd3dy50ZXN0LmNv bS4KLSAgICBHVVJMIHVybCA9IEdVUkwoImh0dHA6Ly93d3cub3RoZXIuY29tL0Nyb3NzT3JpZ2lu SGVhZGVyV2hpdGVsaXN0aW5nLmh0bWwiKTsKLSAgICBXZWJVUkxSZXF1ZXN0IHJlcXVlc3Q7Ci0g ICAgcmVxdWVzdC5pbml0aWFsaXplKCk7Ci0gICAgcmVxdWVzdC5zZXRVUkwodXJsKTsKLQotICAg IG1fZXhwZWN0ZWRSZXNwb25zZSA9IFdlYlVSTFJlc3BvbnNlKCk7Ci0gICAgbV9leHBlY3RlZFJl c3BvbnNlLmluaXRpYWxpemUoKTsKLSAgICBtX2V4cGVjdGVkUmVzcG9uc2Uuc2V0TUlNRVR5cGUo InRleHQvaHRtbCIpOwotICAgIG1fZXhwZWN0ZWRSZXNwb25zZS5hZGRIVFRQSGVhZGVyRmllbGQo IkFjY2Vzcy1Db250cm9sLUFsbG93LU9yaWdpbiIsICIqIik7Ci0gICAgLy8gVGhlc2UgaGVhZGVy cyBhcmUgd2hpdGVsaXN0ZWQgYW5kIHNob3VsZCBiZSBpbiB0aGUgcmVzcG9uc2UuCi0gICAgbV9l eHBlY3RlZFJlc3BvbnNlLmFkZEhUVFBIZWFkZXJGaWVsZCgiY2FjaGUtY29udHJvbCIsICJmb28i KTsKLSAgICBtX2V4cGVjdGVkUmVzcG9uc2UuYWRkSFRUUEhlYWRlckZpZWxkKCJjb250ZW50LWxh bmd1YWdlIiwgImZvbyIpOwotICAgIG1fZXhwZWN0ZWRSZXNwb25zZS5hZGRIVFRQSGVhZGVyRmll bGQoImNvbnRlbnQtdHlwZSIsICJmb28iKTsKLSAgICBtX2V4cGVjdGVkUmVzcG9uc2UuYWRkSFRU UEhlYWRlckZpZWxkKCJleHBpcmVzIiwgImZvbyIpOwotICAgIG1fZXhwZWN0ZWRSZXNwb25zZS5h ZGRIVFRQSGVhZGVyRmllbGQoImxhc3QtbW9kaWZpZWQiLCAiZm9vIik7Ci0gICAgbV9leHBlY3Rl ZFJlc3BvbnNlLmFkZEhUVFBIZWFkZXJGaWVsZCgicHJhZ21hIiwgImZvbyIpOwotICAgIC8vIFRo ZXNlIHNob3VsZCBuZXZlciBiZSBpbiB0aGUgcmVzcG9uc2UuCi0gICAgbV9leHBlY3RlZFJlc3Bv bnNlLmFkZEhUVFBIZWFkZXJGaWVsZCgiU2V0LUNvb2tpZSIsICJmb28iKTsKLSAgICBtX2V4cGVj dGVkUmVzcG9uc2UuYWRkSFRUUEhlYWRlckZpZWxkKCJTZXQtQ29va2llMiIsICJmb28iKTsKLSAg ICB3ZWJraXRfc3VwcG9ydDo6UmVnaXN0ZXJNb2NrZWRVUkwodXJsLCBtX2V4cGVjdGVkUmVzcG9u c2UsIG1fZnJhbWVGaWxlUGF0aCk7Ci0KLSAgICBXZWJVUkxMb2FkZXJPcHRpb25zIG9wdGlvbnM7 Ci0gICAgb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQb2xpY3kgPSBXZWJVUkxMb2FkZXJPcHRp b25zOjpDcm9zc09yaWdpblJlcXVlc3RQb2xpY3lVc2VBY2Nlc3NDb250cm9sOwotICAgIG1fZXhw ZWN0ZWRMb2FkZXIgPSBjcmVhdGVBc3NvY2lhdGVkVVJMTG9hZGVyKG9wdGlvbnMpOwotICAgIEVY UEVDVF9UUlVFKG1fZXhwZWN0ZWRMb2FkZXIpOwotICAgIG1fZXhwZWN0ZWRMb2FkZXItPmxvYWRB c3luY2hyb25vdXNseShyZXF1ZXN0LCB0aGlzKTsKLSAgICBzZXJ2ZVJlcXVlc3RzKCk7Ci0gICAg RVhQRUNUX1RSVUUobV9kaWRSZWNlaXZlUmVzcG9uc2UpOwotICAgIEVYUEVDVF9UUlVFKG1fZGlk UmVjZWl2ZURhdGEpOwotICAgIEVYUEVDVF9UUlVFKG1fZGlkRmluaXNoTG9hZGluZyk7CisgICAg Ly8gVGVzdCB0aGF0IHdoaXRlbGlzdGVkIGhlYWRlcnMgYXJlIHJldHVybmVkIHdpdGhvdXQgZXhw b3NpbmcgdGhlbS4KKyAgICBFWFBFQ1RfVFJVRShDaGVja0FjY2Vzc0NvbnRyb2xIZWFkZXJzKCJj YWNoZS1jb250cm9sIiwgZmFsc2UpKTsKKyAgICBFWFBFQ1RfVFJVRShDaGVja0FjY2Vzc0NvbnRy b2xIZWFkZXJzKCJjb250ZW50LWxhbmd1YWdlIiwgZmFsc2UpKTsKKyAgICBFWFBFQ1RfVFJVRShD aGVja0FjY2Vzc0NvbnRyb2xIZWFkZXJzKCJjb250ZW50LXR5cGUiLCBmYWxzZSkpOworICAgIEVY UEVDVF9UUlVFKENoZWNrQWNjZXNzQ29udHJvbEhlYWRlcnMoImV4cGlyZXMiLCBmYWxzZSkpOwor ICAgIEVYUEVDVF9UUlVFKENoZWNrQWNjZXNzQ29udHJvbEhlYWRlcnMoImxhc3QtbW9kaWZpZWQi LCBmYWxzZSkpOworICAgIEVYUEVDVF9UUlVFKENoZWNrQWNjZXNzQ29udHJvbEhlYWRlcnMoInBy YWdtYSIsIGZhbHNlKSk7CisKKyAgICAvLyBUZXN0IHRoYXQgbm9uLXdoaXRlbGlzdGVkIGhlYWRl cnMgYXJlbid0IHJldHVybmVkLgorICAgIEVYUEVDVF9GQUxTRShDaGVja0FjY2Vzc0NvbnRyb2xI ZWFkZXJzKCJub24td2hpdGVsaXN0ZWQiLCBmYWxzZSkpOworCisgICAgLy8gVGVzdCB0aGF0IFNl dC1Db29raWUgaGVhZGVycyBhcmVuJ3QgcmV0dXJuZWQuCisgICAgRVhQRUNUX0ZBTFNFKENoZWNr QWNjZXNzQ29udHJvbEhlYWRlcnMoIlNldC1Db29raWUiLCBmYWxzZSkpOworICAgIEVYUEVDVF9G QUxTRShDaGVja0FjY2Vzc0NvbnRyb2xIZWFkZXJzKCJTZXQtQ29va2llMiIsIGZhbHNlKSk7CiAK LSAgICBFWFBFQ1RfRkFMU0UobV9hY3R1YWxSZXNwb25zZS5odHRwSGVhZGVyRmllbGQoImNhY2hl LWNvbnRyb2wiKS5pc0VtcHR5KCkpOwotICAgIEVYUEVDVF9GQUxTRShtX2FjdHVhbFJlc3BvbnNl Lmh0dHBIZWFkZXJGaWVsZCgiY29udGVudC1sYW5ndWFnZSIpLmlzRW1wdHkoKSk7Ci0gICAgRVhQ RUNUX0ZBTFNFKG1fYWN0dWFsUmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKCJjb250ZW50LXR5cGUi KS5pc0VtcHR5KCkpOwotICAgIEVYUEVDVF9GQUxTRShtX2FjdHVhbFJlc3BvbnNlLmh0dHBIZWFk ZXJGaWVsZCgiZXhwaXJlcyIpLmlzRW1wdHkoKSk7Ci0gICAgRVhQRUNUX0ZBTFNFKG1fYWN0dWFs UmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKCJsYXN0LW1vZGlmaWVkIikuaXNFbXB0eSgpKTsKLSAg ICBFWFBFQ1RfRkFMU0UobV9hY3R1YWxSZXNwb25zZS5odHRwSGVhZGVyRmllbGQoInByYWdtYSIp LmlzRW1wdHkoKSk7CisgICAgLy8gVGVzdCB0aGF0IGV4cG9zZWQgaGVhZGVycyB0aGF0IGFyZW4n dCB3aGl0ZWxpc3RlZCBhcmUgcmV0dXJuZWQuCisgICAgRVhQRUNUX1RSVUUoQ2hlY2tBY2Nlc3ND b250cm9sSGVhZGVycygibm9uLXdoaXRlbGlzdGVkIiwgdHJ1ZSkpOwogCi0gICAgRVhQRUNUX1RS VUUobV9hY3R1YWxSZXNwb25zZS5odHRwSGVhZGVyRmllbGQoIlNldC1Db29raWUiKS5pc0VtcHR5 KCkpOwotICAgIEVYUEVDVF9UUlVFKG1fYWN0dWFsUmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKCJT ZXQtQ29va2llMiIpLmlzRW1wdHkoKSk7CisgICAgLy8gVGVzdCB0aGF0IFNldC1Db29raWUgaGVh ZGVycyBhcmVuJ3QgcmV0dXJuZWQsIGV2ZW4gaWYgZXhwb3NlZC4KKyAgICBFWFBFQ1RfRkFMU0Uo Q2hlY2tBY2Nlc3NDb250cm9sSGVhZGVycygiU2V0LUNvb2tpZSIsIHRydWUpKTsKIH0KIAogfQo= 122713 2012-01-16 21:58:38 -0800 2012-01-17 02:26:46 -0800 Proposed Patch aaa.txt text/plain 11172 bbudge SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDUxMjApCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTAxLTE2ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KKworICAg ICAgICBBc3NvY2lhdGVkVVJMTG9hZGVyIGFkZHMgc3VwcG9ydCBmb3IgdGhlIEhUVFAgcmVzcG9u c2UgaGVhZGVyIEFjY2Vzcy1Db250cm9sLUV4cG9zZS1IZWFkZXIuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NjQxOQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3JjL0Fzc29jaWF0ZWRVUkxMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViS2l0OjpBc3NvY2lhdGVkVVJMTG9hZGVyOjpDbGllbnRBZGFwdGVy OjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIHRlc3RzL0Fzc29jaWF0ZWRVUkxMb2Fk ZXJUZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdDo6QXNzb2NpYXRlZFVSTExvYWRlclRlc3Q6OkNo ZWNrQWNjZXNzQ29udHJvbEhlYWRlcnMpOgorICAgICAgICAoV2ViS2l0OjpURVNUX0YpOgorCiAy MDEyLTAxLTE2ICBCaWxsIEJ1ZGdlICA8YmJ1ZGdlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBD aGFuZ2VzIEFzc29jaWF0ZWRVUkxMb2FkZXIgdG8gcmVtb3ZlIG5vbi13aGl0ZWxpc3RlZCBIVFRQ IHJlc3BvbnNlIGhlYWRlcnMgZm9yIENPUlMgcmVxdWVzdHMsCkluZGV4OiBTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL3NyYy9Bc3NvY2lhdGVkVVJMTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Bc3NvY2lhdGVkVVJMTG9hZGVyLmNwcAkocmV2aXNpb24g MTA1MTIwKQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvQXNzb2NpYXRlZFVSTExvYWRl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChD KSAyMDEwLCAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmln aHQgKEMpIDIwMTAsIDIwMTEsIDIwMTIgR29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4K ICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1z LCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRl ZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucyBhcmUKQEAgLTUwLDcgKzUwLDcgQEAKICNp bmNsdWRlICJwbGF0Zm9ybS9XZWJVUkxFcnJvci5oIgogI2luY2x1ZGUgInBsYXRmb3JtL1dlYlVS TExvYWRlckNsaWVudC5oIgogI2luY2x1ZGUgInBsYXRmb3JtL1dlYlVSTFJlcXVlc3QuaCIKLSNp bmNsdWRlIDx3dGYvVmVjdG9yLmg+CisjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRl IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC03 Miw2ICs3Miw4IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2lzU2FmZTsKIH07CiAKK3R5cGVkZWYg SGFzaFNldDxTdHJpbmcsIENhc2VGb2xkaW5nSGFzaD4gSFRUUEhlYWRlclNldDsKKwogdm9pZCBI VFRQUmVxdWVzdEhlYWRlclZhbGlkYXRvcjo6dmlzaXRIZWFkZXIoY29uc3QgV2ViU3RyaW5nJiBu YW1lLCBjb25zdCBXZWJTdHJpbmcmIHZhbHVlKQogewogICAgIG1faXNTYWZlID0gbV9pc1NhZmUg JiYgaXNWYWxpZEhUVFBUb2tlbihuYW1lKSAmJiBYTUxIdHRwUmVxdWVzdDo6aXNBbGxvd2VkSFRU UEhlYWRlcihuYW1lKSAmJiBpc1ZhbGlkSFRUUEhlYWRlclZhbHVlKHZhbHVlKTsKQEAgLTgzLDIx ICs4NSw0MCBAQCBwdWJsaWM6CiAgICAgSFRUUFJlc3BvbnNlSGVhZGVyVmFsaWRhdG9yKGJvb2wg dXNpbmdBY2Nlc3NDb250cm9sKSA6IG1fdXNpbmdBY2Nlc3NDb250cm9sKHVzaW5nQWNjZXNzQ29u dHJvbCkgeyB9CiAKICAgICB2b2lkIHZpc2l0SGVhZGVyKGNvbnN0IFdlYlN0cmluZyYgbmFtZSwg Y29uc3QgV2ViU3RyaW5nJiB2YWx1ZSk7Ci0gICAgY29uc3QgVmVjdG9yPFdlYlN0cmluZz4mIGRp c2FsbG93ZWRIZWFkZXJzKCkgY29uc3QgeyByZXR1cm4gbV9kaXNhbGxvd2VkSGVhZGVyczsgfQor ICAgIGNvbnN0IEhUVFBIZWFkZXJTZXQmIGJsb2NrZWRIZWFkZXJzKCk7CiAKIHByaXZhdGU6Ci0g ICAgVmVjdG9yPFdlYlN0cmluZz4gbV9kaXNhbGxvd2VkSGVhZGVyczsKKyAgICBIVFRQSGVhZGVy U2V0IG1fZXhwb3NlZEhlYWRlcnM7CisgICAgSFRUUEhlYWRlclNldCBtX2Jsb2NrZWRIZWFkZXJz OwogICAgIGJvb2wgbV91c2luZ0FjY2Vzc0NvbnRyb2w7CiB9OwogCiB2b2lkIEhUVFBSZXNwb25z ZUhlYWRlclZhbGlkYXRvcjo6dmlzaXRIZWFkZXIoY29uc3QgV2ViU3RyaW5nJiBuYW1lLCBjb25z dCBXZWJTdHJpbmcmIHZhbHVlKQogewogICAgIFN0cmluZyBoZWFkZXJOYW1lKG5hbWUpOwotICAg IC8vIEhpZGUgbm9uLXdoaXRlbGlzdGVkIGhlYWRlcnMgZm9yIENPUlMgcmVxdWVzdHMuCi0gICAg Ly8gSGlkZSBTZXQtQ29va2llIGhlYWRlcnMgZm9yIGFsbCByZXF1ZXN0cy4KLSAgICBpZiAoKG1f dXNpbmdBY2Nlc3NDb250cm9sICYmICFpc09uQWNjZXNzQ29udHJvbFJlc3BvbnNlSGVhZGVyV2hp dGVsaXN0KGhlYWRlck5hbWUpKQotICAgICAgICAgfHwgKGVxdWFsSWdub3JpbmdDYXNlKGhlYWRl ck5hbWUsICJzZXQtY29va2llIikgfHwgZXF1YWxJZ25vcmluZ0Nhc2UoaGVhZGVyTmFtZSwgInNl dC1jb29raWUyIikpKQotICAgICAgICBtX2Rpc2FsbG93ZWRIZWFkZXJzLmFwcGVuZChuYW1lKTsK KyAgICBpZiAobV91c2luZ0FjY2Vzc0NvbnRyb2wpIHsKKyAgICAgICAgaWYgKGVxdWFsSWdub3Jp bmdDYXNlKGhlYWRlck5hbWUsICJhY2Nlc3MtY29udHJvbC1leHBvc2UtaGVhZGVyIikpCisgICAg ICAgICAgICBwYXJzZUFjY2Vzc0NvbnRyb2xFeHBvc2VIZWFkZXJzQWxsb3dMaXN0KHZhbHVlLCBt X2V4cG9zZWRIZWFkZXJzKTsKKyAgICAgICAgZWxzZSBpZiAoIWlzT25BY2Nlc3NDb250cm9sUmVz cG9uc2VIZWFkZXJXaGl0ZWxpc3QoaGVhZGVyTmFtZSkpCisgICAgICAgICAgICBtX2Jsb2NrZWRI ZWFkZXJzLmFkZChuYW1lKTsKKyAgICB9Cit9CisKK2NvbnN0IEhUVFBIZWFkZXJTZXQmIEhUVFBS ZXNwb25zZUhlYWRlclZhbGlkYXRvcjo6YmxvY2tlZEhlYWRlcnMoKQoreworICAgIC8vIFJlbW92 ZSBleHBvc2VkIGhlYWRlcnMgZnJvbSB0aGUgYmxvY2tlZCBzZXQuCisgICAgaWYgKCFtX2V4cG9z ZWRIZWFkZXJzLmlzRW1wdHkoKSkgeworICAgICAgICAvLyBEb24ndCBhbGxvdyBTZXQtQ29va2ll IGhlYWRlcnMgdG8gYmUgZXhwb3NlZC4KKyAgICAgICAgbV9leHBvc2VkSGVhZGVycy5yZW1vdmUo InNldC1jb29raWUiKTsKKyAgICAgICAgbV9leHBvc2VkSGVhZGVycy5yZW1vdmUoInNldC1jb29r aWUyIik7CisgICAgICAgIC8vIEJsb2NrIEFjY2Vzcy1Db250cm9sLUV4cG9zZS1IZWFkZXIgaXRz ZWxmLiBJdCBjb3VsZCBiZSBleHBvc2VkIGxhdGVyLgorICAgICAgICBtX2Jsb2NrZWRIZWFkZXJz LmFkZCgiYWNjZXNzLWNvbnRyb2wtZXhwb3NlLWhlYWRlciIpOworICAgICAgICBIVFRQSGVhZGVy U2V0Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX2V4cG9zZWRIZWFkZXJzLmVuZCgpOworICAgICAg ICBmb3IgKEhUVFBIZWFkZXJTZXQ6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9leHBvc2VkSGVhZGVy cy5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCisgICAgICAgICAgICBtX2Jsb2NrZWRIZWFkZXJz LnJlbW92ZSgqaXQpOworICAgIH0KKworICAgIHJldHVybiBtX2Jsb2NrZWRIZWFkZXJzOwogfQog CiB9CkBAIC0xODcsMTIgKzIwOCwxMyBAQCB2b2lkIEFzc29jaWF0ZWRVUkxMb2FkZXI6OkNsaWVu dEFkYXB0ZXI6CiAgICAgV2ViVVJMUmVzcG9uc2UgdmFsaWRhdGVkUmVzcG9uc2UgPSBXcmFwcGVk UmVzb3VyY2VSZXNwb25zZShyZXNwb25zZSk7CiAgICAgSFRUUFJlc3BvbnNlSGVhZGVyVmFsaWRh dG9yIHZhbGlkYXRvcihtX29wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID09IFdlYlVS TExvYWRlck9wdGlvbnM6OkNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeVVzZUFjY2Vzc0NvbnRyb2wp OwogICAgIHZhbGlkYXRlZFJlc3BvbnNlLnZpc2l0SFRUUEhlYWRlckZpZWxkcygmdmFsaWRhdG9y KTsKLSAgICAvLyBJZiB0aGVyZSBhcmUgZGlzYWxsb3dlZCBoZWFkZXJzLCBjb3B5IHRoZSByZXNw b25zZSBzbyB3ZSBjYW4gcmVtb3ZlIHRoZW0uCi0gICAgY29uc3QgVmVjdG9yPFdlYlN0cmluZz4m IGRpc2FsbG93ZWRIZWFkZXJzID0gdmFsaWRhdG9yLmRpc2FsbG93ZWRIZWFkZXJzKCk7Ci0gICAg aWYgKCFkaXNhbGxvd2VkSGVhZGVycy5pc0VtcHR5KCkpIHsKKyAgICAvLyBJZiB0aGVyZSBhcmUg YmxvY2tlZCBoZWFkZXJzLCBjb3B5IHRoZSByZXNwb25zZSBzbyB3ZSBjYW4gcmVtb3ZlIHRoZW0u CisgICAgY29uc3QgSFRUUEhlYWRlclNldCYgYmxvY2tlZEhlYWRlcnMgPSB2YWxpZGF0b3IuYmxv Y2tlZEhlYWRlcnMoKTsKKyAgICBpZiAoIWJsb2NrZWRIZWFkZXJzLmlzRW1wdHkoKSkgewogICAg ICAgICB2YWxpZGF0ZWRSZXNwb25zZSA9IFdlYlVSTFJlc3BvbnNlKHZhbGlkYXRlZFJlc3BvbnNl KTsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBkaXNhbGxvd2VkSGVhZGVycy5zaXpl KCk7ICsraSkKLSAgICAgICAgICAgIHZhbGlkYXRlZFJlc3BvbnNlLmNsZWFySFRUUEhlYWRlckZp ZWxkKGRpc2FsbG93ZWRIZWFkZXJzW2ldKTsKKyAgICAgICAgSFRUUEhlYWRlclNldDo6Y29uc3Rf aXRlcmF0b3IgZW5kID0gYmxvY2tlZEhlYWRlcnMuZW5kKCk7CisgICAgICAgIGZvciAoSFRUUEhl YWRlclNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBibG9ja2VkSGVhZGVycy5iZWdpbigpOyBpdCAh PSBlbmQ7ICsraXQpCisgICAgICAgICAgICB2YWxpZGF0ZWRSZXNwb25zZS5jbGVhckhUVFBIZWFk ZXJGaWVsZCgqaXQpOwogICAgIH0KICAgICBtX2NsaWVudC0+ZGlkUmVjZWl2ZVJlc3BvbnNlKG1f bG9hZGVyLCB2YWxpZGF0ZWRSZXNwb25zZSk7CiB9CkluZGV4OiBTb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3Rlc3RzL0Fzc29jaWF0ZWRVUkxMb2FkZXJUZXN0LmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0Fzc29jaWF0ZWRVUkxMb2FkZXJUZXN0LmNwcAkocmV2 aXNpb24gMTA1MTE5KQorKysgU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9Bc3NvY2lhdGVk VVJMTG9hZGVyVGVzdC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQwLDYgKzQwLDcgQEAKICNpbmNs dWRlICJwbGF0Zm9ybS9XZWJVUkxMb2FkZXJDbGllbnQuaCIKICNpbmNsdWRlICJwbGF0Zm9ybS9X ZWJVUkxSZXF1ZXN0LmgiCiAjaW5jbHVkZSAicGxhdGZvcm0vV2ViVVJMUmVzcG9uc2UuaCIKKyNp bmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogI2luY2x1ZGUgPGdvb2dsZXVybC9zcmMv Z3VybC5oPgogI2luY2x1ZGUgPGd0ZXN0L2d0ZXN0Lmg+CkBAIC0yMjEsNiArMjIyLDQyIEBAIHB1 YmxpYzoKICAgICAgICAgRVhQRUNUX0ZBTFNFKG1fZGlkUmVjZWl2ZVJlc3BvbnNlKTsKICAgICB9 CiAKKyAgICBib29sIENoZWNrQWNjZXNzQ29udHJvbEhlYWRlcnMoY29uc3QgY2hhciogaGVhZGVy TmFtZSwgYm9vbCBleHBvc2VkKQorICAgIHsKKyAgICAgICAgc3RkOjpzdHJpbmcgaWQoImh0dHA6 Ly93d3cub3RoZXIuY29tL0NoZWNrQWNjZXNzQ29udHJvbEV4cG9zZUhlYWRlcnNfIik7CisgICAg ICAgIGlkLmFwcGVuZChoZWFkZXJOYW1lKTsKKyAgICAgICAgaWYgKGV4cG9zZWQpCisgICAgICAg ICAgICBpZC5hcHBlbmQoIi1FeHBvc2VkIik7CisgICAgICAgIGlkLmFwcGVuZCgiLmh0bWwiKTsK KworICAgICAgICBHVVJMIHVybCA9IEdVUkwoaWQpOworICAgICAgICBXZWJVUkxSZXF1ZXN0IHJl cXVlc3Q7CisgICAgICAgIHJlcXVlc3QuaW5pdGlhbGl6ZSgpOworICAgICAgICByZXF1ZXN0LnNl dFVSTCh1cmwpOworCisgICAgICAgIFdlYlN0cmluZyBoZWFkZXJOYW1lU3RyaW5nKFdlYlN0cmlu Zzo6ZnJvbVVURjgoaGVhZGVyTmFtZSkpOworICAgICAgICBtX2V4cGVjdGVkUmVzcG9uc2UgPSBX ZWJVUkxSZXNwb25zZSgpOworICAgICAgICBtX2V4cGVjdGVkUmVzcG9uc2UuaW5pdGlhbGl6ZSgp OworICAgICAgICBtX2V4cGVjdGVkUmVzcG9uc2Uuc2V0TUlNRVR5cGUoInRleHQvaHRtbCIpOwor ICAgICAgICBtX2V4cGVjdGVkUmVzcG9uc2UuYWRkSFRUUEhlYWRlckZpZWxkKCJBY2Nlc3MtQ29u dHJvbC1BbGxvdy1PcmlnaW4iLCAiKiIpOworICAgICAgICBpZiAoZXhwb3NlZCkKKyAgICAgICAg ICAgIG1fZXhwZWN0ZWRSZXNwb25zZS5hZGRIVFRQSGVhZGVyRmllbGQoImFjY2Vzcy1jb250cm9s LWV4cG9zZS1oZWFkZXIiLCBoZWFkZXJOYW1lU3RyaW5nKTsKKyAgICAgICAgbV9leHBlY3RlZFJl c3BvbnNlLmFkZEhUVFBIZWFkZXJGaWVsZChoZWFkZXJOYW1lU3RyaW5nLCAiZm9vIik7CisgICAg ICAgIHdlYmtpdF9zdXBwb3J0OjpSZWdpc3Rlck1vY2tlZFVSTCh1cmwsIG1fZXhwZWN0ZWRSZXNw b25zZSwgbV9mcmFtZUZpbGVQYXRoKTsKKworICAgICAgICBXZWJVUkxMb2FkZXJPcHRpb25zIG9w dGlvbnM7CisgICAgICAgIG9wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID0gV2ViVVJM TG9hZGVyT3B0aW9uczo6Q3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5VXNlQWNjZXNzQ29udHJvbDsK KyAgICAgICAgbV9leHBlY3RlZExvYWRlciA9IGNyZWF0ZUFzc29jaWF0ZWRVUkxMb2FkZXIob3B0 aW9ucyk7CisgICAgICAgIEVYUEVDVF9UUlVFKG1fZXhwZWN0ZWRMb2FkZXIpOworICAgICAgICBt X2V4cGVjdGVkTG9hZGVyLT5sb2FkQXN5bmNocm9ub3VzbHkocmVxdWVzdCwgdGhpcyk7CisgICAg ICAgIHNlcnZlUmVxdWVzdHMoKTsKKyAgICAgICAgRVhQRUNUX1RSVUUobV9kaWRSZWNlaXZlUmVz cG9uc2UpOworICAgICAgICBFWFBFQ1RfVFJVRShtX2RpZFJlY2VpdmVEYXRhKTsKKyAgICAgICAg RVhQRUNUX1RSVUUobV9kaWRGaW5pc2hMb2FkaW5nKTsKKworICAgICAgICByZXR1cm4gIW1fYWN0 dWFsUmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKGhlYWRlck5hbWVTdHJpbmcpLmlzRW1wdHkoKTsK KyAgICB9CisKIHByb3RlY3RlZDoKICAgICBXZWJTdHJpbmcgbV9mcmFtZUZpbGVQYXRoOwogICAg IFRlc3RXZWJGcmFtZUNsaWVudCBtX3dlYkZyYW1lQ2xpZW50OwpAQCAtNDg5LDUwICs1MjYsMjkg QEAgVEVTVF9GKEFzc29jaWF0ZWRVUkxMb2FkZXJUZXN0LCBVbnRydXN0ZQogICAgIENoZWNrSGVh ZGVyRmFpbHMoImZvbyIsICJiYXJceDBkXHgwYXgtY3NyZi10b2tlbjpceDIwdGVzdDEyMzQiKTsK IH0KIAotLy8gVGVzdCB0aGF0IGEgQ09SUyBsb2FkIG9ubHkgcmV0dXJucyB3aGl0ZWxpc3RlZCBo ZWFkZXJzLgorLy8gVGVzdCB0aGF0IHRoZSBsb2FkZXIgZmlsdGVycyByZXNwb25zZSBoZWFkZXJz IGFjY29yZGluZyB0byB0aGUgQ09SUyBzdGFuZGFyZC4KIFRFU1RfRihBc3NvY2lhdGVkVVJMTG9h ZGVyVGVzdCwgQ3Jvc3NPcmlnaW5IZWFkZXJXaGl0ZWxpc3RpbmcpCiB7Ci0gICAgLy8gVGhpcyBp cyBjcm9zcy1vcmlnaW4gc2luY2UgdGhlIGZyYW1lIHdhcyBsb2FkZWQgZnJvbSB3d3cudGVzdC5j b20uCi0gICAgR1VSTCB1cmwgPSBHVVJMKCJodHRwOi8vd3d3Lm90aGVyLmNvbS9Dcm9zc09yaWdp bkhlYWRlcldoaXRlbGlzdGluZy5odG1sIik7Ci0gICAgV2ViVVJMUmVxdWVzdCByZXF1ZXN0Owot ICAgIHJlcXVlc3QuaW5pdGlhbGl6ZSgpOwotICAgIHJlcXVlc3Quc2V0VVJMKHVybCk7Ci0KLSAg ICBtX2V4cGVjdGVkUmVzcG9uc2UgPSBXZWJVUkxSZXNwb25zZSgpOwotICAgIG1fZXhwZWN0ZWRS ZXNwb25zZS5pbml0aWFsaXplKCk7Ci0gICAgbV9leHBlY3RlZFJlc3BvbnNlLnNldE1JTUVUeXBl KCJ0ZXh0L2h0bWwiKTsKLSAgICBtX2V4cGVjdGVkUmVzcG9uc2UuYWRkSFRUUEhlYWRlckZpZWxk KCJBY2Nlc3MtQ29udHJvbC1BbGxvdy1PcmlnaW4iLCAiKiIpOwotICAgIC8vIFRoZXNlIGhlYWRl cnMgYXJlIHdoaXRlbGlzdGVkIGFuZCBzaG91bGQgYmUgaW4gdGhlIHJlc3BvbnNlLgotICAgIG1f ZXhwZWN0ZWRSZXNwb25zZS5hZGRIVFRQSGVhZGVyRmllbGQoImNhY2hlLWNvbnRyb2wiLCAiZm9v Iik7Ci0gICAgbV9leHBlY3RlZFJlc3BvbnNlLmFkZEhUVFBIZWFkZXJGaWVsZCgiY29udGVudC1s YW5ndWFnZSIsICJmb28iKTsKLSAgICBtX2V4cGVjdGVkUmVzcG9uc2UuYWRkSFRUUEhlYWRlckZp ZWxkKCJjb250ZW50LXR5cGUiLCAiZm9vIik7Ci0gICAgbV9leHBlY3RlZFJlc3BvbnNlLmFkZEhU VFBIZWFkZXJGaWVsZCgiZXhwaXJlcyIsICJmb28iKTsKLSAgICBtX2V4cGVjdGVkUmVzcG9uc2Uu YWRkSFRUUEhlYWRlckZpZWxkKCJsYXN0LW1vZGlmaWVkIiwgImZvbyIpOwotICAgIG1fZXhwZWN0 ZWRSZXNwb25zZS5hZGRIVFRQSGVhZGVyRmllbGQoInByYWdtYSIsICJmb28iKTsKLSAgICAvLyBU aGVzZSBzaG91bGQgbmV2ZXIgYmUgaW4gdGhlIHJlc3BvbnNlLgotICAgIG1fZXhwZWN0ZWRSZXNw b25zZS5hZGRIVFRQSGVhZGVyRmllbGQoIlNldC1Db29raWUiLCAiZm9vIik7Ci0gICAgbV9leHBl Y3RlZFJlc3BvbnNlLmFkZEhUVFBIZWFkZXJGaWVsZCgiU2V0LUNvb2tpZTIiLCAiZm9vIik7Ci0g ICAgd2Via2l0X3N1cHBvcnQ6OlJlZ2lzdGVyTW9ja2VkVVJMKHVybCwgbV9leHBlY3RlZFJlc3Bv bnNlLCBtX2ZyYW1lRmlsZVBhdGgpOwotCi0gICAgV2ViVVJMTG9hZGVyT3B0aW9ucyBvcHRpb25z OwotICAgIG9wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID0gV2ViVVJMTG9hZGVyT3B0 aW9uczo6Q3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5VXNlQWNjZXNzQ29udHJvbDsKLSAgICBtX2V4 cGVjdGVkTG9hZGVyID0gY3JlYXRlQXNzb2NpYXRlZFVSTExvYWRlcihvcHRpb25zKTsKLSAgICBF WFBFQ1RfVFJVRShtX2V4cGVjdGVkTG9hZGVyKTsKLSAgICBtX2V4cGVjdGVkTG9hZGVyLT5sb2Fk QXN5bmNocm9ub3VzbHkocmVxdWVzdCwgdGhpcyk7Ci0gICAgc2VydmVSZXF1ZXN0cygpOwotICAg IEVYUEVDVF9UUlVFKG1fZGlkUmVjZWl2ZVJlc3BvbnNlKTsKLSAgICBFWFBFQ1RfVFJVRShtX2Rp ZFJlY2VpdmVEYXRhKTsKLSAgICBFWFBFQ1RfVFJVRShtX2RpZEZpbmlzaExvYWRpbmcpOworICAg IC8vIFRlc3QgdGhhdCB3aGl0ZWxpc3RlZCBoZWFkZXJzIGFyZSByZXR1cm5lZCB3aXRob3V0IGV4 cG9zaW5nIHRoZW0uCisgICAgRVhQRUNUX1RSVUUoQ2hlY2tBY2Nlc3NDb250cm9sSGVhZGVycygi Y2FjaGUtY29udHJvbCIsIGZhbHNlKSk7CisgICAgRVhQRUNUX1RSVUUoQ2hlY2tBY2Nlc3NDb250 cm9sSGVhZGVycygiY29udGVudC1sYW5ndWFnZSIsIGZhbHNlKSk7CisgICAgRVhQRUNUX1RSVUUo Q2hlY2tBY2Nlc3NDb250cm9sSGVhZGVycygiY29udGVudC10eXBlIiwgZmFsc2UpKTsKKyAgICBF WFBFQ1RfVFJVRShDaGVja0FjY2Vzc0NvbnRyb2xIZWFkZXJzKCJleHBpcmVzIiwgZmFsc2UpKTsK KyAgICBFWFBFQ1RfVFJVRShDaGVja0FjY2Vzc0NvbnRyb2xIZWFkZXJzKCJsYXN0LW1vZGlmaWVk IiwgZmFsc2UpKTsKKyAgICBFWFBFQ1RfVFJVRShDaGVja0FjY2Vzc0NvbnRyb2xIZWFkZXJzKCJw cmFnbWEiLCBmYWxzZSkpOworCisgICAgLy8gVGVzdCB0aGF0IG5vbi13aGl0ZWxpc3RlZCBoZWFk ZXJzIGFyZW4ndCByZXR1cm5lZC4KKyAgICBFWFBFQ1RfRkFMU0UoQ2hlY2tBY2Nlc3NDb250cm9s SGVhZGVycygibm9uLXdoaXRlbGlzdGVkIiwgZmFsc2UpKTsKKworICAgIC8vIFRlc3QgdGhhdCBT ZXQtQ29va2llIGhlYWRlcnMgYXJlbid0IHJldHVybmVkLgorICAgIEVYUEVDVF9GQUxTRShDaGVj a0FjY2Vzc0NvbnRyb2xIZWFkZXJzKCJTZXQtQ29va2llIiwgZmFsc2UpKTsKKyAgICBFWFBFQ1Rf RkFMU0UoQ2hlY2tBY2Nlc3NDb250cm9sSGVhZGVycygiU2V0LUNvb2tpZTIiLCBmYWxzZSkpOwog Ci0gICAgRVhQRUNUX0ZBTFNFKG1fYWN0dWFsUmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKCJjYWNo ZS1jb250cm9sIikuaXNFbXB0eSgpKTsKLSAgICBFWFBFQ1RfRkFMU0UobV9hY3R1YWxSZXNwb25z ZS5odHRwSGVhZGVyRmllbGQoImNvbnRlbnQtbGFuZ3VhZ2UiKS5pc0VtcHR5KCkpOwotICAgIEVY UEVDVF9GQUxTRShtX2FjdHVhbFJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgiY29udGVudC10eXBl IikuaXNFbXB0eSgpKTsKLSAgICBFWFBFQ1RfRkFMU0UobV9hY3R1YWxSZXNwb25zZS5odHRwSGVh ZGVyRmllbGQoImV4cGlyZXMiKS5pc0VtcHR5KCkpOwotICAgIEVYUEVDVF9GQUxTRShtX2FjdHVh bFJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgibGFzdC1tb2RpZmllZCIpLmlzRW1wdHkoKSk7Ci0g ICAgRVhQRUNUX0ZBTFNFKG1fYWN0dWFsUmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKCJwcmFnbWEi KS5pc0VtcHR5KCkpOworICAgIC8vIFRlc3QgdGhhdCBleHBvc2VkIGhlYWRlcnMgdGhhdCBhcmVu J3Qgd2hpdGVsaXN0ZWQgYXJlIHJldHVybmVkLgorICAgIEVYUEVDVF9UUlVFKENoZWNrQWNjZXNz Q29udHJvbEhlYWRlcnMoIm5vbi13aGl0ZWxpc3RlZCIsIHRydWUpKTsKIAotICAgIEVYUEVDVF9U UlVFKG1fYWN0dWFsUmVzcG9uc2UuaHR0cEhlYWRlckZpZWxkKCJTZXQtQ29va2llIikuaXNFbXB0 eSgpKTsKLSAgICBFWFBFQ1RfVFJVRShtX2FjdHVhbFJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZCgi U2V0LUNvb2tpZTIiKS5pc0VtcHR5KCkpOworICAgIC8vIFRlc3QgdGhhdCBTZXQtQ29va2llIGhl YWRlcnMgYXJlbid0IHJldHVybmVkLCBldmVuIGlmIGV4cG9zZWQuCisgICAgRVhQRUNUX0ZBTFNF KENoZWNrQWNjZXNzQ29udHJvbEhlYWRlcnMoIlNldC1Db29raWUiLCB0cnVlKSk7CiB9CiAKIH0K