90153 2012-06-28 03:36:24 -0700 Web Inspector: [Regression] Resource content is not loaded if Resource.requestContent method is called before network request is finished. 2012-06-29 02:35:39 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 659385 0 vsevik 2012-06-28 03:36:24 -0700 Steps to reproduce: 1) Open webkit.org 2) open main.css in Sources Panel 3) reload several times, try pressing ctrl+r several times very often Sometimes (quite often) main.css is shown in sources panel without any content. This is happening since Resource-NetworkRequest split because Resource.requestContent does not check that associated request was already loaded. Patch to follow. 659438 1 149932 vsevik 2012-06-28 05:34:10 -0700 Created attachment 149932 Patch 660275 2 149932 yurys 2012-06-29 01:43:35 -0700 Comment on attachment 149932 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=149932&action=review > LayoutTests/http/tests/inspector/resource-tree/resource-request-content-while-loading.html:27 > + contentWasRequested = true; No need to set it second time > LayoutTests/http/tests/inspector/resource-tree/resource-request-content-while-loading.html:38 > + if (contentWasLoaded) Page reload reply should always come before _addRequest unless you receive _addRequest for the page that was not reloaded yet. Probably using a synchronously loaded resources would allow to avoid this non-determinism. 660301 3 vsevik 2012-06-29 02:15:23 -0700 Regression introduced in r114116 660313 4 vsevik 2012-06-29 02:33:14 -0700 Committed r121537: <http://trac.webkit.org/changeset/121537> 660318 5 vsevik 2012-06-29 02:35:39 -0700 (In reply to comment #2) > (From update of attachment 149932 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=149932&action=review > > > LayoutTests/http/tests/inspector/resource-tree/resource-request-content-while-loading.html:27 > > + contentWasRequested = true; > > No need to set it second time Done. > > LayoutTests/http/tests/inspector/resource-tree/resource-request-content-while-loading.html:38 > > + if (contentWasLoaded) > > Page reload reply should always come before _addRequest unless you receive _addRequest for the page that was not reloaded yet. Probably using a synchronously loaded resources would allow to avoid this non-determinism. It turned out I didn't need all this page reloaded events, landed without listening to them. 149932 2012-06-28 05:34:10 -0700 2012-06-29 01:43:35 -0700 Patch bug-90153-20120628163409.patch text/plain 12953 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxNDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2YwYmMzZWQxZmFlODA3 MWExZjAzZWJmZWY2OGFmNDFhNzhiMDYyNC4uNmEzZmIyZmU3YzFmYWU0MGExMWZhNjIwMGQ4MTg1 NDU4MjU0YjkxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA2LTI4ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJlc291cmNlIGNvbnRlbnQgaXMgbm90IGxvYWRlZCBpZiBSZXNvdXJjZS5yZXF1ZXN0Q29u dGVudCBtZXRob2QgaXMgY2FsbGVkIGJlZm9yZSBuZXR3b3JrIHJlcXVlc3QgaXMgZmluaXNoZWQu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDE1Mwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGh0 dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXRyZWUvcmVzb3VyY2UtcmVxdWVzdC1jb250ZW50 LXdoaWxlLWxvYWRpbmcuaHRtbAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3 b3JrUmVxdWVzdC5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZS5wcm90b3R5cGUucmVxdWVzdENvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlLnByb3RvdHlwZS5fcmVxdWVzdEZpbmlzaGVkKToKKwogMjAxMi0wNi0yOCAg WW9zaGlmdW1pIElub3VlICA8eW9zaW5AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtQbGF0Zm9y bV0gSW1wbGVtZW50IGZ1bmN0aW9ucyBmb3IgbG9jYWxpemVkIHRpbWUgZm9ybWF0IGluZm9ybWF0 aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdv cmtSZXF1ZXN0LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3Jr UmVxdWVzdC5qcwppbmRleCA3ODYyODUwN2Y5MmUxYTZkZTVhMmY5MTBlZTIxNjJmMGNmZGJiOGJh Li43Zjg5OTVhODc2NmRkM2Y5MDhlOGNhMjViOTViOTIxZDhmYTFhMDYwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMKQEAg LTgwMiwyMiArODAyLDYgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtSZXF1ZXN0LnByb3RvdHlwZSA9 IHsKICAgICB9LAogCiAgICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuUmVzb3Vy Y2V9IHJlc291cmNlCi0gICAgICovCi0gICAgc2V0UmVzb3VyY2U6IGZ1bmN0aW9uKHJlc291cmNl KQotICAgIHsKLSAgICAgICAgdGhpcy5fcmVzb3VyY2UgPSByZXNvdXJjZTsKLSAgICB9LAotCi0g ICAgLyoqCi0gICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlJlc291cmNlfQotICAgICAqLwot ICAgIHJlc291cmNlOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gdGhpcy5fcmVz b3VyY2U7Ci0gICAgfSwKLQotICAgIC8qKgogICAgICAqIEByZXR1cm4ge09iamVjdH0KICAgICAg Ki8KICAgICBmcmFtZXM6IGZ1bmN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IDBiNGI5NDUzNWI1NzAzNzQ2Yjg5Y2NmNzk2ZWMy ZjM0YzAxYjRhMTcuLjk5ODM2YzI5Yzg5NTU1YjFmMzRjYTlmNGExMTFlM2YwY2M1NTFiMDAgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwpAQCAt NDIsOCArNDIsNiBAQAogV2ViSW5zcGVjdG9yLlJlc291cmNlID0gZnVuY3Rpb24ocmVxdWVzdCwg dXJsLCBkb2N1bWVudFVSTCwgZnJhbWVJZCwgbG9hZGVySWQsIHR5cGUsIG1pbWVUeXBlLCBpc0hp ZGRlbikKIHsKICAgICB0aGlzLl9yZXF1ZXN0ID0gcmVxdWVzdDsKLSAgICBpZiAodGhpcy5fcmVx dWVzdCkKLSAgICAgICAgdGhpcy5fcmVxdWVzdC5zZXRSZXNvdXJjZSh0aGlzKTsKICAgICB0aGlz LnVybCA9IHVybDsKICAgICB0aGlzLl9kb2N1bWVudFVSTCA9IGRvY3VtZW50VVJMOwogICAgIHRo aXMuX2ZyYW1lSWQgPSBmcmFtZUlkOwpAQCAtNTYsNiArNTQsOCBAQCBXZWJJbnNwZWN0b3IuUmVz b3VyY2UgPSBmdW5jdGlvbihyZXF1ZXN0LCB1cmwsIGRvY3VtZW50VVJMLCBmcmFtZUlkLCBsb2Fk ZXJJZCwgdAogICAgIC8qKiBAdHlwZSB7P3N0cmluZ30gKi8gdGhpcy5fY29udGVudDsKICAgICAv KiogQHR5cGUge2Jvb2xlYW59ICovIHRoaXMuX2NvbnRlbnRFbmNvZGVkOwogICAgIHRoaXMuX3Bl bmRpbmdDb250ZW50Q2FsbGJhY2tzID0gW107CisgICAgaWYgKHRoaXMuX3JlcXVlc3QgJiYgIXRo aXMuX3JlcXVlc3QuZmluaXNoZWQpCisgICAgICAgIHRoaXMuX3JlcXVlc3QuYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3QuRXZlbnRzLkZpbmlzaGVkTG9hZGluZywg dGhpcy5fcmVxdWVzdEZpbmlzaGVkLCB0aGlzKTsKIH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNl Ll9kb21haW5Nb2RlbEJpbmRpbmdzID0gW107CkBAIC00MDAsNyArNDAwLDggQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogCiAgICAgICAgIHRoaXMuX3Bl bmRpbmdDb250ZW50Q2FsbGJhY2tzLnB1c2goY2FsbGJhY2spOwotICAgICAgICB0aGlzLl9pbm5l clJlcXVlc3RDb250ZW50KCk7CisgICAgICAgIGlmICghdGhpcy5fcmVxdWVzdCB8fCB0aGlzLl9y ZXF1ZXN0LmZpbmlzaGVkKQorICAgICAgICAgICAgdGhpcy5faW5uZXJSZXF1ZXN0Q29udGVudCgp OwogICAgIH0sCiAKICAgICBjYW5vbmljYWxNaW1lVHlwZTogZnVuY3Rpb24oKQpAQCAtNDU3LDYg KzQ1OCwxNSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gImRhdGE6IiArIHRoaXMubWltZVR5cGUgKyAodGhpcy5fY29udGVudEVuY29kZWQgPyAi O2Jhc2U2NCwiIDogIiwiKSArIHRoaXMuX2NvbnRlbnQ7CiAgICAgfSwKIAorCisgICAgX3JlcXVl c3RGaW5pc2hlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fcmVxdWVzdC5yZW1v dmVFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5FdmVudHMuRmluaXNo ZWRMb2FkaW5nLCB0aGlzLl9yZXF1ZXN0RmluaXNoZWQsIHRoaXMpOworICAgICAgICBpZiAodGhp cy5fcGVuZGluZ0NvbnRlbnRDYWxsYmFja3MubGVuZ3RoKQorICAgICAgICAgICAgdGhpcy5faW5u ZXJSZXF1ZXN0Q29udGVudCgpOworICAgIH0sCisKKwogICAgIF9pbm5lclJlcXVlc3RDb250ZW50 OiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICBpZiAodGhpcy5fY29udGVudFJlcXVlc3RlZCkK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAwNjFiNTNhODE2NDYxZWUzMzE3NjZlZTlmYzQwMDQ1NmU4YWU2ZWFmLi5kZTZkNjZh MGMxMmZjOTA2NmIyYzYxMDk4ZTU4YmUyZjczZThkMGZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYgQEAK KzIwMTItMDYtMjggIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgV2ViIEluc3BlY3RvcjogUmVzb3VyY2UgY29udGVudCBpcyBub3QgbG9hZGVkIGlmIFJl c291cmNlLnJlcXVlc3RDb250ZW50IG1ldGhvZCBpcyBjYWxsZWQgYmVmb3JlIG5ldHdvcmsgcmVx dWVzdCBpcyBmaW5pc2hlZC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTkwMTUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgUmVzb3VyY2UucmVxdWVzdENvbnRlbnQoKSBub3cgY2hlY2tzIHRoYXQgcmVxdWVz dCAoaWYgdGhlcmUgaXMgb25lKSB3YXMgYWxyZWFkeSBsb2FkZWQgYmVmb3JlIHJlcXVlc3Rpbmcg Y29udGVudCBmcm9tIFBhZ2VBZ2VudC4KKyAgICAgICAgRHJpdmUtYnk6IFJlbW92ZWQgdW5uZWVk ZWQgbGVnYWN5IHJlcXVlc3QuX3Jlc291cmNlIGZpZWxkLgorCisgICAgICAgICogaHR0cC90ZXN0 cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXJlcXVlc3QtcmV2aXNpb24tY29udGVudC5odG1s OgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXRyZWUvcmVzb3VyY2Ut cmVxdWVzdC1jb250ZW50LXdoaWxlLWxvYWRpbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAg ICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXJlcXVlc3Qt Y29udGVudC13aGlsZS1sb2FkaW5nLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMv aW5zcGVjdG9yL3Jlc291cmNlcy10ZXN0LmpzOgorICAgICAgICAoaW5pdGlhbGl6ZV9SZXNvdXJj ZVRlc3QuSW5zcGVjdG9yVGVzdC5ydW5BZnRlclJlc291cmNlc0FyZUZpbmlzaGVkLmNoZWNrUmVz b3VyY2VzKToKKyAgICAgICAgKGluaXRpYWxpemVfUmVzb3VyY2VUZXN0Lkluc3BlY3RvclRlc3Qu cnVuQWZ0ZXJSZXNvdXJjZXNBcmVGaW5pc2hlZCk6CisgICAgICAgIChpbml0aWFsaXplX1Jlc291 cmNlVGVzdC5JbnNwZWN0b3JUZXN0LnNob3dSZXNvdXJjZS5zaG93UmVzb3VyY2VDYWxsYmFjayk6 CisgICAgICAgIChpbml0aWFsaXplX1Jlc291cmNlVGVzdC5JbnNwZWN0b3JUZXN0LnNob3dSZXNv dXJjZSk6CisgICAgICAgIChpbml0aWFsaXplX1Jlc291cmNlVGVzdC5JbnNwZWN0b3JUZXN0LnJl c291cmNlTWF0Y2hpbmdVUkwudmlzaXQpOgorICAgICAgICAoaW5pdGlhbGl6ZV9SZXNvdXJjZVRl c3QuSW5zcGVjdG9yVGVzdC5yZXNvdXJjZU1hdGNoaW5nVVJMKToKKyAgICAgICAgKGluaXRpYWxp emVfUmVzb3VyY2VUZXN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZGVidWdnZXIvcmF3LXNvdXJj ZS1jb2RlLmh0bWw6CisKIDIwMTItMDYtMjggIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Vi a2l0Lm9yZz4KIAogICAgICAgICBbUXRdIFVucmV2aWV3ZWQgZ2FyZGVuaW5nLCBza2lwIGEgbmV3 IHRlc3QgdG8gaGlkZSBhbiBhbm5veWluZyBidWcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29yay1yZXF1ZXN0LXJldmlzaW9uLWNvbnRl bnQuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvbmV0d29y ay1yZXF1ZXN0LXJldmlzaW9uLWNvbnRlbnQuaHRtbAppbmRleCBmNTg0ZWFkNmI0YTEwZTdiNmI3 OTM5MzFjMmQ3YzNhYWQwMmJkODc3Li44ZTNkNjI3YTE1YzcwNmZjZmU5MTFkNGRlOGJiYzA0ZGY0 MzNiMTllIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3 b3JrL25ldHdvcmstcmVxdWVzdC1yZXZpc2lvbi1jb250ZW50Lmh0bWwKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9uZXR3b3JrLXJlcXVlc3QtcmV2aXNpb24t Y29udGVudC5odG1sCkBAIC0xOCw3ICsxOCw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgIGZ1bmN0 aW9uIHN0ZXAyKG1zZykKICAgICB7CiAgICAgICAgIHZhciByZXF1ZXN0ID0gV2ViSW5zcGVjdG9y LnBhbmVscy5uZXR3b3JrLnJlcXVlc3RzW1dlYkluc3BlY3Rvci5wYW5lbHMubmV0d29yay5yZXF1 ZXN0cy5sZW5ndGggLSAxXTsKLSAgICAgICAgcmVzb3VyY2UgPSByZXF1ZXN0LnJlc291cmNlKCk7 CisgICAgICAgIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKHJlcXVlc3Qu dXJsKTsKICAgICAgICAgcmVzb3VyY2UuYWRkUmV2aXNpb24oIiIpOwogICAgICAgICByZXNvdXJj ZS5oaXN0b3J5WzBdLnJlcXVlc3RDb250ZW50KHN0ZXAzKTsKICAgICB9CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXJl cXVlc3QtY29udGVudC13aGlsZS1sb2FkaW5nLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlLXRyZWUvcmVzb3VyY2UtcmVxdWVzdC1jb250ZW50 LXdoaWxlLWxvYWRpbmctZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjAzYWE3NDFmMGYxNWE0NzFi YTBkZTExOTU4ZDhjYzA3MmFkZjg4YjAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXJlcXVlc3QtY29udGVu dC13aGlsZS1sb2FkaW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDEwIEBACitUZXN0cyByZXNv dXJjZSBjb250ZW50IGlzIGNvcnJlY3RseSBsb2FkZWQgaWYgUmVzb3VyY2UucmVxdWVzdENvbnRl bnQgd2FzIGNhbGxlZCBiZWZvcmUgbmV0d29yayByZXF1ZXN0IHdhcyBmaW5pc2hlZC4KKworQnVn IDkwMTUzCitSZXNvdXJjZSB1cmw6IGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3IvcmVz b3VyY2UtdHJlZS9yZXNvdXJjZXMvc3R5bGVzLWluaXRpYWwuY3NzCitSZXNvdXJjZSBjb250ZW50 OiBodG1sIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKK30KKworUGFnZSByZWxvYWRl ZC4KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3Vy Y2UtdHJlZS9yZXNvdXJjZS1yZXF1ZXN0LWNvbnRlbnQtd2hpbGUtbG9hZGluZy5odG1sIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2UtdHJlZS9yZXNvdXJjZS1yZXF1 ZXN0LWNvbnRlbnQtd2hpbGUtbG9hZGluZy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ2ZmI3NTRjNmUyN2Y2 YmFiMDJjNmFmNjhhZjU3ODg0ZDZlN2E3ZGMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXJlcXVlc3QtY29u dGVudC13aGlsZS1sb2FkaW5nLmh0bWwKQEAgLTAsMCArMSw1NyBAQAorPGh0bWw+Cis8aGVhZD4K KzxzY3JpcHQgc3JjPSIuLi9pbnNwZWN0b3ItdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNy Yz0iLi4vcmVzb3VyY2VzLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9InJlc291cmNl LXRyZWUtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9InJl c291cmNlcy9zdHlsZXMtaW5pdGlhbC5jc3MiPgorPHNjcmlwdD4KK2Z1bmN0aW9uIHRlc3QoKQor eworICAgICAgdmFyIHBhZ2VXYXNSZWxvYWRlZCA9IGZhbHNlOworICAgICAgdmFyIGNvbnRlbnRX YXNMb2FkZWQgPSBmYWxzZTsKKyAgICAgIHZhciBjb250ZW50V2FzUmVxdWVzdGVkID0gZmFsc2U7 CisgICAgICB2YXIgcmVzb3VyY2U7CisgICAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2Vi SW5zcGVjdG9yLlJlc291cmNlVHJlZUZyYW1lLnByb3RvdHlwZSwgIl9hZGRSZXF1ZXN0IiwgcmVx dWVzdEFkZGVkLCB0cnVlKTsKKyAgICAgIEluc3BlY3RvclRlc3QuYWRkU25pZmZlcihQYWdlQWdl bnQsICJnZXRSZXNvdXJjZUNvbnRlbnQiLCBwYWdlQWdlbnRHZXRSZXNvdXJjZUNvbnRlbnRDYWxs ZWQsIHRydWUpOworICAgICAgSW5zcGVjdG9yVGVzdC5yZWxvYWRQYWdlKHBhZ2VSZWxvYWRlZCk7 CisKKyAgICAgIGZ1bmN0aW9uIHJlcXVlc3RBZGRlZChyZXF1ZXN0KQorICAgICAgeworICAgICAg ICAgIGlmIChyZXF1ZXN0LnVybC5pbmRleE9mKCJzdHlsZXMtaW5pdGlhbCIpID09PSAtMSkKKyAg ICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgIHJlc291cmNlID0gSW5zcGVjdG9yVGVzdC5y ZXNvdXJjZU1hdGNoaW5nVVJMKCJzdHlsZXMtaW5pdGlhbCIpOworICAgICAgICAgIGlmICghcmVz b3VyY2UgfHwgIXJlc291cmNlLnJlcXVlc3QgfHwgY29udGVudFdhc1JlcXVlc3RlZCkKKyAgICAg ICAgICAgICAgcmV0dXJuOworICAgICAgICAgIGNvbnRlbnRXYXNSZXF1ZXN0ZWQgPSB0cnVlOwor ICAgICAgICAgIHJlc291cmNlLnJlcXVlc3RDb250ZW50KGNvbnRlbnRMb2FkZWQpOworICAgICAg ICAgIGNvbnRlbnRXYXNSZXF1ZXN0ZWQgPSB0cnVlOworICAgICAgfQorCisgICAgICBmdW5jdGlv biBwYWdlQWdlbnRHZXRSZXNvdXJjZUNvbnRlbnRDYWxsZWQoKQorICAgICAgeworICAgICAgICAg IEluc3BlY3RvclRlc3QuYXNzZXJ0VHJ1ZShyZXNvdXJjZS5yZXF1ZXN0LmZpbmlzaGVkKTsKKyAg ICAgIH0KKworICAgICAgZnVuY3Rpb24gcGFnZVJlbG9hZGVkKCkKKyAgICAgIHsKKyAgICAgICAg ICBwYWdlV2FzUmVsb2FkZWQgPSB0cnVlOworICAgICAgICAgIGlmIChjb250ZW50V2FzTG9hZGVk KQorICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNvbXBsZXRlVGVzdCgpOworICAgICAgfQor CisgICAgICBmdW5jdGlvbiBjb250ZW50TG9hZGVkKGNvbnRlbnQpCisgICAgICB7CisgICAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlJlc291cmNlIHVybDogIiArIHJlc291cmNlLnVy bCk7CisgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQoIlJlc291cmNlIGNvbnRlbnQ6 ICIgKyBjb250ZW50KTsKKyAgICAgICAgICBjb250ZW50V2FzTG9hZGVkID0gdHJ1ZTsKKyAgICAg ICAgICBpZiAocGFnZVdhc1JlbG9hZGVkKQorICAgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmNv bXBsZXRlVGVzdCgpOworICAgICAgfQorfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxv YWQ9InJ1blRlc3QoKSI+Cis8cD5UZXN0cyByZXNvdXJjZSBjb250ZW50IGlzIGNvcnJlY3RseSBs b2FkZWQgaWYgUmVzb3VyY2UucmVxdWVzdENvbnRlbnQgd2FzIGNhbGxlZCBiZWZvcmUgbmV0d29y ayByZXF1ZXN0IHdhcyBmaW5pc2hlZC48L3A+Cis8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTAxNTMiPkJ1ZyA5MDE1MzwvYT4KKzwvYm9keT4KKzwvaHRt bD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNl cy10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzLXRl c3QuanMKaW5kZXggZTYyM2UzMDRiYWE0YzdkYzRlZTVkYWNlNjY0MDIwNWRjMjI1M2ZhMC4uOWMw OTczNGNlYWQwMmE2Mzc5YWQ3ZjJlZDI2ODBhNDk3Mjc0ZWE1MiAxMDA2NDQKLS0tIGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzLXRlc3QuanMKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvcmVzb3VyY2VzLXRlc3QuanMKQEAgLTQxLDEzICs0 MSwxMCBAQCBJbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUmVzb3VyY2VzQXJlRmluaXNoZWQgPSBmdW5j dGlvbihyZXNvdXJjZVVSTHMsIGNhbGxiYWNrKQogCiAgICAgZnVuY3Rpb24gY2hlY2tSZXNvdXJj ZXMoKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmZvckFs bFJlc291cmNlcyh2aXNpdCk7Ci0gICAgICAgIGZ1bmN0aW9uIHZpc2l0KHJlc291cmNlKQotICAg ICAgICB7Ci0gICAgICAgICAgICBmb3IgKHVybCBpbiByZXNvdXJjZVVSTHNNYXApIHsKLSAgICAg ICAgICAgICAgICBpZiAocmVzb3VyY2UudXJsLmluZGV4T2YodXJsKSAhPT0gLTEpCi0gICAgICAg ICAgICAgICAgICAgIGRlbGV0ZSByZXNvdXJjZVVSTHNNYXBbdXJsXTsKLSAgICAgICAgICAgIH0K KyAgICAgICAgZm9yICh1cmwgaW4gcmVzb3VyY2VVUkxzTWFwKSB7CisgICAgICAgICAgICB2YXIg cmVzb3VyY2UgPSBJbnNwZWN0b3JUZXN0LnJlc291cmNlTWF0Y2hpbmdVUkwodXJsKTsKKyAgICAg ICAgICAgIGlmIChyZXNvdXJjZSkKKyAgICAgICAgICAgICAgICBkZWxldGUgcmVzb3VyY2VVUkxz TWFwW3VybF07CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFPYmplY3Qua2V5cyhyZXNvdXJjZVVS THNNYXApLmxlbmd0aCkgewogICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1v ZGVsLnJlbW92ZUV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLkV2 ZW50VHlwZXMuUmVzb3VyY2VBZGRlZCwgY2hlY2tSZXNvdXJjZXMpOwpAQCAtNzIsMjEgKzY5LDMx IEBAIEluc3BlY3RvclRlc3Quc2hvd1Jlc291cmNlID0gZnVuY3Rpb24ocmVzb3VyY2VVUkwsIGNh bGxiYWNrKQogCiAgICAgZnVuY3Rpb24gc2hvd1Jlc291cmNlQ2FsbGJhY2soKQogICAgIHsKLSAg ICAgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmZvckFsbFJlc291cmNlcyh2aXNp dCk7Ci0gICAgICAgIGZ1bmN0aW9uIHZpc2l0KHJlc291cmNlKQotICAgICAgICB7Ci0gICAgICAg ICAgICBpZiAocmVzb3VyY2UudXJsLmluZGV4T2YocmVzb3VyY2VVUkwpICE9PSAtMSkgewotICAg ICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5wYW5lbHMucmVzb3VyY2VzLnNob3dSZXNvdXJjZShy ZXNvdXJjZSwgMSk7Ci0gICAgICAgICAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gV2ViSW5zcGVj dG9yLnBhbmVscy5yZXNvdXJjZXMuX3Jlc291cmNlVmlld0ZvclJlc291cmNlKHJlc291cmNlKTsK LSAgICAgICAgICAgICAgICBpZiAoc291cmNlRnJhbWUubG9hZGVkKQotICAgICAgICAgICAgICAg ICAgICBjYWxsYmFja1dyYXBwZXIoc291cmNlRnJhbWUpOwotICAgICAgICAgICAgICAgIGVsc2UK LSAgICAgICAgICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRTbmlmZmVyKHNvdXJjZUZyYW1l LCAib25UZXh0Vmlld2VyQ29udGVudExvYWRlZCIsIGNhbGxiYWNrV3JhcHBlci5iaW5kKG51bGws IHNvdXJjZUZyYW1lKSk7Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAg ICB9Ci0gICAgICAgIH0KKyAgICAgICAgdmFyIHJlc291cmNlID0gSW5zcGVjdG9yVGVzdC5yZXNv dXJjZU1hdGNoaW5nVVJMKHJlc291cmNlVVJMKTsKKyAgICAgICAgaWYgKCFyZXNvdXJjZSkKKyAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMu c2hvd1Jlc291cmNlKHJlc291cmNlLCAxKTsKKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gV2Vi SW5zcGVjdG9yLnBhbmVscy5yZXNvdXJjZXMuX3Jlc291cmNlVmlld0ZvclJlc291cmNlKHJlc291 cmNlKTsKKyAgICAgICAgaWYgKHNvdXJjZUZyYW1lLmxvYWRlZCkKKyAgICAgICAgICAgIGNhbGxi YWNrV3JhcHBlcihzb3VyY2VGcmFtZSk7CisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIEluc3Bl Y3RvclRlc3QuYWRkU25pZmZlcihzb3VyY2VGcmFtZSwgIm9uVGV4dFZpZXdlckNvbnRlbnRMb2Fk ZWQiLCBjYWxsYmFja1dyYXBwZXIuYmluZChudWxsLCBzb3VyY2VGcmFtZSkpOwogICAgIH0KICAg ICBJbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUmVzb3VyY2VzQXJlRmluaXNoZWQoW3Jlc291cmNlVVJM XSwgc2hvd1Jlc291cmNlQ2FsbGJhY2spOwogfQogCitJbnNwZWN0b3JUZXN0LnJlc291cmNlTWF0 Y2hpbmdVUkwgPSBmdW5jdGlvbihyZXNvdXJjZVVSTCwgY2FsbGJhY2spCit7CisgICAgdmFyIHJl c3VsdCA9IG51bGw7CisgICAgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLmZvckFsbFJl c291cmNlcyh2aXNpdCk7CisgICAgZnVuY3Rpb24gdmlzaXQocmVzb3VyY2UpCisgICAgeworICAg ICAgICBpZiAocmVzb3VyY2UudXJsLmluZGV4T2YocmVzb3VyY2VVUkwpICE9PSAtMSkgeworICAg ICAgICAgICAgcmVzdWx0ID0gcmVzb3VyY2U7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAg ICAgICAgfQorICAgIH0KKyAgICByZXR1cm4gcmVzdWx0OworfQorCiB9CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcmF3LXNvdXJjZS1jb2RlLmh0bWwgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvZGVidWdnZXIvcmF3LXNvdXJjZS1jb2RlLmh0bWwKaW5kZXggZjdi NTM4Y2NiMGE1NGU2MTJjYmNmNDg2ZjMwMmU4NGRjMzI2NWVkNi4uNDUzMmI4ZTZkMWI3OWE4MDU3 NzM1NWNlNjAxMmMzY2U5MmNmOWFkMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9y L2RlYnVnZ2VyL3Jhdy1zb3VyY2UtY29kZS5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rv ci9kZWJ1Z2dlci9yYXctc291cmNlLWNvZGUuaHRtbApAQCAtNTksNyArNTksNyBAQCBmdW5jdGlv biB0ZXN0KCkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IG51bGw7CiAgICAgICAgIGlm IChyZXF1ZXN0ICYmIHJlcXVlc3QuZmluaXNoZWQpIHsKLSAgICAgICAgICAgIHJlc291cmNlID0g cmVxdWVzdC5yZXNvdXJjZSgpOworICAgICAgICAgICAgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3Iu cmVzb3VyY2VGb3JVUkwocmVxdWVzdC51cmwpCiAgICAgICAgICAgICByZXF1ZXN0ID0gbnVsbDsK ICAgICAgICAgfQogICAgICAgICB2YXIgcmF3U291cmNlQ29kZSA9IG5ldyBXZWJJbnNwZWN0b3Iu UmF3U291cmNlQ29kZSgiaWQiLCBzY3JpcHQsIHJlc291cmNlLCByZXF1ZXN0LCBjb21waWxlclNv dXJjZU1hcHBpbmcpOwo=