72096 2011-11-11 00:28:14 -0800 Web Inspector: DevTools InspectorStubs.js incorrectly converting responses to arguments 2011-11-11 06:51:12 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 mikelikespie loislo apavlov bweinstein caseq joepeck keishi loislo lsong pfeldman pmuellr rik timothy yurys oldest_to_newest 500561 0 114638 mikelikespie 2011-11-11 00:28:14 -0800 Created attachment 114638 Patch to fix this bug I've been working with the WebSocket protocol and noticed that sometimes getBodyContents is broken. I dug into this a little more and noticed that in WebInspectorStubs.js it was just taking the result argument (object) and converting them into an array. Well, objects aren't ordered. The reason this worked most of the times is that most commands have 1 or 0 result arguments. I patched CodeGeneratorInspector.py to generate correct code. Patch is attached. (also posted on chromium http://code.google.com/p/chromium/issues/detail?id=103881) 500607 1 114638 loislo 2011-11-11 02:29:12 -0800 Comment on attachment 114638 Patch to fix this bug View in context: https://bugs.webkit.org/attachment.cgi?id=114638&action=review lgtm > Source/WebCore/inspector/CodeGeneratorInspector.py:1029 > if (this.dumpInspectorTimeStats) { > - var wrappedCallback = this._callbacks[messageObject.id]; > - wrappedCallback.methodName = messageObject.method; > wrappedCallback.sendRequestTime = Date.now(); > } style nits: curly bracers are not required 500721 2 114689 loislo 2011-11-11 06:16:29 -0800 Created attachment 114689 Patch 500737 3 114693 loislo 2011-11-11 06:45:40 -0800 Created attachment 114693 Patch 500740 4 loislo 2011-11-11 06:51:12 -0800 Committed r99960: <http://trac.webkit.org/changeset/99960> 114638 2011-11-11 00:28:14 -0800 2011-11-11 06:16:18 -0800 Patch to fix this bug 0001-Fixed-unordered-arguments-when-dispatching-responses.patch text/plain 4023 mikelikespie RnJvbSBkMzcwYTNiMGZjYTU5ZTYyMzgxMjM2NWUyZjhhZWQxMzQ1ZGU1OWI3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNaWtlIExld2lzIDxtaWtlbGlrZXNwaWVAZ21haWwuY29tPgpE YXRlOiBUaHUsIDEwIE5vdiAyMDExIDIzOjU2OjAxIC0wODAwClN1YmplY3Q6IFtQQVRDSF0gRml4 ZWQgdW5vcmRlcmVkIGFyZ3VtZW50cyB3aGVuIGRpc3BhdGNoaW5nIHJlc3BvbnNlcyB0bwogY29t bWFuZHMKCi0tLQogU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0 b3IucHkgfCAgIDI3ICsrKysrKysrKysrKysrKy0tLS0KIDEgZmlsZXMgY2hhbmdlZCwgMjEgaW5z ZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CmluZGV4IDQxZjNiODQuLjQwYWJhOTcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9y LnB5CkBAIC05MzksNyArOTM5LDggQEAgSW5zcGVjdG9yQmFja2VuZFN0dWIgPSBmdW5jdGlvbigp CiAgICAgdGhpcy5fY2FsbGJhY2tzID0ge307CiAgICAgdGhpcy5fZG9tYWluRGlzcGF0Y2hlcnMg PSB7fTsKICAgICB0aGlzLl9ldmVudEFyZ3MgPSB7fTsKLSRkZWxlZ2F0ZXMkZXZlbnRBcmdzJGRv bWFpbkRpc3BhdGNoZXJzICAgIH0KKyAgICB0aGlzLl9yZXBseUFyZ3MgPSB7fTsKKyRkZWxlZ2F0 ZXMkZXZlbnRBcmdzJHJlcGx5QXJncyRkb21haW5EaXNwYXRjaGVycyAgICB9CiAKIEluc3BlY3Rv ckJhY2tlbmRTdHViLnByb3RvdHlwZSA9IHsKICAgICBkdW1wSW5zcGVjdG9yVGltZVN0YXRzOiAw LApAQCAtMTAyMCw5ICsxMDIxLDEwIEBAIEluc3BlY3RvckJhY2tlbmRTdHViLnByb3RvdHlwZSA9 IHsKICAgICB7CiAgICAgICAgIG1lc3NhZ2VPYmplY3QuaWQgPSB0aGlzLl93cmFwKGNhbGxiYWNr KTsKIAorICAgICAgICB2YXIgd3JhcHBlZENhbGxiYWNrID0gdGhpcy5fY2FsbGJhY2tzW21lc3Nh Z2VPYmplY3QuaWRdOworICAgICAgICB3cmFwcGVkQ2FsbGJhY2subWV0aG9kTmFtZSA9IG1lc3Nh Z2VPYmplY3QubWV0aG9kOworCiAgICAgICAgIGlmICh0aGlzLmR1bXBJbnNwZWN0b3JUaW1lU3Rh dHMpIHsKLSAgICAgICAgICAgIHZhciB3cmFwcGVkQ2FsbGJhY2sgPSB0aGlzLl9jYWxsYmFja3Nb bWVzc2FnZU9iamVjdC5pZF07Ci0gICAgICAgICAgICB3cmFwcGVkQ2FsbGJhY2subWV0aG9kTmFt ZSA9IG1lc3NhZ2VPYmplY3QubWV0aG9kOwogICAgICAgICAgICAgd3JhcHBlZENhbGxiYWNrLnNl bmRSZXF1ZXN0VGltZSA9IERhdGUubm93KCk7CiAgICAgICAgIH0KIApAQCAtMTA4MywxMyArMTA4 NSwxNyBAQCBJbnNwZWN0b3JCYWNrZW5kU3R1Yi5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAg ICAgICAgIHRoaXMucmVwb3J0UHJvdG9jb2xFcnJvcihtZXNzYWdlT2JqZWN0KTsKICAgICAgICAg ICAgIH0KIAorICAgICAgICAgICAgdmFyIGNhbGxiYWNrID0gdGhpcy5fY2FsbGJhY2tzW21lc3Nh Z2VPYmplY3QuaWRdOworCiAgICAgICAgICAgICB2YXIgYXJndW1lbnRzID0gW107CiAgICAgICAg ICAgICBpZiAobWVzc2FnZU9iamVjdC5yZXN1bHQpIHsKLSAgICAgICAgICAgICAgICBmb3IgKHZh ciBrZXkgaW4gbWVzc2FnZU9iamVjdC5yZXN1bHQpCi0gICAgICAgICAgICAgICAgICAgIGFyZ3Vt ZW50cy5wdXNoKG1lc3NhZ2VPYmplY3QucmVzdWx0W2tleV0pOworICAgICAgICAgICAgICAgIHZh ciBwYXJhbU5hbWVzID0gdGhpcy5fcmVwbHlBcmdzW2NhbGxiYWNrLm1ldGhvZE5hbWVdOworICAg ICAgICAgICAgICAgIGlmIChwYXJhbU5hbWVzKSB7CisgICAgICAgICAgICAgICAgICAgIGZvciAo dmFyIGkgPSAwOyBpIDwgcGFyYW1OYW1lcy5sZW5ndGg7ICsraSkKKyAgICAgICAgICAgICAgICAg ICAgICAgIGFyZ3VtZW50cy5wdXNoKG1lc3NhZ2VPYmplY3QucmVzdWx0W3BhcmFtTmFtZXNbaV1d KTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAKLSAgICAgICAgICAgIHZhciBj YWxsYmFjayA9IHRoaXMuX2NhbGxiYWNrc1ttZXNzYWdlT2JqZWN0LmlkXTsKICAgICAgICAgICAg IGlmIChjYWxsYmFjaykgewogICAgICAgICAgICAgICAgIHZhciBwcm9jZXNzaW5nU3RhcnRUaW1l OwogICAgICAgICAgICAgICAgIGlmICh0aGlzLmR1bXBJbnNwZWN0b3JUaW1lU3RhdHMgJiYgY2Fs bGJhY2subWV0aG9kTmFtZSkKQEAgLTExOTEsNiArMTE5Nyw3IEBAIGNsYXNzIEdlbmVyYXRvcjoK ICAgICBmcm9udGVuZF9tZXRob2RfbGlzdCA9IFtdCiAgICAgYmFja2VuZF9qc19pbml0aWFsaXpl cl9saXN0ID0gW10KICAgICBiYWNrZW5kX2pzX2V2ZW50X2xpc3QgPSBbXQorICAgIGJhY2tlbmRf anNfcmVwbHlfbGlzdCA9IFtdCiAgICAgYmFja2VuZF9qc19kb21haW5fZGlzcGF0Y2hlcl9saXN0 ID0gW10KIAogICAgIGJhY2tlbmRfY29uc3RydWN0b3JfcGFyYW1fbGlzdCA9IFtdCkBAIC0xMzA2 LDYgKzEzMTMsNyBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgICAgIG1ldGhvZF9vdXRfY29kZSA9 ICIiCiAgICAgICAgIGFnZW50X2NhbGxfcGFyYW1fbGlzdCA9IFtdCiAgICAgICAgIHJlc3BvbnNl X2Nvb2tfbGlzdCA9IFtdCisgICAgICAgIGJhY2tlbmRfanNfcmVwbHlfcGFyYW1fbGlzdCA9IFtd CiAgICAgICAgIHJlcXVlc3RfbWVzc2FnZV9wYXJhbSA9ICIiCiAgICAgICAgIGpzX3BhcmFtZXRl cnNfdGV4dCA9ICIiCiAgICAgICAgIGlmICJwYXJhbWV0ZXJzIiBpbiBqc29uX2NvbW1hbmQ6CkBA IC0xMzY0LDYgKzEzNzIsMTIgQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgICAgICAgICAgICAgIG1l dGhvZF9vdXRfY29kZSArPSBjb2RlCiAgICAgICAgICAgICAgICAgYWdlbnRfY2FsbF9wYXJhbV9s aXN0LmFwcGVuZChwYXJhbSkKICAgICAgICAgICAgICAgICByZXNwb25zZV9jb29rX2xpc3QuYXBw ZW5kKGNvb2spCisKKyAgICAgICAgICAgICAgICBiYWNrZW5kX2pzX3JlcGx5X3BhcmFtX2xpc3Qu YXBwZW5kKCJcIiVzXCIiICUganNvbl9yZXR1cm5fbmFtZSkKKworICAgICAgICAgICAgR2VuZXJh dG9yLmJhY2tlbmRfanNfcmVwbHlfbGlzdC5hcHBlbmQoIiAgICB0aGlzLl9yZXBseUFyZ3NbXCIl cy4lc1wiXSA9IFslc107XG4iICUgKAorICAgICAgICAgICAgICAgIGRvbWFpbl9uYW1lLCBqc29u X2NvbW1hbmRfbmFtZSwgam9pbihiYWNrZW5kX2pzX3JlcGx5X3BhcmFtX2xpc3QsICIsICIpKSkK KwogICAgICAgICAgICAgcmVzcG9uc2VfY29va190ZXh0ID0gIiAgICBpZiAoIXByb3RvY29sRXJy b3JzLT5sZW5ndGgoKSAmJiAhZXJyb3IubGVuZ3RoKCkpIHtcbiVzICAgIH1cbiIgJSBqb2luKHJl c3BvbnNlX2Nvb2tfbGlzdCwgIiIpCiAKICAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfbWV0aG9k X2ltcGxlbWVudGF0aW9uX2xpc3QuYXBwZW5kKFRlbXBsYXRlcy5iYWNrZW5kX21ldGhvZC5zdWJz dGl0dXRlKE5vbmUsCkBAIC0xNDE0LDYgKzE0MjgsNyBAQCBiYWNrZW5kX2NwcF9maWxlLndyaXRl KFRlbXBsYXRlcy5iYWNrZW5kX2NwcC5zdWJzdGl0dXRlKE5vbmUsCiAKIGJhY2tlbmRfanNfZmls ZS53cml0ZShUZW1wbGF0ZXMuYmFja2VuZF9qcy5zdWJzdGl0dXRlKE5vbmUsCiAgICAgZGVsZWdh dGVzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfanNfaW5pdGlhbGl6ZXJfbGlzdCwgIiIpLAorICAg IHJlcGx5QXJncz1qb2luKEdlbmVyYXRvci5iYWNrZW5kX2pzX3JlcGx5X2xpc3QsICIiKSwKICAg ICBldmVudEFyZ3M9am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19ldmVudF9saXN0LCAiIiksCiAg ICAgZG9tYWluRGlzcGF0Y2hlcnM9am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19kb21haW5fZGlz cGF0Y2hlcl9saXN0LCAiIikpKQogCi0tIAoxLjcuNwoK 114689 2011-11-11 06:16:29 -0800 2011-11-11 06:45:33 -0800 Patch bug-72096-20111111181627.patch text/plain 4429 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogOTk5NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNzM4YjJkY2YyYTMyM2Ex OGJjY2E2NGU5MzljYTZhOWYwZDRlNDkwLi5iYzhjOGY4ODc1MzE5MGQwZmNhMWIzMWEyMjA5Njlj MjVmZjg1YTRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEtMTEtMTEgIE1pa2Ug TGV3aXMgPG1pa2VsaWtlc3BpZUBnbWFpbC5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog RGV2VG9vbHMgSW5zcGVjdG9yU3R1YnMuanMgaW5jb3JyZWN0bHkgY29udmVydGluZyByZXNwb25z ZXMgdG8gYXJndW1lbnRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzIwOTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGluc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5OgorCiAyMDExLTEx LTExICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IFtjaHJvbWl1bV0gbGlzdCBkZWRpY2F0ZWQgd29ya2VycyBpbiBjYXNlIGlu c3BlY3RvciBvcGVuZWQgcG9zdC13b3JrZXIgY3JlYXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CmluZGV4IDQxZjNiODRmYjg0 YjEyNDg4NGY2MWU0YTdmZjQxNDcxMzk1YWU1ZTguLjQwYWJhOTc4ZDRkZWY0ZDlmZTAyMTNlODI0 NGM3NDkwMDg1NWYyN2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2Rl R2VuZXJhdG9ySW5zcGVjdG9yLnB5CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2Rl R2VuZXJhdG9ySW5zcGVjdG9yLnB5CkBAIC05MzksNyArOTM5LDggQEAgSW5zcGVjdG9yQmFja2Vu ZFN0dWIgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5fY2FsbGJhY2tzID0ge307CiAgICAgdGhpcy5f ZG9tYWluRGlzcGF0Y2hlcnMgPSB7fTsKICAgICB0aGlzLl9ldmVudEFyZ3MgPSB7fTsKLSRkZWxl Z2F0ZXMkZXZlbnRBcmdzJGRvbWFpbkRpc3BhdGNoZXJzICAgIH0KKyAgICB0aGlzLl9yZXBseUFy Z3MgPSB7fTsKKyRkZWxlZ2F0ZXMkZXZlbnRBcmdzJHJlcGx5QXJncyRkb21haW5EaXNwYXRjaGVy cyAgICB9CiAKIEluc3BlY3RvckJhY2tlbmRTdHViLnByb3RvdHlwZSA9IHsKICAgICBkdW1wSW5z cGVjdG9yVGltZVN0YXRzOiAwLApAQCAtMTAyMCw5ICsxMDIxLDEwIEBAIEluc3BlY3RvckJhY2tl bmRTdHViLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgICAgIG1lc3NhZ2VPYmplY3QuaWQgPSB0 aGlzLl93cmFwKGNhbGxiYWNrKTsKIAorICAgICAgICB2YXIgd3JhcHBlZENhbGxiYWNrID0gdGhp cy5fY2FsbGJhY2tzW21lc3NhZ2VPYmplY3QuaWRdOworICAgICAgICB3cmFwcGVkQ2FsbGJhY2su bWV0aG9kTmFtZSA9IG1lc3NhZ2VPYmplY3QubWV0aG9kOworCiAgICAgICAgIGlmICh0aGlzLmR1 bXBJbnNwZWN0b3JUaW1lU3RhdHMpIHsKLSAgICAgICAgICAgIHZhciB3cmFwcGVkQ2FsbGJhY2sg PSB0aGlzLl9jYWxsYmFja3NbbWVzc2FnZU9iamVjdC5pZF07Ci0gICAgICAgICAgICB3cmFwcGVk Q2FsbGJhY2subWV0aG9kTmFtZSA9IG1lc3NhZ2VPYmplY3QubWV0aG9kOwogICAgICAgICAgICAg d3JhcHBlZENhbGxiYWNrLnNlbmRSZXF1ZXN0VGltZSA9IERhdGUubm93KCk7CiAgICAgICAgIH0K IApAQCAtMTA4MywxMyArMTA4NSwxNyBAQCBJbnNwZWN0b3JCYWNrZW5kU3R1Yi5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAgICAgICAgIHRoaXMucmVwb3J0UHJvdG9jb2xFcnJvcihtZXNzYWdl T2JqZWN0KTsKICAgICAgICAgICAgIH0KIAorICAgICAgICAgICAgdmFyIGNhbGxiYWNrID0gdGhp cy5fY2FsbGJhY2tzW21lc3NhZ2VPYmplY3QuaWRdOworCiAgICAgICAgICAgICB2YXIgYXJndW1l bnRzID0gW107CiAgICAgICAgICAgICBpZiAobWVzc2FnZU9iamVjdC5yZXN1bHQpIHsKLSAgICAg ICAgICAgICAgICBmb3IgKHZhciBrZXkgaW4gbWVzc2FnZU9iamVjdC5yZXN1bHQpCi0gICAgICAg ICAgICAgICAgICAgIGFyZ3VtZW50cy5wdXNoKG1lc3NhZ2VPYmplY3QucmVzdWx0W2tleV0pOwor ICAgICAgICAgICAgICAgIHZhciBwYXJhbU5hbWVzID0gdGhpcy5fcmVwbHlBcmdzW2NhbGxiYWNr Lm1ldGhvZE5hbWVdOworICAgICAgICAgICAgICAgIGlmIChwYXJhbU5hbWVzKSB7CisgICAgICAg ICAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgcGFyYW1OYW1lcy5sZW5ndGg7ICsraSkK KyAgICAgICAgICAgICAgICAgICAgICAgIGFyZ3VtZW50cy5wdXNoKG1lc3NhZ2VPYmplY3QucmVz dWx0W3BhcmFtTmFtZXNbaV1dKTsKKyAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAK LSAgICAgICAgICAgIHZhciBjYWxsYmFjayA9IHRoaXMuX2NhbGxiYWNrc1ttZXNzYWdlT2JqZWN0 LmlkXTsKICAgICAgICAgICAgIGlmIChjYWxsYmFjaykgewogICAgICAgICAgICAgICAgIHZhciBw cm9jZXNzaW5nU3RhcnRUaW1lOwogICAgICAgICAgICAgICAgIGlmICh0aGlzLmR1bXBJbnNwZWN0 b3JUaW1lU3RhdHMgJiYgY2FsbGJhY2subWV0aG9kTmFtZSkKQEAgLTExOTEsNiArMTE5Nyw3IEBA IGNsYXNzIEdlbmVyYXRvcjoKICAgICBmcm9udGVuZF9tZXRob2RfbGlzdCA9IFtdCiAgICAgYmFj a2VuZF9qc19pbml0aWFsaXplcl9saXN0ID0gW10KICAgICBiYWNrZW5kX2pzX2V2ZW50X2xpc3Qg PSBbXQorICAgIGJhY2tlbmRfanNfcmVwbHlfbGlzdCA9IFtdCiAgICAgYmFja2VuZF9qc19kb21h aW5fZGlzcGF0Y2hlcl9saXN0ID0gW10KIAogICAgIGJhY2tlbmRfY29uc3RydWN0b3JfcGFyYW1f bGlzdCA9IFtdCkBAIC0xMzA2LDYgKzEzMTMsNyBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgICAg IG1ldGhvZF9vdXRfY29kZSA9ICIiCiAgICAgICAgIGFnZW50X2NhbGxfcGFyYW1fbGlzdCA9IFtd CiAgICAgICAgIHJlc3BvbnNlX2Nvb2tfbGlzdCA9IFtdCisgICAgICAgIGJhY2tlbmRfanNfcmVw bHlfcGFyYW1fbGlzdCA9IFtdCiAgICAgICAgIHJlcXVlc3RfbWVzc2FnZV9wYXJhbSA9ICIiCiAg ICAgICAgIGpzX3BhcmFtZXRlcnNfdGV4dCA9ICIiCiAgICAgICAgIGlmICJwYXJhbWV0ZXJzIiBp biBqc29uX2NvbW1hbmQ6CkBAIC0xMzY0LDYgKzEzNzIsMTIgQEAgY2xhc3MgR2VuZXJhdG9yOgog ICAgICAgICAgICAgICAgIG1ldGhvZF9vdXRfY29kZSArPSBjb2RlCiAgICAgICAgICAgICAgICAg YWdlbnRfY2FsbF9wYXJhbV9saXN0LmFwcGVuZChwYXJhbSkKICAgICAgICAgICAgICAgICByZXNw b25zZV9jb29rX2xpc3QuYXBwZW5kKGNvb2spCisKKyAgICAgICAgICAgICAgICBiYWNrZW5kX2pz X3JlcGx5X3BhcmFtX2xpc3QuYXBwZW5kKCJcIiVzXCIiICUganNvbl9yZXR1cm5fbmFtZSkKKwor ICAgICAgICAgICAgR2VuZXJhdG9yLmJhY2tlbmRfanNfcmVwbHlfbGlzdC5hcHBlbmQoIiAgICB0 aGlzLl9yZXBseUFyZ3NbXCIlcy4lc1wiXSA9IFslc107XG4iICUgKAorICAgICAgICAgICAgICAg IGRvbWFpbl9uYW1lLCBqc29uX2NvbW1hbmRfbmFtZSwgam9pbihiYWNrZW5kX2pzX3JlcGx5X3Bh cmFtX2xpc3QsICIsICIpKSkKKwogICAgICAgICAgICAgcmVzcG9uc2VfY29va190ZXh0ID0gIiAg ICBpZiAoIXByb3RvY29sRXJyb3JzLT5sZW5ndGgoKSAmJiAhZXJyb3IubGVuZ3RoKCkpIHtcbiVz ICAgIH1cbiIgJSBqb2luKHJlc3BvbnNlX2Nvb2tfbGlzdCwgIiIpCiAKICAgICAgICAgR2VuZXJh dG9yLmJhY2tlbmRfbWV0aG9kX2ltcGxlbWVudGF0aW9uX2xpc3QuYXBwZW5kKFRlbXBsYXRlcy5i YWNrZW5kX21ldGhvZC5zdWJzdGl0dXRlKE5vbmUsCkBAIC0xNDE0LDYgKzE0MjgsNyBAQCBiYWNr ZW5kX2NwcF9maWxlLndyaXRlKFRlbXBsYXRlcy5iYWNrZW5kX2NwcC5zdWJzdGl0dXRlKE5vbmUs CiAKIGJhY2tlbmRfanNfZmlsZS53cml0ZShUZW1wbGF0ZXMuYmFja2VuZF9qcy5zdWJzdGl0dXRl KE5vbmUsCiAgICAgZGVsZWdhdGVzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfanNfaW5pdGlhbGl6 ZXJfbGlzdCwgIiIpLAorICAgIHJlcGx5QXJncz1qb2luKEdlbmVyYXRvci5iYWNrZW5kX2pzX3Jl cGx5X2xpc3QsICIiKSwKICAgICBldmVudEFyZ3M9am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19l dmVudF9saXN0LCAiIiksCiAgICAgZG9tYWluRGlzcGF0Y2hlcnM9am9pbihHZW5lcmF0b3IuYmFj a2VuZF9qc19kb21haW5fZGlzcGF0Y2hlcl9saXN0LCAiIikpKQogCg== 114693 2011-11-11 06:45:40 -0800 2011-11-11 06:50:00 -0800 Patch bug-72096-20111111184538.patch text/plain 5322 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogOTk5NTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhNzM4YjJkY2YyYTMyM2Ex OGJjY2E2NGU5MzljYTZhOWYwZDRlNDkwLi5lMDBiOWIzNjQzODJhZjliODU2ZmRjZDA3YzBmYzYz MjY2OWU2M2RhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMTEtMTEgIE1pa2Ug TGV3aXMgPG1pa2VsaWtlc3BpZUBnbWFpbC5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog RGV2VG9vbHMgSW5zcGVjdG9yU3R1YnMuanMgaW5jb3JyZWN0bHkgY29udmVydGluZyByZXNwb25z ZXMgdG8gYXJndW1lbnRzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NzIwOTYKKworICAgICAgICBKU09OLnBhcnNlIGRvZXNuJ3QgZ2FyYW50ZWUgdGhl IG9yZGVyIG9mIGtleXMuCisgICAgICAgIFdlIGhhdmUgdG8gZXhwbGljaXRseSBvcmRlciB0aGUg cmVzdWx0cyBhY2NvcmRpbmcgdG8gSW5zcGVjdG9yLmpzb24gc3BlYy4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9Db2RlR2VuZXJh dG9ySW5zcGVjdG9yLnB5OgorCiAyMDExLTExLTExICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNA Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtjaHJvbWl1bV0gbGlzdCBk ZWRpY2F0ZWQgd29ya2VycyBpbiBjYXNlIGluc3BlY3RvciBvcGVuZWQgcG9zdC13b3JrZXIgY3Jl YXRpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRv ckluc3BlY3Rvci5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5z cGVjdG9yLnB5CmluZGV4IDQxZjNiODRmYjg0YjEyNDg4NGY2MWU0YTdmZjQxNDcxMzk1YWU1ZTgu LjMzYjVmMTg5YzkyZDk1OTFhMDAxNmJlZTE4N2U1NmQ1NmM2MGJmZWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnB5CkBAIC05Mzks NyArOTM5LDggQEAgSW5zcGVjdG9yQmFja2VuZFN0dWIgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5f Y2FsbGJhY2tzID0ge307CiAgICAgdGhpcy5fZG9tYWluRGlzcGF0Y2hlcnMgPSB7fTsKICAgICB0 aGlzLl9ldmVudEFyZ3MgPSB7fTsKLSRkZWxlZ2F0ZXMkZXZlbnRBcmdzJGRvbWFpbkRpc3BhdGNo ZXJzICAgIH0KKyAgICB0aGlzLl9yZXBseUFyZ3MgPSB7fTsKKyRkZWxlZ2F0ZXMkZXZlbnRBcmdz JHJlcGx5QXJncyRkb21haW5EaXNwYXRjaGVyc30KIAogSW5zcGVjdG9yQmFja2VuZFN0dWIucHJv dG90eXBlID0gewogICAgIGR1bXBJbnNwZWN0b3JUaW1lU3RhdHM6IDAsCkBAIC0xMDIwLDExICsx MDIxLDExIEBAIEluc3BlY3RvckJhY2tlbmRTdHViLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAg ICAgIG1lc3NhZ2VPYmplY3QuaWQgPSB0aGlzLl93cmFwKGNhbGxiYWNrKTsKIAotICAgICAgICBp ZiAodGhpcy5kdW1wSW5zcGVjdG9yVGltZVN0YXRzKSB7Ci0gICAgICAgICAgICB2YXIgd3JhcHBl ZENhbGxiYWNrID0gdGhpcy5fY2FsbGJhY2tzW21lc3NhZ2VPYmplY3QuaWRdOwotICAgICAgICAg ICAgd3JhcHBlZENhbGxiYWNrLm1ldGhvZE5hbWUgPSBtZXNzYWdlT2JqZWN0Lm1ldGhvZDsKKyAg ICAgICAgdmFyIHdyYXBwZWRDYWxsYmFjayA9IHRoaXMuX2NhbGxiYWNrc1ttZXNzYWdlT2JqZWN0 LmlkXTsKKyAgICAgICAgd3JhcHBlZENhbGxiYWNrLm1ldGhvZE5hbWUgPSBtZXNzYWdlT2JqZWN0 Lm1ldGhvZDsKKworICAgICAgICBpZiAodGhpcy5kdW1wSW5zcGVjdG9yVGltZVN0YXRzKQogICAg ICAgICAgICAgd3JhcHBlZENhbGxiYWNrLnNlbmRSZXF1ZXN0VGltZSA9IERhdGUubm93KCk7Ci0g ICAgICAgIH0KIAogICAgICAgICBpZiAodGhpcy5kdW1wSW5zcGVjdG9yUHJvdG9jb2xNZXNzYWdl cykKICAgICAgICAgICAgIGNvbnNvbGUubG9nKCJmcm9udGVuZDogIiArIEpTT04uc3RyaW5naWZ5 KG1lc3NhZ2VPYmplY3QpKTsKQEAgLTEwODMsMTMgKzEwODQsMTcgQEAgSW5zcGVjdG9yQmFja2Vu ZFN0dWIucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgICAgICB0aGlzLnJlcG9ydFByb3Rv Y29sRXJyb3IobWVzc2FnZU9iamVjdCk7CiAgICAgICAgICAgICB9CiAKKyAgICAgICAgICAgIHZh ciBjYWxsYmFjayA9IHRoaXMuX2NhbGxiYWNrc1ttZXNzYWdlT2JqZWN0LmlkXTsKKwogICAgICAg ICAgICAgdmFyIGFyZ3VtZW50cyA9IFtdOwogICAgICAgICAgICAgaWYgKG1lc3NhZ2VPYmplY3Qu cmVzdWx0KSB7Ci0gICAgICAgICAgICAgICAgZm9yICh2YXIga2V5IGluIG1lc3NhZ2VPYmplY3Qu cmVzdWx0KQotICAgICAgICAgICAgICAgICAgICBhcmd1bWVudHMucHVzaChtZXNzYWdlT2JqZWN0 LnJlc3VsdFtrZXldKTsKKyAgICAgICAgICAgICAgICB2YXIgcGFyYW1OYW1lcyA9IHRoaXMuX3Jl cGx5QXJnc1tjYWxsYmFjay5tZXRob2ROYW1lXTsKKyAgICAgICAgICAgICAgICBpZiAocGFyYW1O YW1lcykgeworICAgICAgICAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHBhcmFtTmFt ZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgICAgICAgICBhcmd1bWVudHMucHVzaCht ZXNzYWdlT2JqZWN0LnJlc3VsdFtwYXJhbU5hbWVzW2ldXSk7CisgICAgICAgICAgICAgICAgfQog ICAgICAgICAgICAgfQogCi0gICAgICAgICAgICB2YXIgY2FsbGJhY2sgPSB0aGlzLl9jYWxsYmFj a3NbbWVzc2FnZU9iamVjdC5pZF07CiAgICAgICAgICAgICBpZiAoY2FsbGJhY2spIHsKICAgICAg ICAgICAgICAgICB2YXIgcHJvY2Vzc2luZ1N0YXJ0VGltZTsKICAgICAgICAgICAgICAgICBpZiAo dGhpcy5kdW1wSW5zcGVjdG9yVGltZVN0YXRzICYmIGNhbGxiYWNrLm1ldGhvZE5hbWUpCkBAIC0x MTkxLDYgKzExOTYsNyBAQCBjbGFzcyBHZW5lcmF0b3I6CiAgICAgZnJvbnRlbmRfbWV0aG9kX2xp c3QgPSBbXQogICAgIGJhY2tlbmRfanNfaW5pdGlhbGl6ZXJfbGlzdCA9IFtdCiAgICAgYmFja2Vu ZF9qc19ldmVudF9saXN0ID0gW10KKyAgICBiYWNrZW5kX2pzX3JlcGx5X2xpc3QgPSBbXQogICAg IGJhY2tlbmRfanNfZG9tYWluX2Rpc3BhdGNoZXJfbGlzdCA9IFtdCiAKICAgICBiYWNrZW5kX2Nv bnN0cnVjdG9yX3BhcmFtX2xpc3QgPSBbXQpAQCAtMTMwNiw2ICsxMzEyLDcgQEAgY2xhc3MgR2Vu ZXJhdG9yOgogICAgICAgICBtZXRob2Rfb3V0X2NvZGUgPSAiIgogICAgICAgICBhZ2VudF9jYWxs X3BhcmFtX2xpc3QgPSBbXQogICAgICAgICByZXNwb25zZV9jb29rX2xpc3QgPSBbXQorICAgICAg ICBiYWNrZW5kX2pzX3JlcGx5X3BhcmFtX2xpc3QgPSBbXQogICAgICAgICByZXF1ZXN0X21lc3Nh Z2VfcGFyYW0gPSAiIgogICAgICAgICBqc19wYXJhbWV0ZXJzX3RleHQgPSAiIgogICAgICAgICBp ZiAicGFyYW1ldGVycyIgaW4ganNvbl9jb21tYW5kOgpAQCAtMTM2NCw2ICsxMzcxLDEyIEBAIGNs YXNzIEdlbmVyYXRvcjoKICAgICAgICAgICAgICAgICBtZXRob2Rfb3V0X2NvZGUgKz0gY29kZQog ICAgICAgICAgICAgICAgIGFnZW50X2NhbGxfcGFyYW1fbGlzdC5hcHBlbmQocGFyYW0pCiAgICAg ICAgICAgICAgICAgcmVzcG9uc2VfY29va19saXN0LmFwcGVuZChjb29rKQorCisgICAgICAgICAg ICAgICAgYmFja2VuZF9qc19yZXBseV9wYXJhbV9saXN0LmFwcGVuZCgiXCIlc1wiIiAlIGpzb25f cmV0dXJuX25hbWUpCisKKyAgICAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX2pzX3JlcGx5X2xp c3QuYXBwZW5kKCIgICAgdGhpcy5fcmVwbHlBcmdzW1wiJXMuJXNcIl0gPSBbJXNdO1xuIiAlICgK KyAgICAgICAgICAgICAgICBkb21haW5fbmFtZSwganNvbl9jb21tYW5kX25hbWUsIGpvaW4oYmFj a2VuZF9qc19yZXBseV9wYXJhbV9saXN0LCAiLCAiKSkpCisKICAgICAgICAgICAgIHJlc3BvbnNl X2Nvb2tfdGV4dCA9ICIgICAgaWYgKCFwcm90b2NvbEVycm9ycy0+bGVuZ3RoKCkgJiYgIWVycm9y Lmxlbmd0aCgpKSB7XG4lcyAgICB9XG4iICUgam9pbihyZXNwb25zZV9jb29rX2xpc3QsICIiKQog CiAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX21ldGhvZF9pbXBsZW1lbnRhdGlvbl9saXN0LmFw cGVuZChUZW1wbGF0ZXMuYmFja2VuZF9tZXRob2Quc3Vic3RpdHV0ZShOb25lLApAQCAtMTM3Niw3 ICsxMzg5LDcgQEAgY2xhc3MgR2VuZXJhdG9yOgogICAgICAgICAgICAgcmVzcG9uc2VDb29rPXJl c3BvbnNlX2Nvb2tfdGV4dCkpCiAgICAgICAgIEdlbmVyYXRvci5iYWNrZW5kX21ldGhvZF9uYW1l X2RlY2xhcmF0aW9uX2xpc3QuYXBwZW5kKCIgICAgXCIlcy4lc1wiLCIgJSAoZG9tYWluX25hbWUs IGpzb25fY29tbWFuZF9uYW1lKSkKIAotICAgICAgICBHZW5lcmF0b3IuYmFja2VuZF9qc19pbml0 aWFsaXplcl9saXN0LmFwcGVuZCgiICAgICAgICB0aGlzLl9yZWdpc3RlckRlbGVnYXRlKCd7XCJt ZXRob2RcIjogXCIlcy4lc1wiJXMsIFwiaWRcIjogMH0nKTtcbiIgJSAoZG9tYWluX25hbWUsIGpz b25fY29tbWFuZF9uYW1lLCBqc19wYXJhbWV0ZXJzX3RleHQpKQorICAgICAgICBHZW5lcmF0b3Iu YmFja2VuZF9qc19pbml0aWFsaXplcl9saXN0LmFwcGVuZCgiICAgIHRoaXMuX3JlZ2lzdGVyRGVs ZWdhdGUoJ3tcIm1ldGhvZFwiOiBcIiVzLiVzXCIlcywgXCJpZFwiOiAwfScpO1xuIiAlIChkb21h aW5fbmFtZSwganNvbl9jb21tYW5kX25hbWUsIGpzX3BhcmFtZXRlcnNfdGV4dCkpCiAKIAogR2Vu ZXJhdG9yLmdvKCkKQEAgLTE0MTQsNiArMTQyNyw3IEBAIGJhY2tlbmRfY3BwX2ZpbGUud3JpdGUo VGVtcGxhdGVzLmJhY2tlbmRfY3BwLnN1YnN0aXR1dGUoTm9uZSwKIAogYmFja2VuZF9qc19maWxl LndyaXRlKFRlbXBsYXRlcy5iYWNrZW5kX2pzLnN1YnN0aXR1dGUoTm9uZSwKICAgICBkZWxlZ2F0 ZXM9am9pbihHZW5lcmF0b3IuYmFja2VuZF9qc19pbml0aWFsaXplcl9saXN0LCAiIiksCisgICAg cmVwbHlBcmdzPWpvaW4oR2VuZXJhdG9yLmJhY2tlbmRfanNfcmVwbHlfbGlzdCwgIiIpLAogICAg IGV2ZW50QXJncz1qb2luKEdlbmVyYXRvci5iYWNrZW5kX2pzX2V2ZW50X2xpc3QsICIiKSwKICAg ICBkb21haW5EaXNwYXRjaGVycz1qb2luKEdlbmVyYXRvci5iYWNrZW5kX2pzX2RvbWFpbl9kaXNw YXRjaGVyX2xpc3QsICIiKSkpCiAK