7216 2006-02-12 10:36:48 -0800 white-space: pre-wrap collapses leading whitespace following a newline 2006-02-17 01:29:02 -0800 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned hyatt oldest_to_newest 32242 0 mitz 2006-02-12 10:36:48 -0800 [Reported by Dave Hyatt] white-space: pre-wrap collapses whitespace at the start of the line if the previous line ends in a newline. The root cause is that previousLineBrokeCleanly is only being set for <br> and not for breaks caused by newlines. Patch coming up. 32244 1 6436 mitz 2006-02-12 10:49:23 -0800 Created attachment 6436 patch 32264 2 6436 hyatt 2006-02-12 17:34:44 -0800 Comment on attachment 6436 patch r=me 6436 2006-02-12 10:49:23 -0800 2006-02-12 17:34:44 -0800 patch 7216_r1.patch text/plain 12741 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDEyNzcxKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMDYtMDItIyMgIE1pdHogUGV0dGVsICA8b3Bl bmRhcndpbi5vcmdAbWl0enBldHRlbC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgLSB0ZXN0IGZvciBodHRwOi8vYnVnemlsbGEub3BlbmRhcndp bi5vcmcvc2hvd19idWcuY2dpP2lkPTcyMTYKKyAgICAgICAgICB3aGl0ZS1zcGFjZTogcHJlLXdy YXAgY29sbGFwc2VzIGxlYWRpbmcgd2hpdGVzcGFjZSBmb2xsb3dpbmcgYSBuZXdsaW5lCisKKyAg ICAgICAgKiBmYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1zcGFjZXMtYWZ0ZXItbmV3bGlu ZS1leHBlY3RlZC5jaGVja3N1bTogQWRkZWQuCisgICAgICAgICogZmFzdC90ZXh0L3doaXRlc3Bh Y2UvcHJlLXdyYXAtc3BhY2VzLWFmdGVyLW5ld2xpbmUtZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1zcGFjZXMtYWZ0ZXItbmV3bGlu ZS1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvdGV4dC93aGl0ZXNwYWNlL3By ZS13cmFwLXNwYWNlcy1hZnRlci1uZXdsaW5lLmh0bWw6IEFkZGVkLgorCiAyMDA2LTAyLTExICBB bGV4YW5kZXIgS2VsbGV0dCAgPGx5cGFub3ZAa2RlLm9yZz4KIAogICAgICAgICBBZGRpbmcgdGVz dCBjYXNlIGZvcgpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC90ZXh0L3doaXRlc3BhY2UvcHJlLXdy YXAtc3BhY2VzLWFmdGVyLW5ld2xpbmUtZXhwZWN0ZWQucG5nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KQ2Fubm90IGRp c3BsYXk6IGZpbGUgbWFya2VkIGFzIGEgYmluYXJ5IHR5cGUuCnN2bjptaW1lLXR5cGUgPSBhcHBs aWNhdGlvbi9vY3RldC1zdHJlYW0KClByb3BlcnR5IGNoYW5nZXMgb246IHByZS13cmFwLXNwYWNl cy1hZnRlci1uZXdsaW5lLWV4cGVjdGVkLnBuZwpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCk5hbWU6IHN2bjptaW1lLXR5 cGUKICAgKyBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1zcGFjZXMtYWZ0ZXItbmV3bGluZS1leHBlY3RlZC5j aGVja3N1bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvd2hpdGVzcGFjZS9w cmUtd3JhcC1zcGFjZXMtYWZ0ZXItbmV3bGluZS1leHBlY3RlZC5jaGVja3N1bQkocmV2aXNpb24g MCkKKysrIExheW91dFRlc3RzL2Zhc3QvdGV4dC93aGl0ZXNwYWNlL3ByZS13cmFwLXNwYWNlcy1h ZnRlci1uZXdsaW5lLWV4cGVjdGVkLmNoZWNrc3VtCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxIEBA Cis3YzcyMjY0ZWE2MjU1YmRjODZiNmIyNjgxMzdlMTMwZgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUKSW5kZXg6IExheW91dFRlc3RzL2Zhc3QvdGV4dC93aGl0ZXNwYWNlL3ByZS13cmFwLXNw YWNlcy1hZnRlci1uZXdsaW5lLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9mYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1zcGFjZXMtYWZ0ZXItbmV3bGluZS1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9mYXN0L3RleHQvd2hpdGVzcGFj ZS9wcmUtd3JhcC1zcGFjZXMtYWZ0ZXItbmV3bGluZS1leHBlY3RlZC50eHQJKHJldmlzaW9uIDAp CkBAIC0wLDAgKzEsOTUgQEAKK2xheWVyIGF0ICgwLDApIHNpemUgNzg1eDY0NgorICBSZW5kZXJD YW52YXMgYXQgKDAsMCkgc2l6ZSA3ODV4NjAwCitsYXllciBhdCAoMCwwKSBzaXplIDc4NXg2NDYK KyAgUmVuZGVyQmxvY2sge0hUTUx9IGF0ICgwLDApIHNpemUgNzg1eDY0NgorICAgIFJlbmRlckJv ZHkge0JPRFl9IGF0ICg4LDgpIHNpemUgNzY5eDYyNQorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0 ICgwLDApIHNpemUgNzY5eDM2CisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNp emUgNTN4MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA1MzogIlRlc3QgZm9y ICIKKyAgICAgICAgUmVuZGVySW5saW5lIHtJfSBhdCAoMCwwKSBzaXplIDczNXgzNgorICAgICAg ICAgIFJlbmRlcklubGluZSB7QX0gYXQgKDAsMCkgc2l6ZSAzNDh4MTggW2NvbG9yPSMwMDAwRUVd CisgICAgICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoNTMsMCkgc2l6ZSAzNDh4MTgKKyAg ICAgICAgICAgICAgdGV4dCBydW4gYXQgKDUzLDApIHdpZHRoIDM0ODogImh0dHA6Ly9idWd6aWxs YS5vcGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzIxNiIKKyAgICAgICAgICBSZW5kZXJU ZXh0IHtURVhUfSBhdCAoNDAxLDApIHNpemUgNzM1eDM2CisgICAgICAgICAgICB0ZXh0IHJ1biBh dCAoNDAxLDApIHdpZHRoIDQ6ICIgIgorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDQwNSwwKSB3 aWR0aCAzMzA6ICJ3aGl0ZS1zcGFjZTogcHJlLXdyYXAgY29sbGFwc2VzIGxlYWRpbmcgd2hpdGVz cGFjZSIKKyAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE4KSB3aWR0aCAxMjQ6ICJmb2xsb3dp bmcgYSBuZXdsaW5lIgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMTI0LDE4KSBzaXpl IDR4MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMTI0LDE4KSB3aWR0aCA0OiAiLiIKKyAgICAg IFJlbmRlckJsb2NrIHtIUn0gYXQgKDAsNTIpIHNpemUgNzY5eDIgW2JvcmRlcjogKDFweCBpbnNl dCAjMDAwMDAwKV0KKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCw3MCkgc2l6ZSA3Njl4MTgK KyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAzNXgxOAorICAgICAgICAg IHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDM1OiAiSGVyZSAiCisgICAgICAgIFJlbmRlcklubGlu ZSB7Q09ERX0gYXQgKDAsMCkgc2l6ZSAyNHgxNQorICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9 IGF0ICgzNSwyKSBzaXplIDI0eDE1CisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMzUsMikgd2lk dGggMjQ6ICJiYXIiCisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICg1OSwwKSBzaXplIDE0 MngxOAorICAgICAgICAgIHRleHQgcnVuIGF0ICg1OSwwKSB3aWR0aCAxNDI6ICIgc2hvdWxkIGJl IHJpZ2h0IHVuZGVyICIKKyAgICAgICAgUmVuZGVySW5saW5lIHtDT0RFfSBhdCAoMCwwKSBzaXpl IDI0eDE1CisgICAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDIwMSwyKSBzaXplIDI0eDE1 CisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMjAxLDIpIHdpZHRoIDI0OiAiZm9vIgorICAgICAg ICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMjI1LDApIHNpemUgNHgxOAorICAgICAgICAgIHRleHQg cnVuIGF0ICgyMjUsMCkgd2lkdGggNDogIjoiCisgICAgICBSZW5kZXJCbG9jayB7UFJFfSBhdCAo MCwxMDQpIHNpemUgNTF4MzAgW2JnY29sb3I9I0MwQzBDMF0KKyAgICAgICAgUmVuZGVyVGV4dCB7 VEVYVH0gYXQgKDAsMCkgc2l6ZSA1MXgzMAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdp ZHRoIDUxOiAiZm9vICAgICAgIgorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE1KSB3aWR0aCAy NDogImJhciIKKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwxNTApIHNpemUgNzY5eDE4Cisg ICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgMzV4MTgKKyAgICAgICAgICB0 ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzNTogIkhlcmUgIgorICAgICAgICBSZW5kZXJJbmxpbmUg e0NPREV9IGF0ICgwLDApIHNpemUgMjR4MTUKKyAgICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBh dCAoMzUsMikgc2l6ZSAyNHgxNQorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDM1LDIpIHdpZHRo IDI0OiAiYmFyIgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoNTksMCkgc2l6ZSAzMjR4 MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNTksMCkgd2lkdGggMzI0OiAiIHNob3VsZCBiZSBv biB0aGUgcmlnaHQgaGFuZCBzaWRlIG9mIHRoZSBzZWNvbmQgbGluZToiCisgICAgICBSZW5kZXJC bG9jayB7UFJFfSBhdCAoMCwxODQpIHNpemUgNTF4MzAgW2JnY29sb3I9I0MwQzBDMF0KKyAgICAg ICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAyNHgxNQorICAgICAgICAgIHRleHQg cnVuIGF0ICgwLDApIHdpZHRoIDI0OiAiZm9vIgorICAgICAgICBSZW5kZXJCUiB7QlJ9IGF0ICgw LDApIHNpemUgMHgwCisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDE1KSBzaXplIDQ4 eDE1CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTUpIHdpZHRoIDQ4OiAiICAgYmFyIgorICAg ICAgUmVuZGVyQmxvY2sge1BSRX0gYXQgKDAsMjI3KSBzaXplIDUxeDMwIFtiZ2NvbG9yPSNDMEMw QzBdCisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgNTF4MTUKKyAgICAg ICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA1MTogImZvbyAgICAiCisgICAgICAgIFJlbmRl ckJSIHtCUn0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQg KDAsMTUpIHNpemUgNDh4MTUKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxNSkgd2lkdGggNDg6 ICIgICBiYXIiCisgICAgICBSZW5kZXJCbG9jayB7UFJFfSBhdCAoMCwyNzApIHNpemUgNTF4MzAg W2JnY29sb3I9I0MwQzBDMF0KKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6 ZSA0OHgzMAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDI0OiAiZm9vIgorICAg ICAgICAgIHRleHQgcnVuIGF0ICgwLDE1KSB3aWR0aCA0ODogIiAgIGJhciIKKyAgICAgIFJlbmRl ckJsb2NrIHtQUkV9IGF0ICgwLDMxMykgc2l6ZSA1MXgzMCBbYmdjb2xvcj0jQzBDMEMwXQorICAg ICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDQ4eDMwCisgICAgICAgICAgdGV4 dCBydW4gYXQgKDAsMCkgd2lkdGggMzI6ICJmb28gIgorICAgICAgICAgIHRleHQgcnVuIGF0ICgw LDE1KSB3aWR0aCA0ODogIiAgIGJhciIKKyAgICAgIFJlbmRlckJsb2NrIHtQUkV9IGF0ICgwLDM1 Nikgc2l6ZSA1MXgzMCBbYmdjb2xvcj0jQzBDMEMwXQorICAgICAgICBSZW5kZXJUZXh0IHtURVhU fSBhdCAoMCwwKSBzaXplIDQ4eDMwCisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGgg NDA6ICJmb28gICIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxNSkgd2lkdGggNDg6ICIgICBi YXIiCisgICAgICBSZW5kZXJCbG9jayB7UFJFfSBhdCAoMCwzOTkpIHNpemUgNTF4MzAgW2JnY29s b3I9I0MwQzBDMF0KKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSA0OHgz MAorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDQ4OiAiZm9vICAgIgorICAgICAg ICAgIHRleHQgcnVuIGF0ICgwLDE1KSB3aWR0aCA0ODogIiAgIGJhciIKKyAgICAgIFJlbmRlckJs b2NrIHtQUkV9IGF0ICgwLDQ0Mikgc2l6ZSA1MXgzMCBbYmdjb2xvcj0jQzBDMEMwXQorICAgICAg ICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDUxeDMwCisgICAgICAgICAgdGV4dCBy dW4gYXQgKDAsMCkgd2lkdGggNTE6ICJmb28gICAgIgorICAgICAgICAgIHRleHQgcnVuIGF0ICgw LDE1KSB3aWR0aCA0ODogIiAgIGJhciIKKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCw0ODgp IHNpemUgNzY5eDE4CisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgMzV4 MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAzNTogIkhlcmUgIgorICAgICAg ICBSZW5kZXJJbmxpbmUge0NPREV9IGF0ICgwLDApIHNpemUgMjR4MTUKKyAgICAgICAgICBSZW5k ZXJUZXh0IHtURVhUfSBhdCAoMzUsMikgc2l6ZSAyNHgxNQorICAgICAgICAgICAgdGV4dCBydW4g YXQgKDM1LDIpIHdpZHRoIDI0OiAiYmFyIgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAo NTksMCkgc2l6ZSAzMDl4MTgKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoNTksMCkgd2lkdGggMzA5 OiAiIHNob3VsZCBiZSBvbiB0aGUgcmlnaHQgaGFuZCBzaWRlIG9mIHRoZSB0aGlyZCBsaW5lOiIK KyAgICAgIFJlbmRlckJsb2NrIHtQUkV9IGF0ICgwLDUyMikgc2l6ZSA1MXg0NSBbYmdjb2xvcj0j QzBDMEMwXQorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDI0eDE1Cisg ICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMjQ6ICJmb28iCisgICAgICAgIFJlbmRl ckJSIHtCUn0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQg KDAsMzApIHNpemUgNDh4MTUKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwzMCkgd2lkdGggNDg6 ICIgICBiYXIiCisgICAgICBSZW5kZXJCbG9jayB7UFJFfSBhdCAoMCw1ODApIHNpemUgNTF4NDUg W2JnY29sb3I9I0MwQzBDMF0KKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6 ZSA0OHg0NQorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDMyOiAiZm9vICIKKyAg ICAgICAgICB0ZXh0IHJ1biBhdCAoMCwxNSkgd2lkdGggMjQ6ICJiYXoiCisgICAgICAgICAgdGV4 dCBydW4gYXQgKDAsMzApIHdpZHRoIDQ4OiAiICAgYmFyIgpJbmRleDogTGF5b3V0VGVzdHMvZmFz dC90ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtc3BhY2VzLWFmdGVyLW5ld2xpbmUuaHRtbAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3RleHQvd2hpdGVzcGFjZS9wcmUtd3JhcC1zcGFj ZXMtYWZ0ZXItbmV3bGluZS5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvZmFzdC90 ZXh0L3doaXRlc3BhY2UvcHJlLXdyYXAtc3BhY2VzLWFmdGVyLW5ld2xpbmUuaHRtbAkocmV2aXNp b24gMCkKQEAgLTAsMCArMSwyOSBAQAorPHN0eWxlPgorICAgIHByZSB7IHdoaXRlLXNwYWNlOiBw cmUtd3JhcDsgYmFja2dyb3VuZDogc2lsdmVyOyB3aWR0aDogN2V4OyB9Cis8L3N0eWxlPgorPHA+ CisgICAgVGVzdCBmb3IKKyAgICA8aT48YSBocmVmPSJodHRwOi8vYnVnemlsbGEub3BlbmRhcndp bi5vcmcvc2hvd19idWcuY2dpP2lkPTcyMTYiPmh0dHA6Ly9idWd6aWxsYS5vcGVuZGFyd2luLm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzIxNjwvYT4KKyAgICB3aGl0ZS1zcGFjZTogcHJlLXdyYXAgY29s bGFwc2VzIGxlYWRpbmcgd2hpdGVzcGFjZSBmb2xsb3dpbmcgYSBuZXdsaW5lPC9pPi4KKzwvcD4K Kzxocj4KKzxwPkhlcmUgPGNvZGU+YmFyPC9jb2RlPiBzaG91bGQgYmUgcmlnaHQgdW5kZXIgPGNv ZGU+Zm9vPC9jb2RlPjo8L3A+Cis8cHJlPmZvbyAgICAgIGJhcjwvcHJlPgorPHA+SGVyZSA8Y29k ZT5iYXI8L2NvZGU+IHNob3VsZCBiZSBvbiB0aGUgcmlnaHQgaGFuZCBzaWRlIG9mIHRoZSBzZWNv bmQgbGluZTo8L3A+Cis8cHJlPmZvbzxicj4gICBiYXI8L3ByZT4KKzxwcmU+Zm9vICAgIDxicj4g ICBiYXI8L3ByZT4KKzxwcmU+Zm9vCisgICBiYXI8L3ByZT4KKzxwcmU+Zm9vIAorICAgYmFyPC9w cmU+Cis8cHJlPmZvbyAgCisgICBiYXI8L3ByZT4KKzxwcmU+Zm9vICAgCisgICBiYXI8L3ByZT4K KzxwcmU+Zm9vICAgIAorICAgYmFyPC9wcmU+Cis8cD5IZXJlIDxjb2RlPmJhcjwvY29kZT4gc2hv dWxkIGJlIG9uIHRoZSByaWdodCBoYW5kIHNpZGUgb2YgdGhlIHRoaXJkIGxpbmU6PC9wPgorPHBy ZT5mb288YnI+CisgICBiYXI8L3ByZT4KKzxwcmU+Zm9vIGJhegorICAgYmFyPC9wcmU+CkluZGV4 OiBXZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0NoYW5nZUxvZwkocmV2 aXNpb24gMTI3NzEpCisrKyBXZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDA2LTAyLSMjICBNaXR6IFBldHRlbCAgPG9wZW5kYXJ3aW4ub3JnQG1pdHpw ZXR0ZWwuY29tPgorCisgICAgICAgIFRlc3Q6IGZhc3QvdGV4dC93aGl0ZXNwYWNlL3ByZS13cmFw LXNwYWNlcy1hZnRlci1uZXdsaW5lLmh0bWwKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAtIGZpeCBodHRwOi8vYnVnemlsbGEub3BlbmRhcndpbi5vcmcv c2hvd19idWcuY2dpP2lkPTcyMTYKKyAgICAgICAgICB3aGl0ZS1zcGFjZTogcHJlLXdyYXAgY29s bGFwc2VzIGxlYWRpbmcgd2hpdGVzcGFjZSBmb2xsb3dpbmcgYSBuZXdsaW5lCisKKyAgICAgICAg KiByZW5kZXJpbmcvYmlkaS5jcHA6CisgICAgICAgIChraHRtbDo6UmVuZGVyQmxvY2s6OmJpZGlS ZW9yZGVyTGluZSk6IFVzZSBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkgaW5zdGVhZCBvZgorICAg ICAgICByZXNldEJpZGlBdEVuZCBub3cgdGhhdCB0aGUgZm9ybWVyIGlzIGFsd2F5cyBjb3JyZWN0 LgorICAgICAgICAoa2h0bWw6OlJlbmRlckJsb2NrOjpsYXlvdXRJbmxpbmVDaGlsZHJlbik6IFVz ZSBuZXcgc2tpcFRyYWlsaW5nTmV3bGluZSBmbGFnLgorICAgICAgICAoa2h0bWw6OlJlbmRlckJs b2NrOjpmaW5kTmV4dExpbmVCcmVhayk6IFNldCBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkgZm9y IGxpbmUgYnJlYWtzCisgICAgICAgIGNhdXNlZCBieSBuZXdsaW5lcyBhcyB3ZWxsLiBBZGRlZCBz a2lwVHJhaWxpbmdOZXdsaW5lIGZsYWcuCisKIDIwMDYtMDItMTIgIE1hY2llaiBTdGFjaG93aWFr ICA8bWpzQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KSW5kZXg6 IFdlYkNvcmUvcmVuZGVyaW5nL2JpZGkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcmVuZGVy aW5nL2JpZGkuY3BwCShyZXZpc2lvbiAxMjc3MSkKKysrIFdlYkNvcmUvcmVuZGVyaW5nL2JpZGku Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMDAsNiArMTAwLDcgQEAgc3RhdGljIGJvb2wgYmV0d2Vl bk1pZHBvaW50czsKIAogc3RhdGljIGJvb2wgaXNMaW5lRW1wdHkgPSB0cnVlOwogc3RhdGljIGJv b2wgcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5ID0gdHJ1ZTsKK3N0YXRpYyBib29sIHNraXBUcmFp bGluZ05ld2xpbmUgPSBmYWxzZTsKIHN0YXRpYyBib29sIGVtcHR5UnVuID0gdHJ1ZTsKIHN0YXRp YyBpbnQgbnVtU3BhY2VzOwogCkBAIC0xMDA4LDE4ICsxMDA5LDE3IEBAIHZvaWQgUmVuZGVyQmxv Y2s6OmJpZGlSZW9yZGVyTGluZShjb25zdCAKICAgICBiaWRpLmN1cnJlbnQgPSBzdGFydDsKICAg ICBiaWRpLmxhc3QgPSBiaWRpLmN1cnJlbnQ7CiAgICAgYm9vbCBwYXN0RW5kID0gZmFsc2U7Ci0g ICAgYm9vbCByZXNldEJpZGlBdEVuZCA9IGZhbHNlOwogICAgIEJpZGlTdGF0ZSBzdGF0ZUF0RW5k OwogCiAgICAgd2hpbGUgKHRydWUpIHsKICAgICAgICAgUUNoYXI6OkRpcmVjdGlvbiBkaXJDdXJy ZW50OwotICAgICAgICBpZiAocGFzdEVuZCAmJiAocmVzZXRCaWRpQXRFbmQgfHwgYmlkaS5jdXJy ZW50LmF0RW5kKCkpKSB7CisgICAgICAgIGlmIChwYXN0RW5kICYmIChwcmV2aW91c0xpbmVCcm9r ZUNsZWFubHkgfHwgYmlkaS5jdXJyZW50LmF0RW5kKCkpKSB7CiAgICAgICAgICAgICAvL2tkRGVi dWcoNjA0MSkgPDwgImF0RW5kIiA8PCBlbmRsOwogICAgICAgICAgICAgQmlkaUNvbnRleHQgKmMg PSBiaWRpLmNvbnRleHQuZ2V0KCk7CiAgICAgICAgICAgICB3aGlsZSAoYy0+cGFyZW50KQogICAg ICAgICAgICAgICAgIGMgPSBjLT5wYXJlbnQ7CiAgICAgICAgICAgICBkaXJDdXJyZW50ID0gYy0+ ZGlyOwotICAgICAgICAgICAgaWYgKHJlc2V0QmlkaUF0RW5kKSB7CisgICAgICAgICAgICBpZiAo cHJldmlvdXNMaW5lQnJva2VDbGVhbmx5KSB7CiAgICAgICAgICAgICAgICAgLy8gQSBkZXZpYXRp b24gZnJvbSB0aGUgVW5pY29kZSBCaWRpIEFsZ29yaXRobSBpbiBvcmRlciB0byBtYXRjaAogICAg ICAgICAgICAgICAgIC8vIE1hYyBPUyBYIHRleHQgYW5kIFdpbklFOiBhIGhhcmQgbGluZSBicmVh ayByZXNldHMgYmlkaSBzdGF0ZS4KICAgICAgICAgICAgICAgICBzdGF0ZUF0RW5kLmNvbnRleHQg PSBjOwpAQCAtMTM2MCw3ICsxMzYwLDYgQEAgdm9pZCBSZW5kZXJCbG9jazo6YmlkaVJlb3JkZXJM aW5lKGNvbnN0IAogICAgICAgICAgICAgc3RhdGVBdEVuZCA9IGJpZGk7CiAgICAgICAgICAgICBi aWRpLmVuZE9mTGluZSA9IGJpZGkubGFzdDsKICAgICAgICAgICAgIHBhc3RFbmQgPSB0cnVlOwot ICAgICAgICAgICAgcmVzZXRCaWRpQXRFbmQgPSBwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkgfHwg KGVuZC5vYmogJiYgZW5kLm9iai0+c3R5bGUoKS0+cHJlc2VydmVOZXdsaW5lKCkgJiYgZW5kLmN1 cnJlbnQoKSA9PSAnXG4nKTsKICAgICAgICAgfQogICAgIH0KIApAQCAtMTYyOCw3ICsxNjI3LDcg QEAgSW50UmVjdCBSZW5kZXJCbG9jazo6bGF5b3V0SW5saW5lQ2hpbGRyZQogICAgICAgICAgICAg ICAgICAgICB9CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIAotICAgICAgICAg ICAgICAgIGlmIChlbmQgPT0gc3RhcnQgfHwgKCFwcmV2aW91c0xpbmVCcm9rZUNsZWFubHkgJiYg ZW5kLm9iaiAmJiBlbmQub2JqLT5zdHlsZSgpLT5wcmVzZXJ2ZU5ld2xpbmUoKSAmJiBlbmQuY3Vy cmVudCgpID09ICdcbicpKSB7CisgICAgICAgICAgICAgICAgaWYgKGVuZCA9PSBzdGFydCB8fCBz a2lwVHJhaWxpbmdOZXdsaW5lKSB7CiAgICAgICAgICAgICAgICAgICAgIGJpZGkuYWRqdXN0RW1i ZWRkaW5nID0gdHJ1ZTsKICAgICAgICAgICAgICAgICAgICAgZW5kLmluY3JlbWVudChiaWRpKTsK ICAgICAgICAgICAgICAgICAgICAgYmlkaS5hZGp1c3RFbWJlZGRpbmcgPSBmYWxzZTsKQEAgLTE5 NzMsNiArMTk3Miw3IEBAIEJpZGlJdGVyYXRvciBSZW5kZXJCbG9jazo6ZmluZE5leHRMaW5lQnIK IAogICAgIGJvb2wgcHJldkxpbmVCcm9rZUNsZWFubHkgPSBwcmV2aW91c0xpbmVCcm9rZUNsZWFu bHk7CiAgICAgcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5ID0gZmFsc2U7CisgICAgc2tpcFRyYWls aW5nTmV3bGluZSA9IGZhbHNlOwogICAgIAogICAgIHdoaWxlIChvKSB7CiAgICAgICAgIGlmIChv LT5pc0JSKCkpIHsKQEAgLTIyNDYsNiArMjI0NiwxMCBAQCBCaWRpSXRlcmF0b3IgUmVuZGVyQmxv Y2s6OmZpbmROZXh0TGluZUJyCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBz a2lwV2hpdGVzcGFjZShsQnJlYWssIGJpZGkpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGlmIChsQnJlYWsub2JqICYmIGxCcmVhay5vYmotPnN0eWxlKCktPnByZXNlcnZl TmV3bGluZSgpICYmIGxCcmVhay5vYmotPmlzVGV4dCgpICYmIHN0YXRpY19jYXN0PFJlbmRlclRl eHQqPihsQnJlYWsub2JqKS0+dGV4dCgpW2xCcmVhay5wb3NdID09ICdcbicpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcHJldmlvdXNMaW5lQnJva2VDbGVhbmx5ID0gdHJ1ZTsK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2tpcFRyYWlsaW5nTmV3bGluZSA9IHRy dWU7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGdvdG8gZW5kOyAvLyBEaWRuJ3QgZml0LiBKdW1wIHRvIHRoZSBlbmQuCiAgICAgICAg ICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlm IChtaWRXb3JkQnJlYWspCkBAIC0yMjU2LDkgKzIyNjAsMTEgQEAgQmlkaUl0ZXJhdG9yIFJlbmRl ckJsb2NrOjpmaW5kTmV4dExpbmVCcgogICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgICAgICAgICAgaWYgKCooc3RyK3BvcykgPT0g J1xuJyAmJiBvLT5zdHlsZSgpLT5wcmVzZXJ2ZU5ld2xpbmUoKSkgeworICAgICAgICAgICAgICAg ICAgICBpZiAoYyA9PSAnXG4nICYmIG8tPnN0eWxlKCktPnByZXNlcnZlTmV3bGluZSgpKSB7CiAg ICAgICAgICAgICAgICAgICAgICAgICBsQnJlYWsub2JqID0gbzsKICAgICAgICAgICAgICAgICAg ICAgICAgIGxCcmVhay5wb3MgPSBwb3M7CisgICAgICAgICAgICAgICAgICAgICAgICBwcmV2aW91 c0xpbmVCcm9rZUNsZWFubHkgPSB0cnVlOworICAgICAgICAgICAgICAgICAgICAgICAgc2tpcFRy YWlsaW5nTmV3bGluZSA9IHRydWU7CiAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gbEJy ZWFrOwogICAgICAgICAgICAgICAgICAgICB9CiAK