54379 2011-02-14 01:21:24 -0800 Add basic parser for Content Security Policy 2011-02-14 12:48:32 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 53572 1 abarth abarth commit-queue eric jochen oldest_to_newest 350557 0 abarth 2011-02-14 01:21:24 -0800 Add basic parser for Content Security Policy 350558 1 82296 abarth 2011-02-14 01:27:09 -0800 Created attachment 82296 Patch 350561 2 82296 eric 2011-02-14 01:36:37 -0800 Comment on attachment 82296 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=82296&action=review LGTM. I look forward to seeing this testable in the next patch. :) > Source/WebCore/page/ContentSecurityPolicy.cpp:117 > + m_directives.append(CSPDirective(String(name), String(value))); You should explain why you use this method for creating strings, since you say it does only 2 mallocs instead of 4. Seems like a useful comment. 350562 3 82297 abarth 2011-02-14 01:38:39 -0800 Created attachment 82297 Patch for landing 350605 4 82297 commit-queue 2011-02-14 05:14:20 -0800 Comment on attachment 82297 Patch for landing Rejecting attachment 82297 from commit-queue. Failed to run "['./Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=cr-jail-4', 'apply-..." exit_code: 1 Last 500 characters of output: rks/Python.framework/Versions/2.6/lib/python2.6/urllib2.py", line 361, in _call_chain result = func(*args) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_http.py", line 756, in https_open return self.do_open(conn_factory, req) File "/mnt/git/webkit-commit-queue/Tools/Scripts/webkitpy/thirdparty/autoinstalled/mechanize/_http.py", line 706, in do_open raise URLError(err) urllib2.URLError: <urlopen error [Errno 60] Operation timed out> Full output: http://queues.webkit.org/results/7913501 350712 5 82297 eric 2011-02-14 09:42:51 -0800 Comment on attachment 82297 Patch for landing We should probably catch and ignore URLError in certain cases. 350828 6 82297 commit-queue 2011-02-14 12:48:27 -0800 Comment on attachment 82297 Patch for landing Clearing flags on attachment: 82297 Committed r78497: <http://trac.webkit.org/changeset/78497> 350829 7 commit-queue 2011-02-14 12:48:32 -0800 All reviewed patches have been landed. Closing bug. 82296 2011-02-14 01:27:09 -0800 2011-02-14 01:38:36 -0800 Patch bug-54379-20110214012708.patch text/plain 7607 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogNzg0MzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk4 MzU4ZWYxMTNmMWI0MzY2N2I5MGFjNjFmNWUwZmIzODViNGYwMWEuLjE5MDlkMjQyMmYyMjI2NjRh ZDczZmYyOThhOTQzN2ZhZWRlMGViMzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDExLTAyLTE0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGJhc2lj IHBhcnNlciBmb3IgQ29udGVudCBTZWN1cml0eSBQb2xpY3kKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzc5CisKKyAgICAgICAgQWRkIGEgY29uc3Ry dWN0b3IgZm9yIGNvcHlpbmcgYSBWZWN0b3IgaW50byBhIFN0cmluZy4gIEkgc3VzcGVjdCB0aGVy ZQorICAgICAgICBhcmUgYSBudW1iZXIgb2YgY2FsbCBzaXRlcyB0aGF0IGFyZSBkb2luZyB0aGlz IG1hbnVhbGx5IHRoYXQgd291bGQKKyAgICAgICAgYmVuZWZpdCBmcm9tIGJlaW5nIG1vdmVkIHRv IHRoaXMgQVBJLgorCisgICAgICAgICogd3RmL3RleHQvV1RGU3RyaW5nLmg6CisgICAgICAgIChX VEY6OlN0cmluZzo6U3RyaW5nKToKKwogMjAxMS0wMi0xMyAgQ2FtZXJvbiBad2FyaWNoICA8endh cmljaEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvdGV4dC9XVEZTdHJpbmcuaCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvdGV4dC9XVEZTdHJpbmcuaAppbmRleCAwYWVlMmVmZDdk ZjE0NGE4ODUzNmQ3NzcyNTYyZTBlYjVjZjAyNzJlLi4xMjY1NzIxNzgyMzUzMmY2MzhkOTAyMDJm OTY4ZWI4NDNlNDU0MjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL3Rl eHQvV1RGU3RyaW5nLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi90ZXh0L1dURlN0 cmluZy5oCkBAIC05Miw2ICs5MiwxMSBAQCBwdWJsaWM6CiAgICAgLy8gQ29uc3RydWN0IGEgc3Ry aW5nIHdpdGggVVRGLTE2IGRhdGEuCiAgICAgU3RyaW5nKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJz LCB1bnNpZ25lZCBsZW5ndGgpOwogCisgICAgLy8gQ29uc3RydWN0IGEgc3RyaW5nIGJ5IGNvcHlp bmcgdGhlIGNvbnRlbnRzIG9mIGEgdmVjdG9yLiAgVG8gYXZvaWQKKyAgICAvLyBjb3B5aW5nLCBj b25zaWRlciB1c2luZyBTdHJpbmc6OmFkb3B0IGluc3RlYWQuCisgICAgdGVtcGxhdGU8c2l6ZV90 IGlubGluZUNhcGFjaXR5PgorICAgIGV4cGxpY2l0IFN0cmluZyhjb25zdCBWZWN0b3I8VUNoYXIs IGlubGluZUNhcGFjaXR5PiYpOworCiAgICAgLy8gQ29uc3RydWN0IGEgc3RyaW5nIHdpdGggVVRG LTE2IGRhdGEsIGZyb20gYSBudWxsLXRlcm1pbmF0ZWQgc291cmNlLgogICAgIFN0cmluZyhjb25z dCBVQ2hhciopOwogCkBAIC0xMDEsNiArMTA2LDcgQEAgcHVibGljOgogICAgIC8vIENvbnN0cnVj dCBhIHN0cmluZyB3aXRoIGxhdGluMSBkYXRhLCBmcm9tIGEgbnVsbC10ZXJtaW5hdGVkIHNvdXJj ZS4KICAgICBTdHJpbmcoY29uc3QgY2hhciogY2hhcmFjdGVycyk7CiAKKwogICAgIC8vIENvbnN0 cnVjdCBhIHN0cmluZyByZWZlcmVuY2luZyBhbiBleGlzdGluZyBTdHJpbmdJbXBsLgogICAgIFN0 cmluZyhTdHJpbmdJbXBsKiBpbXBsKSA6IG1faW1wbChpbXBsKSB7IH0KICAgICBTdHJpbmcoUGFz c1JlZlB0cjxTdHJpbmdJbXBsPiBpbXBsKSA6IG1faW1wbChpbXBsKSB7IH0KQEAgLTM3OCw2ICsz ODQsMTIgQEAgaW5saW5lIHZvaWQgc3dhcChTdHJpbmcmIGEsIFN0cmluZyYgYikgeyBhLnN3YXAo Yik7IH0KIAogLy8gRGVmaW5pdGlvbnMgb2Ygc3RyaW5nIG9wZXJhdGlvbnMKIAordGVtcGxhdGU8 c2l6ZV90IGlubGluZUNhcGFjaXR5PgorU3RyaW5nOjpTdHJpbmcoY29uc3QgVmVjdG9yPFVDaGFy LCBpbmxpbmVDYXBhY2l0eT4mIHZlY3RvcikKKyAgICA6IG1faW1wbCh2ZWN0b3Iuc2l6ZSgpID8g U3RyaW5nSW1wbDo6Y3JlYXRlKHZlY3Rvci5kYXRhKCksIHZlY3Rvci5zaXplKCkpIDogMCkKK3sK K30KKwogI2lmZGVmIF9fT0JKQ19fCiAvLyBUaGlzIGlzIGZvciBzaXR1YXRpb25zIGluIFdlYktp dCB3aGVyZSB0aGUgbG9uZyBzdGFuZGluZyBiZWhhdmlvciBoYXMgYmVlbgogLy8gIm5pbCBpZiBl bXB0eSIsIHNvIHdlIHRyeSB0byBtYWludGFpbiBsb25nc3RhbmRpbmcgYmVoYXZpb3IgZm9yIHRo ZSBzYWtlIG9mCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA4ODg0MzliMTVjZDVlNzMxNTUyMjY5NjI0YWZlMjY1 NmNkM2M2OC4uZjJkZDA1NTdmNDFjMDM5N2M3MjYxYjdmNDJhMGM2MjZjOTk3OGIyMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDExLTAyLTE0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQWRkIGJhc2ljIHBhcnNlciBmb3IgQ29udGVudCBTZWN1cml0eSBQb2xpY3kKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzc5CisKKyAgICAgICAg VGhlIHBhcnNlciBpbiB0aGlzIHBhdGNoIGlzIHZlcnkgYmFzaWMuICBJdCBqdXN0IHNlZ21lbnRz IHRoZSBDU1AKKyAgICAgICAgaGVhZGVyIGludG8gZGlyZWN0aXZlcy4gIFRoZSBleGFjdGx5IHN5 bnRheCB3aWxsIGxpa2VseSBjaGFuZ2UgYSBiaXQgYXMKKyAgICAgICAgd2UgZGlzY3VzcyB0aGUg ZGV0YWlscyBpbiBwdWJsaWMtd2ViLXNlY3VyaXR5LCBidXQgdGhpcyBwYXJzZXIgd2lsbAorICAg ICAgICBhbGxvdyB1cyB0byBtYWtlIHByb2dyZXNzLgorCisgICAgICAgIFNhZGx5LCB0aGlzIHBh dGNoIGRvZXMgbm90IGNvbnRhaW4gYW55IHRlc3RzLiAgVGhhdCdzIGJlY2F1c2UgQ1NQCisgICAg ICAgIHBvbGljaWVzIGRvIG5vdCBoYXZlIGFueSBvYnNlcnZhYmxlIGVmZmVjdHMgeWV0LiAgSG9w ZWZ1bGx5IHdlJ2xsIGdldAorICAgICAgICBlbm91Z2ggc2tldGNoZWQgb3V0IGluIHRoZSBuZXh0 IGNvdXBsZSBwYXRjaGVzIHRvIGJlZ2luIHdyaXRpbmcgdGVzdHMuCisKKyAgICAgICAgKiBwYWdl L0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDU1BEaXJlY3Rp dmU6OkNTUERpcmVjdGl2ZSk6CisgICAgICAgIChXZWJDb3JlOjpDU1BEaXJlY3RpdmU6Om5hbWUp OgorICAgICAgICAoV2ViQ29yZTo6Q1NQRGlyZWN0aXZlOjp2YWx1ZSk6CisgICAgICAgIChXZWJD b3JlOjpDb250ZW50U2VjdXJpdHlQb2xpY3k6On5Db250ZW50U2VjdXJpdHlQb2xpY3kpOgorICAg ICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjpkaWRSZWNlaXZlSGVhZGVyKToK KyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6cGFyc2UpOgorICAgICAg ICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5Lmg6CisKIDIwMTEtMDItMTMgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYW4gQmVybnN0ZWlu LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3ku Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4 IDA0NWU1YWFmMTcwM2YyOTc5Y2JjODlmNzc2NjU0ZjkwYmEwNjA0YmIuLjBiZTVhZWU4YzJmMTg2 MDg3ZDc4N2VkNzA0ZDAwZmM0ZDYxNDQwMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nv bnRlbnRTZWN1cml0eVBvbGljeS5jcHAKQEAgLTI5LDE1ICsyOSwzOCBAQAogCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKK2NsYXNzIENTUERpcmVjdGl2ZSB7CitwdWJsaWM6CisgICAgQ1NQRGlyZWN0 aXZlKGNvbnN0IFN0cmluZyYgbmFtZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKKyAgICAgICAgOiBt X25hbWUobmFtZSkKKyAgICAgICAgLCBtX3ZhbHVlKHZhbHVlKQorICAgIHsKKyAgICB9CisKKyAg ICBjb25zdCBTdHJpbmcmIG5hbWUoKSBjb25zdCB7IHJldHVybiBtX25hbWU7IH0KKyAgICBjb25z dCBTdHJpbmcmIHZhbHVlKCkgY29uc3QgeyByZXR1cm4gbV92YWx1ZTsgfQorCitwcml2YXRlOgor ICAgIFN0cmluZyBtX25hbWU7CisgICAgU3RyaW5nIG1fdmFsdWU7Cit9OworCiBDb250ZW50U2Vj dXJpdHlQb2xpY3k6OkNvbnRlbnRTZWN1cml0eVBvbGljeSgpCiAgICAgOiBtX2lzRW5hYmxlZChm YWxzZSkKIHsKIH0KIAorQ29udGVudFNlY3VyaXR5UG9saWN5Ojp+Q29udGVudFNlY3VyaXR5UG9s aWN5KCkKK3sKK30KKwogdm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFk ZXIoY29uc3QgU3RyaW5nJiBoZWFkZXIpCiB7CisgICAgaWYgKCFtX2RpcmVjdGl2ZXMuaXNFbXB0 eSgpKQorICAgICAgICByZXR1cm47IC8vIFRoZSBmaXJzdCBwb2xpY3kgd2lucy4KKwogICAgIG1f aXNFbmFibGVkID0gdHJ1ZTsKLSAgICBtX2hlYWRlciA9IGhlYWRlcjsKKyAgICBwYXJzZShoZWFk ZXIpOwogfQogCiBib29sIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Y2FuTG9hZEV4dGVybmFsU2Ny aXB0RnJvbVNyYyhjb25zdCBTdHJpbmcmKSBjb25zdApAQCAtNDUsNCArNjgsNTkgQEAgYm9vbCBD b250ZW50U2VjdXJpdHlQb2xpY3k6OmNhbkxvYWRFeHRlcm5hbFNjcmlwdEZyb21TcmMoY29uc3Qg U3RyaW5nJikgY29uc3QKICAgICByZXR1cm4gIW1faXNFbmFibGVkOwogfQogCit2b2lkIENvbnRl bnRTZWN1cml0eVBvbGljeTo6cGFyc2UoY29uc3QgU3RyaW5nJiBwb2xpY3kpCit7CisgICAgQVNT RVJUKG1fZGlyZWN0aXZlcy5pc0VtcHR5KCkpOworCisgICAgaWYgKHBvbGljeS5pc0VtcHR5KCkp CisgICAgICAgIHJldHVybjsKKworICAgIGVudW0geworICAgICAgICBCZWZvcmVEaXJlY3RpdmVO YW1lLAorICAgICAgICBEaXJlY3RpdmVOYW1lLAorICAgICAgICBBZnRlckRpcmVjdGl2ZU5hbWUs CisgICAgICAgIERpcmVjdGl2ZVZhbHVlLAorICAgIH0gc3RhdGUgPSBCZWZvcmVEaXJlY3RpdmVO YW1lOworCisgICAgY29uc3QgVUNoYXIqIHBvcyA9IHBvbGljeS5jaGFyYWN0ZXJzKCk7CisgICAg Y29uc3QgVUNoYXIqIGVuZCA9IHBvcyArIHBvbGljeS5sZW5ndGgoKTsKKworICAgIFZlY3RvcjxV Q2hhciwgMzI+IG5hbWU7CisgICAgVmVjdG9yPFVDaGFyLCA2ND4gdmFsdWU7CisKKyAgICB3aGls ZSAocG9zIDwgZW5kKSB7CisgICAgICAgIFVDaGFyIGN1cnJlbnRDaGFyYWN0ZXIgPSAqcG9zKys7 CisgICAgICAgIHN3aXRjaCAoc3RhdGUpIHsKKyAgICAgICAgY2FzZSBCZWZvcmVEaXJlY3RpdmVO YW1lOgorICAgICAgICAgICAgaWYgKGlzQVNDSUlTcGFjZShjdXJyZW50Q2hhcmFjdGVyKSkKKyAg ICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIHN0YXRlID0gRGlyZWN0aXZlTmFt ZTsKKyAgICAgICAgICAgIC8vIEZhbGwgdGhyb3VnaC4KKyAgICAgICAgY2FzZSBEaXJlY3RpdmVO YW1lOgorICAgICAgICAgICAgaWYgKCFpc0FTQ0lJU3BhY2UoY3VycmVudENoYXJhY3RlcikpIHsK KyAgICAgICAgICAgICAgICBuYW1lLmFwcGVuZChjdXJyZW50Q2hhcmFjdGVyKTsKKyAgICAgICAg ICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHN0YXRlID0gQWZ0 ZXJEaXJlY3RpdmVOYW1lOworICAgICAgICAgICAgLy8gRmFsbCB0aHJvdWdoLgorICAgICAgICBj YXNlIEFmdGVyRGlyZWN0aXZlTmFtZToKKyAgICAgICAgICAgIGlmIChpc0FTQ0lJU3BhY2UoY3Vy cmVudENoYXJhY3RlcikpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBz dGF0ZSA9IERpcmVjdGl2ZVZhbHVlOworICAgICAgICAgICAgLy8gRmFsbCB0aHJvdWdoLgorICAg ICAgICBjYXNlIERpcmVjdGl2ZVZhbHVlOgorICAgICAgICAgICAgaWYgKGN1cnJlbnRDaGFyYWN0 ZXIgIT0gJzsnKSB7CisgICAgICAgICAgICAgICAgdmFsdWUuYXBwZW5kKGN1cnJlbnRDaGFyYWN0 ZXIpOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAgICAgICAg ICAgLy8gRklYTUU6IFBlcmZvcm0gZGlyZWN0aXZlLXNwZWNpZmljIHBhcnNpbmcgb2YgdGhlIHZh bHVlLgorICAgICAgICAgICAgbV9kaXJlY3RpdmVzLmFwcGVuZChDU1BEaXJlY3RpdmUoU3RyaW5n KG5hbWUpLCBTdHJpbmcodmFsdWUpKSk7CisgICAgICAgICAgICBuYW1lLmNsZWFyKCk7CisgICAg ICAgICAgICB2YWx1ZS5jbGVhcigpOworICAgICAgICAgICAgc3RhdGUgPSBCZWZvcmVEaXJlY3Rp dmVOYW1lOworICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIH0KKyAgICB9Cit9CisKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCmluZGV4IGVmMGQ1 NTE5ODhjYjg3YzBkMTQ4ZmFkMTc5YzI4MmFiYWFhZDc0OWEuLjg0MzUxNjZlNjIzZjYwOWE3OWQ0 MThiNDEzYTk1M2I2Nzk0YmNiZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29u dGVudFNlY3VyaXR5UG9saWN5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2Vj dXJpdHlQb2xpY3kuaApAQCAtMjYsMjEgKzI2LDI5IEBACiAjaWZuZGVmIENvbnRlbnRTZWN1cml0 eVBvbGljeV9oCiAjZGVmaW5lIENvbnRlbnRTZWN1cml0eVBvbGljeV9oCiAKKyNpbmNsdWRlIDx3 dGYvVmVjdG9yLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKIAorY2xhc3MgQ1NQRGlyZWN0aXZlOworCiBjbGFzcyBDb250ZW50U2VjdXJp dHlQb2xpY3kgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKENvbnRlbnRTZWN1cml0eVBvbGlj eSk7CiBwdWJsaWM6CiAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5KCk7CisgICAgfkNvbnRlbnRT ZWN1cml0eVBvbGljeSgpOwogCiAgICAgdm9pZCBkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmlu ZyYpOwogICAgIGJvb2wgY2FuTG9hZEV4dGVybmFsU2NyaXB0RnJvbVNyYyhjb25zdCBTdHJpbmcm IHVybCkgY29uc3Q7CiAKIHByaXZhdGU6CisgICAgdHlwZWRlZiBWZWN0b3I8Q1NQRGlyZWN0aXZl PiBEaXJlY3RpdmVMaXN0OworCisgICAgdm9pZCBwYXJzZShjb25zdCBTdHJpbmcmKTsKKwogICAg IGJvb2wgbV9pc0VuYWJsZWQ7Ci0gICAgU3RyaW5nIG1faGVhZGVyOworICAgIERpcmVjdGl2ZUxp c3QgbV9kaXJlY3RpdmVzOwogfTsKIAogfQo= 82297 2011-02-14 01:38:39 -0800 2011-02-14 12:48:27 -0800 Patch for landing bug-54379-20110214013838.patch text/plain 7492 abarth U3VidmVyc2lvbiBSZXZpc2lvbjogNzg0MzEKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDk4 MzU4ZWYxMTNmMWI0MzY2N2I5MGFjNjFmNWUwZmIzODViNGYwMWEuLmVhNzhmZmZmZmU4MjJkMTIx YWU3ZjdmOGE4MTZkNGZhODc5YTc0NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDExLTAyLTE0ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCisKKyAgICAgICAgQWRkIGJhc2ljIHBh cnNlciBmb3IgQ29udGVudCBTZWN1cml0eSBQb2xpY3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU0Mzc5CisKKyAgICAgICAgQWRkIGEgY29uc3RydWN0 b3IgZm9yIGNvcHlpbmcgYSBWZWN0b3IgaW50byBhIFN0cmluZy4gIEkgc3VzcGVjdCB0aGVyZQor ICAgICAgICBhcmUgYSBudW1iZXIgb2YgY2FsbCBzaXRlcyB0aGF0IGFyZSBkb2luZyB0aGlzIG1h bnVhbGx5IHRoYXQgd291bGQKKyAgICAgICAgYmVuZWZpdCBmcm9tIGJlaW5nIG1vdmVkIHRvIHRo aXMgQVBJLgorCisgICAgICAgICogd3RmL3RleHQvV1RGU3RyaW5nLmg6CisgICAgICAgIChXVEY6 OlN0cmluZzo6U3RyaW5nKToKKwogMjAxMS0wMi0xMyAgQ2FtZXJvbiBad2FyaWNoICA8endhcmlj aEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS93dGYvdGV4dC9XVEZTdHJpbmcuaCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS93dGYvdGV4dC9XVEZTdHJpbmcuaAppbmRleCAwYWVlMmVmZDdkZjE0 NGE4ODUzNmQ3NzcyNTYyZTBlYjVjZjAyNzJlLi5iNjA3NzM1MGU0MDkyYmNkZWY3MmZmNjBkMjBh ZGYzZjU3OTRiMTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvd3RmL3RleHQv V1RGU3RyaW5nLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3d0Zi90ZXh0L1dURlN0cmlu Zy5oCkBAIC05Miw2ICs5MiwxMSBAQCBwdWJsaWM6CiAgICAgLy8gQ29uc3RydWN0IGEgc3RyaW5n IHdpdGggVVRGLTE2IGRhdGEuCiAgICAgU3RyaW5nKGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCB1 bnNpZ25lZCBsZW5ndGgpOwogCisgICAgLy8gQ29uc3RydWN0IGEgc3RyaW5nIGJ5IGNvcHlpbmcg dGhlIGNvbnRlbnRzIG9mIGEgdmVjdG9yLiAgVG8gYXZvaWQKKyAgICAvLyBjb3B5aW5nLCBjb25z aWRlciB1c2luZyBTdHJpbmc6OmFkb3B0IGluc3RlYWQuCisgICAgdGVtcGxhdGU8c2l6ZV90IGlu bGluZUNhcGFjaXR5PgorICAgIGV4cGxpY2l0IFN0cmluZyhjb25zdCBWZWN0b3I8VUNoYXIsIGlu bGluZUNhcGFjaXR5PiYpOworCiAgICAgLy8gQ29uc3RydWN0IGEgc3RyaW5nIHdpdGggVVRGLTE2 IGRhdGEsIGZyb20gYSBudWxsLXRlcm1pbmF0ZWQgc291cmNlLgogICAgIFN0cmluZyhjb25zdCBV Q2hhciopOwogCkBAIC0zNzgsNiArMzgzLDEyIEBAIGlubGluZSB2b2lkIHN3YXAoU3RyaW5nJiBh LCBTdHJpbmcmIGIpIHsgYS5zd2FwKGIpOyB9CiAKIC8vIERlZmluaXRpb25zIG9mIHN0cmluZyBv cGVyYXRpb25zCiAKK3RlbXBsYXRlPHNpemVfdCBpbmxpbmVDYXBhY2l0eT4KK1N0cmluZzo6U3Ry aW5nKGNvbnN0IFZlY3RvcjxVQ2hhciwgaW5saW5lQ2FwYWNpdHk+JiB2ZWN0b3IpCisgICAgOiBt X2ltcGwodmVjdG9yLnNpemUoKSA/IFN0cmluZ0ltcGw6OmNyZWF0ZSh2ZWN0b3IuZGF0YSgpLCB2 ZWN0b3Iuc2l6ZSgpKSA6IDApCit7Cit9CisKICNpZmRlZiBfX09CSkNfXwogLy8gVGhpcyBpcyBm b3Igc2l0dWF0aW9ucyBpbiBXZWJLaXQgd2hlcmUgdGhlIGxvbmcgc3RhbmRpbmcgYmVoYXZpb3Ig aGFzIGJlZW4KIC8vICJuaWwgaWYgZW1wdHkiLCBzbyB3ZSB0cnkgdG8gbWFpbnRhaW4gbG9uZ3N0 YW5kaW5nIGJlaGF2aW9yIGZvciB0aGUgc2FrZSBvZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDYwODg4NDM5YjE1 Y2Q1ZTczMTU1MjI2OTYyNGFmZTI2NTZjZDNjNjguLmFjMzc5NGQyMjQ4ZWM0YTc5N2Y3ZTQ5NTZk Y2U3NWJhNzA2NzAxODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyOCBAQAorMjAxMS0wMi0xNCAg QWRhbSBCYXJ0aCAgPGFiYXJ0aEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IEVy aWMgU2VpZGVsLgorCisgICAgICAgIEFkZCBiYXNpYyBwYXJzZXIgZm9yIENvbnRlbnQgU2VjdXJp dHkgUG9saWN5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD01NDM3OQorCisgICAgICAgIFRoZSBwYXJzZXIgaW4gdGhpcyBwYXRjaCBpcyB2ZXJ5IGJhc2lj LiAgSXQganVzdCBzZWdtZW50cyB0aGUgQ1NQCisgICAgICAgIGhlYWRlciBpbnRvIGRpcmVjdGl2 ZXMuICBUaGUgZXhhY3RseSBzeW50YXggd2lsbCBsaWtlbHkgY2hhbmdlIGEgYml0IGFzCisgICAg ICAgIHdlIGRpc2N1c3MgdGhlIGRldGFpbHMgaW4gcHVibGljLXdlYi1zZWN1cml0eSwgYnV0IHRo aXMgcGFyc2VyIHdpbGwKKyAgICAgICAgYWxsb3cgdXMgdG8gbWFrZSBwcm9ncmVzcy4KKworICAg ICAgICBTYWRseSwgdGhpcyBwYXRjaCBkb2VzIG5vdCBjb250YWluIGFueSB0ZXN0cy4gIFRoYXQn cyBiZWNhdXNlIENTUAorICAgICAgICBwb2xpY2llcyBkbyBub3QgaGF2ZSBhbnkgb2JzZXJ2YWJs ZSBlZmZlY3RzIHlldC4gIEhvcGVmdWxseSB3ZSdsbCBnZXQKKyAgICAgICAgZW5vdWdoIHNrZXRj aGVkIG91dCBpbiB0aGUgbmV4dCBjb3VwbGUgcGF0Y2hlcyB0byBiZWdpbiB3cml0aW5nIHRlc3Rz LgorCisgICAgICAgICogcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q1NQRGlyZWN0aXZlOjpDU1BEaXJlY3RpdmUpOgorICAgICAgICAoV2ViQ29yZTo6 Q1NQRGlyZWN0aXZlOjpuYW1lKToKKyAgICAgICAgKFdlYkNvcmU6OkNTUERpcmVjdGl2ZTo6dmFs dWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5Ojp+Q29udGVudFNl Y3VyaXR5UG9saWN5KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6 ZGlkUmVjZWl2ZUhlYWRlcik6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VjdXJpdHlQb2xp Y3k6OnBhcnNlKToKKyAgICAgICAgKiBwYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oOgorCiAy MDExLTAyLTEzICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29u dGVudFNlY3VyaXR5UG9saWN5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3Vy aXR5UG9saWN5LmNwcAppbmRleCAwNDVlNWFhZjE3MDNmMjk3OWNiYzg5Zjc3NjY1NGY5MGJhMDYw NGJiLi44ODExMGU2MjBmNjY5MTk3OWY1NjA3N2VhODkyOGMwMDgxN2JiYWFhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCkBAIC0yOSwxNSArMjks MzggQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCitjbGFzcyBDU1BEaXJlY3RpdmUgeworcHVi bGljOgorICAgIENTUERpcmVjdGl2ZShjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYg dmFsdWUpCisgICAgICAgIDogbV9uYW1lKG5hbWUpCisgICAgICAgICwgbV92YWx1ZSh2YWx1ZSkK KyAgICB7CisgICAgfQorCisgICAgY29uc3QgU3RyaW5nJiBuYW1lKCkgY29uc3QgeyByZXR1cm4g bV9uYW1lOyB9CisgICAgY29uc3QgU3RyaW5nJiB2YWx1ZSgpIGNvbnN0IHsgcmV0dXJuIG1fdmFs dWU7IH0KKworcHJpdmF0ZToKKyAgICBTdHJpbmcgbV9uYW1lOworICAgIFN0cmluZyBtX3ZhbHVl OworfTsKKwogQ29udGVudFNlY3VyaXR5UG9saWN5OjpDb250ZW50U2VjdXJpdHlQb2xpY3koKQog ICAgIDogbV9pc0VuYWJsZWQoZmFsc2UpCiB7CiB9CiAKK0NvbnRlbnRTZWN1cml0eVBvbGljeTo6 fkNvbnRlbnRTZWN1cml0eVBvbGljeSgpCit7Cit9CisKIHZvaWQgQ29udGVudFNlY3VyaXR5UG9s aWN5OjpkaWRSZWNlaXZlSGVhZGVyKGNvbnN0IFN0cmluZyYgaGVhZGVyKQogeworICAgIGlmICgh bV9kaXJlY3RpdmVzLmlzRW1wdHkoKSkKKyAgICAgICAgcmV0dXJuOyAvLyBUaGUgZmlyc3QgcG9s aWN5IHdpbnMuCisKICAgICBtX2lzRW5hYmxlZCA9IHRydWU7Ci0gICAgbV9oZWFkZXIgPSBoZWFk ZXI7CisgICAgcGFyc2UoaGVhZGVyKTsKIH0KIAogYm9vbCBDb250ZW50U2VjdXJpdHlQb2xpY3k6 OmNhbkxvYWRFeHRlcm5hbFNjcmlwdEZyb21TcmMoY29uc3QgU3RyaW5nJikgY29uc3QKQEAgLTQ1 LDQgKzY4LDYyIEBAIGJvb2wgQ29udGVudFNlY3VyaXR5UG9saWN5OjpjYW5Mb2FkRXh0ZXJuYWxT Y3JpcHRGcm9tU3JjKGNvbnN0IFN0cmluZyYpIGNvbnN0CiAgICAgcmV0dXJuICFtX2lzRW5hYmxl ZDsKIH0KIAordm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OnBhcnNlKGNvbnN0IFN0cmluZyYg cG9saWN5KQoreworICAgIEFTU0VSVChtX2RpcmVjdGl2ZXMuaXNFbXB0eSgpKTsKKworICAgIGlm IChwb2xpY3kuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBlbnVtIHsKKyAgICAg ICAgQmVmb3JlRGlyZWN0aXZlTmFtZSwKKyAgICAgICAgRGlyZWN0aXZlTmFtZSwKKyAgICAgICAg QWZ0ZXJEaXJlY3RpdmVOYW1lLAorICAgICAgICBEaXJlY3RpdmVWYWx1ZSwKKyAgICB9IHN0YXRl ID0gQmVmb3JlRGlyZWN0aXZlTmFtZTsKKworICAgIGNvbnN0IFVDaGFyKiBwb3MgPSBwb2xpY3ku Y2hhcmFjdGVycygpOworICAgIGNvbnN0IFVDaGFyKiBlbmQgPSBwb3MgKyBwb2xpY3kubGVuZ3Ro KCk7CisKKyAgICBWZWN0b3I8VUNoYXIsIDMyPiBuYW1lOworICAgIFZlY3RvcjxVQ2hhciwgNjQ+ IHZhbHVlOworCisgICAgd2hpbGUgKHBvcyA8IGVuZCkgeworICAgICAgICBVQ2hhciBjdXJyZW50 Q2hhcmFjdGVyID0gKnBvcysrOworICAgICAgICBzd2l0Y2ggKHN0YXRlKSB7CisgICAgICAgIGNh c2UgQmVmb3JlRGlyZWN0aXZlTmFtZToKKyAgICAgICAgICAgIGlmIChpc0FTQ0lJU3BhY2UoY3Vy cmVudENoYXJhY3RlcikpCisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICBz dGF0ZSA9IERpcmVjdGl2ZU5hbWU7CisgICAgICAgICAgICAvLyBGYWxsIHRocm91Z2guCisgICAg ICAgIGNhc2UgRGlyZWN0aXZlTmFtZToKKyAgICAgICAgICAgIGlmICghaXNBU0NJSVNwYWNlKGN1 cnJlbnRDaGFyYWN0ZXIpKSB7CisgICAgICAgICAgICAgICAgbmFtZS5hcHBlbmQoY3VycmVudENo YXJhY3Rlcik7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAg ICAgICAgICBzdGF0ZSA9IEFmdGVyRGlyZWN0aXZlTmFtZTsKKyAgICAgICAgICAgIC8vIEZhbGwg dGhyb3VnaC4KKyAgICAgICAgY2FzZSBBZnRlckRpcmVjdGl2ZU5hbWU6CisgICAgICAgICAgICBp ZiAoaXNBU0NJSVNwYWNlKGN1cnJlbnRDaGFyYWN0ZXIpKQorICAgICAgICAgICAgICAgIGNvbnRp bnVlOworICAgICAgICAgICAgc3RhdGUgPSBEaXJlY3RpdmVWYWx1ZTsKKyAgICAgICAgICAgIC8v IEZhbGwgdGhyb3VnaC4KKyAgICAgICAgY2FzZSBEaXJlY3RpdmVWYWx1ZToKKyAgICAgICAgICAg IGlmIChjdXJyZW50Q2hhcmFjdGVyICE9ICc7JykgeworICAgICAgICAgICAgICAgIHZhbHVlLmFw cGVuZChjdXJyZW50Q2hhcmFjdGVyKTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAg ICAgICAgIH0KKyAgICAgICAgICAgIC8vIFdlIHVzZSBhIGNvcHkgaGVyZSBpbnN0ZWFkIG9mIFN0 cmluZzo6YWRvcHQgYmVjYXVzZSB3ZSBleHBlY3QKKyAgICAgICAgICAgIC8vIHRoZSBuYW1lIGFu ZCB0aGUgdmFsdWUgdG8gYmUgcmVsYXRpdmVseSBzaG9ydCwgc28gdGhlIGNvcHkgd2lsbAorICAg ICAgICAgICAgLy8gYmUgY2hlYXBlciB0aGFuIHRoZSBleHRyYSBtYWxsb2MuCisgICAgICAgICAg ICAvLyBGSVhNRTogUGVyZm9ybSBkaXJlY3RpdmUtc3BlY2lmaWMgcGFyc2luZyBvZiB0aGUgdmFs dWUuCisgICAgICAgICAgICBtX2RpcmVjdGl2ZXMuYXBwZW5kKENTUERpcmVjdGl2ZShTdHJpbmco bmFtZSksIFN0cmluZyh2YWx1ZSkpKTsKKyAgICAgICAgICAgIG5hbWUuY2xlYXIoKTsKKyAgICAg ICAgICAgIHZhbHVlLmNsZWFyKCk7CisgICAgICAgICAgICBzdGF0ZSA9IEJlZm9yZURpcmVjdGl2 ZU5hbWU7CisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgfQorICAgIH0KK30KKwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaCBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgKaW5kZXggZWYwZDU1 MTk4OGNiODdjMGQxNDhmYWQxNzljMjgyYWJhYWFkNzQ5YS4uODQzNTE2NmU2MjNmNjA5YTc5ZDQx OGI0MTNhOTUzYjY3OTRiY2JkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250 ZW50U2VjdXJpdHlQb2xpY3kuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5oCkBAIC0yNiwyMSArMjYsMjkgQEAKICNpZm5kZWYgQ29udGVudFNlY3VyaXR5 UG9saWN5X2gKICNkZWZpbmUgQ29udGVudFNlY3VyaXR5UG9saWN5X2gKIAorI2luY2x1ZGUgPHd0 Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCitjbGFzcyBDU1BEaXJlY3RpdmU7CisKIGNsYXNzIENvbnRlbnRTZWN1cml0 eVBvbGljeSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoQ29udGVudFNlY3VyaXR5UG9saWN5 KTsKIHB1YmxpYzoKICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3koKTsKKyAgICB+Q29udGVudFNl Y3VyaXR5UG9saWN5KCk7CiAKICAgICB2b2lkIGRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5n Jik7CiAgICAgYm9vbCBjYW5Mb2FkRXh0ZXJuYWxTY3JpcHRGcm9tU3JjKGNvbnN0IFN0cmluZyYg dXJsKSBjb25zdDsKIAogcHJpdmF0ZToKKyAgICB0eXBlZGVmIFZlY3RvcjxDU1BEaXJlY3RpdmU+ IERpcmVjdGl2ZUxpc3Q7CisKKyAgICB2b2lkIHBhcnNlKGNvbnN0IFN0cmluZyYpOworCiAgICAg Ym9vbCBtX2lzRW5hYmxlZDsKLSAgICBTdHJpbmcgbV9oZWFkZXI7CisgICAgRGlyZWN0aXZlTGlz dCBtX2RpcmVjdGl2ZXM7CiB9OwogCiB9Cg==