135595 2014-08-04 22:08:45 -0700 AX: Select text activity should return replaced text instead of previously selected text 2014-08-05 08:16:18 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach aboxhall apinheiro commit-queue dmazzoni jcraig jdiggs mario samuel_white webkit-bug-importer oldest_to_newest 1026792 0 cfleizach 2014-08-04 22:08:45 -0700 1. Enable Enhanced Dictation in System Preferences>Dictation & Speech 2. Enable Advanced Dictation Commands in System Preferences>Accessibility>Dictation 3. Open Notes and create a new note 4. Activate dictation with fn-fn 5. Say "The quick brown fox jumped. New line. Over the lazy dog" 6. Say "Change lazy dog to excited animal" and note excited animal is entered twice <rdar://problem/17072113> 1026798 1 236006 cfleizach 2014-08-04 23:00:00 -0700 Created attachment 236006 patch 1026799 2 236007 cfleizach 2014-08-04 23:01:16 -0700 Created attachment 236007 patch 1026844 3 236007 commit-queue 2014-08-05 08:16:15 -0700 Comment on attachment 236007 patch Clearing flags on attachment: 236007 Committed r172028: <http://trac.webkit.org/changeset/172028> 1026845 4 commit-queue 2014-08-05 08:16:18 -0700 All reviewed patches have been landed. Closing bug. 236006 2014-08-04 23:00:00 -0700 2014-08-04 23:01:16 -0700 patch patch text/plain 6687 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjAyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTA4LTA0ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKKyAgICAgICAgQVg6IFNlbGVjdCB0ZXh0 IGFjdGl2aXR5IHNob3VsZCByZXR1cm4gcmVwbGFjZWQgdGV4dCBpbnN0ZWFkIG9mIHByZXZpb3Vz bHkgc2VsZWN0ZWQgdGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM1NTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiB0aGUgc2VsZWN0IGFjdGl2aXR5IEFQSSBpcyB1c2VkIHRvIHJlcGxhY2Ug dGV4dCwgdGhlIHJlcGxhY2VtZW50IHN0cmluZyBzaG91bGQgYmUgcmV0dXJuZWQgaW5zdGVhZCBp biB0aGUgb2xkIHNlbGVjdGVkIHRleHQuCisKKyAgICAgICAgVXBkYXRlZCBleGlzdGluZyB0ZXN0 OiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3QtdGV4dC5odG1sCisKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6c2VsZWN0VGV4dCk6CisKKzIwMTQtMDgtMDQgIENocmlz IEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKwogICAgICAgICBBWDogU2VsZWN0IGFj dGl2aXR5IGJlaGF2aW9yIGRvZXMgbm90IHdvcmsgd2hlbiBhbiBleGlzdGluZyByYW5nZSBpcyBh bHJlYWR5IHNlbGVjdGVkCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzU1NzkKIApJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiAxNzIwMjcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02NzYsOCArNjc2LDEzIEBACiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGlmIChyZXBsYWNlU2VsZWN0aW9u KQorICAgICAgICAgICAgLy8gQSBiaXQgb2J2aW91cywgYnV0IHdvcnRoIG5vdGhpbmcgdGhlIEFQ SSBjb250cmFjdCBmb3IgdGhpcyBtZXRob2QgaXMgdGhhdCB3ZSBzaG91bGQKKyAgICAgICAgICAg IC8vIHJldHVybiB0aGUgcmVwbGFjZW1lbnQgc3RyaW5nIHdoZW4gcmVwbGFjaW5nLCBidXQgdGhl IHNlbGVjdGVkIHN0cmluZyBpZiBub3QuCisgICAgICAgICAgICBpZiAocmVwbGFjZVNlbGVjdGlv bikgewogICAgICAgICAgICAgICAgIGZyYW1lLT5lZGl0b3IoKS5yZXBsYWNlU2VsZWN0aW9uV2l0 aFRleHQocmVwbGFjZW1lbnRTdHJpbmcsIHRydWUsIHRydWUpOworICAgICAgICAgICAgICAgIHJl dHVybiByZXBsYWNlbWVudFN0cmluZzsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIAogICAg ICAgICAgICAgcmV0dXJuIGNsb3Nlc3RTdHJpbmc7CiAgICAgICAgIH0KICAgICB9CkluZGV4OiBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAxNzIwMjcpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsNSArMSwxNSBAQAogMjAxNC0wOC0wNCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXph Y2hAYXBwbGUuY29tPgogCisgICAgICAgIEFYOiBTZWxlY3QgdGV4dCBhY3Rpdml0eSBzaG91bGQg cmV0dXJuIHJlcGxhY2VkIHRleHQgaW5zdGVhZCBvZiBwcmV2aW91c2x5IHNlbGVjdGVkIHRleHQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTU5NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZv cm0vbWFjL2FjY2Vzc2liaWxpdHkvc2VsZWN0LXRleHQtZXhwZWN0ZWQudHh0OgorICAgICAgICAq IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3NlbGVjdC10ZXh0Lmh0bWw6CisKKzIwMTQtMDgt MDQgIENocmlzIEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKwogICAgICAgICBBWDog U2VsZWN0IGFjdGl2aXR5IGJlaGF2aW9yIGRvZXMgbm90IHdvcmsgd2hlbiBhbiBleGlzdGluZyBy YW5nZSBpcyBhbHJlYWR5IHNlbGVjdGVkCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzU1NzkKIApJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFj L2FjY2Vzc2liaWxpdHkvc2VsZWN0LXRleHQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3NlbGVjdC10ZXh0LWV4cGVjdGVk LnR4dAkocmV2aXNpb24gMTcyMDI3KQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vz c2liaWxpdHkvc2VsZWN0LXRleHQtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC0xOSwx NSArMTksMTUgQEAKIFBBU1Mgc2VsZWN0aW9uIGlzICdkb2cnCiBQQVNTIHJlc3VsdCBpcyAnZm94 JwogUEFTUyBzZWxlY3Rpb24gaXMgJ2ZveCcKLVBBU1MgcmVzdWx0IGlzICdxdWljaycKK1BBU1Mg cmVzdWx0IGlzICdzbG93JwogUEFTUyBzZWxlY3Rpb24gaXMgJ3Nsb3cnCi1QQVNTIHJlc3VsdCBp cyAnZm94JworUEFTUyByZXN1bHQgaXMgJ2NhdCcKIFBBU1Mgc2VsZWN0aW9uIGlzICdjYXQnCitQ QVNTIHJlc3VsdCBpcyAnQnJvd24nCitQQVNTIHNlbGVjdGlvbiBpcyAnQnJvd24nCiBQQVNTIHJl c3VsdCBpcyAnYnJvd24nCi1QQVNTIHNlbGVjdGlvbiBpcyAnQnJvd24nCi1QQVNTIHJlc3VsdCBp cyAnQnJvd24nCiBQQVNTIHNlbGVjdGlvbiBpcyAnYnJvd24nCi1QQVNTIHJlc3VsdCBpcyAnYnJv d24nCitQQVNTIHJlc3VsdCBpcyAnQlJPV04nCiBQQVNTIHNlbGVjdGlvbiBpcyAnQlJPV04nCiBQ QVNTIHJlc3VsdCBpcyAncXVpY2snCiBQQVNTIHdpbmRvd1NlbGVjdGlvbi5nZXRSYW5nZUF0KDAp LnN0YXJ0T2Zmc2V0IGlzIDExCkBAIC0zNiw3ICszNiw3IEBACiBQQVNTIHdpbmRvd1NlbGVjdGlv bi5nZXRSYW5nZUF0KDApLnN0YXJ0T2Zmc2V0IGlzIDU2CiBQQVNTIHdpbmRvd1NlbGVjdGlvbi5n ZXRSYW5nZUF0KDApLmVuZE9mZnNldCBpcyA2MQogUEFTUyB3aW5kb3dTZWxlY3Rpb24uZ2V0UmFu Z2VBdCgwKS50b1N0cmluZygpIGlzICdUaGUnCi1QQVNTIHJlc3VsdCBpcyAnVGhlJworUEFTUyBy ZXN1bHQgaXMgJ1RIRScKIFBBU1Mgd2luZG93U2VsZWN0aW9uLmdldFJhbmdlQXQoMCkudG9TdHJp bmcoKSBpcyAnVEhFJwogUEFTUyB3aW5kb3dTZWxlY3Rpb24uZ2V0UmFuZ2VBdCgwKS5zdGFydE9m ZnNldCBpcyA3CiBQQVNTIHdpbmRvd1NlbGVjdGlvbi5nZXRSYW5nZUF0KDApLmVuZE9mZnNldCBp cyAxMApJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2VsZWN0 LXRleHQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNz aWJpbGl0eS9zZWxlY3QtdGV4dC5odG1sCShyZXZpc2lvbiAxNzIwMjcpCisrKyBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3QtdGV4dC5odG1sCSh3b3JraW5nIGNv cHkpCkBAIC04MCwzNSArODAsMzUgQEAKICAgICAgICAgLy8gU2VsZWN0IGFuZCByZXBsYWNlIHRl eHQgY2xvc2VzdCB0byBzZWxlY3Rpb24gKHNpbmdsZSBzZWFyY2ggc3RyaW5nKS4KICAgICAgICAg c2VsZWN0RWxlbWVudFRleHQodGFyZ2V0KTsKICAgICAgICAgcmVzdWx0ID0gdGV4dC5zZWxlY3RU ZXh0V2l0aENyaXRlcmlhKCJBWFNlbGVjdFRleHRBbWJpZ3VpdHlSZXNvbHV0aW9uQ2xvc2VzdFRv U2VsZWN0aW9uIiwgInF1aWNrIiwgInNsb3ciKTsKLSAgICAgICAgc2hvdWxkQmUoInJlc3VsdCIs ICIncXVpY2snIik7CisgICAgICAgIHNob3VsZEJlKCJyZXN1bHQiLCAiJ3Nsb3cnIik7CiAgICAg ICAgIHNlbGVjdGlvbiA9IHNlbGVjdGVkVGV4dCgpOwogICAgICAgICBzaG91bGRCZSgic2VsZWN0 aW9uIiwgIidzbG93JyIpOwogICAgICAgICAKICAgICAgICAgLy8gU2VsZWN0IGFuZCByZXBsYWNl IHRleHQgY2xvc2VzdCB0byBzZWxlY3Rpb24gKG11bHRpcGxlIHNlYXJjaCBzdHJpbmdzKS4KICAg ICAgICAgc2VsZWN0RWxlbWVudFRleHQodGFyZ2V0KTsKICAgICAgICAgcmVzdWx0ID0gdGV4dC5z ZWxlY3RUZXh0V2l0aENyaXRlcmlhKCJBWFNlbGVjdFRleHRBbWJpZ3VpdHlSZXNvbHV0aW9uQ2xv c2VzdFRvU2VsZWN0aW9uIiwgWyJkb2ciLCAiZm94Il0sICJjYXQiKTsKLSAgICAgICAgc2hvdWxk QmUoInJlc3VsdCIsICInZm94JyIpOworICAgICAgICBzaG91bGRCZSgicmVzdWx0IiwgIidjYXQn Iik7CiAgICAgICAgIHNlbGVjdGlvbiA9IHNlbGVjdGVkVGV4dCgpOwogICAgICAgICBzaG91bGRC ZSgic2VsZWN0aW9uIiwgIidjYXQnIik7CiAKICAgICAgICAgLy8gU2VsZWN0IGJyb3duIGFuZCBj YXBpdGFsaXplIGl0LgogICAgICAgICBzZWxlY3RFbGVtZW50VGV4dCh0YXJnZXQpOwogICAgICAg ICByZXN1bHQgPSB0ZXh0LnNlbGVjdFRleHRXaXRoQ3JpdGVyaWEoIkFYU2VsZWN0VGV4dEFtYmln dWl0eVJlc29sdXRpb25DbG9zZXN0VG9TZWxlY3Rpb24iLCAiYnJvd24iLCBudWxsLCAiQVhTZWxl Y3RUZXh0QWN0aXZpdHlGaW5kQW5kQ2FwaXRhbGl6ZSIpOwotICAgICAgICBzaG91bGRCZSgicmVz dWx0IiwgIidicm93biciKTsKKyAgICAgICAgc2hvdWxkQmUoInJlc3VsdCIsICInQnJvd24nIik7 CiAgICAgICAgIHNlbGVjdGlvbiA9IHNlbGVjdGVkVGV4dCgpOwogICAgICAgICBzaG91bGRCZSgi c2VsZWN0aW9uIiwgIidCcm93biciKTsKIAogICAgICAgICAvLyBTZWxlY3QgQnJvd24gYW5kIGxv d2VyY2FzZSBpdC4KICAgICAgICAgc2VsZWN0RWxlbWVudFRleHQodGFyZ2V0KTsKICAgICAgICAg cmVzdWx0ID0gdGV4dC5zZWxlY3RUZXh0V2l0aENyaXRlcmlhKCJBWFNlbGVjdFRleHRBbWJpZ3Vp dHlSZXNvbHV0aW9uQ2xvc2VzdFRvU2VsZWN0aW9uIiwgIkJyb3duIiwgbnVsbCwgIkFYU2VsZWN0 VGV4dEFjdGl2aXR5RmluZEFuZExvd2VyY2FzZSIpOwotICAgICAgICBzaG91bGRCZSgicmVzdWx0 IiwgIidCcm93biciKTsKKyAgICAgICAgc2hvdWxkQmUoInJlc3VsdCIsICInYnJvd24nIik7CiAg ICAgICAgIHNlbGVjdGlvbiA9IHNlbGVjdGVkVGV4dCgpOwogICAgICAgICBzaG91bGRCZSgic2Vs ZWN0aW9uIiwgIidicm93biciKTsKIAogICAgICAgICAvLyBTZWxlY3QgYnJvd24gYW5kIHVwcGVy Y2FzZSBpdC4KICAgICAgICAgc2VsZWN0RWxlbWVudFRleHQodGFyZ2V0KTsKICAgICAgICAgcmVz dWx0ID0gdGV4dC5zZWxlY3RUZXh0V2l0aENyaXRlcmlhKCJBWFNlbGVjdFRleHRBbWJpZ3VpdHlS ZXNvbHV0aW9uQ2xvc2VzdFRvU2VsZWN0aW9uIiwgImJyb3duIiwgbnVsbCwgIkFYU2VsZWN0VGV4 dEFjdGl2aXR5RmluZEFuZFVwcGVyY2FzZSIpOwotICAgICAgICBzaG91bGRCZSgicmVzdWx0Iiwg Iidicm93biciKTsKKyAgICAgICAgc2hvdWxkQmUoInJlc3VsdCIsICInQlJPV04nIik7CiAgICAg ICAgIHNlbGVjdGlvbiA9IHNlbGVjdGVkVGV4dCgpOwogICAgICAgICBzaG91bGRCZSgic2VsZWN0 aW9uIiwgIidCUk9XTiciKTsKIApAQCAtMTU1LDExICsxNTUsMTAgQEAKICAgICAgIAogICAgICAg ICB2YXIgdGV4dDIgPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5 SWQoInRleHQyIik7CiAgICAgICAgIHJlc3VsdCA9IHRleHQyLnNlbGVjdFRleHRXaXRoQ3JpdGVy aWEoIkFYU2VsZWN0VGV4dEFtYmlndWl0eVJlc29sdXRpb25DbG9zZXN0VG9TZWxlY3Rpb24iLCAi dGhlIiwgbnVsbCwgIkFYU2VsZWN0VGV4dEFjdGl2aXR5RmluZEFuZFVwcGVyY2FzZSIpOwotICAg ICAgICBzaG91bGRCZSgicmVzdWx0IiwgIidUaGUnIik7CisgICAgICAgIHNob3VsZEJlKCJyZXN1 bHQiLCAiJ1RIRSciKTsKICAgICAgICAgc2hvdWxkQmUoIndpbmRvd1NlbGVjdGlvbi5nZXRSYW5n ZUF0KDApLnRvU3RyaW5nKCkiLCAiJ1RIRSciKTsKICAgICAgICAgc2hvdWxkQmUoIndpbmRvd1Nl bGVjdGlvbi5nZXRSYW5nZUF0KDApLnN0YXJ0T2Zmc2V0IiwgIjciKTsKICAgICAgICAgc2hvdWxk QmUoIndpbmRvd1NlbGVjdGlvbi5nZXRSYW5nZUF0KDApLmVuZE9mZnNldCIsICIxMCIpOwotCiAg ICAgfQogPC9zY3JpcHQ+CiAK 236007 2014-08-04 23:01:16 -0700 2014-08-05 08:16:14 -0700 patch patch text/plain 6686 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3MjAyNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDE5IEBACiAyMDE0LTA4LTA0ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CiAKKyAgICAgICAgQVg6IFNlbGVjdCB0ZXh0 IGFjdGl2aXR5IHNob3VsZCByZXR1cm4gcmVwbGFjZWQgdGV4dCBpbnN0ZWFkIG9mIHByZXZpb3Vz bHkgc2VsZWN0ZWQgdGV4dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM1NTk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiB0aGUgc2VsZWN0IGFjdGl2aXR5IEFQSSBpcyB1c2VkIHRvIHJlcGxhY2Ug dGV4dCwgdGhlIHJlcGxhY2VtZW50IHN0cmluZyBzaG91bGQgYmUgcmV0dXJuZWQgaW5zdGVhZCBv ZiB0aGUgb2xkIHNlbGVjdGVkIHRleHQuCisKKyAgICAgICAgVXBkYXRlZCBleGlzdGluZyB0ZXN0 OiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3QtdGV4dC5odG1sCisKKyAgICAgICAg KiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QWNjZXNzaWJpbGl0eU9iamVjdDo6c2VsZWN0VGV4dCk6CisKKzIwMTQtMDgtMDQgIENocmlz IEZsZWl6YWNoICA8Y2ZsZWl6YWNoQGFwcGxlLmNvbT4KKwogICAgICAgICBBWDogU2VsZWN0IGFj dGl2aXR5IGJlaGF2aW9yIGRvZXMgbm90IHdvcmsgd2hlbiBhbiBleGlzdGluZyByYW5nZSBpcyBh bHJlYWR5IHNlbGVjdGVkCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMzU1NzkKIApJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nl c3NpYmlsaXR5T2JqZWN0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCShyZXZpc2lvbiAxNzIwMjcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlPYmplY3QuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC02NzYsOCArNjc2LDEzIEBACiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIGlmIChyZXBsYWNlU2VsZWN0aW9u KQorICAgICAgICAgICAgLy8gQSBiaXQgb2J2aW91cywgYnV0IHdvcnRoIG5vdGluZyB0aGUgQVBJ IGNvbnRyYWN0IGZvciB0aGlzIG1ldGhvZCBpcyB0aGF0IHdlIHNob3VsZAorICAgICAgICAgICAg Ly8gcmV0dXJuIHRoZSByZXBsYWNlbWVudCBzdHJpbmcgd2hlbiByZXBsYWNpbmcsIGJ1dCB0aGUg c2VsZWN0ZWQgc3RyaW5nIGlmIG5vdC4KKyAgICAgICAgICAgIGlmIChyZXBsYWNlU2VsZWN0aW9u KSB7CiAgICAgICAgICAgICAgICAgZnJhbWUtPmVkaXRvcigpLnJlcGxhY2VTZWxlY3Rpb25XaXRo VGV4dChyZXBsYWNlbWVudFN0cmluZywgdHJ1ZSwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgcmV0 dXJuIHJlcGxhY2VtZW50U3RyaW5nOworICAgICAgICAgICAgfQorICAgICAgICAgICAgCiAgICAg ICAgICAgICByZXR1cm4gY2xvc2VzdFN0cmluZzsKICAgICAgICAgfQogICAgIH0KSW5kZXg6IExh eW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDE3MjAyNykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSw1ICsxLDE1IEBACiAyMDE0LTA4LTA0ICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFj aEBhcHBsZS5jb20+CiAKKyAgICAgICAgQVg6IFNlbGVjdCB0ZXh0IGFjdGl2aXR5IHNob3VsZCBy ZXR1cm4gcmVwbGFjZWQgdGV4dCBpbnN0ZWFkIG9mIHByZXZpb3VzbHkgc2VsZWN0ZWQgdGV4dAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1NTk1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3QtdGV4dC1leHBlY3RlZC50eHQ6CisgICAgICAgICog cGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2VsZWN0LXRleHQuaHRtbDoKKworMjAxNC0wOC0w NCAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hAYXBwbGUuY29tPgorCiAgICAgICAgIEFYOiBT ZWxlY3QgYWN0aXZpdHkgYmVoYXZpb3IgZG9lcyBub3Qgd29yayB3aGVuIGFuIGV4aXN0aW5nIHJh bmdlIGlzIGFscmVhZHkgc2VsZWN0ZWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEzNTU3OQogCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv YWNjZXNzaWJpbGl0eS9zZWxlY3QtdGV4dC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvc2VsZWN0LXRleHQtZXhwZWN0ZWQu dHh0CShyZXZpc2lvbiAxNzIwMjcpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNz aWJpbGl0eS9zZWxlY3QtdGV4dC1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTE5LDE1 ICsxOSwxNSBAQAogUEFTUyBzZWxlY3Rpb24gaXMgJ2RvZycKIFBBU1MgcmVzdWx0IGlzICdmb3gn CiBQQVNTIHNlbGVjdGlvbiBpcyAnZm94JwotUEFTUyByZXN1bHQgaXMgJ3F1aWNrJworUEFTUyBy ZXN1bHQgaXMgJ3Nsb3cnCiBQQVNTIHNlbGVjdGlvbiBpcyAnc2xvdycKLVBBU1MgcmVzdWx0IGlz ICdmb3gnCitQQVNTIHJlc3VsdCBpcyAnY2F0JwogUEFTUyBzZWxlY3Rpb24gaXMgJ2NhdCcKK1BB U1MgcmVzdWx0IGlzICdCcm93bicKK1BBU1Mgc2VsZWN0aW9uIGlzICdCcm93bicKIFBBU1MgcmVz dWx0IGlzICdicm93bicKLVBBU1Mgc2VsZWN0aW9uIGlzICdCcm93bicKLVBBU1MgcmVzdWx0IGlz ICdCcm93bicKIFBBU1Mgc2VsZWN0aW9uIGlzICdicm93bicKLVBBU1MgcmVzdWx0IGlzICdicm93 bicKK1BBU1MgcmVzdWx0IGlzICdCUk9XTicKIFBBU1Mgc2VsZWN0aW9uIGlzICdCUk9XTicKIFBB U1MgcmVzdWx0IGlzICdxdWljaycKIFBBU1Mgd2luZG93U2VsZWN0aW9uLmdldFJhbmdlQXQoMCku c3RhcnRPZmZzZXQgaXMgMTEKQEAgLTM2LDcgKzM2LDcgQEAKIFBBU1Mgd2luZG93U2VsZWN0aW9u LmdldFJhbmdlQXQoMCkuc3RhcnRPZmZzZXQgaXMgNTYKIFBBU1Mgd2luZG93U2VsZWN0aW9uLmdl dFJhbmdlQXQoMCkuZW5kT2Zmc2V0IGlzIDYxCiBQQVNTIHdpbmRvd1NlbGVjdGlvbi5nZXRSYW5n ZUF0KDApLnRvU3RyaW5nKCkgaXMgJ1RoZScKLVBBU1MgcmVzdWx0IGlzICdUaGUnCitQQVNTIHJl c3VsdCBpcyAnVEhFJwogUEFTUyB3aW5kb3dTZWxlY3Rpb24uZ2V0UmFuZ2VBdCgwKS50b1N0cmlu ZygpIGlzICdUSEUnCiBQQVNTIHdpbmRvd1NlbGVjdGlvbi5nZXRSYW5nZUF0KDApLnN0YXJ0T2Zm c2V0IGlzIDcKIFBBU1Mgd2luZG93U2VsZWN0aW9uLmdldFJhbmdlQXQoMCkuZW5kT2Zmc2V0IGlz IDEwCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9zZWxlY3Qt dGV4dC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3Np YmlsaXR5L3NlbGVjdC10ZXh0Lmh0bWwJKHJldmlzaW9uIDE3MjAyNykKKysrIExheW91dFRlc3Rz L3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3NlbGVjdC10ZXh0Lmh0bWwJKHdvcmtpbmcgY29w eSkKQEAgLTgwLDM1ICs4MCwzNSBAQAogICAgICAgICAvLyBTZWxlY3QgYW5kIHJlcGxhY2UgdGV4 dCBjbG9zZXN0IHRvIHNlbGVjdGlvbiAoc2luZ2xlIHNlYXJjaCBzdHJpbmcpLgogICAgICAgICBz ZWxlY3RFbGVtZW50VGV4dCh0YXJnZXQpOwogICAgICAgICByZXN1bHQgPSB0ZXh0LnNlbGVjdFRl eHRXaXRoQ3JpdGVyaWEoIkFYU2VsZWN0VGV4dEFtYmlndWl0eVJlc29sdXRpb25DbG9zZXN0VG9T ZWxlY3Rpb24iLCAicXVpY2siLCAic2xvdyIpOwotICAgICAgICBzaG91bGRCZSgicmVzdWx0Iiwg IidxdWljayciKTsKKyAgICAgICAgc2hvdWxkQmUoInJlc3VsdCIsICInc2xvdyciKTsKICAgICAg ICAgc2VsZWN0aW9uID0gc2VsZWN0ZWRUZXh0KCk7CiAgICAgICAgIHNob3VsZEJlKCJzZWxlY3Rp b24iLCAiJ3Nsb3cnIik7CiAgICAgICAgIAogICAgICAgICAvLyBTZWxlY3QgYW5kIHJlcGxhY2Ug dGV4dCBjbG9zZXN0IHRvIHNlbGVjdGlvbiAobXVsdGlwbGUgc2VhcmNoIHN0cmluZ3MpLgogICAg ICAgICBzZWxlY3RFbGVtZW50VGV4dCh0YXJnZXQpOwogICAgICAgICByZXN1bHQgPSB0ZXh0LnNl bGVjdFRleHRXaXRoQ3JpdGVyaWEoIkFYU2VsZWN0VGV4dEFtYmlndWl0eVJlc29sdXRpb25DbG9z ZXN0VG9TZWxlY3Rpb24iLCBbImRvZyIsICJmb3giXSwgImNhdCIpOwotICAgICAgICBzaG91bGRC ZSgicmVzdWx0IiwgIidmb3gnIik7CisgICAgICAgIHNob3VsZEJlKCJyZXN1bHQiLCAiJ2NhdCci KTsKICAgICAgICAgc2VsZWN0aW9uID0gc2VsZWN0ZWRUZXh0KCk7CiAgICAgICAgIHNob3VsZEJl KCJzZWxlY3Rpb24iLCAiJ2NhdCciKTsKIAogICAgICAgICAvLyBTZWxlY3QgYnJvd24gYW5kIGNh cGl0YWxpemUgaXQuCiAgICAgICAgIHNlbGVjdEVsZW1lbnRUZXh0KHRhcmdldCk7CiAgICAgICAg IHJlc3VsdCA9IHRleHQuc2VsZWN0VGV4dFdpdGhDcml0ZXJpYSgiQVhTZWxlY3RUZXh0QW1iaWd1 aXR5UmVzb2x1dGlvbkNsb3Nlc3RUb1NlbGVjdGlvbiIsICJicm93biIsIG51bGwsICJBWFNlbGVj dFRleHRBY3Rpdml0eUZpbmRBbmRDYXBpdGFsaXplIik7Ci0gICAgICAgIHNob3VsZEJlKCJyZXN1 bHQiLCAiJ2Jyb3duJyIpOworICAgICAgICBzaG91bGRCZSgicmVzdWx0IiwgIidCcm93biciKTsK ICAgICAgICAgc2VsZWN0aW9uID0gc2VsZWN0ZWRUZXh0KCk7CiAgICAgICAgIHNob3VsZEJlKCJz ZWxlY3Rpb24iLCAiJ0Jyb3duJyIpOwogCiAgICAgICAgIC8vIFNlbGVjdCBCcm93biBhbmQgbG93 ZXJjYXNlIGl0LgogICAgICAgICBzZWxlY3RFbGVtZW50VGV4dCh0YXJnZXQpOwogICAgICAgICBy ZXN1bHQgPSB0ZXh0LnNlbGVjdFRleHRXaXRoQ3JpdGVyaWEoIkFYU2VsZWN0VGV4dEFtYmlndWl0 eVJlc29sdXRpb25DbG9zZXN0VG9TZWxlY3Rpb24iLCAiQnJvd24iLCBudWxsLCAiQVhTZWxlY3RU ZXh0QWN0aXZpdHlGaW5kQW5kTG93ZXJjYXNlIik7Ci0gICAgICAgIHNob3VsZEJlKCJyZXN1bHQi LCAiJ0Jyb3duJyIpOworICAgICAgICBzaG91bGRCZSgicmVzdWx0IiwgIidicm93biciKTsKICAg ICAgICAgc2VsZWN0aW9uID0gc2VsZWN0ZWRUZXh0KCk7CiAgICAgICAgIHNob3VsZEJlKCJzZWxl Y3Rpb24iLCAiJ2Jyb3duJyIpOwogCiAgICAgICAgIC8vIFNlbGVjdCBicm93biBhbmQgdXBwZXJj YXNlIGl0LgogICAgICAgICBzZWxlY3RFbGVtZW50VGV4dCh0YXJnZXQpOwogICAgICAgICByZXN1 bHQgPSB0ZXh0LnNlbGVjdFRleHRXaXRoQ3JpdGVyaWEoIkFYU2VsZWN0VGV4dEFtYmlndWl0eVJl c29sdXRpb25DbG9zZXN0VG9TZWxlY3Rpb24iLCAiYnJvd24iLCBudWxsLCAiQVhTZWxlY3RUZXh0 QWN0aXZpdHlGaW5kQW5kVXBwZXJjYXNlIik7Ci0gICAgICAgIHNob3VsZEJlKCJyZXN1bHQiLCAi J2Jyb3duJyIpOworICAgICAgICBzaG91bGRCZSgicmVzdWx0IiwgIidCUk9XTiciKTsKICAgICAg ICAgc2VsZWN0aW9uID0gc2VsZWN0ZWRUZXh0KCk7CiAgICAgICAgIHNob3VsZEJlKCJzZWxlY3Rp b24iLCAiJ0JST1dOJyIpOwogCkBAIC0xNTUsMTEgKzE1NSwxMCBAQAogICAgICAgCiAgICAgICAg IHZhciB0ZXh0MiA9IGFjY2Vzc2liaWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJ ZCgidGV4dDIiKTsKICAgICAgICAgcmVzdWx0ID0gdGV4dDIuc2VsZWN0VGV4dFdpdGhDcml0ZXJp YSgiQVhTZWxlY3RUZXh0QW1iaWd1aXR5UmVzb2x1dGlvbkNsb3Nlc3RUb1NlbGVjdGlvbiIsICJ0 aGUiLCBudWxsLCAiQVhTZWxlY3RUZXh0QWN0aXZpdHlGaW5kQW5kVXBwZXJjYXNlIik7Ci0gICAg ICAgIHNob3VsZEJlKCJyZXN1bHQiLCAiJ1RoZSciKTsKKyAgICAgICAgc2hvdWxkQmUoInJlc3Vs dCIsICInVEhFJyIpOwogICAgICAgICBzaG91bGRCZSgid2luZG93U2VsZWN0aW9uLmdldFJhbmdl QXQoMCkudG9TdHJpbmcoKSIsICInVEhFJyIpOwogICAgICAgICBzaG91bGRCZSgid2luZG93U2Vs ZWN0aW9uLmdldFJhbmdlQXQoMCkuc3RhcnRPZmZzZXQiLCAiNyIpOwogICAgICAgICBzaG91bGRC ZSgid2luZG93U2VsZWN0aW9uLmdldFJhbmdlQXQoMCkuZW5kT2Zmc2V0IiwgIjEwIik7Ci0KICAg ICB9CiA8L3NjcmlwdD4KIAo=