135073 2014-07-18 15:33:42 -0700 Back/Forward arrows (modern) are too large. 2014-07-21 12:16:53 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P1 Normal --- 1 jonowells jonowells commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1023372 0 jonowells 2014-07-18 15:33:42 -0700 These look heavy for their intended look. <rdar://problem/17731035> 1023385 1 235156 jonowells 2014-07-18 16:15:35 -0700 Created attachment 235156 [PATCH] Attempted fix. 1023387 2 235156 joepeck 2014-07-18 16:22:21 -0700 Comment on attachment 235156 [PATCH] Attempted fix. View in context: https://bugs.webkit.org/attachment.cgi?id=235156&action=review This looks good, Tim may be better. > Source/WebInspectorUI/UserInterface/Base/ImageUtilities.js:27 > +const _imageStorageFormatVersion = 2; Maybe we can avoid bumping the global version and make generateColoredImagesForCSS do imageVersion magic like the other path. 1023402 3 jonowells 2014-07-18 17:26:32 -0700 I think we can use that computed version number as a default for all ImageUtilities.js images unless one is specified in `specifications` and passed in as a parameter for a particular image. 1023407 4 235160 jonowells 2014-07-18 17:34:36 -0700 Created attachment 235160 [PATCH] Attempted fix. 1023414 5 235160 timothy 2014-07-18 18:09:42 -0700 Comment on attachment 235160 [PATCH] Attempted fix. View in context: https://bugs.webkit.org/attachment.cgi?id=235160&action=review > Source/WebInspectorUI/UserInterface/Base/Main.js:192 > + if (versionMatch && versionMatch[1].indexOf("+") !== -1 && document.styleSheets.length < 10) { This seems like it should move to Platform.js too. 1023415 6 235160 joepeck 2014-07-18 18:10:26 -0700 Comment on attachment 235160 [PATCH] Attempted fix. View in context: https://bugs.webkit.org/attachment.cgi?id=235160&action=review r=me. Have you tested on a Retina machine? > Source/WebInspectorUI/UserInterface/Base/Platform.js:26 > +// Add global platform information. Nit: Unnecessary comment. Maybe this could go in the block below though. > Source/WebInspectorUI/UserInterface/Base/Platform.js:29 > + codeName: "", Nit: Discussed on IRC, making this version.name sounds better! > Source/WebInspectorUI/UserInterface/Base/Platform.js:43 > + toString: function() > + { > + return this.base + "." + this.version; > + } > + }, > + toString: function() > + { > + return this.name; > + } Nit: Unnecessary toStrings. The only people that will debug this are us, and we can just inspect the object or JSON.stringify it. > Source/WebInspectorUI/UserInterface/Base/Platform.js:65 > +var isLegacyMacOS = false; > +var osVersionMatch = / Mac OS X (\d+)_(\d+)/.exec(navigator.appVersion); > +if (osVersionMatch && osVersionMatch[1] === "10") { > + WebInspector.Platform.version.base = 10; > + switch(osVersionMatch[2]) { > + case "10": > + WebInspector.Platform.codeName = "yosemite"; > + WebInspector.Platform.version.release = 10; > + break; > + case "9": > + WebInspector.Platform.codeName = "mavericks"; > + WebInspector.Platform.version.release = 9; > + WebInspector.Platform.isLegacyMacOS = true; > + break; > + case "8": > + WebInspector.Platform.codeName = "mountain-lion"; > + WebInspector.Platform.version.release = 8; > + WebInspector.Platform.isLegacyMacOS = true; > + } > +} I cringe a bit to have these in the global namespace. I suggest we wrap this work in an anonymous block: (function() { ... })(); Like the Load* files. 1023722 7 235231 jonowells 2014-07-21 11:26:10 -0700 Created attachment 235231 [PATCH] Attempted fix, review feedback. 1023730 8 235231 joepeck 2014-07-21 11:39:42 -0700 Comment on attachment 235231 [PATCH] Attempted fix, review feedback. View in context: https://bugs.webkit.org/attachment.cgi?id=235231&action=review > Source/WebInspectorUI/UserInterface/Base/Platform.js:60 > + WebInspector.Platform.isLegacyMacOS = true; Nit: Would be nice to put a break here even though it is the last. 1023732 9 235232 jonowells 2014-07-21 11:44:39 -0700 Created attachment 235232 [PATCH] Attempted fix, review feedback + 1. 1023748 10 235232 commit-queue 2014-07-21 12:16:50 -0700 Comment on attachment 235232 [PATCH] Attempted fix, review feedback + 1. Clearing flags on attachment: 235232 Committed r171312: <http://trac.webkit.org/changeset/171312> 1023749 11 commit-queue 2014-07-21 12:16:53 -0700 All reviewed patches have been landed. Closing bug. 235156 2014-07-18 16:15:35 -0700 2014-07-18 17:34:36 -0700 [PATCH] Attempted fix. arrows.diff text/plain 6742 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDRiZTk2MjkuLjIxNDRhYjggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE0LTA3LTE4ICBKb25hdGhhbiBXZWxs cyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CisKKyAgICAgICAgQmFjay9Gb3J3YXJkIGFycm93cyAo bW9kZXJuKSBhcmUgdG9vIGxhcmdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM1MDczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hhbmdlcyB0byBhZGp1c3QgbmV3IGZvcndhcmQgYW5kIGJhY2sgYXJy b3cgc2l6ZXMgdG8gYmUgbW9yZSBjb25zaXN0ZW50IHdpdGggdGhlIAorICAgICAgICB1bml2ZXJz YWwgZGVzaWduIGxhbmd1YWdlLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL0ltYWdl VXRpbGl0aWVzLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dz ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5jc3M6CisgICAgICAgICguZmluZC1iYW5u ZXIgPiBidXR0b24gPiAuZ2x5cGgpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5maW5kLWJhbm5lciA+IGJ1dHRvbiA+IC5nbHlwaCk6CisgICAgICAgICguZmluZC1iYW5uZXIg PiBidXR0b24uc2VnbWVudGVkLmxlZnQgPiAuZ2x5cGgpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQubGVmdCA+IC5nbHlw aCk6CisgICAgICAgICguZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLnJpZ2h0ID4gLmds eXBoKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZmluZC1iYW5uZXIgPiBi dXR0b24uc2VnbWVudGVkLnJpZ2h0ID4gLmdseXBoKToKKyAgICAgICAgKC5maW5kLWJhbm5lciA+ IGJ1dHRvbi5zZWdtZW50ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5m aW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvRmluZEJhbm5lci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaW5kQmFubmVyLnBy b3RvdHlwZS5fZ2VuZXJhdGVCdXR0b25zR2x5cGhzSWZOZWVkZWQpOgorICAgICAgICBTaXplIG9m IGZvcndhcmQgYW5kIGJhY2sgYXJyb3dzIGFkanVzdGVkLgorCiAyMDE0LTA3LTE4ICBUaW1vdGh5 IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZlcnQgcjE2OTczNSBz aW5jZSBpdCBicm9rZSBUaW1lbGluZSwgYW5kIGZpeCBidWcgMTI5Njk2IGluIGEgbW9yZSB0YXJn ZXRlZCB3YXkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcwppbmRleCA5ZWUwODUzLi44YWRjMWU3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRp bGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv SW1hZ2VVdGlsaXRpZXMuanMKQEAgLTI0LDcgKzI0LDcgQEAKICAqLwogCiAvLyBCdW1wIHRoaXMg dmVyc2lvbiB3aGVuIG1ha2luZyBjaGFuZ2VzIHRoYXQgYWZmZWN0IHRoZSBzdG9yYWdlIGZvcm1h dC4KLWNvbnN0IF9pbWFnZVN0b3JhZ2VGb3JtYXRWZXJzaW9uID0gMTsKK2NvbnN0IF9pbWFnZVN0 b3JhZ2VGb3JtYXRWZXJzaW9uID0gMjsKIAogdHJ5IHsKICAgICB2YXIgX2dlbmVyYXRlZEltYWdl Q2FjaGVEYXRhYmFzZSA9IG9wZW5EYXRhYmFzZSgiY29tLmFwcGxlLldlYkluc3BlY3RvciIsIDEs ICJXZWIgSW5zcGVjdG9yIFN0b3JhZ2UgRGF0YWJhc2UiLCA1ICogMTAyNCAqIDEwMjQpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVu dEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3Nlci5qcwppbmRleCA4YjE1ZWZlLi5jMWRjNzQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJv d3Nlci5qcwpAQCAtNTMsMTAgKzUzLDkgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyID0g ZnVuY3Rpb24oZWxlbWVudCwgZGVsZWdhdGUsIGRpc2FibGVCYWNrRm9yd2FyZCkKICAgICAgICAg aWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiAmJiBXZWJJbnNwZWN0b3Iu UGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlIDwgMTApIHsKICAgICAgICAgICAgIGZvcndhcmRBcnJv dyA9IHtzcmM6ICJJbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZyIsIHdpZHRoOiA5LCBoZWln aHQ6IDl9OwogICAgICAgICAgICAgYmFja0Fycm93ID0ge3NyYzogIkltYWdlcy9CYWNrQXJyb3dM ZWdhY3kuc3ZnIiwgd2lkdGg6IDksIGhlaWdodDogOX07Ci0gICAgICAgIH0KLSAgICAgICAgZWxz ZSB7Ci0gICAgICAgICAgICBmb3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJv dy5zdmciLCB3aWR0aDogMTAsIGhlaWdodDogMTZ9OwotICAgICAgICAgICAgYmFja0Fycm93ID0g e3NyYzogIkltYWdlcy9CYWNrQXJyb3cuc3ZnIiwgd2lkdGg6IDEwLCBoZWlnaHQ6IDE2fTsKKyAg ICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGZvcndhcmRBcnJvdyA9IHtzcmM6ICJJbWFnZXMv Rm9yd2FyZEFycm93LnN2ZyIsIHdpZHRoOiA4LCBoZWlnaHQ6IDEzfTsKKyAgICAgICAgICAgIGJh Y2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fycm93LnN2ZyIsIHdpZHRoOiA4LCBoZWlnaHQ6 IDEzfTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRl bSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImJhY2siLCBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkJhY2sgKCVzKSIpLmZvcm1hdCh0aGlzLl9iYWNrS2V5Ym9hcmRTaG9y dGN1dC5kaXNwbGF5TmFtZSksIGJhY2tBcnJvdy5zcmMsIGJhY2tBcnJvdy53aWR0aCwgYmFja0Fy cm93LmhlaWdodCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9GaW5kQmFubmVyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3NzCmluZGV4IDZhZDExZDUuLmFhNzdhOTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5u ZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zp bmRCYW5uZXIuY3NzCkBAIC0xMjAsNiArMTIwLDEwIEBACiAgICAgZGlzcGxheTogaW5saW5lLWJs b2NrOwogCiAgICAgd2lkdGg6IDdweDsKKyAgICBoZWlnaHQ6IDExcHg7Cit9CisKK2JvZHkubWFj LXBsYXRmb3JtLmxlZ2FjeSAuZmluZC1iYW5uZXIgPiBidXR0b24gPiAuZ2x5cGggewogICAgIGhl aWdodDogN3B4OwogfQogCkBAIC0xNTAsMTAgKzE1NCwxNCBAQAogCiAuZmluZC1iYW5uZXIgPiBi dXR0b24uc2VnbWVudGVkLmxlZnQgPiAuZ2x5cGggewogICAgIGJhY2tncm91bmQtaW1hZ2U6IC13 ZWJraXQtY2FudmFzKGZpbmQtYmFubmVyLXByZXZpb3VzLWFycm93LW5vcm1hbCk7Ci0gICAgYmFj a2dyb3VuZC1zaXplOiA3cHggN3B4OworICAgIGJhY2tncm91bmQtc2l6ZTogN3B4IDExcHg7CiAg ICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0u bGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQubGVmdCA+IC5nbHlwaCB7Cisg ICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworfQorCiAuZmluZC1iYW5uZXIgPiBidXR0b24u c2VnbWVudGVkLmxlZnQ6YWN0aXZlOm5vdCg6ZGlzYWJsZWQpID4gLmdseXBoIHsKICAgICBiYWNr Z3JvdW5kLWltYWdlOiAtd2Via2l0LWNhbnZhcyhmaW5kLWJhbm5lci1wcmV2aW91cy1hcnJvdy1u b3JtYWwtYWN0aXZlKTsKIH0KQEAgLTE3MCwxNiArMTc4LDI3IEBACiAKIC5maW5kLWJhbm5lciA+ IGJ1dHRvbi5zZWdtZW50ZWQucmlnaHQgPiAuZ2x5cGggewogICAgIGJhY2tncm91bmQtaW1hZ2U6 IC13ZWJraXQtY2FudmFzKGZpbmQtYmFubmVyLW5leHQtYXJyb3ctbm9ybWFsKTsKLSAgICBiYWNr Z3JvdW5kLXNpemU6IDdweCA3cHg7CisgICAgYmFja2dyb3VuZC1zaXplOiA3cHggMTFweDsKICAg ICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5s ZWdhY3kgLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21lbnRlZC5yaWdodCA+IC5nbHlwaCB7Cisg ICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworfQorCiAuZmluZC1iYW5uZXIgPiBidXR0b24u c2VnbWVudGVkLnJpZ2h0OmFjdGl2ZTpub3QoOmRpc2FibGVkKSA+IC5nbHlwaCB7CiAgICAgYmFj a2dyb3VuZC1pbWFnZTogLXdlYmtpdC1jYW52YXMoZmluZC1iYW5uZXItbmV4dC1hcnJvdy1ub3Jt YWwtYWN0aXZlKTsKIH0KIAogLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21lbnRlZCB7CiAgICAg bWluLXdpZHRoOiAyMnB4OworICAgIHBhZGRpbmctdG9wOiAzcHg7CisgICAgcGFkZGluZy1ib3R0 b206IDJweDsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1 dHRvbi5zZWdtZW50ZWQgeworICAgIHBhZGRpbmctdG9wOiAycHg7CisgICAgcGFkZGluZy1ib3R0 b206IDNweDsKIH0KIAogLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21lbnRlZDphY3RpdmUgewpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmlu ZEJhbm5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zp bmRCYW5uZXIuanMKaW5kZXggZGEzZjI5YS4uOTc1ZjdmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcworKysgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCkBAIC0z MjgsMTUgKzMyOCwxNSBAQCBXZWJJbnNwZWN0b3IuRmluZEJhbm5lci5wcm90b3R5cGUgPSB7CiAK ICAgICAgICAgdmFyIGZvcndhcmRBcnJvdywgYmFja0Fycm93OwogICAgICAgICBpZiAoV2ViSW5z cGVjdG9yLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiICYmIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52 ZXJzaW9uLnJlbGVhc2UgPCAxMCkgewotICAgICAgICAgICAgZm9yd2FyZEFycm93ID0gIkltYWdl cy9Gb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIjsKLSAgICAgICAgICAgIGJhY2tBcnJvdyA9ICJJbWFn ZXMvQmFja0Fycm93TGVnYWN5LnN2ZyI7CisgICAgICAgICAgICBmb3J3YXJkQXJyb3cgPSB7c3Jj OiAiSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmciLCB3aWR0aDogNywgaGVpZ2h0OiA3fTsK KyAgICAgICAgICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fycm93TGVnYWN5LnN2 ZyIsIHdpZHRoOiA3LCBoZWlnaHQ6IDd9OwogICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAg Zm9yd2FyZEFycm93ID0gIkltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnIjsKLSAgICAgICAgICAgIGJh Y2tBcnJvdyA9ICJJbWFnZXMvQmFja0Fycm93LnN2ZyI7CisgICAgICAgICAgICBmb3J3YXJkQXJy b3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmciLCB3aWR0aDogNywgaGVpZ2h0OiAx MX07CisgICAgICAgICAgICBiYWNrQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0JhY2tBcnJvdy5zdmci LCB3aWR0aDogNywgaGVpZ2h0OiAxMX07CiAgICAgICAgIH0KIAotICAgICAgICBnZW5lcmF0ZUNv bG9yZWRJbWFnZXNGb3JDU1MoYmFja0Fycm93LCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQt YmFubmVyLXByZXZpb3VzLWFycm93LSIpOwotICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNG b3JDU1MoZm9yd2FyZEFycm93LCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQtYmFubmVyLW5l eHQtYXJyb3ctIik7CisgICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhiYWNrQXJy b3cuc3JjLCBzcGVjaWZpY2F0aW9ucywgYmFja0Fycm93LndpZHRoLCBiYWNrQXJyb3cuaGVpZ2h0 LCAiZmluZC1iYW5uZXItcHJldmlvdXMtYXJyb3ctIik7CisgICAgICAgIGdlbmVyYXRlQ29sb3Jl ZEltYWdlc0ZvckNTUyhmb3J3YXJkQXJyb3cuc3JjLCBzcGVjaWZpY2F0aW9ucywgZm9yd2FyZEFy cm93LndpZHRoLCBmb3J3YXJkQXJyb3cuaGVpZ2h0LCAiZmluZC1iYW5uZXItbmV4dC1hcnJvdy0i KTsKICAgICB9CiB9OwogCg== 235160 2014-07-18 17:34:36 -0700 2014-07-21 11:26:10 -0700 [PATCH] Attempted fix. arrows2.diff text/plain 15703 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDRiZTk2MjkuLjAyMGQzMzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ3IEBACisyMDE0LTA3LTE4ICBKb25hdGhhbiBXZWxs cyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CisKKyAgICAgICAgQmFjay9Gb3J3YXJkIGFycm93cyAo bW9kZXJuKSBhcmUgdG9vIGxhcmdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM1MDczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQ2hhbmdlcyB0byBhZGp1c3QgbmV3IGZvcndhcmQgYW5kIGJhY2sgYXJy b3cgc2l6ZXMgdG8gYmUgbW9yZSBjb25zaXN0ZW50IHdpdGggdGhlIAorICAgICAgICB1bml2ZXJz YWwgZGVzaWduIGxhbmd1YWdlLiBNb3ZlZCBXZWJJbnNwZWN0b3IuUGxhdGZvcm0gZGVmaW5pdGlv biB0byBpdHMgb3duIGZpbGUuCisgICAgICAgIFJlZmFjdG9yZWQgaGFuZGxpbmcgb2YgaW1hZ2Ug dmVyc2lvbnMgaW5zaWRlIEltYWdlVXRpbGl0aWVzLmpzLgorCisgICAgICAgICogVXNlckludGVy ZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzOgorICAgICAgICAoLnJlc3RvcmVJbWFnZSk6Cisg ICAgICAgICguZ2VuZXJhdGVJbWFnZSk6CisgICAgICAgIChnZW5lcmF0ZUNvbG9yZWRJbWFnZXNG b3JDU1MpOgorICAgICAgICBNYWtlIHRoZSBkZWZhdWx0IGltYWdlIHZlcnNpb25pbmcgc21hcnRl ci4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRM b2FkZWQuV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24udG9TdHJpbmcpOiBEZWxldGVkLgor ICAgICAgICAoV2ViSW5zcGVjdG9yLmNvbnRlbnRMb2FkZWQuV2ViSW5zcGVjdG9yLlBsYXRmb3Jt LnRvU3RyaW5nKTogRGVsZXRlZC4KKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZv cm0uanM6IEFkZGVkLgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24udG9T dHJpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnRvU3RyaW5nKToKKyAgICAg ICAgTW92ZSBwbGF0Zm9ybSBpbmZvcm1hdGlvbiBkZWZpbml0aW9uIGludG8gUGxhdGZvcm0uanMu CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRtbDoKKyAgICAgICAgSW5jbHVkZSBQ bGF0Zm9ybS5qcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dz ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5jc3M6CisgICAgICAgICguZmluZC1iYW5u ZXIgPiBidXR0b24gPiAuZ2x5cGgpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5 IC5maW5kLWJhbm5lciA+IGJ1dHRvbiA+IC5nbHlwaCk6CisgICAgICAgICguZmluZC1iYW5uZXIg PiBidXR0b24uc2VnbWVudGVkLmxlZnQgPiAuZ2x5cGgpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQubGVmdCA+IC5nbHlw aCk6CisgICAgICAgICguZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLnJpZ2h0ID4gLmds eXBoKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZmluZC1iYW5uZXIgPiBi dXR0b24uc2VnbWVudGVkLnJpZ2h0ID4gLmdseXBoKToKKyAgICAgICAgKC5maW5kLWJhbm5lciA+ IGJ1dHRvbi5zZWdtZW50ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5m aW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvRmluZEJhbm5lci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GaW5kQmFubmVyLnBy b3RvdHlwZS5fZ2VuZXJhdGVCdXR0b25zR2x5cGhzSWZOZWVkZWQpOgorICAgICAgICBTaXplIG9m IGZvcndhcmQgYW5kIGJhY2sgYXJyb3dzIGFkanVzdGVkLgorCiAyMDE0LTA3LTE4ICBUaW1vdGh5 IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZlcnQgcjE2OTczNSBz aW5jZSBpdCBicm9rZSBUaW1lbGluZSwgYW5kIGZpeCBidWcgMTI5Njk2IGluIGEgbW9yZSB0YXJn ZXRlZCB3YXkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcwppbmRleCA5ZWUwODUzLi43YjIxYmUyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRp bGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2Uv SW1hZ2VVdGlsaXRpZXMuanMKQEAgLTI2LDYgKzI2LDExIEBACiAvLyBCdW1wIHRoaXMgdmVyc2lv biB3aGVuIG1ha2luZyBjaGFuZ2VzIHRoYXQgYWZmZWN0IHRoZSBzdG9yYWdlIGZvcm1hdC4KIGNv bnN0IF9pbWFnZVN0b3JhZ2VGb3JtYXRWZXJzaW9uID0gMTsKIAorLy8gVXNlIGFzIGEgZGVmYXVs dCB3aGVyZSBhbiBpbWFnZSB2ZXJzaW9uIGlzIG5vdCBvdGhlcndpc2Ugc3BlY2lmaWVkLgorLy8g QnVtcCB0aGUgYmFzZSB2ZXJzaW9uIHdoZW4gbWFraW5nIGNoYW5nZXMgdGhhdCBhZmZlY3QgdGhl IHJlc3VsdCBpbWFnZS4KK2NvbnN0IGJhc2VEZWZhdWx0SW1hZ2VWZXJzaW9uID0gMzsKK2NvbnN0 IGRlZmF1bHRJbWFnZVZlcnNpb24gPSBiYXNlRGVmYXVsdEltYWdlVmVyc2lvbiArIDAuMDEgKiBX ZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5iYXNlICsgMC4wMDAxICogV2ViSW5zcGVjdG9y LlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZTsKKwogdHJ5IHsKICAgICB2YXIgX2dlbmVyYXRlZElt YWdlQ2FjaGVEYXRhYmFzZSA9IG9wZW5EYXRhYmFzZSgiY29tLmFwcGxlLldlYkluc3BlY3RvciIs IDEsICJXZWIgSW5zcGVjdG9yIFN0b3JhZ2UgRGF0YWJhc2UiLCA1ICogMTAyNCAqIDEwMjQpOwog fSBjYXRjaCAoZSkgewpAQCAtMzM3LDcgKzM0Miw3IEBAIGZ1bmN0aW9uIGdlbmVyYXRlQ29sb3Jl ZEltYWdlc0ZvckNTUyhpbWFnZVBhdGgsIHNwZWNpZmljYXRpb25zLCB3aWR0aCwgaGVpZ2h0LCBj CiAgICAgewogICAgICAgICBjb25zdCBzdG9yYWdlS2V5ID0gc3RvcmFnZUtleVByZWZpeCArIGNh bnZhc0lkZW50aWZpZXJQcmVmaXggKyBjYW52YXNJZGVudGlmaWVyOwogICAgICAgICBjb25zdCBj b250ZXh0ID0gZG9jdW1lbnQuZ2V0Q1NTQ2FudmFzQ29udGV4dCgiMmQiLCBjYW52YXNJZGVudGlm aWVyUHJlZml4ICsgY2FudmFzSWRlbnRpZmllciwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCk7 Ci0gICAgICAgIHJlc3RvcmVJbWFnZUZyb21TdG9yYWdlKHN0b3JhZ2VLZXksIGNvbnRleHQsIHNj YWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQsIHNwZWNpZmljYXRpb24uaW1hZ2VWZXJzaW9uIHx8IDAs IGZ1bmN0aW9uKCkgeworICAgICAgICByZXN0b3JlSW1hZ2VGcm9tU3RvcmFnZShzdG9yYWdlS2V5 LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVkSGVpZ2h0LCBzcGVjaWZpY2F0aW9uLmltYWdl VmVyc2lvbiB8fCBkZWZhdWx0SW1hZ2VWZXJzaW9uLCBmdW5jdGlvbigpIHsKICAgICAgICAgICAg IGVuc3VyZUltYWdlSXNMb2FkZWQoZ2VuZXJhdGVJbWFnZS5iaW5kKG51bGwsIGNhbnZhc0lkZW50 aWZpZXIsIHNwZWNpZmljYXRpb24pKTsKICAgICAgICAgfSk7CiAgICAgfQpAQCAtMzc0LDcgKzM3 OSw3IEBAIGZ1bmN0aW9uIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhpbWFnZVBhdGgsIHNw ZWNpZmljYXRpb25zLCB3aWR0aCwgaGVpZ2h0LCBjCiAgICAgICAgIGNvbnRleHQuZHJhd0ltYWdl KGNvbG9yZWRJbWFnZSwgMCwgMCwgd2lkdGgsIGhlaWdodCk7CiAKICAgICAgICAgY29uc3Qgc3Rv cmFnZUtleSA9IHN0b3JhZ2VLZXlQcmVmaXggKyBjYW52YXNJZGVudGlmaWVyUHJlZml4ICsgY2Fu dmFzSWRlbnRpZmllcjsKLSAgICAgICAgc2F2ZUltYWdlVG9TdG9yYWdlKHN0b3JhZ2VLZXksIGNv bnRleHQsIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQsIHNwZWNpZmljYXRpb24uaW1hZ2VWZXJz aW9uIHx8IDApOworICAgICAgICBzYXZlSW1hZ2VUb1N0b3JhZ2Uoc3RvcmFnZUtleSwgY29udGV4 dCwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCwgc3BlY2lmaWNhdGlvbi5pbWFnZVZlcnNpb24g fHwgZGVmYXVsdEltYWdlVmVyc2lvbik7CiAgICAgICAgIGNvbnRleHQucmVzdG9yZSgpOwogICAg IH0KIH0KQEAgLTM5Myw5ICszOTgsNyBAQCBmdW5jdGlvbiBnZW5lcmF0ZUVtYm9zc2VkSW1hZ2Vz KHNyYywgd2lkdGgsIGhlaWdodCwgc3RhdGVzLCBjYW52YXNJZGVudGlmaWVyQ2FsbAogICAgIHZh ciBzY2FsZWRXaWR0aCA9IHdpZHRoICogc2NhbGVGYWN0b3I7CiAgICAgdmFyIHNjYWxlZEhlaWdo dCA9IGhlaWdodCAqIHNjYWxlRmFjdG9yOwogCi0gICAgLy8gQnVtcCB0aGUgYmFzZSB2ZXJzaW9u IHdoZW4gbWFraW5nIGNoYW5nZXMgdGhhdCBhZmZlY3QgdGhlIHJlc3VsdCBpbWFnZS4KLSAgICBj b25zdCBiYXNlSW1hZ2VWZXJzaW9uID0gMzsKLSAgICBjb25zdCBpbWFnZVZlcnNpb24gPSBiYXNl SW1hZ2VWZXJzaW9uICsgMC4wMSAqIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLmJhc2Ug KyAwLjAwMDEgKiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlOworICAgIGNv bnN0IGltYWdlVmVyc2lvbiA9IGRlZmF1bHRJbWFnZVZlcnNpb247CiAKICAgICBjb25zdCBzdG9y YWdlS2V5UHJlZml4ID0gImdlbmVyYXRlZC1lbWJvc3NlZC1pbWFnZS0iOwogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggMDU3NDBi Yi4uNWE3MjEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qcwpAQCAtMTg5LDUyICsxODksMTYgQEAgV2ViSW5zcGVjdG9yLmNvbnRlbnRM b2FkZWQgPSBmdW5jdGlvbigpCiAKICAgICAvLyBDaGVjayBmb3IgYSBuaWdodGx5IGJ1aWxkIGJ5 IGxvb2tpbmcgZm9yIGEgcGx1cyBpbiB0aGUgdmVyc2lvbiBudW1iZXIgYW5kIGEgc21hbGwgbnVt YmVyIG9mIHN0eWxlc2hlZXRzIChpbmRpY2F0aW5nIGNvbWJpbmVkIHJlc291cmNlcykuCiAgICAg dmFyIHZlcnNpb25NYXRjaCA9IC8gQXBwbGVXZWJLaXRcLyhbXiBdKykvLmV4ZWMobmF2aWdhdG9y LnVzZXJBZ2VudCk7Ci0gICAgaWYgKHZlcnNpb25NYXRjaCAmJiB2ZXJzaW9uTWF0Y2hbMV0uaW5k ZXhPZigiKyIpICE9PSAtMSAmJiBkb2N1bWVudC5zdHlsZVNoZWV0cy5sZW5ndGggPCAxMCkKKyAg ICBpZiAodmVyc2lvbk1hdGNoICYmIHZlcnNpb25NYXRjaFsxXS5pbmRleE9mKCIrIikgIT09IC0x ICYmIGRvY3VtZW50LnN0eWxlU2hlZXRzLmxlbmd0aCA8IDEwKSB7CisgICAgICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5pc05pZ2h0bHlCdWlsZCA9IHRydWU7CiAgICAgICAgIGRvY3VtZW50LmJv ZHkuY2xhc3NMaXN0LmFkZCgibmlnaHRseS1idWlsZCIpOwotCi0gICAgLy8gQWRkIHBsYXRmb3Jt IHN0eWxlIGNsYXNzZXMgc28gdGhlIFVJIGNhbiBiZSB0d2Vha2VkIHBlci1wbGF0Zm9ybS4KLSAg ICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0gPSB7Ci0gICAgICAgIG5hbWU6IEluc3BlY3RvckZyb250 ZW5kSG9zdC5wbGF0Zm9ybSgpLAotICAgICAgICBjb2RlTmFtZTogIiIsCi0gICAgICAgIHZlcnNp b246IHsKLSAgICAgICAgICAgIGJhc2U6IDAsCi0gICAgICAgICAgICByZWxlYXNlOiAwLAotICAg ICAgICAgICAgdG9TdHJpbmc6IGZ1bmN0aW9uKCkKLSAgICAgICAgICAgIHsKLSAgICAgICAgICAg ICAgICByZXR1cm4gdGhpcy5iYXNlICsgIi4iICsgdGhpcy52ZXJzaW9uOwotICAgICAgICAgICAg fQotICAgICAgICB9LAotICAgICAgICB0b1N0cmluZzogZnVuY3Rpb24oKQotICAgICAgICB7Ci0g ICAgICAgICAgICByZXR1cm4gdGhpcy5uYW1lOwotICAgICAgICB9Ci0gICAgfTsKLQotICAgIHZh ciBpc0xlZ2FjeU1hY09TID0gZmFsc2U7Ci0gICAgdmFyIG9zVmVyc2lvbk1hdGNoID0gLyBNYWMg T1MgWCAoXGQrKV8oXGQrKS8uZXhlYyhuYXZpZ2F0b3IuYXBwVmVyc2lvbik7Ci0gICAgaWYgKG9z VmVyc2lvbk1hdGNoICYmIG9zVmVyc2lvbk1hdGNoWzFdID09PSAiMTAiKSB7Ci0gICAgICAgIFdl Ykluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLmJhc2UgPSAxMDsKLSAgICAgICAgc3dpdGNoKG9z VmVyc2lvbk1hdGNoWzJdKSB7Ci0gICAgICAgICAgICBjYXNlICIxMCI6Ci0gICAgICAgICAgICAg ICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lID0gInlvc2VtaXRlIjsKLSAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlID0gMTA7Ci0gICAg ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlICI5IjoKLSAgICAgICAgICAgICAg ICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUgPSAibWF2ZXJpY2tzIjsKLSAgICAgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlID0gOTsKLSAgICAg ICAgICAgICAgICBpc0xlZ2FjeU1hY09TID0gdHJ1ZTsKLSAgICAgICAgICAgICAgICBicmVhazsK LSAgICAgICAgICAgIGNhc2UgIjgiOgotICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0 Zm9ybS5jb2RlTmFtZSA9ICJtb3VudGFpbi1saW9uIjsKLSAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlID0gODsKLSAgICAgICAgICAgICAgICBpc0xl Z2FjeU1hY09TID0gdHJ1ZTsKLSAgICAgICAgfQogICAgIH0KIAorICAgIC8vIEFkZCBwbGF0Zm9y bSBzdHlsZSBjbGFzc2VzIHNvIHRoZSBVSSBjYW4gYmUgdHdlYWtlZCBwZXItcGxhdGZvcm0uCiAg ICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5QbGF0Zm9ybSArICIt cGxhdGZvcm0iKTsKICAgICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lKQogICAg ICAgICBkb2N1bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNv ZGVOYW1lKTsKLSAgICBpZiAoaXNMZWdhY3lNYWNPUykKKyAgICBpZiAoV2ViSW5zcGVjdG9yLlBs YXRmb3JtLmlzTGVnYWN5TWFjT1MpCiAgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFk ZCgibGVnYWN5Iik7CiAKICAgICB0aGlzLmRlYnVnZ2FibGVUeXBlID0gSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmRlYnVnZ2FibGVUeXBlKCkgPT09ICJ3ZWIiID8gV2ViSW5zcGVjdG9yLkRlYnVnZ2Fi bGVUeXBlLldlYiA6IFdlYkluc3BlY3Rvci5EZWJ1Z2dhYmxlVHlwZS5KYXZhU2NyaXB0OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9QbGF0Zm9y bS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZvcm0u anMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYTcwMjM1NgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZv cm0uanMKQEAgLTAsMCArMSw2NSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK KyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJ UyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwor ICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAq IEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKy8vIEFkZCBnbG9iYWwgcGxhdGZv cm0gaW5mb3JtYXRpb24uCitXZWJJbnNwZWN0b3IuUGxhdGZvcm0gPSB7CisgICAgbmFtZTogSW5z cGVjdG9yRnJvbnRlbmRIb3N0LnBsYXRmb3JtKCksCisgICAgY29kZU5hbWU6ICIiLAorICAgIGlz TGVnYWN5TWFjT1M6IGZhbHNlLAorICAgIGlzTmlnaHRseUJ1aWxkOiBmYWxzZSwKKyAgICB2ZXJz aW9uOiB7CisgICAgICAgIGJhc2U6IDAsCisgICAgICAgIHJlbGVhc2U6IDAsCisgICAgICAgIHRv U3RyaW5nOiBmdW5jdGlvbigpCisgICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiB0aGlzLmJh c2UgKyAiLiIgKyB0aGlzLnZlcnNpb247CisgICAgICAgIH0KKyAgICB9LAorICAgIHRvU3RyaW5n OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5uYW1lOworICAgIH0KK307 CisKK3ZhciBpc0xlZ2FjeU1hY09TID0gZmFsc2U7Cit2YXIgb3NWZXJzaW9uTWF0Y2ggPSAvIE1h YyBPUyBYIChcZCspXyhcZCspLy5leGVjKG5hdmlnYXRvci5hcHBWZXJzaW9uKTsKK2lmIChvc1Zl cnNpb25NYXRjaCAmJiBvc1ZlcnNpb25NYXRjaFsxXSA9PT0gIjEwIikgeworICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS52ZXJzaW9uLmJhc2UgPSAxMDsKKyAgICBzd2l0Y2gob3NWZXJzaW9uTWF0 Y2hbMl0pIHsKKyAgICAgICAgY2FzZSAiMTAiOgorICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBs YXRmb3JtLmNvZGVOYW1lID0gInlvc2VtaXRlIjsKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5Q bGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSAxMDsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAg ICBjYXNlICI5IjoKKyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5jb2RlTmFtZSA9 ICJtYXZlcmlja3MiOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24u cmVsZWFzZSA9IDk7CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0uaXNMZWdhY3lN YWNPUyA9IHRydWU7CisgICAgICAgICAgICBicmVhazsKKyAgICAgICAgY2FzZSAiOCI6CisgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUgPSAibW91bnRhaW4tbGlvbiI7 CisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlID0gODsK KyAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5pc0xlZ2FjeU1hY09TID0gdHJ1ZTsK KyAgICB9Cit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9NYWluLmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0 bWwKaW5kZXggYzZmZTc4YS4uZWJhYzI2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01haW4uaHRtbApAQCAtMTYxLDYgKzE2MSw3IEBACiAgICAgPHNjcmlwdCBz cmM9IkV4dGVybmFsL0NvZGVNaXJyb3IveG1sLmpzIj48L3NjcmlwdD4KIAogICAgIDxzY3JpcHQg c3JjPSJCYXNlL1dlYkluc3BlY3Rvci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9IkJh c2UvUGxhdGZvcm0uanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJCYXNlL09iamVjdC5q cyI+PC9zY3JpcHQ+CiAKICAgICA8c2NyaXB0IHNyYz0iQmFzZS9ET01VdGlsaXRpZXMuanMiPjwv c2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCA4YjE1ZWZlLi5jMWRjNzQwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50 QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtNTMsMTAgKzUzLDkgQEAgV2ViSW5zcGVjdG9yLkNvbnRl bnRCcm93c2VyID0gZnVuY3Rpb24oZWxlbWVudCwgZGVsZWdhdGUsIGRpc2FibGVCYWNrRm9yd2Fy ZCkKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiAmJiBX ZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlIDwgMTApIHsKICAgICAgICAgICAg IGZvcndhcmRBcnJvdyA9IHtzcmM6ICJJbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZyIsIHdp ZHRoOiA5LCBoZWlnaHQ6IDl9OwogICAgICAgICAgICAgYmFja0Fycm93ID0ge3NyYzogIkltYWdl cy9CYWNrQXJyb3dMZWdhY3kuc3ZnIiwgd2lkdGg6IDksIGhlaWdodDogOX07Ci0gICAgICAgIH0K LSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBmb3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2Vz L0ZvcndhcmRBcnJvdy5zdmciLCB3aWR0aDogMTAsIGhlaWdodDogMTZ9OwotICAgICAgICAgICAg YmFja0Fycm93ID0ge3NyYzogIkltYWdlcy9CYWNrQXJyb3cuc3ZnIiwgd2lkdGg6IDEwLCBoZWln aHQ6IDE2fTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGZvcndhcmRBcnJvdyA9IHtz cmM6ICJJbWFnZXMvRm9yd2FyZEFycm93LnN2ZyIsIHdpZHRoOiA4LCBoZWlnaHQ6IDEzfTsKKyAg ICAgICAgICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fycm93LnN2ZyIsIHdpZHRo OiA4LCBoZWlnaHQ6IDEzfTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX2JhY2tCdXR0b25O YXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImJh Y2siLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJhY2sgKCVzKSIpLmZvcm1hdCh0aGlzLl9iYWNr S2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSksIGJhY2tBcnJvdy5zcmMsIGJhY2tBcnJvdy53 aWR0aCwgYmFja0Fycm93LmhlaWdodCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3NzCmluZGV4IDZhZDExZDUuLmFh NzdhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbmRCYW5uZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3NzCkBAIC0xMjAsNiArMTIwLDEwIEBACiAgICAgZGlzcGxh eTogaW5saW5lLWJsb2NrOwogCiAgICAgd2lkdGg6IDdweDsKKyAgICBoZWlnaHQ6IDExcHg7Cit9 CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZmluZC1iYW5uZXIgPiBidXR0b24gPiAuZ2x5 cGggewogICAgIGhlaWdodDogN3B4OwogfQogCkBAIC0xNTAsMTAgKzE1NCwxNCBAQAogCiAuZmlu ZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLmxlZnQgPiAuZ2x5cGggewogICAgIGJhY2tncm91 bmQtaW1hZ2U6IC13ZWJraXQtY2FudmFzKGZpbmQtYmFubmVyLXByZXZpb3VzLWFycm93LW5vcm1h bCk7Ci0gICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworICAgIGJhY2tncm91bmQtc2l6ZTog N3B4IDExcHg7CiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsKIH0KIAorYm9keS5t YWMtcGxhdGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQubGVmdCA+ IC5nbHlwaCB7CisgICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworfQorCiAuZmluZC1iYW5u ZXIgPiBidXR0b24uc2VnbWVudGVkLmxlZnQ6YWN0aXZlOm5vdCg6ZGlzYWJsZWQpID4gLmdseXBo IHsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWNhbnZhcyhmaW5kLWJhbm5lci1wcmV2 aW91cy1hcnJvdy1ub3JtYWwtYWN0aXZlKTsKIH0KQEAgLTE3MCwxNiArMTc4LDI3IEBACiAKIC5m aW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQucmlnaHQgPiAuZ2x5cGggewogICAgIGJhY2tn cm91bmQtaW1hZ2U6IC13ZWJraXQtY2FudmFzKGZpbmQtYmFubmVyLW5leHQtYXJyb3ctbm9ybWFs KTsKLSAgICBiYWNrZ3JvdW5kLXNpemU6IDdweCA3cHg7CisgICAgYmFja2dyb3VuZC1zaXplOiA3 cHggMTFweDsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwogfQogCitib2R5Lm1h Yy1wbGF0Zm9ybS5sZWdhY3kgLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21lbnRlZC5yaWdodCA+ IC5nbHlwaCB7CisgICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworfQorCiAuZmluZC1iYW5u ZXIgPiBidXR0b24uc2VnbWVudGVkLnJpZ2h0OmFjdGl2ZTpub3QoOmRpc2FibGVkKSA+IC5nbHlw aCB7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1jYW52YXMoZmluZC1iYW5uZXItbmV4 dC1hcnJvdy1ub3JtYWwtYWN0aXZlKTsKIH0KIAogLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21l bnRlZCB7CiAgICAgbWluLXdpZHRoOiAyMnB4OworICAgIHBhZGRpbmctdG9wOiAzcHg7CisgICAg cGFkZGluZy1ib3R0b206IDJweDsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5maW5k LWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQgeworICAgIHBhZGRpbmctdG9wOiAycHg7CisgICAg cGFkZGluZy1ib3R0b206IDNweDsKIH0KIAogLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21lbnRl ZDphY3RpdmUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvRmluZEJhbm5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanMKaW5kZXggZGEzZjI5YS4uOTc1ZjdmNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5q cworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFu bmVyLmpzCkBAIC0zMjgsMTUgKzMyOCwxNSBAQCBXZWJJbnNwZWN0b3IuRmluZEJhbm5lci5wcm90 b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIGZvcndhcmRBcnJvdywgYmFja0Fycm93OwogICAgICAg ICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiICYmIFdlYkluc3BlY3Rv ci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPCAxMCkgewotICAgICAgICAgICAgZm9yd2FyZEFy cm93ID0gIkltYWdlcy9Gb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIjsKLSAgICAgICAgICAgIGJhY2tB cnJvdyA9ICJJbWFnZXMvQmFja0Fycm93TGVnYWN5LnN2ZyI7CisgICAgICAgICAgICBmb3J3YXJk QXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmciLCB3aWR0aDogNywg aGVpZ2h0OiA3fTsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fy cm93TGVnYWN5LnN2ZyIsIHdpZHRoOiA3LCBoZWlnaHQ6IDd9OwogICAgICAgICB9IGVsc2Ugewot ICAgICAgICAgICAgZm9yd2FyZEFycm93ID0gIkltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnIjsKLSAg ICAgICAgICAgIGJhY2tBcnJvdyA9ICJJbWFnZXMvQmFja0Fycm93LnN2ZyI7CisgICAgICAgICAg ICBmb3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmciLCB3aWR0aDog NywgaGVpZ2h0OiAxMX07CisgICAgICAgICAgICBiYWNrQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0Jh Y2tBcnJvdy5zdmciLCB3aWR0aDogNywgaGVpZ2h0OiAxMX07CiAgICAgICAgIH0KIAotICAgICAg ICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1MoYmFja0Fycm93LCBzcGVjaWZpY2F0aW9ucywg NywgNywgImZpbmQtYmFubmVyLXByZXZpb3VzLWFycm93LSIpOwotICAgICAgICBnZW5lcmF0ZUNv bG9yZWRJbWFnZXNGb3JDU1MoZm9yd2FyZEFycm93LCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZp bmQtYmFubmVyLW5leHQtYXJyb3ctIik7CisgICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0Zv ckNTUyhiYWNrQXJyb3cuc3JjLCBzcGVjaWZpY2F0aW9ucywgYmFja0Fycm93LndpZHRoLCBiYWNr QXJyb3cuaGVpZ2h0LCAiZmluZC1iYW5uZXItcHJldmlvdXMtYXJyb3ctIik7CisgICAgICAgIGdl bmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhmb3J3YXJkQXJyb3cuc3JjLCBzcGVjaWZpY2F0aW9u cywgZm9yd2FyZEFycm93LndpZHRoLCBmb3J3YXJkQXJyb3cuaGVpZ2h0LCAiZmluZC1iYW5uZXIt bmV4dC1hcnJvdy0iKTsKICAgICB9CiB9OwogCg== 235231 2014-07-21 11:26:10 -0700 2014-07-21 11:44:39 -0700 [PATCH] Attempted fix, review feedback. arrows3.diff text/plain 16153 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDRiZTk2MjkuLjZlMjdkYTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTA3LTIxICBKb25hdGhhbiBXZWxs cyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CisKKyAgICAgICAgQmFjay9Gb3J3YXJkIGFycm93cyAo bW9kZXJuKSBhcmUgdG9vIGxhcmdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM1MDczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29y YXJvLgorCisgICAgICAgIENoYW5nZXMgdG8gYWRqdXN0IG5ldyBmb3J3YXJkIGFuZCBiYWNrIGFy cm93IHNpemVzIHRvIGJlIG1vcmUgY29uc2lzdGVudCB3aXRoIHRoZSAKKyAgICAgICAgdW5pdmVy c2FsIGRlc2lnbiBsYW5ndWFnZS4gTW92ZWQgV2ViSW5zcGVjdG9yLlBsYXRmb3JtIGRlZmluaXRp b24gdG8gaXRzIG93biBmaWxlLgorICAgICAgICBSZWZhY3RvcmVkIGhhbmRsaW5nIG9mIGltYWdl IHZlcnNpb25zIGluc2lkZSBJbWFnZVV0aWxpdGllcy5qcy4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qczoKKyAgICAgICAgKC5yZXN0b3JlSW1hZ2UpOgor ICAgICAgICAoLmdlbmVyYXRlSW1hZ2UpOgorICAgICAgICAoZ2VuZXJhdGVDb2xvcmVkSW1hZ2Vz Rm9yQ1NTKToKKyAgICAgICAgTWFrZSB0aGUgZGVmYXVsdCBpbWFnZSB2ZXJzaW9uaW5nIHNtYXJ0 ZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5jb250ZW50TG9hZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5jb250ZW50 TG9hZGVkLldlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnRvU3RyaW5nKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkLldlYkluc3BlY3Rvci5QbGF0Zm9y bS50b1N0cmluZyk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1BsYXRm b3JtLmpzOiBBZGRlZC4KKyAgICAgICAgTW92ZSBwbGF0Zm9ybSBpbmZvcm1hdGlvbiBkZWZpbml0 aW9uIGludG8gUGxhdGZvcm0uanMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRt bDogSW5jbHVkZSBQbGF0Zm9ybS5qcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5jc3M6CisgICAgICAg ICguZmluZC1iYW5uZXIgPiBidXR0b24gPiAuZ2x5cGgpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbiA+IC5nbHlwaCk6CisgICAgICAgICgu ZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLmxlZnQgPiAuZ2x5cGgpOgorICAgICAgICAo Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQu bGVmdCA+IC5nbHlwaCk6CisgICAgICAgICguZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVk LnJpZ2h0ID4gLmdseXBoKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZmlu ZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLnJpZ2h0ID4gLmdseXBoKToKKyAgICAgICAgKC5m aW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZv cm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5G aW5kQmFubmVyLnByb3RvdHlwZS5fZ2VuZXJhdGVCdXR0b25zR2x5cGhzSWZOZWVkZWQpOgorICAg ICAgICBTaXplIG9mIGZvcndhcmQgYW5kIGJhY2sgYXJyb3dzIGFkanVzdGVkLgorCiAyMDE0LTA3 LTE4ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZl cnQgcjE2OTczNSBzaW5jZSBpdCBicm9rZSBUaW1lbGluZSwgYW5kIGZpeCBidWcgMTI5Njk2IGlu IGEgbW9yZSB0YXJnZXRlZCB3YXkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcwppbmRleCA5ZWUwODUzLi43 YjIxYmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL0ltYWdlVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMKQEAgLTI2LDYgKzI2LDExIEBACiAvLyBCdW1w IHRoaXMgdmVyc2lvbiB3aGVuIG1ha2luZyBjaGFuZ2VzIHRoYXQgYWZmZWN0IHRoZSBzdG9yYWdl IGZvcm1hdC4KIGNvbnN0IF9pbWFnZVN0b3JhZ2VGb3JtYXRWZXJzaW9uID0gMTsKIAorLy8gVXNl IGFzIGEgZGVmYXVsdCB3aGVyZSBhbiBpbWFnZSB2ZXJzaW9uIGlzIG5vdCBvdGhlcndpc2Ugc3Bl Y2lmaWVkLgorLy8gQnVtcCB0aGUgYmFzZSB2ZXJzaW9uIHdoZW4gbWFraW5nIGNoYW5nZXMgdGhh dCBhZmZlY3QgdGhlIHJlc3VsdCBpbWFnZS4KK2NvbnN0IGJhc2VEZWZhdWx0SW1hZ2VWZXJzaW9u ID0gMzsKK2NvbnN0IGRlZmF1bHRJbWFnZVZlcnNpb24gPSBiYXNlRGVmYXVsdEltYWdlVmVyc2lv biArIDAuMDEgKiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5iYXNlICsgMC4wMDAxICog V2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZTsKKwogdHJ5IHsKICAgICB2YXIg X2dlbmVyYXRlZEltYWdlQ2FjaGVEYXRhYmFzZSA9IG9wZW5EYXRhYmFzZSgiY29tLmFwcGxlLldl Ykluc3BlY3RvciIsIDEsICJXZWIgSW5zcGVjdG9yIFN0b3JhZ2UgRGF0YWJhc2UiLCA1ICogMTAy NCAqIDEwMjQpOwogfSBjYXRjaCAoZSkgewpAQCAtMzM3LDcgKzM0Miw3IEBAIGZ1bmN0aW9uIGdl bmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhpbWFnZVBhdGgsIHNwZWNpZmljYXRpb25zLCB3aWR0 aCwgaGVpZ2h0LCBjCiAgICAgewogICAgICAgICBjb25zdCBzdG9yYWdlS2V5ID0gc3RvcmFnZUtl eVByZWZpeCArIGNhbnZhc0lkZW50aWZpZXJQcmVmaXggKyBjYW52YXNJZGVudGlmaWVyOwogICAg ICAgICBjb25zdCBjb250ZXh0ID0gZG9jdW1lbnQuZ2V0Q1NTQ2FudmFzQ29udGV4dCgiMmQiLCBj YW52YXNJZGVudGlmaWVyUHJlZml4ICsgY2FudmFzSWRlbnRpZmllciwgc2NhbGVkV2lkdGgsIHNj YWxlZEhlaWdodCk7Ci0gICAgICAgIHJlc3RvcmVJbWFnZUZyb21TdG9yYWdlKHN0b3JhZ2VLZXks IGNvbnRleHQsIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQsIHNwZWNpZmljYXRpb24uaW1hZ2VW ZXJzaW9uIHx8IDAsIGZ1bmN0aW9uKCkgeworICAgICAgICByZXN0b3JlSW1hZ2VGcm9tU3RvcmFn ZShzdG9yYWdlS2V5LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVkSGVpZ2h0LCBzcGVjaWZp Y2F0aW9uLmltYWdlVmVyc2lvbiB8fCBkZWZhdWx0SW1hZ2VWZXJzaW9uLCBmdW5jdGlvbigpIHsK ICAgICAgICAgICAgIGVuc3VyZUltYWdlSXNMb2FkZWQoZ2VuZXJhdGVJbWFnZS5iaW5kKG51bGws IGNhbnZhc0lkZW50aWZpZXIsIHNwZWNpZmljYXRpb24pKTsKICAgICAgICAgfSk7CiAgICAgfQpA QCAtMzc0LDcgKzM3OSw3IEBAIGZ1bmN0aW9uIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhp bWFnZVBhdGgsIHNwZWNpZmljYXRpb25zLCB3aWR0aCwgaGVpZ2h0LCBjCiAgICAgICAgIGNvbnRl eHQuZHJhd0ltYWdlKGNvbG9yZWRJbWFnZSwgMCwgMCwgd2lkdGgsIGhlaWdodCk7CiAKICAgICAg ICAgY29uc3Qgc3RvcmFnZUtleSA9IHN0b3JhZ2VLZXlQcmVmaXggKyBjYW52YXNJZGVudGlmaWVy UHJlZml4ICsgY2FudmFzSWRlbnRpZmllcjsKLSAgICAgICAgc2F2ZUltYWdlVG9TdG9yYWdlKHN0 b3JhZ2VLZXksIGNvbnRleHQsIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQsIHNwZWNpZmljYXRp b24uaW1hZ2VWZXJzaW9uIHx8IDApOworICAgICAgICBzYXZlSW1hZ2VUb1N0b3JhZ2Uoc3RvcmFn ZUtleSwgY29udGV4dCwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCwgc3BlY2lmaWNhdGlvbi5p bWFnZVZlcnNpb24gfHwgZGVmYXVsdEltYWdlVmVyc2lvbik7CiAgICAgICAgIGNvbnRleHQucmVz dG9yZSgpOwogICAgIH0KIH0KQEAgLTM5Myw5ICszOTgsNyBAQCBmdW5jdGlvbiBnZW5lcmF0ZUVt Ym9zc2VkSW1hZ2VzKHNyYywgd2lkdGgsIGhlaWdodCwgc3RhdGVzLCBjYW52YXNJZGVudGlmaWVy Q2FsbAogICAgIHZhciBzY2FsZWRXaWR0aCA9IHdpZHRoICogc2NhbGVGYWN0b3I7CiAgICAgdmFy IHNjYWxlZEhlaWdodCA9IGhlaWdodCAqIHNjYWxlRmFjdG9yOwogCi0gICAgLy8gQnVtcCB0aGUg YmFzZSB2ZXJzaW9uIHdoZW4gbWFraW5nIGNoYW5nZXMgdGhhdCBhZmZlY3QgdGhlIHJlc3VsdCBp bWFnZS4KLSAgICBjb25zdCBiYXNlSW1hZ2VWZXJzaW9uID0gMzsKLSAgICBjb25zdCBpbWFnZVZl cnNpb24gPSBiYXNlSW1hZ2VWZXJzaW9uICsgMC4wMSAqIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52 ZXJzaW9uLmJhc2UgKyAwLjAwMDEgKiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxl YXNlOworICAgIGNvbnN0IGltYWdlVmVyc2lvbiA9IGRlZmF1bHRJbWFnZVZlcnNpb247CiAKICAg ICBjb25zdCBzdG9yYWdlS2V5UHJlZml4ID0gImdlbmVyYXRlZC1lbWJvc3NlZC1pbWFnZS0iOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMK aW5kZXggMDU3NDBiYi4uMmQ1MGI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMTg3LDU1ICsxODcsMTQgQEAgV2ViSW5zcGVj dG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlbW92ZSIsIHRoaXMuX21vdXNlTW92ZWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAg d2luZG93LmFkZEV2ZW50TGlzdGVuZXIoInBhZ2VoaWRlIiwgdGhpcy5fcGFnZUhpZGRlbi5iaW5k KHRoaXMpKTsKIAotICAgIC8vIENoZWNrIGZvciBhIG5pZ2h0bHkgYnVpbGQgYnkgbG9va2luZyBm b3IgYSBwbHVzIGluIHRoZSB2ZXJzaW9uIG51bWJlciBhbmQgYSBzbWFsbCBudW1iZXIgb2Ygc3R5 bGVzaGVldHMgKGluZGljYXRpbmcgY29tYmluZWQgcmVzb3VyY2VzKS4KLSAgICB2YXIgdmVyc2lv bk1hdGNoID0gLyBBcHBsZVdlYktpdFwvKFteIF0rKS8uZXhlYyhuYXZpZ2F0b3IudXNlckFnZW50 KTsKLSAgICBpZiAodmVyc2lvbk1hdGNoICYmIHZlcnNpb25NYXRjaFsxXS5pbmRleE9mKCIrIikg IT09IC0xICYmIGRvY3VtZW50LnN0eWxlU2hlZXRzLmxlbmd0aCA8IDEwKQotICAgICAgICBkb2N1 bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKLQogICAgIC8vIEFkZCBw bGF0Zm9ybSBzdHlsZSBjbGFzc2VzIHNvIHRoZSBVSSBjYW4gYmUgdHdlYWtlZCBwZXItcGxhdGZv cm0uCi0gICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtID0gewotICAgICAgICBuYW1lOiBJbnNwZWN0 b3JGcm9udGVuZEhvc3QucGxhdGZvcm0oKSwKLSAgICAgICAgY29kZU5hbWU6ICIiLAotICAgICAg ICB2ZXJzaW9uOiB7Ci0gICAgICAgICAgICBiYXNlOiAwLAotICAgICAgICAgICAgcmVsZWFzZTog MCwKLSAgICAgICAgICAgIHRvU3RyaW5nOiBmdW5jdGlvbigpCi0gICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgcmV0dXJuIHRoaXMuYmFzZSArICIuIiArIHRoaXMudmVyc2lvbjsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgfSwKLSAgICAgICAgdG9TdHJpbmc6IGZ1bmN0aW9uKCkKLSAgICAg ICAgewotICAgICAgICAgICAgcmV0dXJuIHRoaXMubmFtZTsKLSAgICAgICAgfQotICAgIH07Ci0K LSAgICB2YXIgaXNMZWdhY3lNYWNPUyA9IGZhbHNlOwotICAgIHZhciBvc1ZlcnNpb25NYXRjaCA9 IC8gTWFjIE9TIFggKFxkKylfKFxkKykvLmV4ZWMobmF2aWdhdG9yLmFwcFZlcnNpb24pOwotICAg IGlmIChvc1ZlcnNpb25NYXRjaCAmJiBvc1ZlcnNpb25NYXRjaFsxXSA9PT0gIjEwIikgewotICAg ICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5iYXNlID0gMTA7Ci0gICAgICAgIHN3 aXRjaChvc1ZlcnNpb25NYXRjaFsyXSkgewotICAgICAgICAgICAgY2FzZSAiMTAiOgotICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5jb2RlTmFtZSA9ICJ5b3NlbWl0ZSI7Ci0g ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA9IDEw OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSAiOSI6Ci0gICAgICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lID0gIm1hdmVyaWNrcyI7Ci0g ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA9IDk7 Ci0gICAgICAgICAgICAgICAgaXNMZWdhY3lNYWNPUyA9IHRydWU7Ci0gICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICBjYXNlICI4IjoKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuUGxhdGZvcm0uY29kZU5hbWUgPSAibW91bnRhaW4tbGlvbiI7Ci0gICAgICAgICAgICAgICAg V2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA9IDg7Ci0gICAgICAgICAgICAg ICAgaXNMZWdhY3lNYWNPUyA9IHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBkb2N1bWVu dC5ib2R5LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlBsYXRmb3JtICsgIi1wbGF0Zm9ybSIp OwotICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUpCi0gICAgICAgIGRvY3Vt ZW50LmJvZHkuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUpOwot ICAgIGlmIChpc0xlZ2FjeU1hY09TKQorICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZChX ZWJJbnNwZWN0b3IuUGxhdGZvcm0ubmFtZSArICItcGxhdGZvcm0iKTsKKyAgICBpZiAoV2ViSW5z cGVjdG9yLlBsYXRmb3JtLmlzTmlnaHRseUJ1aWxkKQorICAgICAgICBkb2N1bWVudC5ib2R5LmNs YXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKKyAgICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRm b3JtLmlzTGVnYWN5TWFjT1MpCiAgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgi bGVnYWN5Iik7CisgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUpCisg ICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUGxhdGZvcm0u dmVyc2lvbi5uYW1lKTsKIAogICAgIHRoaXMuZGVidWdnYWJsZVR5cGUgPSBJbnNwZWN0b3JGcm9u dGVuZEhvc3QuZGVidWdnYWJsZVR5cGUoKSA9PT0gIndlYiIgPyBXZWJJbnNwZWN0b3IuRGVidWdn YWJsZVR5cGUuV2ViIDogV2ViSW5zcGVjdG9yLkRlYnVnZ2FibGVUeXBlLkphdmFTY3JpcHQ7CiAg ICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKHRoaXMuZGVidWdnYWJsZVR5cGUpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9QbGF0Zm9y bS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZvcm0u anMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYWI5NzQzMgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZv cm0uanMKQEAgLTAsMCArMSw2MyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK KyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJ UyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwor ICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAq IEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKK1dlYkluc3BlY3Rvci5QbGF0Zm9y bSA9IHsKKyAgICBuYW1lOiBJbnNwZWN0b3JGcm9udGVuZEhvc3QucGxhdGZvcm0oKSwKKyAgICBp c0xlZ2FjeU1hY09TOiBmYWxzZSwKKyAgICBpc05pZ2h0bHlCdWlsZDogZmFsc2UsCisgICAgdmVy c2lvbjogeworICAgICAgICBiYXNlOiAwLAorICAgICAgICByZWxlYXNlOiAwLAorICAgICAgICBu YW1lOiAiIgorICAgIH0KK307CisKKyhmdW5jdGlvbiAoKSB7CisgICAgLy8gQ2hlY2sgZm9yIGEg bmlnaHRseSBidWlsZCBieSBsb29raW5nIGZvciBhIHBsdXMgaW4gdGhlIHZlcnNpb24gbnVtYmVy IGFuZCBhIHNtYWxsIG51bWJlciBvZiBzdHlsZXNoZWV0cyAoaW5kaWNhdGluZyBjb21iaW5lZCBy ZXNvdXJjZXMpLgorICAgIHZhciB2ZXJzaW9uTWF0Y2ggPSAvIEFwcGxlV2ViS2l0XC8oW14gXSsp Ly5leGVjKG5hdmlnYXRvci51c2VyQWdlbnQpOworICAgIGlmICh2ZXJzaW9uTWF0Y2ggJiYgdmVy c2lvbk1hdGNoWzFdLmluZGV4T2YoIisiKSAhPT0gLTEgJiYgZG9jdW1lbnQuc3R5bGVTaGVldHMu bGVuZ3RoIDwgMTApCisgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5pc05pZ2h0bHlCdWls ZCA9IHRydWU7CisKKyAgICB2YXIgaXNMZWdhY3lNYWNPUyA9IGZhbHNlOworICAgIHZhciBvc1Zl cnNpb25NYXRjaCA9IC8gTWFjIE9TIFggKFxkKylfKFxkKykvLmV4ZWMobmF2aWdhdG9yLmFwcFZl cnNpb24pOworICAgIGlmIChvc1ZlcnNpb25NYXRjaCAmJiBvc1ZlcnNpb25NYXRjaFsxXSA9PT0g IjEwIikgeworICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5iYXNlID0gMTA7 CisgICAgICAgIHN3aXRjaChvc1ZlcnNpb25NYXRjaFsyXSkgeworICAgICAgICAgICAgY2FzZSAi MTAiOgorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUg PSAieW9zZW1pdGUiOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJz aW9uLnJlbGVhc2UgPSAxMDsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNh c2UgIjkiOgorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5h bWUgPSAibWF2ZXJpY2tzIjsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0u dmVyc2lvbi5yZWxlYXNlID0gOTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZv cm0uaXNMZWdhY3lNYWNPUyA9IHRydWU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICBjYXNlICI4IjoKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVy c2lvbi5uYW1lID0gIm1vdW50YWluLWxpb24iOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSA4OworICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5pc0xlZ2FjeU1hY09TID0gdHJ1ZTsKKyAgICAgICAgfQorICAgIH0KK30p KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWlu Lmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKaW5k ZXggYzZmZTc4YS4uZWJhYzI2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvTWFpbi5odG1sCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL01haW4uaHRtbApAQCAtMTYxLDYgKzE2MSw3IEBACiAgICAgPHNjcmlwdCBzcmM9IkV4 dGVybmFsL0NvZGVNaXJyb3IveG1sLmpzIj48L3NjcmlwdD4KIAogICAgIDxzY3JpcHQgc3JjPSJC YXNlL1dlYkluc3BlY3Rvci5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9IkJhc2UvUGxh dGZvcm0uanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJCYXNlL09iamVjdC5qcyI+PC9z Y3JpcHQ+CiAKICAgICA8c2NyaXB0IHNyYz0iQmFzZS9ET01VdGlsaXRpZXMuanMiPjwvc2NyaXB0 PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCA4YjE1ZWZlLi5jMWRjNzQwIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nl ci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250 ZW50QnJvd3Nlci5qcwpAQCAtNTMsMTAgKzUzLDkgQEAgV2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93 c2VyID0gZnVuY3Rpb24oZWxlbWVudCwgZGVsZWdhdGUsIGRpc2FibGVCYWNrRm9yd2FyZCkKICAg ICAgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5uYW1lID09PSAibWFjIiAmJiBXZWJJbnNw ZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlIDwgMTApIHsKICAgICAgICAgICAgIGZvcndh cmRBcnJvdyA9IHtzcmM6ICJJbWFnZXMvRm9yd2FyZEFycm93TGVnYWN5LnN2ZyIsIHdpZHRoOiA5 LCBoZWlnaHQ6IDl9OwogICAgICAgICAgICAgYmFja0Fycm93ID0ge3NyYzogIkltYWdlcy9CYWNr QXJyb3dMZWdhY3kuc3ZnIiwgd2lkdGg6IDksIGhlaWdodDogOX07Ci0gICAgICAgIH0KLSAgICAg ICAgZWxzZSB7Ci0gICAgICAgICAgICBmb3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0Zvcndh cmRBcnJvdy5zdmciLCB3aWR0aDogMTAsIGhlaWdodDogMTZ9OwotICAgICAgICAgICAgYmFja0Fy cm93ID0ge3NyYzogIkltYWdlcy9CYWNrQXJyb3cuc3ZnIiwgd2lkdGg6IDEwLCBoZWlnaHQ6IDE2 fTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIGZvcndhcmRBcnJvdyA9IHtzcmM6ICJJ bWFnZXMvRm9yd2FyZEFycm93LnN2ZyIsIHdpZHRoOiA4LCBoZWlnaHQ6IDEzfTsKKyAgICAgICAg ICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fycm93LnN2ZyIsIHdpZHRoOiA4LCBo ZWlnaHQ6IDEzfTsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX2JhY2tCdXR0b25OYXZpZ2F0 aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImJhY2siLCBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJhY2sgKCVzKSIpLmZvcm1hdCh0aGlzLl9iYWNrS2V5Ym9h cmRTaG9ydGN1dC5kaXNwbGF5TmFtZSksIGJhY2tBcnJvdy5zcmMsIGJhY2tBcnJvdy53aWR0aCwg YmFja0Fycm93LmhlaWdodCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmNzcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3NzCmluZGV4IDZhZDExZDUuLmFhNzdhOTEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Zp bmRCYW5uZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbmRCYW5uZXIuY3NzCkBAIC0xMjAsNiArMTIwLDEwIEBACiAgICAgZGlzcGxheTogaW5s aW5lLWJsb2NrOwogCiAgICAgd2lkdGg6IDdweDsKKyAgICBoZWlnaHQ6IDExcHg7Cit9CisKK2Jv ZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZmluZC1iYW5uZXIgPiBidXR0b24gPiAuZ2x5cGggewog ICAgIGhlaWdodDogN3B4OwogfQogCkBAIC0xNTAsMTAgKzE1NCwxNCBAQAogCiAuZmluZC1iYW5u ZXIgPiBidXR0b24uc2VnbWVudGVkLmxlZnQgPiAuZ2x5cGggewogICAgIGJhY2tncm91bmQtaW1h Z2U6IC13ZWJraXQtY2FudmFzKGZpbmQtYmFubmVyLXByZXZpb3VzLWFycm93LW5vcm1hbCk7Ci0g ICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworICAgIGJhY2tncm91bmQtc2l6ZTogN3B4IDEx cHg7CiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJlcGVhdDsKIH0KIAorYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQubGVmdCA+IC5nbHlw aCB7CisgICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworfQorCiAuZmluZC1iYW5uZXIgPiBi dXR0b24uc2VnbWVudGVkLmxlZnQ6YWN0aXZlOm5vdCg6ZGlzYWJsZWQpID4gLmdseXBoIHsKICAg ICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWNhbnZhcyhmaW5kLWJhbm5lci1wcmV2aW91cy1h cnJvdy1ub3JtYWwtYWN0aXZlKTsKIH0KQEAgLTE3MCwxNiArMTc4LDI3IEBACiAKIC5maW5kLWJh bm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQucmlnaHQgPiAuZ2x5cGggewogICAgIGJhY2tncm91bmQt aW1hZ2U6IC13ZWJraXQtY2FudmFzKGZpbmQtYmFubmVyLW5leHQtYXJyb3ctbm9ybWFsKTsKLSAg ICBiYWNrZ3JvdW5kLXNpemU6IDdweCA3cHg7CisgICAgYmFja2dyb3VuZC1zaXplOiA3cHggMTFw eDsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVwZWF0OwogfQogCitib2R5Lm1hYy1wbGF0 Zm9ybS5sZWdhY3kgLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21lbnRlZC5yaWdodCA+IC5nbHlw aCB7CisgICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworfQorCiAuZmluZC1iYW5uZXIgPiBi dXR0b24uc2VnbWVudGVkLnJpZ2h0OmFjdGl2ZTpub3QoOmRpc2FibGVkKSA+IC5nbHlwaCB7CiAg ICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1jYW52YXMoZmluZC1iYW5uZXItbmV4dC1hcnJv dy1ub3JtYWwtYWN0aXZlKTsKIH0KIAogLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21lbnRlZCB7 CiAgICAgbWluLXdpZHRoOiAyMnB4OworICAgIHBhZGRpbmctdG9wOiAzcHg7CisgICAgcGFkZGlu Zy1ib3R0b206IDJweDsKK30KKworYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5maW5kLWJhbm5l ciA+IGJ1dHRvbi5zZWdtZW50ZWQgeworICAgIHBhZGRpbmctdG9wOiAycHg7CisgICAgcGFkZGlu Zy1ib3R0b206IDNweDsKIH0KIAogLmZpbmQtYmFubmVyID4gYnV0dG9uLnNlZ21lbnRlZDphY3Rp dmUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvRmluZEJhbm5lci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0ZpbmRCYW5uZXIuanMKaW5kZXggZGEzZjI5YS4uOTc1ZjdmNyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpz CkBAIC0zMjgsMTUgKzMyOCwxNSBAQCBXZWJJbnNwZWN0b3IuRmluZEJhbm5lci5wcm90b3R5cGUg PSB7CiAKICAgICAgICAgdmFyIGZvcndhcmRBcnJvdywgYmFja0Fycm93OwogICAgICAgICBpZiAo V2ViSW5zcGVjdG9yLlBsYXRmb3JtLm5hbWUgPT09ICJtYWMiICYmIFdlYkluc3BlY3Rvci5QbGF0 Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPCAxMCkgewotICAgICAgICAgICAgZm9yd2FyZEFycm93ID0g IkltYWdlcy9Gb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIjsKLSAgICAgICAgICAgIGJhY2tBcnJvdyA9 ICJJbWFnZXMvQmFja0Fycm93TGVnYWN5LnN2ZyI7CisgICAgICAgICAgICBmb3J3YXJkQXJyb3cg PSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2FjeS5zdmciLCB3aWR0aDogNywgaGVpZ2h0 OiA3fTsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFja0Fycm93TGVn YWN5LnN2ZyIsIHdpZHRoOiA3LCBoZWlnaHQ6IDd9OwogICAgICAgICB9IGVsc2UgewotICAgICAg ICAgICAgZm9yd2FyZEFycm93ID0gIkltYWdlcy9Gb3J3YXJkQXJyb3cuc3ZnIjsKLSAgICAgICAg ICAgIGJhY2tBcnJvdyA9ICJJbWFnZXMvQmFja0Fycm93LnN2ZyI7CisgICAgICAgICAgICBmb3J3 YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmciLCB3aWR0aDogNywgaGVp Z2h0OiAxMX07CisgICAgICAgICAgICBiYWNrQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0JhY2tBcnJv dy5zdmciLCB3aWR0aDogNywgaGVpZ2h0OiAxMX07CiAgICAgICAgIH0KIAotICAgICAgICBnZW5l cmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1MoYmFja0Fycm93LCBzcGVjaWZpY2F0aW9ucywgNywgNywg ImZpbmQtYmFubmVyLXByZXZpb3VzLWFycm93LSIpOwotICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJ bWFnZXNGb3JDU1MoZm9yd2FyZEFycm93LCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQtYmFu bmVyLW5leHQtYXJyb3ctIik7CisgICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhi YWNrQXJyb3cuc3JjLCBzcGVjaWZpY2F0aW9ucywgYmFja0Fycm93LndpZHRoLCBiYWNrQXJyb3cu aGVpZ2h0LCAiZmluZC1iYW5uZXItcHJldmlvdXMtYXJyb3ctIik7CisgICAgICAgIGdlbmVyYXRl Q29sb3JlZEltYWdlc0ZvckNTUyhmb3J3YXJkQXJyb3cuc3JjLCBzcGVjaWZpY2F0aW9ucywgZm9y d2FyZEFycm93LndpZHRoLCBmb3J3YXJkQXJyb3cuaGVpZ2h0LCAiZmluZC1iYW5uZXItbmV4dC1h cnJvdy0iKTsKICAgICB9CiB9OwogCg== 235232 2014-07-21 11:44:39 -0700 2014-07-21 12:16:50 -0700 [PATCH] Attempted fix, review feedback + 1. arrows4.diff text/plain 16177 jonowells ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDRiZTk2MjkuLjZlMjdkYTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ0IEBACisyMDE0LTA3LTIxICBKb25hdGhhbiBXZWxs cyAgPGpvbm93ZWxsc0BhcHBsZS5jb20+CisKKyAgICAgICAgQmFjay9Gb3J3YXJkIGFycm93cyAo bW9kZXJuKSBhcmUgdG9vIGxhcmdlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTM1MDczCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSm9zZXBoIFBlY29y YXJvLgorCisgICAgICAgIENoYW5nZXMgdG8gYWRqdXN0IG5ldyBmb3J3YXJkIGFuZCBiYWNrIGFy cm93IHNpemVzIHRvIGJlIG1vcmUgY29uc2lzdGVudCB3aXRoIHRoZSAKKyAgICAgICAgdW5pdmVy c2FsIGRlc2lnbiBsYW5ndWFnZS4gTW92ZWQgV2ViSW5zcGVjdG9yLlBsYXRmb3JtIGRlZmluaXRp b24gdG8gaXRzIG93biBmaWxlLgorICAgICAgICBSZWZhY3RvcmVkIGhhbmRsaW5nIG9mIGltYWdl IHZlcnNpb25zIGluc2lkZSBJbWFnZVV0aWxpdGllcy5qcy4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qczoKKyAgICAgICAgKC5yZXN0b3JlSW1hZ2UpOgor ICAgICAgICAoLmdlbmVyYXRlSW1hZ2UpOgorICAgICAgICAoZ2VuZXJhdGVDb2xvcmVkSW1hZ2Vz Rm9yQ1NTKToKKyAgICAgICAgTWFrZSB0aGUgZGVmYXVsdCBpbWFnZSB2ZXJzaW9uaW5nIHNtYXJ0 ZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5jb250ZW50TG9hZGVkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5jb250ZW50 TG9hZGVkLldlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnRvU3RyaW5nKTogRGVsZXRlZC4K KyAgICAgICAgKFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkLldlYkluc3BlY3Rvci5QbGF0Zm9y bS50b1N0cmluZyk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL1BsYXRm b3JtLmpzOiBBZGRlZC4KKyAgICAgICAgTW92ZSBwbGF0Zm9ybSBpbmZvcm1hdGlvbiBkZWZpbml0 aW9uIGludG8gUGxhdGZvcm0uanMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01haW4uaHRt bDogSW5jbHVkZSBQbGF0Zm9ybS5qcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv Q29udGVudEJyb3dzZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29udGVudEJyb3dzZXIp OgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5jc3M6CisgICAgICAg ICguZmluZC1iYW5uZXIgPiBidXR0b24gPiAuZ2x5cGgpOgorICAgICAgICAoYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbiA+IC5nbHlwaCk6CisgICAgICAgICgu ZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLmxlZnQgPiAuZ2x5cGgpOgorICAgICAgICAo Ym9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQu bGVmdCA+IC5nbHlwaCk6CisgICAgICAgICguZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVk LnJpZ2h0ID4gLmdseXBoKToKKyAgICAgICAgKGJvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZmlu ZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLnJpZ2h0ID4gLmdseXBoKToKKyAgICAgICAgKC5m aW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQpOgorICAgICAgICAoYm9keS5tYWMtcGxhdGZv cm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQpOgorICAgICAgICAqIFVz ZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5G aW5kQmFubmVyLnByb3RvdHlwZS5fZ2VuZXJhdGVCdXR0b25zR2x5cGhzSWZOZWVkZWQpOgorICAg ICAgICBTaXplIG9mIGZvcndhcmQgYW5kIGJhY2sgYXJyb3dzIGFkanVzdGVkLgorCiAyMDE0LTA3 LTE4ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZl cnQgcjE2OTczNSBzaW5jZSBpdCBicm9rZSBUaW1lbGluZSwgYW5kIGZpeCBidWcgMTI5Njk2IGlu IGEgbW9yZSB0YXJnZXRlZCB3YXkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL0ltYWdlVXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQmFzZS9JbWFnZVV0aWxpdGllcy5qcwppbmRleCA5ZWUwODUzLi43 YjIxYmUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL0ltYWdlVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvSW1hZ2VVdGlsaXRpZXMuanMKQEAgLTI2LDYgKzI2LDExIEBACiAvLyBCdW1w IHRoaXMgdmVyc2lvbiB3aGVuIG1ha2luZyBjaGFuZ2VzIHRoYXQgYWZmZWN0IHRoZSBzdG9yYWdl IGZvcm1hdC4KIGNvbnN0IF9pbWFnZVN0b3JhZ2VGb3JtYXRWZXJzaW9uID0gMTsKIAorLy8gVXNl IGFzIGEgZGVmYXVsdCB3aGVyZSBhbiBpbWFnZSB2ZXJzaW9uIGlzIG5vdCBvdGhlcndpc2Ugc3Bl Y2lmaWVkLgorLy8gQnVtcCB0aGUgYmFzZSB2ZXJzaW9uIHdoZW4gbWFraW5nIGNoYW5nZXMgdGhh dCBhZmZlY3QgdGhlIHJlc3VsdCBpbWFnZS4KK2NvbnN0IGJhc2VEZWZhdWx0SW1hZ2VWZXJzaW9u ID0gMzsKK2NvbnN0IGRlZmF1bHRJbWFnZVZlcnNpb24gPSBiYXNlRGVmYXVsdEltYWdlVmVyc2lv biArIDAuMDEgKiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5iYXNlICsgMC4wMDAxICog V2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZTsKKwogdHJ5IHsKICAgICB2YXIg X2dlbmVyYXRlZEltYWdlQ2FjaGVEYXRhYmFzZSA9IG9wZW5EYXRhYmFzZSgiY29tLmFwcGxlLldl Ykluc3BlY3RvciIsIDEsICJXZWIgSW5zcGVjdG9yIFN0b3JhZ2UgRGF0YWJhc2UiLCA1ICogMTAy NCAqIDEwMjQpOwogfSBjYXRjaCAoZSkgewpAQCAtMzM3LDcgKzM0Miw3IEBAIGZ1bmN0aW9uIGdl bmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhpbWFnZVBhdGgsIHNwZWNpZmljYXRpb25zLCB3aWR0 aCwgaGVpZ2h0LCBjCiAgICAgewogICAgICAgICBjb25zdCBzdG9yYWdlS2V5ID0gc3RvcmFnZUtl eVByZWZpeCArIGNhbnZhc0lkZW50aWZpZXJQcmVmaXggKyBjYW52YXNJZGVudGlmaWVyOwogICAg ICAgICBjb25zdCBjb250ZXh0ID0gZG9jdW1lbnQuZ2V0Q1NTQ2FudmFzQ29udGV4dCgiMmQiLCBj YW52YXNJZGVudGlmaWVyUHJlZml4ICsgY2FudmFzSWRlbnRpZmllciwgc2NhbGVkV2lkdGgsIHNj YWxlZEhlaWdodCk7Ci0gICAgICAgIHJlc3RvcmVJbWFnZUZyb21TdG9yYWdlKHN0b3JhZ2VLZXks IGNvbnRleHQsIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQsIHNwZWNpZmljYXRpb24uaW1hZ2VW ZXJzaW9uIHx8IDAsIGZ1bmN0aW9uKCkgeworICAgICAgICByZXN0b3JlSW1hZ2VGcm9tU3RvcmFn ZShzdG9yYWdlS2V5LCBjb250ZXh0LCBzY2FsZWRXaWR0aCwgc2NhbGVkSGVpZ2h0LCBzcGVjaWZp Y2F0aW9uLmltYWdlVmVyc2lvbiB8fCBkZWZhdWx0SW1hZ2VWZXJzaW9uLCBmdW5jdGlvbigpIHsK ICAgICAgICAgICAgIGVuc3VyZUltYWdlSXNMb2FkZWQoZ2VuZXJhdGVJbWFnZS5iaW5kKG51bGws IGNhbnZhc0lkZW50aWZpZXIsIHNwZWNpZmljYXRpb24pKTsKICAgICAgICAgfSk7CiAgICAgfQpA QCAtMzc0LDcgKzM3OSw3IEBAIGZ1bmN0aW9uIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhp bWFnZVBhdGgsIHNwZWNpZmljYXRpb25zLCB3aWR0aCwgaGVpZ2h0LCBjCiAgICAgICAgIGNvbnRl eHQuZHJhd0ltYWdlKGNvbG9yZWRJbWFnZSwgMCwgMCwgd2lkdGgsIGhlaWdodCk7CiAKICAgICAg ICAgY29uc3Qgc3RvcmFnZUtleSA9IHN0b3JhZ2VLZXlQcmVmaXggKyBjYW52YXNJZGVudGlmaWVy UHJlZml4ICsgY2FudmFzSWRlbnRpZmllcjsKLSAgICAgICAgc2F2ZUltYWdlVG9TdG9yYWdlKHN0 b3JhZ2VLZXksIGNvbnRleHQsIHNjYWxlZFdpZHRoLCBzY2FsZWRIZWlnaHQsIHNwZWNpZmljYXRp b24uaW1hZ2VWZXJzaW9uIHx8IDApOworICAgICAgICBzYXZlSW1hZ2VUb1N0b3JhZ2Uoc3RvcmFn ZUtleSwgY29udGV4dCwgc2NhbGVkV2lkdGgsIHNjYWxlZEhlaWdodCwgc3BlY2lmaWNhdGlvbi5p bWFnZVZlcnNpb24gfHwgZGVmYXVsdEltYWdlVmVyc2lvbik7CiAgICAgICAgIGNvbnRleHQucmVz dG9yZSgpOwogICAgIH0KIH0KQEAgLTM5Myw5ICszOTgsNyBAQCBmdW5jdGlvbiBnZW5lcmF0ZUVt Ym9zc2VkSW1hZ2VzKHNyYywgd2lkdGgsIGhlaWdodCwgc3RhdGVzLCBjYW52YXNJZGVudGlmaWVy Q2FsbAogICAgIHZhciBzY2FsZWRXaWR0aCA9IHdpZHRoICogc2NhbGVGYWN0b3I7CiAgICAgdmFy IHNjYWxlZEhlaWdodCA9IGhlaWdodCAqIHNjYWxlRmFjdG9yOwogCi0gICAgLy8gQnVtcCB0aGUg YmFzZSB2ZXJzaW9uIHdoZW4gbWFraW5nIGNoYW5nZXMgdGhhdCBhZmZlY3QgdGhlIHJlc3VsdCBp bWFnZS4KLSAgICBjb25zdCBiYXNlSW1hZ2VWZXJzaW9uID0gMzsKLSAgICBjb25zdCBpbWFnZVZl cnNpb24gPSBiYXNlSW1hZ2VWZXJzaW9uICsgMC4wMSAqIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52 ZXJzaW9uLmJhc2UgKyAwLjAwMDEgKiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxl YXNlOworICAgIGNvbnN0IGltYWdlVmVyc2lvbiA9IGRlZmF1bHRJbWFnZVZlcnNpb247CiAKICAg ICBjb25zdCBzdG9yYWdlS2V5UHJlZml4ID0gImdlbmVyYXRlZC1lbWJvc3NlZC1pbWFnZS0iOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01h aW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMK aW5kZXggMDU3NDBiYi4uMmQ1MGI3MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtMTg3LDU1ICsxODcsMTQgQEAgV2ViSW5zcGVj dG9yLmNvbnRlbnRMb2FkZWQgPSBmdW5jdGlvbigpCiAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlbW92ZSIsIHRoaXMuX21vdXNlTW92ZWQuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAg d2luZG93LmFkZEV2ZW50TGlzdGVuZXIoInBhZ2VoaWRlIiwgdGhpcy5fcGFnZUhpZGRlbi5iaW5k KHRoaXMpKTsKIAotICAgIC8vIENoZWNrIGZvciBhIG5pZ2h0bHkgYnVpbGQgYnkgbG9va2luZyBm b3IgYSBwbHVzIGluIHRoZSB2ZXJzaW9uIG51bWJlciBhbmQgYSBzbWFsbCBudW1iZXIgb2Ygc3R5 bGVzaGVldHMgKGluZGljYXRpbmcgY29tYmluZWQgcmVzb3VyY2VzKS4KLSAgICB2YXIgdmVyc2lv bk1hdGNoID0gLyBBcHBsZVdlYktpdFwvKFteIF0rKS8uZXhlYyhuYXZpZ2F0b3IudXNlckFnZW50 KTsKLSAgICBpZiAodmVyc2lvbk1hdGNoICYmIHZlcnNpb25NYXRjaFsxXS5pbmRleE9mKCIrIikg IT09IC0xICYmIGRvY3VtZW50LnN0eWxlU2hlZXRzLmxlbmd0aCA8IDEwKQotICAgICAgICBkb2N1 bWVudC5ib2R5LmNsYXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKLQogICAgIC8vIEFkZCBw bGF0Zm9ybSBzdHlsZSBjbGFzc2VzIHNvIHRoZSBVSSBjYW4gYmUgdHdlYWtlZCBwZXItcGxhdGZv cm0uCi0gICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtID0gewotICAgICAgICBuYW1lOiBJbnNwZWN0 b3JGcm9udGVuZEhvc3QucGxhdGZvcm0oKSwKLSAgICAgICAgY29kZU5hbWU6ICIiLAotICAgICAg ICB2ZXJzaW9uOiB7Ci0gICAgICAgICAgICBiYXNlOiAwLAotICAgICAgICAgICAgcmVsZWFzZTog MCwKLSAgICAgICAgICAgIHRvU3RyaW5nOiBmdW5jdGlvbigpCi0gICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgcmV0dXJuIHRoaXMuYmFzZSArICIuIiArIHRoaXMudmVyc2lvbjsKLSAgICAg ICAgICAgIH0KLSAgICAgICAgfSwKLSAgICAgICAgdG9TdHJpbmc6IGZ1bmN0aW9uKCkKLSAgICAg ICAgewotICAgICAgICAgICAgcmV0dXJuIHRoaXMubmFtZTsKLSAgICAgICAgfQotICAgIH07Ci0K LSAgICB2YXIgaXNMZWdhY3lNYWNPUyA9IGZhbHNlOwotICAgIHZhciBvc1ZlcnNpb25NYXRjaCA9 IC8gTWFjIE9TIFggKFxkKylfKFxkKykvLmV4ZWMobmF2aWdhdG9yLmFwcFZlcnNpb24pOwotICAg IGlmIChvc1ZlcnNpb25NYXRjaCAmJiBvc1ZlcnNpb25NYXRjaFsxXSA9PT0gIjEwIikgewotICAg ICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5iYXNlID0gMTA7Ci0gICAgICAgIHN3 aXRjaChvc1ZlcnNpb25NYXRjaFsyXSkgewotICAgICAgICAgICAgY2FzZSAiMTAiOgotICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5jb2RlTmFtZSA9ICJ5b3NlbWl0ZSI7Ci0g ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA9IDEw OwotICAgICAgICAgICAgICAgIGJyZWFrOwotICAgICAgICAgICAgY2FzZSAiOSI6Ci0gICAgICAg ICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLmNvZGVOYW1lID0gIm1hdmVyaWNrcyI7Ci0g ICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA9IDk7 Ci0gICAgICAgICAgICAgICAgaXNMZWdhY3lNYWNPUyA9IHRydWU7Ci0gICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICBjYXNlICI4IjoKLSAgICAgICAgICAgICAgICBXZWJJbnNwZWN0 b3IuUGxhdGZvcm0uY29kZU5hbWUgPSAibW91bnRhaW4tbGlvbiI7Ci0gICAgICAgICAgICAgICAg V2ViSW5zcGVjdG9yLlBsYXRmb3JtLnZlcnNpb24ucmVsZWFzZSA9IDg7Ci0gICAgICAgICAgICAg ICAgaXNMZWdhY3lNYWNPUyA9IHRydWU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBkb2N1bWVu dC5ib2R5LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLlBsYXRmb3JtICsgIi1wbGF0Zm9ybSIp OwotICAgIGlmIChXZWJJbnNwZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUpCi0gICAgICAgIGRvY3Vt ZW50LmJvZHkuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUGxhdGZvcm0uY29kZU5hbWUpOwot ICAgIGlmIChpc0xlZ2FjeU1hY09TKQorICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZChX ZWJJbnNwZWN0b3IuUGxhdGZvcm0ubmFtZSArICItcGxhdGZvcm0iKTsKKyAgICBpZiAoV2ViSW5z cGVjdG9yLlBsYXRmb3JtLmlzTmlnaHRseUJ1aWxkKQorICAgICAgICBkb2N1bWVudC5ib2R5LmNs YXNzTGlzdC5hZGQoIm5pZ2h0bHktYnVpbGQiKTsKKyAgICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRm b3JtLmlzTGVnYWN5TWFjT1MpCiAgICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZCgi bGVnYWN5Iik7CisgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUpCisg ICAgICAgIGRvY3VtZW50LmJvZHkuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuUGxhdGZvcm0u dmVyc2lvbi5uYW1lKTsKIAogICAgIHRoaXMuZGVidWdnYWJsZVR5cGUgPSBJbnNwZWN0b3JGcm9u dGVuZEhvc3QuZGVidWdnYWJsZVR5cGUoKSA9PT0gIndlYiIgPyBXZWJJbnNwZWN0b3IuRGVidWdn YWJsZVR5cGUuV2ViIDogV2ViSW5zcGVjdG9yLkRlYnVnZ2FibGVUeXBlLkphdmFTY3JpcHQ7CiAg ICAgZG9jdW1lbnQuYm9keS5jbGFzc0xpc3QuYWRkKHRoaXMuZGVidWdnYWJsZVR5cGUpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9QbGF0Zm9y bS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZvcm0u anMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZTdhODk2MgotLS0gL2Rldi9u dWxsCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvUGxhdGZv cm0uanMKQEAgLTAsMCArMSw2NCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMyBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBp biBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRp b24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMK KyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCBy ZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29u ZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRp b25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAq ICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlz Y2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFs cyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJ UyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJwor ICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJ TElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJ TUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAq IEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUws IEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNF UlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElO VEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZ LCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5D TFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9V VCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKK1dlYkluc3BlY3Rvci5QbGF0Zm9y bSA9IHsKKyAgICBuYW1lOiBJbnNwZWN0b3JGcm9udGVuZEhvc3QucGxhdGZvcm0oKSwKKyAgICBp c0xlZ2FjeU1hY09TOiBmYWxzZSwKKyAgICBpc05pZ2h0bHlCdWlsZDogZmFsc2UsCisgICAgdmVy c2lvbjogeworICAgICAgICBiYXNlOiAwLAorICAgICAgICByZWxlYXNlOiAwLAorICAgICAgICBu YW1lOiAiIgorICAgIH0KK307CisKKyhmdW5jdGlvbiAoKSB7CisgICAgLy8gQ2hlY2sgZm9yIGEg bmlnaHRseSBidWlsZCBieSBsb29raW5nIGZvciBhIHBsdXMgaW4gdGhlIHZlcnNpb24gbnVtYmVy IGFuZCBhIHNtYWxsIG51bWJlciBvZiBzdHlsZXNoZWV0cyAoaW5kaWNhdGluZyBjb21iaW5lZCBy ZXNvdXJjZXMpLgorICAgIHZhciB2ZXJzaW9uTWF0Y2ggPSAvIEFwcGxlV2ViS2l0XC8oW14gXSsp Ly5leGVjKG5hdmlnYXRvci51c2VyQWdlbnQpOworICAgIGlmICh2ZXJzaW9uTWF0Y2ggJiYgdmVy c2lvbk1hdGNoWzFdLmluZGV4T2YoIisiKSAhPT0gLTEgJiYgZG9jdW1lbnQuc3R5bGVTaGVldHMu bGVuZ3RoIDwgMTApCisgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5pc05pZ2h0bHlCdWls ZCA9IHRydWU7CisKKyAgICB2YXIgaXNMZWdhY3lNYWNPUyA9IGZhbHNlOworICAgIHZhciBvc1Zl cnNpb25NYXRjaCA9IC8gTWFjIE9TIFggKFxkKylfKFxkKykvLmV4ZWMobmF2aWdhdG9yLmFwcFZl cnNpb24pOworICAgIGlmIChvc1ZlcnNpb25NYXRjaCAmJiBvc1ZlcnNpb25NYXRjaFsxXSA9PT0g IjEwIikgeworICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5iYXNlID0gMTA7 CisgICAgICAgIHN3aXRjaChvc1ZlcnNpb25NYXRjaFsyXSkgeworICAgICAgICAgICAgY2FzZSAi MTAiOgorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5hbWUg PSAieW9zZW1pdGUiOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJz aW9uLnJlbGVhc2UgPSAxMDsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIGNh c2UgIjkiOgorICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLm5h bWUgPSAibWF2ZXJpY2tzIjsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0u dmVyc2lvbi5yZWxlYXNlID0gOTsKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZv cm0uaXNMZWdhY3lNYWNPUyA9IHRydWU7CisgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAg ICAgICBjYXNlICI4IjoKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVy c2lvbi5uYW1lID0gIm1vdW50YWluLWxpb24iOworICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rv ci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPSA4OworICAgICAgICAgICAgICAgIFdlYkluc3Bl Y3Rvci5QbGF0Zm9ybS5pc0xlZ2FjeU1hY09TID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBicmVh azsKKyAgICAgICAgfQorICAgIH0KK30pKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9NYWluLmh0bWwKaW5kZXggYzZmZTc4YS4uZWJhYzI2OCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbApAQCAtMTYxLDYgKzE2MSw3 IEBACiAgICAgPHNjcmlwdCBzcmM9IkV4dGVybmFsL0NvZGVNaXJyb3IveG1sLmpzIj48L3Njcmlw dD4KIAogICAgIDxzY3JpcHQgc3JjPSJCYXNlL1dlYkluc3BlY3Rvci5qcyI+PC9zY3JpcHQ+Cisg ICAgPHNjcmlwdCBzcmM9IkJhc2UvUGxhdGZvcm0uanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQg c3JjPSJCYXNlL09iamVjdC5qcyI+PC9zY3JpcHQ+CiAKICAgICA8c2NyaXB0IHNyYz0iQmFzZS9E T01VdGlsaXRpZXMuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwppbmRleCA4YjE1 ZWZlLi5jMWRjNzQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcwpAQCAtNTMsMTAgKzUzLDkgQEAg V2ViSW5zcGVjdG9yLkNvbnRlbnRCcm93c2VyID0gZnVuY3Rpb24oZWxlbWVudCwgZGVsZWdhdGUs IGRpc2FibGVCYWNrRm9yd2FyZCkKICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5QbGF0Zm9ybS5u YW1lID09PSAibWFjIiAmJiBXZWJJbnNwZWN0b3IuUGxhdGZvcm0udmVyc2lvbi5yZWxlYXNlIDwg MTApIHsKICAgICAgICAgICAgIGZvcndhcmRBcnJvdyA9IHtzcmM6ICJJbWFnZXMvRm9yd2FyZEFy cm93TGVnYWN5LnN2ZyIsIHdpZHRoOiA5LCBoZWlnaHQ6IDl9OwogICAgICAgICAgICAgYmFja0Fy cm93ID0ge3NyYzogIkltYWdlcy9CYWNrQXJyb3dMZWdhY3kuc3ZnIiwgd2lkdGg6IDksIGhlaWdo dDogOX07Ci0gICAgICAgIH0KLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICBmb3J3YXJkQXJy b3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvdy5zdmciLCB3aWR0aDogMTAsIGhlaWdodDog MTZ9OwotICAgICAgICAgICAgYmFja0Fycm93ID0ge3NyYzogIkltYWdlcy9CYWNrQXJyb3cuc3Zn Iiwgd2lkdGg6IDEwLCBoZWlnaHQ6IDE2fTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAg IGZvcndhcmRBcnJvdyA9IHtzcmM6ICJJbWFnZXMvRm9yd2FyZEFycm93LnN2ZyIsIHdpZHRoOiA4 LCBoZWlnaHQ6IDEzfTsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9IHtzcmM6ICJJbWFnZXMvQmFj a0Fycm93LnN2ZyIsIHdpZHRoOiA4LCBoZWlnaHQ6IDEzfTsKICAgICAgICAgfQogCiAgICAgICAg IHRoaXMuX2JhY2tCdXR0b25OYXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9u TmF2aWdhdGlvbkl0ZW0oImJhY2siLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkJhY2sgKCVzKSIp LmZvcm1hdCh0aGlzLl9iYWNrS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSksIGJhY2tBcnJv dy5zcmMsIGJhY2tBcnJvdy53aWR0aCwgYmFja0Fycm93LmhlaWdodCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GaW5kQmFubmVyLmNzcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3Nz CmluZGV4IDZhZDExZDUuLmFhNzdhOTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3NzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuY3NzCkBAIC0xMjAsNiArMTIw LDEwIEBACiAgICAgZGlzcGxheTogaW5saW5lLWJsb2NrOwogCiAgICAgd2lkdGg6IDdweDsKKyAg ICBoZWlnaHQ6IDExcHg7Cit9CisKK2JvZHkubWFjLXBsYXRmb3JtLmxlZ2FjeSAuZmluZC1iYW5u ZXIgPiBidXR0b24gPiAuZ2x5cGggewogICAgIGhlaWdodDogN3B4OwogfQogCkBAIC0xNTAsMTAg KzE1NCwxNCBAQAogCiAuZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLmxlZnQgPiAuZ2x5 cGggewogICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQtY2FudmFzKGZpbmQtYmFubmVyLXBy ZXZpb3VzLWFycm93LW5vcm1hbCk7Ci0gICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4OworICAg IGJhY2tncm91bmQtc2l6ZTogN3B4IDExcHg7CiAgICAgYmFja2dyb3VuZC1yZXBlYXQ6IG5vLXJl cGVhdDsKIH0KIAorYm9keS5tYWMtcGxhdGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRv bi5zZWdtZW50ZWQubGVmdCA+IC5nbHlwaCB7CisgICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4 OworfQorCiAuZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLmxlZnQ6YWN0aXZlOm5vdCg6 ZGlzYWJsZWQpID4gLmdseXBoIHsKICAgICBiYWNrZ3JvdW5kLWltYWdlOiAtd2Via2l0LWNhbnZh cyhmaW5kLWJhbm5lci1wcmV2aW91cy1hcnJvdy1ub3JtYWwtYWN0aXZlKTsKIH0KQEAgLTE3MCwx NiArMTc4LDI3IEBACiAKIC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQucmlnaHQgPiAu Z2x5cGggewogICAgIGJhY2tncm91bmQtaW1hZ2U6IC13ZWJraXQtY2FudmFzKGZpbmQtYmFubmVy LW5leHQtYXJyb3ctbm9ybWFsKTsKLSAgICBiYWNrZ3JvdW5kLXNpemU6IDdweCA3cHg7CisgICAg YmFja2dyb3VuZC1zaXplOiA3cHggMTFweDsKICAgICBiYWNrZ3JvdW5kLXJlcGVhdDogbm8tcmVw ZWF0OwogfQogCitib2R5Lm1hYy1wbGF0Zm9ybS5sZWdhY3kgLmZpbmQtYmFubmVyID4gYnV0dG9u LnNlZ21lbnRlZC5yaWdodCA+IC5nbHlwaCB7CisgICAgYmFja2dyb3VuZC1zaXplOiA3cHggN3B4 OworfQorCiAuZmluZC1iYW5uZXIgPiBidXR0b24uc2VnbWVudGVkLnJpZ2h0OmFjdGl2ZTpub3Qo OmRpc2FibGVkKSA+IC5nbHlwaCB7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1jYW52 YXMoZmluZC1iYW5uZXItbmV4dC1hcnJvdy1ub3JtYWwtYWN0aXZlKTsKIH0KIAogLmZpbmQtYmFu bmVyID4gYnV0dG9uLnNlZ21lbnRlZCB7CiAgICAgbWluLXdpZHRoOiAyMnB4OworICAgIHBhZGRp bmctdG9wOiAzcHg7CisgICAgcGFkZGluZy1ib3R0b206IDJweDsKK30KKworYm9keS5tYWMtcGxh dGZvcm0ubGVnYWN5IC5maW5kLWJhbm5lciA+IGJ1dHRvbi5zZWdtZW50ZWQgeworICAgIHBhZGRp bmctdG9wOiAycHg7CisgICAgcGFkZGluZy1ib3R0b206IDNweDsKIH0KIAogLmZpbmQtYmFubmVy ID4gYnV0dG9uLnNlZ21lbnRlZDphY3RpdmUgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRmluZEJhbm5lci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ZpbmRCYW5uZXIuanMKaW5kZXggZGEzZjI5YS4u OTc1ZjdmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvRmluZEJhbm5lci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9GaW5kQmFubmVyLmpzCkBAIC0zMjgsMTUgKzMyOCwxNSBAQCBXZWJJbnNwZWN0 b3IuRmluZEJhbm5lci5wcm90b3R5cGUgPSB7CiAKICAgICAgICAgdmFyIGZvcndhcmRBcnJvdywg YmFja0Fycm93OwogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLlBsYXRmb3JtLm5hbWUgPT09ICJt YWMiICYmIFdlYkluc3BlY3Rvci5QbGF0Zm9ybS52ZXJzaW9uLnJlbGVhc2UgPCAxMCkgewotICAg ICAgICAgICAgZm9yd2FyZEFycm93ID0gIkltYWdlcy9Gb3J3YXJkQXJyb3dMZWdhY3kuc3ZnIjsK LSAgICAgICAgICAgIGJhY2tBcnJvdyA9ICJJbWFnZXMvQmFja0Fycm93TGVnYWN5LnN2ZyI7Cisg ICAgICAgICAgICBmb3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRBcnJvd0xlZ2Fj eS5zdmciLCB3aWR0aDogNywgaGVpZ2h0OiA3fTsKKyAgICAgICAgICAgIGJhY2tBcnJvdyA9IHtz cmM6ICJJbWFnZXMvQmFja0Fycm93TGVnYWN5LnN2ZyIsIHdpZHRoOiA3LCBoZWlnaHQ6IDd9Owog ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgZm9yd2FyZEFycm93ID0gIkltYWdlcy9Gb3J3 YXJkQXJyb3cuc3ZnIjsKLSAgICAgICAgICAgIGJhY2tBcnJvdyA9ICJJbWFnZXMvQmFja0Fycm93 LnN2ZyI7CisgICAgICAgICAgICBmb3J3YXJkQXJyb3cgPSB7c3JjOiAiSW1hZ2VzL0ZvcndhcmRB cnJvdy5zdmciLCB3aWR0aDogNywgaGVpZ2h0OiAxMX07CisgICAgICAgICAgICBiYWNrQXJyb3cg PSB7c3JjOiAiSW1hZ2VzL0JhY2tBcnJvdy5zdmciLCB3aWR0aDogNywgaGVpZ2h0OiAxMX07CiAg ICAgICAgIH0KIAotICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1MoYmFja0Fycm93 LCBzcGVjaWZpY2F0aW9ucywgNywgNywgImZpbmQtYmFubmVyLXByZXZpb3VzLWFycm93LSIpOwot ICAgICAgICBnZW5lcmF0ZUNvbG9yZWRJbWFnZXNGb3JDU1MoZm9yd2FyZEFycm93LCBzcGVjaWZp Y2F0aW9ucywgNywgNywgImZpbmQtYmFubmVyLW5leHQtYXJyb3ctIik7CisgICAgICAgIGdlbmVy YXRlQ29sb3JlZEltYWdlc0ZvckNTUyhiYWNrQXJyb3cuc3JjLCBzcGVjaWZpY2F0aW9ucywgYmFj a0Fycm93LndpZHRoLCBiYWNrQXJyb3cuaGVpZ2h0LCAiZmluZC1iYW5uZXItcHJldmlvdXMtYXJy b3ctIik7CisgICAgICAgIGdlbmVyYXRlQ29sb3JlZEltYWdlc0ZvckNTUyhmb3J3YXJkQXJyb3cu c3JjLCBzcGVjaWZpY2F0aW9ucywgZm9yd2FyZEFycm93LndpZHRoLCBmb3J3YXJkQXJyb3cuaGVp Z2h0LCAiZmluZC1iYW5uZXItbmV4dC1hcnJvdy0iKTsKICAgICB9CiB9OwogCg==