106617 2013-01-10 16:38:04 -0800 Setting width overrides intrinsic min-width/max-width on flexboxes and their subclasses 2013-01-11 18:22:51 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 106143 106675 1 ojan ojan eae eric esprehn hyatt leviw mifenton ojan.autocc tkent tony webkit.review.bot oldest_to_newest 804816 0 ojan 2013-01-10 16:38:04 -0800 Setting width overrides intrinsic min-width/max-width on flexboxes and their subclasses 804820 1 182225 ojan 2013-01-10 16:41:48 -0800 Created attachment 182225 Patch 805591 2 182225 tony 2013-01-11 13:56:25 -0800 Comment on attachment 182225 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=182225&action=review > Source/WebCore/ChangeLog:9 > + classes that override computePrefferedLogicalWidths so that RenderBox can use Preffered -> Preferred > Source/WebCore/rendering/RenderBox.cpp:2064 > + if (logicalWidth.type() == FillAvailable) > + return logicalWidthResult; > + > + if (widthType == MainOrPreferredSize && sizesLogicalWidthToFitContent(widthType)) I see, you're saying that sizesLogicalWidthToFitContent doesn't make sense for min-width or max-width, right? I would probably have kept the != FillAvailable in the same condition, but this seems OK too. 805805 3 ojan 2013-01-11 18:22:51 -0800 Committed r139535: <http://trac.webkit.org/changeset/139535> 182225 2013-01-10 16:41:48 -0800 2013-01-11 13:56:23 -0800 Patch bug-106617-20130110163851.patch text/plain 30155 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5MzcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGIwN2M2NjRlNGM2OGQx ZDc1ZGUzODgwZmM1MTgxYjgwOWIyZDNjZC4uNGFhZDA4ZWVmOTYxODdmNzM0ZWQzOTNiNjBmMDM1 Mzk2ZjRhY2JlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUyIEBACisyMDEzLTAxLTEwICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgU2V0dGluZyB3aWR0aCBvdmVy cmlkZXMgaW50cmluc2ljIG1pbi13aWR0aC9tYXgtd2lkdGggb24gZmxleGJveGVzIGFuZCB0aGVp ciBzdWJjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMDY2MTcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBPdmVycmlkZSBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyBmb3IgYWxsIFJlbmRl ckZsZXhpYmxlQm94IGFuZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gKKyAgICAgICAgY2xh c3NlcyB0aGF0IG92ZXJyaWRlIGNvbXB1dGVQcmVmZmVyZWRMb2dpY2FsV2lkdGhzIHNvIHRoYXQg UmVuZGVyQm94IGNhbiB1c2UKKyAgICAgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMg aW4gb3JkZXIgdG8gZ2V0IHRoZSBjb3JyZWN0IGludHJpbnNpYyB2YWx1ZXMuCisKKyAgICAgICAg VGVzdHM6IGNzczMvZmxleGJveC9pbnRyaW5zaWMtbWluLXdpZHRoLWFwcGxpZXMtd2l0aC1maXhl ZC13aWR0aC5odG1sCisgICAgICAgICAgICAgICBmYXN0L2ZsZXhib3gvaW50cmluc2ljLW1pbi13 aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lkdGguaHRtbAorICAgICAgICAgICAgICAgZmFzdC9m b3Jtcy9zZWxlY3QvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lkdGgu aHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJveC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKToKKyAgICAg ICAgZml0LWNvbnRlbnQgbmVlZHMgdG8gdXNlIHRoZSBpbnRyaW5zaWMgc2l6ZXMgbm90IHRoZSBw cmVmZXJyZWQgc2l6ZXMKKyAgICAgICAgc2luY2UgYSBmaXhlZCB3aWR0aCBvdmVycmlkZXMgdGhl IHByZWZlcnJlZCBzaXplLgorICAgICAgICBBcyBiZXN0IEkgY2FuIHRlbGwsIHRoZSBzaXplc0xv Z2ljYWxXaWR0aFRvRml0Q29udGVudCBjb2RlcGF0aCBjYW4ga2VlcAorICAgICAgICB1c2luZyBw cmVmZXJyZWQgd2lkdGhzLCB3aGljaCBhcmUgY29uc2lkZXJhYmx5IGZhc3Rlciwgc2luY2UgdGhh dCdzIG9ubHkgdXNlZAorICAgICAgICBjb21wdXRpbmcgd2lkdGggdmFsdWVzLiBBZGRlZCBhIGNs YXVzZSB0byB0aGF0IGlmLXN0YXRlbWVudCB0byBtYWtlIHRoaXMgbW9yZQorICAgICAgICBleHBs aWNpdC4KKworICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94Ojpjb21w dXRlSW50cmluc2ljTG9naWNhbFdpZHRocyk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJEZXBy ZWNhdGVkRmxleGlibGVCb3g6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKToKKyAgICAg ICAgKiByZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94Lmg6CisgICAgICAgIChS ZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3gpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJG bGV4aWJsZUJveC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29t cHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0 aHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJN ZW51TGlzdDo6Y29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0aHMpOgorICAgICAgICAoV2ViQ29y ZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJNZW51TGlzdDo6Y29tcHV0ZVByZWZlcnJlZExv Z2ljYWxXaWR0aHMpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5oOgorICAg ICAgICAoUmVuZGVyTWVudUxpc3QpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJTbGlkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyU2xpZGVyOjpjb21wdXRlSW50cmluc2ljTG9n aWNhbFdpZHRocyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl clNsaWRlcjo6Y29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMpOgorICAgICAgICAqIHJlbmRl cmluZy9SZW5kZXJTbGlkZXIuaDoKKyAgICAgICAgKFJlbmRlclNsaWRlcik6CisgICAgICAgIE5v IGxvZ2ljIGNoYW5nZXMgaW4gYW55IG9mIHRoZXNlIGNvbXB1dGVJbnRyaW5zaWMgbWV0aG9kcy4g SnVzdCBtb3ZpbmcKKyAgICAgICAgdGhlIGNvZGUgb3ZlciBmcm9tIHRoZSBjb21wdXRlUHJlZmVy cmVkIG1ldGhvZHMuCisKIDIwMTMtMDEtMTAgIFlvbmcgTGkgIDx5b2xpQHJpbS5jb20+CiAKICAg ICAgICAgSFRNTE1lZGlhRWxlbWVudDo6cmVzdW1lKCkgc2hvdWxkIHNjaGVkdWxlIGEgbG9hZCBy YXRoZXIgdGhhbiBsb2FkIGltbWVkaWF0ZWx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyQm94LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guY3BwCmluZGV4IDNlODEwZmU1NDhmZjBkOTgxOWI0NjQ4YmFiNjQ0YTY4ZDk2MzZhOGUuLmZk NmY0NGE3OTcwNmZmZjhhYjRlN2MyM2E4ZjE4NDNkYjJhNGU2MzQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJCb3guY3BwCkBAIC0yMDQ5LDcgKzIwNDksMTkgQEAgTGF5b3V0VW5pdCBS ZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsV2lkdGhJblJlZ2lvblVzaW5nKFNpemVUeXBlIHdpZHRo VHlwZSwgTGF5b3UKICAgICBpZiAoc2hyaW5rVG9Bdm9pZEZsb2F0cygpICYmIGNiLT5jb250YWlu c0Zsb2F0cygpKQogICAgICAgICBsb2dpY2FsV2lkdGhSZXN1bHQgPSBtaW4obG9naWNhbFdpZHRo UmVzdWx0LCBzaHJpbmtMb2dpY2FsV2lkdGhUb0F2b2lkRmxvYXRzKG1hcmdpblN0YXJ0LCBtYXJn aW5FbmQsIGNiLCByZWdpb24sIG9mZnNldEZyb21Mb2dpY2FsVG9wT2ZGaXJzdFBhZ2UpKTsKIAot ICAgIGlmIChsb2dpY2FsV2lkdGgudHlwZSgpID09IEZpdENvbnRlbnQgfHwgKGxvZ2ljYWxXaWR0 aC50eXBlKCkgIT0gRmlsbEF2YWlsYWJsZSAmJiBzaXplc0xvZ2ljYWxXaWR0aFRvRml0Q29udGVu dCh3aWR0aFR5cGUpKSkKKyAgICBpZiAobG9naWNhbFdpZHRoLnR5cGUoKSA9PSBGaXRDb250ZW50 KSB7CisgICAgICAgIExheW91dFVuaXQgbWluTG9naWNhbFdpZHRoID0gMDsKKyAgICAgICAgTGF5 b3V0VW5pdCBtYXhMb2dpY2FsV2lkdGggPSAwOworICAgICAgICBjb21wdXRlSW50cmluc2ljTG9n aWNhbFdpZHRocyhtaW5Mb2dpY2FsV2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CisgICAgICAgIG1p bkxvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CisgICAgICAg IG1heExvZ2ljYWxXaWR0aCArPSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbFdpZHRoKCk7CisgICAg ICAgIHJldHVybiBtYXgobWluTG9naWNhbFdpZHRoLCBtaW4obWF4TG9naWNhbFdpZHRoLCBsb2dp Y2FsV2lkdGhSZXN1bHQpKTsKKyAgICB9CisKKyAgICBpZiAobG9naWNhbFdpZHRoLnR5cGUoKSA9 PSBGaWxsQXZhaWxhYmxlKQorICAgICAgICByZXR1cm4gbG9naWNhbFdpZHRoUmVzdWx0OworCisg ICAgaWYgKHdpZHRoVHlwZSA9PSBNYWluT3JQcmVmZXJyZWRTaXplICYmIHNpemVzTG9naWNhbFdp ZHRoVG9GaXRDb250ZW50KHdpZHRoVHlwZSkpCiAgICAgICAgIHJldHVybiBtYXgobWluUHJlZmVy cmVkTG9naWNhbFdpZHRoKCksIG1pbihtYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgoKSwgbG9naWNh bFdpZHRoUmVzdWx0KSk7CiAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aFJlc3VsdDsKIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJs ZUJveC5jcHAKaW5kZXggZmJmOWMxYTQxNTJhYjcwMTRkM2QxNDk2YTJlMDBlNWI5Nzg5Yjg4Mi4u MWIzNTI3NDJkNDVmZGNkZjE0OTU0ZTMwNzEzY2UxNzc5MjJiZDZjYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5j cHAKQEAgLTE3NCw1MyArMTc0LDQ3IEBAIHZvaWQgUmVuZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94 OjpzdHlsZVdpbGxDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYsIGNvbnN0IFJlCiAgICAgUmVu ZGVyQmxvY2s6OnN0eWxlV2lsbENoYW5nZShkaWZmLCBuZXdTdHlsZSk7CiB9CiAKLXZvaWQgUmVu ZGVyRGVwcmVjYXRlZEZsZXhpYmxlQm94OjpjYWxjSG9yaXpvbnRhbFByZWZXaWR0aHMoKQordm9p ZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVCb3g6OmNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lk dGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdp ZHRoKSBjb25zdAogewotICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGZpcnN0Q2hpbGRCb3go KTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nQm94KCkpIHsKLSAgICAgICAgaWYg KGNoaWxkRG9lc05vdEFmZmVjdFdpZHRoT3JGbGV4aW5nKGNoaWxkKSkKLSAgICAgICAgICAgIGNv bnRpbnVlOworICAgIGlmIChoYXNNdWx0aXBsZUxpbmVzKCkgfHwgaXNWZXJ0aWNhbCgpKSB7Cisg ICAgICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGZpcnN0Q2hpbGRCb3goKTsgY2hpbGQ7IGNo aWxkID0gY2hpbGQtPm5leHRTaWJsaW5nQm94KCkpIHsKKyAgICAgICAgICAgIGlmIChjaGlsZERv ZXNOb3RBZmZlY3RXaWR0aE9yRmxleGluZyhjaGlsZCkpCisgICAgICAgICAgICAgICAgY29udGlu dWU7CiAKLSAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBtYXJnaW5XaWR0aEZvckNoaWxkKGNo aWxkKTsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gY2hpbGQtPm1pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCgpICsgbWFyZ2luOwotICAgICAgICBtX21heFByZWZlcnJlZExv Z2ljYWxXaWR0aCArPSBjaGlsZC0+bWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgKyBtYXJnaW47 Ci0gICAgfQotfQorICAgICAgICAgICAgTGF5b3V0VW5pdCBtYXJnaW4gPSBtYXJnaW5XaWR0aEZv ckNoaWxkKGNoaWxkKTsKKyAgICAgICAgICAgIExheW91dFVuaXQgd2lkdGggPSBjaGlsZC0+bWlu UHJlZmVycmVkTG9naWNhbFdpZHRoKCkgKyBtYXJnaW47CisgICAgICAgICAgICBtaW5Mb2dpY2Fs V2lkdGggPSBtYXgod2lkdGgsIG1pbkxvZ2ljYWxXaWR0aCk7CiAKLXZvaWQgUmVuZGVyRGVwcmVj YXRlZEZsZXhpYmxlQm94OjpjYWxjVmVydGljYWxQcmVmV2lkdGhzKCkKLXsKLSAgICBmb3IgKFJl bmRlckJveCogY2hpbGQgPSBmaXJzdENoaWxkQm94KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5u ZXh0U2libGluZ0JveCgpKSB7Ci0gICAgICAgIGlmIChjaGlsZERvZXNOb3RBZmZlY3RXaWR0aE9y RmxleGluZyhjaGlsZCkpCi0gICAgICAgICAgICBjb250aW51ZTsKLQotICAgICAgICBMYXlvdXRV bml0IG1hcmdpbiA9IG1hcmdpbldpZHRoRm9yQ2hpbGQoY2hpbGQpOwotICAgICAgICBMYXlvdXRV bml0IHdpZHRoID0gY2hpbGQtPm1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCgpICsgbWFyZ2luOwot ICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heCh3aWR0aCwgbV9taW5QcmVm ZXJyZWRMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgd2lkdGggPSBjaGlsZC0+bWF4UHJlZmVy cmVkTG9naWNhbFdpZHRoKCkgKyBtYXJnaW47CisgICAgICAgICAgICBtYXhMb2dpY2FsV2lkdGgg PSBtYXgod2lkdGgsIG1heExvZ2ljYWxXaWR0aCk7CisgICAgICAgIH0KKyAgICB9IGVsc2Ugewor ICAgICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBmaXJzdENoaWxkQm94KCk7IGNoaWxkOyBj aGlsZCA9IGNoaWxkLT5uZXh0U2libGluZ0JveCgpKSB7CisgICAgICAgICAgICBpZiAoY2hpbGRE b2VzTm90QWZmZWN0V2lkdGhPckZsZXhpbmcoY2hpbGQpKQorICAgICAgICAgICAgICAgIGNvbnRp bnVlOwogCi0gICAgICAgIHdpZHRoID0gY2hpbGQtPm1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCgp ICsgbWFyZ2luOwotICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heCh3aWR0 aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgTGF5b3V0VW5pdCBt YXJnaW4gPSBtYXJnaW5XaWR0aEZvckNoaWxkKGNoaWxkKTsKKyAgICAgICAgICAgIG1pbkxvZ2lj YWxXaWR0aCArPSBjaGlsZC0+bWluUHJlZmVycmVkTG9naWNhbFdpZHRoKCkgKyBtYXJnaW47Cisg ICAgICAgICAgICBtYXhMb2dpY2FsV2lkdGggKz0gY2hpbGQtPm1heFByZWZlcnJlZExvZ2ljYWxX aWR0aCgpICsgbWFyZ2luOworICAgICAgICB9CiAgICAgfQorCisgICAgbWF4TG9naWNhbFdpZHRo ID0gbWF4KG1pbkxvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKworICAgIExheW91dFVu aXQgc2Nyb2xsYmFyV2lkdGggPSBpbnN0cmluc2ljU2Nyb2xsYmFyTG9naWNhbFdpZHRoKCk7Cisg ICAgbWF4TG9naWNhbFdpZHRoICs9IHNjcm9sbGJhcldpZHRoOworICAgIG1pbkxvZ2ljYWxXaWR0 aCArPSBzY3JvbGxiYXJXaWR0aDsKIH0KIAogdm9pZCBSZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3g6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKIHsKICAgICBBU1NFUlQocHJlZmVy cmVkTG9naWNhbFdpZHRoc0RpcnR5KCkpOwogCisgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lk dGggPSBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IDA7CiAgICAgaWYgKHN0eWxlKCktPndp ZHRoKCkuaXNGaXhlZCgpICYmIHN0eWxlKCktPndpZHRoKCkudmFsdWUoKSA+IDApCiAgICAgICAg IG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgg PSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlKCktPndpZHRo KCkudmFsdWUoKSk7Ci0gICAgZWxzZSB7Ci0gICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdp ZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSAwOwotCi0gICAgICAgIGlmIChoYXNN dWx0aXBsZUxpbmVzKCkgfHwgaXNWZXJ0aWNhbCgpKQotICAgICAgICAgICAgY2FsY1ZlcnRpY2Fs UHJlZldpZHRocygpOwotICAgICAgICBlbHNlCi0gICAgICAgICAgICBjYWxjSG9yaXpvbnRhbFBy ZWZXaWR0aHMoKTsKLQotICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heCht X21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgpOwot Ci0gICAgICAgIExheW91dFVuaXQgc2Nyb2xsYmFyV2lkdGggPSBpbnN0cmluc2ljU2Nyb2xsYmFy TG9naWNhbFdpZHRoKCk7Ci0gICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoICs9IHNj cm9sbGJhcldpZHRoOwotICAgICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSBzY3Jv bGxiYXJXaWR0aDsKLSAgICB9CisgICAgZWxzZQorICAgICAgICBjb21wdXRlSW50cmluc2ljTG9n aWNhbFdpZHRocyhtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgbV9tYXhQcmVmZXJyZWRMb2dp Y2FsV2lkdGgpOwogCiAgICAgaWYgKHN0eWxlKCktPm1pbldpZHRoKCkuaXNGaXhlZCgpICYmIHN0 eWxlKCktPm1pbldpZHRoKCkudmFsdWUoKSA+IDApIHsKICAgICAgICAgbV9tYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGggPSBtYXgobV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGgsIGFkanVzdENvbnRl bnRCb3hMb2dpY2FsV2lkdGhGb3JCb3hTaXppbmcoc3R5bGUoKS0+bWluV2lkdGgoKS52YWx1ZSgp KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRl ZEZsZXhpYmxlQm94LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRGVwcmVjYXRl ZEZsZXhpYmxlQm94LmgKaW5kZXggODUxZmJlNDY0ZGU1OTJmYzZjM2YxMzcwMjAwNTMxODg1OTc2 YjBmMC4uN2M0MTA4NGZiMWRmZjY5ZTQyMWYzNDk5ZGE3OTM4ZTczNTczOWM0ZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckRlcHJlY2F0ZWRGbGV4aWJsZUJveC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJEZXByZWNhdGVkRmxleGlibGVC b3guaApAQCAtMzYsMTAgKzM2LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBjb25zdCBjaGFy KiByZW5kZXJOYW1lKCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZVByZWZlcnJl ZExvZ2ljYWxXaWR0aHMoKTsKLSAgICB2b2lkIGNhbGNIb3Jpem9udGFsUHJlZldpZHRocygpOwot ICAgIHZvaWQgY2FsY1ZlcnRpY2FsUHJlZldpZHRocygpOwotCiAgICAgdmlydHVhbCB2b2lkIHN0 eWxlV2lsbENoYW5nZShTdHlsZURpZmZlcmVuY2UsIGNvbnN0IFJlbmRlclN0eWxlKiBuZXdTdHls ZSkgT1ZFUlJJREU7CiAKICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0QmxvY2soYm9vbCByZWxheW91 dENoaWxkcmVuLCBMYXlvdXRVbml0IHBhZ2VIZWlnaHQgPSAwKTsKQEAgLTU0LDYgKzUwLDkgQEAg cHVibGljOgogICAgIHZvaWQgcGxhY2VDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBjb25zdCBMYXlv dXRQb2ludCYgbG9jYXRpb24pOwogCiBwcm90ZWN0ZWQ6CisgICAgdmlydHVhbCB2b2lkIGNvbXB1 dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5 b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdCBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZv aWQgY29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKSBPVkVSUklERTsKKwogICAgIExheW91 dFVuaXQgYWxsb3dlZENoaWxkRmxleChSZW5kZXJCb3gqIGNoaWxkLCBib29sIGV4cGFuZGluZywg dW5zaWduZWQgZ3JvdXApOwogCiAgICAgYm9vbCBoYXNNdWx0aXBsZUxpbmVzKCkgY29uc3QgeyBy ZXR1cm4gc3R5bGUoKS0+Ym94TGluZXMoKSA9PSBNVUxUSVBMRTsgfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggZWFiYmExMWI1YmVkODZl YTE1N2Y5YWIzNjQ4Y2YzMjJhM2M3MGM5ZC4uOWUyMTQ0ZTg3YjgzZGYxOGQ0ZTJiOTBlMmYzNWNl MWJkOGI0NGI2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZs ZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGli bGVCb3guY3BwCkBAIC0xNTUsNTEgKzE1NSw1NCBAQCBzdGF0aWMgTGF5b3V0VW5pdCBtYXJnaW5M b2dpY2FsV2lkdGhGb3JDaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBSZW5kZXJTdHlsZSogcGFyZQog ICAgIHJldHVybiBtYXJnaW47CiB9CiAKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVJ bnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0 VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdAoreworICAgIGZvciAoUmVuZGVyQm94KiBjaGls ZCA9IGZpcnN0Q2hpbGRCb3goKTsgY2hpbGQ7IGNoaWxkID0gY2hpbGQtPm5leHRTaWJsaW5nQm94 KCkpIHsKKyAgICAgICAgaWYgKGNoaWxkLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkKKyAgICAg ICAgICAgIGNvbnRpbnVlOworCisgICAgICAgIExheW91dFVuaXQgbWFyZ2luID0gbWFyZ2luTG9n aWNhbFdpZHRoRm9yQ2hpbGQoY2hpbGQsIHN0eWxlKCkpOworICAgICAgICBib29sIGhhc09ydGhv Z29uYWxXcml0aW5nTW9kZSA9IGNoaWxkLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpICE9IGlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCk7CisgICAgICAgIExheW91dFVuaXQgbWluUHJlZmVycmVk TG9naWNhbFdpZHRoID0gaGFzT3J0aG9nb25hbFdyaXRpbmdNb2RlID8gY2hpbGQtPmxvZ2ljYWxI ZWlnaHQoKSA6IGNoaWxkLT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKKyAgICAgICAgTGF5 b3V0VW5pdCBtYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBoYXNPcnRob2dvbmFsV3JpdGluZ01v ZGUgPyBjaGlsZC0+bG9naWNhbEhlaWdodCgpIDogY2hpbGQtPm1heFByZWZlcnJlZExvZ2ljYWxX aWR0aCgpOworICAgICAgICBtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gbWFyZ2luOworICAg ICAgICBtYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gbWFyZ2luOworICAgICAgICBpZiAoIWlz Q29sdW1uRmxvdygpKSB7CisgICAgICAgICAgICBtYXhMb2dpY2FsV2lkdGggKz0gbWF4UHJlZmVy cmVkTG9naWNhbFdpZHRoOworICAgICAgICAgICAgaWYgKGlzTXVsdGlsaW5lKCkpIHsKKyAgICAg ICAgICAgICAgICAvLyBGb3IgbXVsdGlsaW5lLCB0aGUgbWluIHByZWZlcnJlZCB3aWR0aCBpcyBp ZiB5b3UgcHV0IGEgYnJlYWsgYmV0d2VlbiBlYWNoIGl0ZW0uCisgICAgICAgICAgICAgICAgbWlu TG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCk7CisgICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAg ICBtaW5Mb2dpY2FsV2lkdGggKz0gbWluUHJlZmVycmVkTG9naWNhbFdpZHRoOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgbWluTG9naWNhbFdpZHRoID0gc3RkOjptYXgobWluUHJlZmVy cmVkTG9naWNhbFdpZHRoLCBtaW5Mb2dpY2FsV2lkdGgpOworICAgICAgICAgICAgaWYgKGlzTXVs dGlsaW5lKCkpIHsKKyAgICAgICAgICAgICAgICAvLyBGb3IgbXVsdGlsaW5lLCB0aGUgbWF4IHBy ZWZlcnJlZCB3aWR0aCBpcyBpZiB5b3UgcHV0IGEgYnJlYWsgYmV0d2VlbiBlYWNoIGl0ZW0uCisg ICAgICAgICAgICAgICAgbWF4TG9naWNhbFdpZHRoICs9IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0 aDsKKyAgICAgICAgICAgIH0gZWxzZQorICAgICAgICAgICAgICAgIG1heExvZ2ljYWxXaWR0aCA9 IHN0ZDo6bWF4KG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKyAg ICAgICAgfQorICAgIH0KKworICAgIG1heExvZ2ljYWxXaWR0aCA9IHN0ZDo6bWF4KG1pbkxvZ2lj YWxXaWR0aCwgbWF4TG9naWNhbFdpZHRoKTsKKworICAgIExheW91dFVuaXQgc2Nyb2xsYmFyV2lk dGggPSBpbnN0cmluc2ljU2Nyb2xsYmFyTG9naWNhbFdpZHRoKCk7CisgICAgbWF4TG9naWNhbFdp ZHRoICs9IHNjcm9sbGJhcldpZHRoOworICAgIG1pbkxvZ2ljYWxXaWR0aCArPSBzY3JvbGxiYXJX aWR0aDsKK30KKwogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZVByZWZlcnJlZExvZ2lj YWxXaWR0aHMoKQogewogICAgIEFTU0VSVChwcmVmZXJyZWRMb2dpY2FsV2lkdGhzRGlydHkoKSk7 CiAKKyAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNh bFdpZHRoID0gMDsKKwogICAgIFJlbmRlclN0eWxlKiBzdHlsZVRvVXNlID0gc3R5bGUoKTsKICAg ICAvLyBGSVhNRTogVGhpcyBzaG91bGQgcHJvYmFibHkgYmUgY2hlY2tpbmcgZm9yIGlzU3BlY2lm aWVkIHNpbmNlIHlvdSBzaG91bGQgYmUgYWJsZSB0byB1c2UgcGVyY2VudGFnZSwgY2FsYyBvciB2 aWV3cG9ydCByZWxhdGl2ZSB2YWx1ZXMgZm9yIHdpZHRoLgogICAgIGlmIChzdHlsZVRvVXNlLT5s b2dpY2FsV2lkdGgoKS5pc0ZpeGVkKCkgJiYgc3R5bGVUb1VzZS0+bG9naWNhbFdpZHRoKCkudmFs dWUoKSA+IDApCiAgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVm ZXJyZWRMb2dpY2FsV2lkdGggPSBhZGp1c3RDb250ZW50Qm94TG9naWNhbFdpZHRoRm9yQm94U2l6 aW5nKHN0eWxlVG9Vc2UtPmxvZ2ljYWxXaWR0aCgpLnZhbHVlKCkpOwotICAgIGVsc2UgewotICAg ICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNhbFdp ZHRoID0gMDsKLQotICAgICAgICBmb3IgKFJlbmRlckJveCogY2hpbGQgPSBmaXJzdENoaWxkQm94 KCk7IGNoaWxkOyBjaGlsZCA9IGNoaWxkLT5uZXh0U2libGluZ0JveCgpKSB7Ci0gICAgICAgICAg ICBpZiAoY2hpbGQtPmlzT3V0T2ZGbG93UG9zaXRpb25lZCgpKQotICAgICAgICAgICAgICAgIGNv bnRpbnVlOwotCi0gICAgICAgICAgICBMYXlvdXRVbml0IG1hcmdpbiA9IG1hcmdpbkxvZ2ljYWxX aWR0aEZvckNoaWxkKGNoaWxkLCBzdHlsZSgpKTsKLSAgICAgICAgICAgIGJvb2wgaGFzT3J0aG9n b25hbFdyaXRpbmdNb2RlID0gY2hpbGQtPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgIT0gaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKTsKLSAgICAgICAgICAgIExheW91dFVuaXQgbWluUHJlZmVy cmVkTG9naWNhbFdpZHRoID0gaGFzT3J0aG9nb25hbFdyaXRpbmdNb2RlID8gY2hpbGQtPmxvZ2lj YWxIZWlnaHQoKSA6IGNoaWxkLT5taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgoKTsKLSAgICAgICAg ICAgIExheW91dFVuaXQgbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gaGFzT3J0aG9nb25hbFdy aXRpbmdNb2RlID8gY2hpbGQtPmxvZ2ljYWxIZWlnaHQoKSA6IGNoaWxkLT5tYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGgoKTsKLSAgICAgICAgICAgIG1pblByZWZlcnJlZExvZ2ljYWxXaWR0aCArPSBt YXJnaW47Ci0gICAgICAgICAgICBtYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0gbWFyZ2luOwot ICAgICAgICAgICAgaWYgKCFpc0NvbHVtbkZsb3coKSkgewotICAgICAgICAgICAgICAgIG1fbWF4 UHJlZmVycmVkTG9naWNhbFdpZHRoICs9IG1heFByZWZlcnJlZExvZ2ljYWxXaWR0aDsKLSAgICAg ICAgICAgICAgICBpZiAoaXNNdWx0aWxpbmUoKSkgewotICAgICAgICAgICAgICAgICAgICAvLyBG b3IgbXVsdGlsaW5lLCB0aGUgbWluIHByZWZlcnJlZCB3aWR0aCBpcyBpZiB5b3UgcHV0IGEgYnJl YWsgYmV0d2VlbiBlYWNoIGl0ZW0uCi0gICAgICAgICAgICAgICAgICAgIG1fbWluUHJlZmVycmVk TG9naWNhbFdpZHRoID0gc3RkOjptYXgobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1pblBy ZWZlcnJlZExvZ2ljYWxXaWR0aCk7Ci0gICAgICAgICAgICAgICAgfSBlbHNlCi0gICAgICAgICAg ICAgICAgICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoICs9IG1pblByZWZlcnJlZExvZ2lj YWxXaWR0aDsKLSAgICAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICAgICAgbV9taW5QcmVm ZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1heChtaW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1f bWluUHJlZmVycmVkTG9naWNhbFdpZHRoKTsKLSAgICAgICAgICAgICAgICBpZiAoaXNNdWx0aWxp bmUoKSkgewotICAgICAgICAgICAgICAgICAgICAvLyBGb3IgbXVsdGlsaW5lLCB0aGUgbWF4IHBy ZWZlcnJlZCB3aWR0aCBpcyBpZiB5b3UgcHV0IGEgYnJlYWsgYmV0d2VlbiBlYWNoIGl0ZW0uCi0g ICAgICAgICAgICAgICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoICs9IG1heFByZWZl cnJlZExvZ2ljYWxXaWR0aDsKLSAgICAgICAgICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgICAg ICAgICAgbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lkdGggPSBzdGQ6Om1heChtYXhQcmVmZXJyZWRM b2dpY2FsV2lkdGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoKTsKLSAgICAgICAgICAgIH0K LSAgICAgICAgfQotCi0gICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gc3RkOjpt YXgobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo KTsKLQotICAgICAgICBMYXlvdXRVbml0IHNjcm9sbGJhcldpZHRoID0gaW5zdHJpbnNpY1Njcm9s bGJhckxvZ2ljYWxXaWR0aCgpOwotICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCAr PSBzY3JvbGxiYXJXaWR0aDsKLSAgICAgICAgbV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGggKz0g c2Nyb2xsYmFyV2lkdGg7Ci0gICAgfQotCisgICAgZWxzZQorICAgICAgICBjb21wdXRlSW50cmlu c2ljTG9naWNhbFdpZHRocyhtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCwgbV9tYXhQcmVmZXJy ZWRMb2dpY2FsV2lkdGgpOwogCiAgICAgLy8gRklYTUU6IFRoaXMgc2hvdWxkIHByb2JhYmx5IGJl IGNoZWNraW5nIGZvciBpc1NwZWNpZmllZCBzaW5jZSB5b3Ugc2hvdWxkIGJlIGFibGUgdG8gdXNl IHBlcmNlbnRhZ2UsIGNhbGMgb3Igdmlld3BvcnQgcmVsYXRpdmUgdmFsdWVzIGZvciBtaW4td2lk dGguCiAgICAgaWYgKHN0eWxlVG9Vc2UtPmxvZ2ljYWxNaW5XaWR0aCgpLmlzRml4ZWQoKSAmJiBz dHlsZVRvVXNlLT5sb2dpY2FsTWluV2lkdGgoKS52YWx1ZSgpID4gMCkgewpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmggYi9Tb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaAppbmRleCA5MzNhOWQ4OTI0MGJmMzcw OWEwYjM3YTQ1MDUxMGY3MjIxOWY3MjExLi5mODNhYjUzZTZkZmU1OTQxZDA1MzY1ZTk3Y2Y1ZDFm YmM0MGJhODFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVC b3guaApAQCAtNDUsNyArNDUsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBib29sIGlzRmxleGli bGVCb3goKSBjb25zdCBPVkVSUklERSB7IHJldHVybiB0cnVlOyB9CiAgICAgdmlydHVhbCBib29s IGF2b2lkc0Zsb2F0cygpIGNvbnN0IE9WRVJSSURFIHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0 dWFsIGJvb2wgY2FuQ29sbGFwc2VBbm9ueW1vdXNCbG9ja0NoaWxkKCkgY29uc3QgT1ZFUlJJREUg eyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZVByZWZlcnJlZExvZ2lj YWxXaWR0aHMoKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0QmxvY2soYm9vbCBy ZWxheW91dENoaWxkcmVuLCBMYXlvdXRVbml0IHBhZ2VMb2dpY2FsSGVpZ2h0ID0gMCkgT1ZFUlJJ REU7CiAKICAgICB2aXJ0dWFsIGludCBiYXNlbGluZVBvc2l0aW9uKEZvbnRCYXNlbGluZSwgYm9v bCBmaXJzdExpbmUsIExpbmVEaXJlY3Rpb25Nb2RlLCBMaW5lUG9zaXRpb25Nb2RlID0gUG9zaXRp b25PbkNvbnRhaW5pbmdMaW5lKSBjb25zdCBPVkVSUklERTsKQEAgLTU2LDYgKzU1LDEwIEBAIHB1 YmxpYzoKIAogICAgIGJvb2wgaXNIb3Jpem9udGFsRmxvdygpIGNvbnN0OwogCitwcm90ZWN0ZWQ6 CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVu aXQmIG1pbkxvZ2ljYWxXaWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdCBP VkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgY29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMo KSBPVkVSUklERTsKKwogcHJpdmF0ZToKICAgICBlbnVtIEZsZXhTaWduIHsKICAgICAgICAgUG9z aXRpdmVGbGV4aWJpbGl0eSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJNZW51TGlzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxp c3QuY3BwCmluZGV4IGU4ZmQ3M2QwNjE3NThmMzg3MTgxN2Y3NDcwMmIyM2IyMjU1YzgyYTguLjY2 ZjYwZjkzMWM2ZWEzNzY1MzA0YWY2NmUzOGIwNDg5ODRiMjE5MGMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJNZW51TGlzdC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmNwcApAQCAtMjcyLDYgKzI3MiwxMyBAQCBMYXlv dXRSZWN0IFJlbmRlck1lbnVMaXN0Ojpjb250cm9sQ2xpcFJlY3QoY29uc3QgTGF5b3V0UG9pbnQm IGFkZGl0aW9uYWxPZmZzZXQpCiAgICAgcmV0dXJuIGludGVyc2VjdGlvbihvdXRlckJveCwgaW5u ZXJCb3gpOwogfQogCit2b2lkIFJlbmRlck1lbnVMaXN0Ojpjb21wdXRlSW50cmluc2ljTG9naWNh bFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2lj YWxXaWR0aCkgY29uc3QKK3sKKyAgICBtYXhMb2dpY2FsV2lkdGggPSBtYXgobV9vcHRpb25zV2lk dGgsIHRoZW1lKCktPm1pbmltdW1NZW51TGlzdFNpemUoc3R5bGUoKSkpICsgbV9pbm5lckJsb2Nr LT5wYWRkaW5nTGVmdCgpICsgbV9pbm5lckJsb2NrLT5wYWRkaW5nUmlnaHQoKTsKKyAgICBpZiAo IXN0eWxlKCktPndpZHRoKCkuaXNQZXJjZW50KCkpCisgICAgICAgIG1pbkxvZ2ljYWxXaWR0aCA9 IG1heExvZ2ljYWxXaWR0aDsKK30KKwogdm9pZCBSZW5kZXJNZW51TGlzdDo6Y29tcHV0ZVByZWZl cnJlZExvZ2ljYWxXaWR0aHMoKQogewogICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0g MDsKQEAgLTI3OSwxMiArMjg2LDggQEAgdm9pZCBSZW5kZXJNZW51TGlzdDo6Y29tcHV0ZVByZWZl cnJlZExvZ2ljYWxXaWR0aHMoKQogICAgIAogICAgIGlmIChzdHlsZSgpLT53aWR0aCgpLmlzRml4 ZWQoKSAmJiBzdHlsZSgpLT53aWR0aCgpLnZhbHVlKCkgPiAwKQogICAgICAgICBtX21pblByZWZl cnJlZExvZ2ljYWxXaWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoID0gYWRqdXN0Q29u dGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgpLT53aWR0aCgpLnZhbHVlKCkp OwotICAgIGVsc2UgewotICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1heCht X29wdGlvbnNXaWR0aCwgdGhlbWUoKS0+bWluaW11bU1lbnVMaXN0U2l6ZShzdHlsZSgpKSkgKyBt X2lubmVyQmxvY2stPnBhZGRpbmdMZWZ0KCkgKyBtX2lubmVyQmxvY2stPnBhZGRpbmdSaWdodCgp OwotCi0gICAgICAgIGlmICghc3R5bGUoKS0+d2lkdGgoKS5pc1BlcmNlbnQoKSkKLSAgICAgICAg ICAgIG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoID0gbV9tYXhQcmVmZXJyZWRMb2dpY2FsV2lk dGg7Ci0gICAgfQorICAgIGVsc2UKKyAgICAgICAgY29tcHV0ZUludHJpbnNpY0xvZ2ljYWxXaWR0 aHMobV9taW5QcmVmZXJyZWRMb2dpY2FsV2lkdGgsIG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo KTsKIAogICAgIGlmIChzdHlsZSgpLT5taW5XaWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZSgpLT5t aW5XaWR0aCgpLnZhbHVlKCkgPiAwKSB7CiAgICAgICAgIG1fbWF4UHJlZmVycmVkTG9naWNhbFdp ZHRoID0gbWF4KG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRoLCBhZGp1c3RDb250ZW50Qm94TG9n aWNhbFdpZHRoRm9yQm94U2l6aW5nKHN0eWxlKCktPm1pbldpZHRoKCkudmFsdWUoKSkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck1lbnVMaXN0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3QuaAppbmRleCBkZjQyZjE2OTZlZjc4 MTI1ZWVmMmQyZWM4YzU2NDE3ODZkY2VkODE2Li44YTlmMzVlMzI2N2YwNGNmMTYwZjNiNTdkYTY2 YzYxOGFhMGZhMGYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVy TWVudUxpc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTWVudUxpc3Qu aApAQCAtNzUsNyArNzUsOCBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCBjb25zdCBjaGFyKiBy ZW5kZXJOYW1lKCkgY29uc3QgeyByZXR1cm4gIlJlbmRlck1lbnVMaXN0IjsgfQogCi0gICAgdmly dHVhbCB2b2lkIGNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCk7CisgICAgdmlydHVhbCB2 b2lkIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhzKExheW91dFVuaXQmIG1pbkxvZ2ljYWxX aWR0aCwgTGF5b3V0VW5pdCYgbWF4TG9naWNhbFdpZHRoKSBjb25zdCBPVkVSUklERTsKKyAgICB2 aXJ0dWFsIHZvaWQgY29tcHV0ZVByZWZlcnJlZExvZ2ljYWxXaWR0aHMoKSBPVkVSUklERTsKIAog ICAgIHZpcnR1YWwgdm9pZCBzdHlsZURpZENoYW5nZShTdHlsZURpZmZlcmVuY2UsIGNvbnN0IFJl bmRlclN0eWxlKiBvbGRTdHlsZSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJTbGlkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNs aWRlci5jcHAKaW5kZXggZWQ5MmFmZjBkOGNkMzg3NmYwYWM4ZDdjMjJmYzNkMWExOWU1ZmYyNy4u ZTUzZjhlNWY1M2Q5N2E2YWI5MjllYzQ0NWQ4OTAyNzRhYTVjMDk0YiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5jcHAKQEAgLTcwLDYgKzcwLDEzIEBAIGludCBSZW5k ZXJTbGlkZXI6OmJhc2VsaW5lUG9zaXRpb24oRm9udEJhc2VsaW5lLCBib29sIC8qZmlyc3RMaW5l Ki8sIExpbmVEaXJlY3RpCiAgICAgcmV0dXJuIGhlaWdodCgpICsgbWFyZ2luVG9wKCk7CiB9CiAK K3ZvaWQgUmVuZGVyU2xpZGVyOjpjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRV bml0JiBtaW5Mb2dpY2FsV2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3QK K3sKKyAgICBtYXhMb2dpY2FsV2lkdGggPSBkZWZhdWx0VHJhY2tMZW5ndGggKiBzdHlsZSgpLT5l ZmZlY3RpdmVab29tKCk7CisgICAgaWYgKCFzdHlsZSgpLT53aWR0aCgpLmlzUGVyY2VudCgpKQor ICAgICAgICBtaW5Mb2dpY2FsV2lkdGggPSBtYXhMb2dpY2FsV2lkdGg7Cit9CisKIHZvaWQgUmVu ZGVyU2xpZGVyOjpjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpCiB7CiAgICAgbV9taW5Q cmVmZXJyZWRMb2dpY2FsV2lkdGggPSAwOwpAQCAtNzcsMTIgKzg0LDggQEAgdm9pZCBSZW5kZXJT bGlkZXI6OmNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkKIAogICAgIGlmIChzdHlsZSgp LT53aWR0aCgpLmlzRml4ZWQoKSAmJiBzdHlsZSgpLT53aWR0aCgpLnZhbHVlKCkgPiAwKQogICAg ICAgICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNhbFdp ZHRoID0gYWRqdXN0Q29udGVudEJveExvZ2ljYWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgpLT53 aWR0aCgpLnZhbHVlKCkpOwotICAgIGVsc2UgewotICAgICAgICBtX21heFByZWZlcnJlZExvZ2lj YWxXaWR0aCA9IGRlZmF1bHRUcmFja0xlbmd0aCAqIHN0eWxlKCktPmVmZmVjdGl2ZVpvb20oKTsK LQotICAgICAgICBpZiAoIXN0eWxlKCktPndpZHRoKCkuaXNQZXJjZW50KCkpCi0gICAgICAgICAg ICBtX21pblByZWZlcnJlZExvZ2ljYWxXaWR0aCA9IG1fbWF4UHJlZmVycmVkTG9naWNhbFdpZHRo OwotICAgIH0KKyAgICBlbHNlCisgICAgICAgIGNvbXB1dGVJbnRyaW5zaWNMb2dpY2FsV2lkdGhz KG1fbWluUHJlZmVycmVkTG9naWNhbFdpZHRoLCBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCk7 CiAKICAgICBpZiAoc3R5bGUoKS0+bWluV2lkdGgoKS5pc0ZpeGVkKCkgJiYgc3R5bGUoKS0+bWlu V2lkdGgoKS52YWx1ZSgpID4gMCkgewogICAgICAgICBtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0 aCA9IG1heChtX21heFByZWZlcnJlZExvZ2ljYWxXaWR0aCwgYWRqdXN0Q29udGVudEJveExvZ2lj YWxXaWR0aEZvckJveFNpemluZyhzdHlsZSgpLT5taW5XaWR0aCgpLnZhbHVlKCkpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTbGlkZXIuaCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJTbGlkZXIuaAppbmRleCAyNTJjZDA4MGMxOWM4ZGRjZDZm ZjkxOWU2NmZhYzk5YmIxM2U1YWMyLi5lOTRlZjhmMWI4YjQ2NGJjYWYzNjU5N2I2ZGMwMmFlYmVh Yzk3YmM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyU2xpZGVy LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclNsaWRlci5oCkBAIC00NCw3 ICs0NCw4IEBAIHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIGNhbkJlUmVwbGFjZWRXaXRoSW5s aW5lUnVuSW4oKSBjb25zdCBPVkVSUklERTsKIAogICAgIHZpcnR1YWwgaW50IGJhc2VsaW5lUG9z aXRpb24oRm9udEJhc2VsaW5lLCBib29sIGZpcnN0TGluZSwgTGluZURpcmVjdGlvbk1vZGUsIExp bmVQb3NpdGlvbk1vZGUgPSBQb3NpdGlvbk9uQ29udGFpbmluZ0xpbmUpIGNvbnN0OwotICAgIHZp cnR1YWwgdm9pZCBjb21wdXRlUHJlZmVycmVkTG9naWNhbFdpZHRocygpOworICAgIHZpcnR1YWwg dm9pZCBjb21wdXRlSW50cmluc2ljTG9naWNhbFdpZHRocyhMYXlvdXRVbml0JiBtaW5Mb2dpY2Fs V2lkdGgsIExheW91dFVuaXQmIG1heExvZ2ljYWxXaWR0aCkgY29uc3QgT1ZFUlJJREU7CisgICAg dmlydHVhbCB2b2lkIGNvbXB1dGVQcmVmZXJyZWRMb2dpY2FsV2lkdGhzKCkgT1ZFUlJJREU7CiAg ICAgdmlydHVhbCBib29sIHJlcXVpcmVzRm9yY2VkU3R5bGVSZWNhbGNQcm9wYWdhdGlvbigpIGNv bnN0IHsgcmV0dXJuIHRydWU7IH0KICAgICB2aXJ0dWFsIHZvaWQgbGF5b3V0KCk7CiB9OwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmlu ZGV4IGUwNjNhNTg0ZjU5YWM3MzBlN2ZiNWU4OTlmMDViYzE2OGFiNjIzMTAuLmQxZDZlODQ3MTM3 NDQxMGFlMDNlNmI4Njg5MzVhNGI4ODFjOTkxNTAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0No YW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx My0wMS0xMCAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFNldHRp bmcgd2lkdGggb3ZlcnJpZGVzIGludHJpbnNpYyBtaW4td2lkdGgvbWF4LXdpZHRoIG9uIGZsZXhi b3hlcyBhbmQgdGhlaXIgc3ViY2xhc3NlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTA2NjE3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBjc3MzL2ZsZXhib3gvaW50cmluc2ljLW1pbi13aWR0aC1hcHBs aWVzLXdpdGgtZml4ZWQtd2lkdGgtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBjc3Mz L2ZsZXhib3gvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lkdGguaHRt bDogQWRkZWQuCisgICAgICAgICogZmFzdC9mbGV4Ym94L2ludHJpbnNpYy1taW4td2lkdGgtYXBw bGllcy13aXRoLWZpeGVkLXdpZHRoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFz dC9mbGV4Ym94L2ludHJpbnNpYy1taW4td2lkdGgtYXBwbGllcy13aXRoLWZpeGVkLXdpZHRoLmh0 bWw6IEFkZGVkLgorICAgICAgICAqIGZhc3QvZm9ybXMvc2VsZWN0L2ludHJpbnNpYy1taW4td2lk dGgtYXBwbGllcy13aXRoLWZpeGVkLXdpZHRoLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvZm9ybXMvc2VsZWN0L2ludHJpbnNpYy1taW4td2lkdGgtYXBwbGllcy13aXRoLWZp eGVkLXdpZHRoLmh0bWw6IEFkZGVkLgorCiAyMDEzLTAxLTEwICBSb2dlciBGb25nICA8cm9nZXJf Zm9uZ0BhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCByZWJhc2VsaW5lcy4gQXBwbGUg V2luZG93cyBwb3J0LgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvY3NzMy9mbGV4Ym94L2ludHJp bnNpYy1taW4td2lkdGgtYXBwbGllcy13aXRoLWZpeGVkLXdpZHRoLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2NzczMvZmxleGJveC9pbnRyaW5zaWMtbWluLXdpZHRoLWFwcGxpZXMtd2l0aC1m aXhlZC13aWR0aC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTVmMzI5YjdlOWFhZGU5YjcyODQx ODg5MGU4MDIzNDExODI0MDNmNwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NzczMv ZmxleGJveC9pbnRyaW5zaWMtbWluLXdpZHRoLWFwcGxpZXMtd2l0aC1maXhlZC13aWR0aC1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSw4IEBACitDaGVjayB0aGF0IG1pbi13aWR0aCBpbnRyaW5zaWMg c2l6ZSBzdGlsbCBhcHBsaWVzIGlmIGEgZml4ZWQgd2lkdGggaXMgc2V0LgorCitQQVNTCitQQVNT CitQQVNTCitQQVNTCisgUEFTUworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhi b3gvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lkdGguaHRtbCBiL0xh eW91dFRlc3RzL2NzczMvZmxleGJveC9pbnRyaW5zaWMtbWluLXdpZHRoLWFwcGxpZXMtd2l0aC1m aXhlZC13aWR0aC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjI1MzY2MmFlMjA4ZjdkM2I5OGI0OWMzZjEwMDQ3 MTQ5NjYxZWNlY2MKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jc3MzL2ZsZXhib3gv aW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lkdGguaHRtbApAQCAtMCww ICsxLDc1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KKy5taW4tY29udGVudCB7CisgICAg d2lkdGg6IDEwcHg7CisgICAgbWluLXdpZHRoOiAtd2Via2l0LW1pbi1jb250ZW50OworICAgIG1p bi13aWR0aDogLW1vei1taW4tY29udGVudDsKKyAgICBtaW4td2lkdGg6IC1pZS1taW4tY29udGVu dDsKKyAgICBtaW4td2lkdGg6IC1vLW1pbi1jb250ZW50OworICAgIG1pbi13aWR0aDogbWluLWNv bnRlbnQ7CisgICAgb3V0bGluZTogMnB4IHNvbGlkOworICAgIGRpc3BsYXk6IC13ZWJraXQtZmxl eDsKKyAgICAtd2Via2l0LWZsZXgtd3JhcDogd3JhcDsKK30KKy5tYXgtY29udGVudCB7CisgICAg d2lkdGg6IDEwcHg7CisgICAgbWluLXdpZHRoOiAtd2Via2l0LW1heC1jb250ZW50OworICAgIG1p bi13aWR0aDogLW1vei1tYXgtY29udGVudDsKKyAgICBtaW4td2lkdGg6IC1pZS1tYXgtY29udGVu dDsKKyAgICBtaW4td2lkdGg6IC1vLW1heC1jb250ZW50OworICAgIG1pbi13aWR0aDogbWF4LWNv bnRlbnQ7CisgICAgb3V0bGluZTogMnB4IHNvbGlkOworICAgIGRpc3BsYXk6IC13ZWJraXQtZmxl eDsKKyAgICAtd2Via2l0LWZsZXgtd3JhcDogd3JhcDsKK30KKy5maXQtY29udGVudCB7CisgICAg d2lkdGg6IDEwcHg7CisgICAgbWluLXdpZHRoOiAtd2Via2l0LWZpdC1jb250ZW50OworICAgIG1p bi13aWR0aDogLW1vei1maXQtY29udGVudDsKKyAgICBtaW4td2lkdGg6IC1pZS1maXQtY29udGVu dDsKKyAgICBtaW4td2lkdGg6IC1vLWZpdC1jb250ZW50OworICAgIG1pbi13aWR0aDogZml0LWNv bnRlbnQ7CisgICAgb3V0bGluZTogMnB4IHNvbGlkOworICAgIGRpc3BsYXk6IC13ZWJraXQtZmxl eDsKKyAgICAtd2Via2l0LWZsZXgtd3JhcDogd3JhcDsKK30KKy5jaGlsZCB7CisgICAgd2lkdGg6 IDIwcHg7CisgICAgaGVpZ2h0OiAyMHB4OworICAgIGJhY2tncm91bmQtY29sb3I6IHBpbms7Cit9 CitkaXYgeworICAgIGRpc3BsYXk6IGlubGluZS1ibG9jazsKKyAgICBsaW5lLWhlaWdodDogMDsK K30KKzwvc3R5bGU+Cis8c2NyaXB0IHNyYz0iLi4vLi4vcmVzb3VyY2VzL2NoZWNrLWxheW91dC5q cyI+PC9zY3JpcHQ+CisKKzxib2R5IG9ubG9hZD0iY2hlY2tMYXlvdXQoJ2JvZHkgPiBkaXYnKSI+ Cis8cD5DaGVjayB0aGF0IG1pbi13aWR0aCBpbnRyaW5zaWMgc2l6ZSBzdGlsbCBhcHBsaWVzIGlm IGEgZml4ZWQgd2lkdGggaXMgc2V0LjwvcD4KKworPGRpdiBjbGFzcz0ibWluLWNvbnRlbnQiIGRh dGEtZXhwZWN0ZWQtd2lkdGg9MjA+CisgICAgPGRpdiBjbGFzcz0iY2hpbGQiPjwvZGl2PjxkaXYg Y2xhc3M9ImNoaWxkIj48L2Rpdj4KKzwvZGl2PgorCis8ZGl2IGNsYXNzPSJtYXgtY29udGVudCIg ZGF0YS1leHBlY3RlZC13aWR0aD00MD4KKyAgICA8ZGl2IGNsYXNzPSJjaGlsZCI+PC9kaXY+PGRp diBjbGFzcz0iY2hpbGQiPjwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9ImZpdC1jb250ZW50 IiBkYXRhLWV4cGVjdGVkLXdpZHRoPTQwPgorICAgIDxkaXYgY2xhc3M9ImNoaWxkIj48L2Rpdj48 ZGl2IGNsYXNzPSJjaGlsZCI+PC9kaXY+Cis8L2Rpdj4KKworPGRpdiBzdHlsZT0id2lkdGg6IDMw cHgiPgorICAgIDxkaXYgY2xhc3M9ImZpdC1jb250ZW50IiBkYXRhLWV4cGVjdGVkLXdpZHRoPTMw PgorICAgICAgICA8ZGl2IGNsYXNzPSJjaGlsZCI+PC9kaXY+PGRpdiBjbGFzcz0iY2hpbGQiPjwv ZGl2PgorICAgIDwvZGl2PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9IndpZHRoOiAxMHB4Ij4KKyAg ICA8ZGl2IGNsYXNzPSJmaXQtY29udGVudCIgZGF0YS1leHBlY3RlZC13aWR0aD0yMD4KKyAgICAg ICAgPGRpdiBjbGFzcz0iY2hpbGQiPjwvZGl2PjxkaXYgY2xhc3M9ImNoaWxkIj48L2Rpdj4KKyAg ICA8L2Rpdj4KKzwvZGl2PgorCis8L2JvZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2ZsZXhib3gvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lkdGgtZXhw ZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJpbnNpYy1taW4td2lkdGgt YXBwbGllcy13aXRoLWZpeGVkLXdpZHRoLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44MWIwZDli NWMzZjk3MTEwOWNiOTY5YjI1YTkxMTliYmU5YzYxMDQwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9mbGV4Ym94L2ludHJpbnNpYy1taW4td2lkdGgtYXBwbGllcy13aXRoLWZp eGVkLXdpZHRoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDggQEAKK0NoZWNrIHRoYXQgbWluLXdp ZHRoIGludHJpbnNpYyBzaXplIHN0aWxsIGFwcGxpZXMgaWYgYSBmaXhlZCB3aWR0aCBpcyBzZXQu CisKKyBQQVNTCisgUEFTUworIFBBU1MKKyBQQVNTCisgUEFTUworCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2ZsZXhib3gvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4 ZWQtd2lkdGguaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvZmxleGJveC9pbnRyaW5zaWMtbWluLXdp ZHRoLWFwcGxpZXMtd2l0aC1maXhlZC13aWR0aC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjA0ODJmMzk5ZTFl ZGVmMjM3NDg4MDdjYTM2YzA4MDRiNWE1ZDQ2MzYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRU ZXN0cy9mYXN0L2ZsZXhib3gvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQt d2lkdGguaHRtbApAQCAtMCwwICsxLDc1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KKy5t aW4tY29udGVudCB7CisgICAgd2lkdGg6IDEwcHg7CisgICAgbWluLXdpZHRoOiAtd2Via2l0LW1p bi1jb250ZW50OworICAgIG1pbi13aWR0aDogLW1vei1taW4tY29udGVudDsKKyAgICBtaW4td2lk dGg6IC1pZS1taW4tY29udGVudDsKKyAgICBtaW4td2lkdGg6IC1vLW1pbi1jb250ZW50OworICAg IG1pbi13aWR0aDogbWluLWNvbnRlbnQ7CisgICAgb3V0bGluZTogMnB4IHNvbGlkOworICAgIGRp c3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94LWxpbmVzOiBtdWx0aXBsZTsKK30K Ky5tYXgtY29udGVudCB7CisgICAgd2lkdGg6IDEwcHg7CisgICAgbWluLXdpZHRoOiAtd2Via2l0 LW1heC1jb250ZW50OworICAgIG1pbi13aWR0aDogLW1vei1tYXgtY29udGVudDsKKyAgICBtaW4t d2lkdGg6IC1pZS1tYXgtY29udGVudDsKKyAgICBtaW4td2lkdGg6IC1vLW1heC1jb250ZW50Owor ICAgIG1pbi13aWR0aDogbWF4LWNvbnRlbnQ7CisgICAgb3V0bGluZTogMnB4IHNvbGlkOworICAg IGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94LWxpbmVzOiBtdWx0aXBsZTsK K30KKy5maXQtY29udGVudCB7CisgICAgd2lkdGg6IDEwcHg7CisgICAgbWluLXdpZHRoOiAtd2Vi a2l0LWZpdC1jb250ZW50OworICAgIG1pbi13aWR0aDogLW1vei1maXQtY29udGVudDsKKyAgICBt aW4td2lkdGg6IC1pZS1maXQtY29udGVudDsKKyAgICBtaW4td2lkdGg6IC1vLWZpdC1jb250ZW50 OworICAgIG1pbi13aWR0aDogZml0LWNvbnRlbnQ7CisgICAgb3V0bGluZTogMnB4IHNvbGlkOwor ICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94LWxpbmVzOiBtdWx0aXBs ZTsKK30KKy5jaGlsZCB7CisgICAgd2lkdGg6IDIwcHg7CisgICAgaGVpZ2h0OiAyMHB4OworICAg IGJhY2tncm91bmQtY29sb3I6IHBpbms7Cit9CitkaXYgeworICAgIGRpc3BsYXk6IGlubGluZS1i bG9jazsKKyAgICBsaW5lLWhlaWdodDogMDsKK30KKzwvc3R5bGU+Cis8c2NyaXB0IHNyYz0iLi4v Li4vcmVzb3VyY2VzL2NoZWNrLWxheW91dC5qcyI+PC9zY3JpcHQ+CisKKzxib2R5IG9ubG9hZD0i Y2hlY2tMYXlvdXQoJ2JvZHkgPiBkaXYnKSI+Cis8cD5DaGVjayB0aGF0IG1pbi13aWR0aCBpbnRy aW5zaWMgc2l6ZSBzdGlsbCBhcHBsaWVzIGlmIGEgZml4ZWQgd2lkdGggaXMgc2V0LjwvcD4KKwor PGRpdiBjbGFzcz0ibWluLWNvbnRlbnQiIGRhdGEtZXhwZWN0ZWQtd2lkdGg9MjA+CisgICAgPGRp diBjbGFzcz0iY2hpbGQiPjwvZGl2PjxkaXYgY2xhc3M9ImNoaWxkIj48L2Rpdj4KKzwvZGl2Pgor Cis8ZGl2IGNsYXNzPSJtYXgtY29udGVudCIgZGF0YS1leHBlY3RlZC13aWR0aD00MD4KKyAgICA8 ZGl2IGNsYXNzPSJjaGlsZCI+PC9kaXY+PGRpdiBjbGFzcz0iY2hpbGQiPjwvZGl2PgorPC9kaXY+ CisKKzxkaXYgY2xhc3M9ImZpdC1jb250ZW50IiBkYXRhLWV4cGVjdGVkLXdpZHRoPTQwPgorICAg IDxkaXYgY2xhc3M9ImNoaWxkIj48L2Rpdj48ZGl2IGNsYXNzPSJjaGlsZCI+PC9kaXY+Cis8L2Rp dj4KKworPGRpdiBzdHlsZT0id2lkdGg6IDMwcHgiPgorICAgIDxkaXYgY2xhc3M9ImZpdC1jb250 ZW50IiBkYXRhLWV4cGVjdGVkLXdpZHRoPTMwPgorICAgICAgICA8ZGl2IGNsYXNzPSJjaGlsZCI+ PC9kaXY+PGRpdiBjbGFzcz0iY2hpbGQiPjwvZGl2PgorICAgIDwvZGl2PgorPC9kaXY+CisKKzxk aXYgc3R5bGU9IndpZHRoOiAxMHB4Ij4KKyAgICA8ZGl2IGNsYXNzPSJmaXQtY29udGVudCIgZGF0 YS1leHBlY3RlZC13aWR0aD0yMD4KKyAgICAgICAgPGRpdiBjbGFzcz0iY2hpbGQiPjwvZGl2Pjxk aXYgY2xhc3M9ImNoaWxkIj48L2Rpdj4KKyAgICA8L2Rpdj4KKzwvZGl2PgorCis8L2JvZHk+CmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC9pbnRyaW5zaWMtbWluLXdp ZHRoLWFwcGxpZXMtd2l0aC1maXhlZC13aWR0aC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMv ZmFzdC9mb3Jtcy9zZWxlY3QvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQt d2lkdGgtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lZmQ2NjZkNDliZGU3NDBkOWE4Y2NlM2Uy N2U1MjgzNGI3YjJiZjhhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jt cy9zZWxlY3QvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lkdGgtZXhw ZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI1IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KK3Nl bGVjdCB7CisgICAgb3V0bGluZTogMnB4IHNvbGlkOworICAgIG1hcmdpbjogMDsKK30KKzwvc3R5 bGU+Cis8Ym9keT4KKzxwPkNoZWNrIHRoYXQgbWluLXdpZHRoIGludHJpbnNpYyBzaXplIHN0aWxs IGFwcGxpZXMgaWYgYSBmaXhlZCB3aWR0aCBpcyBzZXQuPC9wPgorCis8c2VsZWN0Pjwvc2VsZWN0 PgorCis8c2VsZWN0Pjwvc2VsZWN0PgorCis8c2VsZWN0Pjwvc2VsZWN0PgorCis8ZGl2IHN0eWxl PSJ3aWR0aDogMzBweCI+CisgICAgPHNlbGVjdD48L3NlbGVjdD4KKzwvZGl2PgorCis8ZGl2IHN0 eWxlPSJ3aWR0aDogMTBweCI+CisgICAgPHNlbGVjdD48L3NlbGVjdD4KKzwvZGl2PgorCis8L2Jv ZHk+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Zvcm1zL3NlbGVjdC9pbnRyaW5zaWMt bWluLXdpZHRoLWFwcGxpZXMtd2l0aC1maXhlZC13aWR0aC5odG1sIGIvTGF5b3V0VGVzdHMvZmFz dC9mb3Jtcy9zZWxlY3QvaW50cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lk dGguaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi44OTk1ZTYzMWE0MDUxNjM1YjQ1ODQ1Y2FlOTgzODE5OTlmOGUx MjVlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9mb3Jtcy9zZWxlY3QvaW50 cmluc2ljLW1pbi13aWR0aC1hcHBsaWVzLXdpdGgtZml4ZWQtd2lkdGguaHRtbApAQCAtMCwwICsx LDQ5IEBACis8IURPQ1RZUEUgaHRtbD4KKzxzdHlsZT4KKy5taW4tY29udGVudCB7CisgICAgd2lk dGg6IDFweDsKKyAgICBtaW4td2lkdGg6IC13ZWJraXQtbWluLWNvbnRlbnQ7CisgICAgbWluLXdp ZHRoOiAtbW96LW1pbi1jb250ZW50OworICAgIG1pbi13aWR0aDogLWllLW1pbi1jb250ZW50Owor ICAgIG1pbi13aWR0aDogLW8tbWluLWNvbnRlbnQ7CisgICAgbWluLXdpZHRoOiBtaW4tY29udGVu dDsKK30KKy5tYXgtY29udGVudCB7CisgICAgd2lkdGg6IDFweDsKKyAgICBtaW4td2lkdGg6IC13 ZWJraXQtbWF4LWNvbnRlbnQ7CisgICAgbWluLXdpZHRoOiAtbW96LW1heC1jb250ZW50OworICAg IG1pbi13aWR0aDogLWllLW1heC1jb250ZW50OworICAgIG1pbi13aWR0aDogLW8tbWF4LWNvbnRl bnQ7CisgICAgbWluLXdpZHRoOiBtYXgtY29udGVudDsKK30KKy5maXQtY29udGVudCB7CisgICAg d2lkdGg6IDFweDsKKyAgICBtaW4td2lkdGg6IC13ZWJraXQtZml0LWNvbnRlbnQ7CisgICAgbWlu LXdpZHRoOiAtbW96LWZpdC1jb250ZW50OworICAgIG1pbi13aWR0aDogLWllLWZpdC1jb250ZW50 OworICAgIG1pbi13aWR0aDogLW8tZml0LWNvbnRlbnQ7CisgICAgbWluLXdpZHRoOiBmaXQtY29u dGVudDsKK30KK3NlbGVjdCB7CisgICAgb3V0bGluZTogMnB4IHNvbGlkOworICAgIG1hcmdpbjog MDsKK30KKzwvc3R5bGU+Cis8Ym9keT4KKzxwPkNoZWNrIHRoYXQgbWluLXdpZHRoIGludHJpbnNp YyBzaXplIHN0aWxsIGFwcGxpZXMgaWYgYSBmaXhlZCB3aWR0aCBpcyBzZXQuPC9wPgorCis8c2Vs ZWN0IGNsYXNzPSJtaW4tY29udGVudCI+PC9zZWxlY3Q+CisKKzxzZWxlY3QgY2xhc3M9Im1heC1j b250ZW50Ij48L3NlbGVjdD4KKworPHNlbGVjdCBjbGFzcz0iZml0LWNvbnRlbnQiPjwvc2VsZWN0 PgorCis8ZGl2IHN0eWxlPSJ3aWR0aDogMzBweCI+CisgICAgPHNlbGVjdCBjbGFzcz0iZml0LWNv bnRlbnQiPjwvc2VsZWN0PgorPC9kaXY+CisKKzxkaXYgc3R5bGU9IndpZHRoOiAxMHB4Ij4KKyAg ICA8c2VsZWN0IGNsYXNzPSJmaXQtY29udGVudCI+PC9zZWxlY3Q+Cis8L2Rpdj4KKworPC9ib2R5 Pgo=