102239 2012-11-14 08:22:59 -0800 Web Inspector: keep track of mutation observers and disconnect them upon unload 2012-11-15 06:11:52 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov dglazkov eustas.bug keishi loislo ossy pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 766920 0 pfeldman 2012-11-14 08:22:59 -0800 Otherwise we hit memory leaks. 766928 1 174167 pfeldman 2012-11-14 08:28:12 -0800 Created attachment 174167 Patch 766959 2 174167 webkit.review.bot 2012-11-14 09:09:02 -0800 Comment on attachment 174167 Patch Attachment 174167 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14834373 New failing tests: http/tests/inspector/appcache/appcache-iframe-manifests.html http/tests/inspector/injected-script-for-origin.html http/tests/inspector/extensions-network-redirect.html http/tests/inspector/change-iframe-src.html http/tests/inspector/modify-cross-domain-rule.html http/tests/inspector/resource-har-conversion.html http/tests/inspector/console-resource-errors.html http/tests/inspector/filesystem/delete-entry.html http/tests/inspector/extensions-headers.html http/tests/inspector-enabled/injected-script-discard.html http/tests/inspector/console-cross-origin-iframe-logging.html http/tests/inspector/appcache/appcache-swap.html http/tests/inspector/extensions-useragent.html http/tests/inspector-enabled/dynamic-scripts.html http/tests/inspector/console-cd-completions.html http/tests/inspector/compiler-script-mapping.html http/tests/inspector/compiler-source-mapping-debug.html http/tests/inspector/filesystem/directory-tree.html http/tests/inspector/web-socket-frame-error.html http/tests/inspector/console-xhr-logging.html http/tests/inspector/console-xhr-logging-async.html http/tests/inspector/console-cd.html http/tests/inspector/resource-har-headers.html http/tests/inspector/network-preflight-options.html http/tests/inspector/inspect-iframe-from-different-domain.html http/tests/inspector-enabled/console-log-before-frame-navigation.html http/tests/inspector-enabled/dom-storage-open.html http/tests/inspector/resource-parameters.html http/tests/inspector-enabled/database-open.html http/tests/inspector/appcache/appcache-manifest-with-non-existing-file.html 766960 3 174175 pfeldman 2012-11-14 09:09:18 -0800 Created attachment 174175 Patch 766971 4 174175 webkit.review.bot 2012-11-14 09:30:26 -0800 Comment on attachment 174175 Patch Attachment 174175 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/14833351 New failing tests: http/tests/inspector/appcache/appcache-iframe-manifests.html http/tests/inspector/injected-script-for-origin.html http/tests/inspector/extensions-network-redirect.html http/tests/inspector/change-iframe-src.html http/tests/inspector/modify-cross-domain-rule.html http/tests/inspector/resource-har-conversion.html http/tests/inspector/console-resource-errors.html http/tests/inspector/filesystem/delete-entry.html http/tests/inspector/extensions-headers.html http/tests/inspector-enabled/injected-script-discard.html http/tests/inspector/console-cross-origin-iframe-logging.html http/tests/inspector/appcache/appcache-swap.html http/tests/inspector/extensions-useragent.html http/tests/inspector-enabled/dynamic-scripts.html http/tests/inspector/console-cd-completions.html http/tests/inspector/compiler-script-mapping.html http/tests/inspector/compiler-source-mapping-debug.html http/tests/inspector/filesystem/directory-tree.html http/tests/inspector/web-socket-frame-error.html http/tests/inspector/console-xhr-logging.html http/tests/inspector/console-xhr-logging-async.html http/tests/inspector/console-cd.html http/tests/inspector/resource-har-headers.html http/tests/inspector/network-preflight-options.html http/tests/inspector/inspect-iframe-from-different-domain.html http/tests/inspector-enabled/console-log-before-frame-navigation.html http/tests/inspector-enabled/dom-storage-open.html http/tests/inspector/resource-parameters.html http/tests/inspector-enabled/database-open.html http/tests/inspector/appcache/appcache-manifest-with-non-existing-file.html 767047 5 pfeldman 2012-11-14 10:49:34 -0800 Committed r134627: <http://trac.webkit.org/changeset/134627> 767218 6 ossy 2012-11-14 13:08:50 -0800 (In reply to comment #5) > Committed r134627: <http://trac.webkit.org/changeset/134627> It broke all inspector test on Qt - http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release/r134629%20%2845085%29/results.html +main frame - has 1 onunload handler(s) Could you check it please? 767704 7 pfeldman 2012-11-14 21:43:08 -0800 > +main frame - has 1 onunload handler(s) > > Could you check it please? Looking. 767734 8 eustas.bug 2012-11-14 22:37:22 -0800 (In reply to comment #7) > > +main frame - has 1 onunload handler(s) > > > > Could you check it please? > > Looking. CODE: if (!window.testRunner) { Causes new compiler warning: "testRunner" is not defined. 768001 9 ossy 2012-11-15 06:11:52 -0800 Fix landed in http://trac.webkit.org/changeset/134745 174167 2012-11-14 08:28:12 -0800 2012-11-14 09:09:12 -0800 Patch bug-102239-20121114202611.patch text/plain 4758 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThiMmRmNWU4NjNmNGEy YjVmYjEzN2VmZDZjZjc4ZjY5NjUwMGVmZi4uMWFhOTBjZTA5Y2ZjYzcyOWFjZTQ4ZGM1YTU4NDky MWUwM2MwNWQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTE0ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGtlZXAgdHJhY2sgb2YgbXV0YXRpb24gb2JzZXJ2ZXJzIGFuZCBkaXNjb25uZWN0IHRoZW0g dXBvbiB1cGxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwMjIzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE90aGVyd2lzZSB3ZSBoaXQgbWVtb3J5IGxlYWtzLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUud2FzU2hvd24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlwZS53aWxsSGlkZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuX3dhc1Nob3duKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fd2lsbEhpZGUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9h dHRhY2hNdXRhdGlvbk9ic2VydmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsLnByb3RvdHlwZS5fZGV0YWNoTXV0YXRpb25PYnNlcnZlcik6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanM6CisKIDIwMTItMTEtMTQgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxMzQ1MjMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCBjZTZjYmNhN2FhNTI1ZDZk MDY0MjBjMDdhMjI2ZWI3MjkxNTUwMDk4Li5iNDhlNTU5YmNmNTQ0MzQ5YmM2NThiOTYyZDkzODVh NjEwYmU2OWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlZmF1bHRUZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMKQEAgLTU2MCw3ICs1NjAsNyBAQCBXZWJJbnNwZWN0 b3IuRGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX2JvdW5k U2VsZWN0aW9uQ2hhbmdlTGlzdGVuZXIgPSB0aGlzLl9tYWluUGFuZWwuX2hhbmRsZVNlbGVjdGlv bkNoYW5nZS5iaW5kKHRoaXMuX21haW5QYW5lbCk7CiAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50 TGlzdGVuZXIoInNlbGVjdGlvbmNoYW5nZSIsIHRoaXMuX2JvdW5kU2VsZWN0aW9uQ2hhbmdlTGlz dGVuZXIsIGZhbHNlKTsKLSAgICAgICAgdGhpcy5fbWFpblBhbmVsLl9hdHRhY2hNdXRhdGlvbk9i c2VydmVyKCk7CisgICAgICAgIHRoaXMuX21haW5QYW5lbC5fd2FzU2hvd24oKTsKICAgICB9LAog CiAgICAgX2hhbmRsZUZvY3VzZWQ6IGZ1bmN0aW9uKCkKQEAgLTU3MSw3ICs1NzEsNyBAQCBXZWJJ bnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogCiAgICAgd2lsbEhpZGU6 IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX21haW5QYW5lbC5fZGV0YWNoTXV0YXRp b25PYnNlcnZlcigpOworICAgICAgICB0aGlzLl9tYWluUGFuZWwuX3dpbGxIaWRlKCk7CiAgICAg ICAgIGRvY3VtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInNlbGVjdGlvbmNoYW5nZSIsIHRoaXMu X2JvdW5kU2VsZWN0aW9uQ2hhbmdlTGlzdGVuZXIsIGZhbHNlKTsKICAgICAgICAgZGVsZXRlIHRo aXMuX2JvdW5kU2VsZWN0aW9uQ2hhbmdlTGlzdGVuZXI7CiAKQEAgLTEyMzksMTggKzEyMzksMzYg QEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwgPSBmdW5jdGlvbihkZWxlZ2F0ZSwg dGV4dE1vZGVsLCB1cmwsIHN5bmNTY3JvbGwKIH0KIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluUGFuZWwucHJvdG90eXBlID0geworICAgIF93YXNTaG93bjogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgdGhpcy5faXNTaG93aW5nID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fYXR0YWNoTXV0 YXRpb25PYnNlcnZlcigpOworICAgIH0sCisKKyAgICBfd2lsbEhpZGU6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIHRoaXMuX2RldGFjaE11dGF0aW9uT2JzZXJ2ZXIoKTsKKyAgICAgICAgdGhp cy5faXNTaG93aW5nID0gZmFsc2U7CisgICAgfSwKKwogICAgIF9hdHRhY2hNdXRhdGlvbk9ic2Vy dmVyOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX2lzU2hvd2luZykKKyAg ICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBpZiAodGhpcy5fbXV0YXRpb25PYnNlcnZlcikK LSAgICAgICAgICAgIHRoaXMuX211dGF0aW9uT2JzZXJ2ZXIuZGlzY29ubmVjdCgpOwotICAgICAg ICB0aGlzLl9tdXRhdGlvbk9ic2VydmVyID0gbmV3IFdlYktpdE11dGF0aW9uT2JzZXJ2ZXIodGhp cy5faGFuZGxlTXV0YXRpb25zLmJpbmQodGhpcykpOworICAgICAgICAgICAgZGlzcG9zZU11dGF0 aW9uT2JzZXJ2ZXIodGhpcy5fbXV0YXRpb25PYnNlcnZlcik7CisgICAgICAgIHRoaXMuX211dGF0 aW9uT2JzZXJ2ZXIgPSBjcmVhdGVNdXRhdGlvbk9ic2VydmVyKHRoaXMuX2hhbmRsZU11dGF0aW9u cy5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fbXV0YXRpb25PYnNlcnZlci5vYnNlcnZlKHRo aXMuX2NvbnRhaW5lciwgeyBzdWJ0cmVlOiB0cnVlLCBjaGlsZExpc3Q6IHRydWUsIGNoYXJhY3Rl ckRhdGE6IHRydWUgfSk7CiAgICAgfSwKIAogICAgIF9kZXRhY2hNdXRhdGlvbk9ic2VydmVyOiBm dW5jdGlvbigpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX2lzU2hvd2luZykKKyAgICAgICAg ICAgIHJldHVybjsKKwogICAgICAgICBpZiAodGhpcy5fbXV0YXRpb25PYnNlcnZlcikgewotICAg ICAgICAgICAgdGhpcy5fbXV0YXRpb25PYnNlcnZlci5kaXNjb25uZWN0KCk7CisgICAgICAgICAg ICBkaXNwb3NlTXV0YXRpb25PYnNlcnZlcih0aGlzLl9tdXRhdGlvbk9ic2VydmVyKTsKICAgICAg ICAgICAgIGRlbGV0ZSB0aGlzLl9tdXRhdGlvbk9ic2VydmVyOwogICAgICAgICB9CiAgICAgfSwK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVz LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKaW5k ZXggMTIxZjFlYWI4ODBjMWEzZWIyYTU5MTA1OWQ3NTA1ZjI1MGNmNGRmMS4uZWMxNTEzN2M5Mjg5 MzEyM2I5NDhiYmE2YmE0ZmNhODhkNTVhNzhkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKQEAgLTg2NiwzICs4NjYsMzQgQEAgZnVuY3Rp b24gaW1wb3J0U2NyaXB0KHNjcmlwdE5hbWUpCiAgICAgeGhyLnNlbmQobnVsbCk7CiAgICAgd2lu ZG93LmV2YWwoeGhyLnJlc3BvbnNlVGV4dCArICJcbi8vQCBzb3VyY2VVUkw9IiArIHNjcmlwdE5h bWUpOwogfQorCisKKy8vIE11dGF0aW9uIG9ic2VydmVycyBsZWFrIG1lbW9yeS4gS2VlcCB0cmFj ayBvZiB0aGVtIGFuZCBkaXNjb25uZWN0CisvLyBvbiB1bmxvYWQuCit2YXIgX211dGF0aW9uT2Jz ZXJ2ZXJzID0gW107CisKKy8qKgorICogQHBhcmFtIHtmdW5jdGlvbihBcnJheS48V2ViS2l0TXV0 YXRpb24+KX0gaGFuZGxlcgorICogQHJldHVybiB7V2ViS2l0TXV0YXRpb25PYnNlcnZlcn0KKyAq LworZnVuY3Rpb24gY3JlYXRlTXV0YXRpb25PYnNlcnZlcihoYW5kbGVyKQoreworICAgIHZhciBv YnNlcnZlciA9IG5ldyBXZWJLaXRNdXRhdGlvbk9ic2VydmVyKGhhbmRsZXIpOworICAgIF9tdXRh dGlvbk9ic2VydmVycy5wdXNoKG9ic2VydmVyKTsKKyAgICByZXR1cm4gb2JzZXJ2ZXI7Cit9CisK Ky8qKgorICogQHBhcmFtIHtXZWJLaXRNdXRhdGlvbk9ic2VydmVyfSBvYnNlcnZlcgorICovCitm dW5jdGlvbiBkaXNwb3NlTXV0YXRpb25PYnNlcnZlcihvYnNlcnZlcikKK3sKKyAgICBfbXV0YXRp b25PYnNlcnZlcnMucmVtb3ZlKG9ic2VydmVyKTsKKyAgICBvYnNlcnZlci5kaXNjb25uZWN0KCk7 Cit9CisKK3dpbmRvdy5hZGRFdmVudExpc3RlbmVyKCJ1bmxvYWQiLCBmdW5jdGlvbigpIHsKKyAg ICBmb3IgKHZhciBpID0gMDsgaSA8IF9tdXRhdGlvbk9ic2VydmVycy5sZW5ndGg7ICsraSkKKyAg ICAgICAgX211dGF0aW9uT2JzZXJ2ZXJzW2ldLmRpc2Nvbm5lY3QoKTsKKyAgICBfbXV0YXRpb25P YnNlcnZlcnMgPSBbXTsKK30sIGZhbHNlKTsK 174175 2012-11-14 09:09:18 -0800 2012-11-14 10:14:48 -0800 Patch bug-102239-20121114210716.patch text/plain 4952 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTM0NjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYThiMmRmNWU4NjNmNGEy YjVmYjEzN2VmZDZjZjc4ZjY5NjUwMGVmZi4uMWFhOTBjZTA5Y2ZjYzcyOWFjZTQ4ZGM1YTU4NDky MWUwM2MwNWQ1YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTExLTE0ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGtlZXAgdHJhY2sgb2YgbXV0YXRpb24gb2JzZXJ2ZXJzIGFuZCBkaXNjb25uZWN0IHRoZW0g dXBvbiB1cGxvYWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEwMjIzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE90aGVyd2lzZSB3ZSBoaXQgbWVtb3J5IGxlYWtzLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5E ZWZhdWx0VGV4dEVkaXRvci5wcm90b3R5cGUud2FzU2hvd24pOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkRlZmF1bHRUZXh0RWRpdG9yLnByb3RvdHlwZS53aWxsSGlkZSk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGV4dEVkaXRvck1haW5QYW5lbC5wcm90b3R5cGUuX3dhc1Nob3duKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTWFpblBhbmVsLnByb3RvdHlwZS5fd2lsbEhpZGUp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwucHJvdG90eXBlLl9h dHRhY2hNdXRhdGlvbk9ic2VydmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9y TWFpblBhbmVsLnByb3RvdHlwZS5fZGV0YWNoTXV0YXRpb25PYnNlcnZlcik6CisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanM6CisKIDIwMTItMTEtMTQgIFNoZXJpZmYg Qm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHJvbGxpbmcgb3V0IHIxMzQ1MjMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL0RlZmF1bHRUZXh0RWRpdG9yLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9EZWZhdWx0VGV4dEVkaXRvci5qcwppbmRleCBjZTZjYmNhN2FhNTI1ZDZk MDY0MjBjMDdhMjI2ZWI3MjkxNTUwMDk4Li45NDFkNDI1M2NjNWZlZDViMDYzODg3ZjkzYWFhODJj MDQxMGQ0N2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0RlZmF1bHRUZXh0RWRpdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvRGVmYXVsdFRleHRFZGl0b3IuanMKQEAgLTU2MCw3ICs1NjAsNyBAQCBXZWJJbnNwZWN0 b3IuRGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogCiAgICAgICAgIHRoaXMuX2JvdW5k U2VsZWN0aW9uQ2hhbmdlTGlzdGVuZXIgPSB0aGlzLl9tYWluUGFuZWwuX2hhbmRsZVNlbGVjdGlv bkNoYW5nZS5iaW5kKHRoaXMuX21haW5QYW5lbCk7CiAgICAgICAgIGRvY3VtZW50LmFkZEV2ZW50 TGlzdGVuZXIoInNlbGVjdGlvbmNoYW5nZSIsIHRoaXMuX2JvdW5kU2VsZWN0aW9uQ2hhbmdlTGlz dGVuZXIsIGZhbHNlKTsKLSAgICAgICAgdGhpcy5fbWFpblBhbmVsLl9hdHRhY2hNdXRhdGlvbk9i c2VydmVyKCk7CisgICAgICAgIHRoaXMuX21haW5QYW5lbC5fd2FzU2hvd24oKTsKICAgICB9LAog CiAgICAgX2hhbmRsZUZvY3VzZWQ6IGZ1bmN0aW9uKCkKQEAgLTU3MSw3ICs1NzEsNyBAQCBXZWJJ bnNwZWN0b3IuRGVmYXVsdFRleHRFZGl0b3IucHJvdG90eXBlID0gewogCiAgICAgd2lsbEhpZGU6 IGZ1bmN0aW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX21haW5QYW5lbC5fZGV0YWNoTXV0YXRp b25PYnNlcnZlcigpOworICAgICAgICB0aGlzLl9tYWluUGFuZWwuX3dpbGxIaWRlKCk7CiAgICAg ICAgIGRvY3VtZW50LnJlbW92ZUV2ZW50TGlzdGVuZXIoInNlbGVjdGlvbmNoYW5nZSIsIHRoaXMu X2JvdW5kU2VsZWN0aW9uQ2hhbmdlTGlzdGVuZXIsIGZhbHNlKTsKICAgICAgICAgZGVsZXRlIHRo aXMuX2JvdW5kU2VsZWN0aW9uQ2hhbmdlTGlzdGVuZXI7CiAKQEAgLTEyMzksMTYgKzEyMzksMzQg QEAgV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JNYWluUGFuZWwgPSBmdW5jdGlvbihkZWxlZ2F0ZSwg dGV4dE1vZGVsLCB1cmwsIHN5bmNTY3JvbGwKIH0KIAogV2ViSW5zcGVjdG9yLlRleHRFZGl0b3JN YWluUGFuZWwucHJvdG90eXBlID0geworICAgIF93YXNTaG93bjogZnVuY3Rpb24oKQorICAgIHsK KyAgICAgICAgdGhpcy5faXNTaG93aW5nID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5fYXR0YWNoTXV0 YXRpb25PYnNlcnZlcigpOworICAgIH0sCisKKyAgICBfd2lsbEhpZGU6IGZ1bmN0aW9uKCkKKyAg ICB7CisgICAgICAgIHRoaXMuX2RldGFjaE11dGF0aW9uT2JzZXJ2ZXIoKTsKKyAgICAgICAgdGhp cy5faXNTaG93aW5nID0gZmFsc2U7CisgICAgfSwKKwogICAgIF9hdHRhY2hNdXRhdGlvbk9ic2Vy dmVyOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX2lzU2hvd2luZykKKyAg ICAgICAgICAgIHJldHVybjsKKwogICAgICAgICBpZiAodGhpcy5fbXV0YXRpb25PYnNlcnZlcikK ICAgICAgICAgICAgIHRoaXMuX211dGF0aW9uT2JzZXJ2ZXIuZGlzY29ubmVjdCgpOwotICAgICAg ICB0aGlzLl9tdXRhdGlvbk9ic2VydmVyID0gbmV3IFdlYktpdE11dGF0aW9uT2JzZXJ2ZXIodGhp cy5faGFuZGxlTXV0YXRpb25zLmJpbmQodGhpcykpOworICAgICAgICB0aGlzLl9tdXRhdGlvbk9i c2VydmVyID0gbmV3IE5vbkxlYWtpbmdNdXRhdGlvbk9ic2VydmVyKHRoaXMuX2hhbmRsZU11dGF0 aW9ucy5iaW5kKHRoaXMpKTsKICAgICAgICAgdGhpcy5fbXV0YXRpb25PYnNlcnZlci5vYnNlcnZl KHRoaXMuX2NvbnRhaW5lciwgeyBzdWJ0cmVlOiB0cnVlLCBjaGlsZExpc3Q6IHRydWUsIGNoYXJh Y3RlckRhdGE6IHRydWUgfSk7CiAgICAgfSwKIAogICAgIF9kZXRhY2hNdXRhdGlvbk9ic2VydmVy OiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICBpZiAoIXRoaXMuX2lzU2hvd2luZykKKyAgICAg ICAgICAgIHJldHVybjsKKwogICAgICAgICBpZiAodGhpcy5fbXV0YXRpb25PYnNlcnZlcikgewog ICAgICAgICAgICAgdGhpcy5fbXV0YXRpb25PYnNlcnZlci5kaXNjb25uZWN0KCk7CiAgICAgICAg ICAgICBkZWxldGUgdGhpcy5fbXV0YXRpb25PYnNlcnZlcjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdXRpbGl0aWVzLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC91dGlsaXRpZXMuanMKaW5kZXggMTIxZjFlYWI4ODBjMWEzZWIy YTU5MTA1OWQ3NTA1ZjI1MGNmNGRmMS4uOWEyODA1YzllNjk4YTEyNDgyZDgzNGE2ZGU1OGNhMjM4 M2JkYzg0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91 dGlsaXRpZXMuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC91dGls aXRpZXMuanMKQEAgLTg2NiwzICs4NjYsNDMgQEAgZnVuY3Rpb24gaW1wb3J0U2NyaXB0KHNjcmlw dE5hbWUpCiAgICAgeGhyLnNlbmQobnVsbCk7CiAgICAgd2luZG93LmV2YWwoeGhyLnJlc3BvbnNl VGV4dCArICJcbi8vQCBzb3VyY2VVUkw9IiArIHNjcmlwdE5hbWUpOwogfQorCisKKy8qKgorICog TXV0YXRpb24gb2JzZXJ2ZXJzIGxlYWsgbWVtb3J5LiBLZWVwIHRyYWNrIG9mIHRoZW0gYW5kIGRp c2Nvbm5lY3QKKyAqIG9uIHVubG9hZC4KKyAqIEBjb25zdHJ1Y3RvcgorICogQHBhcmFtIHtmdW5j dGlvbihBcnJheS48V2ViS2l0TXV0YXRpb24+KX0gaGFuZGxlcgorICovCitmdW5jdGlvbiBOb25M ZWFraW5nTXV0YXRpb25PYnNlcnZlcihoYW5kbGVyKQoreworICAgIHRoaXMuX29ic2VydmVyID0g bmV3IFdlYktpdE11dGF0aW9uT2JzZXJ2ZXIoaGFuZGxlcik7CisgICAgTm9uTGVha2luZ011dGF0 aW9uT2JzZXJ2ZXIuX2luc3RhbmNlcy5wdXNoKHRoaXMpOworfQorCitOb25MZWFraW5nTXV0YXRp b25PYnNlcnZlci5faW5zdGFuY2VzID0gW107CisKK05vbkxlYWtpbmdNdXRhdGlvbk9ic2VydmVy LnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge0VsZW1lbnR9IGVsZW1lbnQK KyAgICAgKiBAcGFyYW0ge09iamVjdH0gY29uZmlnCisgICAgICovCisgICAgb2JzZXJ2ZTogZnVu Y3Rpb24oZWxlbWVudCwgY29uZmlnKQorICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX29ic2VydmVy KQorICAgICAgICAgICAgdGhpcy5fb2JzZXJ2ZXIub2JzZXJ2ZShlbGVtZW50LCBjb25maWcpOwor ICAgIH0sCisKKyAgICBkaXNjb25uZWN0OiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAo dGhpcy5fb2JzZXJ2ZXIpCisgICAgICAgICAgICB0aGlzLl9vYnNlcnZlci5kaXNjb25uZWN0KCk7 CisgICAgICAgIE5vbkxlYWtpbmdNdXRhdGlvbk9ic2VydmVyLl9pbnN0YW5jZXMucmVtb3ZlKHRo aXMpOworICAgICAgICBkZWxldGUgdGhpcy5fb2JzZXJ2ZXI7CisgICAgfQorfQorCit3aW5kb3cu YWRkRXZlbnRMaXN0ZW5lcigidW5sb2FkIiwgZnVuY3Rpb24oKSB7CisgICAgd2hpbGUgKE5vbkxl YWtpbmdNdXRhdGlvbk9ic2VydmVyLl9pbnN0YW5jZXMubGVuZ3RoKQorICAgICAgICBOb25MZWFr aW5nTXV0YXRpb25PYnNlcnZlci5faW5zdGFuY2VzW05vbkxlYWtpbmdNdXRhdGlvbk9ic2VydmVy Ll9pbnN0YW5jZXMubGVuZ3RoIC0gMV0uZGlzY29ubmVjdCgpOworfSwgZmFsc2UpOwo=