135731 2014-08-07 15:30:07 -0700 [Services with UI] Action menu does not appear if selection includes both text and an image 2014-08-07 18:18:55 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Mac Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 enrica enrica thorton oldest_to_newest 1027671 0 enrica 2014-08-07 15:30:07 -0700 * STEPS TO REPRODUCE 0. Install a text viewer extension 1. Load the Yelp page for Nihon Whisky Lounge in San Francisco - http://www.yelp.com/biz/nihon-whisky-lounge-san-francisco#query:nihon%20whiskey%20lounge 2. Select some text + a picture 3. Click on the arrow. * RESULTS Nothing happens. Perhaps this is because a text viewer extension isn't considered valid for a selection containing an image, which would be fine, but in that case, I would expect the drop down arrow not to show up since there is no valid extension installed. Expected The arrow should not appear at all if there are no services that can handle combination of text and image. <rdar://problem/17837491> 1027673 1 236237 enrica 2014-08-07 15:40:53 -0700 Created attachment 236237 Patch 1027679 2 enrica 2014-08-07 16:09:16 -0700 Committed revision 172301. 1027721 3 236237 thorton 2014-08-07 18:13:18 -0700 Comment on attachment 236237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=236237&action=review > Source/WebKit2/Shared/WebProcessCreationParameters.cpp:54 > + , hasRichContentServices(false) This needs to get filled in in WebContext::createNewWebProcess, but it doesn't! Will fix. 1027723 4 236250 thorton 2014-08-07 18:15:48 -0700 Created attachment 236250 follow up patch 1027726 5 thorton 2014-08-07 18:18:55 -0700 Follow up landed in http://trac.webkit.org/changeset/172322. 236237 2014-08-07 15:40:53 -0700 2014-08-07 18:13:18 -0700 Patch richcontentforservices.txt text/plain 19134 enrica SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjI5MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI3IEBACisyMDE0LTA4LTA3ICBFbnJpY2Eg Q2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CisKKyAgICAgICAgW1NlcnZpY2VzIHdpdGggVUld IEFjdGlvbiBtZW51IGRvZXMgbm90IGFwcGVhciBpZiBzZWxlY3Rpb24gaW5jbHVkZXMgYm90aCB0 ZXh0IGFuZCBhbiBpbWFnZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTEzNTczMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTc4Mzc0OTE+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBjb2xsZWN0 aW5nIHNlbGVjdGlvbiByZWN0cyB2aWEgU2VsZWN0aW9uUmVjdEdhdGhlcmVyIHdlIHNob3VsZCBh bHNvIG5vdGUgaWYgdGhlIHNlbGVjdGlvbgorICAgICAgICBjb250YWlucyBub24gdGV4dCBlbGVt ZW50cy4gVGhpcyB3YXkgdGhlIE5vdGlmaWVyIGNsYXNzIGNhbiBzZW5kIHRoYXQgaW5mb3JtYXRp b24gdG8gU2VydmljZXNPdmVybGF5Q29udHJvbGxlcgorICAgICAgICB0byBwcm9wZXJseSBoYW5k bGUgdGhlIGhpZ2hsaWdodCBmb3IgdGhlIHNlcnZpY2UuCisKKyAgICAgICAgKiBlZGl0aW5nL1Nl bGVjdGlvblJlY3RHYXRoZXJlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3Rpb25SZWN0 R2F0aGVyZXI6OlNlbGVjdGlvblJlY3RHYXRoZXJlcik6CisgICAgICAgIChXZWJDb3JlOjpTZWxl Y3Rpb25SZWN0R2F0aGVyZXI6Ok5vdGlmaWVyOjp+Tm90aWZpZXIpOgorICAgICAgICAoV2ViQ29y ZTo6U2VsZWN0aW9uUmVjdEdhdGhlcmVyOjpjbGVhckFuZENyZWF0ZU5vdGlmaWVyKToKKyAgICAg ICAgKiBlZGl0aW5nL1NlbGVjdGlvblJlY3RHYXRoZXJlci5oOgorICAgICAgICAoV2ViQ29yZTo6 U2VsZWN0aW9uUmVjdEdhdGhlcmVyOjpzZXRUZXh0T25seSk6CisgICAgICAgIChXZWJDb3JlOjpT ZWxlY3Rpb25SZWN0R2F0aGVyZXI6OmlzVGV4dE9ubHkpOgorICAgICAgICAqIHBhZ2UvRWRpdG9y Q2xpZW50Lmg6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3JDbGllbnQ6OnNlbGVjdGlvblJlY3Rz RGlkQ2hhbmdlKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmlldy5jcHA6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJWaWV3OjphcHBseVN1YnRyZWVTZWxlY3Rpb24pOgorCiAyMDE0LTA4 LTA3ICBCZXRoIERha2luICA8YmRha2luQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXhlZCBiYWNr Z3JvdW5kcyBkb24ndCBwYWludCBpbiBibHVycmVkIGluc2V0IGFyZWFzCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvblJlY3RHYXRoZXJlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvZWRpdGluZy9TZWxlY3Rpb25SZWN0R2F0aGVyZXIuY3BwCShyZXZpc2lv biAxNzIyNDcpCisrKyBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1NlbGVjdGlvblJlY3RHYXRoZXJl ci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM3LDYgKzM3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogCiBTZWxlY3Rpb25SZWN0R2F0aGVyZXI6OlNlbGVjdGlvblJlY3RHYXRoZXJlcihSZW5kZXJW aWV3JiByZW5kZXJWaWV3KQogICAgIDogbV9yZW5kZXJWaWV3KHJlbmRlclZpZXcpCisgICAgLCBt X2lzVGV4dE9ubHkodHJ1ZSkKIHsKIH0KIApAQCAtNzAsMTMgKzcxLDE0IEBAIFNlbGVjdGlvblJl Y3RHYXRoZXJlcjo6Tm90aWZpZXI6Ok5vdGlmaWUKIFNlbGVjdGlvblJlY3RHYXRoZXJlcjo6Tm90 aWZpZXI6On5Ob3RpZmllcigpCiB7CiAgICAgaWYgKEVkaXRvckNsaWVudCogY2xpZW50ID0gbV9n YXRoZXJlci5tX3JlbmRlclZpZXcudmlldygpLmZyYW1lKCkuZWRpdG9yKCkuY2xpZW50KCkpCi0g ICAgICAgIGNsaWVudC0+c2VsZWN0aW9uUmVjdHNEaWRDaGFuZ2UobV9nYXRoZXJlci5tX3JlY3Rz LCBtX2dhdGhlcmVyLm1fZ2FwUmVjdHMpOworICAgICAgICBjbGllbnQtPnNlbGVjdGlvblJlY3Rz RGlkQ2hhbmdlKG1fZ2F0aGVyZXIubV9yZWN0cywgbV9nYXRoZXJlci5tX2dhcFJlY3RzLCBtX2dh dGhlcmVyLmlzVGV4dE9ubHkoKSk7CiB9CiAKIHN0ZDo6dW5pcXVlX3B0cjxTZWxlY3Rpb25SZWN0 R2F0aGVyZXI6Ok5vdGlmaWVyPiBTZWxlY3Rpb25SZWN0R2F0aGVyZXI6OmNsZWFyQW5kQ3JlYXRl Tm90aWZpZXIoKQogewogICAgIG1fcmVjdHMuY2xlYXIoKTsKICAgICBtX2dhcFJlY3RzLmNsZWFy KCk7CisgICAgbV9pc1RleHRPbmx5ID0gdHJ1ZTsKIAogICAgIHJldHVybiBzdGQ6Om1ha2VfdW5p cXVlPE5vdGlmaWVyPigqdGhpcyk7CiB9CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1Nl bGVjdGlvblJlY3RHYXRoZXJlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2VkaXRp bmcvU2VsZWN0aW9uUmVjdEdhdGhlcmVyLmgJKHJldmlzaW9uIDE3MjI0NykKKysrIFNvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvU2VsZWN0aW9uUmVjdEdhdGhlcmVyLmgJKHdvcmtpbmcgY29weSkKQEAg LTQ3LDYgKzQ3LDggQEAgcHVibGljOgogCiAgICAgdm9pZCBhZGRSZWN0KFJlbmRlckxheWVyTW9k ZWxPYmplY3QgKnJlcGFpbnRDb250YWluZXIsIGNvbnN0IExheW91dFJlY3QmKTsKICAgICB2b2lk IGFkZEdhcFJlY3RzKFJlbmRlckxheWVyTW9kZWxPYmplY3QgKnJlcGFpbnRDb250YWluZXIsIGNv bnN0IEdhcFJlY3RzJik7CisgICAgdm9pZCBzZXRUZXh0T25seShib29sIGlzVGV4dE9ubHkpIHsg bV9pc1RleHRPbmx5ID0gaXNUZXh0T25seTsgfQorICAgIGJvb2wgaXNUZXh0T25seSgpIGNvbnN0 IHsgcmV0dXJuIG1faXNUZXh0T25seTsgfQogCiAgICAgY2xhc3MgTm90aWZpZXIgewogICAgICAg ICBXVEZfTUFLRV9OT05DT1BZQUJMRShOb3RpZmllcik7CkBAIC02Niw2ICs2OCw3IEBAIHByaXZh dGU6CiAgICAgLy8gQWxsIHJlY3RzIGFyZSBpbiBSZW5kZXJWaWV3IGNvb3JkaW5hdGVzLgogICAg IFZlY3RvcjxMYXlvdXRSZWN0PiBtX3JlY3RzOwogICAgIFZlY3RvcjxHYXBSZWN0cz4gbV9nYXBS ZWN0czsKKyAgICBib29sIG1faXNUZXh0T25seTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2UvRWRpdG9yQ2xpZW50LmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcGFnZS9FZGl0b3JDbGllbnQuaAkocmV2aXNpb24gMTcyMjQ3KQor KysgU291cmNlL1dlYkNvcmUvcGFnZS9FZGl0b3JDbGllbnQuaAkod29ya2luZyBjb3B5KQpAQCAt MTgzLDcgKzE4Myw3IEBAIHB1YmxpYzoKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKSB8 fCBFTkFCTEUoVEVMRVBIT05FX05VTUJFUl9ERVRFQ1RJT04pCiAgICAgdmlydHVhbCB2b2lkIHNl bGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzQ2hhbmdlZChjb25zdCBWZWN0b3I8UmVmUHRyPFJh bmdlPj4mKSB7IH0KLSAgICB2aXJ0dWFsIHZvaWQgc2VsZWN0aW9uUmVjdHNEaWRDaGFuZ2UoY29u c3QgVmVjdG9yPExheW91dFJlY3Q+JiwgY29uc3QgVmVjdG9yPEdhcFJlY3RzPiYpIHsgfQorICAg IHZpcnR1YWwgdm9pZCBzZWxlY3Rpb25SZWN0c0RpZENoYW5nZShjb25zdCBWZWN0b3I8TGF5b3V0 UmVjdD4mLCBjb25zdCBWZWN0b3I8R2FwUmVjdHM+JiwgYm9vbCkgeyB9CiAjZW5kaWYKIAogICAg IC8vIFN1cHBvcnQgZm9yIGdsb2JhbCBzZWxlY3Rpb25zLCB1c2VkIG9uIHBsYXRmb3JtcyBsaWtl IHRoZSBYIFdpbmRvdyBTeXN0ZW0gdGhhdCB0cmVhdApJbmRleDogU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclZpZXcuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJWaWV3LmNwcAkocmV2aXNpb24gMTcyMjQ3KQorKysgU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDE3LDYgKzEwMTcs OCBAQCB2b2lkIFJlbmRlclZpZXc6OmFwcGx5U3VidHJlZVNlbGVjdGlvbihTCiAgICAgICAgICAg ICBmb3IgKGF1dG8mIHJlY3QgOiBzZWxlY3Rpb25JbmZvLT5jb2xsZWN0ZWRTZWxlY3Rpb25SZWN0 cygpKQogICAgICAgICAgICAgICAgIG1fc2VsZWN0aW9uUmVjdEdhdGhlcmVyLmFkZFJlY3Qoc2Vs ZWN0aW9uSW5mby0+cmVwYWludENvbnRhaW5lcigpLCByZWN0KTsKICNlbmRpZgorICAgICAgICAg ICAgaWYgKCFvLT5pc1RleHRPckxpbmVCcmVhaygpKQorICAgICAgICAgICAgICAgIG1fc2VsZWN0 aW9uUmVjdEdhdGhlcmVyLnNldFRleHRPbmx5KGZhbHNlKTsKIAogICAgICAgICAgICAgbmV3U2Vs ZWN0ZWRPYmplY3RzLnNldChvLCBXVEY6Om1vdmUoc2VsZWN0aW9uSW5mbykpOwogCkluZGV4OiBT b3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvQ2hh bmdlTG9nCShyZXZpc2lvbiAxNzIyOTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSw0MiBAQAorMjAxNC0wOC0wNyAgRW5yaWNhIENhc3VjY2kg IDxlbnJpY2FAYXBwbGUuY29tPgorCisgICAgICAgIFtTZXJ2aWNlcyB3aXRoIFVJXSBBY3Rpb24g bWVudSBkb2VzIG5vdCBhcHBlYXIgaWYgc2VsZWN0aW9uIGluY2x1ZGVzIGJvdGggdGV4dCBhbmQg YW4gaW1hZ2UuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMzU3MzEKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzE3ODM3NDkxPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBhIG5ldyBzZXR0aW5n IHRvIFNlcnZpY2VzQ29udHJvbGxlciB0byBjb21tdW5pY2F0ZSB0byB0aGUgV2ViUHJvY2VzcyBp ZgorICAgICAgICB0aGVyZSBhcmUgc2VydmljZXMgaW5zdGFsbGVkIHRoYXQgY2FuIGhhbmRsZSBh IGNvbWJpbmF0aW9uIG9mIHRleHQgYW5kIGltYWdlcy4KKyAgICAgICAgVGhpcyB3YXkgU2Vydmlj ZXNPdmVybGF5Q29udHJvbGxlciBjYW4gZGVjaWRlIGlmIGl0IGFwcHJvcHJpYXRlIHRvIHNob3cg dGhlIGhpZ2h0bGlnaHQKKyAgICAgICAgYmFzZWQgb24gdGhlIHR5cGUgb2Ygc2VsZWN0aW9uICh0 ZXh0IG9ubHkgb3Igbm9uIHRleHQgb25seSkuIFRoaXMgaW5mb3JtYXRpb24gaXMgcmV0cmlldmVk CisgICAgICAgIHdoZW4gdGhlIHNlbGVjdGlvbiByZWN0cyBhcmUgY29sbGVjdGVkIGJ5IFNlbGVj dGlvbkdhdGhlcmVyIGFuZCB1c2VkIGJ5CisgICAgICAgIFNlbGVjdGlvbkdhdGhlcmVyOjpOb3Rp ZmllciB0byBjb21tdW5pY2F0ZSB0aGUgc2VsZWN0aW9uIGNoYW5nZS4KKworICAgICAgICAqIFNo YXJlZC9XZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6V2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy cyk6CisgICAgICAgICogU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaDoKKyAg ICAgICAgKiBVSVByb2Nlc3MvbWFjL1NlcnZpY2VzQ29udHJvbGxlci5oOgorICAgICAgICAoV2Vi S2l0OjpTZXJ2aWNlc0NvbnRyb2xsZXI6Omhhc1JpY2hDb250ZW50U2VydmljZXMpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvU2VydmljZXNDb250cm9sbGVyLm1tOgorICAgICAgICAoV2ViS2l0 OjpTZXJ2aWNlc0NvbnRyb2xsZXI6OlNlcnZpY2VzQ29udHJvbGxlcik6CisgICAgICAgIChXZWJL aXQ6OlNlcnZpY2VzQ29udHJvbGxlcjo6cmVmcmVzaEV4aXN0aW5nU2VydmljZXMpOgorICAgICAg ICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9yQ2xpZW50LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViRWRpdG9yQ2xpZW50OjpzZWxlY3Rpb25SZWN0c0RpZENoYW5nZSk6Cisg ICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuaDoKKyAg ICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oOgor ICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvU2VydmljZXNPdmVybGF5Q29udHJvbGxl ci5tbToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6U2Vydmlj ZXNPdmVybGF5Q29udHJvbGxlcik6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VzT3ZlcmxheUNv bnRyb2xsZXI6OnNlbGVjdGlvblJlY3RzRGlkQ2hhbmdlKToKKyAgICAgICAgKFdlYktpdDo6U2Vy dmljZXNPdmVybGF5Q29udHJvbGxlcjo6ZHJhd1NlbGVjdGlvbkhpZ2hsaWdodCk6CisgICAgICAg ICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz czo6V2ViUHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRpYWxpemVX ZWJQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6c2V0RW5hYmxlZFNlcnZp Y2VzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuaDoKKyAgICAgICAgKFdlYktp dDo6V2ViUHJvY2Vzczo6aGFzUmljaENvbnRlbnRTZXJ2aWNlcyk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2VzLmluOgorCiAyMDE0LTA4LTA3ICBSeXVhbiBDaG9pICA8 cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXSBGaXggc2V2ZXJhbCB3YXJu aW5ncyBvZiBkb3h5Z2VuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0Ny ZWF0aW9uUGFyYW1ldGVycy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVk L1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuY3BwCShyZXZpc2lvbiAxNzIyNDcpCisrKyBT b3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHdv cmtpbmcgY29weSkKQEAgLTUxLDYgKzUxLDcgQEAgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy czo6V2ViUHJvY2VzcwogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgICwgaGFzSW1h Z2VTZXJ2aWNlcyhmYWxzZSkKICAgICAsIGhhc1NlbGVjdGlvblNlcnZpY2VzKGZhbHNlKQorICAg ICwgaGFzUmljaENvbnRlbnRTZXJ2aWNlcyhmYWxzZSkKICNlbmRpZgogewogfQpJbmRleDogU291 cmNlL1dlYktpdDIvU2hhcmVkL1dlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy cy5oCShyZXZpc2lvbiAxNzIyNDcpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvV2ViUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNjgsNiArMTY4LDcgQEAg c3RydWN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMgewogI2lmIEVOQUJMRShTRVJWSUNF X0NPTlRST0xTKQogICAgIGJvb2wgaGFzSW1hZ2VTZXJ2aWNlczsKICAgICBib29sIGhhc1NlbGVj dGlvblNlcnZpY2VzOworICAgIGJvb2wgaGFzUmljaENvbnRlbnRTZXJ2aWNlczsKICNlbmRpZgog fTsKIApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xs ZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1NlcnZpY2Vz Q29udHJvbGxlci5oCShyZXZpc2lvbiAxNzIyNDcpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1NlcnZpY2VzQ29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC00NSw2ICs0NSw3 IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaGFzSW1hZ2VTZXJ2aWNlcygpIGNvbnN0IHsgcmV0dXJu IG1faGFzSW1hZ2VTZXJ2aWNlczsgfQogICAgIGJvb2wgaGFzU2VsZWN0aW9uU2VydmljZXMoKSBj b25zdCB7IHJldHVybiBtX2hhc1NlbGVjdGlvblNlcnZpY2VzOyB9CisgICAgYm9vbCBoYXNSaWNo Q29udGVudFNlcnZpY2VzKCkgY29uc3QgeyByZXR1cm4gbV9oYXNSaWNoQ29udGVudFNlcnZpY2Vz OyB9CiAKICAgICB2b2lkIHJlZnJlc2hFeGlzdGluZ1NlcnZpY2VzKFdlYkNvbnRleHQqKTsKIApA QCAtNTgsNiArNTksNyBAQCBwcml2YXRlOgogCiAgICAgYm9vbCBtX2hhc0ltYWdlU2VydmljZXM7 CiAgICAgYm9vbCBtX2hhc1NlbGVjdGlvblNlcnZpY2VzOworICAgIGJvb2wgbV9oYXNSaWNoQ29u dGVudFNlcnZpY2VzOwogCiAgICAgSGFzaFNldDxSZWZQdHI8V2ViQ29udGV4dD4+IG1fY29udGV4 dHNUb05vdGlmeTsKIH07CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1NlcnZp Y2VzQ29udHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv bWFjL1NlcnZpY2VzQ29udHJvbGxlci5tbQkocmV2aXNpb24gMTcyMjQ3KQorKysgU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL21hYy9TZXJ2aWNlc0NvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkK QEAgLTYxLDYgKzYxLDcgQEAgU2VydmljZXNDb250cm9sbGVyOjpTZXJ2aWNlc0NvbnRyb2xsZXIo KQogICAgICwgbV9pc1JlZnJlc2hpbmcoZmFsc2UpCiAgICAgLCBtX2hhc0ltYWdlU2VydmljZXMo ZmFsc2UpCiAgICAgLCBtX2hhc1NlbGVjdGlvblNlcnZpY2VzKGZhbHNlKQorICAgICwgbV9oYXNS aWNoQ29udGVudFNlcnZpY2VzKGZhbHNlKQogewogICAgIHJlZnJlc2hFeGlzdGluZ1NlcnZpY2Vz KCk7CiB9CkBAIC05MywxNCArOTQsMzAgQEAgdm9pZCBTZXJ2aWNlc0NvbnRyb2xsZXI6OnJlZnJl c2hFeGlzdGluZwogCiAgICAgICAgIGJvb2wgaGFzU2VsZWN0aW9uU2VydmljZXMgPSBwaWNrZXIu Z2V0KCkubWVudTsKIAorICAgICAgICBzdGF0aWMgTlNBdHRyaWJ1dGVkU3RyaW5nICphdHRyaWJ1 dGVkU3RyaW5nV2l0aFJpY2hDb250ZW50OworICAgICAgICBpZiAoIWF0dHJpYnV0ZWRTdHJpbmdX aXRoUmljaENvbnRlbnQpIHsKKyAgICAgICAgICAgIE5TVGV4dEF0dGFjaG1lbnQgKmF0dGFjaG1l bnQgPSBbW05TVGV4dEF0dGFjaG1lbnQgYWxsb2NdIGluaXRdOworICAgICAgICAgICAgTlNUZXh0 QXR0YWNobWVudENlbGwgKmNlbGwgPSBbW05TVGV4dEF0dGFjaG1lbnRDZWxsIGFsbG9jXSBpbml0 SW1hZ2VDZWxsOmltYWdlLmdldCgpXTsKKyAgICAgICAgICAgIFthdHRhY2htZW50IHNldEF0dGFj aG1lbnRDZWxsOmNlbGxdOworICAgICAgICAgICAgTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyAq cmljaFN0cmluZyA9IChOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nICopW05TTXV0YWJsZUF0dHJp YnV0ZWRTdHJpbmcgYXR0cmlidXRlZFN0cmluZ1dpdGhBdHRhY2htZW50OmF0dGFjaG1lbnRdOwor ICAgICAgICAgICAgW3JpY2hTdHJpbmcgYXBwZW5kQXR0cmlidXRlZFN0cmluZzogYXR0cmlidXRl ZFN0cmluZ107CisgICAgICAgICAgICBhdHRyaWJ1dGVkU3RyaW5nV2l0aFJpY2hDb250ZW50ID0g W3JpY2hTdHJpbmcgcmV0YWluXTsKKyAgICAgICAgfQorCisgICAgICAgIHBpY2tlciA9IGFkb3B0 TlMoW1tOU1NoYXJpbmdTZXJ2aWNlUGlja2VyIGFsbG9jXSBpbml0V2l0aEl0ZW1zOkBbIGF0dHJp YnV0ZWRTdHJpbmdXaXRoUmljaENvbnRlbnQgXV0pOworICAgICAgICBbcGlja2VyIHNldFN0eWxl Ok5TU2hhcmluZ1NlcnZpY2VQaWNrZXJTdHlsZVRleHRTZWxlY3Rpb25dOworCisgICAgICAgIGJv b2wgaGFzUmljaENvbnRlbnRTZXJ2aWNlcyA9IHBpY2tlci5nZXQoKS5tZW51OworICAgICAgICAK ICAgICAgICAgZGlzcGF0Y2hfYXN5bmMoZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSwgXnsKLSAg ICAgICAgICAgIGJvb2wgbm90aWZ5Q29udGV4dHMgPSAoaGFzSW1hZ2VTZXJ2aWNlcyAhPSBtX2hh c0ltYWdlU2VydmljZXMpIHx8IChoYXNTZWxlY3Rpb25TZXJ2aWNlcyAhPSBtX2hhc1NlbGVjdGlv blNlcnZpY2VzKTsKKyAgICAgICAgICAgIGJvb2wgbm90aWZ5Q29udGV4dHMgPSAoaGFzSW1hZ2VT ZXJ2aWNlcyAhPSBtX2hhc0ltYWdlU2VydmljZXMpIHx8IChoYXNTZWxlY3Rpb25TZXJ2aWNlcyAh PSBtX2hhc1NlbGVjdGlvblNlcnZpY2VzKSB8fCAoaGFzUmljaENvbnRlbnRTZXJ2aWNlcyAhPSBt X2hhc1JpY2hDb250ZW50U2VydmljZXMpOwogICAgICAgICAgICAgbV9oYXNTZWxlY3Rpb25TZXJ2 aWNlcyA9IGhhc1NlbGVjdGlvblNlcnZpY2VzOwogICAgICAgICAgICAgbV9oYXNJbWFnZVNlcnZp Y2VzID0gaGFzSW1hZ2VTZXJ2aWNlczsKKyAgICAgICAgICAgIG1faGFzUmljaENvbnRlbnRTZXJ2 aWNlcyA9IGhhc1JpY2hDb250ZW50U2VydmljZXM7CiAKICAgICAgICAgICAgIGlmIChub3RpZnlD b250ZXh0cykgewogICAgICAgICAgICAgICAgIGZvciAoY29uc3QgUmVmUHRyPFdlYkNvbnRleHQ+ JiBjb250ZXh0IDogbV9jb250ZXh0c1RvTm90aWZ5KQotICAgICAgICAgICAgICAgICAgICBjb250 ZXh0LT5zZW5kVG9BbGxQcm9jZXNzZXMoTWVzc2FnZXM6OldlYlByb2Nlc3M6OlNldEVuYWJsZWRT ZXJ2aWNlcyhtX2hhc0ltYWdlU2VydmljZXMsIG1faGFzU2VsZWN0aW9uU2VydmljZXMpKTsKKyAg ICAgICAgICAgICAgICAgICAgY29udGV4dC0+c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpX ZWJQcm9jZXNzOjpTZXRFbmFibGVkU2VydmljZXMobV9oYXNJbWFnZVNlcnZpY2VzLCBtX2hhc1Nl bGVjdGlvblNlcnZpY2VzLCBtX2hhc1JpY2hDb250ZW50U2VydmljZXMpKTsKICAgICAgICAgICAg IH0KIAogICAgICAgICAgICAgbV9jb250ZXh0c1RvTm90aWZ5LmNsZWFyKCk7CkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDE3MjI0NykKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTE3NCw2ICsxNzQsNyBAQCBXZWJQcm9jZXNzOjpXZWJQcm9jZXNzKCkKICNpZiBFTkFCTEUo U0VSVklDRV9DT05UUk9MUykKICAgICAsIG1faGFzSW1hZ2VTZXJ2aWNlcyhmYWxzZSkKICAgICAs IG1faGFzU2VsZWN0aW9uU2VydmljZXMoZmFsc2UpCisgICAgLCBtX2hhc1JpY2hDb250ZW50U2Vy dmljZXMoZmFsc2UpCiAjZW5kaWYKICAgICAsIG1fbm9uVmlzaWJsZVByb2Nlc3NDbGVhbnVwVGlt ZXIodGhpcywgJldlYlByb2Nlc3M6Om5vblZpc2libGVQcm9jZXNzQ2xlYW51cFRpbWVyRmlyZWQp CiB7CkBAIC0zNjQsNyArMzY1LDcgQEAgdm9pZCBXZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJv Y2VzcyhjbwogICAgIHNldE1lbW9yeUNhY2hlRGlzYWJsZWQocGFyYW1ldGVycy5tZW1vcnlDYWNo ZURpc2FibGVkKTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotICAgIHNldEVuYWJs ZWRTZXJ2aWNlcyhwYXJhbWV0ZXJzLmhhc0ltYWdlU2VydmljZXMsIHBhcmFtZXRlcnMuaGFzU2Vs ZWN0aW9uU2VydmljZXMpOworICAgIHNldEVuYWJsZWRTZXJ2aWNlcyhwYXJhbWV0ZXJzLmhhc0lt YWdlU2VydmljZXMsIHBhcmFtZXRlcnMuaGFzU2VsZWN0aW9uU2VydmljZXMsIHBhcmFtZXRlcnMu aGFzUmljaENvbnRlbnRTZXJ2aWNlcyk7CiAjZW5kaWYKIAogI2lmIEVOQUJMRShSRU1PVEVfSU5T UEVDVE9SKQpAQCAtMTI1MSwxMCArMTI1MiwxMSBAQCB2b2lkIFdlYlByb2Nlc3M6OnNldE1lbW9y eUNhY2hlRGlzYWJsZWQoCiB9CiAKICNpZiBFTkFCTEUoU0VSVklDRV9DT05UUk9MUykKLXZvaWQg V2ViUHJvY2Vzczo6c2V0RW5hYmxlZFNlcnZpY2VzKGJvb2wgaGFzSW1hZ2VTZXJ2aWNlcywgYm9v bCBoYXNTZWxlY3Rpb25TZXJ2aWNlcykKK3ZvaWQgV2ViUHJvY2Vzczo6c2V0RW5hYmxlZFNlcnZp Y2VzKGJvb2wgaGFzSW1hZ2VTZXJ2aWNlcywgYm9vbCBoYXNTZWxlY3Rpb25TZXJ2aWNlcywgYm9v bCBoYXNSaWNoQ29udGVudFNlcnZpY2VzKQogewogICAgIG1faGFzSW1hZ2VTZXJ2aWNlcyA9IGhh c0ltYWdlU2VydmljZXM7CiAgICAgbV9oYXNTZWxlY3Rpb25TZXJ2aWNlcyA9IGhhc1NlbGVjdGlv blNlcnZpY2VzOworICAgIG1faGFzUmljaENvbnRlbnRTZXJ2aWNlcyA9IGhhc1JpY2hDb250ZW50 U2VydmljZXM7CiB9CiAjZW5kaWYKIApJbmRleDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ cm9jZXNzLmgJKHJldmlzaW9uIDE3MjI0NykKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODksNiArMTg5LDcgQEAgcHVibGljOgog I2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQogICAgIGJvb2wgaGFzSW1hZ2VTZXJ2aWNlcygp IGNvbnN0IHsgcmV0dXJuIG1faGFzSW1hZ2VTZXJ2aWNlczsgfQogICAgIGJvb2wgaGFzU2VsZWN0 aW9uU2VydmljZXMoKSBjb25zdCB7IHJldHVybiBtX2hhc1NlbGVjdGlvblNlcnZpY2VzOyB9Cisg ICAgYm9vbCBoYXNSaWNoQ29udGVudFNlcnZpY2VzKCkgY29uc3QgeyByZXR1cm4gbV9oYXNSaWNo Q29udGVudFNlcnZpY2VzOyB9CiAjZW5kaWYKIAogcHJpdmF0ZToKQEAgLTI1Miw3ICsyNTMsNyBA QCBwcml2YXRlOgogICAgIHZvaWQgc2V0TWVtb3J5Q2FjaGVEaXNhYmxlZChib29sKTsKIAogI2lm IEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotICAgIHZvaWQgc2V0RW5hYmxlZFNlcnZpY2VzKGJv b2wgaGFzSW1hZ2VTZXJ2aWNlcywgYm9vbCBoYXNTZWxlY3Rpb25TZXJ2aWNlcyk7CisgICAgdm9p ZCBzZXRFbmFibGVkU2VydmljZXMoYm9vbCBoYXNJbWFnZVNlcnZpY2VzLCBib29sIGhhc1NlbGVj dGlvblNlcnZpY2VzLCBib29sIGhhc1JpY2hDb250ZW50U2VydmljZXMpOwogI2VuZGlmCiAKICAg ICB2b2lkIHBvc3RJbmplY3RlZEJ1bmRsZU1lc3NhZ2UoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNl JiBtZXNzYWdlRGF0YSk7CkBAIC0zMzksNiArMzQwLDcgQEAgcHJpdmF0ZToKICNpZiBFTkFCTEUo U0VSVklDRV9DT05UUk9MUykKICAgICBib29sIG1faGFzSW1hZ2VTZXJ2aWNlczsKICAgICBib29s IG1faGFzU2VsZWN0aW9uU2VydmljZXM7CisgICAgYm9vbCBtX2hhc1JpY2hDb250ZW50U2Vydmlj ZXM7CiAjZW5kaWYKIAogICAgIEhhc2hTZXQ8dWludDY0X3Q+IG1fcGFnZXNJbldpbmRvd3M7Cklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MubWVzc2FnZXMuaW4KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLm1lc3NhZ2Vz LmluCShyZXZpc2lvbiAxNzIyNDcpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBy b2Nlc3MubWVzc2FnZXMuaW4JKHdvcmtpbmcgY29weSkKQEAgLTkwLDcgKzkwLDcgQEAgbWVzc2Fn ZXMgLT4gV2ViUHJvY2VzcyBMZWdhY3lSZWNlaXZlciB7CiAgICAgU2V0TWVtb3J5Q2FjaGVEaXNh YmxlZChib29sIGRpc2FibGVkKTsKIAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xTKQotICAg IFNldEVuYWJsZWRTZXJ2aWNlcyhib29sIGhhc0ltYWdlU2VydmljZXMsIGJvb2wgaGFzU2VsZWN0 aW9uU2VydmljZXMpCisgICAgU2V0RW5hYmxlZFNlcnZpY2VzKGJvb2wgaGFzSW1hZ2VTZXJ2aWNl cywgYm9vbCBoYXNTZWxlY3Rpb25TZXJ2aWNlcywgYm9vbCBoYXNSaWNoQ29udGVudFNlcnZpY2Vz KQogI2VuZGlmCiAKICAgICBQcm9jZXNzV2lsbFN1c3BlbmQoKQpJbmRleDogU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRWRpdG9y Q2xpZW50LmNwcAkocmV2aXNpb24gMTcyMjQ3KQorKysgU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGllbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 MzgsMTEgKzUzOCwxMSBAQCB2b2lkIFdlYkVkaXRvckNsaWVudDo6c2VsZWN0ZWRUZWxlcGhvbmVO CiAgICAgbV9wYWdlLT5zZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyKCkuc2VsZWN0ZWRUZWxlcGhv bmVOdW1iZXJSYW5nZXNDaGFuZ2VkKHJhbmdlcyk7CiAjZW5kaWYKIH0KLXZvaWQgV2ViRWRpdG9y Q2xpZW50OjpzZWxlY3Rpb25SZWN0c0RpZENoYW5nZShjb25zdCBWZWN0b3I8TGF5b3V0UmVjdD4m IHJlY3RzLCBjb25zdCBWZWN0b3I8R2FwUmVjdHM+JiBnYXBSZWN0cykKK3ZvaWQgV2ViRWRpdG9y Q2xpZW50OjpzZWxlY3Rpb25SZWN0c0RpZENoYW5nZShjb25zdCBWZWN0b3I8TGF5b3V0UmVjdD4m IHJlY3RzLCBjb25zdCBWZWN0b3I8R2FwUmVjdHM+JiBnYXBSZWN0cywgYm9vbCBpc1RleHRPbmx5 KQogewogI2lmIFBMQVRGT1JNKE1BQykKICAgICBpZiAobV9wYWdlLT5zZXJ2aWNlQ29udHJvbHNF bmFibGVkKCkpCi0gICAgICAgIG1fcGFnZS0+c2VydmljZXNPdmVybGF5Q29udHJvbGxlcigpLnNl bGVjdGlvblJlY3RzRGlkQ2hhbmdlKHJlY3RzLCBnYXBSZWN0cyk7CisgICAgICAgIG1fcGFnZS0+ c2VydmljZXNPdmVybGF5Q29udHJvbGxlcigpLnNlbGVjdGlvblJlY3RzRGlkQ2hhbmdlKHJlY3Rz LCBnYXBSZWN0cywgaXNUZXh0T25seSk7CiAjZW5kaWYKIH0KICNlbmRpZiAvLyBFTkFCTEUoU0VS VklDRV9DT05UUk9MUykgJiYgRU5BQkxFKFRFTEVQSE9ORV9OVU1CRVJfREVURUNUSU9OKQpJbmRl eDogU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJFZGl0b3JDbGll bnQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkVkaXRvckNsaWVudC5oCShyZXZpc2lvbiAxNzIyNDcpCisrKyBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkVkaXRvckNsaWVudC5oCSh3b3JraW5nIGNv cHkpCkBAIC0xNzAsNyArMTcwLDcgQEAgcHJpdmF0ZToKIAogI2lmIEVOQUJMRShURUxFUEhPTkVf TlVNQkVSX0RFVEVDVElPTikgfHwgRU5BQkxFKFNFUlZJQ0VfQ09OVFJPTFMpCiAgICAgdmlydHVh bCB2b2lkIHNlbGVjdGVkVGVsZXBob25lTnVtYmVyUmFuZ2VzQ2hhbmdlZChjb25zdCBWZWN0b3I8 UmVmUHRyPFdlYkNvcmU6OlJhbmdlPj4mKSBvdmVycmlkZTsKLSAgICB2aXJ0dWFsIHZvaWQgc2Vs ZWN0aW9uUmVjdHNEaWRDaGFuZ2UoY29uc3QgVmVjdG9yPFdlYkNvcmU6OkxheW91dFJlY3Q+Jiwg Y29uc3QgVmVjdG9yPFdlYkNvcmU6OkdhcFJlY3RzPiYpIG92ZXJyaWRlOworICAgIHZpcnR1YWwg dm9pZCBzZWxlY3Rpb25SZWN0c0RpZENoYW5nZShjb25zdCBWZWN0b3I8V2ViQ29yZTo6TGF5b3V0 UmVjdD4mLCBjb25zdCBWZWN0b3I8V2ViQ29yZTo6R2FwUmVjdHM+JiwgYm9vbCBpc1RleHRPbmx5 KSBvdmVycmlkZTsKICNlbmRpZgogCiAgICAgV2ViUGFnZSogbV9wYWdlOwpJbmRleDogU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1NlcnZpY2VzT3ZlcmxheUNvbnRyb2xsZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvU2VydmljZXNP dmVybGF5Q29udHJvbGxlci5oCShyZXZpc2lvbiAxNzIyNDcpCisrKyBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvU2VydmljZXNPdmVybGF5Q29udHJvbGxlci5oCSh3b3JraW5nIGNv cHkpCkBAIC02Myw3ICs2Myw3IEBAIHB1YmxpYzoKICAgICB+U2VydmljZXNPdmVybGF5Q29udHJv bGxlcigpOwogCiAgICAgdm9pZCBzZWxlY3RlZFRlbGVwaG9uZU51bWJlclJhbmdlc0NoYW5nZWQo Y29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpSYW5nZT4+Jik7Ci0gICAgdm9pZCBzZWxlY3Rp b25SZWN0c0RpZENoYW5nZShjb25zdCBWZWN0b3I8V2ViQ29yZTo6TGF5b3V0UmVjdD4mLCBjb25z dCBWZWN0b3I8V2ViQ29yZTo6R2FwUmVjdHM+Jik7CisgICAgdm9pZCBzZWxlY3Rpb25SZWN0c0Rp ZENoYW5nZShjb25zdCBWZWN0b3I8V2ViQ29yZTo6TGF5b3V0UmVjdD4mLCBjb25zdCBWZWN0b3I8 V2ViQ29yZTo6R2FwUmVjdHM+JiwgYm9vbCBpc1RleHRPbmx5KTsKIAogcHJpdmF0ZToKICAgICB2 b2lkIGNyZWF0ZU92ZXJsYXlJZk5lZWRlZCgpOwpAQCAtOTUsNiArOTUsNyBAQCBwcml2YXRlOgog ICAgIAogICAgIFZlY3RvcjxXZWJDb3JlOjpMYXlvdXRSZWN0PiBtX2N1cnJlbnRTZWxlY3Rpb25S ZWN0czsKICAgICBSZXRhaW5QdHI8RERIaWdobGlnaHRSZWY+IG1fc2VsZWN0aW9uSGlnaGxpZ2h0 OworICAgIGJvb2wgbV9pc1RleHRPbmx5OwogICAgIHN0ZDo6Y2hyb25vOjpzdGVhZHlfY2xvY2s6 OnRpbWVfcG9pbnQgbV9sYXN0U2VsZWN0aW9uQ2hhbmdlVGltZTsKICAgICBzdGQ6OmNocm9ubzo6 c3RlYWR5X2Nsb2NrOjp0aW1lX3BvaW50IG1fbGFzdEhvdmVyZWRIaWdobGlnaHRDaGFuZ2VUaW1l OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1NlcnZpY2Vz T3ZlcmxheUNvbnRyb2xsZXIubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL21hYy9TZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyLm1tCShyZXZpc2lvbiAx NzIyNDcpCisrKyBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1NlcnZpY2Vz T3ZlcmxheUNvbnRyb2xsZXIubW0JKHdvcmtpbmcgY29weSkKQEAgLTc2LDYgKzc2LDcgQEAgc3Rh dGljIEludFJlY3QgdGV4dFF1YWRzVG9Cb3VuZGluZ1JlY3RGbwogU2VydmljZXNPdmVybGF5Q29u dHJvbGxlcjo6U2VydmljZXNPdmVybGF5Q29udHJvbGxlcihXZWJQYWdlJiB3ZWJQYWdlKQogICAg IDogbV93ZWJQYWdlKCZ3ZWJQYWdlKQogICAgICwgbV9zZXJ2aWNlc092ZXJsYXkobnVsbHB0cikK KyAgICAsIG1faXNUZXh0T25seShmYWxzZSkKICAgICAsIG1fcmVwYWludEhpZ2hsaWdodFRpbWVy KHRoaXMsICZTZXJ2aWNlc092ZXJsYXlDb250cm9sbGVyOjpyZXBhaW50SGlnaGxpZ2h0VGltZXJG aXJlZCkKIHsKIH0KQEAgLTIxMSwxMSArMjEyLDEyIEBAIHN0YXRpYyB2b2lkIGNvbXBhY3RSZWN0 c1dpdGhHYXBSZWN0cyhWZWMKICAgICB9CiB9CiAKLXZvaWQgU2VydmljZXNPdmVybGF5Q29udHJv bGxlcjo6c2VsZWN0aW9uUmVjdHNEaWRDaGFuZ2UoY29uc3QgVmVjdG9yPExheW91dFJlY3Q+JiBy ZWN0cywgY29uc3QgVmVjdG9yPEdhcFJlY3RzPiYgZ2FwUmVjdHMpCit2b2lkIFNlcnZpY2VzT3Zl cmxheUNvbnRyb2xsZXI6OnNlbGVjdGlvblJlY3RzRGlkQ2hhbmdlKGNvbnN0IFZlY3RvcjxMYXlv dXRSZWN0PiYgcmVjdHMsIGNvbnN0IFZlY3RvcjxHYXBSZWN0cz4mIGdhcFJlY3RzLCBib29sIGlz VGV4dE9ubHkpCiB7CiAjaWYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+IDEwOTAK ICAgICBjbGVhclNlbGVjdGlvbkhpZ2hsaWdodCgpOwogICAgIG1fY3VycmVudFNlbGVjdGlvblJl Y3RzID0gcmVjdHM7CisgICAgbV9pc1RleHRPbmx5ID0gaXNUZXh0T25seTsKIAogICAgIG1fbGFz dFNlbGVjdGlvbkNoYW5nZVRpbWUgPSBzdGQ6OmNocm9ubzo6c3RlYWR5X2Nsb2NrOjpub3coKTsK IApAQCAtMjcxLDcgKzI3Myw3IEBAIHZvaWQgU2VydmljZXNPdmVybGF5Q29udHJvbGxlcjo6ZHJh d1NlbGUKIHsKICAgICAvLyBJdCdzIHBvc3NpYmxlIHRvIGVuZCB1cCBkcmF3aW5nIHRoZSBzZWxl Y3Rpb24gaGlnaGxpZ2h0IGJlZm9yZSB3ZSd2ZSBhY3R1YWxseSByZWNlaXZlZCB0aGUgc2VsZWN0 aW9uIHJlY3RzLgogICAgIC8vIElmIHRoYXQgaGFwcGVucyB3ZSdsbCBlbmQgdXAgaGVyZSBhZ2Fp biBvbmNlIHdlIGhhdmUgdGhlIHJlY3RzLgotICAgIGlmIChtX2N1cnJlbnRTZWxlY3Rpb25SZWN0 cy5pc0VtcHR5KCkpCisgICAgaWYgKG1fY3VycmVudFNlbGVjdGlvblJlY3RzLmlzRW1wdHkoKSB8 fCAoIVdlYlByb2Nlc3M6OnNoYXJlZCgpLmhhc1JpY2hDb250ZW50U2VydmljZXMoKSAmJiAhbV9p c1RleHRPbmx5KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gSWYgdGhlcmUgYXJlIG5vIGlu c3RhbGxlZCBzZWxlY3Rpb24gc2VydmljZXMgYW5kIHdlIGhhdmUgbm8gcGhvbmUgbnVtYmVycyBk ZXRlY3RlZCwgdGhlbiB3ZSBoYXZlIG5vdGhpbmcgdG8gZHJhdy4K 236250 2014-08-07 18:15:48 -0700 2014-08-07 18:17:07 -0700 follow up patch services.diff text/plain 1375 thorton SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjMyMCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE0LTA4LTA3ICBUaW0gSG9y dG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgorCisgICAgICAgIFtTZXJ2aWNlcyB3aXRo IFVJXSBBY3Rpb24gbWVudSBkb2VzIG5vdCBhcHBlYXIgaWYgc2VsZWN0aW9uIGluY2x1ZGVzIGJv dGggdGV4dCBhbmQgYW4gaW1hZ2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzNTczMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTc4Mzc0OTE+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OmNyZWF0ZU5l d1dlYlByb2Nlc3MpOgorICAgICAgICBJbml0aWFsaXplIGhhc1JpY2hDb250ZW50U2VydmljZXMg d2l0aCB0aGUgY2FjaGVkIHZhbHVlLgorCiAyMDE0LTA4LTA3ICBCZW5qYW1pbiBQb3VsYWluICA8 YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEdldCByaWQgb2YgU0NSSVBURURfU1BFRUNI CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCShyZXZpc2lvbiAx NzIzMjApCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTY4MSw2ICs2ODEsNyBAQAogI2lmIEVOQUJMRShTRVJWSUNFX0NPTlRST0xT KQogICAgIHBhcmFtZXRlcnMuaGFzSW1hZ2VTZXJ2aWNlcyA9IFNlcnZpY2VzQ29udHJvbGxlcjo6 c2hhcmVkKCkuaGFzSW1hZ2VTZXJ2aWNlcygpOwogICAgIHBhcmFtZXRlcnMuaGFzU2VsZWN0aW9u U2VydmljZXMgPSBTZXJ2aWNlc0NvbnRyb2xsZXI6OnNoYXJlZCgpLmhhc1NlbGVjdGlvblNlcnZp Y2VzKCk7CisgICAgcGFyYW1ldGVycy5oYXNSaWNoQ29udGVudFNlcnZpY2VzID0gU2VydmljZXND b250cm9sbGVyOjpzaGFyZWQoKS5oYXNSaWNoQ29udGVudFNlcnZpY2VzKCk7CiAgICAgU2Vydmlj ZXNDb250cm9sbGVyOjpzaGFyZWQoKS5yZWZyZXNoRXhpc3RpbmdTZXJ2aWNlcyh0aGlzKTsKICNl bmRpZgogCg==