7392 2006-02-20 11:34:28 -0800 GMAIL: XMLHttpRequest does not correctly report "Interactive" state on receipt of load data 2019-02-06 09:03:42 -0800 1 1 1 Unclassified WebKit DOM 420+ Mac OS X 10.4 RESOLVED FIXED InRadar P2 Normal --- 1 eric eric ap cdumez oldest_to_newest 33513 0 eric 2006-02-20 11:34:28 -0800 GMAIL: XMLHttpRequest does not correctly report "Interactive" state on receipt of load data Simple fix (and cleanup) attached. This blocks GMail chat in Safari. 33514 1 6627 eric 2006-02-20 11:35:04 -0800 Created attachment 6627 simple fix (and a little cleanup) 33516 2 6627 darin 2006-02-20 11:42:03 -0800 Comment on attachment 6627 simple fix (and a little cleanup) I think it's awkward to have changeState have a side effect of always calling the listener if the passed state is Interactive. Seems like the wrong name for a function that will both change state and have this particular side effect. I'd suggest instead doing something different at the caller in XMLHttpRequest::slotData; maybe code that detects the state and calls callReadyStateChangeListener explicitly if we're already in "interactive" state? Also, I think that putting this code into a separate function makes the logic a little weaker, because now the guarantee that the load event is sent exactly once is pretty subtle. If anyone called callReadyStateChangeListener an extra time when the state was already Completed, we'd fire a separate load event. The fix looks good, but I think it can be done in a way that's slightly clearer. 33517 3 darin 2006-02-20 11:47:32 -0800 Sorry, I see now that you already went one round with John Sullivan on trying to make this clearer. However, even given that I still think there's room for improvement. 33518 4 6628 eric 2006-02-20 11:55:14 -0800 Created attachment 6628 Addressing Darin's concerns 33519 5 eric 2006-02-20 11:56:21 -0800 This is also in Radar: <rdar://problem/4449442> GMAIL: XMLHttpRequest does not correctly report "Interactive" state on receipt of load data 33520 6 ap 2006-02-20 12:00:23 -0800 Just for the record: the current version of Web Applications spec says "A readystatechange event shall immediately be dispatched at the object whenever the readyState attribute changes value. The readystatechange event must never be dispatched by the UA if the readyState attribute did not change." But I agree that such behavior doesn't sound right. 33524 7 6628 darin 2006-02-20 12:19:23 -0800 Comment on attachment 6628 Addressing Darin's concerns Typo, "recieves" instead of "receives". Looks fine, r=me. 33859 8 ap 2006-02-24 01:19:05 -0800 A test for this is http/tests/xmlhttprequest/interactive-state.html 1503019 9 lforschler 2019-02-06 09:03:42 -0800 Mass moving XML DOM bugs to the "DOM" Component. 6627 2006-02-20 11:35:04 -0800 2006-02-20 11:55:14 -0800 simple fix (and a little cleanup) gmail.patch text/plain 5324 eric SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTAx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDYtMDIt MjAgIEVyaWMgU2VpZGVsICA8ZXNlaWRlbEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ0NDk0NDI+IEdN QUlMOiBYTUxIdHRwUmVxdWVzdCBkb2VzIG5vdCBjb3JyZWN0bHkgcmVwb3J0ICJJbnRlcmFjdGl2 ZSIgc3RhdGUgb24gcmVjZWlwdCBvZiBsb2FkIGRhdGEKKyAgICAgICAgQWxzbyBjbGVhbmVkIHVw IHNwYWNpbmcgYSBsaXR0bGUuCisKKyAgICAgICAgTm8gbGF5b3V0IHRlc3QgcG9zc2libGUgKGxv Y2FsIGxvYWRzIGFyZSBub24gaW5jcmVtZW50YWwpLgorCisgICAgICAgICogeG1sL3htbGh0dHBy ZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjaGFuZ2VTdGF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6c2xvdERhdGEpOgorCiAyMDA2 LTAyLTIwICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBNYWNpZWouCkluZGV4OiB4bWwveG1saHR0cHJlcXVlc3QuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB4 bWwveG1saHR0cHJlcXVlc3QuaAkocmV2aXNpb24gMTI5MDEpCisrKyB4bWwveG1saHR0cHJlcXVl c3QuaAkod29ya2luZyBjb3B5KQpAQCAtOTMsNiArOTMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgc3RhdGljIFFTdHJpbmcgZ2V0U3BlY2lmaWNIZWFkZXIoY29uc3QgUVN0cmluZyYgaGVh ZGVycywgY29uc3QgUVN0cmluZyYgbmFtZSk7CiAKICAgICB2b2lkIGNoYW5nZVN0YXRlKFhNTEh0 dHBSZXF1ZXN0U3RhdGUgbmV3U3RhdGUpOworICAgIHZvaWQgY2FsbFJlYWR5U3RhdGVDaGFuZ2VM aXN0ZW5lcigpOwogCiAgICAgdHlwZWRlZiBIYXNoU2V0PFhNTEh0dHBSZXF1ZXN0Kj4gUmVxdWVz dHNTZXQ7CiAgICAgdHlwZWRlZiBIYXNoTWFwPERvY3VtZW50SW1wbCosIFJlcXVlc3RzU2V0Kj4g UmVxdWVzdHNNYXA7CkluZGV4OiB4bWwveG1saHR0cHJlcXVlc3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHhtbC94bWxodHRwcmVxdWVzdC5jcHAJKHJldmlzaW9uIDEyOTAxKQorKysgeG1sL3htbGh0dHBy ZXF1ZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU0LDkgKzE1NCwxNSBAQCBYTUxIdHRwUmVx dWVzdDo6flhNTEh0dHBSZXF1ZXN0KCkKIAogdm9pZCBYTUxIdHRwUmVxdWVzdDo6Y2hhbmdlU3Rh dGUoWE1MSHR0cFJlcXVlc3RTdGF0ZSBuZXdTdGF0ZSkKIHsKLSAgaWYgKHN0YXRlICE9IG5ld1N0 YXRlKSB7CisgICAgYm9vbCBzdGF0ZURpZENoYW5nZSA9IChuZXdTdGF0ZSAhPSBzdGF0ZSk7CiAg ICAgc3RhdGUgPSBuZXdTdGF0ZTsKLSAgICAKKworICAgIGlmIChzdGF0ZURpZENoYW5nZSB8fCBu ZXdTdGF0ZSA9PSBJbnRlcmFjdGl2ZSkKKyAgICAgICAgY2FsbFJlYWR5U3RhdGVDaGFuZ2VMaXN0 ZW5lcigpOworfQorCit2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjYWxsUmVhZHlTdGF0ZUNoYW5nZUxp c3RlbmVyKCkKK3sKICAgICBpZiAoZG9jICYmIGRvYy0+ZnJhbWUoKSAmJiBtX29uUmVhZHlTdGF0 ZUNoYW5nZUxpc3RlbmVyKSB7CiAgICAgICBpbnQgaWdub3JlRXhjZXB0aW9uOwogICAgICAgUmVm UHRyPEV2ZW50SW1wbD4gZXYgPSBkb2MtPmNyZWF0ZUV2ZW50KCJIVE1MRXZlbnRzIiwgaWdub3Jl RXhjZXB0aW9uKTsKQEAgLTE3MCw3ICsxNzYsNiBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjaGFu Z2VTdGF0ZShYTUxIdHRwCiAgICAgICBldi0+aW5pdEV2ZW50KGxvYWRFdmVudCwgdHJ1ZSwgdHJ1 ZSk7CiAgICAgICBtX29uTG9hZExpc3RlbmVyLT5oYW5kbGVFdmVudEltcGwoZXYuZ2V0KCksIHRy dWUpOwogICAgIH0KLSAgfQogfQogCiBib29sIFhNTEh0dHBSZXF1ZXN0Ojp1cmxNYXRjaGVzRG9j dW1lbnREb21haW4oY29uc3QgS1VSTCYgX3VybCkgY29uc3QKQEAgLTMzMCw5ICszMzUsOCBAQCB2 b2lkIFhNTEh0dHBSZXF1ZXN0OjpvdmVycmlkZU1JTUVUeXBlKGNvCiAKIHZvaWQgWE1MSHR0cFJl cXVlc3Q6OnNldFJlcXVlc3RIZWFkZXIoY29uc3QgRE9NU3RyaW5nJiBuYW1lLCBjb25zdCBET01T dHJpbmcgJnZhbHVlKQogewotICBpZiAocmVxdWVzdEhlYWRlcnMubGVuZ3RoKCkgPiAwKSB7Cisg IGlmIChyZXF1ZXN0SGVhZGVycy5sZW5ndGgoKSA+IDApCiAgICAgcmVxdWVzdEhlYWRlcnMgKz0g IlxyXG4iOwotICB9CiAgIHJlcXVlc3RIZWFkZXJzICs9IG5hbWUucXN0cmluZygpOwogICByZXF1 ZXN0SGVhZGVycyArPSAiOiAiOwogICByZXF1ZXN0SGVhZGVycyArPSB2YWx1ZS5xc3RyaW5nKCk7 CkBAIC0zNDUsMTUgKzM0OSwxMyBAQCBRU3RyaW5nIFhNTEh0dHBSZXF1ZXN0OjpnZXRSZXF1ZXN0 SGVhZGVyCiAKIERPTVN0cmluZyBYTUxIdHRwUmVxdWVzdDo6Z2V0QWxsUmVzcG9uc2VIZWFkZXJz KCkgY29uc3QKIHsKLSAgaWYgKHJlc3BvbnNlSGVhZGVycy5pc0VtcHR5KCkpIHsKKyAgaWYgKHJl c3BvbnNlSGVhZGVycy5pc0VtcHR5KCkpCiAgICAgcmV0dXJuIERPTVN0cmluZygpOwotICB9CiAK ICAgaW50IGVuZE9mTGluZSA9IHJlc3BvbnNlSGVhZGVycy5maW5kKCJcbiIpOwogCi0gIGlmIChl bmRPZkxpbmUgPT0gLTEpIHsKKyAgaWYgKGVuZE9mTGluZSA9PSAtMSkKICAgICByZXR1cm4gRE9N U3RyaW5nKCk7Ci0gIH0KIAogICByZXR1cm4gcmVzcG9uc2VIZWFkZXJzLm1pZChlbmRPZkxpbmUg KyAxKSArICJcbiI7CiB9CkBAIC0zNzMsOSArMzc1LDggQEAgUVN0cmluZyBYTUxIdHRwUmVxdWVz dDo6Z2V0U3BlY2lmaWNIZWFkZQogICBpbnQgbWF0Y2hMZW5ndGg7CiAgIGludCBoZWFkZXJMaW5l UG9zID0gaGVhZGVyTGluZVBhdHRlcm4ubWF0Y2goaGVhZGVycywgMCwgJm1hdGNoTGVuZ3RoKTsK ICAgd2hpbGUgKGhlYWRlckxpbmVQb3MgIT0gLTEpIHsKLSAgICBpZiAoaGVhZGVyTGluZVBvcyA9 PSAwIHx8IGhlYWRlcnNbaGVhZGVyTGluZVBvcy0xXSA9PSAnXG4nKSB7CisgICAgaWYgKGhlYWRl ckxpbmVQb3MgPT0gMCB8fCBoZWFkZXJzW2hlYWRlckxpbmVQb3MtMV0gPT0gJ1xuJykKICAgICAg IGJyZWFrOwotICAgIH0KICAgICAKICAgICBoZWFkZXJMaW5lUG9zID0gaGVhZGVyTGluZVBhdHRl cm4ubWF0Y2goaGVhZGVycywgaGVhZGVyTGluZVBvcyArIDEsICZtYXRjaExlbmd0aCk7CiAgIH0K QEAgLTQyNCwxOCArNDI1LDE2IEBAIGludCBYTUxIdHRwUmVxdWVzdDo6Z2V0U3RhdHVzKCkgY29u c3QKIAogRE9NU3RyaW5nIFhNTEh0dHBSZXF1ZXN0OjpnZXRTdGF0dXNUZXh0KCkgY29uc3QKIHsK LSAgaWYgKHJlc3BvbnNlSGVhZGVycy5pc0VtcHR5KCkpIHsKKyAgaWYgKHJlc3BvbnNlSGVhZGVy cy5pc0VtcHR5KCkpCiAgICAgcmV0dXJuIERPTVN0cmluZygpOwotICB9CiAgIAogICBpbnQgZW5k T2ZMaW5lID0gcmVzcG9uc2VIZWFkZXJzLmZpbmQoIlxuIik7CiAgIFFTdHJpbmcgZmlyc3RMaW5l ID0gZW5kT2ZMaW5lID09IC0xID8gcmVzcG9uc2VIZWFkZXJzIDogcmVzcG9uc2VIZWFkZXJzLmxl ZnQoZW5kT2ZMaW5lKTsKICAgaW50IGNvZGVTdGFydCA9IGZpcnN0TGluZS5maW5kKCIgIik7CiAg IGludCBjb2RlRW5kID0gZmlyc3RMaW5lLmZpbmQoIiAiLCBjb2RlU3RhcnQgKyAxKTsKIAotICBp ZiAoY29kZVN0YXJ0ID09IC0xIHx8IGNvZGVFbmQgPT0gLTEpIHsKKyAgaWYgKGNvZGVTdGFydCA9 PSAtMSB8fCBjb2RlRW5kID09IC0xKQogICAgIHJldHVybiBET01TdHJpbmcoKTsKLSAgfQogICAK ICAgUVN0cmluZyBzdGF0dXNUZXh0ID0gZmlyc3RMaW5lLm1pZChjb2RlRW5kICsgMSwgZW5kT2ZM aW5lIC0gKGNvZGVFbmQgKyAxKSkuc3RyaXBXaGl0ZVNwYWNlKCk7CiAgIApAQCAtNDUxLDkgKzQ1 MCw4IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OnByb2Nlc3NTeW5jTG9hZFJlc3UKICAgCiAgIHJl c3BvbnNlSGVhZGVycyA9IGhlYWRlcnM7CiAgIGNoYW5nZVN0YXRlKExvYWRlZCk7Ci0gIGlmIChh Ym9ydGVkKSB7CisgIGlmIChhYm9ydGVkKQogICAgIHJldHVybjsKLSAgfQogICAKICAgY29uc3Qg Y2hhciAqYnl0ZXMgPSAoY29uc3QgY2hhciAqKWRhdGEuZGF0YSgpOwogICBpbnQgbGVuID0gKGlu dClkYXRhLnNpemUoKTsKQEAgLTQ5Niw5ICs0OTQsOCBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0Ojpz bG90RmluaXNoZWQoSm9iKikKIAogdm9pZCBYTUxIdHRwUmVxdWVzdDo6c2xvdFJlZGlyZWN0aW9u KEpvYiosIGNvbnN0IEtVUkwmIHVybCkKIHsKLSAgaWYgKCF1cmxNYXRjaGVzRG9jdW1lbnREb21h aW4odXJsKSkgeworICBpZiAoIXVybE1hdGNoZXNEb2N1bWVudERvbWFpbih1cmwpKQogICAgIGFi b3J0KCk7Ci0gIH0KIH0KIAogdm9pZCBYTUxIdHRwUmVxdWVzdDo6c2xvdERhdGEoSm9iKiwgY29u c3QgY2hhciAqZGF0YSwgaW50IGxlbikKQEAgLTUxOSwxMCArNTE2LDkgQEAgdm9pZCBYTUxIdHRw UmVxdWVzdDo6c2xvdERhdGEoSm9iKiwgY29ucwogICAgIGRlY29kZXIgPSBuZXcgRGVjb2RlcjsK ICAgICBpZiAoIWVuY29kaW5nLmlzRW1wdHkoKSkKICAgICAgIGRlY29kZXItPnNldEVuY29kaW5n KGVuY29kaW5nLmxhdGluMSgpLCBEZWNvZGVyOjpFbmNvZGluZ0Zyb21IVFRQSGVhZGVyKTsKLSAg ICBlbHNlIHsKKyAgICBlbHNlCiAgICAgICAvLyBvbmx5IGFsbG93IERlY29kZXIgdG8gbG9vayBp bnNpZGUgdGhlIHJlc3BvbnNlIGlmIGl0J3MgWE1MCiAgICAgICBkZWNvZGVyLT5zZXRFbmNvZGlu ZygiVVRGLTgiLCByZXNwb25zZUlzWE1MKCkgPyBEZWNvZGVyOjpEZWZhdWx0RW5jb2RpbmcgOiBE ZWNvZGVyOjpFbmNvZGluZ0Zyb21IVFRQSGVhZGVyKTsKLSAgICB9CiAgIH0KICAgaWYgKGxlbiA9 PSAwKQogICAgIHJldHVybjsKQEAgLTUzNCw5ICs1MzAsOCBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0 OjpzbG90RGF0YShKb2IqLCBjb25zCiAKICAgcmVzcG9uc2UgKz0gZGVjb2RlZDsKIAotICBpZiAo IWFib3J0ZWQpIHsKKyAgaWYgKCFhYm9ydGVkKQogICAgIGNoYW5nZVN0YXRlKEludGVyYWN0aXZl KTsKLSAgfQogfQogCiBYTUxIdHRwUmVxdWVzdDo6UmVxdWVzdHNNYXAmIFhNTEh0dHBSZXF1ZXN0 OjpyZXF1ZXN0c0J5RG9jdW1lbnQoKQo= 6628 2006-02-20 11:55:14 -0800 2006-02-20 12:19:23 -0800 Addressing Darin's concerns gmail.patch text/plain 5399 eric SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDEyOTAx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDYtMDIt MjAgIEVyaWMgU2VpZGVsICA8ZXNlaWRlbEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzQ0NDk0NDI+IEdN QUlMOiBYTUxIdHRwUmVxdWVzdCBkb2VzIG5vdCBjb3JyZWN0bHkgcmVwb3J0ICJJbnRlcmFjdGl2 ZSIgc3RhdGUgb24gcmVjZWlwdCBvZiBsb2FkIGRhdGEKKyAgICAgICAgQWxzbyBjbGVhbmVkIHVw IHNwYWNpbmcgYSBsaXR0bGUuCisKKyAgICAgICAgTm8gbGF5b3V0IHRlc3QgcG9zc2libGUgKGxv Y2FsIGxvYWRzIGFyZSBub24gaW5jcmVtZW50YWwpLgorCisgICAgICAgICogeG1sL3htbGh0dHBy ZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjaGFuZ2VTdGF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpYTUxIdHRwUmVxdWVzdDo6c2xvdERhdGEpOgorCiAyMDA2 LTAyLTIwICBEYXJpbiBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdl ZCBieSBNYWNpZWouCkluZGV4OiB4bWwveG1saHR0cHJlcXVlc3QuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB4 bWwveG1saHR0cHJlcXVlc3QuaAkocmV2aXNpb24gMTI5MDEpCisrKyB4bWwveG1saHR0cHJlcXVl c3QuaAkod29ya2luZyBjb3B5KQpAQCAtOTMsNiArOTMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgc3RhdGljIFFTdHJpbmcgZ2V0U3BlY2lmaWNIZWFkZXIoY29uc3QgUVN0cmluZyYgaGVh ZGVycywgY29uc3QgUVN0cmluZyYgbmFtZSk7CiAKICAgICB2b2lkIGNoYW5nZVN0YXRlKFhNTEh0 dHBSZXF1ZXN0U3RhdGUgbmV3U3RhdGUpOworICAgIHZvaWQgY2FsbFJlYWR5U3RhdGVDaGFuZ2VM aXN0ZW5lcigpOwogCiAgICAgdHlwZWRlZiBIYXNoU2V0PFhNTEh0dHBSZXF1ZXN0Kj4gUmVxdWVz dHNTZXQ7CiAgICAgdHlwZWRlZiBIYXNoTWFwPERvY3VtZW50SW1wbCosIFJlcXVlc3RzU2V0Kj4g UmVxdWVzdHNNYXA7CkluZGV4OiB4bWwveG1saHR0cHJlcXVlc3QuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IHhtbC94bWxodHRwcmVxdWVzdC5jcHAJKHJldmlzaW9uIDEyOTAxKQorKysgeG1sL3htbGh0dHBy ZXF1ZXN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTU0LDkgKzE1NCwxNCBAQCBYTUxIdHRwUmVx dWVzdDo6flhNTEh0dHBSZXF1ZXN0KCkKIAogdm9pZCBYTUxIdHRwUmVxdWVzdDo6Y2hhbmdlU3Rh dGUoWE1MSHR0cFJlcXVlc3RTdGF0ZSBuZXdTdGF0ZSkKIHsKLSAgaWYgKHN0YXRlICE9IG5ld1N0 YXRlKSB7Ci0gICAgc3RhdGUgPSBuZXdTdGF0ZTsKLSAgICAKKyAgICBpZiAoc3RhdGUgIT0gbmV3 U3RhdGUpIHsKKyAgICAgICAgc3RhdGUgPSBuZXdTdGF0ZTsKKyAgICAgICAgY2FsbFJlYWR5U3Rh dGVDaGFuZ2VMaXN0ZW5lcigpOworICAgIH0KK30KKwordm9pZCBYTUxIdHRwUmVxdWVzdDo6Y2Fs bFJlYWR5U3RhdGVDaGFuZ2VMaXN0ZW5lcigpCit7CiAgICAgaWYgKGRvYyAmJiBkb2MtPmZyYW1l KCkgJiYgbV9vblJlYWR5U3RhdGVDaGFuZ2VMaXN0ZW5lcikgewogICAgICAgaW50IGlnbm9yZUV4 Y2VwdGlvbjsKICAgICAgIFJlZlB0cjxFdmVudEltcGw+IGV2ID0gZG9jLT5jcmVhdGVFdmVudCgi SFRNTEV2ZW50cyIsIGlnbm9yZUV4Y2VwdGlvbik7CkBAIC0xNzAsNyArMTc1LDYgQEAgdm9pZCBY TUxIdHRwUmVxdWVzdDo6Y2hhbmdlU3RhdGUoWE1MSHR0cAogICAgICAgZXYtPmluaXRFdmVudChs b2FkRXZlbnQsIHRydWUsIHRydWUpOwogICAgICAgbV9vbkxvYWRMaXN0ZW5lci0+aGFuZGxlRXZl bnRJbXBsKGV2LmdldCgpLCB0cnVlKTsKICAgICB9Ci0gIH0KIH0KIAogYm9vbCBYTUxIdHRwUmVx dWVzdDo6dXJsTWF0Y2hlc0RvY3VtZW50RG9tYWluKGNvbnN0IEtVUkwmIF91cmwpIGNvbnN0CkBA IC0zMzAsOSArMzM0LDggQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6b3ZlcnJpZGVNSU1FVHlwZShj bwogCiB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpzZXRSZXF1ZXN0SGVhZGVyKGNvbnN0IERPTVN0cmlu ZyYgbmFtZSwgY29uc3QgRE9NU3RyaW5nICZ2YWx1ZSkKIHsKLSAgaWYgKHJlcXVlc3RIZWFkZXJz Lmxlbmd0aCgpID4gMCkgeworICBpZiAocmVxdWVzdEhlYWRlcnMubGVuZ3RoKCkgPiAwKQogICAg IHJlcXVlc3RIZWFkZXJzICs9ICJcclxuIjsKLSAgfQogICByZXF1ZXN0SGVhZGVycyArPSBuYW1l LnFzdHJpbmcoKTsKICAgcmVxdWVzdEhlYWRlcnMgKz0gIjogIjsKICAgcmVxdWVzdEhlYWRlcnMg Kz0gdmFsdWUucXN0cmluZygpOwpAQCAtMzQ1LDE1ICszNDgsMTMgQEAgUVN0cmluZyBYTUxIdHRw UmVxdWVzdDo6Z2V0UmVxdWVzdEhlYWRlcgogCiBET01TdHJpbmcgWE1MSHR0cFJlcXVlc3Q6Omdl dEFsbFJlc3BvbnNlSGVhZGVycygpIGNvbnN0CiB7Ci0gIGlmIChyZXNwb25zZUhlYWRlcnMuaXNF bXB0eSgpKSB7CisgIGlmIChyZXNwb25zZUhlYWRlcnMuaXNFbXB0eSgpKQogICAgIHJldHVybiBE T01TdHJpbmcoKTsKLSAgfQogCiAgIGludCBlbmRPZkxpbmUgPSByZXNwb25zZUhlYWRlcnMuZmlu ZCgiXG4iKTsKIAotICBpZiAoZW5kT2ZMaW5lID09IC0xKSB7CisgIGlmIChlbmRPZkxpbmUgPT0g LTEpCiAgICAgcmV0dXJuIERPTVN0cmluZygpOwotICB9CiAKICAgcmV0dXJuIHJlc3BvbnNlSGVh ZGVycy5taWQoZW5kT2ZMaW5lICsgMSkgKyAiXG4iOwogfQpAQCAtMzczLDkgKzM3NCw4IEBAIFFT dHJpbmcgWE1MSHR0cFJlcXVlc3Q6OmdldFNwZWNpZmljSGVhZGUKICAgaW50IG1hdGNoTGVuZ3Ro OwogICBpbnQgaGVhZGVyTGluZVBvcyA9IGhlYWRlckxpbmVQYXR0ZXJuLm1hdGNoKGhlYWRlcnMs IDAsICZtYXRjaExlbmd0aCk7CiAgIHdoaWxlIChoZWFkZXJMaW5lUG9zICE9IC0xKSB7Ci0gICAg aWYgKGhlYWRlckxpbmVQb3MgPT0gMCB8fCBoZWFkZXJzW2hlYWRlckxpbmVQb3MtMV0gPT0gJ1xu JykgeworICAgIGlmIChoZWFkZXJMaW5lUG9zID09IDAgfHwgaGVhZGVyc1toZWFkZXJMaW5lUG9z LTFdID09ICdcbicpCiAgICAgICBicmVhazsKLSAgICB9CiAgICAgCiAgICAgaGVhZGVyTGluZVBv cyA9IGhlYWRlckxpbmVQYXR0ZXJuLm1hdGNoKGhlYWRlcnMsIGhlYWRlckxpbmVQb3MgKyAxLCAm bWF0Y2hMZW5ndGgpOwogICB9CkBAIC00MjQsMTggKzQyNCwxNiBAQCBpbnQgWE1MSHR0cFJlcXVl c3Q6OmdldFN0YXR1cygpIGNvbnN0CiAKIERPTVN0cmluZyBYTUxIdHRwUmVxdWVzdDo6Z2V0U3Rh dHVzVGV4dCgpIGNvbnN0CiB7Ci0gIGlmIChyZXNwb25zZUhlYWRlcnMuaXNFbXB0eSgpKSB7Cisg IGlmIChyZXNwb25zZUhlYWRlcnMuaXNFbXB0eSgpKQogICAgIHJldHVybiBET01TdHJpbmcoKTsK LSAgfQogICAKICAgaW50IGVuZE9mTGluZSA9IHJlc3BvbnNlSGVhZGVycy5maW5kKCJcbiIpOwog ICBRU3RyaW5nIGZpcnN0TGluZSA9IGVuZE9mTGluZSA9PSAtMSA/IHJlc3BvbnNlSGVhZGVycyA6 IHJlc3BvbnNlSGVhZGVycy5sZWZ0KGVuZE9mTGluZSk7CiAgIGludCBjb2RlU3RhcnQgPSBmaXJz dExpbmUuZmluZCgiICIpOwogICBpbnQgY29kZUVuZCA9IGZpcnN0TGluZS5maW5kKCIgIiwgY29k ZVN0YXJ0ICsgMSk7CiAKLSAgaWYgKGNvZGVTdGFydCA9PSAtMSB8fCBjb2RlRW5kID09IC0xKSB7 CisgIGlmIChjb2RlU3RhcnQgPT0gLTEgfHwgY29kZUVuZCA9PSAtMSkKICAgICByZXR1cm4gRE9N U3RyaW5nKCk7Ci0gIH0KICAgCiAgIFFTdHJpbmcgc3RhdHVzVGV4dCA9IGZpcnN0TGluZS5taWQo Y29kZUVuZCArIDEsIGVuZE9mTGluZSAtIChjb2RlRW5kICsgMSkpLnN0cmlwV2hpdGVTcGFjZSgp OwogICAKQEAgLTQ1MSw5ICs0NDksOCBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0Ojpwcm9jZXNzU3lu Y0xvYWRSZXN1CiAgIAogICByZXNwb25zZUhlYWRlcnMgPSBoZWFkZXJzOwogICBjaGFuZ2VTdGF0 ZShMb2FkZWQpOwotICBpZiAoYWJvcnRlZCkgeworICBpZiAoYWJvcnRlZCkKICAgICByZXR1cm47 Ci0gIH0KICAgCiAgIGNvbnN0IGNoYXIgKmJ5dGVzID0gKGNvbnN0IGNoYXIgKilkYXRhLmRhdGEo KTsKICAgaW50IGxlbiA9IChpbnQpZGF0YS5zaXplKCk7CkBAIC00OTYsOSArNDkzLDggQEAgdm9p ZCBYTUxIdHRwUmVxdWVzdDo6c2xvdEZpbmlzaGVkKEpvYiopCiAKIHZvaWQgWE1MSHR0cFJlcXVl c3Q6OnNsb3RSZWRpcmVjdGlvbihKb2IqLCBjb25zdCBLVVJMJiB1cmwpCiB7Ci0gIGlmICghdXJs TWF0Y2hlc0RvY3VtZW50RG9tYWluKHVybCkpIHsKKyAgaWYgKCF1cmxNYXRjaGVzRG9jdW1lbnRE b21haW4odXJsKSkKICAgICBhYm9ydCgpOwotICB9CiB9CiAKIHZvaWQgWE1MSHR0cFJlcXVlc3Q6 OnNsb3REYXRhKEpvYiosIGNvbnN0IGNoYXIgKmRhdGEsIGludCBsZW4pCkBAIC01MTksMTAgKzUx NSw5IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OnNsb3REYXRhKEpvYiosIGNvbnMKICAgICBkZWNv ZGVyID0gbmV3IERlY29kZXI7CiAgICAgaWYgKCFlbmNvZGluZy5pc0VtcHR5KCkpCiAgICAgICBk ZWNvZGVyLT5zZXRFbmNvZGluZyhlbmNvZGluZy5sYXRpbjEoKSwgRGVjb2Rlcjo6RW5jb2RpbmdG cm9tSFRUUEhlYWRlcik7Ci0gICAgZWxzZSB7CisgICAgZWxzZQogICAgICAgLy8gb25seSBhbGxv dyBEZWNvZGVyIHRvIGxvb2sgaW5zaWRlIHRoZSByZXNwb25zZSBpZiBpdCdzIFhNTAogICAgICAg ZGVjb2Rlci0+c2V0RW5jb2RpbmcoIlVURi04IiwgcmVzcG9uc2VJc1hNTCgpID8gRGVjb2Rlcjo6 RGVmYXVsdEVuY29kaW5nIDogRGVjb2Rlcjo6RW5jb2RpbmdGcm9tSFRUUEhlYWRlcik7Ci0gICAg fQogICB9CiAgIGlmIChsZW4gPT0gMCkKICAgICByZXR1cm47CkBAIC01MzUsNyArNTMwLDExIEBA IHZvaWQgWE1MSHR0cFJlcXVlc3Q6OnNsb3REYXRhKEpvYiosIGNvbnMKICAgcmVzcG9uc2UgKz0g ZGVjb2RlZDsKIAogICBpZiAoIWFib3J0ZWQpIHsKLSAgICBjaGFuZ2VTdGF0ZShJbnRlcmFjdGl2 ZSk7CisgICAgaWYgKHN0YXRlICE9IEludGVyYWN0aXZlKQorICAgICAgICBjaGFuZ2VTdGF0ZShJ bnRlcmFjdGl2ZSk7CisgICAgZWxzZQorICAgICAgICAvLyBGaXJlZm94IGNhbGxzIHJlYWR5U3Rh dGVDaGFuZ2VkIGV2ZXJ5IHRpbWUgaXQgcmVjaWV2ZXMgZGF0YSwgNDQ0OTQ0MgorICAgICAgICBj YWxsUmVhZHlTdGF0ZUNoYW5nZUxpc3RlbmVyKCk7CiAgIH0KIH0KIAo=