53685 2011-02-03 08:33:51 -0800 Add CSP to Document and pass the X-WebKit-CSP header from the MainResourceLoader. 2011-02-06 03:13:15 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 53572 1 jochen jochen abarth commit-queue webkit.review.bot oldest_to_newest 344730 0 jochen 2011-02-03 08:33:51 -0800 Add CSP to Frame and add a stub method that checks the response for CSPs 344733 1 81064 jochen 2011-02-03 08:34:59 -0800 Created attachment 81064 Patch 344737 2 jochen 2011-02-03 08:36:02 -0800 Adam, not sure this is the right place to add the policy? 344776 3 81064 abarth 2011-02-03 09:32:35 -0800 Comment on attachment 81064 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81064&action=review > Source/WebCore/page/ContentSecurityPolicy.cpp:38 > -ContentSecurityPolicy::ContentSecurityPolicy() > +ContentSecurityPolicy::ContentSecurityPolicy(Frame* frame) > + : m_frame(frame) > +{ > +} The policy should be on the Document because the policy is scoped to a given document. The Frame survives navigation between documents, but the policy doesn't. > Source/WebCore/page/ContentSecurityPolicy.cpp:49 > +bool ContentSecurityPolicy::isEnabled() const > { > + DEFINE_STATIC_LOCAL(String, CSPHeader, ("X-WebKit-CSP")); > + > + Frame* frame = m_frame; > + if (frame->document()->url() == blankURL()) > + frame = m_frame->tree()->parent(); > + > + return !frame->loader()->documentLoader()->response().httpHeaderField(CSPHeader).isEmpty(); > } It looks like you copied this logic from XSSAuditor, but that logic was somewhat specific to that case (especially the blankURL bit). This design won't scale well when we have to do more complex parsing of the policy header. Instead, we should have WebCore call into this object when the header is available, so that it can parse the header once and remember what it said. You can look at how this works for X-Frame-Options. 344883 4 webkit.review.bot 2011-02-03 11:42:51 -0800 Attachment 81064 did not build on mac: Build output: http://queues.webkit.org/results/7693384 344965 5 abarth 2011-02-03 13:41:59 -0800 @jochen: We should also mark these bugs as blocking the meta bug so folks can follow our progress via the meta bug. 345762 6 81279 jochen 2011-02-04 13:48:54 -0800 Created attachment 81279 Patch 345805 7 81279 abarth 2011-02-04 14:39:44 -0800 Comment on attachment 81279 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=81279&action=review Mostly organizational comments. We want to put as much of the "guts" inside ContentSecurityPolicy as possible. The outside code should be as oblivious as possible. > Source/WebCore/dom/Document.cpp:4622 > +void Document::parseContentSecurityPolicyHeader(const String& header) > +{ > + // FIXME: Actually parse the header. > + m_contentSecurityPolicy.setEnabled(!header.isEmpty()); > +} parse should be a method on ContentSecurityPolicy. It's the one that's going to do the heavy lifting. > Source/WebCore/dom/Document.h:1093 > + void parseContentSecurityPolicyHeader(const String&); We should just have an accessor for m_contentSecurityPolicy > Source/WebCore/loader/MainResourceLoader.cpp:362 > + m_frame->loader()->didReceiveContentSecurityPolicyHeader(content); I'd just change this to call through to the document->contentSecurityPolicy()->didReceiveHeader(content), which can then call parse internally. 345927 8 webkit.review.bot 2011-02-04 16:53:38 -0800 Attachment 81279 did not build on mac: Build output: http://queues.webkit.org/results/7704048 346083 9 81349 jochen 2011-02-05 01:45:22 -0800 Created attachment 81349 Patch 346085 10 81349 abarth 2011-02-05 01:52:03 -0800 Comment on attachment 81349 Patch Thanks! 346091 11 81350 jochen 2011-02-05 02:27:57 -0800 Created attachment 81350 Patch 346092 12 jochen 2011-02-05 02:30:06 -0800 Fixing the header attributes so it compiles on mac. 346121 13 81350 commit-queue 2011-02-05 03:52:33 -0800 Comment on attachment 81350 Patch Clearing flags on attachment: 81350 Committed r77742: <http://trac.webkit.org/changeset/77742> 346123 14 webkit.review.bot 2011-02-05 04:05:35 -0800 Attachment 81349 did not build on mac: Build output: http://queues.webkit.org/results/7702330 346133 15 commit-queue 2011-02-05 05:25:32 -0800 The commit-queue encountered the following flaky tests while processing attachment 81350: http/tests/websocket/tests/handshake-error.html bug 53851 (author: abarth@webkit.org) The commit-queue is continuing to process your patch. 81064 2011-02-03 08:34:59 -0800 2011-02-04 13:48:48 -0800 Patch bug-53685-20110203173457.patch text/plain 4545 jochen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZGYzZmYwNDE3NzBhMmJiNDE2MGFiNjg4NGM0ZjNhNzQ2OTQyODczLi4w OWNlYmQ2ZjkzOTQ2YmJjMmMzY2M0MDYyYWEzMmRhNjA5NDc0MzY0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTEtMDItMDMgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIGEgQ29udGVudFNlY3VyaXR5UG9saWN5IHRvIEZyYW1lIGFuZCBhIHN0dWIgbWV0aG9kIHRo YXQgY2hlY2tzIHRoZSByZXNwb25zZSBmb3IgYSBYLVdlYktpdC1DU1AgaGVhZGVyLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM2ODUKKworICAgICAg ICAqIHBhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNv bnRlbnRTZWN1cml0eVBvbGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5KToKKyAgICAgICAgKFdl YkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6aXNFbmFibGVkKToKKyAgICAgICAgKiBwYWdl L0NvbnRlbnRTZWN1cml0eVBvbGljeS5oOgorICAgICAgICAqIHBhZ2UvRnJhbWUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6RnJhbWU6OkZyYW1lKToKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmg6Cisg ICAgICAgIChXZWJDb3JlOjpGcmFtZTo6Y29udGVudFNlY3VyaXR5UG9saWN5KToKKwogMjAxMS0w Mi0wMyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w YWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5jcHAKaW5kZXggYmEyZmU3YzEyODE2NjY5MzAwZjZiYmQ5NGM0NDg5 ZGEyMTg3NzM5OC4uMzJlZWE2MDEzMjllNzFjMjQyZDA5OWQ5NTE3ZDJmNTg1NzYzNDRiMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcApAQCAtMjYs MTAgKzI2LDI2IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiQ29udGVudFNlY3Vy aXR5UG9saWN5LmgiCiAKKyNpbmNsdWRlICJEb2N1bWVudExvYWRlci5oIgorI2luY2x1ZGUgIkZy YW1lLmgiCisjaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZUJhc2UuaCIKKwogbmFtZXNwYWNlIFdl YkNvcmUgewogCi1Db250ZW50U2VjdXJpdHlQb2xpY3k6OkNvbnRlbnRTZWN1cml0eVBvbGljeSgp CitDb250ZW50U2VjdXJpdHlQb2xpY3k6OkNvbnRlbnRTZWN1cml0eVBvbGljeShGcmFtZSogZnJh bWUpCisgICAgOiBtX2ZyYW1lKGZyYW1lKQoreworfQorCitib29sIENvbnRlbnRTZWN1cml0eVBv bGljeTo6aXNFbmFibGVkKCkgY29uc3QKIHsKKyAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFN0cmlu ZywgQ1NQSGVhZGVyLCAoIlgtV2ViS2l0LUNTUCIpKTsKKworICAgIEZyYW1lKiBmcmFtZSA9IG1f ZnJhbWU7CisgICAgaWYgKGZyYW1lLT5kb2N1bWVudCgpLT51cmwoKSA9PSBibGFua1VSTCgpKQor ICAgICAgICBmcmFtZSA9IG1fZnJhbWUtPnRyZWUoKS0+cGFyZW50KCk7CisKKyAgICByZXR1cm4g IWZyYW1lLT5sb2FkZXIoKS0+ZG9jdW1lbnRMb2FkZXIoKS0+cmVzcG9uc2UoKS5odHRwSGVhZGVy RmllbGQoQ1NQSGVhZGVyKS5pc0VtcHR5KCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCmluZGV4IDc0MGYxM2M3MDc2NWVlYWYyMGI0N2M2NzIw MGEzY2FiNTAxMmJkNWYuLjZiNWQ1OTM5N2MzZWViMTAzNzkwN2Q4ZjE0N2RhYzQ5MDBjYzc2YTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmgK KysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaApAQCAtMzAs MTIgKzMwLDE5IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAorY2xhc3MgRnJhbWU7CisKIGNs YXNzIENvbnRlbnRTZWN1cml0eVBvbGljeSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoQ29u dGVudFNlY3VyaXR5UG9saWN5KTsKIHB1YmxpYzoKLSAgICBDb250ZW50U2VjdXJpdHlQb2xpY3ko KTsKKyAgICBDb250ZW50U2VjdXJpdHlQb2xpY3koRnJhbWUqKTsKKworICAgIGJvb2wgaXNFbmFi bGVkKCkgY29uc3Q7CisKK3ByaXZhdGU6CisgICAgRnJhbWUqIG1fZnJhbWU7CiB9OwogCi19Cit9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKLSNlbmRpZgorI2VuZGlmIC8vIENvbnRlbnRTZWN1cml0 eVBvbGljeS5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCmluZGV4IDBjMWEyZGMyY2FiYTk1YzZmZjcxYzIw NTViMjY5MmE2ZWU2Mjc3MjEuLjc1M2U1ZjM2ZDUwYWQwYTdhZDExN2ViNTMyODk0ZGI3NzVlZmQ3 MTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCkBAIC0xNTIsNiArMTUyLDcgQEAgaW5saW5lIEZyYW1l OjpGcmFtZShQYWdlKiBwYWdlLCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVudCwg RnJhbWVMb2FkZXIKICAgICAsIG1fbmF2aWdhdGlvblNjaGVkdWxlcih0aGlzKQogICAgICwgbV9v d25lckVsZW1lbnQob3duZXJFbGVtZW50KQogICAgICwgbV9zY3JpcHQodGhpcykKKyAgICAsIG1f Y29udGVudFNlY3VyaXR5UG9saWN5KHRoaXMpCiAgICAgLCBtX2VkaXRvcih0aGlzKQogICAgICwg bV9zZWxlY3Rpb25Db250cm9sbGVyKHRoaXMpCiAgICAgLCBtX2V2ZW50SGFuZGxlcih0aGlzKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZS5oIGIvU291cmNlL1dlYkNvcmUv cGFnZS9GcmFtZS5oCmluZGV4IGExZTVjMTA1ZWMwYjQ5OTA4ODE5Nzk1ODFlZTdjZTk2YmZmOWUw YmMuLmJkNzA2MjVkMmNkYjg5NTVlZTJmODRiNzlkNzU0MWJkNzJhOGViMTAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Zy YW1lLmgKQEAgLTI5LDYgKzI5LDcgQEAKICNkZWZpbmUgRnJhbWVfaAogCiAjaW5jbHVkZSAiQW5p bWF0aW9uQ29udHJvbGxlci5oIgorI2luY2x1ZGUgIkNvbnRlbnRTZWN1cml0eVBvbGljeS5oIgog I2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRHJhZ0ltYWdlLmgiCiAjaW5jbHVkZSAi RWRpdG9yLmgiCkBAIC0xMTIsNiArMTEzLDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAg ICBGcmFtZVRyZWUqIHRyZWUoKSBjb25zdDsKICAgICAgICAgQW5pbWF0aW9uQ29udHJvbGxlciog YW5pbWF0aW9uKCkgY29uc3Q7CiAgICAgICAgIFNjcmlwdENvbnRyb2xsZXIqIHNjcmlwdCgpOwor ICAgICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3kqIGNvbnRlbnRTZWN1cml0eVBvbGljeSgpOwog ICAgICAgICAKICAgICAgICAgUmVuZGVyVmlldyogY29udGVudFJlbmRlcmVyKCkgY29uc3Q7IC8v IFJvb3Qgb2YgdGhlIHJlbmRlciB0cmVlIGZvciB0aGUgZG9jdW1lbnQgY29udGFpbmVkIGluIHRo aXMgZnJhbWUuCiAgICAgICAgIFJlbmRlclBhcnQqIG93bmVyUmVuZGVyZXIoKSBjb25zdDsgLy8g UmVuZGVyZXIgZm9yIHRoZSBlbGVtZW50IHRoYXQgY29udGFpbnMgdGhpcyBmcmFtZS4KQEAgLTIy OCw2ICsyMzAsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgU2NyaXB0Q29udHJv bGxlciBtX3NjcmlwdDsKIAorICAgICAgICBDb250ZW50U2VjdXJpdHlQb2xpY3kgbV9jb250ZW50 U2VjdXJpdHlQb2xpY3k7CisKICAgICAgICAgbXV0YWJsZSBFZGl0b3IgbV9lZGl0b3I7CiAgICAg ICAgIG11dGFibGUgU2VsZWN0aW9uQ29udHJvbGxlciBtX3NlbGVjdGlvbkNvbnRyb2xsZXI7CiAg ICAgICAgIG11dGFibGUgRXZlbnRIYW5kbGVyIG1fZXZlbnRIYW5kbGVyOwpAQCAtMjkzLDYgKzI5 NywxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIHJldHVybiAmbV9zY3JpcHQ7CiAg ICAgfQogCisgICAgaW5saW5lIENvbnRlbnRTZWN1cml0eVBvbGljeSogRnJhbWU6OmNvbnRlbnRT ZWN1cml0eVBvbGljeSgpCisgICAgeworICAgICAgICByZXR1cm4gJm1fY29udGVudFNlY3VyaXR5 UG9saWN5OworICAgIH0KKwogICAgIGlubGluZSBEb2N1bWVudCogRnJhbWU6OmRvY3VtZW50KCkg Y29uc3QKICAgICB7CiAgICAgICAgIHJldHVybiBtX2RvYy5nZXQoKTsK 81279 2011-02-04 13:48:54 -0800 2011-02-05 01:45:16 -0800 Patch bug-53685-20110204224851.patch text/plain 6060 jochen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZGYzZmYwNDE3NzBhMmJiNDE2MGFiNjg4NGM0ZjNhNzQ2OTQyODczLi45 Mjc0NmJlNTY3NzFiY2Y0YjVmMmFmNmFhY2E1ZTFjNWFkZDI1MGJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTEtMDItMDQgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIENvbnRlbnRTZWN1cml0eVBvbGljeSBvYmplY3QgdG8gRG9jdW1lbnQgYW5kIHBhc3MgdGhl IFgtV2ViS2l0LUNTUCBoZWFkZXIgZnJvbSB0aGUgTWFpblJlc291cmNlTG9hZGVyIHRvIHRoZSBE b2N1bWVudC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTUzNjg1CisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnQ6OnBhcnNlQ29udGVudFNlY3VyaXR5UG9saWN5SGVhZGVyKToKKyAgICAgICAgKiBk b20vRG9jdW1lbnQuaDoKKyAgICAgICAgKiBsb2FkZXIvRnJhbWVMb2FkZXIuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmRpZFJlY2VpdmVDb250ZW50U2VjdXJpdHlQb2xpY3lI ZWFkZXIpOgorICAgICAgICAqIGxvYWRlci9GcmFtZUxvYWRlci5oOgorICAgICAgICAqIGxvYWRl ci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWFpblJlc291cmNl TG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAqIHBhZ2UvQ29udGVudFNlY3Vy aXR5UG9saWN5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeTo6 Q29udGVudFNlY3VyaXR5UG9saWN5KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0 eVBvbGljeTo6c2V0RW5hYmxlZCk6CisgICAgICAgICogcGFnZS9Db250ZW50U2VjdXJpdHlQb2xp Y3kuaDoKKwogMjAxMS0wMi0wMyAgTmlrb2xhcyBaaW1tZXJtYW5uICA8bnppbW1lcm1hbm5Acmlt LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBEaXJrIFNjaHVsemUuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAppbmRleCAyNTIwYWU4YzJjZWJmZGUwNzU5MzNhM2UyOTRmZWY5MWI0NzVhMWZhLi5i NDM1OGQxMDEwZDYyNTZmOGYyYjM0Y2I5YTZlNzNjMzIwMWMyNmY0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKQEAgLTQ2MTUsNiArNDYxNSwxMiBAQCB2b2lkIERvY3VtZW50OjpwYXJzZUROU1By ZWZldGNoQ29udHJvbEhlYWRlcihjb25zdCBTdHJpbmcmIGRuc1ByZWZldGNoQ29udHJvbCkKICAg ICBtX2hhdmVFeHBsaWNpdGx5RGlzYWJsZWRETlNQcmVmZXRjaCA9IHRydWU7CiB9CiAKK3ZvaWQg RG9jdW1lbnQ6OnBhcnNlQ29udGVudFNlY3VyaXR5UG9saWN5SGVhZGVyKGNvbnN0IFN0cmluZyYg aGVhZGVyKQoreworICAgIC8vIEZJWE1FOiBBY3R1YWxseSBwYXJzZSB0aGUgaGVhZGVyLgorICAg IG1fY29udGVudFNlY3VyaXR5UG9saWN5LnNldEVuYWJsZWQoIWhlYWRlci5pc0VtcHR5KCkpOwor fQorCiB2b2lkIERvY3VtZW50OjphZGRNZXNzYWdlKE1lc3NhZ2VTb3VyY2Ugc291cmNlLCBNZXNz YWdlVHlwZSB0eXBlLCBNZXNzYWdlTGV2ZWwgbGV2ZWwsIGNvbnN0IFN0cmluZyYgbWVzc2FnZSwg dW5zaWduZWQgbGluZU51bWJlciwgY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwsIFBhc3NSZWZQdHI8 U2NyaXB0Q2FsbFN0YWNrPiBjYWxsU3RhY2spCiB7CiAgICAgaWYgKERPTVdpbmRvdyogd2luZG93 ID0gZG9tV2luZG93KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQu aCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCmluZGV4IDVhNzQ1ZTQ2YjAyMDY4YmE3 MmVkYzFhNDdiODVmY2Y1OWYwYmU0OGEuLjNmZjYwNTM5Y2I5YWNmYmVkNzkzNjk2MGI2ZjkwYmQ0 ODEyYWEyNTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVk ZSAiQ29sbGVjdGlvblR5cGUuaCIKICNpbmNsdWRlICJDb2xvci5oIgogI2luY2x1ZGUgIkNvbnRh aW5lck5vZGUuaCIKKyNpbmNsdWRlICJDb250ZW50U2VjdXJpdHlQb2xpY3kuaCIKICNpbmNsdWRl ICJET01UaW1lU3RhbXAuaCIKICNpbmNsdWRlICJEb2N1bWVudE9yZGVyZWRNYXAuaCIKICNpbmNs dWRlICJEb2N1bWVudFRpbWluZy5oIgpAQCAtMTA4OSw2ICsxMDkwLDggQEAgcHVibGljOgogCiAg ICAgdm9pZCBpbml0RE5TUHJlZmV0Y2goKTsKIAorICAgIHZvaWQgcGFyc2VDb250ZW50U2VjdXJp dHlQb2xpY3lIZWFkZXIoY29uc3QgU3RyaW5nJik7CisKIHByb3RlY3RlZDoKICAgICBEb2N1bWVu dChGcmFtZSosIGNvbnN0IEtVUkwmIHVybCwgYm9vbCBpc1hIVE1MLCBib29sIGlzSFRNTCwgY29u c3QgS1VSTCYgYmFzZVVSTCA9IEtVUkwoKSk7CiAKQEAgLTEzOTAsNiArMTM5Myw4IEBAIHByaXZh dGU6CiAgICAgT3duUHRyPFJlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrTGlzdD4gbV9yZXF1 ZXN0QW5pbWF0aW9uRnJhbWVDYWxsYmFja3M7CiAgICAgaW50IG1fbmV4dFJlcXVlc3RBbmltYXRp b25GcmFtZUNhbGxiYWNrSWQ7CiAjZW5kaWYKKworICAgIENvbnRlbnRTZWN1cml0eVBvbGljeSBt X2NvbnRlbnRTZWN1cml0eVBvbGljeTsKIH07CiAKIGlubGluZSBib29sIERvY3VtZW50OjpoYXNF bGVtZW50V2l0aElkKEF0b21pY1N0cmluZ0ltcGwqIGlkKSBjb25zdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5jcHAKaW5kZXggNDhiYTY0ODUxNjIyOGQ2MDQ2OWRjZGEzZTU3NzRjZjE1 ZjZiNzI5OS4uZGZkOWE1ODI3YWM3NDk5NDE4YmNkODFmOWNlZDBkMTJlYjZiYjk0OSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCkBAIC0zNDE4LDYgKzM0MTgsMTEgQEAgdm9p ZCBGcmFtZUxvYWRlcjo6ZGlkQ2hhbmdlSWNvbnMoRG9jdW1lbnRMb2FkZXIqIGxvYWRlcikKICAg ICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkQ2hhbmdlSWNvbnMoKTsKIH0KIAordm9pZCBGcmFt ZUxvYWRlcjo6ZGlkUmVjZWl2ZUNvbnRlbnRTZWN1cml0eVBvbGljeUhlYWRlcihjb25zdCBTdHJp bmcmIGhlYWRlcikKK3sKKyAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5wYXJzZUNvbnRlbnRTZWN1 cml0eVBvbGljeUhlYWRlcihoZWFkZXIpOworfQorCiB2b2lkIEZyYW1lTG9hZGVyOjpkaXNwYXRj aERpZENvbW1pdExvYWQoKQogewogICAgIGlmIChtX3N0YXRlTWFjaGluZS5jcmVhdGluZ0luaXRp YWxFbXB0eURvY3VtZW50KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJh bWVMb2FkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5oCmluZGV4IDM3 MDhiZjgyZWFlOTNjMTY2ZTE4ODgxNDcyN2I1N2JkMDQ0YjQ1ODkuLjRmN2E3MGIwMWFkNmM2MWJm Nzc4YTVmNDIzNWFkMzI3MDNjYjIzMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5o CkBAIC0xOTAsNiArMTkwLDcgQEAgcHVibGljOgogICAgIHZvaWQgd2lsbENoYW5nZVRpdGxlKERv Y3VtZW50TG9hZGVyKik7CiAgICAgdm9pZCBkaWRDaGFuZ2VUaXRsZShEb2N1bWVudExvYWRlciop OwogICAgIHZvaWQgZGlkQ2hhbmdlSWNvbnMoRG9jdW1lbnRMb2FkZXIqKTsKKyAgICB2b2lkIGRp ZFJlY2VpdmVDb250ZW50U2VjdXJpdHlQb2xpY3lIZWFkZXIoY29uc3QgU3RyaW5nJik7CiAKICAg ICBGcmFtZUxvYWRUeXBlIGxvYWRUeXBlKCkgY29uc3Q7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKaW5kZXggZTZhYmVmZDFiNDNhZjY0ZDBmODJiMWYy ZTY2N2NlYTIwYTg0ZmZiZi4uYmM1YzRhZjdiNzc0NjVhYzFiYjY5Y2ZkYzEyNGNjNGE5YjAwNjRl ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKQEAg LTM1Niw2ICszNTYsMTIgQEAgdm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNw b25zZShjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByKQogICAgICAgICB9CiAgICAgfQogCisgICAg aXQgPSByLmh0dHBIZWFkZXJGaWVsZHMoKS5maW5kKEF0b21pY1N0cmluZygieC13ZWJraXQtY3Nw IikpOworICAgIGlmIChpdCAhPSByLmh0dHBIZWFkZXJGaWVsZHMoKS5lbmQoKSkgeworICAgICAg ICBTdHJpbmcgY29udGVudCA9IGl0LT5zZWNvbmQ7CisgICAgICAgIG1fZnJhbWUtPmxvYWRlcigp LT5kaWRSZWNlaXZlQ29udGVudFNlY3VyaXR5UG9saWN5SGVhZGVyKGNvbnRlbnQpOworICAgIH0K KwogICAgIC8vIFRoZXJlIGlzIGEgYnVnIGluIENGTmV0d29yayB3aGVyZSBjYWxsYmFja3MgY2Fu IGJlIGRpc3BhdGNoZWQgZXZlbiB3aGVuIGxvYWRzIGFyZSBkZWZlcnJlZC4KICAgICAvLyBTZWUg PHJkYXI6Ly9wcm9ibGVtLzYzMDQ2MDA+IGZvciBtb3JlIGRldGFpbHMuCiAjaWYgIVBMQVRGT1JN KENGKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xp Y3kuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmlu ZGV4IGJhMmZlN2MxMjgxNjY2OTMwMGY2YmJkOTRjNDQ4OWRhMjE4NzczOTguLmZjYjcyMzVkNjVi ZGM1ZTQ3MTEwZGM3MjUwYzdkMTQ3OWYyYjRmNGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKQEAgLTI5LDcgKzI5LDEzIEBACiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5 KCkKKyAgICA6IG1faXNFbmFibGVkKGZhbHNlKQogewogfQogCit2b2lkIENvbnRlbnRTZWN1cml0 eVBvbGljeTo6c2V0RW5hYmxlZChib29sIGlzRW5hYmxlZCkKK3sKKyAgICBtX2lzRW5hYmxlZCA9 IGlzRW5hYmxlZDsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250 ZW50U2VjdXJpdHlQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5 UG9saWN5LmgKaW5kZXggNzQwZjEzYzcwNzY1ZWVhZjIwYjQ3YzY3MjAwYTNjYWI1MDEyYmQ1Zi4u MTFmODRiMzJmZGI1YWY0YjU5NDVlZGEyMWZmNWYyNmM5MGVhOTczZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC0zNCw2ICszNCwxMSBAQCBjbGFz cyBDb250ZW50U2VjdXJpdHlQb2xpY3kgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKENvbnRl bnRTZWN1cml0eVBvbGljeSk7CiBwdWJsaWM6CiAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5KCk7 CisKKyAgICB2b2lkIHNldEVuYWJsZWQoYm9vbCk7CisKK3ByaXZhdGU6CisgICAgYm9vbCBtX2lz RW5hYmxlZDsKIH07CiAKIH0K 81349 2011-02-05 01:45:22 -0800 2011-02-05 02:29:17 -0800 Patch bug-53685-20110205104520.patch text/plain 4022 jochen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZGYzZmYwNDE3NzBhMmJiNDE2MGFiNjg4NGM0ZjNhNzQ2OTQyODczLi4w ZmIzZWYyM2IxMjQ4YzRjMjZjMTQ5M2UzZTIxZmEzZTlkNDZkMjlmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTggQEAKKzIwMTEtMDItMDUgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg QWRkIENvbnRlbnRTZWN1cml0eVBvbGljeSBvYmplY3QgdG8gRG9jdW1lbnQgYW5kIHBhc3MgdGhl IFgtV2ViS2l0LUNTUCBoZWFkZXIgZnJvbSB0aGUgTWFpblJlc291cmNlTG9hZGVyLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTM2ODUKKworICAgICAg ICAqIGRvbS9Eb2N1bWVudC5oOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmNvbnRlbnRT ZWN1cml0eVBvbGljeSk6CisgICAgICAgICogbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNYWluUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25z ZSk6CisgICAgICAgICogcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAo V2ViQ29yZTo6Q29udGVudFNlY3VyaXR5UG9saWN5OjpkaWRSZWNlaXZlSGVhZGVyKToKKyAgICAg ICAgKiBwYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oOgorCiAyMDExLTAyLTAzICBOaWtvbGFz IFppbW1lcm1hbm4gIDxuemltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5o IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKaW5kZXggNWE3NDVlNDZiMDIwNjhiYTcy ZWRjMWE0N2I4NWZjZjU5ZjBiZTQ4YS4uOTQ2ZTU3YWYyYjZmOGYxYzBmNzY3OTI5MDMxYzhkYjYw YTEzZDg5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKKysrIGIv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKQEAgLTMyLDYgKzMyLDcgQEAKICNpbmNsdWRl ICJDb2xsZWN0aW9uVHlwZS5oIgogI2luY2x1ZGUgIkNvbG9yLmgiCiAjaW5jbHVkZSAiQ29udGFp bmVyTm9kZS5oIgorI2luY2x1ZGUgIkNvbnRlbnRTZWN1cml0eVBvbGljeS5oIgogI2luY2x1ZGUg IkRPTVRpbWVTdGFtcC5oIgogI2luY2x1ZGUgIkRvY3VtZW50T3JkZXJlZE1hcC5oIgogI2luY2x1 ZGUgIkRvY3VtZW50VGltaW5nLmgiCkBAIC0xMDg5LDYgKzEwOTAsOCBAQCBwdWJsaWM6CiAKICAg ICB2b2lkIGluaXRETlNQcmVmZXRjaCgpOwogCisgICAgQ29udGVudFNlY3VyaXR5UG9saWN5KiBj b250ZW50U2VjdXJpdHlQb2xpY3koKSB7IHJldHVybiAmbV9jb250ZW50U2VjdXJpdHlQb2xpY3k7 IH0KKwogcHJvdGVjdGVkOgogICAgIERvY3VtZW50KEZyYW1lKiwgY29uc3QgS1VSTCYgdXJsLCBi b29sIGlzWEhUTUwsIGJvb2wgaXNIVE1MLCBjb25zdCBLVVJMJiBiYXNlVVJMID0gS1VSTCgpKTsK IApAQCAtMTM5MCw2ICsxMzkzLDggQEAgcHJpdmF0ZToKICAgICBPd25QdHI8UmVxdWVzdEFuaW1h dGlvbkZyYW1lQ2FsbGJhY2tMaXN0PiBtX3JlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrczsK ICAgICBpbnQgbV9uZXh0UmVxdWVzdEFuaW1hdGlvbkZyYW1lQ2FsbGJhY2tJZDsKICNlbmRpZgor CisgICAgQ29udGVudFNlY3VyaXR5UG9saWN5IG1fY29udGVudFNlY3VyaXR5UG9saWN5OwogfTsK IAogaW5saW5lIGJvb2wgRG9jdW1lbnQ6Omhhc0VsZW1lbnRXaXRoSWQoQXRvbWljU3RyaW5nSW1w bCogaWQpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291 cmNlTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIu Y3BwCmluZGV4IGU2YWJlZmQxYjQzYWY2NGQwZjgyYjFmMmU2NjdjZWEyMGE4NGZmYmYuLjlmMzUw ZThjMWVlNjM1Mzg5NmNjNWY5NGY2YjRjNGY1NzM4MGYxODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCkBAIC0zMSw2ICszMSw4IEBACiAjaW5jbHVk ZSAiTWFpblJlc291cmNlTG9hZGVyLmgiCiAKICNpbmNsdWRlICJBcHBsaWNhdGlvbkNhY2hlSG9z dC5oIgorI2luY2x1ZGUgIkNvbnRlbnRTZWN1cml0eVBvbGljeS5oIgorI2luY2x1ZGUgIkRvY3Vt ZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkVGltaW5nLmgiCiAjaW5jbHVkZSAiRG9jdW1l bnRMb2FkZXIuaCIKICNpbmNsdWRlICJGb3JtU3RhdGUuaCIKQEAgLTM1Niw2ICszNTgsMTIgQEAg dm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiByKQogICAgICAgICB9CiAgICAgfQogCisgICAgaXQgPSByLmh0dHBIZWFkZXJG aWVsZHMoKS5maW5kKEF0b21pY1N0cmluZygieC13ZWJraXQtY3NwIikpOworICAgIGlmIChpdCAh PSByLmh0dHBIZWFkZXJGaWVsZHMoKS5lbmQoKSkgeworICAgICAgICBTdHJpbmcgY29udGVudCA9 IGl0LT5zZWNvbmQ7CisgICAgICAgIG1fZnJhbWUtPmRvY3VtZW50KCktPmNvbnRlbnRTZWN1cml0 eVBvbGljeSgpLT5kaWRSZWNlaXZlSGVhZGVyKGNvbnRlbnQpOworICAgIH0KKwogICAgIC8vIFRo ZXJlIGlzIGEgYnVnIGluIENGTmV0d29yayB3aGVyZSBjYWxsYmFja3MgY2FuIGJlIGRpc3BhdGNo ZWQgZXZlbiB3aGVuIGxvYWRzIGFyZSBkZWZlcnJlZC4KICAgICAvLyBTZWUgPHJkYXI6Ly9wcm9i bGVtLzYzMDQ2MDA+IGZvciBtb3JlIGRldGFpbHMuCiAjaWYgIVBMQVRGT1JNKENGKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCmluZGV4IGJhMmZlN2Mx MjgxNjY2OTMwMGY2YmJkOTRjNDQ4OWRhMjE4NzczOTguLmIwYjk1MTY4NGIwMjQ3NDFiMDYwYTc5 OTFkZDhiODZhNGUxNTAzMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVu dFNlY3VyaXR5UG9saWN5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1 cml0eVBvbGljeS5jcHAKQEAgLTMyLDQgKzMyLDkgQEAgQ29udGVudFNlY3VyaXR5UG9saWN5OjpD b250ZW50U2VjdXJpdHlQb2xpY3koKQogewogfQogCit2b2lkIENvbnRlbnRTZWN1cml0eVBvbGlj eTo6ZGlkUmVjZWl2ZUhlYWRlcihjb25zdCBTdHJpbmcmIGhlYWRlcikKK3sKKyAgICBtX2hlYWRl ciA9IGhlYWRlcjsKK30KKwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9Db250 ZW50U2VjdXJpdHlQb2xpY3kuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5 UG9saWN5LmgKaW5kZXggNzQwZjEzYzcwNzY1ZWVhZjIwYjQ3YzY3MjAwYTNjYWI1MDEyYmQ1Zi4u MjNiZmJmMjlmNTYyODIzOWYwMzFkZWU3YjMyMTY3ZmVlMjUyZWNkMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCkBAIC0zNCw2ICszNCwxMSBAQCBjbGFz cyBDb250ZW50U2VjdXJpdHlQb2xpY3kgewogICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKENvbnRl bnRTZWN1cml0eVBvbGljeSk7CiBwdWJsaWM6CiAgICAgQ29udGVudFNlY3VyaXR5UG9saWN5KCk7 CisKKyAgICB2b2lkIGRpZFJlY2VpdmVIZWFkZXIoY29uc3QgU3RyaW5nJik7CisKK3ByaXZhdGU6 CisgICAgU3RyaW5nIG1faGVhZGVyOwogfTsKIAogfQo= 81350 2011-02-05 02:27:57 -0800 2011-02-05 03:52:33 -0800 Patch bug-53685-20110205112755.patch text/plain 5709 jochen ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiZGYzZmYwNDE3NzBhMmJiNDE2MGFiNjg4NGM0ZjNhNzQ2OTQyODczLi5j MmJiZmY4ZGUxNjU2MTdiY2Y3NzBiZmNkZGM0ZjAzZDk4ZDNlNjA1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTkgQEAKKzIwMTEtMDItMDUgIEpvY2hlbiBFaXNpbmdlciAgPGpvY2hlbkBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBBZGQg Q29udGVudFNlY3VyaXR5UG9saWN5IG9iamVjdCB0byBEb2N1bWVudCBhbmQgcGFzcyB0aGUgWC1X ZWJLaXQtQ1NQIGhlYWRlciBmcm9tIHRoZSBNYWluUmVzb3VyY2VMb2FkZXIuCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MzY4NQorCisgICAgICAgICog V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIGRvbS9Eb2N1bWVu dC5oOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmNvbnRlbnRTZWN1cml0eVBvbGljeSk6 CisgICAgICAgICogbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNYWluUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgICog cGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dFNlY3VyaXR5UG9saWN5OjpkaWRSZWNlaXZlSGVhZGVyKToKKyAgICAgICAgKiBwYWdlL0NvbnRl bnRTZWN1cml0eVBvbGljeS5oOgorCiAyMDExLTAyLTAzICBOaWtvbGFzIFppbW1lcm1hbm4gIDxu emltbWVybWFubkByaW0uY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpp bmRleCAzZmEwZWRiNDE0Mjc3ODMzN2VmZjdiODBhMDFlYjQ5YjEyMzcxYmVlLi40ZTUwZmMyOTlh OTRhYmY0MGVhYmMzYWM3NzRiYTJhNTUwZTFkYWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0zMTE2LDcgKzMxMTYsNyBAQAog CQk5N0JDODRCNDEyMzcxMTgwMDAwQzYxNjEgLyogVGV4dERvY3VtZW50LmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5N0JDODRCMjEyMzcxMTgwMDAwQzYx NjEgLyogVGV4dERvY3VtZW50LmggKi87IH07CiAJCTk3QzA3ODUwMTE2NUQ1QkUwMDNBMzJFRiAv KiBTdWZmaXhUcmVlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSA5N0MwNzg0RjExNjVENUJFMDAzQTMyRUYgLyogU3VmZml4VHJlZS5oICovOyB9OwogCQk5 N0M0NzFEQjEyRjkyNUJEMDA4NjM1NEIgLyogQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcCBpbiBT b3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3QzQ3MUQ5MTJGOTI1 QkMwMDg2MzU0QiAvKiBDb250ZW50U2VjdXJpdHlQb2xpY3kuY3BwICovOyB9OwotCQk5N0M0NzFE QzEyRjkyNUJEMDA4NjM1NEIgLyogQ29udGVudFNlY3VyaXR5UG9saWN5LmggaW4gSGVhZGVycyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5N0M0NzFEQTEyRjkyNUJEMDA4NjM1 NEIgLyogQ29udGVudFNlY3VyaXR5UG9saWN5LmggKi87IH07CisJCTk3QzQ3MURDMTJGOTI1QkQw MDg2MzU0QiAvKiBDb250ZW50U2VjdXJpdHlQb2xpY3kuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDk3QzQ3MURBMTJGOTI1QkQwMDg2MzU0QiAvKiBDb250 ZW50U2VjdXJpdHlQb2xpY3kuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9IChQcml2YXRl LCApOyB9OyB9OwogCQk5N0RDRTIwMTEwODA3Qzc1MDA1N0QzOTQgLyogSGlzdG9yeUNvbnRyb2xs ZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTdE Q0UxRkYxMDgwN0M3NTAwNTdEMzk0IC8qIEhpc3RvcnlDb250cm9sbGVyLmNwcCAqLzsgfTsKIAkJ OTdEQ0UyMDIxMDgwN0M3NTAwNTdEMzk0IC8qIEhpc3RvcnlDb250cm9sbGVyLmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5N0RDRTIwMDEwODA3Qzc1MDA1 N0QzOTQgLyogSGlzdG9yeUNvbnRyb2xsZXIuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRFUyA9 IChQcml2YXRlLCApOyB9OyB9OwogCQk5N0RENEQ4NjBGREY0RDZFMDBFQ0Y5QTQgLyogWFNTQXVk aXRvci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5 N0RENEQ4NDBGREY0RDZEMDBFQ0Y5QTQgLyogWFNTQXVkaXRvci5jcHAgKi87IH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5oCmluZGV4IDVhNzQ1ZTQ2YjAyMDY4YmE3MmVkYzFhNDdiODVmY2Y1OWYwYmU0OGEu Ljk0NmU1N2FmMmI2ZjhmMWMwZjc2NzkyOTAzMWM4ZGI2MGExM2Q4OTYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5oCkBAIC0zMiw2ICszMiw3IEBACiAjaW5jbHVkZSAiQ29sbGVjdGlvblR5cGUuaCIKICNp bmNsdWRlICJDb2xvci5oIgogI2luY2x1ZGUgIkNvbnRhaW5lck5vZGUuaCIKKyNpbmNsdWRlICJD b250ZW50U2VjdXJpdHlQb2xpY3kuaCIKICNpbmNsdWRlICJET01UaW1lU3RhbXAuaCIKICNpbmNs dWRlICJEb2N1bWVudE9yZGVyZWRNYXAuaCIKICNpbmNsdWRlICJEb2N1bWVudFRpbWluZy5oIgpA QCAtMTA4OSw2ICsxMDkwLDggQEAgcHVibGljOgogCiAgICAgdm9pZCBpbml0RE5TUHJlZmV0Y2go KTsKIAorICAgIENvbnRlbnRTZWN1cml0eVBvbGljeSogY29udGVudFNlY3VyaXR5UG9saWN5KCkg eyByZXR1cm4gJm1fY29udGVudFNlY3VyaXR5UG9saWN5OyB9CisKIHByb3RlY3RlZDoKICAgICBE b2N1bWVudChGcmFtZSosIGNvbnN0IEtVUkwmIHVybCwgYm9vbCBpc1hIVE1MLCBib29sIGlzSFRN TCwgY29uc3QgS1VSTCYgYmFzZVVSTCA9IEtVUkwoKSk7CiAKQEAgLTEzOTAsNiArMTM5Myw4IEBA IHByaXZhdGU6CiAgICAgT3duUHRyPFJlcXVlc3RBbmltYXRpb25GcmFtZUNhbGxiYWNrTGlzdD4g bV9yZXF1ZXN0QW5pbWF0aW9uRnJhbWVDYWxsYmFja3M7CiAgICAgaW50IG1fbmV4dFJlcXVlc3RB bmltYXRpb25GcmFtZUNhbGxiYWNrSWQ7CiAjZW5kaWYKKworICAgIENvbnRlbnRTZWN1cml0eVBv bGljeSBtX2NvbnRlbnRTZWN1cml0eVBvbGljeTsKIH07CiAKIGlubGluZSBib29sIERvY3VtZW50 OjpoYXNFbGVtZW50V2l0aElkKEF0b21pY1N0cmluZ0ltcGwqIGlkKSBjb25zdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcAppbmRleCBlNmFiZWZkMWI0M2Fm NjRkMGY4MmIxZjJlNjY3Y2VhMjBhODRmZmJmLi45ZjM1MGU4YzFlZTYzNTM4OTZjYzVmOTRmNmI0 YzRmNTczODBmMTg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291 cmNlTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9h ZGVyLmNwcApAQCAtMzEsNiArMzEsOCBAQAogI2luY2x1ZGUgIk1haW5SZXNvdXJjZUxvYWRlci5o IgogCiAjaW5jbHVkZSAiQXBwbGljYXRpb25DYWNoZUhvc3QuaCIKKyNpbmNsdWRlICJDb250ZW50 U2VjdXJpdHlQb2xpY3kuaCIKKyNpbmNsdWRlICJEb2N1bWVudC5oIgogI2luY2x1ZGUgIkRvY3Vt ZW50TG9hZFRpbWluZy5oIgogI2luY2x1ZGUgIkRvY3VtZW50TG9hZGVyLmgiCiAjaW5jbHVkZSAi Rm9ybVN0YXRlLmgiCkBAIC0zNTYsNiArMzU4LDEyIEBAIHZvaWQgTWFpblJlc291cmNlTG9hZGVy OjpkaWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcikKICAgICAgICAg fQogICAgIH0KIAorICAgIGl0ID0gci5odHRwSGVhZGVyRmllbGRzKCkuZmluZChBdG9taWNTdHJp bmcoIngtd2Via2l0LWNzcCIpKTsKKyAgICBpZiAoaXQgIT0gci5odHRwSGVhZGVyRmllbGRzKCku ZW5kKCkpIHsKKyAgICAgICAgU3RyaW5nIGNvbnRlbnQgPSBpdC0+c2Vjb25kOworICAgICAgICBt X2ZyYW1lLT5kb2N1bWVudCgpLT5jb250ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhl YWRlcihjb250ZW50KTsKKyAgICB9CisKICAgICAvLyBUaGVyZSBpcyBhIGJ1ZyBpbiBDRk5ldHdv cmsgd2hlcmUgY2FsbGJhY2tzIGNhbiBiZSBkaXNwYXRjaGVkIGV2ZW4gd2hlbiBsb2FkcyBhcmUg ZGVmZXJyZWQuCiAgICAgLy8gU2VlIDxyZGFyOi8vcHJvYmxlbS82MzA0NjAwPiBmb3IgbW9yZSBk ZXRhaWxzLgogI2lmICFQTEFURk9STShDRikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVu dFNlY3VyaXR5UG9saWN5LmNwcAppbmRleCBiYTJmZTdjMTI4MTY2NjkzMDBmNmJiZDk0YzQ0ODlk YTIxODc3Mzk4Li5iMGI5NTE2ODRiMDI0NzQxYjA2MGE3OTkxZGQ4Yjg2YTRlMTUwMzJlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJpdHlQb2xpY3kuY3BwCkBAIC0zMiw0 ICszMiw5IEBAIENvbnRlbnRTZWN1cml0eVBvbGljeTo6Q29udGVudFNlY3VyaXR5UG9saWN5KCkK IHsKIH0KIAordm9pZCBDb250ZW50U2VjdXJpdHlQb2xpY3k6OmRpZFJlY2VpdmVIZWFkZXIoY29u c3QgU3RyaW5nJiBoZWFkZXIpCit7CisgICAgbV9oZWFkZXIgPSBoZWFkZXI7Cit9CisKIH0KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVudFNlY3VyaXR5UG9saWN5LmggYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0NvbnRlbnRTZWN1cml0eVBvbGljeS5oCmluZGV4IDc0MGYxM2M3 MDc2NWVlYWYyMGI0N2M2NzIwMGEzY2FiNTAxMmJkNWYuLjIzYmZiZjI5ZjU2MjgyMzlmMDMxZGVl N2IzMjE2N2ZlZTI1MmVjZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvQ29udGVu dFNlY3VyaXR5UG9saWN5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9Db250ZW50U2VjdXJp dHlQb2xpY3kuaApAQCAtMzQsNiArMzQsMTEgQEAgY2xhc3MgQ29udGVudFNlY3VyaXR5UG9saWN5 IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShDb250ZW50U2VjdXJpdHlQb2xpY3kpOwogcHVi bGljOgogICAgIENvbnRlbnRTZWN1cml0eVBvbGljeSgpOworCisgICAgdm9pZCBkaWRSZWNlaXZl SGVhZGVyKGNvbnN0IFN0cmluZyYpOworCitwcml2YXRlOgorICAgIFN0cmluZyBtX2hlYWRlcjsK IH07CiAKIH0K