32684 2009-12-17 16:14:39 -0800 [Qt] Allow the application to override online/offline network status 2010-01-07 09:30:16 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt P2 Normal --- 1 yael yael hausmann kenneth laszlo.gombos webkit.review.bot oldest_to_newest 172982 0 yael 2009-12-17 16:14:39 -0800 The application should be able to force offline mode even if there is a network connection. 172983 1 45109 yael 2009-12-17 16:25:55 -0800 Created attachment 45109 Patch. Add an attribute to QWebSettings. 173110 2 45109 kenneth 2009-12-18 03:54:14 -0800 Comment on attachment 45109 Patch. Personally I find the name a bit confusing. Also, as the bug touches API you need to make it a blocker on our 4.7 API bug. 173963 3 yael 2009-12-21 07:20:01 -0800 (In reply to comment #2) > (From update of attachment 45109 [details]) > Personally I find the name a bit confusing. Also, as the bug touches API you > need to make it a blocker on our 4.7 API bug. This API is temporary for S60. QNAM will provide the final version of the API, and when that is released, we would not need to use this API anymore. 175487 4 45109 hausmann 2009-12-29 03:22:52 -0800 Comment on attachment 45109 Patch. If this is temporary until QNAM supports it, then it should be made private API, not public API. 175966 5 laszlo.gombos 2009-12-30 10:16:20 -0800 I do not see an easy way to create a "non-public setting" so maybe a simple qt_networkAccessAllowed(bool) API will do. qt_networkAccessAllowed need also be listed in the Symbian def files so that they are exported (see symbian/bwins/QtWebKitu.def and symbian/eabi/QtWebKitu.def). I think patch does not need the ENABLE(QT_BEARER) guard. Yael, Can you recreate the patch ? - it should apply against http://gitorious.org/+qtwebkit-developers/webkit/qtwebkit. Thanks. 176078 6 yael 2009-12-30 16:00:34 -0800 Thank you for your comments. Can someone please tell me how does bearer management get included in the gitorious builds? I noticed that the first patch was removed from the build in r52654. 176168 7 kenneth 2009-12-31 04:26:08 -0800 (In reply to comment #5) > I do not see an easy way to create a "non-public setting" so maybe a simple > qt_networkAccessAllowed(bool) API will do. That would be my suggestion :-) 177654 8 45969 yael 2010-01-06 11:10:52 -0800 Created attachment 45969 Patch v2 Updated the patch to use private API. I am not comfortable with removing the build time flag for this patch, because if the patch was committed to the trunk, we would want to keep these flags. 177672 9 laszlo.gombos 2010-01-06 11:44:46 -0800 (In reply to comment #8) > Created an attachment (id=45969) [details] > Patch v2 I think this patch will need a def file update for Symbian. Just a nit - no need to cache the networkAccessAllowed state info in qwebsettings.cpp. Also, even though this was prepared specifically for 4.6. branch, we might want to consider landing on the trunk as well (with the private API). 177677 10 yael 2010-01-06 11:51:37 -0800 (In reply to comment #9) > Also, even though this was prepared specifically for 4.6. branch, we might want > to consider landing on the trunk as well (with the private API). We are negotiating with Bearer Management team a new API, that will eliminate the need for this patch. It was created strictly as a short-term stop gap. Once we have the new Bearer Management API available, this patch will not be needed at all. 177680 11 kenneth 2010-01-06 11:56:25 -0800 (In reply to comment #10) > (In reply to comment #9) > > Also, even though this was prepared specifically for 4.6. branch, we might want > > to consider landing on the trunk as well (with the private API). > > We are negotiating with Bearer Management team a new API, that will eliminate > the need for this patch. It was created strictly as a short-term stop gap. Once > we have the new Bearer Management API available, this patch will not be needed > at all. But if this is not committed then I cannot build anything requiring 2010.1 using trunk right? If that is the case, we should add it to trunk. 177692 12 yael 2010-01-06 12:11:01 -0800 (In reply to comment #11) > (In reply to comment #10) > > (In reply to comment #9) > > > Also, even though this was prepared specifically for 4.6. branch, we might want > > > to consider landing on the trunk as well (with the private API). > > > > We are negotiating with Bearer Management team a new API, that will eliminate > > the need for this patch. It was created strictly as a short-term stop gap. Once > > we have the new Bearer Management API available, this patch will not be needed > > at all. > > But if this is not committed then I cannot build anything requiring 2010.1 > using trunk right? If that is the case, we should add it to trunk. I would not say "I cannot build anything". This patch is to allow something like "work offline" menu in firefox browser. The dependency for this feature is still under development and I think this is still not ready to go to the trunk. 177792 13 laszlo.gombos 2010-01-06 14:49:47 -0800 Yael promised to create another patch with the (private) API always exposed (not guarded). 178154 14 yael 2010-01-07 05:37:23 -0800 (In reply to comment #13) > Yael promised to create another patch with the (private) API always exposed > (not guarded). Thinking about this a little more, I came to the conclusion that the private API has to stay in QWebSettings and not be moved to NetworkNotifierQt, as we agreed. The reason is simple, when the flag is truned off, that file is not part of the build, so it kind of invalidates comment #15. 178160 15 laszlo.gombos 2010-01-07 05:53:02 -0800 (In reply to comment #14) > (In reply to comment #13) > > Yael promised to create another patch with the (private) API always exposed > > (not guarded). > > Thinking about this a little more, I came to the conclusion that the private > API has to stay in QWebSettings and not be moved to NetworkNotifierQt, as we > agreed. The reason is simple, when the flag is truned off, that file is not > part of the build, so it kind of invalidates comment #15. I was thinking doing something like this - so that the (private) API is always exported: Index: WebKit/qt/Api/qwebsettings.cpp =================================================================== +void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed) +{ +#if ENABLE(QT_BEARER) + networkAccessAllowed = isAllowed; + WebCore::networkStateNotifier().setNetworkAccessAllowed(networkAccessAllowed); +#endif +} 178161 16 yael 2010-01-07 05:55:54 -0800 (In reply to comment #15) > I was thinking doing something like this - so that the (private) API is always > exported: > > Index: WebKit/qt/Api/qwebsettings.cpp > =================================================================== > > +void QWEBKIT_EXPORT qt_networkAccessAllowed(bool isAllowed) > +{ > +#if ENABLE(QT_BEARER) > + networkAccessAllowed = isAllowed; > + > WebCore::networkStateNotifier().setNetworkAccessAllowed(networkAccessAllowed); > +#endif > +} Then we are in agreement:-) last night we talked about moving it to NetwrokNotifierQt, but it will not work. 178207 17 46058 yael 2010-01-07 09:17:44 -0800 Created attachment 46058 Patch v3 Moved the guard to be inside the new private API. people thought it would be better if this patch is landed in webkit.org too, so now it is ready for review. 178212 18 webkit.review.bot 2010-01-07 09:20:28 -0800 style-queue ran check-webkit-style on attachment 46058 without any errors. 178223 19 46058 hausmann 2010-01-07 09:28:43 -0800 Comment on attachment 46058 Patch v3 will apply manually 178224 20 hausmann 2010-01-07 09:29:49 -0800 Committed r52928: <http://trac.webkit.org/changeset/52928> 178225 21 hausmann 2010-01-07 09:30:16 -0800 Cherry-picked into qtwebkit-4.6 as 99ccc1c3e4db5354246720f9b9aa3d282e64497d 45109 2009-12-17 16:25:55 -0800 2010-01-06 11:10:52 -0800 Patch. 32684.patch text/plain 7754 yael SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTIyOTMpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMDktMTItMTcgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQWxsb3cgdGhlIGFwcGxpY2F0aW9uIHRvIG92ZXJyaWRlIG9ubGluZS9vZmZs aW5lIG5ldHdvcmsgc3RhdHVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMjY4NAorCisgICAgICAgIEFkZCBhIHNldHRpbmcgc28gdGhhdCBhcHBsaWNh dGlvbnMgY2FuIG92ZXJpZGUgdGhlIG5ldHdvcmsgc3RhdHVzLgorICAgICAgICBBcHBsaWNhdGlv bnMgdGhhdCB1c2UgdGhpcyBzZXR0aW5nIHN0aWxsIG5lZWQgdG8gYmxvY2sgbmV0d29yayBhY2Nl c3MKKyAgICAgICAgdGhyb3VnaCBRTkFNLgorCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5j cHA6CisgICAgICAgIChRV2ViU2V0dGluZ3NQcml2YXRlOjphcHBseSk6CisgICAgICAgIChRV2Vi U2V0dGluZ3M6OlFXZWJTZXR0aW5ncyk6CisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5oOgor CiAyMDA5LTEyLTE3ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW4ucG91bGFpbkBub2tpYS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2ltb24gSGF1c21hbm4uCkluZGV4OiBXZWJLaXQv cXQvQXBpL3F3ZWJzZXR0aW5ncy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNl dHRpbmdzLmgJKHJldmlzaW9uIDUyMjkxKQorKysgV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3Mu aAkod29ya2luZyBjb3B5KQpAQCAtNjcsNyArNjcsOCBAQAogICAgICAgICBMb2NhbFN0b3JhZ2VE YXRhYmFzZUVuYWJsZWQgPSBMb2NhbFN0b3JhZ2VFbmFibGVkLAogI2VuZGlmCiAgICAgICAgIExv Y2FsQ29udGVudENhbkFjY2Vzc1JlbW90ZVVybHMsCi0gICAgICAgIERuc1ByZWZldGNoRW5hYmxl ZAorICAgICAgICBEbnNQcmVmZXRjaEVuYWJsZWQsCisgICAgICAgIE5ldHdvcmtBY2Nlc3NBbGxv d2VkCiAgICAgfTsKICAgICBlbnVtIFdlYkdyYXBoaWMgewogICAgICAgICBNaXNzaW5nSW1hZ2VH cmFwaGljLApJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkocmV2aXNpb24gNTIyOTEpCisrKyBX ZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3 LDEwIEBACiAjaW5jbHVkZSA8UVVybD4KICNpbmNsdWRlIDxRRmlsZUluZm8+CiAKKyNpZiBFTkFC TEUoUVRfQkVBUkVSKQorI2luY2x1ZGUgIk5ldHdvcmtTdGF0ZU5vdGlmaWVyLmgiCisjZW5kaWYK KwogY2xhc3MgUVdlYlNldHRpbmdzUHJpdmF0ZSB7CiBwdWJsaWM6CiAgICAgUVdlYlNldHRpbmdz UHJpdmF0ZShXZWJDb3JlOjpTZXR0aW5ncyogd2NTZXR0aW5ncyA9IDApCkBAIC0xMzgsNiArMTQy LDEyIEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdsb2JhbC0+YXR0 cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6OkF1dG9Mb2FkSW1hZ2VzKSk7CiAgICAgICAgIHNl dHRpbmdzLT5zZXRMb2Fkc0ltYWdlc0F1dG9tYXRpY2FsbHkodmFsdWUpOwogCisjaWYgRU5BQkxF KFFUX0JFQVJFUikKKyAgICAgICAgdmFsdWUgPSBhdHRyaWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5n czo6TmV0d29ya0FjY2Vzc0FsbG93ZWQsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGdsb2JhbC0+YXR0cmlidXRlcy52YWx1ZShRV2ViU2V0dGluZ3M6Ok5ldHdvcmtBY2Nl c3NBbGxvd2VkKSk7CisgICAgICAgIFdlYkNvcmU6Om5ldHdvcmtTdGF0ZU5vdGlmaWVyKCkuc2V0 TmV0d29ya0FjY2Vzc0FsbG93ZWQodmFsdWUpOworI2VuZGlmCisKICAgICAgICAgdmFsdWUgPSBh dHRyaWJ1dGVzLnZhbHVlKFFXZWJTZXR0aW5nczo6SmF2YXNjcmlwdEVuYWJsZWQsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdsb2JhbC0+YXR0cmlidXRlcy52YWx1ZShR V2ViU2V0dGluZ3M6OkphdmFzY3JpcHRFbmFibGVkKSk7CiAgICAgICAgIHNldHRpbmdzLT5zZXRK YXZhU2NyaXB0RW5hYmxlZCh2YWx1ZSk7CkBAIC0zMTMsNiArMzIzLDkgQEAKICAgICAgICAgd2Vi IHBhZ2VzLgogICAgIFx2YWx1ZSBEbnNQcmVmZXRjaEVuYWJsZWQgU3BlY2lmaWVzIHdoZXRoZXIg UXRXZWJraXQgd2lsbCB0cnkgdG8gcHJlLWZldGNoIEROUyBlbnRyaWVzIHRvCiAgICAgICAgIHNw ZWVkIHVwIGJyb3dzaW5nLiBUaGlzIG9ubHkgd29ya3MgYXMgYSBnbG9iYWwgYXR0cmlidXRlLiBP bmx5IGZvciBRdCA0LjYgYW5kIGxhdGVyLgorICAgIFx2YWx1ZSBOZXR3b3JrQWNjZXNzQWxsb3dl ZCBTcGVjaWZpZXMgd2hldGhlciBRdFdlYmtpdCBjYW4gYWNjZXNzIHRoZSBuZXR3b3JrLAorICAg ICAgICBpZiBpdCBpcyBhdmFpbGFibGUuIFRoaXMgb25seSB3b3JrcyBhcyBhIGdsb2JhbCBhdHRy aWJ1dGUuIE9ubHkgZm9yIFF0IDQuNiBhbmQgbGF0ZXIuCisgICAgICAgIFRoaXMgYXR0cmlidXRl IGlzIGluZm9ybWF0aXZlIG9ubHkuIFRoZSBhY3R1YWwgYmxvY2tpbmcgc3RpbGwgaGFzIHRvIGJl IGRvbmUgYXQgdGhlIFFOQU0gbGV2ZWwuCiAgICAgXHZhbHVlIEphdmFzY3JpcHRFbmFibGVkIEVu YWJsZXMgb3IgZGlzYWJsZXMgdGhlIHJ1bm5pbmcgb2YgSmF2YVNjcmlwdAogICAgICAgICBwcm9n cmFtcy4KICAgICBcdmFsdWUgSmF2YUVuYWJsZWQgRW5hYmxlcyBvciBkaXNhYmxlcyBKYXZhIGFw cGxldHMuCkBAIC0zNjUsNiArMzc4LDcgQEAKIAogICAgIGQtPmF0dHJpYnV0ZXMuaW5zZXJ0KFFX ZWJTZXR0aW5nczo6QXV0b0xvYWRJbWFnZXMsIHRydWUpOwogICAgIGQtPmF0dHJpYnV0ZXMuaW5z ZXJ0KFFXZWJTZXR0aW5nczo6RG5zUHJlZmV0Y2hFbmFibGVkLCBmYWxzZSk7CisgICAgZC0+YXR0 cmlidXRlcy5pbnNlcnQoUVdlYlNldHRpbmdzOjpOZXR3b3JrQWNjZXNzQWxsb3dlZCwgdHJ1ZSk7 CiAgICAgZC0+YXR0cmlidXRlcy5pbnNlcnQoUVdlYlNldHRpbmdzOjpKYXZhc2NyaXB0RW5hYmxl ZCwgdHJ1ZSk7CiAgICAgZC0+YXR0cmlidXRlcy5pbnNlcnQoUVdlYlNldHRpbmdzOjpMaW5rc0lu Y2x1ZGVkSW5Gb2N1c0NoYWluLCB0cnVlKTsKICAgICBkLT5hdHRyaWJ1dGVzLmluc2VydChRV2Vi U2V0dGluZ3M6Olpvb21UZXh0T25seSwgZmFsc2UpOwpJbmRleDogV2ViQ29yZS9DaGFuZ2VMb2cK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDUyMjkzKQorKysgV2Vi Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyMiBAQAorMjAwOS0xMi0x NyAgWWFlbCBBaGFyb24gIDx5YWVsLmFoYXJvbkBub2tpYS5jb20+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBBbGxvdyB0aGUgYXBwbGljYXRp b24gdG8gb3ZlcnJpZGUgb25saW5lL29mZmxpbmUgbmV0d29yayBzdGF0dXMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTMyNjg0CisKKyAgICAgICAgQWRk ZWQgQVBJIHRvIE5ldHdvcmtTdGF0ZU5vdGlmaWVyIGZvciBmb3JjaW5nIG5ldHdvcmsgc3RhdHVz LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RhdGVOb3RpZmllci5oOgor ICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRl Lmg6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclF0 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZTo6TmV0 d29ya1N0YXRlTm90aWZpZXJQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdGF0 ZU5vdGlmaWVyUHJpdmF0ZTo6b25saW5lU3RhdGVDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6 Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZTo6bmV0d29ya0FjY2Vzc1Blcm1pc3Npb25DaGFu Z2VkKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyOjp1cGRhdGVTdGF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllcjo6TmV0d29ya1N0YXRl Tm90aWZpZXIpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0YXRlTm90aWZpZXI6OnNldE5l dHdvcmtBY2Nlc3NBbGxvd2VkKToKKwogMjAwOS0xMi0xNyAgU3RldmUgQmxvY2sgIDxzdGV2ZWJs b2NrQGdvb2dsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJRdC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5v dGlmaWVyUXQuY3BwCShyZXZpc2lvbiA1MjI5MSkKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiAr MzAsNyBAQAogTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlOjpOZXR3b3JrU3RhdGVOb3RpZmll clByaXZhdGUoTmV0d29ya1N0YXRlTm90aWZpZXIqIG5vdGlmaWVyKQogICAgIDogbV9jb25maWd1 cmF0aW9uTWFuYWdlcihuZXcgUU5ldHdvcmtDb25maWd1cmF0aW9uTWFuYWdlcigpKQogICAgICwg bV9vbmxpbmUobV9jb25maWd1cmF0aW9uTWFuYWdlci0+aXNPbmxpbmUoKSkKKyAgICAsIG1fbmV0 d29ya0FjY2Vzc0FsbG93ZWQodHJ1ZSkKICAgICAsIG1fbm90aWZpZXIobm90aWZpZXIpCiB7CiAg ICAgUV9BU1NFUlQobm90aWZpZXIpOwpAQCAtNDIsOSArNDMsMjAgQEAKICAgICAgICAgcmV0dXJu OwogCiAgICAgbV9vbmxpbmUgPSBpc09ubGluZTsKLSAgICBtX25vdGlmaWVyLT51cGRhdGVTdGF0 ZSgpOworICAgIGlmIChtX25ldHdvcmtBY2Nlc3NBbGxvd2VkKQorICAgICAgICBtX25vdGlmaWVy LT51cGRhdGVTdGF0ZSgpOwogfQogCit2b2lkIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZTo6 bmV0d29ya0FjY2Vzc1Blcm1pc3Npb25DaGFuZ2VkKGJvb2wgaXNBbGxvd2VkKQoreworICAgIGlm IChpc0FsbG93ZWQgPT0gbV9uZXR3b3JrQWNjZXNzQWxsb3dlZCkKKyAgICAgICAgcmV0dXJuOwor CisgICAgbV9uZXR3b3JrQWNjZXNzQWxsb3dlZCA9IGlzQWxsb3dlZDsKKyAgICBpZiAobV9vbmxp bmUpCisgICAgICAgIG1fbm90aWZpZXItPnVwZGF0ZVN0YXRlKCk7Cit9CisKIE5ldHdvcmtTdGF0 ZU5vdGlmaWVyUHJpdmF0ZTo6fk5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSgpCiB7CiAgICAg ZGVsZXRlIG1fY29uZmlndXJhdGlvbk1hbmFnZXI7CkBAIC01MiwxMCArNjQsMTAgQEAKIAogdm9p ZCBOZXR3b3JrU3RhdGVOb3RpZmllcjo6dXBkYXRlU3RhdGUoKQogewotICAgIGlmIChtX2lzT25M aW5lID09IHAtPm1fb25saW5lKQorICAgIGlmIChtX2lzT25MaW5lID09IChwLT5tX29ubGluZSAm JiBwLT5tX25ldHdvcmtBY2Nlc3NBbGxvd2VkKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9p c09uTGluZSA9IHAtPm1fb25saW5lOworICAgIG1faXNPbkxpbmUgPSBwLT5tX29ubGluZSAmJiBw LT5tX25ldHdvcmtBY2Nlc3NBbGxvd2VkOwogICAgIGlmIChtX25ldHdvcmtTdGF0ZUNoYW5nZWRG dW5jdGlvbikKICAgICAgICAgbV9uZXR3b3JrU3RhdGVDaGFuZ2VkRnVuY3Rpb24oKTsKIH0KQEAg LTY1LDkgKzc3LDE0IEBACiAgICAgLCBtX25ldHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbigwKQog ewogICAgIHAgPSBuZXcgTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlKHRoaXMpOwotICAgIG1f aXNPbkxpbmUgPSBwLT5tX29ubGluZTsKKyAgICBtX2lzT25MaW5lID0gcC0+bV9vbmxpbmUgJiYg cC0+bV9uZXR3b3JrQWNjZXNzQWxsb3dlZDsKIH0KIAordm9pZCBOZXR3b3JrU3RhdGVOb3RpZmll cjo6c2V0TmV0d29ya0FjY2Vzc0FsbG93ZWQoYm9vbCBpc0FsbG93ZWQpCit7CisgICAgcC0+bmV0 d29ya0FjY2Vzc1Blcm1pc3Npb25DaGFuZ2VkKGlzQWxsb3dlZCk7Cit9CisKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKIAogI2luY2x1ZGUgIm1vY19OZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUu Y3BwIgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlm aWVyUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9O ZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUuaAkocmV2aXNpb24gNTIyOTEpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlLmgJKHdvcmtp bmcgY29weSkKQEAgLTM3LDEwICszNywxMiBAQAogICAgIH5OZXR3b3JrU3RhdGVOb3RpZmllclBy aXZhdGUoKTsKIHB1YmxpYyBzbG90czoKICAgICB2b2lkIG9ubGluZVN0YXRlQ2hhbmdlZChib29s KTsKKyAgICB2b2lkIG5ldHdvcmtBY2Nlc3NQZXJtaXNzaW9uQ2hhbmdlZChib29sKTsKIAogcHVi bGljOgogICAgIFF0TW9iaWxpdHk6OlFOZXR3b3JrQ29uZmlndXJhdGlvbk1hbmFnZXIqIG1fY29u ZmlndXJhdGlvbk1hbmFnZXI7CiAgICAgYm9vbCBtX29ubGluZTsKKyAgICBib29sIG1fbmV0d29y a0FjY2Vzc0FsbG93ZWQ7CiAgICAgTmV0d29ya1N0YXRlTm90aWZpZXIqIG1fbm90aWZpZXI7CiB9 OwogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRlTm90aWZpZXIu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRlTm90 aWZpZXIuaAkocmV2aXNpb24gNTIyOTEpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0 d29ya1N0YXRlTm90aWZpZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTgsNyArNTgsMTEgQEAKICAg ICB2b2lkIHNldE5ldHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbih2b2lkICgqKSgpKTsKICAgICAK ICAgICBib29sIG9uTGluZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNPbkxpbmU7IH0KLSAgICAKKwor I2lmIChQTEFURk9STShRVCkgJiYgRU5BQkxFKFFUX0JFQVJFUikpCisgICAgdm9pZCBzZXROZXR3 b3JrQWNjZXNzQWxsb3dlZChib29sKTsKKyNlbmRpZgorCiBwcml2YXRlOiAgICAKICAgICBib29s IG1faXNPbkxpbmU7CiAgICAgdm9pZCAoKm1fbmV0d29ya1N0YXRlQ2hhbmdlZEZ1bmN0aW9uKSgp Owo= 45969 2010-01-06 11:10:52 -0800 2010-01-07 09:17:44 -0800 Patch v2 32684.patch text/plain 6062 yael SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTI4NTQpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDEtMDYgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQWxsb3cgdGhlIGFwcGxpY2F0aW9uIHRvIG92ZXJyaWRlIG9ubGluZS9vZmZs aW5lIG5ldHdvcmsgc3RhdHVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMjY4NAorCisgICAgICAgIEFkZCBhIHNldHRpbmcgc28gdGhhdCBhcHBsaWNh dGlvbnMgY2FuIG92ZXJpZGUgdGhlIG5ldHdvcmsgc3RhdHVzLgorICAgICAgICBBcHBsaWNhdGlv bnMgdGhhdCB1c2UgdGhpcyBzZXR0aW5nIHN0aWxsIG5lZWQgdG8gYmxvY2sgbmV0d29yayBhY2Nl c3MKKyAgICAgICAgdGhyb3VnaCBRTkFNLgorCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5j cHA6CisgICAgICAgIChxdF9uZXR3b3JrQWNjZXNzQWxsb3dlZCk6CisgICAgICAgIChRV2ViU2V0 dGluZ3M6Omdsb2JhbFNldHRpbmdzKToKKwogMjAxMC0wMS0wNSAgWWFlbCBBaGFyb24gIDx5YWVs LmFoYXJvbkBub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSb2hkZSBD aHJpc3RpYW5zZW4uCkluZGV4OiBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwCShyZXZpc2lvbiA1MjgxNykK KysrIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcs NiArNDcsMTkgQEAKICNpbmNsdWRlIDxRVXJsPgogI2luY2x1ZGUgPFFGaWxlSW5mbz4KIAorI2lm IEVOQUJMRShRVF9CRUFSRVIpCisjaW5jbHVkZSAiTmV0d29ya1N0YXRlTm90aWZpZXIuaCIKKwor c3RhdGljIGJvb2wgbmV0d29ya0FjY2Vzc0FsbG93ZWQ7CisKK3ZvaWQgUVdFQktJVF9FWFBPUlQg cXRfbmV0d29ya0FjY2Vzc0FsbG93ZWQoYm9vbCBpc0FsbG93ZWQpCit7CisgICAgbmV0d29ya0Fj Y2Vzc0FsbG93ZWQgPSBpc0FsbG93ZWQ7CisgICAgV2ViQ29yZTo6bmV0d29ya1N0YXRlTm90aWZp ZXIoKS5zZXROZXR3b3JrQWNjZXNzQWxsb3dlZChuZXR3b3JrQWNjZXNzQWxsb3dlZCk7Cit9Cisj ZW5kaWYKKworCiBjbGFzcyBRV2ViU2V0dGluZ3NQcml2YXRlIHsKIHB1YmxpYzoKICAgICBRV2Vi U2V0dGluZ3NQcml2YXRlKFdlYkNvcmU6OlNldHRpbmdzKiB3Y1NldHRpbmdzID0gMCkKQEAgLTIx Niw4ICsyMjksMTMgQEAKIFFXZWJTZXR0aW5ncyogUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5n cygpCiB7CiAgICAgc3RhdGljIFFXZWJTZXR0aW5ncyogZ2xvYmFsID0gMDsKLSAgICBpZiAoIWds b2JhbCkKKyAgICBpZiAoIWdsb2JhbCkgeworICAgICAgICAvLyBJbml0aWFsaXplIHRoZSBzdGF0 aWMgdmFyaWFibGVzCiAgICAgICAgIGdsb2JhbCA9IG5ldyBRV2ViU2V0dGluZ3M7CisjaWYgRU5B QkxFKFFUX0JFQVJFUikKKyAgICAgICAgbmV0d29ya0FjY2Vzc0FsbG93ZWQgPSB0cnVlOworI2Vu ZGlmCisgICAgfQogICAgIHJldHVybiBnbG9iYWw7CiB9CiAKSW5kZXg6IFdlYkNvcmUvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCShyZXZpc2lvbiA1Mjg1NCkKKysr IFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAt MDEtMDYgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gQWxsb3cgdGhlIGFwcGxp Y2F0aW9uIHRvIG92ZXJyaWRlIG9ubGluZS9vZmZsaW5lIG5ldHdvcmsgc3RhdHVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjY4NAorCisgICAgICAg IEFkZGVkIEFQSSB0byBOZXR3b3JrU3RhdGVOb3RpZmllciBmb3IgZm9yY2luZyBuZXR3b3JrIHN0 YXR1cy4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRlTm90aWZpZXIu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUHJp dmF0ZS5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZp ZXJRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6 Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3Jr U3RhdGVOb3RpZmllclByaXZhdGU6Om9ubGluZVN0YXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJD b3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6Om5ldHdvcmtBY2Nlc3NQZXJtaXNzaW9u Q2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllcjo6dXBkYXRl U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya1N0YXRlTm90aWZpZXI6Ok5ldHdvcmtT dGF0ZU5vdGlmaWVyKToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyOjpz ZXROZXR3b3JrQWNjZXNzQWxsb3dlZCk6CisKIDIwMTAtMDEtMDYgIFNpbW9uIEhhdXNtYW5uICA8 c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgdHJpdmlhbCBR dCBidWlsZCBmaXguCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0 YXRlTm90aWZpZXJRdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUXQuY3BwCShyZXZpc2lvbiA1MjgxNykKKysrIFdlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclF0LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAogTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlOjpO ZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUoTmV0d29ya1N0YXRlTm90aWZpZXIqIG5vdGlmaWVy KQogICAgIDogbV9jb25maWd1cmF0aW9uTWFuYWdlcihuZXcgUU5ldHdvcmtDb25maWd1cmF0aW9u TWFuYWdlcigpKQogICAgICwgbV9vbmxpbmUobV9jb25maWd1cmF0aW9uTWFuYWdlci0+aXNPbmxp bmUoKSkKKyAgICAsIG1fbmV0d29ya0FjY2Vzc0FsbG93ZWQodHJ1ZSkKICAgICAsIG1fbm90aWZp ZXIobm90aWZpZXIpCiB7CiAgICAgUV9BU1NFUlQobm90aWZpZXIpOwpAQCAtNDIsOSArNDMsMjAg QEAKICAgICAgICAgcmV0dXJuOwogCiAgICAgbV9vbmxpbmUgPSBpc09ubGluZTsKLSAgICBtX25v dGlmaWVyLT51cGRhdGVTdGF0ZSgpOworICAgIGlmIChtX25ldHdvcmtBY2Nlc3NBbGxvd2VkKQor ICAgICAgICBtX25vdGlmaWVyLT51cGRhdGVTdGF0ZSgpOwogfQogCit2b2lkIE5ldHdvcmtTdGF0 ZU5vdGlmaWVyUHJpdmF0ZTo6bmV0d29ya0FjY2Vzc1Blcm1pc3Npb25DaGFuZ2VkKGJvb2wgaXNB bGxvd2VkKQoreworICAgIGlmIChpc0FsbG93ZWQgPT0gbV9uZXR3b3JrQWNjZXNzQWxsb3dlZCkK KyAgICAgICAgcmV0dXJuOworCisgICAgbV9uZXR3b3JrQWNjZXNzQWxsb3dlZCA9IGlzQWxsb3dl ZDsKKyAgICBpZiAobV9vbmxpbmUpCisgICAgICAgIG1fbm90aWZpZXItPnVwZGF0ZVN0YXRlKCk7 Cit9CisKIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZTo6fk5ldHdvcmtTdGF0ZU5vdGlmaWVy UHJpdmF0ZSgpCiB7CiAgICAgZGVsZXRlIG1fY29uZmlndXJhdGlvbk1hbmFnZXI7CkBAIC01Miwx MCArNjQsMTAgQEAKIAogdm9pZCBOZXR3b3JrU3RhdGVOb3RpZmllcjo6dXBkYXRlU3RhdGUoKQog ewotICAgIGlmIChtX2lzT25MaW5lID09IHAtPm1fb25saW5lKQorICAgIGlmIChtX2lzT25MaW5l ID09IChwLT5tX29ubGluZSAmJiBwLT5tX25ldHdvcmtBY2Nlc3NBbGxvd2VkKSkKICAgICAgICAg cmV0dXJuOwogCi0gICAgbV9pc09uTGluZSA9IHAtPm1fb25saW5lOworICAgIG1faXNPbkxpbmUg PSBwLT5tX29ubGluZSAmJiBwLT5tX25ldHdvcmtBY2Nlc3NBbGxvd2VkOwogICAgIGlmIChtX25l dHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbikKICAgICAgICAgbV9uZXR3b3JrU3RhdGVDaGFuZ2Vk RnVuY3Rpb24oKTsKIH0KQEAgLTY1LDkgKzc3LDE0IEBACiAgICAgLCBtX25ldHdvcmtTdGF0ZUNo YW5nZWRGdW5jdGlvbigwKQogewogICAgIHAgPSBuZXcgTmV0d29ya1N0YXRlTm90aWZpZXJQcml2 YXRlKHRoaXMpOwotICAgIG1faXNPbkxpbmUgPSBwLT5tX29ubGluZTsKKyAgICBtX2lzT25MaW5l ID0gcC0+bV9vbmxpbmUgJiYgcC0+bV9uZXR3b3JrQWNjZXNzQWxsb3dlZDsKIH0KIAordm9pZCBO ZXR3b3JrU3RhdGVOb3RpZmllcjo6c2V0TmV0d29ya0FjY2Vzc0FsbG93ZWQoYm9vbCBpc0FsbG93 ZWQpCit7CisgICAgcC0+bmV0d29ya0FjY2Vzc1Blcm1pc3Npb25DaGFuZ2VkKGlzQWxsb3dlZCk7 Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2luY2x1ZGUgIm1vY19OZXR3b3JrU3Rh dGVOb3RpZmllclByaXZhdGUuY3BwIgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0 L05ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9xdC9OZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUuaAkocmV2aXNpb24g NTI4MTcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZp ZXJQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTM3LDEwICszNywxMiBAQAogICAgIH5OZXR3 b3JrU3RhdGVOb3RpZmllclByaXZhdGUoKTsKIHB1YmxpYyBzbG90czoKICAgICB2b2lkIG9ubGlu ZVN0YXRlQ2hhbmdlZChib29sKTsKKyAgICB2b2lkIG5ldHdvcmtBY2Nlc3NQZXJtaXNzaW9uQ2hh bmdlZChib29sKTsKIAogcHVibGljOgogICAgIFF0TW9iaWxpdHk6OlFOZXR3b3JrQ29uZmlndXJh dGlvbk1hbmFnZXIqIG1fY29uZmlndXJhdGlvbk1hbmFnZXI7CiAgICAgYm9vbCBtX29ubGluZTsK KyAgICBib29sIG1fbmV0d29ya0FjY2Vzc0FsbG93ZWQ7CiAgICAgTmV0d29ya1N0YXRlTm90aWZp ZXIqIG1fbm90aWZpZXI7CiB9OwogCkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0 d29ya1N0YXRlTm90aWZpZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvTmV0d29ya1N0YXRlTm90aWZpZXIuaAkocmV2aXNpb24gNTI4MTcpCisrKyBXZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRlTm90aWZpZXIuaAkod29ya2luZyBjb3B5KQpAQCAt NTgsNyArNTgsMTEgQEAKICAgICB2b2lkIHNldE5ldHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbih2 b2lkICgqKSgpKTsKICAgICAKICAgICBib29sIG9uTGluZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNP bkxpbmU7IH0KLSAgICAKKworI2lmIChQTEFURk9STShRVCkgJiYgRU5BQkxFKFFUX0JFQVJFUikp CisgICAgdm9pZCBzZXROZXR3b3JrQWNjZXNzQWxsb3dlZChib29sKTsKKyNlbmRpZgorCiBwcml2 YXRlOiAgICAKICAgICBib29sIG1faXNPbkxpbmU7CiAgICAgdm9pZCAoKm1fbmV0d29ya1N0YXRl Q2hhbmdlZEZ1bmN0aW9uKSgpOwo= 46058 2010-01-07 09:17:44 -0800 2010-01-07 09:28:43 -0800 Patch v3 32684.patch text/plain 5636 yael SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTI4NTQpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDEtMDcgIFlhZWwgQWhhcm9uICA8eWFlbC5haGFy b25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFtRdF0gQWxsb3cgdGhlIGFwcGxpY2F0aW9uIHRvIG92ZXJyaWRlIG9ubGluZS9vZmZs aW5lIG5ldHdvcmsgc3RhdHVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0zMjY4NAorCisgICAgICAgIEFkZCBhIHNldHRpbmcgc28gdGhhdCBhcHBsaWNh dGlvbnMgY2FuIG92ZXJpZGUgdGhlIG5ldHdvcmsgc3RhdHVzLgorICAgICAgICBBcHBsaWNhdGlv bnMgdGhhdCB1c2UgdGhpcyBzZXR0aW5nIHN0aWxsIG5lZWQgdG8gYmxvY2sgbmV0d29yayBhY2Nl c3MKKyAgICAgICAgdGhyb3VnaCBRTkFNLgorCisgICAgICAgICogQXBpL3F3ZWJzZXR0aW5ncy5j cHA6CisgICAgICAgIChxdF9uZXR3b3JrQWNjZXNzQWxsb3dlZCk6CisKIDIwMTAtMDEtMDUgIFlh ZWwgQWhhcm9uICA8eWFlbC5haGFyb25Abm9raWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViS2l0L3F0L0FwaS9xd2Vic2V0 dGluZ3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcAko cmV2aXNpb24gNTI4MTcpCisrKyBXZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTQ3LDYgKzQ3LDE3IEBACiAjaW5jbHVkZSA8UVVybD4KICNpbmNsdWRlIDxR RmlsZUluZm8+CiAKKyNpZiBFTkFCTEUoUVRfQkVBUkVSKQorI2luY2x1ZGUgIk5ldHdvcmtTdGF0 ZU5vdGlmaWVyLmgiCisjZW5kaWYKKwordm9pZCBRV0VCS0lUX0VYUE9SVCBxdF9uZXR3b3JrQWNj ZXNzQWxsb3dlZChib29sIGlzQWxsb3dlZCkKK3sKKyNpZiBFTkFCTEUoUVRfQkVBUkVSKQorICAg IFdlYkNvcmU6Om5ldHdvcmtTdGF0ZU5vdGlmaWVyKCkuc2V0TmV0d29ya0FjY2Vzc0FsbG93ZWQo aXNBbGxvd2VkKTsKKyNlbmRpZgorfQorCiBjbGFzcyBRV2ViU2V0dGluZ3NQcml2YXRlIHsKIHB1 YmxpYzoKICAgICBRV2ViU2V0dGluZ3NQcml2YXRlKFdlYkNvcmU6OlNldHRpbmdzKiB3Y1NldHRp bmdzID0gMCkKSW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv Q2hhbmdlTG9nCShyZXZpc2lvbiA1Mjg1NCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMDEtMDcgIFlhZWwgQWhhcm9uICA8eWFlbC5h aGFyb25Abm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtRdF0gQWxsb3cgdGhlIGFwcGxpY2F0aW9uIHRvIG92ZXJyaWRlIG9ubGluZS9v ZmZsaW5lIG5ldHdvcmsgc3RhdHVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0zMjY4NAorCisgICAgICAgIEFkZGVkIEFQSSB0byBOZXR3b3JrU3RhdGVO b3RpZmllciBmb3IgZm9yY2luZyBuZXR3b3JrIHN0YXR1cy4KKworICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvTmV0d29ya1N0YXRlTm90aWZpZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZS5oOgorICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJRdC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0 ZSk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGU6Om9ubGlu ZVN0YXRlQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrU3RhdGVOb3RpZmllclBy aXZhdGU6Om5ldHdvcmtBY2Nlc3NQZXJtaXNzaW9uQ2hhbmdlZCk6CisgICAgICAgIChXZWJDb3Jl OjpOZXR3b3JrU3RhdGVOb3RpZmllcjo6dXBkYXRlU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6 TmV0d29ya1N0YXRlTm90aWZpZXI6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyKToKKyAgICAgICAgKFdl YkNvcmU6Ok5ldHdvcmtTdGF0ZU5vdGlmaWVyOjpzZXROZXR3b3JrQWNjZXNzQWxsb3dlZCk6CisK IDIwMTAtMDEtMDYgIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQgdHJpdmlhbCBRdCBidWlsZCBmaXguCkluZGV4OiBXZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJRdC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUXQu Y3BwCShyZXZpc2lvbiA1MjgxNykKKysrIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9OZXR3 b3JrU3RhdGVOb3RpZmllclF0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzAsNiArMzAsNyBAQAog TmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlOjpOZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUo TmV0d29ya1N0YXRlTm90aWZpZXIqIG5vdGlmaWVyKQogICAgIDogbV9jb25maWd1cmF0aW9uTWFu YWdlcihuZXcgUU5ldHdvcmtDb25maWd1cmF0aW9uTWFuYWdlcigpKQogICAgICwgbV9vbmxpbmUo bV9jb25maWd1cmF0aW9uTWFuYWdlci0+aXNPbmxpbmUoKSkKKyAgICAsIG1fbmV0d29ya0FjY2Vz c0FsbG93ZWQodHJ1ZSkKICAgICAsIG1fbm90aWZpZXIobm90aWZpZXIpCiB7CiAgICAgUV9BU1NF UlQobm90aWZpZXIpOwpAQCAtNDIsOSArNDMsMjAgQEAKICAgICAgICAgcmV0dXJuOwogCiAgICAg bV9vbmxpbmUgPSBpc09ubGluZTsKLSAgICBtX25vdGlmaWVyLT51cGRhdGVTdGF0ZSgpOworICAg IGlmIChtX25ldHdvcmtBY2Nlc3NBbGxvd2VkKQorICAgICAgICBtX25vdGlmaWVyLT51cGRhdGVT dGF0ZSgpOwogfQogCit2b2lkIE5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZTo6bmV0d29ya0Fj Y2Vzc1Blcm1pc3Npb25DaGFuZ2VkKGJvb2wgaXNBbGxvd2VkKQoreworICAgIGlmIChpc0FsbG93 ZWQgPT0gbV9uZXR3b3JrQWNjZXNzQWxsb3dlZCkKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9u ZXR3b3JrQWNjZXNzQWxsb3dlZCA9IGlzQWxsb3dlZDsKKyAgICBpZiAobV9vbmxpbmUpCisgICAg ICAgIG1fbm90aWZpZXItPnVwZGF0ZVN0YXRlKCk7Cit9CisKIE5ldHdvcmtTdGF0ZU5vdGlmaWVy UHJpdmF0ZTo6fk5ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0ZSgpCiB7CiAgICAgZGVsZXRlIG1f Y29uZmlndXJhdGlvbk1hbmFnZXI7CkBAIC01MiwxMCArNjQsMTAgQEAKIAogdm9pZCBOZXR3b3Jr U3RhdGVOb3RpZmllcjo6dXBkYXRlU3RhdGUoKQogewotICAgIGlmIChtX2lzT25MaW5lID09IHAt Pm1fb25saW5lKQorICAgIGlmIChtX2lzT25MaW5lID09IChwLT5tX29ubGluZSAmJiBwLT5tX25l dHdvcmtBY2Nlc3NBbGxvd2VkKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbV9pc09uTGluZSA9 IHAtPm1fb25saW5lOworICAgIG1faXNPbkxpbmUgPSBwLT5tX29ubGluZSAmJiBwLT5tX25ldHdv cmtBY2Nlc3NBbGxvd2VkOwogICAgIGlmIChtX25ldHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbikK ICAgICAgICAgbV9uZXR3b3JrU3RhdGVDaGFuZ2VkRnVuY3Rpb24oKTsKIH0KQEAgLTY1LDkgKzc3 LDE0IEBACiAgICAgLCBtX25ldHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbigwKQogewogICAgIHAg PSBuZXcgTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlKHRoaXMpOwotICAgIG1faXNPbkxpbmUg PSBwLT5tX29ubGluZTsKKyAgICBtX2lzT25MaW5lID0gcC0+bV9vbmxpbmUgJiYgcC0+bV9uZXR3 b3JrQWNjZXNzQWxsb3dlZDsKIH0KIAordm9pZCBOZXR3b3JrU3RhdGVOb3RpZmllcjo6c2V0TmV0 d29ya0FjY2Vzc0FsbG93ZWQoYm9vbCBpc0FsbG93ZWQpCit7CisgICAgcC0+bmV0d29ya0FjY2Vz c1Blcm1pc3Npb25DaGFuZ2VkKGlzQWxsb3dlZCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNv cmUKIAogI2luY2x1ZGUgIm1vY19OZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUuY3BwIgpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L05ldHdvcmtTdGF0ZU5vdGlmaWVyUHJpdmF0 ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9OZXR3b3JrU3Rh dGVOb3RpZmllclByaXZhdGUuaAkocmV2aXNpb24gNTI4MTcpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvcXQvTmV0d29ya1N0YXRlTm90aWZpZXJQcml2YXRlLmgJKHdvcmtpbmcgY29weSkK QEAgLTM3LDEwICszNywxMiBAQAogICAgIH5OZXR3b3JrU3RhdGVOb3RpZmllclByaXZhdGUoKTsK IHB1YmxpYyBzbG90czoKICAgICB2b2lkIG9ubGluZVN0YXRlQ2hhbmdlZChib29sKTsKKyAgICB2 b2lkIG5ldHdvcmtBY2Nlc3NQZXJtaXNzaW9uQ2hhbmdlZChib29sKTsKIAogcHVibGljOgogICAg IFF0TW9iaWxpdHk6OlFOZXR3b3JrQ29uZmlndXJhdGlvbk1hbmFnZXIqIG1fY29uZmlndXJhdGlv bk1hbmFnZXI7CiAgICAgYm9vbCBtX29ubGluZTsKKyAgICBib29sIG1fbmV0d29ya0FjY2Vzc0Fs bG93ZWQ7CiAgICAgTmV0d29ya1N0YXRlTm90aWZpZXIqIG1fbm90aWZpZXI7CiB9OwogCkluZGV4 OiBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRlTm90aWZpZXIuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRlTm90aWZpZXIuaAko cmV2aXNpb24gNTI4MTcpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya1N0YXRl Tm90aWZpZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNTgsNyArNTgsMTEgQEAKICAgICB2b2lkIHNl dE5ldHdvcmtTdGF0ZUNoYW5nZWRGdW5jdGlvbih2b2lkICgqKSgpKTsKICAgICAKICAgICBib29s IG9uTGluZSgpIGNvbnN0IHsgcmV0dXJuIG1faXNPbkxpbmU7IH0KLSAgICAKKworI2lmIChQTEFU Rk9STShRVCkgJiYgRU5BQkxFKFFUX0JFQVJFUikpCisgICAgdm9pZCBzZXROZXR3b3JrQWNjZXNz QWxsb3dlZChib29sKTsKKyNlbmRpZgorCiBwcml2YXRlOiAgICAKICAgICBib29sIG1faXNPbkxp bmU7CiAgICAgdm9pZCAoKm1fbmV0d29ya1N0YXRlQ2hhbmdlZEZ1bmN0aW9uKSgpOwo=