103898 2012-12-03 08:27:28 -0800 [GStreamer] create playbin in ::load(), not in player constructor 2012-12-16 07:42:56 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 31155 0 vjaquez webkit-unassigned eric.carlson feature-media-reviews gustavo menard mrobinson philn pnormand webkit-ews webkit.review.bot xan.lopez oldest_to_newest 781484 0 vjaquez 2012-12-03 08:27:28 -0800 Following the bug #31155 we need to create playbin in ::load(), not in player constructor. Hence we could build the pipeline after we have the most of its run-time requirements. I set this bug as subtask of the bug #31155, as it might be a risky change. 792084 1 179587 vjaquez 2012-12-15 04:45:33 -0800 Created attachment 179587 Patch 792085 2 179587 webkit-ews 2012-12-15 04:52:02 -0800 Comment on attachment 179587 Patch Attachment 179587 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/15366013 792086 3 179587 webkit-ews 2012-12-15 04:53:09 -0800 Comment on attachment 179587 Patch Attachment 179587 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/15362036 792087 4 179587 eflews.bot 2012-12-15 04:53:45 -0800 Comment on attachment 179587 Patch Attachment 179587 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/15317988 792089 5 179587 pnormand 2012-12-15 04:57:24 -0800 Comment on attachment 179587 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179587&action=review Looks good I guess, I'd like to test it before landing. Are the tests still passing? including http/tests/media ? > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1774 > + enableDownloadBuffering(); s/enable/set I guess 792090 6 179589 vjaquez 2012-12-15 05:10:31 -0800 Created attachment 179589 Patch 792104 7 vjaquez 2012-12-15 06:36:17 -0800 (In reply to comment #5) > (From update of attachment 179587 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=179587&action=review > > Looks good I guess, I'd like to test it before landing. Are the tests still passing? including http/tests/media ? > > > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1774 > > + enableDownloadBuffering(); > > s/enable/set I guess Yep All the tests passed ok $ Tools/Scripts/run-webkit-tests --gtk http/test/media Using port 'gtk' Test configuration: <, x86, release> Placing test results in /home/vjaquez/WebKit/WebKitBuild/Release/layout-test-results Baseline search path: gtk -> generic Using Release build Pixel tests disabled Regular timeout: 6000, slow test timeout: 30000 Command line: /home/vjaquez/WebKit/WebKitBuild/Release/Programs/DumpRenderTree - Found 39 tests; running 21, skipping 18. Running 1 DumpRenderTree over 1 shard. All 21 tests ran as expected. 792106 8 179589 pnormand 2012-12-15 07:07:26 -0800 Comment on attachment 179589 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179589&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:-1753 > - ASSERT(m_playBin); I think it'd make sense to move this ASSERT in ::load, before setting the url of playbin. 792144 9 179601 vjaquez 2012-12-15 11:20:49 -0800 Created attachment 179601 Patch 792145 10 179601 pnormand 2012-12-15 11:30:52 -0800 Comment on attachment 179601 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179601&action=review Some more feedback, I'd still like to test this patch as well :) > Source/WebCore/ChangeLog:8 > + This patch does the instantiation of the playbin pipeline into the WebCore::MediaPlayerPrivateGStreamer::load() method, so we could construct the pipeline take in count other possible options, such as pitch. Sorry for the late feedback on this, can you please wrap this line so it's not ultra wide huge? :) Also rephrase the second part, such as "so the pipeline layout can reflect other predefined settings such as audio pitch preservation in variable playback rate scenarios" ? 792316 11 179645 vjaquez 2012-12-16 05:06:20 -0800 Created attachment 179645 Patch 792326 12 179645 webkit.review.bot 2012-12-16 07:42:51 -0800 Comment on attachment 179645 Patch Clearing flags on attachment: 179645 Committed r137838: <http://trac.webkit.org/changeset/137838> 792327 13 webkit.review.bot 2012-12-16 07:42:56 -0800 All reviewed patches have been landed. Closing bug. 179587 2012-12-15 04:45:33 -0800 2012-12-15 05:10:25 -0800 Patch bug-103898-20121215124251.patch text/plain 4591 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzI5YTI4ZjAzOGMxODNh ODY5NjA5OTVlNTIwNGFlNzljMWQyNWZmOC4uNjhhMDI3YjUzMDYxM2NhNTE0OWRkNDhlMjIzYzM3 NTJhNThjN2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEyLTE1ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dTdHJlYW1lcl0gY3JlYXRlIHBsYXliaW4gaW4gOjpsb2FkKCksIG5vdCBpbiBwbGF5ZXIgY29u c3RydWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwMzg5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgcGF0Y2ggZG9lcyB0aGUgaW5zdGFudGlhdGlvbiBvZiB0aGUgcGxheWJpbiBwaXBlbGlu ZSBpbnRvIHRoZSAgV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKCkg bWV0aG9kLCBzbyB3ZSBjb3VsZCBjb25zdHJ1Y3QgdGhlIHBpcGVsaW5lIHRha2UgaW4gY291bnQg b3RoZXIgcG9zc2libGUgb3B0aW9ucywgc3VjaCBhcyBwaXRjaC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6bG9hZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorICAgICAgICAoTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyKToKKwogMjAxMi0xMi0xNCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEdXBsaWNhdGUgc2NyaXB0cyBhcHBlYXIg aW4gd29ya3NwYWNlIHdoZW4gc2NyaXB0IHdhcyByZWZlcmVuY2VkIGJ5IHVybCB3aXRoIGEgZnJh Z21lbnQgcGFydC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAKaW5kZXggZGNjZWU2OWQ2MTVmNTIwZjRiMWRkZTk2MzkyM2U3NDNhNjQ1NzdmNS4uZDYw NzQ4MjE3MjM4YzFjZjJhYjNlMDdmNmIxNjY2ZjIxMjg3OTRlMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTI0NSw4ICsyNDUsNiBAQCBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcihN ZWRpYVBsYXllciogcGxheWVyKQogICAgICwgbV90b3RhbEJ5dGVzKC0xKQogICAgICwgbV9vcmln aW5hbFByZWxvYWRXYXNBdXRvQW5kV2FzT3ZlcnJpZGRlbihmYWxzZSkKIHsKLSAgICBpZiAoaW5p dGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2ViS2l0RWxlbWVudHMoKSkKLSAgICAgICAgY3Jl YXRlR1NUUGxheUJpbigpOwogfQogCiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIoKQpAQCAtMjkzLDYgKzI5MSw4IEBAIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigpCiAKIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKGNvbnN0IFN0cmluZyYgdXJsKQogewor ICAgIGlmICghaW5pdGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2ViS2l0RWxlbWVudHMoKSkK KyAgICAgICAgcmV0dXJuOwogCiAgICAgS1VSTCBrdXJsKEtVUkwoKSwgdXJsKTsKICAgICBTdHJp bmcgY2xlYW5VcmwodXJsKTsKQEAgLTMwMSw2ICszMDEsMTEgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmxvYWQoY29uc3QgU3RyaW5nJiB1cmwpCiAgICAgaWYgKGt1cmwuaXNM b2NhbEZpbGUoKSkKICAgICAgICAgY2xlYW5VcmwgPSBjbGVhblVybC5zdWJzdHJpbmcoMCwga3Vy bC5wYXRoRW5kKCkpOwogCisgICAgaWYgKCFtX3BsYXlCaW4pIHsKKyAgICAgICAgY3JlYXRlR1NU UGxheUJpbigpOworICAgICAgICBzZXREb3dubG9hZEJ1ZmZlcmluZygpOworICAgIH0KKwogICAg IG1fdXJsID0gS1VSTChLVVJMKCksIGNsZWFuVXJsKTsKICAgICBnX29iamVjdF9zZXQobV9wbGF5 QmluLCAidXJpIiwgY2xlYW5VcmwudXRmOCgpLmRhdGEoKSwgTlVMTCk7CiAKQEAgLTE3NDQsMTMg KzE3NDksMTAgQEAgTWVkaWFQbGF5ZXI6Ok1vdmllTG9hZFR5cGUgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjptb3ZpZUxvYWRUeXBlKCkgY29uc3QKICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6 OkRvd25sb2FkOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UHJl bG9hZChNZWRpYVBsYXllcjo6UHJlbG9hZCBwcmVsb2FkKQordm9pZCBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnNldERvd25sb2FkQnVmZmVyaW5nKCkKIHsKLSAgICBtX29yaWdpbmFsUHJl bG9hZFdhc0F1dG9BbmRXYXNPdmVycmlkZGVuID0gbV9wcmVsb2FkICE9IHByZWxvYWQgJiYgbV9w cmVsb2FkID09IE1lZGlhUGxheWVyOjpBdXRvOwotCi0gICAgbV9wcmVsb2FkID0gcHJlbG9hZDsK LQotICAgIEFTU0VSVChtX3BsYXlCaW4pOworICAgIGlmICghbV9wbGF5QmluKQorICAgICAgICBy ZXR1cm47CiAKICAgICBHc3RQbGF5RmxhZ3MgZmxhZ3M7CiAgICAgZ19vYmplY3RfZ2V0KG1fcGxh eUJpbiwgImZsYWdzIiwgJmZsYWdzLCBOVUxMKTsKQEAgLTE3NjEsNiArMTc2MywxNSBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UHJlbG9hZChNZWRpYVBsYXllcjo6UHJl bG9hZCBwcmVsb2FkKQogICAgICAgICBMT0dfTUVESUFfTUVTU0FHRSgiRGlzYWJsaW5nIG9uLWRp c2sgYnVmZmVyaW5nIik7CiAgICAgICAgIGdfb2JqZWN0X3NldChtX3BsYXlCaW4sICJmbGFncyIs IGZsYWdzICYgfkdTVF9QTEFZX0ZMQUdfRE9XTkxPQUQsIE5VTEwpOwogICAgIH0KK30KKwordm9p ZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNldFByZWxvYWQoTWVkaWFQbGF5ZXI6OlBy ZWxvYWQgcHJlbG9hZCkKK3sKKyAgICBtX29yaWdpbmFsUHJlbG9hZFdhc0F1dG9BbmRXYXNPdmVy cmlkZGVuID0gbV9wcmVsb2FkICE9IHByZWxvYWQgJiYgbV9wcmVsb2FkID09IE1lZGlhUGxheWVy OjpBdXRvOworCisgICAgbV9wcmVsb2FkID0gcHJlbG9hZDsKKworICAgIGVuYWJsZURvd25sb2Fk QnVmZmVyaW5nKCk7CiAKICAgICBpZiAobV9kZWxheWluZ0xvYWQgJiYgbV9wcmVsb2FkICE9IE1l ZGlhUGxheWVyOjpOb25lKSB7CiAgICAgICAgIG1fZGVsYXlpbmdMb2FkID0gZmFsc2U7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXggNTlmNTI4Yjcy MWQ1M2JjYTBjZDBmN2MzODUyYmQ3YTk4ZDdkYjA0NS4uN2JlYzE0MzZhYmY2MmRiODdiZWY3YjBi YjQzYmJjZDg3NjA4M2JjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuaApAQCAtMTUwLDYgKzE1MCw3IEBAIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lciA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UgewogICAgICAgICAg ICAgYm9vbCBsb2FkTmV4dExvY2F0aW9uKCk7CiAgICAgICAgICAgICB2b2lkIG1lZGlhTG9jYXRp b25DaGFuZ2VkKEdzdE1lc3NhZ2UqKTsKIAorICAgICAgICAgICAgdm9pZCBzZXREb3dubG9hZEJ1 ZmZlcmluZygpOwogICAgICAgICAgICAgdm9pZCBwcm9jZXNzQnVmZmVyaW5nU3RhdHMoR3N0TWVz c2FnZSopOwogCiAgICAgICAgICAgICB2aXJ0dWFsIFN0cmluZyBlbmdpbmVEZXNjcmlwdGlvbigp IGNvbnN0IHsgcmV0dXJuICJHU3RyZWFtZXIiOyB9Cg== 179589 2012-12-15 05:10:31 -0800 2012-12-15 11:20:42 -0800 Patch bug-103898-20121215130750.patch text/plain 4588 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzI5YTI4ZjAzOGMxODNh ODY5NjA5OTVlNTIwNGFlNzljMWQyNWZmOC4uNjhhMDI3YjUzMDYxM2NhNTE0OWRkNDhlMjIzYzM3 NTJhNThjN2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEyLTE1ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dTdHJlYW1lcl0gY3JlYXRlIHBsYXliaW4gaW4gOjpsb2FkKCksIG5vdCBpbiBwbGF5ZXIgY29u c3RydWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwMzg5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgcGF0Y2ggZG9lcyB0aGUgaW5zdGFudGlhdGlvbiBvZiB0aGUgcGxheWJpbiBwaXBlbGlu ZSBpbnRvIHRoZSAgV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKCkg bWV0aG9kLCBzbyB3ZSBjb3VsZCBjb25zdHJ1Y3QgdGhlIHBpcGVsaW5lIHRha2UgaW4gY291bnQg b3RoZXIgcG9zc2libGUgb3B0aW9ucywgc3VjaCBhcyBwaXRjaC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6bG9hZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorICAgICAgICAoTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyKToKKwogMjAxMi0xMi0xNCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEdXBsaWNhdGUgc2NyaXB0cyBhcHBlYXIg aW4gd29ya3NwYWNlIHdoZW4gc2NyaXB0IHdhcyByZWZlcmVuY2VkIGJ5IHVybCB3aXRoIGEgZnJh Z21lbnQgcGFydC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAKaW5kZXggZGNjZWU2OWQ2MTVmNTIwZjRiMWRkZTk2MzkyM2U3NDNhNjQ1NzdmNS4uNGIw MWQ3NjEwNjNiYzY3MGMxOTU1NTI2ODdmMGQyNDQwN2E1ZDAzNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTI0NSw4ICsyNDUsNiBAQCBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcihN ZWRpYVBsYXllciogcGxheWVyKQogICAgICwgbV90b3RhbEJ5dGVzKC0xKQogICAgICwgbV9vcmln aW5hbFByZWxvYWRXYXNBdXRvQW5kV2FzT3ZlcnJpZGRlbihmYWxzZSkKIHsKLSAgICBpZiAoaW5p dGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2ViS2l0RWxlbWVudHMoKSkKLSAgICAgICAgY3Jl YXRlR1NUUGxheUJpbigpOwogfQogCiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIoKQpAQCAtMjkzLDYgKzI5MSw4IEBAIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigpCiAKIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKGNvbnN0IFN0cmluZyYgdXJsKQogewor ICAgIGlmICghaW5pdGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2ViS2l0RWxlbWVudHMoKSkK KyAgICAgICAgcmV0dXJuOwogCiAgICAgS1VSTCBrdXJsKEtVUkwoKSwgdXJsKTsKICAgICBTdHJp bmcgY2xlYW5VcmwodXJsKTsKQEAgLTMwMSw2ICszMDEsMTEgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmxvYWQoY29uc3QgU3RyaW5nJiB1cmwpCiAgICAgaWYgKGt1cmwuaXNM b2NhbEZpbGUoKSkKICAgICAgICAgY2xlYW5VcmwgPSBjbGVhblVybC5zdWJzdHJpbmcoMCwga3Vy bC5wYXRoRW5kKCkpOwogCisgICAgaWYgKCFtX3BsYXlCaW4pIHsKKyAgICAgICAgY3JlYXRlR1NU UGxheUJpbigpOworICAgICAgICBzZXREb3dubG9hZEJ1ZmZlcmluZygpOworICAgIH0KKwogICAg IG1fdXJsID0gS1VSTChLVVJMKCksIGNsZWFuVXJsKTsKICAgICBnX29iamVjdF9zZXQobV9wbGF5 QmluLCAidXJpIiwgY2xlYW5VcmwudXRmOCgpLmRhdGEoKSwgTlVMTCk7CiAKQEAgLTE3NDQsMTMg KzE3NDksMTAgQEAgTWVkaWFQbGF5ZXI6Ok1vdmllTG9hZFR5cGUgTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjptb3ZpZUxvYWRUeXBlKCkgY29uc3QKICAgICByZXR1cm4gTWVkaWFQbGF5ZXI6 OkRvd25sb2FkOwogfQogCi12b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UHJl bG9hZChNZWRpYVBsYXllcjo6UHJlbG9hZCBwcmVsb2FkKQordm9pZCBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnNldERvd25sb2FkQnVmZmVyaW5nKCkKIHsKLSAgICBtX29yaWdpbmFsUHJl bG9hZFdhc0F1dG9BbmRXYXNPdmVycmlkZGVuID0gbV9wcmVsb2FkICE9IHByZWxvYWQgJiYgbV9w cmVsb2FkID09IE1lZGlhUGxheWVyOjpBdXRvOwotCi0gICAgbV9wcmVsb2FkID0gcHJlbG9hZDsK LQotICAgIEFTU0VSVChtX3BsYXlCaW4pOworICAgIGlmICghbV9wbGF5QmluKQorICAgICAgICBy ZXR1cm47CiAKICAgICBHc3RQbGF5RmxhZ3MgZmxhZ3M7CiAgICAgZ19vYmplY3RfZ2V0KG1fcGxh eUJpbiwgImZsYWdzIiwgJmZsYWdzLCBOVUxMKTsKQEAgLTE3NjEsNiArMTc2MywxNSBAQCB2b2lk IE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UHJlbG9hZChNZWRpYVBsYXllcjo6UHJl bG9hZCBwcmVsb2FkKQogICAgICAgICBMT0dfTUVESUFfTUVTU0FHRSgiRGlzYWJsaW5nIG9uLWRp c2sgYnVmZmVyaW5nIik7CiAgICAgICAgIGdfb2JqZWN0X3NldChtX3BsYXlCaW4sICJmbGFncyIs IGZsYWdzICYgfkdTVF9QTEFZX0ZMQUdfRE9XTkxPQUQsIE5VTEwpOwogICAgIH0KK30KKwordm9p ZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNldFByZWxvYWQoTWVkaWFQbGF5ZXI6OlBy ZWxvYWQgcHJlbG9hZCkKK3sKKyAgICBtX29yaWdpbmFsUHJlbG9hZFdhc0F1dG9BbmRXYXNPdmVy cmlkZGVuID0gbV9wcmVsb2FkICE9IHByZWxvYWQgJiYgbV9wcmVsb2FkID09IE1lZGlhUGxheWVy OjpBdXRvOworCisgICAgbV9wcmVsb2FkID0gcHJlbG9hZDsKKworICAgIHNldERvd25sb2FkQnVm ZmVyaW5nKCk7CiAKICAgICBpZiAobV9kZWxheWluZ0xvYWQgJiYgbV9wcmVsb2FkICE9IE1lZGlh UGxheWVyOjpOb25lKSB7CiAgICAgICAgIG1fZGVsYXlpbmdMb2FkID0gZmFsc2U7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKaW5kZXggNTlmNTI4YjcyMWQ1 M2JjYTBjZDBmN2MzODUyYmQ3YTk4ZDdkYjA0NS4uN2JlYzE0MzZhYmY2MmRiODdiZWY3YjBiYjQz YmJjZDg3NjA4M2JjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIuaApAQCAtMTUwLDYgKzE1MCw3IEBAIGNsYXNzIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lciA6IHB1YmxpYyBNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2UgewogICAgICAgICAgICAg Ym9vbCBsb2FkTmV4dExvY2F0aW9uKCk7CiAgICAgICAgICAgICB2b2lkIG1lZGlhTG9jYXRpb25D aGFuZ2VkKEdzdE1lc3NhZ2UqKTsKIAorICAgICAgICAgICAgdm9pZCBzZXREb3dubG9hZEJ1ZmZl cmluZygpOwogICAgICAgICAgICAgdm9pZCBwcm9jZXNzQnVmZmVyaW5nU3RhdHMoR3N0TWVzc2Fn ZSopOwogCiAgICAgICAgICAgICB2aXJ0dWFsIFN0cmluZyBlbmdpbmVEZXNjcmlwdGlvbigpIGNv bnN0IHsgcmV0dXJuICJHU3RyZWFtZXIiOyB9Cg== 179601 2012-12-15 11:20:49 -0800 2012-12-16 05:06:12 -0800 Patch bug-103898-20121215191807.patch text/plain 4614 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3NzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzI5YTI4ZjAzOGMxODNh ODY5NjA5OTVlNTIwNGFlNzljMWQyNWZmOC4uNjhhMDI3YjUzMDYxM2NhNTE0OWRkNDhlMjIzYzM3 NTJhNThjN2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTEyLTE1ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dTdHJlYW1lcl0gY3JlYXRlIHBsYXliaW4gaW4gOjpsb2FkKCksIG5vdCBpbiBwbGF5ZXIgY29u c3RydWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwMzg5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgcGF0Y2ggZG9lcyB0aGUgaW5zdGFudGlhdGlvbiBvZiB0aGUgcGxheWJpbiBwaXBlbGlu ZSBpbnRvIHRoZSAgV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKCkg bWV0aG9kLCBzbyB3ZSBjb3VsZCBjb25zdHJ1Y3QgdGhlIHBpcGVsaW5lIHRha2UgaW4gY291bnQg b3RoZXIgcG9zc2libGUgb3B0aW9ucywgc3VjaCBhcyBwaXRjaC4KKworICAgICAgICBObyBuZXcg dGVzdHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6bG9hZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorICAgICAgICAoTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyKToKKwogMjAxMi0xMi0xNCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEdXBsaWNhdGUgc2NyaXB0cyBhcHBlYXIg aW4gd29ya3NwYWNlIHdoZW4gc2NyaXB0IHdhcyByZWZlcmVuY2VkIGJ5IHVybCB3aXRoIGEgZnJh Z21lbnQgcGFydC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAKaW5kZXggZGNjZWU2OWQ2MTVmNTIwZjRiMWRkZTk2MzkyM2U3NDNhNjQ1NzdmNS4uM2Uy NTU3OWFjYzhkZGYxMTE0Yjc5YTYzMzkxNDZiYWY1N2NlNzVmYiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKQEAgLTI0NSw4ICsyNDUsNiBAQCBN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcihN ZWRpYVBsYXllciogcGxheWVyKQogICAgICwgbV90b3RhbEJ5dGVzKC0xKQogICAgICwgbV9vcmln aW5hbFByZWxvYWRXYXNBdXRvQW5kV2FzT3ZlcnJpZGRlbihmYWxzZSkKIHsKLSAgICBpZiAoaW5p dGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2ViS2l0RWxlbWVudHMoKSkKLSAgICAgICAgY3Jl YXRlR1NUUGxheUJpbigpOwogfQogCiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIoKQpAQCAtMjkzLDYgKzI5MSw4IEBAIE1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigpCiAKIHZvaWQg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpsb2FkKGNvbnN0IFN0cmluZyYgdXJsKQogewor ICAgIGlmICghaW5pdGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2ViS2l0RWxlbWVudHMoKSkK KyAgICAgICAgcmV0dXJuOwogCiAgICAgS1VSTCBrdXJsKEtVUkwoKSwgdXJsKTsKICAgICBTdHJp bmcgY2xlYW5VcmwodXJsKTsKQEAgLTMwMSw2ICszMDEsMTMgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmxvYWQoY29uc3QgU3RyaW5nJiB1cmwpCiAgICAgaWYgKGt1cmwuaXNM b2NhbEZpbGUoKSkKICAgICAgICAgY2xlYW5VcmwgPSBjbGVhblVybC5zdWJzdHJpbmcoMCwga3Vy bC5wYXRoRW5kKCkpOwogCisgICAgaWYgKCFtX3BsYXlCaW4pIHsKKyAgICAgICAgY3JlYXRlR1NU UGxheUJpbigpOworICAgICAgICBzZXREb3dubG9hZEJ1ZmZlcmluZygpOworICAgIH0KKworICAg IEFTU0VSVChtX3BsYXlCaW4pOworCiAgICAgbV91cmwgPSBLVVJMKEtVUkwoKSwgY2xlYW5Vcmwp OwogICAgIGdfb2JqZWN0X3NldChtX3BsYXlCaW4sICJ1cmkiLCBjbGVhblVybC51dGY4KCkuZGF0 YSgpLCBOVUxMKTsKIApAQCAtMTc0NCwxMyArMTc1MSwxMCBAQCBNZWRpYVBsYXllcjo6TW92aWVM b2FkVHlwZSBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Om1vdmllTG9hZFR5cGUoKSBjb25z dAogICAgIHJldHVybiBNZWRpYVBsYXllcjo6RG93bmxvYWQ7CiB9CiAKLXZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRQcmVsb2FkKE1lZGlhUGxheWVyOjpQcmVsb2FkIHByZWxv YWQpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0RG93bmxvYWRCdWZmZXJp bmcoKQogewotICAgIG1fb3JpZ2luYWxQcmVsb2FkV2FzQXV0b0FuZFdhc092ZXJyaWRkZW4gPSBt X3ByZWxvYWQgIT0gcHJlbG9hZCAmJiBtX3ByZWxvYWQgPT0gTWVkaWFQbGF5ZXI6OkF1dG87Ci0K LSAgICBtX3ByZWxvYWQgPSBwcmVsb2FkOwotCi0gICAgQVNTRVJUKG1fcGxheUJpbik7CisgICAg aWYgKCFtX3BsYXlCaW4pCisgICAgICAgIHJldHVybjsKIAogICAgIEdzdFBsYXlGbGFncyBmbGFn czsKICAgICBnX29iamVjdF9nZXQobV9wbGF5QmluLCAiZmxhZ3MiLCAmZmxhZ3MsIE5VTEwpOwpA QCAtMTc2MSw2ICsxNzY1LDE1IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpz ZXRQcmVsb2FkKE1lZGlhUGxheWVyOjpQcmVsb2FkIHByZWxvYWQpCiAgICAgICAgIExPR19NRURJ QV9NRVNTQUdFKCJEaXNhYmxpbmcgb24tZGlzayBidWZmZXJpbmciKTsKICAgICAgICAgZ19vYmpl Y3Rfc2V0KG1fcGxheUJpbiwgImZsYWdzIiwgZmxhZ3MgJiB+R1NUX1BMQVlfRkxBR19ET1dOTE9B RCwgTlVMTCk7CiAgICAgfQorfQorCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 c2V0UHJlbG9hZChNZWRpYVBsYXllcjo6UHJlbG9hZCBwcmVsb2FkKQoreworICAgIG1fb3JpZ2lu YWxQcmVsb2FkV2FzQXV0b0FuZFdhc092ZXJyaWRkZW4gPSBtX3ByZWxvYWQgIT0gcHJlbG9hZCAm JiBtX3ByZWxvYWQgPT0gTWVkaWFQbGF5ZXI6OkF1dG87CisKKyAgICBtX3ByZWxvYWQgPSBwcmVs b2FkOworCisgICAgc2V0RG93bmxvYWRCdWZmZXJpbmcoKTsKIAogICAgIGlmIChtX2RlbGF5aW5n TG9hZCAmJiBtX3ByZWxvYWQgIT0gTWVkaWFQbGF5ZXI6Ok5vbmUpIHsKICAgICAgICAgbV9kZWxh eWluZ0xvYWQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXIuaAppbmRleCA1OWY1MjhiNzIxZDUzYmNhMGNkMGY3YzM4NTJiZDdhOThkN2RiMDQ1Li43 YmVjMTQzNmFiZjYyZGI4N2JlZjdiMGJiNDNiYmNkODc2MDgzYmNjIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCkBAIC0xNTAsNiArMTUwLDcgQEAgY2xh c3MgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyIDogcHVibGljIE1lZGlhUGxheWVyUHJpdmF0 ZUludGVyZmFjZSB7CiAgICAgICAgICAgICBib29sIGxvYWROZXh0TG9jYXRpb24oKTsKICAgICAg ICAgICAgIHZvaWQgbWVkaWFMb2NhdGlvbkNoYW5nZWQoR3N0TWVzc2FnZSopOwogCisgICAgICAg ICAgICB2b2lkIHNldERvd25sb2FkQnVmZmVyaW5nKCk7CiAgICAgICAgICAgICB2b2lkIHByb2Nl c3NCdWZmZXJpbmdTdGF0cyhHc3RNZXNzYWdlKik7CiAKICAgICAgICAgICAgIHZpcnR1YWwgU3Ry aW5nIGVuZ2luZURlc2NyaXB0aW9uKCkgY29uc3QgeyByZXR1cm4gIkdTdHJlYW1lciI7IH0K 179645 2012-12-16 05:06:20 -0800 2012-12-16 07:42:51 -0800 Patch bug-103898-20121216130337.patch text/plain 4584 vjaquez U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWU0MGY0NDhkNjBjNzAy NDBkZTJlYWU0MDYyYjAwZjMzOGY1NmE1Yy4uNmFkYWMzZTllZDVmNzdkNTQ5MjNkNDUzZDFkMWY2 MGY1YzAxZjY2NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDEyLTEyLTE2ICBWw61j dG9yIE1hbnVlbCBKw6FxdWV6IExlYWwgIDx2amFxdWV6QGlnYWxpYS5jb20+CisKKyAgICAgICAg W0dTdHJlYW1lcl0gY3JlYXRlIHBsYXliaW4gaW4gOjpsb2FkKCksIG5vdCBpbiBwbGF5ZXIgY29u c3RydWN0b3IKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEwMzg5OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoaXMgcGF0Y2ggbW92ZXMgdGhlIGluc3RhbnRpYXRpb24gb2YgdGhlIHBsYXliaW4gcGlwZWxp bmUgaW50byB0aGUKKyAgICAgICAgV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy Ojpsb2FkKCkgbWV0aG9kLCBzbyB0aGUgcGlwZWxpbmUKKyAgICAgICAgbGF5b3V0IGNhbiByZWZs ZWN0IG90aGVyIHByZWRlZmluZWQgc2V0dGluZ3Mgc3VjaCBhcyBhdWRpbyBwaXRjaAorICAgICAg ICBwcmVzZXJ2YXRpb24gaW4gdmFyaWFibGUgcGxheWJhY2sgcmF0ZSBzY2VuYXJpb3MKKworICAg ICAgICBObyBuZXcgdGVzdHMuIENvdmVyZWQgYnkgZXhpc3RpbmcgdGVzdHMuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6TWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6bG9hZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oOgorICAgICAgICAoTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyKToKKwogMjAxMi0xMi0xNSAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVH U3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggZGNjZWU2OWQ2MTVmNTIwZjRi MWRkZTk2MzkyM2U3NDNhNjQ1NzdmNS4uM2UyNTU3OWFjYzhkZGYxMTE0Yjc5YTYzMzkxNDZiYWY1 N2NlNzVmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAKQEAgLTI0NSw4ICsyNDUsNiBAQCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6Ok1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcihNZWRpYVBsYXllciogcGxheWVyKQogICAgICwgbV90 b3RhbEJ5dGVzKC0xKQogICAgICwgbV9vcmlnaW5hbFByZWxvYWRXYXNBdXRvQW5kV2FzT3ZlcnJp ZGRlbihmYWxzZSkKIHsKLSAgICBpZiAoaW5pdGlhbGl6ZUdTdHJlYW1lckFuZFJlZ2lzdGVyV2Vi S2l0RWxlbWVudHMoKSkKLSAgICAgICAgY3JlYXRlR1NUUGxheUJpbigpOwogfQogCiBNZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIoKQpAQCAt MjkzLDYgKzI5MSw4IEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcigpCiAKIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjps b2FkKGNvbnN0IFN0cmluZyYgdXJsKQogeworICAgIGlmICghaW5pdGlhbGl6ZUdTdHJlYW1lckFu ZFJlZ2lzdGVyV2ViS2l0RWxlbWVudHMoKSkKKyAgICAgICAgcmV0dXJuOwogCiAgICAgS1VSTCBr dXJsKEtVUkwoKSwgdXJsKTsKICAgICBTdHJpbmcgY2xlYW5VcmwodXJsKTsKQEAgLTMwMSw2ICsz MDEsMTMgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmxvYWQoY29uc3QgU3Ry aW5nJiB1cmwpCiAgICAgaWYgKGt1cmwuaXNMb2NhbEZpbGUoKSkKICAgICAgICAgY2xlYW5Vcmwg PSBjbGVhblVybC5zdWJzdHJpbmcoMCwga3VybC5wYXRoRW5kKCkpOwogCisgICAgaWYgKCFtX3Bs YXlCaW4pIHsKKyAgICAgICAgY3JlYXRlR1NUUGxheUJpbigpOworICAgICAgICBzZXREb3dubG9h ZEJ1ZmZlcmluZygpOworICAgIH0KKworICAgIEFTU0VSVChtX3BsYXlCaW4pOworCiAgICAgbV91 cmwgPSBLVVJMKEtVUkwoKSwgY2xlYW5VcmwpOwogICAgIGdfb2JqZWN0X3NldChtX3BsYXlCaW4s ICJ1cmkiLCBjbGVhblVybC51dGY4KCkuZGF0YSgpLCBOVUxMKTsKIApAQCAtMTc0NCwxMyArMTc1 MSwxMCBAQCBNZWRpYVBsYXllcjo6TW92aWVMb2FkVHlwZSBNZWRpYVBsYXllclByaXZhdGVHU3Ry ZWFtZXI6Om1vdmllTG9hZFR5cGUoKSBjb25zdAogICAgIHJldHVybiBNZWRpYVBsYXllcjo6RG93 bmxvYWQ7CiB9CiAKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRQcmVsb2Fk KE1lZGlhUGxheWVyOjpQcmVsb2FkIHByZWxvYWQpCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6c2V0RG93bmxvYWRCdWZmZXJpbmcoKQogewotICAgIG1fb3JpZ2luYWxQcmVsb2Fk V2FzQXV0b0FuZFdhc092ZXJyaWRkZW4gPSBtX3ByZWxvYWQgIT0gcHJlbG9hZCAmJiBtX3ByZWxv YWQgPT0gTWVkaWFQbGF5ZXI6OkF1dG87Ci0KLSAgICBtX3ByZWxvYWQgPSBwcmVsb2FkOwotCi0g ICAgQVNTRVJUKG1fcGxheUJpbik7CisgICAgaWYgKCFtX3BsYXlCaW4pCisgICAgICAgIHJldHVy bjsKIAogICAgIEdzdFBsYXlGbGFncyBmbGFnczsKICAgICBnX29iamVjdF9nZXQobV9wbGF5Qmlu LCAiZmxhZ3MiLCAmZmxhZ3MsIE5VTEwpOwpAQCAtMTc2MSw2ICsxNzY1LDE1IEBAIHZvaWQgTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRQcmVsb2FkKE1lZGlhUGxheWVyOjpQcmVsb2Fk IHByZWxvYWQpCiAgICAgICAgIExPR19NRURJQV9NRVNTQUdFKCJEaXNhYmxpbmcgb24tZGlzayBi dWZmZXJpbmciKTsKICAgICAgICAgZ19vYmplY3Rfc2V0KG1fcGxheUJpbiwgImZsYWdzIiwgZmxh Z3MgJiB+R1NUX1BMQVlfRkxBR19ET1dOTE9BRCwgTlVMTCk7CiAgICAgfQorfQorCit2b2lkIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c2V0UHJlbG9hZChNZWRpYVBsYXllcjo6UHJlbG9h ZCBwcmVsb2FkKQoreworICAgIG1fb3JpZ2luYWxQcmVsb2FkV2FzQXV0b0FuZFdhc092ZXJyaWRk ZW4gPSBtX3ByZWxvYWQgIT0gcHJlbG9hZCAmJiBtX3ByZWxvYWQgPT0gTWVkaWFQbGF5ZXI6OkF1 dG87CisKKyAgICBtX3ByZWxvYWQgPSBwcmVsb2FkOworCisgICAgc2V0RG93bmxvYWRCdWZmZXJp bmcoKTsKIAogICAgIGlmIChtX2RlbGF5aW5nTG9hZCAmJiBtX3ByZWxvYWQgIT0gTWVkaWFQbGF5 ZXI6Ok5vbmUpIHsKICAgICAgICAgbV9kZWxheWluZ0xvYWQgPSBmYWxzZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAppbmRleCA1OWY1MjhiNzIxZDUzYmNh MGNkMGY3YzM4NTJiZDdhOThkN2RiMDQ1Li43YmVjMTQzNmFiZjYyZGI4N2JlZjdiMGJiNDNiYmNk ODc2MDgzYmNjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9n c3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5oCkBAIC0xNTAsNiArMTUwLDcgQEAgY2xhc3MgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy IDogcHVibGljIE1lZGlhUGxheWVyUHJpdmF0ZUludGVyZmFjZSB7CiAgICAgICAgICAgICBib29s IGxvYWROZXh0TG9jYXRpb24oKTsKICAgICAgICAgICAgIHZvaWQgbWVkaWFMb2NhdGlvbkNoYW5n ZWQoR3N0TWVzc2FnZSopOwogCisgICAgICAgICAgICB2b2lkIHNldERvd25sb2FkQnVmZmVyaW5n KCk7CiAgICAgICAgICAgICB2b2lkIHByb2Nlc3NCdWZmZXJpbmdTdGF0cyhHc3RNZXNzYWdlKik7 CiAKICAgICAgICAgICAgIHZpcnR1YWwgU3RyaW5nIGVuZ2luZURlc2NyaXB0aW9uKCkgY29uc3Qg eyByZXR1cm4gIkdTdHJlYW1lciI7IH0K