45662 2010-09-13 06:07:03 -0700 Web Inspector: [Resources panel] Should be easy to copy data. 2011-04-25 09:39:28 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman webkit-unassigned bweinstein joepeck keishi loislo pfeldman pmuellr rik sullivan sullivan yurys oldest_to_newest 278160 0 pfeldman 2010-09-13 06:07:03 -0700 In Firebug, when you right-click a URL, you get a context menu with options to copy the location, copy the request headers, or copy the response headers. HttpWatch is even better--it has separate panels for headers, cookies, query string, and postdata. You can go to any panel, and see the data split into a table of name/value pairs. Right click on any value and you get the option to copy the value, the name/value pair, or all the rows in the panel. This is extremely useful when someone asks you to send them the value of a certain header or post field, which happens to me a lot. 387087 1 89893 sullivan 2011-04-15 17:39:57 -0700 Created attachment 89893 Patch To get the request/response headers as plain text, I implemented get requestHeadersText() and get responseHeadersText() for WebInspector.Resource, similar to the getters for sorted headers. Let me know if there's a better way to do this. 387577 2 89893 yurys 2011-04-18 01:28:00 -0700 Comment on attachment 89893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89893&action=review > Source/WebCore/inspector/front-end/NetworkPanel.js:1003 > + contextMenu.appendItem(WebInspector.UIString("Copy request headers"), this._exportRequestHeaders.bind(this, resource)); New UI strings should be added to Source/WebCore/English.lproj/localizedStrings.js. 387590 3 89893 pfeldman 2011-04-18 02:18:31 -0700 Comment on attachment 89893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89893&action=review Overall looks good. You need an entry in localizedStrings.js as Yury suggests to land this. > Source/WebCore/inspector/front-end/NetworkPanel.js:1023 > InspectorFrontendHost.copyText(JSON.stringify(har)); It used to export values, now it copies them, so the name of the method is misleading. Do not reuse it. > Source/WebCore/inspector/front-end/NetworkPanel.js:1026 > + _exportLocation: function(resource) I.e. should be _copyLocation, etc. > Source/WebCore/inspector/front-end/Resource.js:429 > + this._requestHeadersText += key + ": " + this.requestHeaders[key] + '\n'; Please use double quotes. > Source/WebCore/inspector/front-end/Resource.js:510 > + this._responseHeadersText += key + ": " + this.responseHeaders[key] + '\n'; ditto. 390522 4 89893 sullivan 2011-04-21 18:28:56 -0700 Comment on attachment 89893 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=89893&action=review >> Source/WebCore/inspector/front-end/NetworkPanel.js:1023 >> InspectorFrontendHost.copyText(JSON.stringify(har)); > > It used to export values, now it copies them, so the name of the method is misleading. Do not reuse it. Done. >> Source/WebCore/inspector/front-end/NetworkPanel.js:1026 >> + _exportLocation: function(resource) > > I.e. should be _copyLocation, etc. Done. >> Source/WebCore/inspector/front-end/Resource.js:429 >> + this._requestHeadersText += key + ": " + this.requestHeaders[key] + '\n'; > > Please use double quotes. Done. >> Source/WebCore/inspector/front-end/Resource.js:510 >> + this._responseHeadersText += key + ": " + this.responseHeaders[key] + '\n'; > > ditto. Done. 390523 5 90647 sullivan 2011-04-21 18:30:16 -0700 Created attachment 90647 Patch: Addresses comments and adds localized strings. 390678 6 90647 pfeldman 2011-04-22 02:07:22 -0700 Comment on attachment 90647 Patch: Addresses comments and adds localized strings. I think you need to merge this code with the tip of the tree. Also, note that there is a way to copy headers via switching to raw view + selecting + copypasting. 390938 7 90734 sullivan 2011-04-22 11:48:38 -0700 Created attachment 90734 New patch, merged with tip of tree 390944 8 sullivan 2011-04-22 11:55:49 -0700 (In reply to comment #6) > (From update of attachment 90647 [details]) > I think you need to merge this code with the tip of the tree. Also, note that there is a way to copy headers via switching to raw view + selecting + copypasting. Yes, it's possible to do this, but it's really hard to get all the headers without truncating something from the top or bottom or accidentally including some of the text above/below the headers, especially on a laptop with a smaller screen and no mouse. I think this is why both Firebug and HttpWatch provide context menu options for this. It's a very useful feature for quickly getting information into a bug or email. 391786 9 90734 pfeldman 2011-04-25 09:39:19 -0700 Comment on attachment 90734 New patch, merged with tip of tree Clearing flags on attachment: 90734 Committed r84778: <http://trac.webkit.org/changeset/84778> 391788 10 pfeldman 2011-04-25 09:39:28 -0700 All reviewed patches have been landed. Closing bug. 89893 2011-04-15 17:39:57 -0700 2011-04-21 18:30:16 -0700 Patch context_copy.patch text/plain 4464 sullivan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBmZjU1ZGMxLi4zZTJlM2IwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDQtMTUgIEFubmllIFN1bGxpdmFuICA8c3VsbGl2YW5AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtSZXNvdXJjZXMgcGFuZWxdIFNob3VsZCBiZSBlYXN5IHRvIGNvcHkgZGF0YS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NjYyCisKKyAg ICAgICAgQWRkcyBjb250ZXh0IG1lbnUgaXRlbXMgdG8gY29weSByZXNvdXJjZSBsb2NhdGlvbiwg cmVzb3VyY2UgcmVxdWVzdCBoZWFkZXJzLCBhbmQgcmVzb3VyY2UgcmVzcG9uc2UgaGVhZGVycy4K KworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuX2NvbnRleHRNZW51KTogQWRk IG5ldyBpdGVtcyB0byBjb250ZXh0IG1lbnUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29y a1BhbmVsLnByb3RvdHlwZS5fZXhwb3J0TG9jYXRpb24pOiBDb3B5IHJlc291cmNlIGxvY2F0aW9u IHRvIGNsaXBib2FyZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90 eXBlLl9leHBvcnRSZXF1ZXN0SGVhZGVycyk6IENvcHkgcmVzb3VyY2UgcmVxdWVzdCBoZWFkZXJz IHRvIGNsaXBib2FyZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90 eXBlLl9leHBvcnRSZXNwb25zZUhlYWRlcnMpOiBDb3B5IHJlc291cmNlIHJlc3BvbnNlIGhlYWRl cnMgdG8gY2xpcGJvYXJkLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Uu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCByZXF1ZXN0 SGVhZGVyc1RleHQpOiBJZiBfcmVxdWVzdEhlYWRlcnNUZXh0IGlzIHVuZGVmaW5lZCwgZ2VuZXJh dGUgaXQgZnJvbSByZXF1ZXN0SGVhZGVycy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5wcm90b3R5cGUuZ2V0IHJlc3BvbnNlSGVhZGVyc1RleHQpOiBJZiBfcmVzcG9uc2VIZWFkZXJz VGV4dCBpcyB1bmRlZmluZWQsIGdlbmVyYXRlIGl0IGZvcm0gcmVzcG9uc2VIZWFkZXJzLgorCiAy MDExLTA0LTE1ICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IDM4YmUxMWEuLmFlYWQwN2EgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpz CkBAIC05OTcsOCArOTk3LDE0IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBl ID0gewogICAgICAgICB2YXIgY29udGV4dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRN ZW51KCk7CiAgICAgICAgIHZhciBncmlkTm9kZSA9IHRoaXMuX2RhdGFHcmlkLmRhdGFHcmlkTm9k ZUZyb21Ob2RlKGV2ZW50LnRhcmdldCk7CiAgICAgICAgIHZhciByZXNvdXJjZSA9IGdyaWROb2Rl ICYmIGdyaWROb2RlLl9yZXNvdXJjZTsKLSAgICAgICAgaWYgKHJlc291cmNlKQorICAgICAgICBp ZiAocmVzb3VyY2UpIHsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJDb3B5IGxvY2F0aW9uIiksIHRoaXMuX2V4cG9ydExvY2F0aW9uLmJp bmQodGhpcywgcmVzb3VyY2UpKTsKKyAgICAgICAgICAgIGlmIChyZXNvdXJjZS5yZXF1ZXN0SGVh ZGVyc1RleHQpCisgICAgICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIkNvcHkgcmVxdWVzdCBoZWFkZXJzIiksIHRoaXMuX2V4cG9ydFJlcXVl c3RIZWFkZXJzLmJpbmQodGhpcywgcmVzb3VyY2UpKTsKKyAgICAgICAgICAgIGlmIChyZXNvdXJj ZS5yZXNwb25zZUhlYWRlcnNUZXh0KQorICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb3B5IHJlc3BvbnNlIGhlYWRlcnMiKSwgdGhp cy5fZXhwb3J0UmVzcG9uc2VIZWFkZXJzLmJpbmQodGhpcywgcmVzb3VyY2UpKTsKICAgICAgICAg ICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb3B5IGVu dHJ5IGFzIEhBUiIpLCB0aGlzLl9leHBvcnRSZXNvdXJjZS5iaW5kKHRoaXMsIHJlc291cmNlKSk7 CisgICAgICAgIH0KICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkNvcHkgbmV0d29yayBsb2cgYXMgSEFSIiksIHRoaXMuX2V4cG9ydEFsbC5iaW5k KHRoaXMpKTsKICAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CiAgICAgfSwKQEAgLTEw MTcsNiArMTAyMywyMSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNvcHlUZXh0KEpTT04uc3RyaW5naWZ5KGhh cikpOwogICAgIH0sCiAKKyAgICBfZXhwb3J0TG9jYXRpb246IGZ1bmN0aW9uKHJlc291cmNlKQor ICAgIHsKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNvcHlUZXh0KHJlc291cmNlLnVy bCk7CisgICAgfSwKKworICAgIF9leHBvcnRSZXF1ZXN0SGVhZGVyczogZnVuY3Rpb24ocmVzb3Vy Y2UpCisgICAgeworICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQocmVzb3Vy Y2UucmVxdWVzdEhlYWRlcnNUZXh0KTsKKyAgICB9LAorCisgICAgX2V4cG9ydFJlc3BvbnNlSGVh ZGVyczogZnVuY3Rpb24ocmVzb3VyY2UpCisgICAgeworICAgICAgICBJbnNwZWN0b3JGcm9udGVu ZEhvc3QuY29weVRleHQocmVzb3VyY2UucmVzcG9uc2VIZWFkZXJzVGV4dCk7CisgICAgfSwKKwog ICAgIF91cGRhdGVPZmZzY3JlZW5Sb3dzOiBmdW5jdGlvbihlKQogICAgIHsKICAgICAgICAgdmFy IGRhdGFUYWJsZUJvZHkgPSB0aGlzLl9kYXRhR3JpZC5kYXRhVGFibGVCb2R5OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKaW5kZXggZDgzNzNjZC4u MjhlMTJmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9S ZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlLmpzCkBAIC00MjEsNiArNDIxLDEyIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5 cGUgPSB7CiAKICAgICBnZXQgcmVxdWVzdEhlYWRlcnNUZXh0KCkKICAgICB7CisgICAgICAgIGlm ICh0aGlzLl9yZXF1ZXN0SGVhZGVyc1RleHQgIT09IHVuZGVmaW5lZCkKKyAgICAgICAgICAgIHJl dHVybiB0aGlzLl9yZXF1ZXN0SGVhZGVyc1RleHQ7CisKKyAgICAgICAgdGhpcy5fcmVxdWVzdEhl YWRlcnNUZXh0ID0gIiI7CisgICAgICAgIGZvciAodmFyIGtleSBpbiB0aGlzLnJlcXVlc3RIZWFk ZXJzKQorICAgICAgICAgICAgdGhpcy5fcmVxdWVzdEhlYWRlcnNUZXh0ICs9IGtleSArICI6ICIg KyB0aGlzLnJlcXVlc3RIZWFkZXJzW2tleV0gKyAnXG4nOyAKICAgICAgICAgcmV0dXJuIHRoaXMu X3JlcXVlc3RIZWFkZXJzVGV4dDsKICAgICB9LAogCkBAIC00OTYsNiArNTAyLDEyIEBAIFdlYklu c3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgCiAgICAgZ2V0IHJlc3BvbnNlSGVh ZGVyc1RleHQoKQogICAgIHsKKyAgICAgICAgaWYgKHRoaXMuX3Jlc3BvbnNlSGVhZGVyc1RleHQg IT09IHVuZGVmaW5lZCkKKyAgICAgICAgICAgIHJldHVybiB0aGlzLl9yZXNwb25zZUhlYWRlcnNU ZXh0OworICAgICAgICAKKyAgICAgICAgdGhpcy5fcmVzcG9uc2VIZWFkZXJzVGV4dCA9ICIiOwor ICAgICAgICBmb3IgKHZhciBrZXkgaW4gdGhpcy5yZXNwb25zZUhlYWRlcnMpCisgICAgICAgICAg ICB0aGlzLl9yZXNwb25zZUhlYWRlcnNUZXh0ICs9IGtleSArICI6ICIgKyB0aGlzLnJlc3BvbnNl SGVhZGVyc1trZXldICsgJ1xuJzsgCiAgICAgICAgIHJldHVybiB0aGlzLl9yZXNwb25zZUhlYWRl cnNUZXh0OwogICAgIH0sCiAK 90647 2011-04-21 18:30:16 -0700 2011-04-22 11:48:38 -0700 Patch: Addresses comments and adds localized strings. copy_context.patch text/plain 4759 sullivan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3OWVhMTJjLi4yNjRhMGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDQtMjEgIEFubmllIFN1bGxpdmFuICA8c3VsbGl2YW5AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtSZXNvdXJjZXMgcGFuZWxdIFNob3VsZCBiZSBlYXN5IHRvIGNvcHkgZGF0YS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NjYyCisKKyAg ICAgICAgQWRkcyBjb250ZXh0IG1lbnUgaXRlbXMgdG8gY29weSByZXNvdXJjZSBsb2NhdGlvbiwg cmVzb3VyY2UgcmVxdWVzdCBoZWFkZXJzLCBhbmQgcmVzb3VyY2UgcmVzcG9uc2UgaGVhZGVycy4K KworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuX2NvbnRleHRNZW51KTogQWRk IG5ldyBpdGVtcyB0byBjb250ZXh0IG1lbnUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29y a1BhbmVsLnByb3RvdHlwZS5fZXhwb3J0TG9jYXRpb24pOiBDb3B5IHJlc291cmNlIGxvY2F0aW9u IHRvIGNsaXBib2FyZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90 eXBlLl9leHBvcnRSZXF1ZXN0SGVhZGVycyk6IENvcHkgcmVzb3VyY2UgcmVxdWVzdCBoZWFkZXJz IHRvIGNsaXBib2FyZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90 eXBlLl9leHBvcnRSZXNwb25zZUhlYWRlcnMpOiBDb3B5IHJlc291cmNlIHJlc3BvbnNlIGhlYWRl cnMgdG8gY2xpcGJvYXJkLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Uu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCByZXF1ZXN0 SGVhZGVyc1RleHQpOiBJZiBfcmVxdWVzdEhlYWRlcnNUZXh0IGlzIHVuZGVmaW5lZCwgZ2VuZXJh dGUgaXQgZnJvbSByZXF1ZXN0SGVhZGVycy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5wcm90b3R5cGUuZ2V0IHJlc3BvbnNlSGVhZGVyc1RleHQpOiBJZiBfcmVzcG9uc2VIZWFkZXJz VGV4dCBpcyB1bmRlZmluZWQsIGdlbmVyYXRlIGl0IGZvcm0gcmVzcG9uc2VIZWFkZXJzLgorCiAy MDExLTA0LTIxICBOYXQgRHVjYSAgPG5kdWNhQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBKYW1lcyBSb2JpbnNvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0VuZ2xp c2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA1NDYwNmExNGQ2OTRmOGJiZTk4YmU0OTRhNzQ3 YjM2NzZkOTFhNmZjLi4zMDc4ZmRkMTA0OGFkZDQwYzE4YWJhMjk5NGIzNGVhNWNhM2UxMGU0IDEw MDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDEyMgp6Y21jYnpuRUJpPzxfI005bExLX3dTYVRU aThJbVV9VDhVNVEoJmJ7em5TNElQYTxZUlMqV0BYYWcobXh6TnF8SmIKdj80bHd3a2hwTFdMbj1j dExqaDElOSp8Q0RQKy1XST57fSlZUWlvTnB1KmUqIWs3Y3VseytkTXFAPj9UQAoKZGVsdGEgMTgK YWNtWEBOalFQcjk8XyNNOWxmTnR4K1B1WUopKj04XmNMQG1xCgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRleCBmYzYzMmVlLi43 ZDJjYzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05l dHdvcmtQYW5lbC5qcwpAQCAtMTAwMyw4ICsxMDAzLDE0IEBAIFdlYkluc3BlY3Rvci5OZXR3b3Jr UGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB2YXIgZ3JpZE5vZGUgPSB0aGlzLl9kYXRhR3Jp ZC5kYXRhR3JpZE5vZGVGcm9tTm9kZShldmVudC50YXJnZXQpOwogICAgICAgICB2YXIgcmVzb3Vy Y2UgPSBncmlkTm9kZSAmJiBncmlkTm9kZS5fcmVzb3VyY2U7CiAKLSAgICAgICAgaWYgKHJlc291 cmNlKQorICAgICAgICBpZiAocmVzb3VyY2UpIHsKKyAgICAgICAgICAgIGNvbnRleHRNZW51LmFw cGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb3B5IGxvY2F0aW9uIiksIHRoaXMuX2Nv cHlMb2NhdGlvbi5iaW5kKHRoaXMsIHJlc291cmNlKSk7CisgICAgICAgICAgICBpZiAocmVzb3Vy Y2UucmVxdWVzdEhlYWRlcnNUZXh0KQorICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb3B5IHJlcXVlc3QgaGVhZGVycyIpLCB0aGlz Ll9jb3B5UmVxdWVzdEhlYWRlcnMuYmluZCh0aGlzLCByZXNvdXJjZSkpOworICAgICAgICAgICAg aWYgKHJlc291cmNlLnJlc3BvbnNlSGVhZGVyc1RleHQpCisgICAgICAgICAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvcHkgcmVzcG9uc2UgaGVh ZGVycyIpLCB0aGlzLl9jb3B5UmVzcG9uc2VIZWFkZXJzLmJpbmQodGhpcywgcmVzb3VyY2UpKTsK ICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJDb3B5IGVudHJ5IGFzIEhBUiIpLCB0aGlzLl9jb3B5UmVzb3VyY2UuYmluZCh0aGlzLCByZXNv dXJjZSkpOworICAgICAgICB9CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJDb3B5IGFsbCBhcyBIQVIiKSwgdGhpcy5fY29weUFsbC5iaW5kKHRo aXMpKTsKIAogICAgICAgICBpZiAoUHJlZmVyZW5jZXMuc2F2ZUFzQXZhaWxhYmxlKSB7CkBAIC0x MDMxLDYgKzEwMzcsMjEgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUgPSB7 CiAgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5jb3B5VGV4dChKU09OLnN0cmluZ2lmeSho YXIpKTsKICAgICB9LAogCisgICAgX2NvcHlMb2NhdGlvbjogZnVuY3Rpb24ocmVzb3VyY2UpCisg ICAgeworICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQocmVzb3VyY2UudXJs KTsKKyAgICB9LAorCisgICAgX2NvcHlSZXF1ZXN0SGVhZGVyczogZnVuY3Rpb24ocmVzb3VyY2Up CisgICAgeworICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQocmVzb3VyY2Uu cmVxdWVzdEhlYWRlcnNUZXh0KTsKKyAgICB9LAorCisgICAgX2NvcHlSZXNwb25zZUhlYWRlcnM6 IGZ1bmN0aW9uKHJlc291cmNlKQorICAgIHsKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0 LmNvcHlUZXh0KHJlc291cmNlLnJlc3BvbnNlSGVhZGVyc1RleHQpOworICAgIH0sCisKICAgICBf ZXhwb3J0QWxsOiBmdW5jdGlvbigpCiAgICAgewogICAgICAgICB2YXIgaGFyQXJjaGl2ZSA9IHsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Uu anMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4 IDVlYmZmZjEuLmM1NDhkODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9SZXNvdXJjZS5qcwpAQCAtNDM1LDYgKzQzNSwxMiBAQCBXZWJJbnNwZWN0b3IuUmVzb3Vy Y2UucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHJlcXVlc3RIZWFkZXJzVGV4dCgpCiAgICAgewor ICAgICAgICBpZiAodGhpcy5fcmVxdWVzdEhlYWRlcnNUZXh0ICE9PSB1bmRlZmluZWQpCisgICAg ICAgICAgICByZXR1cm4gdGhpcy5fcmVxdWVzdEhlYWRlcnNUZXh0OworCisgICAgICAgIHRoaXMu X3JlcXVlc3RIZWFkZXJzVGV4dCA9ICIiOworICAgICAgICBmb3IgKHZhciBrZXkgaW4gdGhpcy5y ZXF1ZXN0SGVhZGVycykKKyAgICAgICAgICAgIHRoaXMuX3JlcXVlc3RIZWFkZXJzVGV4dCArPSBr ZXkgKyAiOiAiICsgdGhpcy5yZXF1ZXN0SGVhZGVyc1trZXldICsgIlxuIjsgCiAgICAgICAgIHJl dHVybiB0aGlzLl9yZXF1ZXN0SGVhZGVyc1RleHQ7CiAgICAgfSwKIApAQCAtNTEwLDYgKzUxNiwx MiBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIAogICAgIGdldCBy ZXNwb25zZUhlYWRlcnNUZXh0KCkKICAgICB7CisgICAgICAgIGlmICh0aGlzLl9yZXNwb25zZUhl YWRlcnNUZXh0ICE9PSB1bmRlZmluZWQpCisgICAgICAgICAgICByZXR1cm4gdGhpcy5fcmVzcG9u c2VIZWFkZXJzVGV4dDsKKyAgICAgICAgCisgICAgICAgIHRoaXMuX3Jlc3BvbnNlSGVhZGVyc1Rl eHQgPSAiIjsKKyAgICAgICAgZm9yICh2YXIga2V5IGluIHRoaXMucmVzcG9uc2VIZWFkZXJzKQor ICAgICAgICAgICAgdGhpcy5fcmVzcG9uc2VIZWFkZXJzVGV4dCArPSBrZXkgKyAiOiAiICsgdGhp cy5yZXNwb25zZUhlYWRlcnNba2V5XSArICJcbiI7IAogICAgICAgICByZXR1cm4gdGhpcy5fcmVz cG9uc2VIZWFkZXJzVGV4dDsKICAgICB9LAogCg== 90734 2011-04-22 11:48:38 -0700 2011-04-25 09:39:19 -0700 New patch, merged with tip of tree copy_context.patch text/plain 4760 sullivan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhNzJkOTkyLi4xMDc2MTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTEtMDQtMjIgIEFubmllIFN1bGxpdmFuICA8c3VsbGl2YW5AY2hyb21pdW0ub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtSZXNvdXJjZXMgcGFuZWxdIFNob3VsZCBiZSBlYXN5IHRvIGNvcHkgZGF0YS4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NjYyCisKKyAg ICAgICAgQWRkcyBjb250ZXh0IG1lbnUgaXRlbXMgdG8gY29weSByZXNvdXJjZSBsb2NhdGlvbiwg cmVzb3VyY2UgcmVxdWVzdCBoZWFkZXJzLCBhbmQgcmVzb3VyY2UgcmVzcG9uc2UgaGVhZGVycy4K KworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtQYW5lbC5wcm90b3R5cGUuX2NvbnRleHRNZW51KTogQWRk IG5ldyBpdGVtcyB0byBjb250ZXh0IG1lbnUuCisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29y a1BhbmVsLnByb3RvdHlwZS5fZXhwb3J0TG9jYXRpb24pOiBDb3B5IHJlc291cmNlIGxvY2F0aW9u IHRvIGNsaXBib2FyZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90 eXBlLl9leHBvcnRSZXF1ZXN0SGVhZGVycyk6IENvcHkgcmVzb3VyY2UgcmVxdWVzdCBoZWFkZXJz IHRvIGNsaXBib2FyZC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90 eXBlLl9leHBvcnRSZXNwb25zZUhlYWRlcnMpOiBDb3B5IHJlc291cmNlIHJlc3BvbnNlIGhlYWRl cnMgdG8gY2xpcGJvYXJkLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2Uu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLmdldCByZXF1ZXN0 SGVhZGVyc1RleHQpOiBJZiBfcmVxdWVzdEhlYWRlcnNUZXh0IGlzIHVuZGVmaW5lZCwgZ2VuZXJh dGUgaXQgZnJvbSByZXF1ZXN0SGVhZGVycy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5wcm90b3R5cGUuZ2V0IHJlc3BvbnNlSGVhZGVyc1RleHQpOiBJZiBfcmVzcG9uc2VIZWFkZXJz VGV4dCBpcyB1bmRlZmluZWQsIGdlbmVyYXRlIGl0IGZvcm0gcmVzcG9uc2VIZWFkZXJzLgorCiAy MDExLTA0LTIyICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgR2F2aW4gQmFycmFjbG91Z2guCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Fbmds aXNoLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMgYi9Tb3VyY2UvV2ViQ29yZS9FbmdsaXNoLmxw cm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggOTI3ZWNmNDZkNGMxMzY1NmQ0OTUwZDRiZmY5 NGNhMDI5YWM5OGE4MC4uZTM3YzFjMTc4ZDFmZmM5MDBlNmUzNzQyNTY2ZDBjZGUxODg1MmJlZSAx MDA2NDQKR0lUIGJpbmFyeSBwYXRjaApkZWx0YSAxMjIKemNtY2IhbD08MlU8XyNNOWxMS193U2FU VGk4SW1VfVQ4VTVRKCZie3puUzRJUGE8WVJTKldAWGFnKG14ek5xfEpiCnY/NGx3d2tocExXTG49 Y3RMamgxJTkqfENEUCstV0k+e30pWVFpb05wdSplKiFrN2N1bHsrN2k2YF9keiQKCmRlbHRhIDE4 CmFjbWNiJWc4OXg7PF8jTTlsZk50eCtQdVlKKFA5OHImSXUqfQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMKaW5kZXggZjMyYWViMy4u NjY0NmY0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O ZXR3b3JrUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9O ZXR3b3JrUGFuZWwuanMKQEAgLTEwMDMsOCArMTAwMywxNCBAQCBXZWJJbnNwZWN0b3IuTmV0d29y a1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGdyaWROb2RlID0gdGhpcy5fZGF0YUdy aWQuZGF0YUdyaWROb2RlRnJvbU5vZGUoZXZlbnQudGFyZ2V0KTsKICAgICAgICAgdmFyIHJlc291 cmNlID0gZ3JpZE5vZGUgJiYgZ3JpZE5vZGUuX3Jlc291cmNlOwogCi0gICAgICAgIGlmIChyZXNv dXJjZSkKKyAgICAgICAgaWYgKHJlc291cmNlKSB7CisgICAgICAgICAgICBjb250ZXh0TWVudS5h cHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29weSBsb2NhdGlvbiIpLCB0aGlzLl9j b3B5TG9jYXRpb24uYmluZCh0aGlzLCByZXNvdXJjZSkpOworICAgICAgICAgICAgaWYgKHJlc291 cmNlLnJlcXVlc3RIZWFkZXJzVGV4dCkKKyAgICAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29weSByZXF1ZXN0IGhlYWRlcnMiKSwgdGhp cy5fY29weVJlcXVlc3RIZWFkZXJzLmJpbmQodGhpcywgcmVzb3VyY2UpKTsKKyAgICAgICAgICAg IGlmIChyZXNvdXJjZS5yZXNwb25zZUhlYWRlcnNUZXh0KQorICAgICAgICAgICAgICAgIGNvbnRl eHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDb3B5IHJlc3BvbnNlIGhl YWRlcnMiKSwgdGhpcy5fY29weVJlc3BvbnNlSGVhZGVycy5iaW5kKHRoaXMsIHJlc291cmNlKSk7 CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiQ29weSBlbnRyeSBhcyBIQVIiKSwgdGhpcy5fY29weVJlc291cmNlLmJpbmQodGhpcywgcmVz b3VyY2UpKTsKKyAgICAgICAgfQogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYklu c3BlY3Rvci5VSVN0cmluZygiQ29weSBhbGwgYXMgSEFSIiksIHRoaXMuX2NvcHlBbGwuYmluZCh0 aGlzKSk7CiAKICAgICAgICAgaWYgKFByZWZlcmVuY2VzLnNhdmVBc0F2YWlsYWJsZSkgewpAQCAt MTAzMSw2ICsxMDM3LDIxIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrUGFuZWwucHJvdG90eXBlID0g ewogICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3QuY29weVRleHQoSlNPTi5zdHJpbmdpZnko aGFyKSk7CiAgICAgfSwKIAorICAgIF9jb3B5TG9jYXRpb246IGZ1bmN0aW9uKHJlc291cmNlKQor ICAgIHsKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNvcHlUZXh0KHJlc291cmNlLnVy bCk7CisgICAgfSwKKworICAgIF9jb3B5UmVxdWVzdEhlYWRlcnM6IGZ1bmN0aW9uKHJlc291cmNl KQorICAgIHsKKyAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNvcHlUZXh0KHJlc291cmNl LnJlcXVlc3RIZWFkZXJzVGV4dCk7CisgICAgfSwKKworICAgIF9jb3B5UmVzcG9uc2VIZWFkZXJz OiBmdW5jdGlvbihyZXNvdXJjZSkKKyAgICB7CisgICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9z dC5jb3B5VGV4dChyZXNvdXJjZS5yZXNwb25zZUhlYWRlcnNUZXh0KTsKKyAgICB9LAorCiAgICAg X2V4cG9ydEFsbDogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgdmFyIGhhckFyY2hpdmUgPSB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNl LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwppbmRl eCA1ZWJmZmYxLi5jNTQ4ZDg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvUmVzb3VyY2UuanMKQEAgLTQzNSw2ICs0MzUsMTIgQEAgV2ViSW5zcGVjdG9yLlJlc291 cmNlLnByb3RvdHlwZSA9IHsKIAogICAgIGdldCByZXF1ZXN0SGVhZGVyc1RleHQoKQogICAgIHsK KyAgICAgICAgaWYgKHRoaXMuX3JlcXVlc3RIZWFkZXJzVGV4dCAhPT0gdW5kZWZpbmVkKQorICAg ICAgICAgICAgcmV0dXJuIHRoaXMuX3JlcXVlc3RIZWFkZXJzVGV4dDsKKworICAgICAgICB0aGlz Ll9yZXF1ZXN0SGVhZGVyc1RleHQgPSAiIjsKKyAgICAgICAgZm9yICh2YXIga2V5IGluIHRoaXMu cmVxdWVzdEhlYWRlcnMpCisgICAgICAgICAgICB0aGlzLl9yZXF1ZXN0SGVhZGVyc1RleHQgKz0g a2V5ICsgIjogIiArIHRoaXMucmVxdWVzdEhlYWRlcnNba2V5XSArICJcbiI7IAogICAgICAgICBy ZXR1cm4gdGhpcy5fcmVxdWVzdEhlYWRlcnNUZXh0OwogICAgIH0sCiAKQEAgLTUxMCw2ICs1MTYs MTIgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNlLnByb3RvdHlwZSA9IHsKICAgICAKICAgICBnZXQg cmVzcG9uc2VIZWFkZXJzVGV4dCgpCiAgICAgeworICAgICAgICBpZiAodGhpcy5fcmVzcG9uc2VI ZWFkZXJzVGV4dCAhPT0gdW5kZWZpbmVkKQorICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc3Bv bnNlSGVhZGVyc1RleHQ7CisgICAgICAgIAorICAgICAgICB0aGlzLl9yZXNwb25zZUhlYWRlcnNU ZXh0ID0gIiI7CisgICAgICAgIGZvciAodmFyIGtleSBpbiB0aGlzLnJlc3BvbnNlSGVhZGVycykK KyAgICAgICAgICAgIHRoaXMuX3Jlc3BvbnNlSGVhZGVyc1RleHQgKz0ga2V5ICsgIjogIiArIHRo aXMucmVzcG9uc2VIZWFkZXJzW2tleV0gKyAiXG4iOyAKICAgICAgICAgcmV0dXJuIHRoaXMuX3Jl c3BvbnNlSGVhZGVyc1RleHQ7CiAgICAgfSwKIAo=