32801 2009-12-20 12:34:18 -0800 Don't shrink by default always when zoom in/out is enabled for standalone images 2014-07-24 06:45:35 -0700 1 1 1 Unclassified WebKit Images 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 0 mario webkit-unassigned xan.lopez oldest_to_newest 173789 0 mario 2009-12-20 12:34:18 -0800 DESCRIPTION: Currently the ShrinksStandaloneImagesToFit setting in WebCore::Settings controls two things at the same time: - Whether an standalone image should show up automatically resized to window size when loaded - Whether it's possible to zoom in (and out) the image by clicking on top of it So, if you now set that setting to 'true' you'll get that all standalone images will appear shrunk to window size by default, and clicking on them will enlarge them. However if you set it to 'false' the image will appear in 1:1 ratio *and* clicking on top of it will get no effect (no zoom out as the handler won't be even installed). This means so far it's impossible to render standalone images to the 1:1 ratio by default while still being able to click on top of them to zoom in/out the image, as using 'true' will shrink by default and using 'false' will not install the mouse click handler for that. Check epiphany bug 599997 for more details about the motivation of this bug (https://bugzilla.gnome.org/show_bug.cgi?id=599997) PROPOSAL: Basically I'd see two ways to fix this: 1. Keep the same meaning for ShrinksStandaloneImagesToFit values and just *add a new setting* to control the initial status of an image when shrinking is activated: initially shrink it or not. 2. Change the meaning of ShrinksStandaloneImagesToFit setting so it would control *only* whether the image is initially shrank or not, having the handler for the zoom in/out thing always installed. The main advantage of (1) is that it doesn't affect to the behaviour of already existing applications, just extends the possibilities with a new setting (but adding a new setting could be seen as a disavantage also). The main advantage of (2) is that it would keep things more simple, although it would be needed to take the change into account in already existing apps, and it would make impossible to disable the zoom. I have patches for both the two possibilities but I'm not sure which one is the most correct one bearing in mind all the platforms, so opinions? (I'll attach patches right away) 173799 1 45291 mario 2009-12-20 13:13:27 -0800 Created attachment 45291 Patch for proposal 1 (In reply to comment #0) > [...] > 1. Keep the same meaning for ShrinksStandaloneImagesToFit values and just > *add a new setting* to control the initial status of an image when shrinking is > activated: initially shrink it or not. Attached patch would implement this proposal 173802 2 45292 mario 2009-12-20 13:14:47 -0800 Created attachment 45292 Patch for proposal 2 (In reply to comment #0) > [...] > 2. Change the meaning of ShrinksStandaloneImagesToFit setting so it would > control *only* whether the image is initially shrank or not, having the handler > for the zoom in/out thing always installed. Attached patch would implement this 237360 3 ap 2010-06-12 15:58:47 -0700 This patch has been overlooked, because it isn't marked for review. Please see <http://webkit.org/coding/contributing.html> for more detail. 237754 4 mario 2010-06-14 02:06:31 -0700 (In reply to comment #3) > This patch has been overlooked, because it isn't marked for review. Please see <http://webkit.org/coding/contributing.html> for more detail. Sorry, I'll rebuild the patches against the last version of trunk and will add review flags for both of them this time, although obviously, only one of those would get in in the best case :-) 237850 5 58659 mario 2010-06-14 09:11:40 -0700 Created attachment 58659 Patch for proposal 1 Here you have a patch for the first proposal done against the latest version of trunk. Personally, this is the option I like the most, but do not pay much attention to that, just let me know what you think both of the proposal and the implementation :-) 237860 6 58662 mario 2010-06-14 09:33:12 -0700 Created attachment 58662 Patch for proposal 2 ...and here is the new patch for the second proposal 259950 7 mario 2010-08-04 03:25:51 -0700 This has been stuck for quite a long time and I wonder whether I should do something else other than ping people or keep commenting. Adding Xan Lopez to CC, as he's the maintainer of Epiphany browser, which depends on this bug to get https://bugzilla.gnome.org/show_bug.cgi?id=599997 fixed. 292331 8 58659 abarth 2010-10-10 11:22:31 -0700 Comment on attachment 58659 Patch for proposal 1 There doesn't seem to be much interested in this patch. R- for lack of tests. 292332 9 58662 abarth 2010-10-10 11:22:47 -0700 Comment on attachment 58662 Patch for proposal 2 No tests. 297439 10 mario 2010-10-21 08:39:32 -0700 Thanks Adam for reviewing the patches. The lack of tests is a shame, actually, but I wrote those patches almost one year ago when I barely knew what a Layout Test was, so I'm not surprised I didn't add any... :-) Anyway, now I'm busy fixing those bugs related to accessibility in the GTK port so I don't think I'll work for a while on this bug (hope that's ok), unless I find some contiguous spare time at some point to focus on that, but that will be unlikely until december, I'm afraid :-( Once again, thanks a lot for reviewing it. Now I have a clear lead to follow to get this fixed. 1024507 11 mario 2014-07-24 06:45:35 -0700 I think 4 years, together with the fact that this patch does not apply any more, is prudent enough to resolve this as a won't fix. 45291 2009-12-20 13:13:27 -0800 2010-06-14 09:11:40 -0700 Patch for proposal 1 0000-bug-32801-proposal-1.patch text/plain 12560 mario RnJvbSA3NTNjMWNmZGNjYzA2YzAzMDUzZmE1MDJlYWUwMWQ5M2Q3ZWRmNzdlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBTdW4sIDIwIERlYyAyMDA5IDIxOjUyOjAwICswMTAwClN1YmplY3Q6IFtQQVRD SF0gUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpEb24ndCBzaHJpbmsgYnkgZGVmYXVsdCBh bHdheXMgd2hlbiB6b29tIGluL291dCBpcyBlbmFibGVkIGZvcgpzdGFuZGFsb25lIGltYWdlcwpo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI4MDEKCkFkZCBhIG5ldyBz ZXR0aW5nIHRvIGNvbnRyb2wgd2hldGhlciBhbiBzdGFuZGFsb25lIGltYWdlIGdldHMKc2hydW5r IGJ5IGRlZmF1bHQgd2hlbiBzaHJpbmtzU3RhbmRhbG9uZUltYWdlc1RvRml0IGlzIHRydWUuCgoq IHdlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHA6Cih3ZWJraXRfd2ViX3NldHRpbmdzX2NsYXNz X2luaXQpOgood2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVydHkpOgood2Via2l0X3dlYl9z ZXR0aW5nc19nZXRfcHJvcGVydHkpOgood2Via2l0X3dlYl9zZXR0aW5nc19jb3B5KToKKiB3ZWJr aXQvd2Via2l0d2Vidmlldy5jcHA6Cih3ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3NldHRpbmdzKToK LS0tCiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgfCAgIDIyICsrKysr KysrKysrKysrKysrKysrKysKIFdlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuY3BwICAgICAg ICB8ICAgMTkgKysrKysrKysrKysrKysrLS0tLQogV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVu dC5oICAgICAgICAgIHwgICAgNCArKysrCiBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwICAgICAg ICAgICAgICAgfCAgICA1ICsrKysrCiBXZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaCAgICAgICAgICAg ICAgICAgfCAgICA0ICsrKysKIFdlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAg ICB8ICAgMTkgKysrKysrKysrKysrKysrKysrKwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vi c2V0dGluZ3MuY3BwIHwgICAxOSArKysrKysrKysrKysrKysrKysrCiBXZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXR3ZWJ2aWV3LmNwcCAgICAgfCAgICA0ICsrKy0KIDggZmlsZXMgY2hhbmdlZCwgOTEg aW5zZXJ0aW9ucygrKSwgNSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5n ZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDNlNGQwNGQuLjIzMDEyYzQgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjUgQEAKKzIwMDktMTItMjAgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERv bid0IHNocmluayBieSBkZWZhdWx0IGFsd2F5cyB3aGVuIHpvb20gaW4vb3V0IGlzIGVuYWJsZWQg Zm9yCisgICAgICAgIHN0YW5kYWxvbmUgaW1hZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjgwMQorICAgIAorICAgICAgICBBZGQgYSBuZXcgc2V0 dGluZyB0byBjb250cm9sIHdoZXRoZXIgYW4gc3RhbmRhbG9uZSBpbWFnZSBnZXRzCisgICAgICAg IHNocnVuayBieSBkZWZhdWx0IHdoZW4gc2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNUb0ZpdCBpcyB0 cnVlLgorCisgICAgICAgICogbG9hZGVyL0ltYWdlRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW1hZ2VEb2N1bWVudDo6SW1hZ2VEb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpJ bWFnZURvY3VtZW50OjppbWFnZUNsaWNrZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1 bWVudDo6d2luZG93U2l6ZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVu dDo6c2hvdWxkU2hyaW5rSW5pdGlhbGx5KToKKyAgICAgICAgKiBsb2FkZXIvSW1hZ2VEb2N1bWVu dC5oOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2V0 dGluZ3M6OnNldFNocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KToKKyAgICAgICAgKiBw YWdlL1NldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6c2hyaW5rc1N0YW5k YWxvbmVJbWFnZXNJbml0aWFsbHkpOgorCiAyMDA5LTEyLTIwICBNYXJ0aW4gUm9iaW5zb24gIDxt YXJ0aW4uamFtZXMucm9iaW5zb25AZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhh biBMb3Blei4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuY3BwIGIv V2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAKaW5kZXggOWI1NTk4ZC4uOGNhMTQ5MCAx MDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAKKysrIGIvV2ViQ29y ZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAKQEAgLTE2OSw2ICsxNjksNyBAQCBJbWFnZURvY3Vt ZW50OjpJbWFnZURvY3VtZW50KEZyYW1lKiBmcmFtZSkKICAgICAsIG1faW1hZ2VTaXplSXNLbm93 bihmYWxzZSkKICAgICAsIG1fZGlkU2hyaW5rSW1hZ2UoZmFsc2UpCiAgICAgLCBtX3Nob3VsZFNo cmlua0ltYWdlKHNob3VsZFNocmlua1RvRml0KCkpCisgICAgLCBtX3Nob3VsZFNocmlua0ltYWdl SW5pdGlhbGx5KHNob3VsZFNocmlua0luaXRpYWxseSgpKQogewogICAgIHNldFBhcnNlTW9kZShD b21wYXQpOwogfQpAQCAtMjQwLDEyICsyNDEsMTYgQEAgdm9pZCBJbWFnZURvY3VtZW50OjpyZXNp emVJbWFnZVRvRml0KCkKIAogdm9pZCBJbWFnZURvY3VtZW50OjppbWFnZUNsaWNrZWQoaW50IHgs IGludCB5KQogeworICAgIGJvb2wgcmVhbGx5U2hvdWxkU2hyaW5rID0gZmFsc2U7CisKICAgICBp ZiAoIW1faW1hZ2VTaXplSXNLbm93biB8fCBpbWFnZUZpdHNJbldpbmRvdygpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBtX3Nob3VsZFNocmlua0ltYWdlID0gIW1fc2hvdWxkU2hyaW5rSW1hZ2U7 Ci0gICAgCi0gICAgaWYgKG1fc2hvdWxkU2hyaW5rSW1hZ2UpCisKKyAgICByZWFsbHlTaG91bGRT aHJpbmsgPSBtX3Nob3VsZFNocmlua0ltYWdlSW5pdGlhbGx5ID8gbV9zaG91bGRTaHJpbmtJbWFn ZSA6ICFtX3Nob3VsZFNocmlua0ltYWdlOworCisgICAgaWYgKHJlYWxseVNob3VsZFNocmluaykK ICAgICAgICAgd2luZG93U2l6ZUNoYW5nZWQoKTsKICAgICBlbHNlIHsKICAgICAgICAgcmVzdG9y ZUltYWdlU2l6ZSgpOwpAQCAtMzEzLDEwICszMTgsMTEgQEAgdm9pZCBJbWFnZURvY3VtZW50Ojp3 aW5kb3dTaXplQ2hhbmdlZCgpCiAgICAgICAgIHJldHVybjsKIAogICAgIGJvb2wgZml0c0luV2lu ZG93ID0gaW1hZ2VGaXRzSW5XaW5kb3coKTsKLSAgICAKKyAgICBib29sIHJlYWxseVNob3VsZFNo cmluayA9IG1fc2hvdWxkU2hyaW5rSW1hZ2VJbml0aWFsbHkgPyBtX3Nob3VsZFNocmlua0ltYWdl IDogIW1fc2hvdWxkU2hyaW5rSW1hZ2U7CisKICAgICAvLyBJZiB0aGUgaW1hZ2UgaGFzIGJlZW4g ZXhwbGljaXRseSB6b29tZWQgaW4sIHJlc3RvcmUgdGhlIGN1cnNvciBpZiB0aGUgaW1hZ2UgZml0 cwogICAgIC8vIGFuZCBzZXQgaXQgdG8gYSB6b29tIG91dCBjdXJzb3IgaWYgdGhlIGltYWdlIGRv ZXNuJ3QgZml0Ci0gICAgaWYgKCFtX3Nob3VsZFNocmlua0ltYWdlKSB7CisgICAgaWYgKCFyZWFs bHlTaG91bGRTaHJpbmspIHsKICAgICAgICAgRXhjZXB0aW9uQ29kZSBlYzsKICAgICAgICAgCiAg ICAgICAgIGlmIChmaXRzSW5XaW5kb3cpCkBAIC0zNTYsNiArMzYyLDExIEBAIGJvb2wgSW1hZ2VE b2N1bWVudDo6c2hvdWxkU2hyaW5rVG9GaXQoKSBjb25zdAogICAgICAgICBmcmFtZSgpLT5wYWdl KCktPm1haW5GcmFtZSgpID09IGZyYW1lKCk7CiB9CiAKK2Jvb2wgSW1hZ2VEb2N1bWVudDo6c2hv dWxkU2hyaW5rSW5pdGlhbGx5KCkgY29uc3QKK3sKKyAgICByZXR1cm4gZnJhbWUoKS0+cGFnZSgp LT5zZXR0aW5ncygpLT5zaHJpbmtzU3RhbmRhbG9uZUltYWdlc0luaXRpYWxseSgpOworfQorCiAv LyAtLS0tLS0tLQogCiB2b2lkIEltYWdlRXZlbnRMaXN0ZW5lcjo6aGFuZGxlRXZlbnQoU2NyaXB0 RXhlY3V0aW9uQ29udGV4dCosIEV2ZW50KiBldmVudCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9h ZGVyL0ltYWdlRG9jdW1lbnQuaCBiL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuaAppbmRl eCAwODBiMjUwLi5kNzBkZmQzIDEwMDY0NAotLS0gYS9XZWJDb3JlL2xvYWRlci9JbWFnZURvY3Vt ZW50LmgKKysrIGIvV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5oCkBAIC01Nyw2ICs1Nyw3 IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZXN0b3JlSW1hZ2VTaXplKCk7CiAgICAgYm9vbCBpbWFn ZUZpdHNJbldpbmRvdygpIGNvbnN0OwogICAgIGJvb2wgc2hvdWxkU2hyaW5rVG9GaXQoKSBjb25z dDsKKyAgICBib29sIHNob3VsZFNocmlua0luaXRpYWxseSgpIGNvbnN0OwogICAgIGZsb2F0IHNj YWxlKCkgY29uc3Q7CiAgICAgCiAgICAgSW1hZ2VEb2N1bWVudEVsZW1lbnQqIG1faW1hZ2VFbGVt ZW50OwpAQCAtNjksNiArNzAsOSBAQCBwcml2YXRlOgogICAgIAogICAgIC8vIFdoZXRoZXIgdGhl IGltYWdlIHNob3VsZCBiZSBzaHJ1bmsgb3Igbm90CiAgICAgYm9vbCBtX3Nob3VsZFNocmlua0lt YWdlOworCisgICAgLy8gV2hldGhlciB0aGUgaW1hZ2Ugc2hvdWxkIGJlIGluaXRpYWxseSBzaHJ1 bmsgb3Igbm90CisgICAgYm9vbCBtX3Nob3VsZFNocmlua0ltYWdlSW5pdGlhbGx5OwogfTsKICAg ICAKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAgYi9XZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuY3BwCmluZGV4IDEwZjIyOGMuLmQ3NTgwM2MgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvcGFnZS9TZXR0aW5ncy5jcHAKKysrIGIvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApAQCAt MzcyLDYgKzM3MiwxMSBAQCB2b2lkIFNldHRpbmdzOjpzZXRTaHJpbmtzU3RhbmRhbG9uZUltYWdl c1RvRml0KGJvb2wgc2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNUb0ZpdAogICAgIG1fc2hyaW5rc1N0 YW5kYWxvbmVJbWFnZXNUb0ZpdCA9IHNocmlua3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQ7CiB9CiAK K3ZvaWQgU2V0dGluZ3M6OnNldFNocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KGJvb2wg c2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNJbml0aWFsbHkpCit7CisgICAgbV9zaHJpbmtzU3RhbmRh bG9uZUltYWdlc0luaXRpYWxseSA9IHNocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5Owor fQorCiB2b2lkIFNldHRpbmdzOjpzZXRTaG93c1VSTHNJblRvb2xUaXBzKGJvb2wgc2hvd3NVUkxz SW5Ub29sVGlwcykKIHsKICAgICBtX3Nob3dzVVJMc0luVG9vbFRpcHMgPSBzaG93c1VSTHNJblRv b2xUaXBzOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wYWdlL1NldHRpbmdzLmggYi9XZWJDb3JlL3Bh Z2UvU2V0dGluZ3MuaAppbmRleCA2NzNiYThmLi44OTYwMDRiIDEwMDY0NAotLS0gYS9XZWJDb3Jl L3BhZ2UvU2V0dGluZ3MuaAorKysgYi9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaApAQCAtMTg0LDYg KzE4NCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRTaHJpbmtzU3Rh bmRhbG9uZUltYWdlc1RvRml0KGJvb2wpOwogICAgICAgICBib29sIHNocmlua3NTdGFuZGFsb25l SW1hZ2VzVG9GaXQoKSBjb25zdCB7IHJldHVybiBtX3Nocmlua3NTdGFuZGFsb25lSW1hZ2VzVG9G aXQ7IH0KIAorICAgICAgICB2b2lkIHNldFNocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5 KGJvb2wpOworICAgICAgICBib29sIHNocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KCkg Y29uc3QgeyByZXR1cm4gbV9zaHJpbmtzU3RhbmRhbG9uZUltYWdlc0luaXRpYWxseTsgfQorCiAg ICAgICAgIHZvaWQgc2V0U2hvd3NVUkxzSW5Ub29sVGlwcyhib29sKTsKICAgICAgICAgYm9vbCBz aG93c1VSTHNJblRvb2xUaXBzKCkgY29uc3QgeyByZXR1cm4gbV9zaG93c1VSTHNJblRvb2xUaXBz OyB9CiAKQEAgLTMyMSw2ICszMjQsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJv b2wgbV9uZWVkc1RpZ2VyTWFpbFF1aXJrcyA6IDE7CiAgICAgICAgIGJvb2wgbV9pc0RPTVBhc3Rl QWxsb3dlZCA6IDE7CiAgICAgICAgIGJvb2wgbV9zaHJpbmtzU3RhbmRhbG9uZUltYWdlc1RvRml0 IDogMTsKKyAgICAgICAgYm9vbCBtX3Nocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5IDog MTsKICAgICAgICAgYm9vbCBtX3VzZXNQYWdlQ2FjaGU6IDE7CiAgICAgICAgIGJvb2wgbV9zaG93 c1VSTHNJblRvb2xUaXBzIDogMTsKICAgICAgICAgYm9vbCBtX2ZvcmNlRlRQRGlyZWN0b3J5TGlz dGluZ3MgOiAxOwpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwppbmRleCBlYWJiYTlmLi43YmUwN2EyIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisy MDA5LTEyLTIwICBNYXJpbyBTYW5jaGV6IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBzaHJp bmsgYnkgZGVmYXVsdCBhbHdheXMgd2hlbiB6b29tIGluL291dCBpcyBlbmFibGVkIGZvcgorICAg ICAgICBzdGFuZGFsb25lIGltYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MzI4MDEKKyAgICAKKyAgICAgICAgQWRkIGEgbmV3IHNldHRpbmcgdG8g Y29udHJvbCB3aGV0aGVyIGFuIHN0YW5kYWxvbmUgaW1hZ2UgZ2V0cworICAgICAgICBzaHJ1bmsg YnkgZGVmYXVsdCB3aGVuIHNocmlua3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQgaXMgdHJ1ZS4KKwor ICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHA6CisgICAgICAgICh3ZWJraXRf d2ViX3NldHRpbmdzX2NsYXNzX2luaXQpOgorICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19z ZXRfcHJvcGVydHkpOgorICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19nZXRfcHJvcGVydHkp OgorICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19jb3B5KToKKyAgICAgICAgKiB3ZWJraXQv d2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3NldHRp bmdzKToKKwogMjAwOS0xMi0yMCAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3Jv bmhhQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBSZXZpZXdlZCBieSBYYW4gTG9wZXouCmRp ZmYgLS1naXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAgYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKaW5kZXggMDU2OWVlZS4uNjVjYzUw ZCAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCisr KyBiL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcApAQCAtNzgsNiArNzgs NyBAQCBzdHJ1Y3QgX1dlYktpdFdlYlNldHRpbmdzUHJpdmF0ZSB7CiAgICAgZ2Jvb2xlYW4gZW5m b3JjZV85Nl9kcGk7CiAgICAgZ2Jvb2xlYW4gYXV0b19sb2FkX2ltYWdlczsKICAgICBnYm9vbGVh biBhdXRvX3Nocmlua19pbWFnZXM7CisgICAgZ2Jvb2xlYW4gYXV0b19zaHJpbmtfaW1hZ2VzX2lu aXRpYWxseTsKICAgICBnYm9vbGVhbiBwcmludF9iYWNrZ3JvdW5kczsKICAgICBnYm9vbGVhbiBl bmFibGVfc2NyaXB0czsKICAgICBnYm9vbGVhbiBlbmFibGVfcGx1Z2luczsKQEAgLTEyNCw2ICsx MjUsNyBAQCBlbnVtIHsKICAgICBQUk9QX0VORk9SQ0VfOTZfRFBJLAogICAgIFBST1BfQVVUT19M T0FEX0lNQUdFUywKICAgICBQUk9QX0FVVE9fU0hSSU5LX0lNQUdFUywKKyAgICBQUk9QX0FVVE9f U0hSSU5LX0lNQUdFU19JTklUSUFMTFksCiAgICAgUFJPUF9QUklOVF9CQUNLR1JPVU5EUywKICAg ICBQUk9QX0VOQUJMRV9TQ1JJUFRTLAogICAgIFBST1BfRU5BQkxFX1BMVUdJTlMsCkBAIC0zNjIs NiArMzY0LDE2IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfc2V0dGluZ3NfY2xhc3NfaW5pdChX ZWJLaXRXZWJTZXR0aW5nc0NsYXNzKiBrbGFzcykKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGZsYWdzKSk7CiAKICAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5 KGdvYmplY3RfY2xhc3MsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQUk9Q X0FVVE9fU0hSSU5LX0lNQUdFU19JTklUSUFMTFksCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJhdXRvLXNocmluay1pbWFnZXMtaW5pdGlhbGx5IiwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIF8oIkF1dG8gU2hyaW5rIEltYWdlcyBJbml0aWFsbHki KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF8oIkF1dG9tYXRpY2FsbHkg c2hyaW5rIHN0YW5kYWxvbmUgaW1hZ2VzICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgInJpZ2h0IGFmdGVyIHRoZXkncmUgbG9hZGVkIGZvciB0aGUgZmlyc3QgdGltZS4i KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRSVUUsCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBmbGFncykpOworCisgICAgZ19vYmplY3RfY2xhc3Nf aW5zdGFsbF9wcm9wZXJ0eShnb2JqZWN0X2NsYXNzLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgUFJPUF9QUklOVF9CQUNLR1JPVU5EUywKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGdfcGFyYW1fc3BlY19ib29sZWFuKAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgInByaW50LWJhY2tncm91bmRzIiwKQEAgLTg2MCw2ICs4NzIsOSBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX3NldF9wcm9wZXJ0eShHT2JqZWN0KiBv YmplY3QsIGd1aW50IHByb3BfaWQsIGNvbgogICAgIGNhc2UgUFJPUF9BVVRPX1NIUklOS19JTUFH RVM6CiAgICAgICAgIHByaXYtPmF1dG9fc2hyaW5rX2ltYWdlcyA9IGdfdmFsdWVfZ2V0X2Jvb2xl YW4odmFsdWUpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfQVVUT19TSFJJTktfSU1B R0VTX0lOSVRJQUxMWToKKyAgICAgICAgcHJpdi0+YXV0b19zaHJpbmtfaW1hZ2VzX2luaXRpYWxs eSA9IGdfdmFsdWVfZ2V0X2Jvb2xlYW4odmFsdWUpOworICAgICAgICBicmVhazsKICAgICBjYXNl IFBST1BfUFJJTlRfQkFDS0dST1VORFM6CiAgICAgICAgIHByaXYtPnByaW50X2JhY2tncm91bmRz ID0gZ192YWx1ZV9nZXRfYm9vbGVhbih2YWx1ZSk7CiAgICAgICAgIGJyZWFrOwpAQCAtMTAyMSw2 ICsxMDM2LDkgQEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19nZXRfcHJvcGVydHko R09iamVjdCogb2JqZWN0LCBndWludCBwcm9wX2lkLCBHVmEKICAgICBjYXNlIFBST1BfQVVUT19T SFJJTktfSU1BR0VTOgogICAgICAgICBnX3ZhbHVlX3NldF9ib29sZWFuKHZhbHVlLCBwcml2LT5h dXRvX3Nocmlua19pbWFnZXMpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfQVVUT19T SFJJTktfSU1BR0VTX0lOSVRJQUxMWToKKyAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1 ZSwgcHJpdi0+YXV0b19zaHJpbmtfaW1hZ2VzX2luaXRpYWxseSk7CisgICAgICAgIGJyZWFrOwog ICAgIGNhc2UgUFJPUF9QUklOVF9CQUNLR1JPVU5EUzoKICAgICAgICAgZ192YWx1ZV9zZXRfYm9v bGVhbih2YWx1ZSwgcHJpdi0+cHJpbnRfYmFja2dyb3VuZHMpOwogICAgICAgICBicmVhazsKQEAg LTExMzcsNiArMTE1NSw3IEBAIFdlYktpdFdlYlNldHRpbmdzKiB3ZWJraXRfd2ViX3NldHRpbmdz X2NvcHkoV2ViS2l0V2ViU2V0dGluZ3MqIHdlYl9zZXR0aW5ncykKICAgICAgICAgICAgICAgICAg Im1pbmltdW0tbG9naWNhbC1mb250LXNpemUiLCBwcml2LT5taW5pbXVtX2xvZ2ljYWxfZm9udF9z aXplLAogICAgICAgICAgICAgICAgICAiYXV0by1sb2FkLWltYWdlcyIsIHByaXYtPmF1dG9fbG9h ZF9pbWFnZXMsCiAgICAgICAgICAgICAgICAgICJhdXRvLXNocmluay1pbWFnZXMiLCBwcml2LT5h dXRvX3Nocmlua19pbWFnZXMsCisgICAgICAgICAgICAgICAgICJhdXRvLXNocmluay1pbWFnZXMt aW5pdGlhbGx5IiwgcHJpdi0+YXV0b19zaHJpbmtfaW1hZ2VzX2luaXRpYWxseSwKICAgICAgICAg ICAgICAgICAgInByaW50LWJhY2tncm91bmRzIiwgcHJpdi0+cHJpbnRfYmFja2dyb3VuZHMsCiAg ICAgICAgICAgICAgICAgICJlbmFibGUtc2NyaXB0cyIsIHByaXYtPmVuYWJsZV9zY3JpcHRzLAog ICAgICAgICAgICAgICAgICAiZW5hYmxlLXBsdWdpbnMiLCBwcml2LT5lbmFibGVfcGx1Z2lucywK ZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggMmQyZTZlNy4uMDFmMTA4ZSAxMDA2 NDQKLS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTI0NTgsNyArMjQ1OCw3IEBAIHN0YXRp YyB2b2lkIHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2Vi VmlldykKICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBjb3JlKHdlYlZpZXcpLT5zZXR0aW5ncygp OwogCiAgICAgZ2NoYXIqIGRlZmF1bHRFbmNvZGluZywgKmN1cnNpdmVGb250RmFtaWx5LCAqZGVm YXVsdEZvbnRGYW1pbHksICpmYW50YXN5Rm9udEZhbWlseSwgKm1vbm9zcGFjZUZvbnRGYW1pbHks ICpzYW5zU2VyaWZGb250RmFtaWx5LCAqc2VyaWZGb250RmFtaWx5LCAqdXNlclN0eWxlc2hlZXRV cmk7Ci0gICAgZ2Jvb2xlYW4gYXV0b0xvYWRJbWFnZXMsIGF1dG9TaHJpbmtJbWFnZXMsIHByaW50 QmFja2dyb3VuZHMsCisgICAgZ2Jvb2xlYW4gYXV0b0xvYWRJbWFnZXMsIGF1dG9TaHJpbmtJbWFn ZXMsIGF1dG9TaHJpbmtJbWFnZXNJbml0aWFsbHksIHByaW50QmFja2dyb3VuZHMsCiAgICAgICAg IGVuYWJsZVNjcmlwdHMsIGVuYWJsZVBsdWdpbnMsIGVuYWJsZURldmVsb3BlckV4dHJhcywgcmVz aXphYmxlVGV4dEFyZWFzLAogICAgICAgICBlbmFibGVQcml2YXRlQnJvd3NpbmcsIGVuYWJsZUNh cmV0QnJvd3NpbmcsIGVuYWJsZUhUTUw1RGF0YWJhc2UsIGVuYWJsZUhUTUw1TG9jYWxTdG9yYWdl LAogICAgICAgICBlbmFibGVYU1NBdWRpdG9yLCBqYXZhc2NyaXB0Q2FuT3BlbldpbmRvd3MsIGVu YWJsZU9mZmxpbmVXZWJBcHBDYWNoZSwKQEAgLTI0NzcsNiArMjQ3Nyw3IEBAIHN0YXRpYyB2b2lk IHdlYmtpdF93ZWJfdmlld191cGRhdGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykK ICAgICAgICAgICAgICAgICAgInNlcmlmLWZvbnQtZmFtaWx5IiwgJnNlcmlmRm9udEZhbWlseSwK ICAgICAgICAgICAgICAgICAgImF1dG8tbG9hZC1pbWFnZXMiLCAmYXV0b0xvYWRJbWFnZXMsCiAg ICAgICAgICAgICAgICAgICJhdXRvLXNocmluay1pbWFnZXMiLCAmYXV0b1Nocmlua0ltYWdlcywK KyAgICAgICAgICAgICAgICAgImF1dG8tc2hyaW5rLWltYWdlcy1pbml0aWFsbHkiLCAmYXV0b1No cmlua0ltYWdlc0luaXRpYWxseSwKICAgICAgICAgICAgICAgICAgInByaW50LWJhY2tncm91bmRz IiwgJnByaW50QmFja2dyb3VuZHMsCiAgICAgICAgICAgICAgICAgICJlbmFibGUtc2NyaXB0cyIs ICZlbmFibGVTY3JpcHRzLAogICAgICAgICAgICAgICAgICAiZW5hYmxlLXBsdWdpbnMiLCAmZW5h YmxlUGx1Z2lucywKQEAgLTI1MDcsNiArMjUwOCw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJf dmlld191cGRhdGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBzZXR0aW5n cy0+c2V0U2VyaWZGb250RmFtaWx5KHNlcmlmRm9udEZhbWlseSk7CiAgICAgc2V0dGluZ3MtPnNl dExvYWRzSW1hZ2VzQXV0b21hdGljYWxseShhdXRvTG9hZEltYWdlcyk7CiAgICAgc2V0dGluZ3Mt PnNldFNocmlua3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQoYXV0b1Nocmlua0ltYWdlcyk7CisgICAg c2V0dGluZ3MtPnNldFNocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KGF1dG9TaHJpbmtJ bWFnZXNJbml0aWFsbHkpOwogICAgIHNldHRpbmdzLT5zZXRTaG91bGRQcmludEJhY2tncm91bmRz KHByaW50QmFja2dyb3VuZHMpOwogICAgIHNldHRpbmdzLT5zZXRKYXZhU2NyaXB0RW5hYmxlZChl bmFibGVTY3JpcHRzKTsKICAgICBzZXR0aW5ncy0+c2V0UGx1Z2luc0VuYWJsZWQoZW5hYmxlUGx1 Z2lucyk7Ci0tIAoxLjYuMy4zCgo= 45292 2009-12-20 13:14:47 -0800 2010-06-14 09:33:12 -0700 Patch for proposal 2 0000-bug-32801-proposal-2.patch text/plain 5322 mario RnJvbSBkNWYzM2M2OTFiODVlYjBiZWE4MjZkMTcyNmY5N2VkY2Q5ZTExNzVhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBTdW4sIDIwIERlYyAyMDA5IDIxOjQ2OjQ0ICswMTAwClN1YmplY3Q6IFtQQVRD SF0gUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpEb24ndCBzaHJpbmsgYnkgZGVmYXVsdCBh bHdheXMgd2hlbiB6b29tIGluL291dCBpcyBlbmFibGVkIGZvcgpzdGFuZGFsb25lIGltYWdlcwpo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI4MDEKCk1ha2Ugc2hyaW5r c1N0YW5kYWxvbmVJbWFnZXNUb0ZpdCBjb250cm9sIG9ubHkgd2hldGhlciBhbgpzdGFuZGFsb25l IGltYWdlIGdldHMgc2hydW5rIGJ5IGRlZmF1bHQgYW5kIGFsd2F5cyBpbnN0YWxsCm5lZWRlZCBo YW5kbGVycyB0byB6b29tIGluL291dCB0aGUgaW1hZ2UgYnkgY2xpY2tpbmcgb24gaXQKCiogbG9h ZGVyL0ltYWdlRG9jdW1lbnQuY3BwOgooV2ViQ29yZTo6SW1hZ2VEb2N1bWVudDo6Y3JlYXRlRG9j dW1lbnRTdHJ1Y3R1cmUpOgooV2ViQ29yZTo6SW1hZ2VEb2N1bWVudDo6aW1hZ2VDbGlja2VkKToK KFdlYkNvcmU6OkltYWdlRG9jdW1lbnQ6OmltYWdlQ2hhbmdlZCk6CihXZWJDb3JlOjpJbWFnZURv Y3VtZW50Ojp3aW5kb3dTaXplQ2hhbmdlZCk6CiogbG9hZGVyL0ltYWdlRG9jdW1lbnQuaDoKLS0t CiBXZWJDb3JlL0NoYW5nZUxvZyAgICAgICAgICAgICAgICB8ICAgMTkgKysrKysrKysrKysrKysr KysrKwogV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAgfCAgIDIyICsrKysrKysrKy0t LS0tLS0tLS0tLS0KIFdlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuaCAgIHwgICAgMiArLQog V2ViS2l0L2d0ay9DaGFuZ2VMb2cgICAgICAgICAgICAgfCAgIDE5ICsrKysrKysrKysrKysrKysr KysKIDQgZmlsZXMgY2hhbmdlZCwgNDggaW5zZXJ0aW9ucygrKSwgMTQgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAz ZTRkMDRkLi4xODliN2NjIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDA5LTEyLTIwICBNYXJpbyBTYW5jaGV6 IFByYWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBEb24ndCBzaHJpbmsgYnkgZGVmYXVsdCBhbHdheXMgd2hl biB6b29tIGluL291dCBpcyBlbmFibGVkIGZvcgorICAgICAgICBzdGFuZGFsb25lIGltYWdlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI4MDEKKwor ICAgICAgICBNYWtlIHNocmlua3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQgY29udHJvbCBvbmx5IHdo ZXRoZXIgYW4KKyAgICAgICAgc3RhbmRhbG9uZSBpbWFnZSBnZXRzIHNocnVuayBieSBkZWZhdWx0 IGFuZCBhbHdheXMgaW5zdGFsbAorICAgICAgICBuZWVkZWQgaGFuZGxlcnMgdG8gem9vbSBpbi9v dXQgdGhlIGltYWdlIGJ5IGNsaWNraW5nIG9uIGl0CisKKyAgICAgICAgKiBsb2FkZXIvSW1hZ2VE b2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50OjpjcmVhdGVEb2N1 bWVudFN0cnVjdHVyZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50OjppbWFnZUNs aWNrZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudDo6aW1hZ2VDaGFuZ2VkKToK KyAgICAgICAgKFdlYkNvcmU6OkltYWdlRG9jdW1lbnQ6OndpbmRvd1NpemVDaGFuZ2VkKToKKyAg ICAgICAgKiBsb2FkZXIvSW1hZ2VEb2N1bWVudC5oOgorCiAyMDA5LTEyLTIwICBNYXJ0aW4gUm9i aW5zb24gIDxtYXJ0aW4uamFtZXMucm9iaW5zb25AZ21haWwuY29tPgogCiAgICAgICAgIFJldmll d2VkIGJ5IFhhbiBMb3Blei4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1l bnQuY3BwIGIvV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAKaW5kZXggOWI1NTk4ZC4u NjZkNGQ4MCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAKKysr IGIvV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAKQEAgLTE5OCwxMyArMTk4LDExIEBA IHZvaWQgSW1hZ2VEb2N1bWVudDo6Y3JlYXRlRG9jdW1lbnRTdHJ1Y3R1cmUoKQogICAgIAogICAg IGJvZHktPmFwcGVuZENoaWxkKGltYWdlRWxlbWVudCwgZWMpOwogICAgIAotICAgIGlmIChzaG91 bGRTaHJpbmtUb0ZpdCgpKSB7Ci0gICAgICAgIC8vIEFkZCBldmVudCBsaXN0ZW5lcnMKLSAgICAg ICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxpc3RlbmVyID0gSW1hZ2VFdmVudExpc3RlbmVyOjpj cmVhdGUodGhpcyk7Ci0gICAgICAgIGlmIChET01XaW5kb3cqIGRvbVdpbmRvdyA9IHRoaXMtPmRv bVdpbmRvdygpKQotICAgICAgICAgICAgZG9tV2luZG93LT5hZGRFdmVudExpc3RlbmVyKCJyZXNp emUiLCBsaXN0ZW5lciwgZmFsc2UpOwotICAgICAgICBpbWFnZUVsZW1lbnQtPmFkZEV2ZW50TGlz dGVuZXIoImNsaWNrIiwgbGlzdGVuZXIucmVsZWFzZSgpLCBmYWxzZSk7Ci0gICAgfQorICAgIC8v IEFkZCBldmVudCBsaXN0ZW5lcnMKKyAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIg PSBJbWFnZUV2ZW50TGlzdGVuZXI6OmNyZWF0ZSh0aGlzKTsKKyAgICBpZiAoRE9NV2luZG93KiBk b21XaW5kb3cgPSB0aGlzLT5kb21XaW5kb3coKSkKKyAgICAgICAgZG9tV2luZG93LT5hZGRFdmVu dExpc3RlbmVyKCJyZXNpemUiLCBsaXN0ZW5lciwgZmFsc2UpOworICAgIGltYWdlRWxlbWVudC0+ YWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCBsaXN0ZW5lci5yZWxlYXNlKCksIGZhbHNlKTsKIAog ICAgIG1faW1hZ2VFbGVtZW50ID0gaW1hZ2VFbGVtZW50LmdldCgpOwogfQpAQCAtMjQ0LDcgKzI0 Miw3IEBAIHZvaWQgSW1hZ2VEb2N1bWVudDo6aW1hZ2VDbGlja2VkKGludCB4LCBpbnQgeSkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgbV9zaG91bGRTaHJpbmtJbWFnZSA9ICFtX3Nob3VsZFNocmlu a0ltYWdlOwotICAgIAorCiAgICAgaWYgKG1fc2hvdWxkU2hyaW5rSW1hZ2UpCiAgICAgICAgIHdp bmRvd1NpemVDaGFuZ2VkKCk7CiAgICAgZWxzZSB7CkBAIC0yNzMsMTAgKzI3MSw4IEBAIHZvaWQg SW1hZ2VEb2N1bWVudDo6aW1hZ2VDaGFuZ2VkKCkKICAgICAKICAgICBtX2ltYWdlU2l6ZUlzS25v d24gPSB0cnVlOwogICAgIAotICAgIGlmIChzaG91bGRTaHJpbmtUb0ZpdCgpKSB7Ci0gICAgICAg IC8vIEZvcmNlIHJlc2l6aW5nIG9mIHRoZSBpbWFnZQotICAgICAgICB3aW5kb3dTaXplQ2hhbmdl ZCgpOwotICAgIH0KKyAgICAvLyBGb3JjZSByZXNpemluZyBvZiB0aGUgaW1hZ2UKKyAgICB3aW5k b3dTaXplQ2hhbmdlZCgpOwogfQogCiB2b2lkIEltYWdlRG9jdW1lbnQ6OnJlc3RvcmVJbWFnZVNp emUoKQpAQCAtMzEzLDcgKzMwOSw3IEBAIHZvaWQgSW1hZ2VEb2N1bWVudDo6d2luZG93U2l6ZUNo YW5nZWQoKQogICAgICAgICByZXR1cm47CiAKICAgICBib29sIGZpdHNJbldpbmRvdyA9IGltYWdl Rml0c0luV2luZG93KCk7Ci0gICAgCisKICAgICAvLyBJZiB0aGUgaW1hZ2UgaGFzIGJlZW4gZXhw bGljaXRseSB6b29tZWQgaW4sIHJlc3RvcmUgdGhlIGN1cnNvciBpZiB0aGUgaW1hZ2UgZml0cwog ICAgIC8vIGFuZCBzZXQgaXQgdG8gYSB6b29tIG91dCBjdXJzb3IgaWYgdGhlIGltYWdlIGRvZXNu J3QgZml0CiAgICAgaWYgKCFtX3Nob3VsZFNocmlua0ltYWdlKSB7CmRpZmYgLS1naXQgYS9XZWJD b3JlL2xvYWRlci9JbWFnZURvY3VtZW50LmggYi9XZWJDb3JlL2xvYWRlci9JbWFnZURvY3VtZW50 LmgKaW5kZXggMDgwYjI1MC4uMGVjNTlhOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvSW1h Z2VEb2N1bWVudC5oCisrKyBiL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuaApAQCAtNjcs NyArNjcsNyBAQCBwcml2YXRlOgogICAgIC8vIFdoZXRoZXIgdGhlIGltYWdlIGlzIHNocnVuayB0 byBmaXQgb3Igbm90CiAgICAgYm9vbCBtX2RpZFNocmlua0ltYWdlOwogICAgIAotICAgIC8vIFdo ZXRoZXIgdGhlIGltYWdlIHNob3VsZCBiZSBzaHJ1bmsgb3Igbm90CisgICAgLy8gV2hldGhlciB0 aGUgaW1hZ2Ugc2hvdWxkIGJlIHNocnVuayBvciBub3QgYnkgZGVmYXVsdAogICAgIGJvb2wgbV9z aG91bGRTaHJpbmtJbWFnZTsKIH07CiAgICAgCmRpZmYgLS1naXQgYS9XZWJLaXQvZ3RrL0NoYW5n ZUxvZyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCmluZGV4IGVhYmJhOWYuLjVmMTdhMzAgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMDktMTItMjAgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hl ekBpZ2FsaWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIERvbid0IHNocmluayBieSBkZWZhdWx0IGFsd2F5cyB3aGVuIHpvb20gaW4vb3V0IGlz IGVuYWJsZWQgZm9yCisgICAgICAgIHN0YW5kYWxvbmUgaW1hZ2VzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjgwMQorCisgICAgICAgIE1ha2Ugc2hy aW5rc1N0YW5kYWxvbmVJbWFnZXNUb0ZpdCBjb250cm9sIG9ubHkgd2hldGhlciBhbgorICAgICAg ICBzdGFuZGFsb25lIGltYWdlIGdldHMgc2hydW5rIGJ5IGRlZmF1bHQgYW5kIGFsd2F5cyBpbnN0 YWxsCisgICAgICAgIG5lZWRlZCBoYW5kbGVycyB0byB6b29tIGluL291dCB0aGUgaW1hZ2UgYnkg Y2xpY2tpbmcgb24gaXQKKworICAgICAgICAqIGxvYWRlci9JbWFnZURvY3VtZW50LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkltYWdlRG9jdW1lbnQ6OmNyZWF0ZURvY3VtZW50U3RydWN0dXJlKToK KyAgICAgICAgKFdlYkNvcmU6OkltYWdlRG9jdW1lbnQ6OmltYWdlQ2xpY2tlZCk6CisgICAgICAg IChXZWJDb3JlOjpJbWFnZURvY3VtZW50OjppbWFnZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29y ZTo6SW1hZ2VEb2N1bWVudDo6d2luZG93U2l6ZUNoYW5nZWQpOgorICAgICAgICAqIGxvYWRlci9J bWFnZURvY3VtZW50Lmg6CisKIDIwMDktMTItMjAgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1 c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWGFu IExvcGV6LgotLSAKMS42LjMuMwoK 58659 2010-06-14 09:11:40 -0700 2010-10-10 11:22:31 -0700 Patch for proposal 1 0001-32801-v1.patch text/plain 13349 mario RnJvbSA5ZjAwNDg2OGU4MWQ0MzhmODUyY2Y1YjNmNjdjYmZjZGI1MTE3YTk2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBNb24sIDE0IEp1biAyMDEwIDE3OjMxOjE5ICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMC0wNi0xNCAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBEb24ndCBzaHJp bmsgYnkgZGVmYXVsdCBhbHdheXMgd2hlbiB6b29tIGluL291dCBpcyBlbmFibGVkIGZvciBzdGFu ZGFsb25lIGltYWdlcwogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zMjgwMQoKICAgICAgICBBZGQgYSBuZXcgc2V0dGluZyB0byBjb250cm9sIHdoZXRoZXIg YW4gc3RhbmRhbG9uZSBpbWFnZSBnZXRzCiAgICAgICAgc2hydW5rIGJ5IGRlZmF1bHQgd2hlbiBz aHJpbmtzU3RhbmRhbG9uZUltYWdlc1RvRml0IGlzIHRydWUuCgogICAgICAgICogbG9hZGVyL0lt YWdlRG9jdW1lbnQuY3BwOgogICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50OjpJbWFnZURv Y3VtZW50KToKICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudDo6aW1hZ2VDbGlja2VkKToK ICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudDo6d2luZG93U2l6ZUNoYW5nZWQpOgogICAg ICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50OjpzaG91bGRTaHJpbmtJbml0aWFsbHkpOgogICAg ICAgICogbG9hZGVyL0ltYWdlRG9jdW1lbnQuaDoKICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3Bw OgogICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6c2V0U2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNJ bml0aWFsbHkpOgogICAgICAgICogcGFnZS9TZXR0aW5ncy5oOgogICAgICAgIChXZWJDb3JlOjpT ZXR0aW5nczo6c2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNJbml0aWFsbHkpOgoKMjAxMC0wNi0xNCAg TWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBEb24ndCBzaHJpbmsgYnkgZGVmYXVsdCBh bHdheXMgd2hlbiB6b29tIGluL291dCBpcyBlbmFibGVkIGZvciBzdGFuZGFsb25lIGltYWdlcwog ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjgwMQoKICAg ICAgICBBZGQgYSBuZXcgc2V0dGluZyB0byBjb250cm9sIHdoZXRoZXIgYW4gc3RhbmRhbG9uZSBp bWFnZSBnZXRzCiAgICAgICAgc2hydW5rIGJ5IGRlZmF1bHQgd2hlbiBzaHJpbmtzU3RhbmRhbG9u ZUltYWdlc1RvRml0IGlzIHRydWUuCgogICAgICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdz LmNwcDoKICAgICAgICAod2Via2l0X3dlYl9zZXR0aW5nc19jbGFzc19pbml0KToKICAgICAgICAo d2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVydHkpOgogICAgICAgICh3ZWJraXRfd2ViX3Nl dHRpbmdzX2dldF9wcm9wZXJ0eSk6CiAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY29weSk6 CiAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CiAgICAgICAgKHdlYmtpdF93ZWJf dmlld191cGRhdGVfc2V0dGluZ3MpOgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9nICAgICAgICAgICAg ICAgICAgICAgICB8ICAgMjEgKysrKysrKysrKysrKysrKysrKysrCiBXZWJDb3JlL2xvYWRlci9J bWFnZURvY3VtZW50LmNwcCAgICAgICAgfCAgIDE3ICsrKysrKysrKysrKystLS0tCiBXZWJDb3Jl L2xvYWRlci9JbWFnZURvY3VtZW50LmggICAgICAgICAgfCAgICA0ICsrKysKIFdlYkNvcmUvcGFn ZS9TZXR0aW5ncy5jcHAgICAgICAgICAgICAgICB8ICAgIDUgKysrKysKIFdlYkNvcmUvcGFnZS9T ZXR0aW5ncy5oICAgICAgICAgICAgICAgICB8ICAgIDQgKysrKwogV2ViS2l0L2d0ay9DaGFuZ2VM b2cgICAgICAgICAgICAgICAgICAgIHwgICAxOCArKysrKysrKysrKysrKysrKysKIFdlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcCB8ICAgMTkgKysrKysrKysrKysrKysrKysr KwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgICAgIHwgICAgNCArKystCiA4 IGZpbGVzIGNoYW5nZWQsIDg3IGluc2VydGlvbnMoKyksIDUgZGVsZXRpb25zKC0pCgpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAyMzljZGE2 Li5mYzExM2QwIDEwMDY0NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEwLTA2LTE0ICBNYXJpbyBTYW5jaGV6IFByYWRh ICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBEb24ndCBzaHJpbmsgYnkgZGVmYXVsdCBhbHdheXMgd2hlbiB6b29t IGluL291dCBpcyBlbmFibGVkIGZvciBzdGFuZGFsb25lIGltYWdlcworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI4MDEKKworICAgICAgICBBZGQgYSBu ZXcgc2V0dGluZyB0byBjb250cm9sIHdoZXRoZXIgYW4gc3RhbmRhbG9uZSBpbWFnZSBnZXRzCisg ICAgICAgIHNocnVuayBieSBkZWZhdWx0IHdoZW4gc2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNUb0Zp dCBpcyB0cnVlLgorCisgICAgICAgICogbG9hZGVyL0ltYWdlRG9jdW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudDo6SW1hZ2VEb2N1bWVudCk6CisgICAgICAgIChXZWJD b3JlOjpJbWFnZURvY3VtZW50OjppbWFnZUNsaWNrZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1h Z2VEb2N1bWVudDo6d2luZG93U2l6ZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VE b2N1bWVudDo6c2hvdWxkU2hyaW5rSW5pdGlhbGx5KToKKyAgICAgICAgKiBsb2FkZXIvSW1hZ2VE b2N1bWVudC5oOgorICAgICAgICAqIHBhZ2UvU2V0dGluZ3MuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6U2V0dGluZ3M6OnNldFNocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KToKKyAgICAg ICAgKiBwYWdlL1NldHRpbmdzLmg6CisgICAgICAgIChXZWJDb3JlOjpTZXR0aW5nczo6c2hyaW5r c1N0YW5kYWxvbmVJbWFnZXNJbml0aWFsbHkpOgorCiAyMDEwLTA2LTEzICBBbmRlcnMgQmFra2Vu ICA8YWdiYWtrZW5AZ21haWwuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVs LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5jcHAgYi9XZWJDb3Jl L2xvYWRlci9JbWFnZURvY3VtZW50LmNwcAppbmRleCA4YWI0MTJmLi4zNThiOWU5IDEwMDY0NAot LS0gYS9XZWJDb3JlL2xvYWRlci9JbWFnZURvY3VtZW50LmNwcAorKysgYi9XZWJDb3JlL2xvYWRl ci9JbWFnZURvY3VtZW50LmNwcApAQCAtMTg4LDYgKzE4OCw3IEBAIEltYWdlRG9jdW1lbnQ6Oklt YWdlRG9jdW1lbnQoRnJhbWUqIGZyYW1lKQogICAgICwgbV9pbWFnZVNpemVJc0tub3duKGZhbHNl KQogICAgICwgbV9kaWRTaHJpbmtJbWFnZShmYWxzZSkKICAgICAsIG1fc2hvdWxkU2hyaW5rSW1h Z2Uoc2hvdWxkU2hyaW5rVG9GaXQoKSkKKyAgICAsIG1fc2hvdWxkU2hyaW5rSW1hZ2VJbml0aWFs bHkoc2hvdWxkU2hyaW5rSW5pdGlhbGx5KCkpCiB7CiAgICAgc2V0UGFyc2VNb2RlKENvbXBhdCk7 CiB9CkBAIC0yNjcsOCArMjY4LDEwIEBAIHZvaWQgSW1hZ2VEb2N1bWVudDo6aW1hZ2VDbGlja2Vk KGludCB4LCBpbnQgeSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9zaG91bGRTaHJpbmtJbWFn ZSA9ICFtX3Nob3VsZFNocmlua0ltYWdlOwotICAgIAotICAgIGlmIChtX3Nob3VsZFNocmlua0lt YWdlKQorCisgICAgYm9vbCByZWFsbHlTaG91bGRTaHJpbmsgPSBtX3Nob3VsZFNocmlua0ltYWdl SW5pdGlhbGx5ID8gbV9zaG91bGRTaHJpbmtJbWFnZSA6ICFtX3Nob3VsZFNocmlua0ltYWdlOwor CisgICAgaWYgKHJlYWxseVNob3VsZFNocmluaykKICAgICAgICAgd2luZG93U2l6ZUNoYW5nZWQo KTsKICAgICBlbHNlIHsKICAgICAgICAgcmVzdG9yZUltYWdlU2l6ZSgpOwpAQCAtMzM4LDEwICsz NDEsMTEgQEAgdm9pZCBJbWFnZURvY3VtZW50Ojp3aW5kb3dTaXplQ2hhbmdlZCgpCiAgICAgICAg IHJldHVybjsKIAogICAgIGJvb2wgZml0c0luV2luZG93ID0gaW1hZ2VGaXRzSW5XaW5kb3coKTsK LSAgICAKKyAgICBib29sIHJlYWxseVNob3VsZFNocmluayA9IG1fc2hvdWxkU2hyaW5rSW1hZ2VJ bml0aWFsbHkgPyBtX3Nob3VsZFNocmlua0ltYWdlIDogIW1fc2hvdWxkU2hyaW5rSW1hZ2U7CisK ICAgICAvLyBJZiB0aGUgaW1hZ2UgaGFzIGJlZW4gZXhwbGljaXRseSB6b29tZWQgaW4sIHJlc3Rv cmUgdGhlIGN1cnNvciBpZiB0aGUgaW1hZ2UgZml0cwogICAgIC8vIGFuZCBzZXQgaXQgdG8gYSB6 b29tIG91dCBjdXJzb3IgaWYgdGhlIGltYWdlIGRvZXNuJ3QgZml0Ci0gICAgaWYgKCFtX3Nob3Vs ZFNocmlua0ltYWdlKSB7CisgICAgaWYgKCFyZWFsbHlTaG91bGRTaHJpbmspIHsKICAgICAgICAg RXhjZXB0aW9uQ29kZSBlYzsKICAgICAgICAgCiAgICAgICAgIGlmIChmaXRzSW5XaW5kb3cpCkBA IC0zODEsNiArMzg1LDExIEBAIGJvb2wgSW1hZ2VEb2N1bWVudDo6c2hvdWxkU2hyaW5rVG9GaXQo KSBjb25zdAogICAgICAgICBmcmFtZSgpLT5wYWdlKCktPm1haW5GcmFtZSgpID09IGZyYW1lKCk7 CiB9CiAKK2Jvb2wgSW1hZ2VEb2N1bWVudDo6c2hvdWxkU2hyaW5rSW5pdGlhbGx5KCkgY29uc3QK K3sKKyAgICByZXR1cm4gZnJhbWUoKS0+cGFnZSgpLT5zZXR0aW5ncygpLT5zaHJpbmtzU3RhbmRh bG9uZUltYWdlc0luaXRpYWxseSgpOworfQorCiAvLyAtLS0tLS0tLQogCiB2b2lkIEltYWdlRXZl bnRMaXN0ZW5lcjo6aGFuZGxlRXZlbnQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIEV2ZW50KiBl dmVudCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuaCBiL1dlYkNv cmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuaAppbmRleCBiZDYyN2I0Li42YTJhMTEyIDEwMDY0NAot LS0gYS9XZWJDb3JlL2xvYWRlci9JbWFnZURvY3VtZW50LmgKKysrIGIvV2ViQ29yZS9sb2FkZXIv SW1hZ2VEb2N1bWVudC5oCkBAIC01Nyw2ICs1Nyw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZXN0 b3JlSW1hZ2VTaXplKCk7CiAgICAgYm9vbCBpbWFnZUZpdHNJbldpbmRvdygpIGNvbnN0OwogICAg IGJvb2wgc2hvdWxkU2hyaW5rVG9GaXQoKSBjb25zdDsKKyAgICBib29sIHNob3VsZFNocmlua0lu aXRpYWxseSgpIGNvbnN0OwogICAgIGZsb2F0IHNjYWxlKCkgY29uc3Q7CiAgICAgCiAgICAgSW1h Z2VEb2N1bWVudEVsZW1lbnQqIG1faW1hZ2VFbGVtZW50OwpAQCAtNjksNiArNzAsOSBAQCBwcml2 YXRlOgogICAgIAogICAgIC8vIFdoZXRoZXIgdGhlIGltYWdlIHNob3VsZCBiZSBzaHJ1bmsgb3Ig bm90CiAgICAgYm9vbCBtX3Nob3VsZFNocmlua0ltYWdlOworCisgICAgLy8gV2hldGhlciB0aGUg aW1hZ2Ugc2hvdWxkIGJlIGluaXRpYWxseSBzaHJ1bmsgb3Igbm90CisgICAgYm9vbCBtX3Nob3Vs ZFNocmlua0ltYWdlSW5pdGlhbGx5OwogfTsKICAgICAKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUv cGFnZS9TZXR0aW5ncy5jcHAgYi9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuY3BwCmluZGV4IGMxOWE5 YTIuLmZlMjg1NTMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGFnZS9TZXR0aW5ncy5jcHAKKysrIGIv V2ViQ29yZS9wYWdlL1NldHRpbmdzLmNwcApAQCAtNDE2LDYgKzQxNiwxMSBAQCB2b2lkIFNldHRp bmdzOjpzZXRTaHJpbmtzU3RhbmRhbG9uZUltYWdlc1RvRml0KGJvb2wgc2hyaW5rc1N0YW5kYWxv bmVJbWFnZXNUb0ZpdAogICAgIG1fc2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNUb0ZpdCA9IHNocmlu a3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQ7CiB9CiAKK3ZvaWQgU2V0dGluZ3M6OnNldFNocmlua3NT dGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KGJvb2wgc2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNJbml0 aWFsbHkpCit7CisgICAgbV9zaHJpbmtzU3RhbmRhbG9uZUltYWdlc0luaXRpYWxseSA9IHNocmlu a3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5OworfQorCiB2b2lkIFNldHRpbmdzOjpzZXRTaG93 c1VSTHNJblRvb2xUaXBzKGJvb2wgc2hvd3NVUkxzSW5Ub29sVGlwcykKIHsKICAgICBtX3Nob3dz VVJMc0luVG9vbFRpcHMgPSBzaG93c1VSTHNJblRvb2xUaXBzOwpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9wYWdlL1NldHRpbmdzLmggYi9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAppbmRleCA0ZmJiOWYy Li5mYjViMjNmIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BhZ2UvU2V0dGluZ3MuaAorKysgYi9XZWJD b3JlL3BhZ2UvU2V0dGluZ3MuaApAQCAtMTk2LDYgKzE5Niw5IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgdm9pZCBzZXRTaHJpbmtzU3RhbmRhbG9uZUltYWdlc1RvRml0KGJvb2wpOwog ICAgICAgICBib29sIHNocmlua3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQoKSBjb25zdCB7IHJldHVy biBtX3Nocmlua3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQ7IH0KIAorICAgICAgICB2b2lkIHNldFNo cmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KGJvb2wpOworICAgICAgICBib29sIHNocmlu a3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KCkgY29uc3QgeyByZXR1cm4gbV9zaHJpbmtzU3Rh bmRhbG9uZUltYWdlc0luaXRpYWxseTsgfQorCiAgICAgICAgIHZvaWQgc2V0U2hvd3NVUkxzSW5U b29sVGlwcyhib29sKTsKICAgICAgICAgYm9vbCBzaG93c1VSTHNJblRvb2xUaXBzKCkgY29uc3Qg eyByZXR1cm4gbV9zaG93c1VSTHNJblRvb2xUaXBzOyB9CiAKQEAgLTM1Myw2ICszNTYsNyBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgbV9uZWVkc1RpZ2VyTWFpbFF1aXJrcyA6 IDE7CiAgICAgICAgIGJvb2wgbV9pc0RPTVBhc3RlQWxsb3dlZCA6IDE7CiAgICAgICAgIGJvb2wg bV9zaHJpbmtzU3RhbmRhbG9uZUltYWdlc1RvRml0IDogMTsKKyAgICAgICAgYm9vbCBtX3Nocmlu a3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5IDogMTsKICAgICAgICAgYm9vbCBtX3VzZXNQYWdl Q2FjaGU6IDE7CiAgICAgICAgIGJvb2wgbV9zaG93c1VSTHNJblRvb2xUaXBzIDogMTsKICAgICAg ICAgYm9vbCBtX2ZvcmNlRlRQRGlyZWN0b3J5TGlzdGluZ3MgOiAxOwpkaWZmIC0tZ2l0IGEvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCAyNDM2NTFmLi4z ZTk4ZGZjIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEwLTA2LTE0ICBNYXJpbyBTYW5jaGV6IFBy YWRhICA8bXNhbmNoZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBEb24ndCBzaHJpbmsgYnkgZGVmYXVsdCBhbHdheXMgd2hlbiB6 b29tIGluL291dCBpcyBlbmFibGVkIGZvciBzdGFuZGFsb25lIGltYWdlcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzI4MDEKKworICAgICAgICBBZGQg YSBuZXcgc2V0dGluZyB0byBjb250cm9sIHdoZXRoZXIgYW4gc3RhbmRhbG9uZSBpbWFnZSBnZXRz CisgICAgICAgIHNocnVuayBieSBkZWZhdWx0IHdoZW4gc2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNU b0ZpdCBpcyB0cnVlLgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcDoK KyAgICAgICAgKHdlYmtpdF93ZWJfc2V0dGluZ3NfY2xhc3NfaW5pdCk6CisgICAgICAgICh3ZWJr aXRfd2ViX3NldHRpbmdzX3NldF9wcm9wZXJ0eSk6CisgICAgICAgICh3ZWJraXRfd2ViX3NldHRp bmdzX2dldF9wcm9wZXJ0eSk6CisgICAgICAgICh3ZWJraXRfd2ViX3NldHRpbmdzX2NvcHkpOgor ICAgICAgICAqIHdlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdF93ZWJf dmlld191cGRhdGVfc2V0dGluZ3MpOgorCiAyMDEwLTA2LTEwICBFcmljIFNlaWRlbCAgPGVyaWNA d2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0 IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwIGIvV2ViS2l0L2d0ay93 ZWJraXQvd2Via2l0d2Vic2V0dGluZ3MuY3BwCmluZGV4IGQ2MWYzZmYuLjlhODZmMWMgMTAwNjQ0 Ci0tLSBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnNldHRpbmdzLmNwcAorKysgYi9XZWJL aXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJzZXR0aW5ncy5jcHAKQEAgLTc4LDYgKzc4LDcgQEAgc3Ry dWN0IF9XZWJLaXRXZWJTZXR0aW5nc1ByaXZhdGUgewogICAgIGdib29sZWFuIGVuZm9yY2VfOTZf ZHBpOwogICAgIGdib29sZWFuIGF1dG9fbG9hZF9pbWFnZXM7CiAgICAgZ2Jvb2xlYW4gYXV0b19z aHJpbmtfaW1hZ2VzOworICAgIGdib29sZWFuIGF1dG9fc2hyaW5rX2ltYWdlc19pbml0aWFsbHk7 CiAgICAgZ2Jvb2xlYW4gcHJpbnRfYmFja2dyb3VuZHM7CiAgICAgZ2Jvb2xlYW4gZW5hYmxlX3Nj cmlwdHM7CiAgICAgZ2Jvb2xlYW4gZW5hYmxlX3BsdWdpbnM7CkBAIC0xMjksNiArMTMwLDcgQEAg ZW51bSB7CiAgICAgUFJPUF9FTkZPUkNFXzk2X0RQSSwKICAgICBQUk9QX0FVVE9fTE9BRF9JTUFH RVMsCiAgICAgUFJPUF9BVVRPX1NIUklOS19JTUFHRVMsCisgICAgUFJPUF9BVVRPX1NIUklOS19J TUFHRVNfSU5JVElBTExZLAogICAgIFBST1BfUFJJTlRfQkFDS0dST1VORFMsCiAgICAgUFJPUF9F TkFCTEVfU0NSSVBUUywKICAgICBQUk9QX0VOQUJMRV9QTFVHSU5TLApAQCAtMzcyLDYgKzM3NCwx NiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3NldHRpbmdzX2NsYXNzX2luaXQoV2ViS2l0V2Vi U2V0dGluZ3NDbGFzcyoga2xhc3MpCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBmbGFncykpOwogCiAgICAgZ19vYmplY3RfY2xhc3NfaW5zdGFsbF9wcm9wZXJ0eShnb2JqZWN0 X2NsYXNzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUFJPUF9BVVRPX1NI UklOS19JTUFHRVNfSU5JVElBTExZLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgZ19wYXJhbV9zcGVjX2Jvb2xlYW4oCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAiYXV0by1zaHJpbmstaW1hZ2VzLWluaXRpYWxseSIsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBfKCJBdXRvIFNocmluayBJbWFnZXMgSW5pdGlhbGx5IiksCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJBdXRvbWF0aWNhbGx5IHNocmluayBz dGFuZGFsb25lIGltYWdlcyAiCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJyaWdodCBhZnRlciB0aGV5J3JlIGxvYWRlZCBmb3IgdGhlIGZpcnN0IHRpbWUuIiksCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUUlVFLAorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgZmxhZ3MpKTsKKworICAgIGdfb2JqZWN0X2NsYXNzX2luc3RhbGxf cHJvcGVydHkoZ29iamVjdF9jbGFzcywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFBST1BfUFJJTlRfQkFDS0dST1VORFMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBnX3BhcmFtX3NwZWNfYm9vbGVhbigKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJwcmludC1iYWNrZ3JvdW5kcyIsCkBAIC05NjMsNiArOTc1LDkgQEAgc3RhdGlj IHZvaWQgd2Via2l0X3dlYl9zZXR0aW5nc19zZXRfcHJvcGVydHkoR09iamVjdCogb2JqZWN0LCBn dWludCBwcm9wX2lkLCBjb24KICAgICBjYXNlIFBST1BfQVVUT19TSFJJTktfSU1BR0VTOgogICAg ICAgICBwcml2LT5hdXRvX3Nocmlua19pbWFnZXMgPSBnX3ZhbHVlX2dldF9ib29sZWFuKHZhbHVl KTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX0FVVE9fU0hSSU5LX0lNQUdFU19JTklU SUFMTFk6CisgICAgICAgIHByaXYtPmF1dG9fc2hyaW5rX2ltYWdlc19pbml0aWFsbHkgPSBnX3Zh bHVlX2dldF9ib29sZWFuKHZhbHVlKTsKKyAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBQUk9QX1BS SU5UX0JBQ0tHUk9VTkRTOgogICAgICAgICBwcml2LT5wcmludF9iYWNrZ3JvdW5kcyA9IGdfdmFs dWVfZ2V0X2Jvb2xlYW4odmFsdWUpOwogICAgICAgICBicmVhazsKQEAgLTExMzEsNiArMTE0Niw5 IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfc2V0dGluZ3NfZ2V0X3Byb3BlcnR5KEdPYmplY3Qq IG9iamVjdCwgZ3VpbnQgcHJvcF9pZCwgR1ZhCiAgICAgY2FzZSBQUk9QX0FVVE9fU0hSSU5LX0lN QUdFUzoKICAgICAgICAgZ192YWx1ZV9zZXRfYm9vbGVhbih2YWx1ZSwgcHJpdi0+YXV0b19zaHJp bmtfaW1hZ2VzKTsKICAgICAgICAgYnJlYWs7CisgICAgY2FzZSBQUk9QX0FVVE9fU0hSSU5LX0lN QUdFU19JTklUSUFMTFk6CisgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFsdWUsIHByaXYt PmF1dG9fc2hyaW5rX2ltYWdlc19pbml0aWFsbHkpOworICAgICAgICBicmVhazsKICAgICBjYXNl IFBST1BfUFJJTlRfQkFDS0dST1VORFM6CiAgICAgICAgIGdfdmFsdWVfc2V0X2Jvb2xlYW4odmFs dWUsIHByaXYtPnByaW50X2JhY2tncm91bmRzKTsKICAgICAgICAgYnJlYWs7CkBAIC0xMjYyLDYg KzEyODAsNyBAQCBXZWJLaXRXZWJTZXR0aW5ncyogd2Via2l0X3dlYl9zZXR0aW5nc19jb3B5KFdl YktpdFdlYlNldHRpbmdzKiB3ZWJfc2V0dGluZ3MpCiAgICAgICAgICAgICAgICAgICJtaW5pbXVt LWxvZ2ljYWwtZm9udC1zaXplIiwgcHJpdi0+bWluaW11bV9sb2dpY2FsX2ZvbnRfc2l6ZSwKICAg ICAgICAgICAgICAgICAgImF1dG8tbG9hZC1pbWFnZXMiLCBwcml2LT5hdXRvX2xvYWRfaW1hZ2Vz LAogICAgICAgICAgICAgICAgICAiYXV0by1zaHJpbmstaW1hZ2VzIiwgcHJpdi0+YXV0b19zaHJp bmtfaW1hZ2VzLAorICAgICAgICAgICAgICAgICAiYXV0by1zaHJpbmstaW1hZ2VzLWluaXRpYWxs eSIsIHByaXYtPmF1dG9fc2hyaW5rX2ltYWdlc19pbml0aWFsbHksCiAgICAgICAgICAgICAgICAg ICJwcmludC1iYWNrZ3JvdW5kcyIsIHByaXYtPnByaW50X2JhY2tncm91bmRzLAogICAgICAgICAg ICAgICAgICAiZW5hYmxlLXNjcmlwdHMiLCBwcml2LT5lbmFibGVfc2NyaXB0cywKICAgICAgICAg ICAgICAgICAgImVuYWJsZS1wbHVnaW5zIiwgcHJpdi0+ZW5hYmxlX3BsdWdpbnMsCmRpZmYgLS1n aXQgYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcCBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwCmluZGV4IDY3NDQ3MzIuLjZiNzIyNjYgMTAwNjQ0Ci0tLSBh L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwCisrKyBiL1dlYktpdC9ndGsvd2Vi a2l0L3dlYmtpdHdlYnZpZXcuY3BwCkBAIC0yNjY2LDcgKzI2NjYsNyBAQCBzdGF0aWMgdm9pZCB3 ZWJraXRfd2ViX3ZpZXdfdXBkYXRlX3NldHRpbmdzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcpCiAg ICAgU2V0dGluZ3MqIHNldHRpbmdzID0gY29yZSh3ZWJWaWV3KS0+c2V0dGluZ3MoKTsKIAogICAg IGdjaGFyKiBkZWZhdWx0RW5jb2RpbmcsICpjdXJzaXZlRm9udEZhbWlseSwgKmRlZmF1bHRGb250 RmFtaWx5LCAqZmFudGFzeUZvbnRGYW1pbHksICptb25vc3BhY2VGb250RmFtaWx5LCAqc2Fuc1Nl cmlmRm9udEZhbWlseSwgKnNlcmlmRm9udEZhbWlseSwgKnVzZXJTdHlsZXNoZWV0VXJpOwotICAg IGdib29sZWFuIGF1dG9Mb2FkSW1hZ2VzLCBhdXRvU2hyaW5rSW1hZ2VzLCBwcmludEJhY2tncm91 bmRzLAorICAgIGdib29sZWFuIGF1dG9Mb2FkSW1hZ2VzLCBhdXRvU2hyaW5rSW1hZ2VzLCBhdXRv U2hyaW5rSW1hZ2VzSW5pdGlhbGx5LCBwcmludEJhY2tncm91bmRzLAogICAgICAgICBlbmFibGVT Y3JpcHRzLCBlbmFibGVQbHVnaW5zLCBlbmFibGVEZXZlbG9wZXJFeHRyYXMsIHJlc2l6YWJsZVRl eHRBcmVhcywKICAgICAgICAgZW5hYmxlUHJpdmF0ZUJyb3dzaW5nLCBlbmFibGVDYXJldEJyb3dz aW5nLCBlbmFibGVIVE1MNURhdGFiYXNlLCBlbmFibGVIVE1MNUxvY2FsU3RvcmFnZSwKICAgICAg ICAgZW5hYmxlWFNTQXVkaXRvciwgZW5hYmxlU3BhdGlhbE5hdmlnYXRpb24sIGphdmFzY3JpcHRD YW5PcGVuV2luZG93cywKQEAgLTI2ODcsNiArMjY4Nyw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93 ZWJfdmlld191cGRhdGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICAgICAg ICAgICAgICAgInNlcmlmLWZvbnQtZmFtaWx5IiwgJnNlcmlmRm9udEZhbWlseSwKICAgICAgICAg ICAgICAgICAgImF1dG8tbG9hZC1pbWFnZXMiLCAmYXV0b0xvYWRJbWFnZXMsCiAgICAgICAgICAg ICAgICAgICJhdXRvLXNocmluay1pbWFnZXMiLCAmYXV0b1Nocmlua0ltYWdlcywKKyAgICAgICAg ICAgICAgICAgImF1dG8tc2hyaW5rLWltYWdlcy1pbml0aWFsbHkiLCAmYXV0b1Nocmlua0ltYWdl c0luaXRpYWxseSwKICAgICAgICAgICAgICAgICAgInByaW50LWJhY2tncm91bmRzIiwgJnByaW50 QmFja2dyb3VuZHMsCiAgICAgICAgICAgICAgICAgICJlbmFibGUtc2NyaXB0cyIsICZlbmFibGVT Y3JpcHRzLAogICAgICAgICAgICAgICAgICAiZW5hYmxlLXBsdWdpbnMiLCAmZW5hYmxlUGx1Z2lu cywKQEAgLTI3MjEsNiArMjcyMiw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF93ZWJfdmlld191cGRh dGVfc2V0dGluZ3MoV2ViS2l0V2ViVmlldyogd2ViVmlldykKICAgICBzZXR0aW5ncy0+c2V0U2Vy aWZGb250RmFtaWx5KHNlcmlmRm9udEZhbWlseSk7CiAgICAgc2V0dGluZ3MtPnNldExvYWRzSW1h Z2VzQXV0b21hdGljYWxseShhdXRvTG9hZEltYWdlcyk7CiAgICAgc2V0dGluZ3MtPnNldFNocmlu a3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQoYXV0b1Nocmlua0ltYWdlcyk7CisgICAgc2V0dGluZ3Mt PnNldFNocmlua3NTdGFuZGFsb25lSW1hZ2VzSW5pdGlhbGx5KGF1dG9TaHJpbmtJbWFnZXNJbml0 aWFsbHkpOwogICAgIHNldHRpbmdzLT5zZXRTaG91bGRQcmludEJhY2tncm91bmRzKHByaW50QmFj a2dyb3VuZHMpOwogICAgIHNldHRpbmdzLT5zZXRKYXZhU2NyaXB0RW5hYmxlZChlbmFibGVTY3Jp cHRzKTsKICAgICBzZXR0aW5ncy0+c2V0UGx1Z2luc0VuYWJsZWQoZW5hYmxlUGx1Z2lucyk7Ci0t IAoxLjcuMC40Cgo= 58662 2010-06-14 09:33:12 -0700 2010-10-10 11:22:47 -0700 Patch for proposal 2 0001-32801-v2.patch text/plain 3845 mario RnJvbSAwYjA3Yjc4MmJjNGU4MjgyMjQwYjYzZDJjNTRmNDc0ZGJiMTNkY2U4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBNYXJpbyBTYW5jaGV6IFByYWRhIDxtc2FuY2hlekBpZ2FsaWEu Y29tPgpEYXRlOiBNb24sIDE0IEp1biAyMDEwIDE4OjI3OjQwICswMjAwClN1YmplY3Q6IFtQQVRD SF0gMjAxMC0wNi0xNCAgTWFyaW8gU2FuY2hleiBQcmFkYSAgPG1zYW5jaGV6QGlnYWxpYS5jb20+ CgogICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKICAgICAgICBEb24ndCBzaHJp bmsgYnkgZGVmYXVsdCBhbHdheXMgd2hlbiB6b29tIGluL291dCBpcyBlbmFibGVkIGZvciBzdGFu ZGFsb25lIGltYWdlcwogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zMjgwMQoKICAgICAgICBNYWtlIHNocmlua3NTdGFuZGFsb25lSW1hZ2VzVG9GaXQgY29u dHJvbCBvbmx5IHdoZXRoZXIgYW4KICAgICAgICBzdGFuZGFsb25lIGltYWdlIGdldHMgc2hydW5r IGJ5IGRlZmF1bHQgYW5kIGFsd2F5cyBpbnN0YWxsCiAgICAgICAgbmVlZGVkIGhhbmRsZXJzIHRv IHpvb20gaW4vb3V0IHRoZSBpbWFnZSBieSBjbGlja2luZyBvbiBpdAoKICAgICAgICAqIGxvYWRl ci9JbWFnZURvY3VtZW50LmNwcDoKICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudDo6Y3Jl YXRlRG9jdW1lbnRTdHJ1Y3R1cmUpOgogICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50Ojpp bWFnZUNsaWNrZWQpOgogICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50OjppbWFnZUNoYW5n ZWQpOgogICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3VtZW50Ojp3aW5kb3dTaXplQ2hhbmdlZCk6 CiAgICAgICAgKiBsb2FkZXIvSW1hZ2VEb2N1bWVudC5oOgotLS0KIFdlYkNvcmUvQ2hhbmdlTG9n ICAgICAgICAgICAgICAgIHwgICAxOCArKysrKysrKysrKysrKysrKysKIFdlYkNvcmUvbG9hZGVy L0ltYWdlRG9jdW1lbnQuY3BwIHwgICAxOCArKysrKysrLS0tLS0tLS0tLS0KIFdlYkNvcmUvbG9h ZGVyL0ltYWdlRG9jdW1lbnQuaCAgIHwgICAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAyNiBpbnNl cnRpb25zKCspLCAxMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDIzOWNkYTYuLjBlMGZmNjggMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEg QEAKKzIwMTAtMDYtMTQgIE1hcmlvIFNhbmNoZXogUHJhZGEgIDxtc2FuY2hlekBpZ2FsaWEuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0 IHNocmluayBieSBkZWZhdWx0IGFsd2F5cyB3aGVuIHpvb20gaW4vb3V0IGlzIGVuYWJsZWQgZm9y IHN0YW5kYWxvbmUgaW1hZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMjgwMQorCisgICAgICAgIE1ha2Ugc2hyaW5rc1N0YW5kYWxvbmVJbWFnZXNU b0ZpdCBjb250cm9sIG9ubHkgd2hldGhlciBhbgorICAgICAgICBzdGFuZGFsb25lIGltYWdlIGdl dHMgc2hydW5rIGJ5IGRlZmF1bHQgYW5kIGFsd2F5cyBpbnN0YWxsCisgICAgICAgIG5lZWRlZCBo YW5kbGVycyB0byB6b29tIGluL291dCB0aGUgaW1hZ2UgYnkgY2xpY2tpbmcgb24gaXQKKworICAg ICAgICAqIGxvYWRlci9JbWFnZURvY3VtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdl RG9jdW1lbnQ6OmNyZWF0ZURvY3VtZW50U3RydWN0dXJlKToKKyAgICAgICAgKFdlYkNvcmU6Oklt YWdlRG9jdW1lbnQ6OmltYWdlQ2xpY2tlZCk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZURvY3Vt ZW50OjppbWFnZUNoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VEb2N1bWVudDo6d2lu ZG93U2l6ZUNoYW5nZWQpOgorICAgICAgICAqIGxvYWRlci9JbWFnZURvY3VtZW50Lmg6CisKIDIw MTAtMDYtMTMgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFpbC5jb20+CiAKICAgICAgICAg UmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9JbWFn ZURvY3VtZW50LmNwcCBiL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuY3BwCmluZGV4IDhh YjQxMmYuLjk3NTI3NjQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQu Y3BwCisrKyBiL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuY3BwCkBAIC0yMTcsMTMgKzIx NywxMSBAQCB2b2lkIEltYWdlRG9jdW1lbnQ6OmNyZWF0ZURvY3VtZW50U3RydWN0dXJlKCkKICAg ICAKICAgICBib2R5LT5hcHBlbmRDaGlsZChpbWFnZUVsZW1lbnQsIGVjKTsKICAgICAKLSAgICBp ZiAoc2hvdWxkU2hyaW5rVG9GaXQoKSkgewotICAgICAgICAvLyBBZGQgZXZlbnQgbGlzdGVuZXJz Ci0gICAgICAgIFJlZlB0cjxFdmVudExpc3RlbmVyPiBsaXN0ZW5lciA9IEltYWdlRXZlbnRMaXN0 ZW5lcjo6Y3JlYXRlKHRoaXMpOwotICAgICAgICBpZiAoRE9NV2luZG93KiBkb21XaW5kb3cgPSB0 aGlzLT5kb21XaW5kb3coKSkKLSAgICAgICAgICAgIGRvbVdpbmRvdy0+YWRkRXZlbnRMaXN0ZW5l cigicmVzaXplIiwgbGlzdGVuZXIsIGZhbHNlKTsKLSAgICAgICAgaW1hZ2VFbGVtZW50LT5hZGRF dmVudExpc3RlbmVyKCJjbGljayIsIGxpc3RlbmVyLnJlbGVhc2UoKSwgZmFsc2UpOwotICAgIH0K KyAgICAvLyBBZGQgZXZlbnQgbGlzdGVuZXJzCisgICAgUmVmUHRyPEV2ZW50TGlzdGVuZXI+IGxp c3RlbmVyID0gSW1hZ2VFdmVudExpc3RlbmVyOjpjcmVhdGUodGhpcyk7CisgICAgaWYgKERPTVdp bmRvdyogZG9tV2luZG93ID0gdGhpcy0+ZG9tV2luZG93KCkpCisgICAgICAgIGRvbVdpbmRvdy0+ YWRkRXZlbnRMaXN0ZW5lcigicmVzaXplIiwgbGlzdGVuZXIsIGZhbHNlKTsKKyAgICBpbWFnZUVs ZW1lbnQtPmFkZEV2ZW50TGlzdGVuZXIoImNsaWNrIiwgbGlzdGVuZXIucmVsZWFzZSgpLCBmYWxz ZSk7CiAKICAgICBtX2ltYWdlRWxlbWVudCA9IGltYWdlRWxlbWVudC5nZXQoKTsKIH0KQEAgLTI5 NiwxMCArMjk0LDggQEAgdm9pZCBJbWFnZURvY3VtZW50OjppbWFnZUNoYW5nZWQoKQogICAgIAog ICAgIG1faW1hZ2VTaXplSXNLbm93biA9IHRydWU7CiAgICAgCi0gICAgaWYgKHNob3VsZFNocmlu a1RvRml0KCkpIHsKLSAgICAgICAgLy8gRm9yY2UgcmVzaXppbmcgb2YgdGhlIGltYWdlCi0gICAg ICAgIHdpbmRvd1NpemVDaGFuZ2VkKCk7Ci0gICAgfQorICAgIC8vIEZvcmNlIHJlc2l6aW5nIG9m IHRoZSBpbWFnZQorICAgIHdpbmRvd1NpemVDaGFuZ2VkKCk7CiB9CiAKIHZvaWQgSW1hZ2VEb2N1 bWVudDo6cmVzdG9yZUltYWdlU2l6ZSgpCmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9JbWFn ZURvY3VtZW50LmggYi9XZWJDb3JlL2xvYWRlci9JbWFnZURvY3VtZW50LmgKaW5kZXggYmQ2Mjdi NC4uNWJjMWYyMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvSW1hZ2VEb2N1bWVudC5oCisr KyBiL1dlYkNvcmUvbG9hZGVyL0ltYWdlRG9jdW1lbnQuaApAQCAtNjcsNyArNjcsNyBAQCBwcml2 YXRlOgogICAgIC8vIFdoZXRoZXIgdGhlIGltYWdlIGlzIHNocnVuayB0byBmaXQgb3Igbm90CiAg ICAgYm9vbCBtX2RpZFNocmlua0ltYWdlOwogICAgIAotICAgIC8vIFdoZXRoZXIgdGhlIGltYWdl IHNob3VsZCBiZSBzaHJ1bmsgb3Igbm90CisgICAgLy8gV2hldGhlciB0aGUgaW1hZ2Ugc2hvdWxk IGJlIHNocnVuayBvciBub3QgYnkgZGVmYXVsdAogICAgIGJvb2wgbV9zaG91bGRTaHJpbmtJbWFn ZTsKIH07CiAgICAgCi0tIAoxLjcuMC40Cgo=