35191 2010-02-20 02:43:52 -0800 [Gtk] use geoclue providers with don't provide update 2010-03-02 18:21:01 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P2 Normal --- 35355 0 a.renevier webkit-unassigned commit-queue gustavo webkit.review.bot oldest_to_newest 192157 0 a.renevier 2010-02-20 02:43:52 -0800 Hi, currently, we call geoclue_master_client_set_requirements with require_updates argument set to true. It means only providers with provide updates will be taken into account. We could set this argument to false (and that would need some other code modification) to be able to use providers that don't provide updates (such as hostip). 192158 1 49123 a.renevier 2010-02-20 04:04:42 -0800 Created attachment 49123 patch v1 path proposal: after creating geocluePosition (with need_update to false), I call geoclue_position_get_position_async. Asynchronous call is needed for two things: - not freezing the interface in case it takes a long time to have the position. - not calling Geolocation::makeSuccessCallbacks before Geolocation::startRequest returns (otherwise, makeSuccessCallbacks is called with an empty m_oneShots). 192159 2 a.renevier 2010-02-20 04:08:32 -0800 Also, I've a question about GeolocationServiceGtk::startUpdating code: g_error_free is not called after if (!result) { setError(PositionError::POSITION_UNAVAILABLE, error->message) Is it because of some GOwnPtr magic ? 192627 3 49123 eric 2010-02-22 14:19:53 -0800 Comment on attachment 49123 patch v1 This patch fails to apply (click on any one of the purple bubbles to see why). Thus it can't be commit-queue'd. 193099 4 49322 a.renevier 2010-02-23 13:29:02 -0800 Created attachment 49322 patch v1.2 I hope this one will work. 193101 5 webkit.review.bot 2010-02-23 13:31:46 -0800 Attachment 49322 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/gtk/GeolocationServiceGtk.h:53: get_position is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebCore/platform/gtk/GeolocationServiceGtk.cpp:171: GeolocationServiceGtk::get_position is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 193130 6 gustavo 2010-02-23 14:27:04 -0800 (In reply to comment #2) > Also, I've a question about GeolocationServiceGtk::startUpdating code: > > > g_error_free is not called after > > > if (!result) { > setError(PositionError::POSITION_UNAVAILABLE, error->message) > > Is it because of some GOwnPtr magic ? Yes. GOwnPtr knows that the reference is only relevant inside that scope, so when the function is done it will free the pointer. Here's GError's specialization of the template: template <> void freeOwnedGPtr<GError>(GError* ptr) { if (ptr) g_error_free(ptr); } You can see more details at JavaScriptCore/wtf/gobject/GOwnPtr.cpp 193142 7 49322 gustavo 2010-02-23 14:57:57 -0800 Comment on attachment 49322 patch v1.2  8 No new tests. (OOPS!) You should state here that there's no testable behaviour change, (I assume there isn't because this depends on the system). Also, you're not doing only what you claim in the changelog, in this patch. You're also making updating the location information async, which does sound like a good idea, but should be made into another patch. r- for that reason. Also, we had many crashes happen because the WebCore object goes away between an async call, and its callback returning, so passin 'this' here worries me:  118 geoclue_position_get_position_async(m_geocluePosition, (GeocluePositionCallback)get_position, this); Have you checked what the life cycle of the geolocation service object is, and if it will react well if its client goes away? 193242 8 49357 a.renevier 2010-02-23 22:19:23 -0800 Created attachment 49357 patch v1.3 (In reply to comment #7) > (From update of attachment 49322 [details]) > 8 No new tests. (OOPS!) > > You should state here that there's no testable behaviour change, (I assume > there isn't because this depends on the system). ok, here is an updated patch > Also, you're not doing only > what you claim in the changelog, in this patch. You're also making updating the > location information async, which does sound like a good idea, but should be > made into another patch. r- for that reason. asynchronous reply is needed here. As explained in comment 1, if we return a position synchronously from startUpdating, callback fonctions will not be called. Currently (providers providing update only), position return is asynchronous. If we use providers which don't provide updates, we need to get position asynchronously (otherwise, geolocation simply won't work). > Also, we had many crashes happen because the WebCore object goes away between > an async call, and its callback returning, so passin 'this' here worries me: > > 118 geoclue_position_get_position_async(m_geocluePosition, > (GeocluePositionCallback)get_position, this); > > Have you checked what the life cycle of the geolocation service object is, and > if it will react well if its client goes away? I've tested what happens when page is unloaded before position is available. GeolocationService is destroyed and get_position is not called, and no crash append. 193243 9 webkit.review.bot 2010-02-23 22:21:30 -0800 Attachment 49357 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebCore/platform/gtk/GeolocationServiceGtk.h:53: get_position is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebCore/platform/gtk/GeolocationServiceGtk.cpp:171: GeolocationServiceGtk::get_position is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 193471 10 a.renevier 2010-02-24 13:10:27 -0800 As seen with kon on irc, it's probably better to split this bug in two parts: first, implement the mechanism to get the position asynchronously after GeocluePosition* has been created. Then, in a second part, set the flag to allow providers with don't provide update. 194200 11 49610 a.renevier 2010-02-26 12:10:25 -0800 Created attachment 49610 patch v2 sorry, wrong patch. This patch depends on bug #35355 being fixed 194792 12 49610 commit-queue 2010-03-01 13:17:06 -0800 Comment on attachment 49610 patch v2 Rejecting patch 49610 from commit-queue. Failed to run "['/Users/eseidel/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', '--reviewer', 'Gustavo Noronha Silva', '--force']" exit_code: 1 Last 500 characters of output: e: Wed, 24 Feb 2010 22:17:15 +0100 Subject: [PATCH] Bug #35191 --- WebCore/ChangeLog | 12 ++++++++++++ WebCore/platform/gtk/GeolocationServiceGtk.cpp | 2 +- 2 files changed, 13 insertions(+), 1 deletions(-) ------------------------------------------------------------------- patching file WebCore/ChangeLog Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file WebCore/ChangeLog.rej patching file WebCore/platform/gtk/GeolocationServiceGtk.cpp Full output: http://webkit-commit-queue.appspot.com/results/320259 194798 13 49747 a.renevier 2010-03-01 13:29:13 -0800 Created attachment 49747 patch v2.1 Here is an update patch against latest Changelog. But is it frequent for patches to not apply because of changelogs modifications ? how to avoid that in the future ? 195348 14 49747 commit-queue 2010-03-02 18:20:56 -0800 Comment on attachment 49747 patch v2.1 Clearing flags on attachment: 49747 Committed r55446: <http://trac.webkit.org/changeset/55446> 195349 15 commit-queue 2010-03-02 18:21:01 -0800 All reviewed patches have been landed. Closing bug. 49123 2010-02-20 04:04:42 -0800 2010-02-23 13:29:02 -0800 patch v1 0001-bug-35191.patch text/plain 7135 a.renevier RnJvbSBjZGMyMmUzNDdhMmQ5NDkzYWFkNjY0MjExODQwNmMyNjIxNGY3YTBlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBhcm5vIDxhcm5vQHJlbmV2aWVyLm5ldD4KRGF0ZTogU2F0LCAy MCBGZWIgMjAxMCAxMTo1NzozOSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIGJ1ZyAjMzUxOTEKCi0t LQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgMTQg KysrKysrKwogV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2aWNlR3RrLmNwcCB8 ICAgNDkgKysrKysrKysrKystLS0tLS0tLS0tLS0KIFdlYkNvcmUvcGxhdGZvcm0vZ3RrL0dlb2xv Y2F0aW9uU2VydmljZUd0ay5oICAgfCAgICAyICstCiAzIGZpbGVzIGNoYW5nZWQsIDM4IGluc2Vy dGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9n IGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzA1NjdiZC4uYmM0MzMxNiAxMDA2NDQKLS0tIGEv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsOCArMSwyMiBA QAorMjAxMC0wMi0yMCAgQXJubyBSZW5ldmllciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIHVzZSBnZW9j bHVlIHByb3ZpZGVycyB3aXRoIGRvbid0IHByb3ZpZGUgdXBkYXRlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTE5MQorCisgICAgICAgIE5vIG5ldyB0 ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2Vydmlj ZUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvblNlcnZpY2VHdGs6OnN0YXJ0 VXBkYXRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb25TZXJ2aWNlR3RrOjpnZXRf cG9zaXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsu aDoKKwogMjAxMC0wMi0xOCAgUGV0ZXIgS2FzdGluZyAgPHBrYXN0aW5nQGdvb2dsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gRmlzaGVyLgogCiAgICAgICAgIE1ha2UgUGFzdGVi b2FyZDo6d3JpdGVJbWFnZSgpIHNhZmUgYWdhaW5zdCBOVUxMIGNhY2hlZEltYWdlcywgYW5kIGNs ZWFuCiAgICAgICAgIHVwIHNvbWUgY29kZS4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTM1MTM2CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0v Z3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9s b2NhdGlvblNlcnZpY2VHdGsuY3BwCmluZGV4IGVkYjhkMTAuLjk0YWNlNWYgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5jcHAKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2aWNlR3RrLmNwcApAQCAtOTMsMzcgKzkz LDM4IEBAIGJvb2wgR2VvbG9jYXRpb25TZXJ2aWNlR3RrOjpzdGFydFVwZGF0aW5nKFBvc2l0aW9u T3B0aW9ucyogb3B0aW9ucykKICAgICBHZW9jbHVlQWNjdXJhY3lMZXZlbCBhY2N1cmFjeUxldmVs ID0gR0VPQ0xVRV9BQ0NVUkFDWV9MRVZFTF9MT0NBTElUWTsKICAgICBpbnQgdGltZW91dCA9IDA7 CiAgICAgaWYgKG9wdGlvbnMpIHsKICAgICAgICAgYWNjdXJhY3lMZXZlbCA9IG9wdGlvbnMtPmVu YWJsZUhpZ2hBY2N1cmFjeSgpID8gR0VPQ0xVRV9BQ0NVUkFDWV9MRVZFTF9ERVRBSUxFRCA6IEdF T0NMVUVfQUNDVVJBQ1lfTEVWRUxfTE9DQUxJVFk7CiAgICAgICAgIHRpbWVvdXQgPSBvcHRpb25z LT50aW1lb3V0KCk7CiAgICAgfQogCiAgICAgZ2Jvb2xlYW4gcmVzdWx0ID0gZ2VvY2x1ZV9tYXN0 ZXJfY2xpZW50X3NldF9yZXF1aXJlbWVudHMoY2xpZW50LCBhY2N1cmFjeUxldmVsLCB0aW1lb3V0 LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHRydWUsIEdFT0NMVUVfUkVTT1VSQ0VfQUxMLCAmZXJyb3Iub3V0UHRyKCkpOworICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGZhbHNlLCBHRU9DTFVFX1JFU09VUkNFX0FMTCwgJmVycm9yLm91dFB0cigpKTsKIAogICAgIGlm ICghcmVzdWx0KSB7CiAgICAgICAgIHNldEVycm9yKFBvc2l0aW9uRXJyb3I6OlBPU0lUSU9OX1VO QVZBSUxBQkxFLCBlcnJvci0+bWVzc2FnZSk7CiAgICAgICAgIGdfb2JqZWN0X3VucmVmKGNsaWVu dCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICBtX2dlb2NsdWVQb3NpdGlv biA9IGdlb2NsdWVfbWFzdGVyX2NsaWVudF9jcmVhdGVfcG9zaXRpb24oY2xpZW50LCAmZXJyb3Iu b3V0UHRyKCkpOwogICAgIGlmICghbV9nZW9jbHVlUG9zaXRpb24pIHsKICAgICAgICAgc2V0RXJy b3IoUG9zaXRpb25FcnJvcjo6UE9TSVRJT05fVU5BVkFJTEFCTEUsIGVycm9yLT5tZXNzYWdlKTsK ICAgICAgICAgZ19vYmplY3RfdW5yZWYoY2xpZW50KTsKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KIAorICAgIG1fZ2VvY2x1ZUNsaWVudCA9IGNsaWVudDsKKworICAgIGdlb2NsdWVfcG9z aXRpb25fZ2V0X3Bvc2l0aW9uX2FzeW5jKG1fZ2VvY2x1ZVBvc2l0aW9uLCAoR2VvY2x1ZVBvc2l0 aW9uQ2FsbGJhY2spZ2V0X3Bvc2l0aW9uLCB0aGlzKTsKKwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qo R19PQkpFQ1QobV9nZW9jbHVlUG9zaXRpb24pLCAicG9zaXRpb24tY2hhbmdlZCIsCiAgICAgICAg ICAgICAgICAgICAgICBHX0NBTExCQUNLKHBvc2l0aW9uX2NoYW5nZWQpLCB0aGlzKTsKIAotICAg IG1fZ2VvY2x1ZUNsaWVudCA9IGNsaWVudDsKLSAgICB1cGRhdGVMb2NhdGlvbkluZm9ybWF0aW9u KCk7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAogdm9pZCBHZW9sb2NhdGlvblNlcnZpY2VHdGs6 OnN0b3BVcGRhdGluZygpCiB7CiAgICAgaWYgKCFtX2dlb2NsdWVDbGllbnQpCiAgICAgICAgIHJl dHVybjsKIApAQCAtMTUxLDQ5ICsxNTIsNDUgQEAgR2VvcG9zaXRpb24qIEdlb2xvY2F0aW9uU2Vy dmljZUd0azo6bGFzdFBvc2l0aW9uKCkgY29uc3QKICAgICByZXR1cm4gbV9sYXN0UG9zaXRpb24u Z2V0KCk7CiB9CiAKIFBvc2l0aW9uRXJyb3IqIEdlb2xvY2F0aW9uU2VydmljZUd0azo6bGFzdEVy cm9yKCkgY29uc3QKIHsKICAgICByZXR1cm4gbV9sYXN0RXJyb3IuZ2V0KCk7CiB9CiAKLXZvaWQg R2VvbG9jYXRpb25TZXJ2aWNlR3RrOjp1cGRhdGVMb2NhdGlvbkluZm9ybWF0aW9uKCkKLXsKLSAg ICBBU1NFUlQobV9nZW9jbHVlUG9zaXRpb24pOwotCi0gICAgR093blB0cjxHRXJyb3I+IGVycm9y OwotICAgIEdPd25QdHI8R2VvY2x1ZUFjY3VyYWN5PiBhY2N1cmFjeTsKLQotICAgIEdlb2NsdWVQ b3NpdGlvbkZpZWxkcyBmaWVsZHMgPSBnZW9jbHVlX3Bvc2l0aW9uX2dldF9wb3NpdGlvbihtX2dl b2NsdWVQb3NpdGlvbiwgJm1fdGltZXN0YW1wLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmbV9sYXRpdHVkZSwgJm1fbG9u Z2l0dWRlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAmbV9hbHRpdHVkZSwgJmFjY3VyYWN5Lm91dFB0cigpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAmZXJyb3Iub3V0UHRyKCkpOwotICAgIGlmIChlcnJvcikgewotICAgICAgICBzZXRFcnJvcihQ b3NpdGlvbkVycm9yOjpQT1NJVElPTl9VTkFWQUlMQUJMRSwgZXJyb3ItPm1lc3NhZ2UpOwotICAg ICAgICByZXR1cm47Ci0gICAgfSBlbHNlIGlmICghKGZpZWxkcyAmIEdFT0NMVUVfUE9TSVRJT05f RklFTERTX0xBVElUVURFICYmIGZpZWxkcyAmIEdFT0NMVUVfUE9TSVRJT05fRklFTERTX0xPTkdJ VFVERSkpIHsKLSAgICAgICAgc2V0RXJyb3IoUG9zaXRpb25FcnJvcjo6UE9TSVRJT05fVU5BVkFJ TEFCTEUsICJQb3NpdGlvbiBjb3VsZCBub3QgYmUgZGV0ZXJtaW5lZC4iKTsKLSAgICAgICAgcmV0 dXJuOwotICAgIH0KLQotCi19Ci0KIHZvaWQgR2VvbG9jYXRpb25TZXJ2aWNlR3RrOjp1cGRhdGVQ b3NpdGlvbigpCiB7CiAgICAgbV9sYXN0RXJyb3IgPSAwOwogCiAgICAgUmVmUHRyPENvb3JkaW5h dGVzPiBjb29yZGluYXRlcyA9IENvb3JkaW5hdGVzOjpjcmVhdGUobV9sYXRpdHVkZSwgbV9sb25n aXR1ZGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgdHJ1ZSwgbV9hbHRpdHVkZSwgbV9hY2N1cmFjeSwKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB0cnVlLCBtX2FsdGl0dWRl QWNjdXJhY3ksIGZhbHNlLCAwLjAsIGZhbHNlLCAwLjApOwogICAgIG1fbGFzdFBvc2l0aW9uID0g R2VvcG9zaXRpb246OmNyZWF0ZShjb29yZGluYXRlcy5yZWxlYXNlKCksIG1fdGltZXN0YW1wICog MTAwMC4wKTsKICAgICBwb3NpdGlvbkNoYW5nZWQoKTsKIH0KIAordm9pZCBHZW9sb2NhdGlvblNl cnZpY2VHdGs6OmdldF9wb3NpdGlvbihHZW9jbHVlUG9zaXRpb24gKnBvc2l0aW9uLAorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHZW9jbHVlUG9zaXRpb25GaWVsZHMg ZmllbGRzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbnQgdGlt ZXN0YW1wLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBkb3VibGUg bGF0aXR1ZGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJs ZSBsb25naXR1ZGUsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRv dWJsZSBhbHRpdHVkZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg R2VvY2x1ZUFjY3VyYWN5KiBhY2N1cmFjeSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgR0Vycm9yKiBlcnJvciwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgR2VvbG9jYXRpb25TZXJ2aWNlR3RrKiB0aGF0KQoreworICAgIGlmIChlcnJv cikgeworICAgICAgICB0aGF0LT5zZXRFcnJvcihQb3NpdGlvbkVycm9yOjpQT1NJVElPTl9VTkFW QUlMQUJMRSwgZXJyb3ItPm1lc3NhZ2UpOworICAgICAgICBnX2Vycm9yX2ZyZWUoZXJyb3IpOwor ICAgICAgICByZXR1cm47CisgICAgfQorICAgIHBvc2l0aW9uX2NoYW5nZWQocG9zaXRpb24sIGZp ZWxkcywgdGltZXN0YW1wLCBsYXRpdHVkZSwgbG9uZ2l0dWRlLCBhbHRpdHVkZSwgYWNjdXJhY3ks IHRoYXQpOworfQorCiB2b2lkIEdlb2xvY2F0aW9uU2VydmljZUd0azo6cG9zaXRpb25fY2hhbmdl ZChHZW9jbHVlUG9zaXRpb24qLCBHZW9jbHVlUG9zaXRpb25GaWVsZHMgZmllbGRzLCBpbnQgdGlt ZXN0YW1wLCBkb3VibGUgbGF0aXR1ZGUsIGRvdWJsZSBsb25naXR1ZGUsIGRvdWJsZSBhbHRpdHVk ZSwgR2VvY2x1ZUFjY3VyYWN5KiBhY2N1cmFjeSwgR2VvbG9jYXRpb25TZXJ2aWNlR3RrKiB0aGF0 KQogewogICAgIGlmICghKGZpZWxkcyAmIEdFT0NMVUVfUE9TSVRJT05fRklFTERTX0xBVElUVURF ICYmIGZpZWxkcyAmIEdFT0NMVUVfUE9TSVRJT05fRklFTERTX0xPTkdJVFVERSkpIHsKICAgICAg ICAgdGhhdC0+c2V0RXJyb3IoUG9zaXRpb25FcnJvcjo6UE9TSVRJT05fVU5BVkFJTEFCTEUsICJQ b3NpdGlvbiBjb3VsZCBub3QgYmUgZGV0ZXJtaW5lZC4iKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAogICAgIHRoYXQtPm1fdGltZXN0YW1wID0gdGltZXN0YW1wOwpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2aWNlR3RrLmggYi9XZWJDb3JlL3BsYXRm b3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuaAppbmRleCBhMTk4ZGMwLi5hNmZkMzIyIDEw MDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuaAor KysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuaApAQCAtNDEs MjEgKzQxLDIxIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdmlydHVhbCB2b2lkIHJl c3VtZSgpOwogCiAgICAgICAgIEdlb3Bvc2l0aW9uKiBsYXN0UG9zaXRpb24oKSBjb25zdDsKICAg ICAgICAgUG9zaXRpb25FcnJvciogbGFzdEVycm9yKCkgY29uc3Q7CiAKICAgICBwcml2YXRlOgog ICAgICAgICBHZW9sb2NhdGlvblNlcnZpY2VHdGsoR2VvbG9jYXRpb25TZXJ2aWNlQ2xpZW50Kik7 CiAKLSAgICAgICAgdm9pZCB1cGRhdGVMb2NhdGlvbkluZm9ybWF0aW9uKCk7CiAgICAgICAgIHZv aWQgc2V0RXJyb3IoUG9zaXRpb25FcnJvcjo6RXJyb3JDb2RlLCBjb25zdCBjaGFyKiBtZXNzYWdl KTsKICAgICAgICAgdm9pZCB1cGRhdGVQb3NpdGlvbigpOwogCiAgICAgICAgIHN0YXRpYyB2b2lk IHBvc2l0aW9uX2NoYW5nZWQoR2VvY2x1ZVBvc2l0aW9uKiwgR2VvY2x1ZVBvc2l0aW9uRmllbGRz LCBpbnQsIGRvdWJsZSwgZG91YmxlLCBkb3VibGUsIEdlb2NsdWVBY2N1cmFjeSosIEdlb2xvY2F0 aW9uU2VydmljZUd0ayopOworICAgICAgICBzdGF0aWMgdm9pZCBnZXRfcG9zaXRpb24oR2VvY2x1 ZVBvc2l0aW9uKiwgR2VvY2x1ZVBvc2l0aW9uRmllbGRzLCBpbnQsIGRvdWJsZSwgZG91YmxlLCBk b3VibGUsIEdlb2NsdWVBY2N1cmFjeSosIEdFcnJvciosIEdlb2xvY2F0aW9uU2VydmljZUd0ayop OwogCiAgICAgcHJpdmF0ZToKICAgICAgICAgUmVmUHRyPEdlb3Bvc2l0aW9uPiBtX2xhc3RQb3Np dGlvbjsKICAgICAgICAgUmVmUHRyPFBvc2l0aW9uRXJyb3I+IG1fbGFzdEVycm9yOwogCiAgICAg ICAgIC8vIHN0YXRlIG9iamVjdHMKICAgICAgICAgR2VvY2x1ZU1hc3RlckNsaWVudCogbV9nZW9j bHVlQ2xpZW50OwogICAgICAgICBHZW9jbHVlUG9zaXRpb24qIG1fZ2VvY2x1ZVBvc2l0aW9uOwot LSAKMS43LjAKCg== 49322 2010-02-23 13:29:02 -0800 2010-02-23 22:19:23 -0800 patch v1.2 35191.patch text/plain 5104 a.renevier ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Yzg5MzkwYi4uNWM4OGZiZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMi0yNCAgQXJubyBSZW5ldmll ciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtHdGtdIHVzZSBnZW9jbHVlIHByb3ZpZGVycyB3aXRoIGRvbid0IHBy b3ZpZGUgdXBkYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNTE5MQorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4gKE9PUFMhKQorCisgICAgICAgICog cGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpHZW9sb2NhdGlvblNlcnZpY2VHdGs6OnN0YXJ0VXBkYXRpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6R2VvbG9jYXRpb25TZXJ2aWNlR3RrOjpnZXRfcG9zaXRpb24pOgorICAgICAgICAqIHBsYXRm b3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuaDoKKwogMjAxMC0wMi0yMyAgQXJubyBSZW5l dmllciAgPGFybm9AcmVuZXZpZXIubmV0PgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2 aWNlR3RrLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5j cHAKaW5kZXggZWRiOGQxMC4uOTRhY2U1ZiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvR2VvbG9jYXRpb25TZXJ2aWNlR3RrLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL2d0ay9H ZW9sb2NhdGlvblNlcnZpY2VHdGsuY3BwCkBAIC05OCw3ICs5OCw3IEBAIGJvb2wgR2VvbG9jYXRp b25TZXJ2aWNlR3RrOjpzdGFydFVwZGF0aW5nKFBvc2l0aW9uT3B0aW9ucyogb3B0aW9ucykKICAg ICB9CiAKICAgICBnYm9vbGVhbiByZXN1bHQgPSBnZW9jbHVlX21hc3Rlcl9jbGllbnRfc2V0X3Jl cXVpcmVtZW50cyhjbGllbnQsIGFjY3VyYWN5TGV2ZWwsIHRpbWVvdXQsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdHJ1ZSwgR0VP Q0xVRV9SRVNPVVJDRV9BTEwsICZlcnJvci5vdXRQdHIoKSk7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZmFsc2UsIEdFT0NMVUVf UkVTT1VSQ0VfQUxMLCAmZXJyb3Iub3V0UHRyKCkpOwogCiAgICAgaWYgKCFyZXN1bHQpIHsKICAg ICAgICAgc2V0RXJyb3IoUG9zaXRpb25FcnJvcjo6UE9TSVRJT05fVU5BVkFJTEFCTEUsIGVycm9y LT5tZXNzYWdlKTsKQEAgLTExMywxMiArMTEzLDEzIEBAIGJvb2wgR2VvbG9jYXRpb25TZXJ2aWNl R3RrOjpzdGFydFVwZGF0aW5nKFBvc2l0aW9uT3B0aW9ucyogb3B0aW9ucykKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KIAorICAgIG1fZ2VvY2x1ZUNsaWVudCA9IGNsaWVudDsKKworICAg IGdlb2NsdWVfcG9zaXRpb25fZ2V0X3Bvc2l0aW9uX2FzeW5jKG1fZ2VvY2x1ZVBvc2l0aW9uLCAo R2VvY2x1ZVBvc2l0aW9uQ2FsbGJhY2spZ2V0X3Bvc2l0aW9uLCB0aGlzKTsKKwogICAgIGdfc2ln bmFsX2Nvbm5lY3QoR19PQkpFQ1QobV9nZW9jbHVlUG9zaXRpb24pLCAicG9zaXRpb24tY2hhbmdl ZCIsCiAgICAgICAgICAgICAgICAgICAgICBHX0NBTExCQUNLKHBvc2l0aW9uX2NoYW5nZWQpLCB0 aGlzKTsKIAotICAgIG1fZ2VvY2x1ZUNsaWVudCA9IGNsaWVudDsKLSAgICB1cGRhdGVMb2NhdGlv bkluZm9ybWF0aW9uKCk7Ci0KICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtMTU2LDI4ICsxNTcs NiBAQCBQb3NpdGlvbkVycm9yKiBHZW9sb2NhdGlvblNlcnZpY2VHdGs6Omxhc3RFcnJvcigpIGNv bnN0CiAgICAgcmV0dXJuIG1fbGFzdEVycm9yLmdldCgpOwogfQogCi12b2lkIEdlb2xvY2F0aW9u U2VydmljZUd0azo6dXBkYXRlTG9jYXRpb25JbmZvcm1hdGlvbigpCi17Ci0gICAgQVNTRVJUKG1f Z2VvY2x1ZVBvc2l0aW9uKTsKLQotICAgIEdPd25QdHI8R0Vycm9yPiBlcnJvcjsKLSAgICBHT3du UHRyPEdlb2NsdWVBY2N1cmFjeT4gYWNjdXJhY3k7Ci0KLSAgICBHZW9jbHVlUG9zaXRpb25GaWVs ZHMgZmllbGRzID0gZ2VvY2x1ZV9wb3NpdGlvbl9nZXRfcG9zaXRpb24obV9nZW9jbHVlUG9zaXRp b24sICZtX3RpbWVzdGFtcCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgJm1fbGF0aXR1ZGUsICZtX2xvbmdpdHVkZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgJm1fYWx0aXR1ZGUsICZhY2N1cmFjeS5vdXRQdHIoKSwKLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJmVycm9yLm91 dFB0cigpKTsKLSAgICBpZiAoZXJyb3IpIHsKLSAgICAgICAgc2V0RXJyb3IoUG9zaXRpb25FcnJv cjo6UE9TSVRJT05fVU5BVkFJTEFCTEUsIGVycm9yLT5tZXNzYWdlKTsKLSAgICAgICAgcmV0dXJu OwotICAgIH0gZWxzZSBpZiAoIShmaWVsZHMgJiBHRU9DTFVFX1BPU0lUSU9OX0ZJRUxEU19MQVRJ VFVERSAmJiBmaWVsZHMgJiBHRU9DTFVFX1BPU0lUSU9OX0ZJRUxEU19MT05HSVRVREUpKSB7Ci0g ICAgICAgIHNldEVycm9yKFBvc2l0aW9uRXJyb3I6OlBPU0lUSU9OX1VOQVZBSUxBQkxFLCAiUG9z aXRpb24gY291bGQgbm90IGJlIGRldGVybWluZWQuIik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9 Ci0KLQotfQotCiB2b2lkIEdlb2xvY2F0aW9uU2VydmljZUd0azo6dXBkYXRlUG9zaXRpb24oKQog ewogICAgIG1fbGFzdEVycm9yID0gMDsKQEAgLTE4OSw2ICsxNjgsMjQgQEAgdm9pZCBHZW9sb2Nh dGlvblNlcnZpY2VHdGs6OnVwZGF0ZVBvc2l0aW9uKCkKICAgICBwb3NpdGlvbkNoYW5nZWQoKTsK IH0KIAordm9pZCBHZW9sb2NhdGlvblNlcnZpY2VHdGs6OmdldF9wb3NpdGlvbihHZW9jbHVlUG9z aXRpb24gKnBvc2l0aW9uLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBHZW9jbHVlUG9zaXRpb25GaWVsZHMgZmllbGRzLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBpbnQgdGltZXN0YW1wLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBkb3VibGUgbGF0aXR1ZGUsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGRvdWJsZSBsb25naXR1ZGUsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBhbHRpdHVkZSwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgR2VvY2x1ZUFjY3VyYWN5KiBhY2N1cmFjeSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR0Vycm9yKiBlcnJvciwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgR2VvbG9jYXRpb25TZXJ2aWNlR3Rr KiB0aGF0KQoreworICAgIGlmIChlcnJvcikgeworICAgICAgICB0aGF0LT5zZXRFcnJvcihQb3Np dGlvbkVycm9yOjpQT1NJVElPTl9VTkFWQUlMQUJMRSwgZXJyb3ItPm1lc3NhZ2UpOworICAgICAg ICBnX2Vycm9yX2ZyZWUoZXJyb3IpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIHBvc2l0 aW9uX2NoYW5nZWQocG9zaXRpb24sIGZpZWxkcywgdGltZXN0YW1wLCBsYXRpdHVkZSwgbG9uZ2l0 dWRlLCBhbHRpdHVkZSwgYWNjdXJhY3ksIHRoYXQpOworfQorCiB2b2lkIEdlb2xvY2F0aW9uU2Vy dmljZUd0azo6cG9zaXRpb25fY2hhbmdlZChHZW9jbHVlUG9zaXRpb24qLCBHZW9jbHVlUG9zaXRp b25GaWVsZHMgZmllbGRzLCBpbnQgdGltZXN0YW1wLCBkb3VibGUgbGF0aXR1ZGUsIGRvdWJsZSBs b25naXR1ZGUsIGRvdWJsZSBhbHRpdHVkZSwgR2VvY2x1ZUFjY3VyYWN5KiBhY2N1cmFjeSwgR2Vv bG9jYXRpb25TZXJ2aWNlR3RrKiB0aGF0KQogewogICAgIGlmICghKGZpZWxkcyAmIEdFT0NMVUVf UE9TSVRJT05fRklFTERTX0xBVElUVURFICYmIGZpZWxkcyAmIEdFT0NMVUVfUE9TSVRJT05fRklF TERTX0xPTkdJVFVERSkpIHsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dlb2xv Y2F0aW9uU2VydmljZUd0ay5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2 aWNlR3RrLmgKaW5kZXggYTE5OGRjMC4uYTZmZDMyMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2aWNlR3RrLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9n dGsvR2VvbG9jYXRpb25TZXJ2aWNlR3RrLmgKQEAgLTQ2LDExICs0NiwxMSBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgcHJpdmF0ZToKICAgICAgICAgR2VvbG9jYXRpb25TZXJ2aWNlR3RrKEdl b2xvY2F0aW9uU2VydmljZUNsaWVudCopOwogCi0gICAgICAgIHZvaWQgdXBkYXRlTG9jYXRpb25J bmZvcm1hdGlvbigpOwogICAgICAgICB2b2lkIHNldEVycm9yKFBvc2l0aW9uRXJyb3I6OkVycm9y Q29kZSwgY29uc3QgY2hhciogbWVzc2FnZSk7CiAgICAgICAgIHZvaWQgdXBkYXRlUG9zaXRpb24o KTsKIAogICAgICAgICBzdGF0aWMgdm9pZCBwb3NpdGlvbl9jaGFuZ2VkKEdlb2NsdWVQb3NpdGlv biosIEdlb2NsdWVQb3NpdGlvbkZpZWxkcywgaW50LCBkb3VibGUsIGRvdWJsZSwgZG91YmxlLCBH ZW9jbHVlQWNjdXJhY3kqLCBHZW9sb2NhdGlvblNlcnZpY2VHdGsqKTsKKyAgICAgICAgc3RhdGlj IHZvaWQgZ2V0X3Bvc2l0aW9uKEdlb2NsdWVQb3NpdGlvbiosIEdlb2NsdWVQb3NpdGlvbkZpZWxk cywgaW50LCBkb3VibGUsIGRvdWJsZSwgZG91YmxlLCBHZW9jbHVlQWNjdXJhY3kqLCBHRXJyb3Iq LCBHZW9sb2NhdGlvblNlcnZpY2VHdGsqKTsKIAogICAgIHByaXZhdGU6CiAgICAgICAgIFJlZlB0 cjxHZW9wb3NpdGlvbj4gbV9sYXN0UG9zaXRpb247Cg== 49357 2010-02-23 22:19:23 -0800 2010-02-26 12:10:25 -0800 patch v1.3 35191.patch text/plain 5121 a.renevier ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmY5YWE4NC4uMTZkM2U3ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wMi0yNCAgQXJubyBSZW5ldmll ciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFtHdGtdIHVzZSBnZW9jbHVlIHByb3ZpZGVycyB3aXRoIGRvbid0IHBy b3ZpZGUgdXBkYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zNTE5MQorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYmVoYXZpb3VyIGRlcGVuZHMgb24g c3lzdGVtLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5j cHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvblNlcnZpY2VHdGs6OnN0YXJ0VXBkYXRp bmcpOgorICAgICAgICAoV2ViQ29yZTo6R2VvbG9jYXRpb25TZXJ2aWNlR3RrOjpnZXRfcG9zaXRp b24pOgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuaDoKKwog MjAxMC0wMi0yMyAgRXZhbiBNYXJ0aW4gIDxldmFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBKZXJlbXkgT3Jsb3cuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR2VvbG9j YXRpb25TZXJ2aWNlR3RrLmNwcAppbmRleCBlZGI4ZDEwLi45NGFjZTVmIDEwMDY0NAotLS0gYS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuY3BwCisrKyBiL1dlYkNv cmUvcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5jcHAKQEAgLTk4LDcgKzk4LDcg QEAgYm9vbCBHZW9sb2NhdGlvblNlcnZpY2VHdGs6OnN0YXJ0VXBkYXRpbmcoUG9zaXRpb25PcHRp b25zKiBvcHRpb25zKQogICAgIH0KIAogICAgIGdib29sZWFuIHJlc3VsdCA9IGdlb2NsdWVfbWFz dGVyX2NsaWVudF9zZXRfcmVxdWlyZW1lbnRzKGNsaWVudCwgYWNjdXJhY3lMZXZlbCwgdGltZW91 dCwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB0cnVlLCBHRU9DTFVFX1JFU09VUkNFX0FMTCwgJmVycm9yLm91dFB0cigpKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBmYWxzZSwgR0VPQ0xVRV9SRVNPVVJDRV9BTEwsICZlcnJvci5vdXRQdHIoKSk7CiAKICAgICBp ZiAoIXJlc3VsdCkgewogICAgICAgICBzZXRFcnJvcihQb3NpdGlvbkVycm9yOjpQT1NJVElPTl9V TkFWQUlMQUJMRSwgZXJyb3ItPm1lc3NhZ2UpOwpAQCAtMTEzLDEyICsxMTMsMTMgQEAgYm9vbCBH ZW9sb2NhdGlvblNlcnZpY2VHdGs6OnN0YXJ0VXBkYXRpbmcoUG9zaXRpb25PcHRpb25zKiBvcHRp b25zKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCisgICAgbV9nZW9jbHVlQ2xpZW50 ID0gY2xpZW50OworCisgICAgZ2VvY2x1ZV9wb3NpdGlvbl9nZXRfcG9zaXRpb25fYXN5bmMobV9n ZW9jbHVlUG9zaXRpb24sIChHZW9jbHVlUG9zaXRpb25DYWxsYmFjaylnZXRfcG9zaXRpb24sIHRo aXMpOworCiAgICAgZ19zaWduYWxfY29ubmVjdChHX09CSkVDVChtX2dlb2NsdWVQb3NpdGlvbiks ICJwb3NpdGlvbi1jaGFuZ2VkIiwKICAgICAgICAgICAgICAgICAgICAgIEdfQ0FMTEJBQ0socG9z aXRpb25fY2hhbmdlZCksIHRoaXMpOwogCi0gICAgbV9nZW9jbHVlQ2xpZW50ID0gY2xpZW50Owot ICAgIHVwZGF0ZUxvY2F0aW9uSW5mb3JtYXRpb24oKTsKLQogICAgIHJldHVybiB0cnVlOwogfQog CkBAIC0xNTYsMjggKzE1Nyw2IEBAIFBvc2l0aW9uRXJyb3IqIEdlb2xvY2F0aW9uU2VydmljZUd0 azo6bGFzdEVycm9yKCkgY29uc3QKICAgICByZXR1cm4gbV9sYXN0RXJyb3IuZ2V0KCk7CiB9CiAK LXZvaWQgR2VvbG9jYXRpb25TZXJ2aWNlR3RrOjp1cGRhdGVMb2NhdGlvbkluZm9ybWF0aW9uKCkK LXsKLSAgICBBU1NFUlQobV9nZW9jbHVlUG9zaXRpb24pOwotCi0gICAgR093blB0cjxHRXJyb3I+ IGVycm9yOwotICAgIEdPd25QdHI8R2VvY2x1ZUFjY3VyYWN5PiBhY2N1cmFjeTsKLQotICAgIEdl b2NsdWVQb3NpdGlvbkZpZWxkcyBmaWVsZHMgPSBnZW9jbHVlX3Bvc2l0aW9uX2dldF9wb3NpdGlv bihtX2dlb2NsdWVQb3NpdGlvbiwgJm1fdGltZXN0YW1wLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmbV9sYXRpdHVkZSwg Jm1fbG9uZ2l0dWRlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAmbV9hbHRpdHVkZSwgJmFjY3VyYWN5Lm91dFB0cigpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAmZXJyb3Iub3V0UHRyKCkpOwotICAgIGlmIChlcnJvcikgewotICAgICAgICBzZXRF cnJvcihQb3NpdGlvbkVycm9yOjpQT1NJVElPTl9VTkFWQUlMQUJMRSwgZXJyb3ItPm1lc3NhZ2Up OwotICAgICAgICByZXR1cm47Ci0gICAgfSBlbHNlIGlmICghKGZpZWxkcyAmIEdFT0NMVUVfUE9T SVRJT05fRklFTERTX0xBVElUVURFICYmIGZpZWxkcyAmIEdFT0NMVUVfUE9TSVRJT05fRklFTERT X0xPTkdJVFVERSkpIHsKLSAgICAgICAgc2V0RXJyb3IoUG9zaXRpb25FcnJvcjo6UE9TSVRJT05f VU5BVkFJTEFCTEUsICJQb3NpdGlvbiBjb3VsZCBub3QgYmUgZGV0ZXJtaW5lZC4iKTsKLSAgICAg ICAgcmV0dXJuOwotICAgIH0KLQotCi19Ci0KIHZvaWQgR2VvbG9jYXRpb25TZXJ2aWNlR3RrOjp1 cGRhdGVQb3NpdGlvbigpCiB7CiAgICAgbV9sYXN0RXJyb3IgPSAwOwpAQCAtMTg5LDYgKzE2OCwy NCBAQCB2b2lkIEdlb2xvY2F0aW9uU2VydmljZUd0azo6dXBkYXRlUG9zaXRpb24oKQogICAgIHBv c2l0aW9uQ2hhbmdlZCgpOwogfQogCit2b2lkIEdlb2xvY2F0aW9uU2VydmljZUd0azo6Z2V0X3Bv c2l0aW9uKEdlb2NsdWVQb3NpdGlvbiAqcG9zaXRpb24sCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIEdlb2NsdWVQb3NpdGlvbkZpZWxkcyBmaWVsZHMsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludCB0aW1lc3RhbXAsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvdWJsZSBsYXRpdHVkZSwKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIGxvbmdpdHVkZSwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZG91YmxlIGFsdGl0dWRlLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHZW9jbHVlQWNjdXJhY3kq IGFjY3VyYWN5LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHRXJy b3IqIGVycm9yLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBHZW9s b2NhdGlvblNlcnZpY2VHdGsqIHRoYXQpCit7CisgICAgaWYgKGVycm9yKSB7CisgICAgICAgIHRo YXQtPnNldEVycm9yKFBvc2l0aW9uRXJyb3I6OlBPU0lUSU9OX1VOQVZBSUxBQkxFLCBlcnJvci0+ bWVzc2FnZSk7CisgICAgICAgIGdfZXJyb3JfZnJlZShlcnJvcik7CisgICAgICAgIHJldHVybjsK KyAgICB9CisgICAgcG9zaXRpb25fY2hhbmdlZChwb3NpdGlvbiwgZmllbGRzLCB0aW1lc3RhbXAs IGxhdGl0dWRlLCBsb25naXR1ZGUsIGFsdGl0dWRlLCBhY2N1cmFjeSwgdGhhdCk7Cit9CisKIHZv aWQgR2VvbG9jYXRpb25TZXJ2aWNlR3RrOjpwb3NpdGlvbl9jaGFuZ2VkKEdlb2NsdWVQb3NpdGlv biosIEdlb2NsdWVQb3NpdGlvbkZpZWxkcyBmaWVsZHMsIGludCB0aW1lc3RhbXAsIGRvdWJsZSBs YXRpdHVkZSwgZG91YmxlIGxvbmdpdHVkZSwgZG91YmxlIGFsdGl0dWRlLCBHZW9jbHVlQWNjdXJh Y3kqIGFjY3VyYWN5LCBHZW9sb2NhdGlvblNlcnZpY2VHdGsqIHRoYXQpCiB7CiAgICAgaWYgKCEo ZmllbGRzICYgR0VPQ0xVRV9QT1NJVElPTl9GSUVMRFNfTEFUSVRVREUgJiYgZmllbGRzICYgR0VP Q0xVRV9QT1NJVElPTl9GSUVMRFNfTE9OR0lUVURFKSkgewpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2aWNlR3RrLmggYi9XZWJDb3JlL3BsYXRmb3JtL2d0 ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuaAppbmRleCBhMTk4ZGMwLi5hNmZkMzIyIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuaAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuaApAQCAtNDYsMTEgKzQ2 LDExIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBwcml2YXRlOgogICAgICAgICBHZW9sb2Nh dGlvblNlcnZpY2VHdGsoR2VvbG9jYXRpb25TZXJ2aWNlQ2xpZW50Kik7CiAKLSAgICAgICAgdm9p ZCB1cGRhdGVMb2NhdGlvbkluZm9ybWF0aW9uKCk7CiAgICAgICAgIHZvaWQgc2V0RXJyb3IoUG9z aXRpb25FcnJvcjo6RXJyb3JDb2RlLCBjb25zdCBjaGFyKiBtZXNzYWdlKTsKICAgICAgICAgdm9p ZCB1cGRhdGVQb3NpdGlvbigpOwogCiAgICAgICAgIHN0YXRpYyB2b2lkIHBvc2l0aW9uX2NoYW5n ZWQoR2VvY2x1ZVBvc2l0aW9uKiwgR2VvY2x1ZVBvc2l0aW9uRmllbGRzLCBpbnQsIGRvdWJsZSwg ZG91YmxlLCBkb3VibGUsIEdlb2NsdWVBY2N1cmFjeSosIEdlb2xvY2F0aW9uU2VydmljZUd0ayop OworICAgICAgICBzdGF0aWMgdm9pZCBnZXRfcG9zaXRpb24oR2VvY2x1ZVBvc2l0aW9uKiwgR2Vv Y2x1ZVBvc2l0aW9uRmllbGRzLCBpbnQsIGRvdWJsZSwgZG91YmxlLCBkb3VibGUsIEdlb2NsdWVB Y2N1cmFjeSosIEdFcnJvciosIEdlb2xvY2F0aW9uU2VydmljZUd0ayopOwogCiAgICAgcHJpdmF0 ZToKICAgICAgICAgUmVmUHRyPEdlb3Bvc2l0aW9uPiBtX2xhc3RQb3NpdGlvbjsK 49610 2010-02-26 12:10:25 -0800 2010-03-01 13:29:13 -0800 patch v2 0001-Bug-35191.patch text/plain 2380 a.renevier RnJvbSBhMGFiODBjMjFkMDE3OWZmOTllYWZmZDc1NzJhZDZkY2ZkYTA1NGU5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBcm5vIFJlbmV2aWVyIDxhcm5vQHJlbmV2aWVyLm5ldD4KRGF0 ZTogV2VkLCAyNCBGZWIgMjAxMCAyMjoxNzoxNSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIEJ1ZyAj MzUxOTEKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgMTIgKysrKysrKysrKysrCiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNl cnZpY2VHdGsuY3BwIHwgICAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCsp LCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggNDFiNjI3Yy4uMzc4YjI5NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsOCArMSwyMCBAQAorMjAxMC0w Mi0yNCAgQXJubyBSZW5ldmllciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIHVzZSBnZW9jbHVlIHByb3Zp ZGVycyB3aXRoIGRvbid0IHByb3ZpZGUgdXBkYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTE5MQorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYmVo YXZpb3VyIGRlcGVuZHMgb24gc3lzdGVtLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0dlb2xv Y2F0aW9uU2VydmljZUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvblNlcnZp Y2VHdGs6OnN0YXJ0VXBkYXRpbmcpOgorCiAyMDEwLTAyLTI2ICBEaXJrIFNjaHVsemUgIDxrcml0 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTmlrb2xhcyBaaW1tZXJtYW5uLgog CiAgICAgICAgIFNWR1Jlc291cmNlQ2xpcHBlciBuZWVkcyB0byBiZSBtb3ZlZCB0byBSZW5kZXJT VkdSZXNvdXJjZUNsaXBwZXIKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTM1NDIxCiAKICAgICAgICAgTW92ZSBTVkdSZXNvdXJjZUNsaXBwZXIgdG8gUmVu ZGVyU1ZHUmVzb3VyY2VDbGlwcGVyLiBUaGlzIGZvbGxvd3MgdGhlIGNoYW5nZXMKZGlmZiAtLWdp dCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5jcHAgYi9XZWJD b3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuY3BwCmluZGV4IGVkYjhkMTAu LjhlMjg5YjcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2Vy dmljZUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2aWNl R3RrLmNwcApAQCAtOTMsMTcgKzkzLDE3IEBAIGJvb2wgR2VvbG9jYXRpb25TZXJ2aWNlR3RrOjpz dGFydFVwZGF0aW5nKFBvc2l0aW9uT3B0aW9ucyogb3B0aW9ucykKICAgICBHZW9jbHVlQWNjdXJh Y3lMZXZlbCBhY2N1cmFjeUxldmVsID0gR0VPQ0xVRV9BQ0NVUkFDWV9MRVZFTF9MT0NBTElUWTsK ICAgICBpbnQgdGltZW91dCA9IDA7CiAgICAgaWYgKG9wdGlvbnMpIHsKICAgICAgICAgYWNjdXJh Y3lMZXZlbCA9IG9wdGlvbnMtPmVuYWJsZUhpZ2hBY2N1cmFjeSgpID8gR0VPQ0xVRV9BQ0NVUkFD WV9MRVZFTF9ERVRBSUxFRCA6IEdFT0NMVUVfQUNDVVJBQ1lfTEVWRUxfTE9DQUxJVFk7CiAgICAg ICAgIHRpbWVvdXQgPSBvcHRpb25zLT50aW1lb3V0KCk7CiAgICAgfQogCiAgICAgZ2Jvb2xlYW4g cmVzdWx0ID0gZ2VvY2x1ZV9tYXN0ZXJfY2xpZW50X3NldF9yZXF1aXJlbWVudHMoY2xpZW50LCBh Y2N1cmFjeUxldmVsLCB0aW1lb3V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRydWUsIEdFT0NMVUVfUkVTT1VSQ0VfQUxMLCAm ZXJyb3Iub3V0UHRyKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGZhbHNlLCBHRU9DTFVFX1JFU09VUkNFX0FMTCwgJmVycm9y Lm91dFB0cigpKTsKIAogICAgIGlmICghcmVzdWx0KSB7CiAgICAgICAgIHNldEVycm9yKFBvc2l0 aW9uRXJyb3I6OlBPU0lUSU9OX1VOQVZBSUxBQkxFLCBlcnJvci0+bWVzc2FnZSk7CiAgICAgICAg IGdfb2JqZWN0X3VucmVmKGNsaWVudCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAK ICAgICBtX2dlb2NsdWVQb3NpdGlvbiA9IGdlb2NsdWVfbWFzdGVyX2NsaWVudF9jcmVhdGVfcG9z aXRpb24oY2xpZW50LCAmZXJyb3Iub3V0UHRyKCkpOwotLSAKMS43LjAKCg== 49747 2010-03-01 13:29:13 -0800 2010-03-02 18:20:56 -0800 patch v2.1 0001-Bug-35191.patch text/plain 1719 a.renevier RnJvbSBhMTYwY2QyYzcxZDg2YzIzMjAxNDEyODIwMTc1ODk0ZWY2MjI2ODY3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBcm5vIFJlbmV2aWVyIDxhcm5vQHJlbmV2aWVyLm5ldD4KRGF0 ZTogV2VkLCAyNCBGZWIgMjAxMCAyMjoxNzoxNSArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIEJ1ZyAj MzUxOTEKCi0tLQogV2ViQ29yZS9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICB8ICAgMTIgKysrKysrKysrKysrCiBXZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNl cnZpY2VHdGsuY3BwIHwgICAgMiArLQogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25zKCsp LCAxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggZGVjMzA0Mi4uYzhlNjQ3MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMC0w Mi0yNCAgQXJubyBSZW5ldmllciAgPGFybm9AcmVuZXZpZXIubmV0PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtHdGtdIHVzZSBnZW9jbHVlIHByb3Zp ZGVycyB3aXRoIGRvbid0IHByb3ZpZGUgdXBkYXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTE5MQorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgYmVo YXZpb3VyIGRlcGVuZHMgb24gc3lzdGVtLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL0dlb2xv Y2F0aW9uU2VydmljZUd0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHZW9sb2NhdGlvblNlcnZp Y2VHdGs6OnN0YXJ0VXBkYXRpbmcpOgorCiAyMDEwLTAzLTAxICBLZW5uZXRoIFJ1c3NlbGwgIDxr YnJAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBPbGl2ZXIgSHVudC4KZGlmZiAt LWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9uU2VydmljZUd0ay5jcHAgYi9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9HZW9sb2NhdGlvblNlcnZpY2VHdGsuY3BwCmluZGV4IGY5NjFl YmIuLjU5Yzk1MzggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL0dlb2xvY2F0aW9u U2VydmljZUd0ay5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvR2VvbG9jYXRpb25TZXJ2 aWNlR3RrLmNwcApAQCAtOTgsNyArOTgsNyBAQCBib29sIEdlb2xvY2F0aW9uU2VydmljZUd0azo6 c3RhcnRVcGRhdGluZyhQb3NpdGlvbk9wdGlvbnMqIG9wdGlvbnMpCiAgICAgfQogCiAgICAgZ2Jv b2xlYW4gcmVzdWx0ID0gZ2VvY2x1ZV9tYXN0ZXJfY2xpZW50X3NldF9yZXF1aXJlbWVudHMoY2xp ZW50LCBhY2N1cmFjeUxldmVsLCB0aW1lb3V0LAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHRydWUsIEdFT0NMVUVfUkVTT1VSQ0Vf QUxMLCAmZXJyb3Iub3V0UHRyKCkpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGZhbHNlLCBHRU9DTFVFX1JFU09VUkNFX0FMTCwg JmVycm9yLm91dFB0cigpKTsKIAogICAgIGlmICghcmVzdWx0KSB7CiAgICAgICAgIHNldEVycm9y KFBvc2l0aW9uRXJyb3I6OlBPU0lUSU9OX1VOQVZBSUxBQkxFLCBlcnJvci0+bWVzc2FnZSk7Ci0t IAoxLjcuMAoK