59697 2011-04-28 06:42:19 -0700 [Soup] does not load css stylesheets without content-type 2011-04-28 11:24:57 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED http://open.mapquest.co.uk/ P2 Normal --- 0 a.renevier webkit-unassigned abarth commit-queue eric webkit.review.bot oldest_to_newest 394400 0 a.renevier 2011-04-28 06:42:19 -0700 Hi, when a css stylesheet has no content-type, and a random file extension (such as php), that css sheet is not loaded. This happens for example with http://open.mapquest.co.uk/ : site fails with webkit/gtk but fails with other browsers. In CachedCSSStyleSheet::canUseSheet, there is following comment: // Note that we grab the Content-Type // header directly because we want to see what the value is BEFORE content // sniffing. So, it looks like Content-Type header should match official Content-Type, but soup backend replaces it with the sniffed one. So may be, sniffed Content-Type should be kept in a separate variable, and not be injected into soup message headers. 394411 1 91487 a.renevier 2011-04-28 07:08:05 -0700 Created attachment 91487 Patch patch attempt 394421 2 91489 a.renevier 2011-04-28 07:35:50 -0700 Created attachment 91489 patch v1.1 prevents a memory leak 394423 3 91489 gustavo 2011-04-28 07:47:01 -0700 Comment on attachment 91489 patch v1.1 View in context: https://bugs.webkit.org/attachment.cgi?id=91489&action=review Just a style nit. > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:345 > + soup_header_g_string_append_param(str, (const char*) key, (const char*) value); This should use C++-style casts like this: static_cast<const char*>(key). 394424 4 91490 a.renevier 2011-04-28 07:54:26 -0700 Created attachment 91490 patch v1.2 fixes style 394434 5 91493 a.renevier 2011-04-28 08:14:16 -0700 Created attachment 91493 patch v1.3 fixes style 394435 6 91493 gustavo 2011-04-28 08:18:37 -0700 Comment on attachment 91493 patch v1.3 Great work, thanks! 394543 7 commit-queue 2011-04-28 10:47:47 -0700 The commit-queue encountered the following flaky tests while processing attachment 91493: http/tests/xmlhttprequest/cross-origin-authorization.html bug 52398 (author: ap@webkit.org) The commit-queue is continuing to process your patch. 394547 8 91493 commit-queue 2011-04-28 10:49:31 -0700 Comment on attachment 91493 patch v1.3 Clearing flags on attachment: 91493 Committed r85207: <http://trac.webkit.org/changeset/85207> 394548 9 commit-queue 2011-04-28 10:49:36 -0700 All reviewed patches have been landed. Closing bug. 394577 10 webkit.review.bot 2011-04-28 11:24:57 -0700 http://trac.webkit.org/changeset/85207 might have broken SnowLeopard Intel Release (Tests) 91487 2011-04-28 07:08:05 -0700 2011-04-28 07:35:42 -0700 Patch bug-59697-20110428160803.patch text/plain 6644 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogODQ5MTEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxNWZmYTcxNzFjNzM5NzYyNmVjOWQ2 MzYwMzRmNDkyNTkzNGMzMTRmLi4yZjBiMWMzMTU5ODQ0ZWViNmUzMTJkNmNmZTNkNGYyODQwN2Iw OGI3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMjggIEFybm8gUmVuZXZpZXIgIDxh cm5vQHJlbmV2aWVyLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbU291cF0gZG9lcyBub3QgbG9hZCBjc3Mgc3R5bGVzaGVldHMgd2l0aG91dCBj b250ZW50LXR5cGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU5Njk3CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDogRW5hYmxlIG5vdyBw YXNzaW5nIHRlc3RzOgorICAgICAgICAgLSBodHRwL3Rlc3RzL21pbWUvc3RhbmRhcmQtbW9kZS1s b2Fkcy1zdHlsZXNoZWV0LXdpdGgtZW1wdHktY29udGVudC10eXBlLmh0bWwKKyAgICAgICAgIC0g aHR0cC90ZXN0cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVldC13aXRoLXRleHQt Y3NzLWFuZC1pbnZhbGlkLXR5cGUuaHRtbAorCiAyMDExLTA0LTI2ICBLcmlzdMOzZiBLb3N6dHnD syAgPEtvc3p0eW8uS3Jpc3RvZkBzdHVkLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2Vk IGJ5IENzYWJhIE9zenRyb2dvbsOhYy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKaW5kZXggZjc2 NDkxZGQ0NTVmYThjNGMzMWU0NGQ4ZGE3YTg3YjRiZDUxN2EyZC4uOGIxYjBmYWFmMWVjZDU3YmQx Y2I2YjM1MDRjNDFiODE1NTcxNmU0ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKQEAgLTUx Niw4ICs1MTYsNiBAQCBodHRwL3Rlc3RzL2xvYWRpbmcvdGV4dC1jb250ZW50LXR5cGUtd2l0aC1i aW5hcnktZXh0ZW5zaW9uLmh0bWwKIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcGxheS1zdGFsbC1z ZWVrLmh0bWwKIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcGxheS1zdGFsbC5odG1sCiBodHRwL3Rl c3RzL21lZGlhL3ZpZGVvLXNlZWthYmxlLXN0YWxsLmh0bWwKLWh0dHAvdGVzdHMvbWltZS9zdGFu ZGFyZC1tb2RlLWxvYWRzLXN0eWxlc2hlZXQtd2l0aC1lbXB0eS1jb250ZW50LXR5cGUuaHRtbAot aHR0cC90ZXN0cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVldC13aXRoLXRleHQt Y3NzLWFuZC1pbnZhbGlkLXR5cGUuaHRtbAogaHR0cC90ZXN0cy9taXNjL2FjaWQzLmh0bWwKIGh0 dHAvdGVzdHMvbWlzYy9saW5rLXJlbC1wcmVmZXRjaC1hbmQtc3VicmVzb3VyY2UuaHRtbAogaHR0 cC90ZXN0cy9taXNjL3BvbGljeS1kZWxlZ2F0ZS1jYWxsZWQtdHdpY2UuaHRtbApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDA3NGNjOThlMzg5YmU1ZTE4Mzk1NjRjOGQyOGU1YWQ2N2M1MzBmNTMuLjI2NGJiZTEwMTc1 NWEwNjY3OTk5NzYxZWFjYTcwNDg1OWQzYWI3NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBA QAorMjAxMS0wNC0yOCAgQXJubyBSZW5ldmllciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtTb3VwXSBkb2VzIG5v dCBsb2FkIGNzcyBzdHlsZXNoZWV0cyB3aXRob3V0IGNvbnRlbnQtdHlwZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk2OTcKKworICAgICAgICBXaGVu IHNuaWZmaW5nIGNvbnRlbnQgdHlwZSwgZG8gbm90IHJlcGxhY2UgaHR0cCBDb250ZW50LVR5cGUg aGVhZGVyIGluCisgICAgICAgIHNvdXAgbWVzc2FnZSBhbnltb3JlLCBidXQga2VlcCBzbmlmZmVk IGNvbnRlbnQgdHlwZSBpbiBhIHNlcGFyYXRlCisgICAgICAgIHZhcmlhYmxlLgorCisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpjb250ZW50U25pZmZlZENhbGxiYWNrKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZTo6c25pZmZlZENvbnRlbnRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlUmVzcG9uc2U6OnNldFNuaWZmZWRDb250ZW50VHlwZSk6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9zb3VwL1Jlc291cmNlUmVzcG9uc2VTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlUmVzcG9uc2U6OnVwZGF0ZUZyb21Tb3VwTWVzc2FnZSk6CisKIDIwMTEtMDQtMjYg IEdhYm9yIExva2kgIDxsb2tpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ3Nh YmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAppbmRleCBkYzIyZmNhNDEwZmM0 Y2EwYWEwNjU5MWI0MDMxOGY2MjhkOWUxNDU3Li5kNjYzYjY0MmEyMjQwMDhjMjU1ZWEwMWMzNGM5 MjNhNjgwMTAwYWUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtMzE2LDEyICszMTYsNiBA QCBzdGF0aWMgdm9pZCB3cm90ZUJvZHlEYXRhQ2FsbGJhY2soU291cE1lc3NhZ2UqLCBTb3VwQnVm ZmVyKiBidWZmZXIsIGdwb2ludGVyIGRhdAogLy8gVGhpcyBjYWxsYmFjayB3aWxsIG5vdCBiZSBj YWxsZWQgaWYgdGhlIGNvbnRlbnQgc25pZmZlciBpcyBkaXNhYmxlZCBpbiBzdGFydEhUVFBSZXF1 ZXN0Lgogc3RhdGljIHZvaWQgY29udGVudFNuaWZmZWRDYWxsYmFjayhTb3VwTWVzc2FnZSogbXNn LCBjb25zdCBjaGFyKiBzbmlmZmVkVHlwZSwgR0hhc2hUYWJsZSAqcGFyYW1zLCBncG9pbnRlciBk YXRhKQogewotICAgIGlmIChzbmlmZmVkVHlwZSkgewotICAgICAgICBjb25zdCBjaGFyKiBvZmZp Y2lhbFR5cGUgPSBzb3VwX21lc3NhZ2VfaGVhZGVyc19nZXRfb25lKG1zZy0+cmVzcG9uc2VfaGVh ZGVycywgIkNvbnRlbnQtVHlwZSIpOwotCi0gICAgICAgIGlmICghb2ZmaWNpYWxUeXBlIHx8IHN0 cmNtcChvZmZpY2lhbFR5cGUsIHNuaWZmZWRUeXBlKSkKLSAgICAgICAgICAgIHNvdXBfbWVzc2Fn ZV9oZWFkZXJzX3NldF9jb250ZW50X3R5cGUobXNnLT5yZXNwb25zZV9oZWFkZXJzLCBzbmlmZmVk VHlwZSwgcGFyYW1zKTsKLSAgICB9CiAKICAgICBpZiAoc3RhdHVzV2lsbEJlSGFuZGxlZEJ5U291 cChtc2ctPnN0YXR1c19jb2RlKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMzM4LDYgKzMzMiwyNCBA QCBzdGF0aWMgdm9pZCBjb250ZW50U25pZmZlZENhbGxiYWNrKFNvdXBNZXNzYWdlKiBtc2csIGNv bnN0IGNoYXIqIHNuaWZmZWRUeXBlLCBHSAogCiAgICAgQVNTRVJUKGQtPm1fcmVzcG9uc2UuaXNO dWxsKCkpOwogCisgICAgaWYgKHNuaWZmZWRUeXBlKSB7CisgICAgICAgIGNvbnN0IGNoYXIqIG9m ZmljaWFsVHlwZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9vbmUobXNnLT5yZXNwb25zZV9o ZWFkZXJzLCAiQ29udGVudC1UeXBlIik7CisgICAgICAgIGlmICghb2ZmaWNpYWxUeXBlIHx8IHN0 cmNtcChvZmZpY2lhbFR5cGUsIHNuaWZmZWRUeXBlKSkgeworICAgICAgICAgICAgR1N0cmluZyog c3RyID0gZ19zdHJpbmdfbmV3KHNuaWZmZWRUeXBlKTsKKyAgICAgICAgICAgIGlmIChwYXJhbXMp IHsKKyAgICAgICAgICAgICAgICBHSGFzaFRhYmxlSXRlciBpdGVyOworICAgICAgICAgICAgICAg IGdwb2ludGVyIGtleSwgdmFsdWU7CisgICAgICAgICAgICAgICAgZ19oYXNoX3RhYmxlX2l0ZXJf aW5pdCgmaXRlciwgcGFyYW1zKTsKKyAgICAgICAgICAgICAgICB3aGlsZSAoZ19oYXNoX3RhYmxl X2l0ZXJfbmV4dCgmaXRlciwgJmtleSwgJnZhbHVlKSkgeworICAgICAgICAgICAgICAgICAgICBn X3N0cmluZ19hcHBlbmQoc3RyLCAiOyAiKTsKKyAgICAgICAgICAgICAgICAgICAgc291cF9oZWFk ZXJfZ19zdHJpbmdfYXBwZW5kX3BhcmFtKHN0ciwgKGNvbnN0IGNoYXIqKSBrZXksIChjb25zdCBj aGFyKikgdmFsdWUpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIGQtPm1fcmVzcG9uc2Uuc2V0U25pZmZlZENvbnRlbnRUeXBlKHN0ci0+c3RyKTsKKyAgICAg ICAgICAgIGdfc3RyaW5nX2ZyZWUoc3RyLCBGQUxTRSk7CisgICAgICAgIH0KKyAgICB9CisKICAg ICBmaWxsUmVzcG9uc2VGcm9tTWVzc2FnZShtc2csICZkLT5tX3Jlc3BvbnNlKTsKICAgICBjbGll bnQtPmRpZFJlY2VpdmVSZXNwb25zZShoYW5kbGUuZ2V0KCksIGQtPm1fcmVzcG9uc2UpOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVzcG9uc2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJj ZVJlc3BvbnNlLmgKaW5kZXggZTcyMTNmNWJmNDc3OGU5ODRjODY2MjYyNjhlMWFjOWI4Nzc2NDcw My4uNmViYmE4YjU1YTcxOWM4YjdiMmM0ZDI0MWFkN2U3MTYxZTQ4Mzk3MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVzcG9uc2UuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25z ZS5oCkBAIC01OCwxMCArNTgsMTQgQEAgcHVibGljOgogICAgIFNvdXBNZXNzYWdlRmxhZ3Mgc291 cE1lc3NhZ2VGbGFncygpIGNvbnN0IHsgcmV0dXJuIG1fc291cEZsYWdzOyB9CiAgICAgdm9pZCBz ZXRTb3VwTWVzc2FnZUZsYWdzKFNvdXBNZXNzYWdlRmxhZ3Mgc291cEZsYWdzKSB7IG1fc291cEZs YWdzID0gc291cEZsYWdzOyB9CiAKKyAgICBjb25zdCBTdHJpbmcmIHNuaWZmZWRDb250ZW50VHlw ZSgpIGNvbnN0IHsgcmV0dXJuIG1fc25pZmZlZENvbnRlbnRUeXBlOyB9CisgICAgdm9pZCBzZXRT bmlmZmVkQ29udGVudFR5cGUoY29uc3QgU3RyaW5nJiB2YWx1ZSkgeyBtX3NuaWZmZWRDb250ZW50 VHlwZSA9IHZhbHVlOyB9CisKIHByaXZhdGU6CiAgICAgZnJpZW5kIGNsYXNzIFJlc291cmNlUmVz cG9uc2VCYXNlOwogCiAgICAgU291cE1lc3NhZ2VGbGFncyBtX3NvdXBGbGFnczsKKyAgICBTdHJp bmcgbV9zbmlmZmVkQ29udGVudFR5cGU7CiAKICAgICB2b2lkIGRvVXBkYXRlUmVzb3VyY2VSZXNw b25zZSgpIHsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvUmVzb3VyY2VSZXNwb25zZVNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL1Jlc291cmNlUmVzcG9uc2VTb3VwLmNwcAppbmRleCAzYmNkY2M0OWM0NWQ3 ODg5ZWUyZTQ3MDE2Yzk0ZTY3YjZkM2I4NDIwLi45ZTE2MDBjY2Y1MzBkYWJhODc2MDBkMWFkNjk5 MTk3YTQzYzY2NDkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvUmVzb3VyY2VSZXNwb25zZVNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlc3BvbnNlU291cC5jcHAKQEAgLTcxLDcgKzcxLDEx IEBAIHZvaWQgUmVzb3VyY2VSZXNwb25zZTo6dXBkYXRlRnJvbVNvdXBNZXNzYWdlKFNvdXBNZXNz YWdlKiBzb3VwTWVzc2FnZSkKIAogICAgIG1fc291cEZsYWdzID0gc291cF9tZXNzYWdlX2dldF9m bGFncyhzb3VwTWVzc2FnZSk7CiAKLSAgICBTdHJpbmcgY29udGVudFR5cGUgPSBzb3VwX21lc3Nh Z2VfaGVhZGVyc19nZXRfb25lKHNvdXBNZXNzYWdlLT5yZXNwb25zZV9oZWFkZXJzLCAiQ29udGVu dC1UeXBlIik7CisgICAgU3RyaW5nIGNvbnRlbnRUeXBlOworICAgIGlmICh0aGlzLT5zbmlmZmVk Q29udGVudFR5cGUoKS5pc0VtcHR5KCkpCisgICAgICAgIGNvbnRlbnRUeXBlID0gc291cF9tZXNz YWdlX2hlYWRlcnNfZ2V0X29uZShzb3VwTWVzc2FnZS0+cmVzcG9uc2VfaGVhZGVycywgIkNvbnRl bnQtVHlwZSIpOworICAgIGVsc2UKKyAgICAgICAgY29udGVudFR5cGUgPSB0aGlzLT5zbmlmZmVk Q29udGVudFR5cGUoKTsKICAgICBzZXRNaW1lVHlwZShleHRyYWN0TUlNRVR5cGVGcm9tTWVkaWFU eXBlKGNvbnRlbnRUeXBlKSk7CiAKICAgICBzZXRUZXh0RW5jb2RpbmdOYW1lKGV4dHJhY3RDaGFy c2V0RnJvbU1lZGlhVHlwZShjb250ZW50VHlwZSkpOwo= 91489 2011-04-28 07:35:50 -0700 2011-04-28 07:54:19 -0700 patch v1.1 bug-59697-20110428163548.patch text/plain 6643 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogODQ5MTEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAxNWZmYTcxNzFjNzM5NzYyNmVjOWQ2 MzYwMzRmNDkyNTkzNGMzMTRmLi4yZjBiMWMzMTU5ODQ0ZWViNmUzMTJkNmNmZTNkNGYyODQwN2Iw OGI3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMjggIEFybm8gUmVuZXZpZXIgIDxh cm5vQHJlbmV2aWVyLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbU291cF0gZG9lcyBub3QgbG9hZCBjc3Mgc3R5bGVzaGVldHMgd2l0aG91dCBj b250ZW50LXR5cGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU5Njk3CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDogRW5hYmxlIG5vdyBw YXNzaW5nIHRlc3RzOgorICAgICAgICAgLSBodHRwL3Rlc3RzL21pbWUvc3RhbmRhcmQtbW9kZS1s b2Fkcy1zdHlsZXNoZWV0LXdpdGgtZW1wdHktY29udGVudC10eXBlLmh0bWwKKyAgICAgICAgIC0g aHR0cC90ZXN0cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVldC13aXRoLXRleHQt Y3NzLWFuZC1pbnZhbGlkLXR5cGUuaHRtbAorCiAyMDExLTA0LTI2ICBLcmlzdMOzZiBLb3N6dHnD syAgPEtvc3p0eW8uS3Jpc3RvZkBzdHVkLnUtc3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2Vk IGJ5IENzYWJhIE9zenRyb2dvbsOhYy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKaW5kZXggZjc2 NDkxZGQ0NTVmYThjNGMzMWU0NGQ4ZGE3YTg3YjRiZDUxN2EyZC4uOGIxYjBmYWFmMWVjZDU3YmQx Y2I2YjM1MDRjNDFiODE1NTcxNmU0ZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKQEAgLTUx Niw4ICs1MTYsNiBAQCBodHRwL3Rlc3RzL2xvYWRpbmcvdGV4dC1jb250ZW50LXR5cGUtd2l0aC1i aW5hcnktZXh0ZW5zaW9uLmh0bWwKIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcGxheS1zdGFsbC1z ZWVrLmh0bWwKIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tcGxheS1zdGFsbC5odG1sCiBodHRwL3Rl c3RzL21lZGlhL3ZpZGVvLXNlZWthYmxlLXN0YWxsLmh0bWwKLWh0dHAvdGVzdHMvbWltZS9zdGFu ZGFyZC1tb2RlLWxvYWRzLXN0eWxlc2hlZXQtd2l0aC1lbXB0eS1jb250ZW50LXR5cGUuaHRtbAot aHR0cC90ZXN0cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVldC13aXRoLXRleHQt Y3NzLWFuZC1pbnZhbGlkLXR5cGUuaHRtbAogaHR0cC90ZXN0cy9taXNjL2FjaWQzLmh0bWwKIGh0 dHAvdGVzdHMvbWlzYy9saW5rLXJlbC1wcmVmZXRjaC1hbmQtc3VicmVzb3VyY2UuaHRtbAogaHR0 cC90ZXN0cy9taXNjL3BvbGljeS1kZWxlZ2F0ZS1jYWxsZWQtdHdpY2UuaHRtbApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmlu ZGV4IDA3NGNjOThlMzg5YmU1ZTE4Mzk1NjRjOGQyOGU1YWQ2N2M1MzBmNTMuLjI2NGJiZTEwMTc1 NWEwNjY3OTk5NzYxZWFjYTcwNDg1OWQzYWI3NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBA QAorMjAxMS0wNC0yOCAgQXJubyBSZW5ldmllciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtTb3VwXSBkb2VzIG5v dCBsb2FkIGNzcyBzdHlsZXNoZWV0cyB3aXRob3V0IGNvbnRlbnQtdHlwZQorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTk2OTcKKworICAgICAgICBXaGVu IHNuaWZmaW5nIGNvbnRlbnQgdHlwZSwgZG8gbm90IHJlcGxhY2UgaHR0cCBDb250ZW50LVR5cGUg aGVhZGVyIGluCisgICAgICAgIHNvdXAgbWVzc2FnZSBhbnltb3JlLCBidXQga2VlcCBzbmlmZmVk IGNvbnRlbnQgdHlwZSBpbiBhIHNlcGFyYXRlCisgICAgICAgIHZhcmlhYmxlLgorCisgICAgICAg ICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAg IChXZWJDb3JlOjpjb250ZW50U25pZmZlZENhbGxiYWNrKToKKyAgICAgICAgKiBwbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3Vy Y2VSZXNwb25zZTo6c25pZmZlZENvbnRlbnRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlUmVzcG9uc2U6OnNldFNuaWZmZWRDb250ZW50VHlwZSk6CisgICAgICAgICogcGxhdGZvcm0v bmV0d29yay9zb3VwL1Jlc291cmNlUmVzcG9uc2VTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlJlc291cmNlUmVzcG9uc2U6OnVwZGF0ZUZyb21Tb3VwTWVzc2FnZSk6CisKIDIwMTEtMDQtMjYg IEdhYm9yIExva2kgIDxsb2tpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgQ3Nh YmEgT3N6dHJvZ29uw6FjLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAppbmRleCBkYzIyZmNhNDEwZmM0 Y2EwYWEwNjU5MWI0MDMxOGY2MjhkOWUxNDU3Li5iZDBkYzU4ZWY3MjVkYzY5NDU0NjA3MWRiNDVk ODVhOTg2OWRmMjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtMzE2LDEyICszMTYsNiBA QCBzdGF0aWMgdm9pZCB3cm90ZUJvZHlEYXRhQ2FsbGJhY2soU291cE1lc3NhZ2UqLCBTb3VwQnVm ZmVyKiBidWZmZXIsIGdwb2ludGVyIGRhdAogLy8gVGhpcyBjYWxsYmFjayB3aWxsIG5vdCBiZSBj YWxsZWQgaWYgdGhlIGNvbnRlbnQgc25pZmZlciBpcyBkaXNhYmxlZCBpbiBzdGFydEhUVFBSZXF1 ZXN0Lgogc3RhdGljIHZvaWQgY29udGVudFNuaWZmZWRDYWxsYmFjayhTb3VwTWVzc2FnZSogbXNn LCBjb25zdCBjaGFyKiBzbmlmZmVkVHlwZSwgR0hhc2hUYWJsZSAqcGFyYW1zLCBncG9pbnRlciBk YXRhKQogewotICAgIGlmIChzbmlmZmVkVHlwZSkgewotICAgICAgICBjb25zdCBjaGFyKiBvZmZp Y2lhbFR5cGUgPSBzb3VwX21lc3NhZ2VfaGVhZGVyc19nZXRfb25lKG1zZy0+cmVzcG9uc2VfaGVh ZGVycywgIkNvbnRlbnQtVHlwZSIpOwotCi0gICAgICAgIGlmICghb2ZmaWNpYWxUeXBlIHx8IHN0 cmNtcChvZmZpY2lhbFR5cGUsIHNuaWZmZWRUeXBlKSkKLSAgICAgICAgICAgIHNvdXBfbWVzc2Fn ZV9oZWFkZXJzX3NldF9jb250ZW50X3R5cGUobXNnLT5yZXNwb25zZV9oZWFkZXJzLCBzbmlmZmVk VHlwZSwgcGFyYW1zKTsKLSAgICB9CiAKICAgICBpZiAoc3RhdHVzV2lsbEJlSGFuZGxlZEJ5U291 cChtc2ctPnN0YXR1c19jb2RlKSkKICAgICAgICAgcmV0dXJuOwpAQCAtMzM4LDYgKzMzMiwyNCBA QCBzdGF0aWMgdm9pZCBjb250ZW50U25pZmZlZENhbGxiYWNrKFNvdXBNZXNzYWdlKiBtc2csIGNv bnN0IGNoYXIqIHNuaWZmZWRUeXBlLCBHSAogCiAgICAgQVNTRVJUKGQtPm1fcmVzcG9uc2UuaXNO dWxsKCkpOwogCisgICAgaWYgKHNuaWZmZWRUeXBlKSB7CisgICAgICAgIGNvbnN0IGNoYXIqIG9m ZmljaWFsVHlwZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9vbmUobXNnLT5yZXNwb25zZV9o ZWFkZXJzLCAiQ29udGVudC1UeXBlIik7CisgICAgICAgIGlmICghb2ZmaWNpYWxUeXBlIHx8IHN0 cmNtcChvZmZpY2lhbFR5cGUsIHNuaWZmZWRUeXBlKSkgeworICAgICAgICAgICAgR1N0cmluZyog c3RyID0gZ19zdHJpbmdfbmV3KHNuaWZmZWRUeXBlKTsKKyAgICAgICAgICAgIGlmIChwYXJhbXMp IHsKKyAgICAgICAgICAgICAgICBHSGFzaFRhYmxlSXRlciBpdGVyOworICAgICAgICAgICAgICAg IGdwb2ludGVyIGtleSwgdmFsdWU7CisgICAgICAgICAgICAgICAgZ19oYXNoX3RhYmxlX2l0ZXJf aW5pdCgmaXRlciwgcGFyYW1zKTsKKyAgICAgICAgICAgICAgICB3aGlsZSAoZ19oYXNoX3RhYmxl X2l0ZXJfbmV4dCgmaXRlciwgJmtleSwgJnZhbHVlKSkgeworICAgICAgICAgICAgICAgICAgICBn X3N0cmluZ19hcHBlbmQoc3RyLCAiOyAiKTsKKyAgICAgICAgICAgICAgICAgICAgc291cF9oZWFk ZXJfZ19zdHJpbmdfYXBwZW5kX3BhcmFtKHN0ciwgKGNvbnN0IGNoYXIqKSBrZXksIChjb25zdCBj aGFyKikgdmFsdWUpOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAg ICAgIGQtPm1fcmVzcG9uc2Uuc2V0U25pZmZlZENvbnRlbnRUeXBlKHN0ci0+c3RyKTsKKyAgICAg ICAgICAgIGdfc3RyaW5nX2ZyZWUoc3RyLCBUUlVFKTsKKyAgICAgICAgfQorICAgIH0KKwogICAg IGZpbGxSZXNwb25zZUZyb21NZXNzYWdlKG1zZywgJmQtPm1fcmVzcG9uc2UpOwogICAgIGNsaWVu dC0+ZGlkUmVjZWl2ZVJlc3BvbnNlKGhhbmRsZS5nZXQoKSwgZC0+bV9yZXNwb25zZSk7CiB9CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VS ZXNwb25zZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVzcG9uc2UuaAppbmRleCBlNzIxM2Y1YmY0Nzc4ZTk4NGM4NjYyNjI2OGUxYWM5Yjg3NzY0NzAz Li42ZWJiYThiNTVhNzE5YzhiN2IyYzRkMjQxYWQ3ZTcxNjFlNDgzOTcwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25zZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlc3BvbnNl LmgKQEAgLTU4LDEwICs1OCwxNCBAQCBwdWJsaWM6CiAgICAgU291cE1lc3NhZ2VGbGFncyBzb3Vw TWVzc2FnZUZsYWdzKCkgY29uc3QgeyByZXR1cm4gbV9zb3VwRmxhZ3M7IH0KICAgICB2b2lkIHNl dFNvdXBNZXNzYWdlRmxhZ3MoU291cE1lc3NhZ2VGbGFncyBzb3VwRmxhZ3MpIHsgbV9zb3VwRmxh Z3MgPSBzb3VwRmxhZ3M7IH0KIAorICAgIGNvbnN0IFN0cmluZyYgc25pZmZlZENvbnRlbnRUeXBl KCkgY29uc3QgeyByZXR1cm4gbV9zbmlmZmVkQ29udGVudFR5cGU7IH0KKyAgICB2b2lkIHNldFNu aWZmZWRDb250ZW50VHlwZShjb25zdCBTdHJpbmcmIHZhbHVlKSB7IG1fc25pZmZlZENvbnRlbnRU eXBlID0gdmFsdWU7IH0KKwogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgUmVzb3VyY2VSZXNw b25zZUJhc2U7CiAKICAgICBTb3VwTWVzc2FnZUZsYWdzIG1fc291cEZsYWdzOworICAgIFN0cmlu ZyBtX3NuaWZmZWRDb250ZW50VHlwZTsKIAogICAgIHZvaWQgZG9VcGRhdGVSZXNvdXJjZVJlc3Bv bnNlKCkgeyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZVJlc3BvbnNlU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25zZVNvdXAuY3BwCmluZGV4IDNiY2RjYzQ5YzQ1ZDc4 ODllZTJlNDcwMTZjOTRlNjdiNmQzYjg0MjAuLjllMTYwMGNjZjUzMGRhYmE4NzYwMGQxYWQ2OTkx OTdhNDNjNjY0OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZVJlc3BvbnNlU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVzcG9uc2VTb3VwLmNwcApAQCAtNzEsNyArNzEsMTEg QEAgdm9pZCBSZXNvdXJjZVJlc3BvbnNlOjp1cGRhdGVGcm9tU291cE1lc3NhZ2UoU291cE1lc3Nh Z2UqIHNvdXBNZXNzYWdlKQogCiAgICAgbV9zb3VwRmxhZ3MgPSBzb3VwX21lc3NhZ2VfZ2V0X2Zs YWdzKHNvdXBNZXNzYWdlKTsKIAotICAgIFN0cmluZyBjb250ZW50VHlwZSA9IHNvdXBfbWVzc2Fn ZV9oZWFkZXJzX2dldF9vbmUoc291cE1lc3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsICJDb250ZW50 LVR5cGUiKTsKKyAgICBTdHJpbmcgY29udGVudFR5cGU7CisgICAgaWYgKHRoaXMtPnNuaWZmZWRD b250ZW50VHlwZSgpLmlzRW1wdHkoKSkKKyAgICAgICAgY29udGVudFR5cGUgPSBzb3VwX21lc3Nh Z2VfaGVhZGVyc19nZXRfb25lKHNvdXBNZXNzYWdlLT5yZXNwb25zZV9oZWFkZXJzLCAiQ29udGVu dC1UeXBlIik7CisgICAgZWxzZQorICAgICAgICBjb250ZW50VHlwZSA9IHRoaXMtPnNuaWZmZWRD b250ZW50VHlwZSgpOwogICAgIHNldE1pbWVUeXBlKGV4dHJhY3RNSU1FVHlwZUZyb21NZWRpYVR5 cGUoY29udGVudFR5cGUpKTsKIAogICAgIHNldFRleHRFbmNvZGluZ05hbWUoZXh0cmFjdENoYXJz ZXRGcm9tTWVkaWFUeXBlKGNvbnRlbnRUeXBlKSk7Cg== 91490 2011-04-28 07:54:26 -0700 2011-04-28 08:14:08 -0700 patch v1.2 bug-59697-20110428165424.patch text/plain 6915 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogODUxODEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkNjZjZDBlMGM5N2MwNTE2ZGZlN2E3 MGE0OWFiYTA2YzNhZGMwZTI3Li43MjlhNjdlYzBkZTRmZjAxMTAxNDczZGMxNzcxZDcwNzQ3ZjEw MmE0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMjggIEFybm8gUmVuZXZpZXIgIDxh cm5vQHJlbmV2aWVyLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbU291cF0gZG9lcyBub3QgbG9hZCBjc3Mgc3R5bGVzaGVldHMgd2l0aG91dCBj b250ZW50LXR5cGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU5Njk3CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDogRW5hYmxlIG5vdyBw YXNzaW5nIHRlc3RzOgorICAgICAgICAgLSBodHRwL3Rlc3RzL21pbWUvc3RhbmRhcmQtbW9kZS1s b2Fkcy1zdHlsZXNoZWV0LXdpdGgtZW1wdHktY29udGVudC10eXBlLmh0bWwKKyAgICAgICAgIC0g aHR0cC90ZXN0cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVldC13aXRoLXRleHQt Y3NzLWFuZC1pbnZhbGlkLXR5cGUuaHRtbAorCiAyMDExLTA0LTI4ICBNYXJrIFBpbGdyaW0gIDxw aWxncmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAppbmRleCBkZDE1MmY5NWI0OWNmYzhlN2I0Y2I5YWFmNjg3 ODYzOGE1ZGRiNjFmLi43Njk4ZDkwNzk4ZTllNjdhNmE3ZTM4OThkODM0NmVhZWFhZjk2NGJjIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZApAQCAtNTE1LDggKzUxNSw2IEBAIGh0dHAvdGVzdHMv bG9hZGluZy90ZXh0LWNvbnRlbnQtdHlwZS13aXRoLWJpbmFyeS1leHRlbnNpb24uaHRtbAogaHR0 cC90ZXN0cy9tZWRpYS92aWRlby1wbGF5LXN0YWxsLXNlZWsuaHRtbAogaHR0cC90ZXN0cy9tZWRp YS92aWRlby1wbGF5LXN0YWxsLmh0bWwKIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tc2Vla2FibGUt c3RhbGwuaHRtbAotaHR0cC90ZXN0cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVl dC13aXRoLWVtcHR5LWNvbnRlbnQtdHlwZS5odG1sCi1odHRwL3Rlc3RzL21pbWUvc3RhbmRhcmQt bW9kZS1sb2Fkcy1zdHlsZXNoZWV0LXdpdGgtdGV4dC1jc3MtYW5kLWludmFsaWQtdHlwZS5odG1s CiBodHRwL3Rlc3RzL21pc2MvYWNpZDMuaHRtbAogaHR0cC90ZXN0cy9taXNjL2xpbmstcmVsLXBy ZWZldGNoLWFuZC1zdWJyZXNvdXJjZS5odG1sCiBodHRwL3Rlc3RzL21pc2MvcG9saWN5LWRlbGVn YXRlLWNhbGxlZC10d2ljZS5odG1sCkBAIC0xMzk4LDQgKzEzOTYsNCBAQCBmYXN0L2V2ZW50cy9r ZXlkb3duLTEuaHRtbAogCiAjIFVuc2tpcCB3aGVuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01OTU3MSBpcyBmaXhlZAogZmFzdC9kb20vc2hhZG93L2djLXNoYWRvdy5o dG1sCi1mYXN0L2RvbS9zaGFkb3cvbm8tcmVuZGVyZXJzLWZvci1saWdodC1jaGlsZHJlbi5odG1s ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorZmFzdC9kb20vc2hhZG93L25vLXJlbmRlcmVy cy1mb3ItbGlnaHQtY2hpbGRyZW4uaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMwNmY4NjU5ZDQ5MzlmYWU0 NWIyYTZjYjcyZDRmOTI1MWUwODEyZjEuLjA5ODkzZTJhODcxZDEyNjY0ZTllMTliYTVlZjA1MjI5 OTg0YTM5NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wNC0yOCAgQXJubyBS ZW5ldmllciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtTb3VwXSBkb2VzIG5vdCBsb2FkIGNzcyBzdHlsZXNoZWV0 cyB3aXRob3V0IGNvbnRlbnQtdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTk2OTcKKworICAgICAgICBXaGVuIHNuaWZmaW5nIGNvbnRlbnQgdHlw ZSwgZG8gbm90IHJlcGxhY2UgaHR0cCBDb250ZW50LVR5cGUgaGVhZGVyIGluCisgICAgICAgIHNv dXAgbWVzc2FnZSBhbnltb3JlLCBidXQga2VlcCBzbmlmZmVkIGNvbnRlbnQgdHlwZSBpbiBhIHNl cGFyYXRlCisgICAgICAgIHZhcmlhYmxlLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9z b3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb250ZW50U25p ZmZlZENhbGxiYWNrKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VS ZXNwb25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6c25pZmZlZENv bnRlbnRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OnNldFNuaWZm ZWRDb250ZW50VHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVzcG9uc2VTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OnVw ZGF0ZUZyb21Tb3VwTWVzc2FnZSk6CisKIDIwMTEtMDQtMjggIG9qYWIgIDxvamFiQG9qYWIucnU+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3Bw CmluZGV4IGRjMjJmY2E0MTBmYzRjYTBhYTA2NTkxYjQwMzE4ZjYyOGQ5ZTE0NTcuLmM3ZGRjNzU4 OGJhOTc1NmQ5YjE1OTkzMDM0NDYxOGUyY2RkNDFiYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3Bw CkBAIC0zMTYsMTIgKzMxNiw2IEBAIHN0YXRpYyB2b2lkIHdyb3RlQm9keURhdGFDYWxsYmFjayhT b3VwTWVzc2FnZSosIFNvdXBCdWZmZXIqIGJ1ZmZlciwgZ3BvaW50ZXIgZGF0CiAvLyBUaGlzIGNh bGxiYWNrIHdpbGwgbm90IGJlIGNhbGxlZCBpZiB0aGUgY29udGVudCBzbmlmZmVyIGlzIGRpc2Fi bGVkIGluIHN0YXJ0SFRUUFJlcXVlc3QuCiBzdGF0aWMgdm9pZCBjb250ZW50U25pZmZlZENhbGxi YWNrKFNvdXBNZXNzYWdlKiBtc2csIGNvbnN0IGNoYXIqIHNuaWZmZWRUeXBlLCBHSGFzaFRhYmxl ICpwYXJhbXMsIGdwb2ludGVyIGRhdGEpCiB7Ci0gICAgaWYgKHNuaWZmZWRUeXBlKSB7Ci0gICAg ICAgIGNvbnN0IGNoYXIqIG9mZmljaWFsVHlwZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9v bmUobXNnLT5yZXNwb25zZV9oZWFkZXJzLCAiQ29udGVudC1UeXBlIik7Ci0KLSAgICAgICAgaWYg KCFvZmZpY2lhbFR5cGUgfHwgc3RyY21wKG9mZmljaWFsVHlwZSwgc25pZmZlZFR5cGUpKQotICAg ICAgICAgICAgc291cF9tZXNzYWdlX2hlYWRlcnNfc2V0X2NvbnRlbnRfdHlwZShtc2ctPnJlc3Bv bnNlX2hlYWRlcnMsIHNuaWZmZWRUeXBlLCBwYXJhbXMpOwotICAgIH0KIAogICAgIGlmIChzdGF0 dXNXaWxsQmVIYW5kbGVkQnlTb3VwKG1zZy0+c3RhdHVzX2NvZGUpKQogICAgICAgICByZXR1cm47 CkBAIC0zMzgsNiArMzMyLDI0IEBAIHN0YXRpYyB2b2lkIGNvbnRlbnRTbmlmZmVkQ2FsbGJhY2so U291cE1lc3NhZ2UqIG1zZywgY29uc3QgY2hhciogc25pZmZlZFR5cGUsIEdICiAKICAgICBBU1NF UlQoZC0+bV9yZXNwb25zZS5pc051bGwoKSk7CiAKKyAgICBpZiAoc25pZmZlZFR5cGUpIHsKKyAg ICAgICAgY29uc3QgY2hhciogb2ZmaWNpYWxUeXBlID0gc291cF9tZXNzYWdlX2hlYWRlcnNfZ2V0 X29uZShtc2ctPnJlc3BvbnNlX2hlYWRlcnMsICJDb250ZW50LVR5cGUiKTsKKyAgICAgICAgaWYg KCFvZmZpY2lhbFR5cGUgfHwgc3RyY21wKG9mZmljaWFsVHlwZSwgc25pZmZlZFR5cGUpKSB7Cisg ICAgICAgICAgICBHU3RyaW5nKiBzdHIgPSBnX3N0cmluZ19uZXcoc25pZmZlZFR5cGUpOworICAg ICAgICAgICAgaWYgKHBhcmFtcykgeworICAgICAgICAgICAgICAgIEdIYXNoVGFibGVJdGVyIGl0 ZXI7CisgICAgICAgICAgICAgICAgZ3BvaW50ZXIga2V5LCB2YWx1ZTsKKyAgICAgICAgICAgICAg ICBnX2hhc2hfdGFibGVfaXRlcl9pbml0KCZpdGVyLCBwYXJhbXMpOworICAgICAgICAgICAgICAg IHdoaWxlIChnX2hhc2hfdGFibGVfaXRlcl9uZXh0KCZpdGVyLCAma2V5LCAmdmFsdWUpKSB7Cisg ICAgICAgICAgICAgICAgICAgIGdfc3RyaW5nX2FwcGVuZChzdHIsICI7ICIpOworICAgICAgICAg ICAgICAgICAgICBzb3VwX2hlYWRlcl9nX3N0cmluZ19hcHBlbmRfcGFyYW0oc3RyLCBzdGF0aWNf Y2FzdDxjb25zdCBjaGFyKj4oa2V5KSwgc3RhdGljX2Nhc3Q8Y29uc3QgY2hhcio+KHZhbHVlKSk7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgZC0+bV9yZXNw b25zZS5zZXRTbmlmZmVkQ29udGVudFR5cGUoc3RyLT5zdHIpOworICAgICAgICAgICAgZ19zdHJp bmdfZnJlZShzdHIsIFRSVUUpOworICAgICAgICB9CisgICAgfQorCiAgICAgZmlsbFJlc3BvbnNl RnJvbU1lc3NhZ2UobXNnLCAmZC0+bV9yZXNwb25zZSk7CiAgICAgY2xpZW50LT5kaWRSZWNlaXZl UmVzcG9uc2UoaGFuZGxlLmdldCgpLCBkLT5tX3Jlc3BvbnNlKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlc3BvbnNlLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25zZS5oCmlu ZGV4IGU3MjEzZjViZjQ3NzhlOTg0Yzg2NjI2MjY4ZTFhYzliODc3NjQ3MDMuLjZlYmJhOGI1NWE3 MTljOGI3YjJjNGQyNDFhZDdlNzE2MWU0ODM5NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlc3BvbnNlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVzcG9uc2UuaApAQCAtNTgsMTAg KzU4LDE0IEBAIHB1YmxpYzoKICAgICBTb3VwTWVzc2FnZUZsYWdzIHNvdXBNZXNzYWdlRmxhZ3Mo KSBjb25zdCB7IHJldHVybiBtX3NvdXBGbGFnczsgfQogICAgIHZvaWQgc2V0U291cE1lc3NhZ2VG bGFncyhTb3VwTWVzc2FnZUZsYWdzIHNvdXBGbGFncykgeyBtX3NvdXBGbGFncyA9IHNvdXBGbGFn czsgfQogCisgICAgY29uc3QgU3RyaW5nJiBzbmlmZmVkQ29udGVudFR5cGUoKSBjb25zdCB7IHJl dHVybiBtX3NuaWZmZWRDb250ZW50VHlwZTsgfQorICAgIHZvaWQgc2V0U25pZmZlZENvbnRlbnRU eXBlKGNvbnN0IFN0cmluZyYgdmFsdWUpIHsgbV9zbmlmZmVkQ29udGVudFR5cGUgPSB2YWx1ZTsg fQorCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlQmFzZTsKIAog ICAgIFNvdXBNZXNzYWdlRmxhZ3MgbV9zb3VwRmxhZ3M7CisgICAgU3RyaW5nIG1fc25pZmZlZENv bnRlbnRUeXBlOwogCiAgICAgdm9pZCBkb1VwZGF0ZVJlc291cmNlUmVzcG9uc2UoKSB7IH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVzcG9uc2VTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZVJlc3BvbnNlU291cC5jcHAKaW5kZXggM2JjZGNjNDljNDVkNzg4OWVlMmU0NzAxNmM5 NGU2N2I2ZDNiODQyMC4uOWUxNjAwY2NmNTMwZGFiYTg3NjAwZDFhZDY5OTE5N2E0M2M2NjQ5MyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVzcG9uc2VTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvUmVzb3VyY2VSZXNwb25zZVNvdXAuY3BwCkBAIC03MSw3ICs3MSwxMSBAQCB2b2lkIFJlc291 cmNlUmVzcG9uc2U6OnVwZGF0ZUZyb21Tb3VwTWVzc2FnZShTb3VwTWVzc2FnZSogc291cE1lc3Nh Z2UpCiAKICAgICBtX3NvdXBGbGFncyA9IHNvdXBfbWVzc2FnZV9nZXRfZmxhZ3Moc291cE1lc3Nh Z2UpOwogCi0gICAgU3RyaW5nIGNvbnRlbnRUeXBlID0gc291cF9tZXNzYWdlX2hlYWRlcnNfZ2V0 X29uZShzb3VwTWVzc2FnZS0+cmVzcG9uc2VfaGVhZGVycywgIkNvbnRlbnQtVHlwZSIpOworICAg IFN0cmluZyBjb250ZW50VHlwZTsKKyAgICBpZiAodGhpcy0+c25pZmZlZENvbnRlbnRUeXBlKCku aXNFbXB0eSgpKQorICAgICAgICBjb250ZW50VHlwZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dl dF9vbmUoc291cE1lc3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsICJDb250ZW50LVR5cGUiKTsKKyAg ICBlbHNlCisgICAgICAgIGNvbnRlbnRUeXBlID0gdGhpcy0+c25pZmZlZENvbnRlbnRUeXBlKCk7 CiAgICAgc2V0TWltZVR5cGUoZXh0cmFjdE1JTUVUeXBlRnJvbU1lZGlhVHlwZShjb250ZW50VHlw ZSkpOwogCiAgICAgc2V0VGV4dEVuY29kaW5nTmFtZShleHRyYWN0Q2hhcnNldEZyb21NZWRpYVR5 cGUoY29udGVudFR5cGUpKTsK 91493 2011-04-28 08:14:16 -0700 2011-04-28 10:49:31 -0700 patch v1.3 bug-59697-20110428171414.patch text/plain 6909 a.renevier U3VidmVyc2lvbiBSZXZpc2lvbjogODUxODEKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBkNjZjZDBlMGM5N2MwNTE2ZGZlN2E3 MGE0OWFiYTA2YzNhZGMwZTI3Li43MjlhNjdlYzBkZTRmZjAxMTAxNDczZGMxNzcxZDcwNzQ3ZjEw MmE0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMDQtMjggIEFybm8gUmVuZXZpZXIgIDxh cm5vQHJlbmV2aWVyLm5ldD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBbU291cF0gZG9lcyBub3QgbG9hZCBjc3Mgc3R5bGVzaGVldHMgd2l0aG91dCBj b250ZW50LXR5cGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTU5Njk3CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDogRW5hYmxlIG5vdyBw YXNzaW5nIHRlc3RzOgorICAgICAgICAgLSBodHRwL3Rlc3RzL21pbWUvc3RhbmRhcmQtbW9kZS1s b2Fkcy1zdHlsZXNoZWV0LXdpdGgtZW1wdHktY29udGVudC10eXBlLmh0bWwKKyAgICAgICAgIC0g aHR0cC90ZXN0cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVldC13aXRoLXRleHQt Y3NzLWFuZC1pbnZhbGlkLXR5cGUuaHRtbAorCiAyMDExLTA0LTI4ICBNYXJrIFBpbGdyaW0gIDxw aWxncmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBUb255IENoYW5nLgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAppbmRleCBkZDE1MmY5NWI0OWNmYzhlN2I0Y2I5YWFmNjg3 ODYzOGE1ZGRiNjFmLi43Njk4ZDkwNzk4ZTllNjdhNmE3ZTM4OThkODM0NmVhZWFhZjk2NGJjIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAorKysgYi9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZApAQCAtNTE1LDggKzUxNSw2IEBAIGh0dHAvdGVzdHMv bG9hZGluZy90ZXh0LWNvbnRlbnQtdHlwZS13aXRoLWJpbmFyeS1leHRlbnNpb24uaHRtbAogaHR0 cC90ZXN0cy9tZWRpYS92aWRlby1wbGF5LXN0YWxsLXNlZWsuaHRtbAogaHR0cC90ZXN0cy9tZWRp YS92aWRlby1wbGF5LXN0YWxsLmh0bWwKIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tc2Vla2FibGUt c3RhbGwuaHRtbAotaHR0cC90ZXN0cy9taW1lL3N0YW5kYXJkLW1vZGUtbG9hZHMtc3R5bGVzaGVl dC13aXRoLWVtcHR5LWNvbnRlbnQtdHlwZS5odG1sCi1odHRwL3Rlc3RzL21pbWUvc3RhbmRhcmQt bW9kZS1sb2Fkcy1zdHlsZXNoZWV0LXdpdGgtdGV4dC1jc3MtYW5kLWludmFsaWQtdHlwZS5odG1s CiBodHRwL3Rlc3RzL21pc2MvYWNpZDMuaHRtbAogaHR0cC90ZXN0cy9taXNjL2xpbmstcmVsLXBy ZWZldGNoLWFuZC1zdWJyZXNvdXJjZS5odG1sCiBodHRwL3Rlc3RzL21pc2MvcG9saWN5LWRlbGVn YXRlLWNhbGxlZC10d2ljZS5odG1sCkBAIC0xMzk4LDQgKzEzOTYsNCBAQCBmYXN0L2V2ZW50cy9r ZXlkb3duLTEuaHRtbAogCiAjIFVuc2tpcCB3aGVuIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD01OTU3MSBpcyBmaXhlZAogZmFzdC9kb20vc2hhZG93L2djLXNoYWRvdy5o dG1sCi1mYXN0L2RvbS9zaGFkb3cvbm8tcmVuZGVyZXJzLWZvci1saWdodC1jaGlsZHJlbi5odG1s ClwgTm8gbmV3bGluZSBhdCBlbmQgb2YgZmlsZQorZmFzdC9kb20vc2hhZG93L25vLXJlbmRlcmVy cy1mb3ItbGlnaHQtY2hpbGRyZW4uaHRtbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGMwNmY4NjU5ZDQ5MzlmYWU0 NWIyYTZjYjcyZDRmOTI1MWUwODEyZjEuLjA5ODkzZTJhODcxZDEyNjY0ZTllMTliYTVlZjA1MjI5 OTg0YTM5NDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wNC0yOCAgQXJubyBS ZW5ldmllciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtTb3VwXSBkb2VzIG5vdCBsb2FkIGNzcyBzdHlsZXNoZWV0 cyB3aXRob3V0IGNvbnRlbnQtdHlwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTk2OTcKKworICAgICAgICBXaGVuIHNuaWZmaW5nIGNvbnRlbnQgdHlw ZSwgZG8gbm90IHJlcGxhY2UgaHR0cCBDb250ZW50LVR5cGUgaGVhZGVyIGluCisgICAgICAgIHNv dXAgbWVzc2FnZSBhbnltb3JlLCBidXQga2VlcCBzbmlmZmVkIGNvbnRlbnQgdHlwZSBpbiBhIHNl cGFyYXRlCisgICAgICAgIHZhcmlhYmxlLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9z b3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb250ZW50U25p ZmZlZENhbGxiYWNrKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VS ZXNwb25zZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZTo6c25pZmZlZENv bnRlbnRUeXBlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OnNldFNuaWZm ZWRDb250ZW50VHlwZSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVzcG9uc2VTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2U6OnVw ZGF0ZUZyb21Tb3VwTWVzc2FnZSk6CisKIDIwMTEtMDQtMjggIG9qYWIgIDxvamFiQG9qYWIucnU+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3Bw CmluZGV4IGRjMjJmY2E0MTBmYzRjYTBhYTA2NTkxYjQwMzE4ZjYyOGQ5ZTE0NTcuLmM3ZGRjNzU4 OGJhOTc1NmQ5YjE1OTkzMDM0NDYxOGUyY2RkNDFiYTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3Bw CkBAIC0zMTYsMTIgKzMxNiw2IEBAIHN0YXRpYyB2b2lkIHdyb3RlQm9keURhdGFDYWxsYmFjayhT b3VwTWVzc2FnZSosIFNvdXBCdWZmZXIqIGJ1ZmZlciwgZ3BvaW50ZXIgZGF0CiAvLyBUaGlzIGNh bGxiYWNrIHdpbGwgbm90IGJlIGNhbGxlZCBpZiB0aGUgY29udGVudCBzbmlmZmVyIGlzIGRpc2Fi bGVkIGluIHN0YXJ0SFRUUFJlcXVlc3QuCiBzdGF0aWMgdm9pZCBjb250ZW50U25pZmZlZENhbGxi YWNrKFNvdXBNZXNzYWdlKiBtc2csIGNvbnN0IGNoYXIqIHNuaWZmZWRUeXBlLCBHSGFzaFRhYmxl ICpwYXJhbXMsIGdwb2ludGVyIGRhdGEpCiB7Ci0gICAgaWYgKHNuaWZmZWRUeXBlKSB7Ci0gICAg ICAgIGNvbnN0IGNoYXIqIG9mZmljaWFsVHlwZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9v bmUobXNnLT5yZXNwb25zZV9oZWFkZXJzLCAiQ29udGVudC1UeXBlIik7Ci0KLSAgICAgICAgaWYg KCFvZmZpY2lhbFR5cGUgfHwgc3RyY21wKG9mZmljaWFsVHlwZSwgc25pZmZlZFR5cGUpKQotICAg ICAgICAgICAgc291cF9tZXNzYWdlX2hlYWRlcnNfc2V0X2NvbnRlbnRfdHlwZShtc2ctPnJlc3Bv bnNlX2hlYWRlcnMsIHNuaWZmZWRUeXBlLCBwYXJhbXMpOwotICAgIH0KIAogICAgIGlmIChzdGF0 dXNXaWxsQmVIYW5kbGVkQnlTb3VwKG1zZy0+c3RhdHVzX2NvZGUpKQogICAgICAgICByZXR1cm47 CkBAIC0zMzgsNiArMzMyLDI0IEBAIHN0YXRpYyB2b2lkIGNvbnRlbnRTbmlmZmVkQ2FsbGJhY2so U291cE1lc3NhZ2UqIG1zZywgY29uc3QgY2hhciogc25pZmZlZFR5cGUsIEdICiAKICAgICBBU1NF UlQoZC0+bV9yZXNwb25zZS5pc051bGwoKSk7CiAKKyAgICBpZiAoc25pZmZlZFR5cGUpIHsKKyAg ICAgICAgY29uc3QgY2hhciogb2ZmaWNpYWxUeXBlID0gc291cF9tZXNzYWdlX2hlYWRlcnNfZ2V0 X29uZShtc2ctPnJlc3BvbnNlX2hlYWRlcnMsICJDb250ZW50LVR5cGUiKTsKKyAgICAgICAgaWYg KCFvZmZpY2lhbFR5cGUgfHwgc3RyY21wKG9mZmljaWFsVHlwZSwgc25pZmZlZFR5cGUpKSB7Cisg ICAgICAgICAgICBHU3RyaW5nKiBzdHIgPSBnX3N0cmluZ19uZXcoc25pZmZlZFR5cGUpOworICAg ICAgICAgICAgaWYgKHBhcmFtcykgeworICAgICAgICAgICAgICAgIEdIYXNoVGFibGVJdGVyIGl0 ZXI7CisgICAgICAgICAgICAgICAgZ3BvaW50ZXIga2V5LCB2YWx1ZTsKKyAgICAgICAgICAgICAg ICBnX2hhc2hfdGFibGVfaXRlcl9pbml0KCZpdGVyLCBwYXJhbXMpOworICAgICAgICAgICAgICAg IHdoaWxlIChnX2hhc2hfdGFibGVfaXRlcl9uZXh0KCZpdGVyLCAma2V5LCAmdmFsdWUpKSB7Cisg ICAgICAgICAgICAgICAgICAgIGdfc3RyaW5nX2FwcGVuZChzdHIsICI7ICIpOworICAgICAgICAg ICAgICAgICAgICBzb3VwX2hlYWRlcl9nX3N0cmluZ19hcHBlbmRfcGFyYW0oc3RyLCBzdGF0aWNf Y2FzdDxjb25zdCBjaGFyKj4oa2V5KSwgc3RhdGljX2Nhc3Q8Y29uc3QgY2hhcio+KHZhbHVlKSk7 CisgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgfQorICAgICAgICAgICAgZC0+bV9yZXNw b25zZS5zZXRTbmlmZmVkQ29udGVudFR5cGUoc3RyLT5zdHIpOworICAgICAgICAgICAgZ19zdHJp bmdfZnJlZShzdHIsIFRSVUUpOworICAgICAgICB9CisgICAgfQorCiAgICAgZmlsbFJlc3BvbnNl RnJvbU1lc3NhZ2UobXNnLCAmZC0+bV9yZXNwb25zZSk7CiAgICAgY2xpZW50LT5kaWRSZWNlaXZl UmVzcG9uc2UoaGFuZGxlLmdldCgpLCBkLT5tX3Jlc3BvbnNlKTsKIH0KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlc3BvbnNlLmggYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VSZXNwb25zZS5oCmlu ZGV4IGU3MjEzZjViZjQ3NzhlOTg0Yzg2NjI2MjY4ZTFhYzliODc3NjQ3MDMuLjZlYmJhOGI1NWE3 MTljOGI3YjJjNGQyNDFhZDdlNzE2MWU0ODM5NzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZVJlc3BvbnNlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlUmVzcG9uc2UuaApAQCAtNTgsMTAg KzU4LDE0IEBAIHB1YmxpYzoKICAgICBTb3VwTWVzc2FnZUZsYWdzIHNvdXBNZXNzYWdlRmxhZ3Mo KSBjb25zdCB7IHJldHVybiBtX3NvdXBGbGFnczsgfQogICAgIHZvaWQgc2V0U291cE1lc3NhZ2VG bGFncyhTb3VwTWVzc2FnZUZsYWdzIHNvdXBGbGFncykgeyBtX3NvdXBGbGFncyA9IHNvdXBGbGFn czsgfQogCisgICAgY29uc3QgU3RyaW5nJiBzbmlmZmVkQ29udGVudFR5cGUoKSBjb25zdCB7IHJl dHVybiBtX3NuaWZmZWRDb250ZW50VHlwZTsgfQorICAgIHZvaWQgc2V0U25pZmZlZENvbnRlbnRU eXBlKGNvbnN0IFN0cmluZyYgdmFsdWUpIHsgbV9zbmlmZmVkQ29udGVudFR5cGUgPSB2YWx1ZTsg fQorCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlQmFzZTsKIAog ICAgIFNvdXBNZXNzYWdlRmxhZ3MgbV9zb3VwRmxhZ3M7CisgICAgU3RyaW5nIG1fc25pZmZlZENv bnRlbnRUeXBlOwogCiAgICAgdm9pZCBkb1VwZGF0ZVJlc291cmNlUmVzcG9uc2UoKSB7IH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVzcG9uc2VTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZVJlc3BvbnNlU291cC5jcHAKaW5kZXggM2JjZGNjNDljNDVkNzg4OWVlMmU0NzAxNmM5 NGU2N2I2ZDNiODQyMC4uMmMyNGU2ZDBlZGZjNGUyOTQxZWZmNjI0YTIxMTdlOTJiMWRkOWEwMSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl UmVzcG9uc2VTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvUmVzb3VyY2VSZXNwb25zZVNvdXAuY3BwCkBAIC03MSw3ICs3MSwxMSBAQCB2b2lkIFJlc291 cmNlUmVzcG9uc2U6OnVwZGF0ZUZyb21Tb3VwTWVzc2FnZShTb3VwTWVzc2FnZSogc291cE1lc3Nh Z2UpCiAKICAgICBtX3NvdXBGbGFncyA9IHNvdXBfbWVzc2FnZV9nZXRfZmxhZ3Moc291cE1lc3Nh Z2UpOwogCi0gICAgU3RyaW5nIGNvbnRlbnRUeXBlID0gc291cF9tZXNzYWdlX2hlYWRlcnNfZ2V0 X29uZShzb3VwTWVzc2FnZS0+cmVzcG9uc2VfaGVhZGVycywgIkNvbnRlbnQtVHlwZSIpOworICAg IFN0cmluZyBjb250ZW50VHlwZTsKKyAgICBpZiAoc25pZmZlZENvbnRlbnRUeXBlKCkuaXNFbXB0 eSgpKQorICAgICAgICBjb250ZW50VHlwZSA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dldF9vbmUo c291cE1lc3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsICJDb250ZW50LVR5cGUiKTsKKyAgICBlbHNl CisgICAgICAgIGNvbnRlbnRUeXBlID0gdGhpcy0+c25pZmZlZENvbnRlbnRUeXBlKCk7CiAgICAg c2V0TWltZVR5cGUoZXh0cmFjdE1JTUVUeXBlRnJvbU1lZGlhVHlwZShjb250ZW50VHlwZSkpOwog CiAgICAgc2V0VGV4dEVuY29kaW5nTmFtZShleHRyYWN0Q2hhcnNldEZyb21NZWRpYVR5cGUoY29u dGVudFR5cGUpKTsK