121391 2013-09-15 08:57:30 -0700 Clean up WebSocket code and prevent it from dropping messages 2013-09-17 10:04:04 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 121383 1 timothy timothy cgarcia graouts gustavo joepeck rtakacs seokju timothy webkit-bug-importer oldest_to_newest 929445 0 timothy 2013-09-15 08:57:30 -0700 Clean up WebSocket code and prevent it from dropping messages 929446 1 211710 timothy 2013-09-15 08:59:43 -0700 Created attachment 211710 Patch 929447 2 webkit-bug-importer 2013-09-15 09:00:35 -0700 <rdar://problem/14995089> 929448 3 timothy 2013-09-15 09:00:49 -0700 Roland, can you test this for me? It should fix the issue you emailed about. 929449 4 webkit-bug-importer 2013-09-15 09:01:17 -0700 <rdar://problem/14995091> 929450 5 211711 timothy 2013-09-15 09:05:14 -0700 Created attachment 211711 Patch 929513 6 rtakacs 2013-09-15 15:29:57 -0700 It seems the appearance and the functionality are good, but there are some random WebProcess crashes. Tomorrow I will determine what causes them. 929782 7 timothy 2013-09-16 10:04:48 -0700 *** Bug 121315 has been marked as a duplicate of this bug. *** 929786 8 timothy 2013-09-16 10:10:31 -0700 The crashes are likely not related. 929817 9 211711 joepeck 2013-09-16 11:02:49 -0700 Comment on attachment 211711 Patch r=me. It sounds like Roland Takacs tested it and it worked for him as well. But I'll let you cq it. 929818 10 211711 joepeck 2013-09-16 11:03:08 -0700 Comment on attachment 211711 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=211711&action=review > Source/WebInspectorUI/ChangeLog:13 > + if the socket ins't ready yet. Call _sendPendingMessagesToBackendIfNeeded. Typo: ins't 929913 11 rtakacs 2013-09-16 14:05:11 -0700 (In reply to comment #8) > The crashes are likely not related. Yes, as I checked the crash happens at ImageBufferCairo.cpp. 930280 12 timothy 2013-09-17 10:03:51 -0700 http://trac.webkit.org/changeset/155966 211710 2013-09-15 08:59:43 -0700 2013-09-15 09:05:11 -0700 Patch bug-121391-20130915085946.patch text/plain 5406 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 ZWRmNzFiNDVjMzAxY2ZmNjRmMGQ4ZGU0NzIyZjQ4YWRiOWVjMDA0Li5mZjYzZmFlM2Q4Yjk5MzJj OGRiY2EyYTYzNGY5NzFmZThiODcxYTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMy0wOS0xNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgQ2xlYW4gdXAgdGhlIEluc3BlY3RvcidzIFdlYlNvY2tldCBjb2RlIGFu ZCBwcmV2ZW50IGl0IGZyb20gZHJvcHBpbmcgbWVzc2FnZXMuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTM5MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9JbnNwZWN0b3JG cm9udGVuZEhvc3RTdHViLmpzOgorICAgICAgICAoLldlYkluc3BlY3Rvci5JbnNwZWN0b3JGcm9u dGVuZEhvc3RTdHViLnByb3RvdHlwZS5pbml0aWFsaXplV2ViU29ja2V0KTogQWRkZWQuIENyZWF0 ZSB0aGUgc29ja2V0CisgICAgICAgIGFuZCBjYWxsIF9zZW5kUGVuZGluZ01lc3NhZ2VzVG9CYWNr ZW5kSWZOZWVkZWQuCisgICAgICAgICguV2ViSW5zcGVjdG9yLkluc3BlY3RvckZyb250ZW5kSG9z dFN0dWIucHJvdG90eXBlLnNlbmRNZXNzYWdlVG9CYWNrZW5kKTogU3RvcmUgbWVzc2FnZXMgYXMg cGVuZGluZworICAgICAgICBpZiB0aGUgc29ja2V0IGlucyd0IHJlYWR5IHlldC4gQ2FsbCBfc2Vu ZFBlbmRpbmdNZXNzYWdlc1RvQmFja2VuZElmTmVlZGVkLgorICAgICAgICAoLldlYkluc3BlY3Rv ci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLnByb3RvdHlwZS5fc2VuZFBlbmRpbmdNZXNzYWdl c1RvQmFja2VuZElmTmVlZGVkKTogQWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9NYWlu LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9pbml0aWFsaXplV2ViU29ja2V0SWZOZWVkZWQp OiBNb3ZlIHNvY2tldCBjcmVhdGlvbiB0byBpbml0aWFsaXplV2ViU29ja2V0LgorCiAyMDEzLTA5 LTEzICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNv bT4KIAogICAgICAgICBbR1RLXSBNb3ZlIHRvIHRoZSBuZXcgd2ViIGluc3BlY3RvcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW5zcGVjdG9yRnJvbnRl bmRIb3N0U3R1Yi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0luc3Bl Y3RvckZyb250ZW5kSG9zdFN0dWIuanMKaW5kZXggM2VlMGM0ODA4ODU0ZDhiZTVjYjc5MmU3MmE3 YmFkMzI3Njk4ZTVkMS4uN2U4NGNlYzE4OGE0NDE3NzU3ZjcyNWExZGIwMmQ2Yjk4NzkwYWM3MiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW5zcGVjdG9y RnJvbnRlbmRIb3N0U3R1Yi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzCkBAIC0zMCwxMyArMzAsMjkgQEAKICAq LwogCiBpZiAoIXdpbmRvdy5JbnNwZWN0b3JGcm9udGVuZEhvc3QpIHsKLQogICAgIFdlYkluc3Bl Y3Rvci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViID0gZnVuY3Rpb24oKQogICAgIHsKICAgICAg ICAgdGhpcy5fYXR0YWNoZWRXaW5kb3dIZWlnaHQgPSAwOwogICAgIH0KIAogICAgIFdlYkluc3Bl Y3Rvci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLnByb3RvdHlwZSA9IHsKKyAgICAgICAgLy8g UHVibGljCisKKyAgICAgICAgaW5pdGlhbGl6ZVdlYlNvY2tldDogZnVuY3Rpb24odXJsKQorICAg ICAgICB7CisgICAgICAgICAgICB2YXIgc29ja2V0ID0gbmV3IFdlYlNvY2tldCh1cmwpOworICAg ICAgICAgICAgc29ja2V0LmFkZEV2ZW50TGlzdGVuZXIoIm9wZW4iLCBzb2NrZXRSZWFkeS5iaW5k KHRoaXMpKTsKKworICAgICAgICAgICAgZnVuY3Rpb24gc29ja2V0UmVhZHkoKQorICAgICAgICAg ICAgeworICAgICAgICAgICAgICAgIHRoaXMuX3NvY2tldCA9IHNvY2tldDsKKworICAgICAgICAg ICAgICAgIHRoaXMuX3NvY2tldC5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgZnVuY3Rpb24o bWVzc2FnZSkgeyBJbnNwZWN0b3JCYWNrZW5kLmRpc3BhdGNoKG1lc3NhZ2UuZGF0YSk7IH0pOwor ICAgICAgICAgICAgICAgIHRoaXMuX3NvY2tldC5hZGRFdmVudExpc3RlbmVyKCJlcnJvciIsIGZ1 bmN0aW9uKGVycm9yKSB7IGNvbnNvbGUuZXJyb3IoZXJyb3IpOyB9KTsKKworICAgICAgICAgICAg ICAgIHRoaXMuX3NlbmRQZW5kaW5nTWVzc2FnZXNUb0JhY2tlbmRJZk5lZWRlZCgpOworICAgICAg ICAgICAgfQorICAgICAgICB9LAogCiAgICAgICAgIGJyaW5nVG9Gcm9udDogZnVuY3Rpb24oKQog ICAgICAgICB7CkBAIC0xMDEsOCArMTE3LDE2IEBAIGlmICghd2luZG93Lkluc3BlY3RvckZyb250 ZW5kSG9zdCkgewogCiAgICAgICAgIHNlbmRNZXNzYWdlVG9CYWNrZW5kOiBmdW5jdGlvbihtZXNz YWdlKQogICAgICAgICB7Ci0gICAgICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLnNvY2tldCkKLSAg ICAgICAgICAgICAgICBXZWJJbnNwZWN0b3Iuc29ja2V0LnNlbmQobWVzc2FnZSk7CisgICAgICAg ICAgICBpZiAoIXRoaXMuX3NvY2tldCkgeworICAgICAgICAgICAgICAgIGlmICghdGhpcy5fcGVu ZGluZ01lc3NhZ2VzKQorICAgICAgICAgICAgICAgICAgICB0aGlzLl9wZW5kaW5nTWVzc2FnZXMg PSBbXTsKKyAgICAgICAgICAgICAgICB0aGlzLl9wZW5kaW5nTWVzc2FnZXMucHVzaChtZXNzYWdl KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAg IHRoaXMuX3NlbmRQZW5kaW5nTWVzc2FnZXNUb0JhY2tlbmRJZk5lZWRlZCgpOworCisgICAgICAg ICAgICB0aGlzLl9zb2NrZXQuc2VuZChtZXNzYWdlKTsKICAgICAgICAgfSwKIAogICAgICAgICBs b2FkUmVzb3VyY2VTeW5jaHJvbm91c2x5OiBmdW5jdGlvbih1cmwpCkBAIC0xMTQsMTAgKzEzOCwy MyBAQCBpZiAoIXdpbmRvdy5JbnNwZWN0b3JGcm9udGVuZEhvc3QpIHsKICAgICAgICAgICAgIGlm ICh4aHIuc3RhdHVzID09PSAyMDApCiAgICAgICAgICAgICAgICAgcmV0dXJuIHhoci5yZXNwb25z ZVRleHQ7CiAgICAgICAgICAgICByZXR1cm4gbnVsbDsKKyAgICAgICAgfSwKKworICAgICAgICAv LyBQcml2YXRlCisKKyAgICAgICAgX3NlbmRQZW5kaW5nTWVzc2FnZXNUb0JhY2tlbmRJZk5lZWRl ZDogZnVuY3Rpb24oKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXRoaXMuX3BlbmRpbmdN ZXNzYWdlcykKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgIGZvciAodmFy IGkgPSAwOyBpIDwgdGhpcy5fcGVuZGluZ01lc3NhZ2VzLmxlbmd0aDsgKytpKQorICAgICAgICAg ICAgICAgIHRoaXMuX3NvY2tldC5zZW5kKHRoaXMuX3BlbmRpbmdNZXNzYWdlc1tpXSk7CisKKyAg ICAgICAgICAgIGRlbGV0ZSB0aGlzLl9wZW5kaW5nTWVzc2FnZXM7CiAgICAgICAgIH0KICAgICB9 CiAKICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QgPSBuZXcgV2ViSW5zcGVjdG9yLkluc3BlY3Rv ckZyb250ZW5kSG9zdFN0dWIoKTsKKwogICAgIFdlYkluc3BlY3Rvci5kb250TG9jYWxpemVVc2Vy SW50ZXJmYWNlID0gdHJ1ZTsKIH0KLQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL01haW4uanMKaW5kZXggN2M4OTI5YTJlMTc4YWMyMDdmZjg0ZmUzMjhkNGQ1N2FmMzM4M2Ni ZC4uMDNlMDQ1YmRmYTJkZTM4YjRlNjAwNWUyNWNjZjRhNjQzYTgwODc5MiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5qcworKysgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmpzCkBAIC0xMDk0LDI5ICsxMDk0LDIz IEBAIFdlYkluc3BlY3Rvci5fY29udGVudEJyb3dzZXJSZXByZXNlbnRlZE9iamVjdHNEaWRDaGFu Z2UgPSBmdW5jdGlvbihldmVudCkKIAogV2ViSW5zcGVjdG9yLl9pbml0aWFsaXplV2ViU29ja2V0 SWZOZWVkZWQgPSBmdW5jdGlvbigpCiB7Ci0gICAgdmFyIHdzOworICAgIGlmICghSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmluaXRpYWxpemVXZWJTb2NrZXQpCisgICAgICAgIHJldHVybjsKKwogICAg IHZhciBxdWVyeVBhcmFtcyA9IHBhcnNlTG9jYXRpb25RdWVyeVBhcmFtZXRlcnMoKTsKIAogICAg IGlmICgid3MiIGluIHF1ZXJ5UGFyYW1zKQotICAgICAgICB3cyA9ICJ3czovLyIgKyBxdWVyeVBh cmFtcy53czsKKyAgICAgICAgdmFyIHVybCA9ICJ3czovLyIgKyBxdWVyeVBhcmFtcy53czsKICAg ICBlbHNlIGlmICgicGFnZSIgaW4gcXVlcnlQYXJhbXMpIHsKICAgICAgICAgdmFyIHBhZ2UgPSBx dWVyeVBhcmFtcy5wYWdlOwogICAgICAgICB2YXIgaG9zdCA9ICJob3N0IiBpbiBxdWVyeVBhcmFt cyA/IHF1ZXJ5UGFyYW1zLmhvc3QgOiB3aW5kb3cubG9jYXRpb24uaG9zdDsKLSAgICAgICAgd3Mg PSAid3M6Ly8iICsgaG9zdCArICIvZGV2dG9vbHMvcGFnZS8iICsgcGFnZTsKKyAgICAgICAgdmFy IHVybCA9ICJ3czovLyIgKyBob3N0ICsgIi9kZXZ0b29scy9wYWdlLyIgKyBwYWdlOwogICAgIH0K IAotICAgIGlmICghd3MpCisgICAgaWYgKCF1cmwpCiAgICAgICAgIHJldHVybjsKIAotICAgIHZh ciBzb2NrZXQgPSBuZXcgV2ViU29ja2V0KHdzKTsKLSAgICBzb2NrZXQuYWRkRXZlbnRMaXN0ZW5l cigib3BlbiIsIGNyZWF0ZVNvY2tldCk7Ci0KLSAgICBmdW5jdGlvbiBjcmVhdGVTb2NrZXQoKQot ICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnNvY2tldCA9IHNvY2tldDsKLSAgICAgICAgV2Vi SW5zcGVjdG9yLnNvY2tldC5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgZnVuY3Rpb24obWVz c2FnZSkgeyBJbnNwZWN0b3JCYWNrZW5kLmRpc3BhdGNoKG1lc3NhZ2UuZGF0YSk7IH0pOwotICAg ICAgICBXZWJJbnNwZWN0b3Iuc29ja2V0LmFkZEV2ZW50TGlzdGVuZXIoImVycm9yIiwgZnVuY3Rp b24oZXJyb3IpIHsgY29uc29sZS5lcnJvcihlcnJvcik7IH0pOwotICAgIH0KKyAgICBJbnNwZWN0 b3JGcm9udGVuZEhvc3QuaW5pdGlhbGl6ZVdlYlNvY2tldCh1cmwpOwogfQogCiBXZWJJbnNwZWN0 b3IuX3VwZGF0ZVNwbGl0Q29uc29sZUhlaWdodCA9IGZ1bmN0aW9uKGhlaWdodCkK 211711 2013-09-15 09:05:14 -0700 2013-09-17 10:04:04 -0700 Patch bug-121391-20130915090518.patch text/plain 5746 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU1NzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA1 ZWRmNzFiNDVjMzAxY2ZmNjRmMGQ4ZGU0NzIyZjQ4YWRiOWVjMDA0Li5mZjYzZmFlM2Q4Yjk5MzJj OGRiY2EyYTYzNGY5NzFmZThiODcxYTcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAxMy0wOS0xNSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgQ2xlYW4gdXAgdGhlIEluc3BlY3RvcidzIFdlYlNvY2tldCBjb2RlIGFu ZCBwcmV2ZW50IGl0IGZyb20gZHJvcHBpbmcgbWVzc2FnZXMuCisKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTM5MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9JbnNwZWN0b3JG cm9udGVuZEhvc3RTdHViLmpzOgorICAgICAgICAoLldlYkluc3BlY3Rvci5JbnNwZWN0b3JGcm9u dGVuZEhvc3RTdHViLnByb3RvdHlwZS5pbml0aWFsaXplV2ViU29ja2V0KTogQWRkZWQuIENyZWF0 ZSB0aGUgc29ja2V0CisgICAgICAgIGFuZCBjYWxsIF9zZW5kUGVuZGluZ01lc3NhZ2VzVG9CYWNr ZW5kSWZOZWVkZWQuCisgICAgICAgICguV2ViSW5zcGVjdG9yLkluc3BlY3RvckZyb250ZW5kSG9z dFN0dWIucHJvdG90eXBlLnNlbmRNZXNzYWdlVG9CYWNrZW5kKTogU3RvcmUgbWVzc2FnZXMgYXMg cGVuZGluZworICAgICAgICBpZiB0aGUgc29ja2V0IGlucyd0IHJlYWR5IHlldC4gQ2FsbCBfc2Vu ZFBlbmRpbmdNZXNzYWdlc1RvQmFja2VuZElmTmVlZGVkLgorICAgICAgICAoLldlYkluc3BlY3Rv ci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLnByb3RvdHlwZS5fc2VuZFBlbmRpbmdNZXNzYWdl c1RvQmFja2VuZElmTmVlZGVkKTogQWRkZWQuCisgICAgICAgICogVXNlckludGVyZmFjZS9NYWlu LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9pbml0aWFsaXplV2ViU29ja2V0SWZOZWVkZWQp OiBNb3ZlIHNvY2tldCBjcmVhdGlvbiB0byBpbml0aWFsaXplV2ViU29ja2V0LgorCiAyMDEzLTA5 LTEzICBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgIDxndXN0YXZvLm5vcm9uaGFAY29sbGFib3JhLmNv bT4KIAogICAgICAgICBbR1RLXSBNb3ZlIHRvIHRoZSBuZXcgd2ViIGluc3BlY3RvcgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW5zcGVjdG9yRnJvbnRl bmRIb3N0U3R1Yi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0luc3Bl Y3RvckZyb250ZW5kSG9zdFN0dWIuanMKaW5kZXggM2VlMGM0ODA4ODU0ZDhiZTVjYjc5MmU3MmE3 YmFkMzI3Njk4ZTVkMS4uNDljODVlNWFjNzlhYTc4ZjRmY2IxNGYzMGQ5Y2U0ZjUxOTI3N2YxMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW5zcGVjdG9y RnJvbnRlbmRIb3N0U3R1Yi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzCkBAIC0xLDYgKzEsNyBAQAogLyoKICAq IENvcHlyaWdodCAoQykgMjAwOSBHb29nbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICog Q29weXJpZ2h0IChDKSAyMDEzIFNlb2tqdSBLd29uIChzZW9ranUua3dvbkBnbWFpbC5jb20pCisg KiBDb3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoK ICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdp dGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQpAQCAtMzAsMTMgKzMxLDI5IEBACiAgKi8K IAogaWYgKCF3aW5kb3cuSW5zcGVjdG9yRnJvbnRlbmRIb3N0KSB7Ci0KICAgICBXZWJJbnNwZWN0 b3IuSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1YiA9IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAg IHRoaXMuX2F0dGFjaGVkV2luZG93SGVpZ2h0ID0gMDsKICAgICB9CiAKICAgICBXZWJJbnNwZWN0 b3IuSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5wcm90b3R5cGUgPSB7CisgICAgICAgIC8vIFB1 YmxpYworCisgICAgICAgIGluaXRpYWxpemVXZWJTb2NrZXQ6IGZ1bmN0aW9uKHVybCkKKyAgICAg ICAgeworICAgICAgICAgICAgdmFyIHNvY2tldCA9IG5ldyBXZWJTb2NrZXQodXJsKTsKKyAgICAg ICAgICAgIHNvY2tldC5hZGRFdmVudExpc3RlbmVyKCJvcGVuIiwgc29ja2V0UmVhZHkuYmluZCh0 aGlzKSk7CisKKyAgICAgICAgICAgIGZ1bmN0aW9uIHNvY2tldFJlYWR5KCkKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICB0aGlzLl9zb2NrZXQgPSBzb2NrZXQ7CisKKyAgICAgICAgICAg ICAgICB0aGlzLl9zb2NrZXQuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIGZ1bmN0aW9uKG1l c3NhZ2UpIHsgSW5zcGVjdG9yQmFja2VuZC5kaXNwYXRjaChtZXNzYWdlLmRhdGEpOyB9KTsKKyAg ICAgICAgICAgICAgICB0aGlzLl9zb2NrZXQuYWRkRXZlbnRMaXN0ZW5lcigiZXJyb3IiLCBmdW5j dGlvbihlcnJvcikgeyBjb25zb2xlLmVycm9yKGVycm9yKTsgfSk7CisKKyAgICAgICAgICAgICAg ICB0aGlzLl9zZW5kUGVuZGluZ01lc3NhZ2VzVG9CYWNrZW5kSWZOZWVkZWQoKTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgfSwKIAogICAgICAgICBicmluZ1RvRnJvbnQ6IGZ1bmN0aW9uKCkKICAg ICAgICAgewpAQCAtMTAxLDggKzExOCwxNiBAQCBpZiAoIXdpbmRvdy5JbnNwZWN0b3JGcm9udGVu ZEhvc3QpIHsKIAogICAgICAgICBzZW5kTWVzc2FnZVRvQmFja2VuZDogZnVuY3Rpb24obWVzc2Fn ZSkKICAgICAgICAgewotICAgICAgICAgICAgaWYgKFdlYkluc3BlY3Rvci5zb2NrZXQpCi0gICAg ICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNvY2tldC5zZW5kKG1lc3NhZ2UpOworICAgICAgICAg ICAgaWYgKCF0aGlzLl9zb2NrZXQpIHsKKyAgICAgICAgICAgICAgICBpZiAoIXRoaXMuX3BlbmRp bmdNZXNzYWdlcykKKyAgICAgICAgICAgICAgICAgICAgdGhpcy5fcGVuZGluZ01lc3NhZ2VzID0g W107CisgICAgICAgICAgICAgICAgdGhpcy5fcGVuZGluZ01lc3NhZ2VzLnB1c2gobWVzc2FnZSk7 CisgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICB0 aGlzLl9zZW5kUGVuZGluZ01lc3NhZ2VzVG9CYWNrZW5kSWZOZWVkZWQoKTsKKworICAgICAgICAg ICAgdGhpcy5fc29ja2V0LnNlbmQobWVzc2FnZSk7CiAgICAgICAgIH0sCiAKICAgICAgICAgbG9h ZFJlc291cmNlU3luY2hyb25vdXNseTogZnVuY3Rpb24odXJsKQpAQCAtMTE0LDEwICsxMzksMjMg QEAgaWYgKCF3aW5kb3cuSW5zcGVjdG9yRnJvbnRlbmRIb3N0KSB7CiAgICAgICAgICAgICBpZiAo eGhyLnN0YXR1cyA9PT0gMjAwKQogICAgICAgICAgICAgICAgIHJldHVybiB4aHIucmVzcG9uc2VU ZXh0OwogICAgICAgICAgICAgcmV0dXJuIG51bGw7CisgICAgICAgIH0sCisKKyAgICAgICAgLy8g UHJpdmF0ZQorCisgICAgICAgIF9zZW5kUGVuZGluZ01lc3NhZ2VzVG9CYWNrZW5kSWZOZWVkZWQ6 IGZ1bmN0aW9uKCkKKyAgICAgICAgeworICAgICAgICAgICAgaWYgKCF0aGlzLl9wZW5kaW5nTWVz c2FnZXMpCisgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHRoaXMuX3BlbmRpbmdNZXNzYWdlcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAg ICAgICB0aGlzLl9zb2NrZXQuc2VuZCh0aGlzLl9wZW5kaW5nTWVzc2FnZXNbaV0pOworCisgICAg ICAgICAgICBkZWxldGUgdGhpcy5fcGVuZGluZ01lc3NhZ2VzOwogICAgICAgICB9CiAgICAgfQog CiAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0ID0gbmV3IFdlYkluc3BlY3Rvci5JbnNwZWN0b3JG cm9udGVuZEhvc3RTdHViKCk7CisKICAgICBXZWJJbnNwZWN0b3IuZG9udExvY2FsaXplVXNlcklu dGVyZmFjZSA9IHRydWU7CiB9Ci0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9NYWluLmpzCmluZGV4IDdjODkyOWEyZTE3OGFjMjA3ZmY4NGZlMzI4ZDRkNTdhZjMzODNjYmQu LjAzZTA0NWJkZmEyZGUzOGI0ZTYwMDVlMjVjY2Y0YTY0M2E4MDg3OTIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5qcwpAQCAtMTA5NCwyOSArMTA5NCwyMyBA QCBXZWJJbnNwZWN0b3IuX2NvbnRlbnRCcm93c2VyUmVwcmVzZW50ZWRPYmplY3RzRGlkQ2hhbmdl ID0gZnVuY3Rpb24oZXZlbnQpCiAKIFdlYkluc3BlY3Rvci5faW5pdGlhbGl6ZVdlYlNvY2tldElm TmVlZGVkID0gZnVuY3Rpb24oKQogewotICAgIHZhciB3czsKKyAgICBpZiAoIUluc3BlY3RvckZy b250ZW5kSG9zdC5pbml0aWFsaXplV2ViU29ja2V0KQorICAgICAgICByZXR1cm47CisKICAgICB2 YXIgcXVlcnlQYXJhbXMgPSBwYXJzZUxvY2F0aW9uUXVlcnlQYXJhbWV0ZXJzKCk7CiAKICAgICBp ZiAoIndzIiBpbiBxdWVyeVBhcmFtcykKLSAgICAgICAgd3MgPSAid3M6Ly8iICsgcXVlcnlQYXJh bXMud3M7CisgICAgICAgIHZhciB1cmwgPSAid3M6Ly8iICsgcXVlcnlQYXJhbXMud3M7CiAgICAg ZWxzZSBpZiAoInBhZ2UiIGluIHF1ZXJ5UGFyYW1zKSB7CiAgICAgICAgIHZhciBwYWdlID0gcXVl cnlQYXJhbXMucGFnZTsKICAgICAgICAgdmFyIGhvc3QgPSAiaG9zdCIgaW4gcXVlcnlQYXJhbXMg PyBxdWVyeVBhcmFtcy5ob3N0IDogd2luZG93LmxvY2F0aW9uLmhvc3Q7Ci0gICAgICAgIHdzID0g IndzOi8vIiArIGhvc3QgKyAiL2RldnRvb2xzL3BhZ2UvIiArIHBhZ2U7CisgICAgICAgIHZhciB1 cmwgPSAid3M6Ly8iICsgaG9zdCArICIvZGV2dG9vbHMvcGFnZS8iICsgcGFnZTsKICAgICB9CiAK LSAgICBpZiAoIXdzKQorICAgIGlmICghdXJsKQogICAgICAgICByZXR1cm47CiAKLSAgICB2YXIg c29ja2V0ID0gbmV3IFdlYlNvY2tldCh3cyk7Ci0gICAgc29ja2V0LmFkZEV2ZW50TGlzdGVuZXIo Im9wZW4iLCBjcmVhdGVTb2NrZXQpOwotCi0gICAgZnVuY3Rpb24gY3JlYXRlU29ja2V0KCkKLSAg ICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5zb2NrZXQgPSBzb2NrZXQ7Ci0gICAgICAgIFdlYklu c3BlY3Rvci5zb2NrZXQuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIGZ1bmN0aW9uKG1lc3Nh Z2UpIHsgSW5zcGVjdG9yQmFja2VuZC5kaXNwYXRjaChtZXNzYWdlLmRhdGEpOyB9KTsKLSAgICAg ICAgV2ViSW5zcGVjdG9yLnNvY2tldC5hZGRFdmVudExpc3RlbmVyKCJlcnJvciIsIGZ1bmN0aW9u KGVycm9yKSB7IGNvbnNvbGUuZXJyb3IoZXJyb3IpOyB9KTsKLSAgICB9CisgICAgSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmluaXRpYWxpemVXZWJTb2NrZXQodXJsKTsKIH0KIAogV2ViSW5zcGVjdG9y Ll91cGRhdGVTcGxpdENvbnNvbGVIZWlnaHQgPSBmdW5jdGlvbihoZWlnaHQpCg==