45446 2010-09-09 02:13:07 -0700 [EFL] Add setting API to set a local storage database path. 2010-09-26 19:43:40 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 0 gyuyoung.kim webkit-unassigned antognolli+webkit commit-queue kenneth tonikitoo oldest_to_newest 276374 0 gyuyoung.kim 2010-09-09 02:13:07 -0700 We need to set database path to use local storage. 276377 1 67012 gyuyoung.kim 2010-09-09 02:23:40 -0700 Created attachment 67012 Patch The local storage database path is set via setLocalStorageDatabsePath() of Settings class. Thus, we should use settings instance to set the database path. I was obliged to define this method in ewk_view.cpp. In my opinion, we need to move settgins methods to ewk_settings.cpp. I'd like to listen your opinions about this patch. :). I was obliged to modify eweblauncher as well. Thanks, Gyuyoung Kim. 276381 2 67013 gyuyoung.kim 2010-09-09 02:26:17 -0700 Created attachment 67013 Patch There was missing changelog. 277162 3 antognolli+webkit 2010-09-10 06:35:41 -0700 Hi Gyuyoung, Yes, from an organisational point of view, you are right, we should move all setting functions to ewk_settings.{cpp,h}. But if you look at the setting functions, almost all of them deal with the page_settings, that is an WebCore::Settings and we get it from the page. And the page is relative to the view. And the ones that don't do that, depend at least on the frame loader, that need a frame, thus usually associated with a view. In the ewk_settings.cpp, all functions deal with settings that are independent of the view, that are set globally, so we don't need a view. Anyway, your patch looks good to me. 277668 4 gyuyoung.kim 2010-09-10 23:23:51 -0700 (In reply to comment #3) > Hi Gyuyoung, > > Yes, from an organisational point of view, you are right, we should move all setting functions to ewk_settings.{cpp,h}. But if you look at the setting functions, almost all of them deal with the page_settings, that is an WebCore::Settings and we get it from the page. And the page is relative to the view. > > And the ones that don't do that, depend at least on the frame loader, that need a frame, thus usually associated with a view. > > In the ewk_settings.cpp, all functions deal with settings that are independent of the view, that are set globally, so we don't need a view. > > Anyway, your patch looks good to me. Hello antognolli, I understand your comments. OK, Let's keep current architecture for a while. If I find good solution, I wiil discuss it with you guys again. :) Thanks, Gyuyoung Kim 277670 5 gyuyoung.kim 2010-09-10 23:26:28 -0700 I tested this patch in url below, http://people.w3.org/mike/localstorage.html After EWebLauncher is exit, the previous datas are alive continually. 278012 6 kenneth 2010-09-13 00:01:46 -0700 Antognolli, what do you think? 278184 7 antognolli+webkit 2010-09-13 06:50:56 -0700 Sorry, my bad, I just missed that. You need to free the path with eina_stringshare_del in _ewk_view_priv_del(). Another point is: do you know what's the default value for the database path? If it's not empty, then you need to set it in the settings->local_storage_database_path during the ewk_view creation too, so they won't have different and thus inconsistent values. This is done in _ewk_view_priv_new(). There you also can set a default path if there's none yet. 278830 8 gyuyoung.kim 2010-09-14 05:08:36 -0700 (In reply to comment #7) > Sorry, my bad, I just missed that. > > You need to free the path with eina_stringshare_del in _ewk_view_priv_del(). > Thank you for your comment. I will free the database path in _ewk_view_priv_del(). > Another point is: do you know what's the default value for the database path? If it's not empty, then you need to set it in the settings->local_storage_database_path during the ewk_view creation too, so they won't have different and thus inconsistent values. This is done in _ewk_view_priv_new(). There you also can set a default path if there's none yet. I don't find if there is default database path until now. I continue to find if there is a default database path in webkit. If there are no default database path. IMO, we can set default database path. However, as you know, EWebLauncher defines database path. And, the database path can be changed according to user id. 832 tmp = getenv("TMPDIR"); 833 if (!tmp) 834 tmp = "/tmp"; 835 snprintf(path, sizeof(path), "%s/.ewebkit-%u", tmp, getuid()); So, default database path will be changed by EWebLauncher. Ok, I look this into further. Them, I will post my thought here again. Thanks. 278856 9 antognolli+webkit 2010-09-14 06:29:39 -0700 (In reply to comment #8) > > Another point is: do you know what's the default value for the database path? If it's not empty, then you need to set it in the settings->local_storage_database_path during the ewk_view creation too, so they won't have different and thus inconsistent values. This is done in _ewk_view_priv_new(). There you also can set a default path if there's none yet. > > I don't find if there is default database path until now. I continue to find if there is a default database path in webkit. If there are no default database path. IMO, we can set default database path. However, as you know, EWebLauncher defines database path. And, the database path can be changed according to user id. > > 832 tmp = getenv("TMPDIR"); > 833 if (!tmp) > 834 tmp = "/tmp"; > 835 snprintf(path, sizeof(path), "%s/.ewebkit-%u", tmp, getuid()); > > So, default database path will be changed by EWebLauncher. Ok, I look this into further. Them, I will post my thought here again. Thanks. Ok, that's not a problem, you can initialise it in EWebLauncher. But in _ewk_view_priv_new() it would be good to have something like: s = priv->page_settings->localStorageDatabasePath(); priv->settings.local_storage_database_path = eina_stringshare_add(s.utf8().data()); I just checked the default value of priv->page_settings->localStorageDatabasePath(), and it defaults to "". So it would be good to make sure that it makes sense to have enabled local storage, without a local storage database path set. If it doesn't, then maybe we should disable local storage by default. 279302 10 67629 gyuyoung.kim 2010-09-14 18:35:22 -0700 Created attachment 67629 Patch Antognolli, Thank you for your comment. I set default path from "priv->page_settings->localStorageDatabasePath()" 40 + s = priv->page_settings->localStorageDatabasePath(); 41 + priv->settings.local_storage_database_path = eina_stringshare_add(s.string().utf8().data()); As mentioned in your previous comment, the database path is null until user sets database path. However, it seems to me that if the default path is set once, default database path will be set whenever ewk_view is created. 280638 11 antognolli+webkit 2010-09-17 07:11:49 -0700 Ok, the patch seems nice now. 280639 12 67629 tonikitoo 2010-09-17 07:24:32 -0700 Comment on attachment 67629 Patch Please make sure it applies fine against tot (see the purple balloons) 280873 13 67629 commit-queue 2010-09-17 14:33:42 -0700 Comment on attachment 67629 Patch Rejecting patch 67629 from commit-queue. Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Antonio Gomes', u'--force']" exit_code: 1 Last 500 characters of output: ching file WebKit/efl/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKit/efl/ewk/ewk_view.cpp Hunk #1 FAILED at 90. Hunk #2 succeeded at 580 (offset 1 line). Hunk #3 succeeded at 666 (offset 1 line). Hunk #4 succeeded at 2790 (offset 5 lines). 1 out of 4 hunks FAILED -- saving rejects to file WebKit/efl/ewk/ewk_view.cpp.rej patching file WebKit/efl/ewk/ewk_view.h patching file WebKitTools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file WebKitTools/EWebLauncher/main.c Full output: http://queues.webkit.org/results/4037043 281350 14 68045 gyuyoung.kim 2010-09-19 18:45:38 -0700 Created attachment 68045 Patch I make this patch again based on latest webkit. 285204 15 68045 commit-queue 2010-09-26 16:49:38 -0700 Comment on attachment 68045 Patch Rejecting patch 68045 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'apply-attachment', '--force-clean', '--non-interactive', '--quiet', 68045]" exit_code: 2 Cleaning working directory Updating working directory Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=68045&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=45446&ctype=xml Processing 1 patch from 1 bug. Processing patch 68045 from bug 45446. Failed to run "[u'/Projects/CommitQueue/WebKitTools/Scripts/svn-apply', u'--reviewer', u'Antonio Gomes', u'--force']" exit_code: 1 Full output: http://queues.webkit.org/results/4026153 285209 16 68866 gyuyoung.kim 2010-09-26 17:13:45 -0700 Created attachment 68866 Patch New Patch. 285213 17 68866 commit-queue 2010-09-26 17:44:21 -0700 Comment on attachment 68866 Patch Rejecting patch 68866 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']" exit_code: 2 Last 500 characters of output: l tests successful. Files=14, Tests=304, 1 wallclock secs ( 0.72 cusr + 0.16 csys = 0.88 CPU) Running build-dumprendertree Compiling Java tests make: Nothing to be done for `default'. Running tests from /Projects/CommitQueue/LayoutTests Testing 21376 test cases. java/lc3/JSObject/ToObject-001.html -> failed Exiting early after 1 failures. 17486 tests run. 280.32s total testing time 17485 test cases (99%) succeeded 1 test case (<1%) had incorrect layout 28 test cases (<1%) had stderr output Full output: http://queues.webkit.org/results/4084102 285216 18 gyuyoung.kim 2010-09-26 17:59:07 -0700 (In reply to comment #17) > (From update of attachment 68866 [details]) > Rejecting patch 68866 from commit-queue. > > Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', 'build-and-test', '--no-clean', '--no-update', '--test', '--quiet', '--non-interactive']" exit_code: 2 > Last 500 characters of output: > l tests successful. > Files=14, Tests=304, 1 wallclock secs ( 0.72 cusr + 0.16 csys = 0.88 CPU) > Running build-dumprendertree > Compiling Java tests > make: Nothing to be done for `default'. > Running tests from /Projects/CommitQueue/LayoutTests > Testing 21376 test cases. > java/lc3/JSObject/ToObject-001.html -> failed > > Exiting early after 1 failures. 17486 tests run. > 280.32s total testing time > > 17485 test cases (99%) succeeded > 1 test case (<1%) had incorrect layout > 28 test cases (<1%) had stderr output > > Full output: http://queues.webkit.org/results/4084102 Hmm, I guess why this patch made an error in "java/lc3/JSObject/ToObject-001.html" caes. I think this patch can't influence on the test case. Does anyone know the reason ? 285229 19 68868 gyuyoung.kim 2010-09-26 18:29:32 -0700 Created attachment 68868 Patch There was a problem previous patch. I fix it. Sorry for my frequent uploading. Thanks. 285239 20 68868 tonikitoo 2010-09-26 18:51:18 -0700 Comment on attachment 68868 Patch ... and once again :-) 285240 21 tonikitoo 2010-09-26 18:51:55 -0700 Please clear the review flag on obsolete patches. 285249 22 68868 commit-queue 2010-09-26 19:43:34 -0700 Comment on attachment 68868 Patch Clearing flags on attachment: 68868 Committed r68363: <http://trac.webkit.org/changeset/68363> 285250 23 commit-queue 2010-09-26 19:43:40 -0700 All reviewed patches have been landed. Closing bug. 67012 2010-09-09 02:23:40 -0700 2010-09-09 02:26:17 -0700 Patch patch-database-path.txt text/plain 5716 gyuyoung.kim ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmNwcAppbmRleCBlYTU0MTY3Li42YjYwMGFiIDEwMDY0NAotLS0gYS9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKKysrIGIvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBA IC05MCw2ICs5MCw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICAgICAg Y29uc3QgY2hhciogZW5jb2RpbmdfZGVmYXVsdDsKICAgICAgICAgY29uc3QgY2hhciogZW5jb2Rp bmdfY3VzdG9tOwogICAgICAgICBjb25zdCBjaGFyKiBjYWNoZV9kaXJlY3Rvcnk7CisgICAgICAg IGNvbnN0IGNoYXIqIGxvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aDsKICAgICAgICAgaW50IGZv bnRfbWluaW11bV9zaXplOwogICAgICAgICBpbnQgZm9udF9taW5pbXVtX2xvZ2ljYWxfc2l6ZTsK ICAgICAgICAgaW50IGZvbnRfZGVmYXVsdF9zaXplOwpAQCAtMjc0Niw2ICsyNzQ3LDM2IEBAIEVp bmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2Vfc2V0KEV2YXNfT2JqZWN0KiBv LCBFaW5hX0Jvb2wgZW5hYmxlKQogfQogCiAvKioKKyAqIEdldHMgdGhlIGxvY2FsIHN0b3JhZ2Ug ZGF0YWJhc2UgcGF0aC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBnZXQgdGhlIGxv Y2FsIHN0b3JhZ2UgZGF0YWJhc2UgcGF0aC4KKyAqIEByZXR1cm4gdGhlIGxvY2FsIHN0b3JhZ2Ug ZGF0YWJhc2UgcGF0aC4KKyAqLworY29uc3QgY2hhciogZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9z dG9yYWdlX2RhdGFiYXNlX3BhdGhfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0KiBvKQoreworICAgIEVX S19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIDApOworICAgIEVXS19WSUVXX1BSSVZfR0VU X09SX1JFVFVSTihzZCwgcHJpdiwgMCk7CisgICAgcmV0dXJuIHByaXYtPnNldHRpbmdzLmxvY2Fs X3N0b3JhZ2VfZGF0YWJhc2VfcGF0aDsKK30KKworLyoqCisgKiBTZXRzIHRoZSBsb2NhbCBzdG9y YWdlIGRhdGFiYXNlIHBhdGguCisgKgorICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gc2V0IHRo ZSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBv biBzdWNjZXNzIGFuZCBAYyBFSU5BX0ZBTFNFIG9uIGZhaWx1cmUKKyAqLworRWluYV9Cb29sIGV3 a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3NldChFdmFzX09iamVj dCogbywgY29uc3QgY2hhciogcGF0aCkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVUVVJO KG8sIHNkLCBFSU5BX0ZBTFNFKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2Qs IHByaXYsIEVJTkFfRkFMU0UpOworICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3JlcGxhY2UoJnBy aXYtPnNldHRpbmdzLmxvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aCwgcGF0aCkpIHsKKyAgICAg ICAgV1RGOjpBdG9taWNTdHJpbmcgcyA9IFdURjo6U3RyaW5nOjpmcm9tVVRGOChwYXRoKTsKKyAg ICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0TG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKHMp OworICAgIH0KKyAgICByZXR1cm4gRUlOQV9UUlVFOworfQorCisvKioKICAqIFNpbWlsYXIgdG8g ZXZhc19vYmplY3Rfc21hcnRfZGF0YV9nZXQoKSwgYnV0IGRvZXMgdHlwZSBjaGVja2luZy4KICAq CiAgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBxdWVyeSBpbnRlcm5hbCBkYXRhLgpkaWZmIC0t Z2l0IGEvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaCBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmgKaW5kZXggYzVkMmQ0NS4uNDkwN2E1ZiAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9ld2svZXdr X3ZpZXcuaAorKysgYi9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCkBAIC00NDksNiArNDQ5LDgg QEAgRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19zcGF0aWFsX25hdmlnYXRpb25f c2V0KEV2YXNfT2JqZWN0KiBvLCBFaW5hX0IKIAogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdf c2V0dGluZ19sb2NhbF9zdG9yYWdlX2dldChFdmFzX09iamVjdCogbyk7CiBFQVBJIEVpbmFfQm9v bCAgICBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2Vfc2V0KEV2YXNfT2JqZWN0KiBvLCBF aW5hX0Jvb2wgZW5hYmxlKTsKK0VBUEkgY29uc3QgY2hhciAgKmV3a192aWV3X3NldHRpbmdfbG9j YWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CitFQVBJ IEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0 aF9zZXQoRXZhc19PYmplY3QgKm8sIGNvbnN0IGNoYXIgKnBhdGgpOwogCiAvKiB0byBiZSB1c2Vk IGJ5IHN1YmNsYXNzIGltcGxlbWVudGF0aW9ucyAqLwogRUFQSSBFd2tfVmlld19TbWFydF9EYXRh ICpld2tfdmlld19zbWFydF9kYXRhX2dldChjb25zdCBFdmFzX09iamVjdCAqbyk7CmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKaW5kZXgg YjhkYmRhYy4uZjRlMzIwZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBi L1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEwLTA5LTA5ICBHeXV5 b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0VGTF0gQWRkIHNldHRpbmcgQVBJIHRvIHNl dCBhIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UgcGF0aC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NDQ2CisKKyAgICAgICAgQWRkIGEgc2V0dGluZyBB UEkgdG8gc2V0IGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UgcGF0aC4KKworICAgICAgICAqIEVXZWJM YXVuY2hlci9tYWluLmM6CisgICAgICAgIChvbl9rZXlfZG93bik6CisgICAgICAgIChicm93c2Vy Q3JlYXRlKToKKyAgICAgICAgKG1haW4pOgorCiAyMDEwLTA5LTA4ICBWaWN0b3IgV2FuZyAgPHZp Y3RvcndAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE9qYW4gVmFmYWkuCmRp ZmYgLS1naXQgYS9XZWJLaXRUb29scy9FV2ViTGF1bmNoZXIvbWFpbi5jIGIvV2ViS2l0VG9vbHMv RVdlYkxhdW5jaGVyL21haW4uYwppbmRleCBjMTk1NmEyLi42N2UyZTYyIDEwMDY0NAotLS0gYS9X ZWJLaXRUb29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCisrKyBiL1dlYktpdFRvb2xzL0VXZWJMYXVu Y2hlci9tYWluLmMKQEAgLTE0Nyw3ICsxNDcsNyBAQCB0eXBlZGVmIHN0cnVjdCBfRUxhdW5jaGVy IHsKIAogc3RhdGljIHZvaWQgYnJvd3NlckRlc3Ryb3koRWNvcmVfRXZhcyAqZWUpOwogc3RhdGlj IHZvaWQgY2xvc2VXaW5kb3coRWNvcmVfRXZhcyAqZWUpOwotc3RhdGljIGludCBicm93c2VyQ3Jl YXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJB Z2VudCwgRWluYV9SZWN0YW5nbGUgZ2VvbWV0cnksIGNvbnN0IGNoYXIgKmVuZ2luZSwgdW5zaWdu ZWQgY2hhciBpc0Z1bGxzY3JlZW4pOworc3RhdGljIGludCBicm93c2VyQ3JlYXRlKGNvbnN0IGNo YXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9S ZWN0YW5nbGUgZ2VvbWV0cnksIGNvbnN0IGNoYXIgKmVuZ2luZSwgdW5zaWduZWQgY2hhciBpc0Z1 bGxzY3JlZW4sIGNvbnN0IGNoYXIgKmRhdGFiYXNlUGF0aCk7CiAKIHN0YXRpYyB2b2lkCiBwcmlu dF9oaXN0b3J5KEVpbmFfTGlzdCAqbGlzdCkKQEAgLTU2Miw3ICs1NjIsNyBAQCBvbl9rZXlfZG93 bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZv KQogICAgICAgICBpbmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoRjkpIHdhcyBwcmVzc2VkLlxuIik7 CiAgICAgICAgIEVpbmFfUmVjdGFuZ2xlIGdlb21ldHJ5ID0gezAsIDAsIDAsIDB9OwogICAgICAg ICBicm93c2VyQ3JlYXRlKCJodHRwOi8vd3d3Lmdvb2dsZS5jb20iLAotICAgICAgICAgICAgICAg ICAgICAgICBhcHAtPnRoZW1lLCBhcHAtPnVzZXJBZ2VudCwgZ2VvbWV0cnksIE5VTEwsIDApOwor ICAgICAgICAgICAgICAgICAgICAgICBhcHAtPnRoZW1lLCBhcHAtPnVzZXJBZ2VudCwgZ2VvbWV0 cnksIE5VTEwsIDAsIE5VTEwpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjEw IikpIHsKICAgICAgICAgRXZhc19Db29yZCB4LCB5LCB3LCBoOwogICAgICAgICBFdmFzX09iamVj dCAqZnJhbWUgPSBld2tfdmlld19mcmFtZV9tYWluX2dldChvYmopOwpAQCAtNjE0LDcgKzYxNCw3 IEBAIHF1aXQoRWluYV9Cb29sIHN1Y2Nlc3MsIGNvbnN0IGNoYXIgKm1zZykKIH0KIAogc3RhdGlj IGludAotYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNvbnN0IGNoYXIgKnRoZW1lLCBj b25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25zdCBjaGFy ICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVuKQorYnJvd3NlckNyZWF0ZShjb25z dCBjaGFyICp1cmwsIGNvbnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVp bmFfUmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25zdCBjaGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIg aXNGdWxsc2NyZWVuLCBjb25zdCBjaGFyICpkYXRhYmFzZVBhdGgpCiB7CiAgICAgaWYgKChnZW9t ZXRyeS53IDw9IDApICYmIChnZW9tZXRyeS5oIDw9IDApKSB7CiAgICAgICAgIGdlb21ldHJ5Lncg PSBERUZBVUxUX1dJRFRIOwpAQCAtNjYwLDYgKzY2MCw5IEBAIGJyb3dzZXJDcmVhdGUoY29uc3Qg Y2hhciAqdXJsLCBjb25zdCBjaGFyICp0aGVtZSwgY29uc3QgY2hhciAqdXNlckFnZW50LCBFaW5h X1JlCiAgICAgZXdrX3ZpZXdfdGhlbWVfc2V0KGFwcC0+YnJvd3NlciwgdGhlbWUpOwogICAgIGlm ICh1c2VyQWdlbnQpCiAgICAgICAgIGV3a192aWV3X3NldHRpbmdfdXNlcl9hZ2VudF9zZXQoYXBw LT5icm93c2VyLCB1c2VyQWdlbnQpOworCisgICAgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9y YWdlX2RhdGFiYXNlX3BhdGhfc2V0KGFwcC0+YnJvd3NlciwgZGF0YWJhc2VQYXRoKTsKKwogICAg IGV2YXNfb2JqZWN0X25hbWVfc2V0KGFwcC0+YnJvd3NlciwgImJyb3dzZXIiKTsKIAogICAgIGV2 YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZChhcHAtPmJyb3dzZXIsICJ0aXRsZSxjaGFuZ2Vk Iiwgb25fdGl0bGVfY2hhbmdlZCwgYXBwKTsKQEAgLTgzOSw3ICs4NDIsNyBAQCBtYWluKGludCBh cmdjLCBjaGFyICphcmd2W10pCiAgICAgaWYgKHByb3h5VXJpKQogICAgICAgICBld2tfc2V0dGlu Z3NfcHJveHlfdXJpX3NldChwcm94eVVyaSk7CiAKLSAgICBicm93c2VyQ3JlYXRlKHVybCwgdGhl bWUsIHVzZXJBZ2VudCwgZ2VvbWV0cnksIGVuZ2luZSwgaXNGdWxsc2NyZWVuKTsKKyAgICBicm93 c2VyQ3JlYXRlKHVybCwgdGhlbWUsIHVzZXJBZ2VudCwgZ2VvbWV0cnksIGVuZ2luZSwgaXNGdWxs c2NyZWVuLCBwYXRoKTsKICAgICBlY29yZV9ldmVudF9oYW5kbGVyX2FkZChFQ09SRV9FVkVOVF9T SUdOQUxfRVhJVCwgbWFpbl9zaWduYWxfZXhpdCwgJndpbmRvd3MpOwogCiAgICAgZWNvcmVfbWFp bl9sb29wX2JlZ2luKCk7Cg== 67013 2010-09-09 02:26:17 -0700 2010-09-14 18:35:22 -0700 Patch patch-database-path.txt text/plain 6437 gyuyoung.kim ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggOTcwOWM5OC4uM2I1ZTcxMSAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOS0wOSAg R3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSB0 byBzZXQgYSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQ0NgorCisgICAgICAgIEFkZCBhIHNldHRp bmcgQVBJIHRvIHNldCBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisKKyAgICAgICAgKiBl d2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdl X2RhdGFiYXNlX3BhdGhfZ2V0KTogQWRkZWQuCisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2xv Y2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aF9zZXQpOiBBZGRlZC4KKyAgICAgICAgKiBld2svZXdr X3ZpZXcuaDoKKwogMjAxMC0wOS0wOCAgUnl1YW4gQ2hvaSAgPHJ5dWFuLmNob2lAc2Ftc3VuZy5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXgg ZWE1NDE2Ny4uNmI2MDBhYiAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3Bw CisrKyBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcApAQCAtOTAsNiArOTAsNyBAQCBzdHJ1 Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAgICAgICAgIGNvbnN0IGNoYXIqIGVuY29kaW5n X2RlZmF1bHQ7CiAgICAgICAgIGNvbnN0IGNoYXIqIGVuY29kaW5nX2N1c3RvbTsKICAgICAgICAg Y29uc3QgY2hhciogY2FjaGVfZGlyZWN0b3J5OworICAgICAgICBjb25zdCBjaGFyKiBsb2NhbF9z dG9yYWdlX2RhdGFiYXNlX3BhdGg7CiAgICAgICAgIGludCBmb250X21pbmltdW1fc2l6ZTsKICAg ICAgICAgaW50IGZvbnRfbWluaW11bV9sb2dpY2FsX3NpemU7CiAgICAgICAgIGludCBmb250X2Rl ZmF1bHRfc2l6ZTsKQEAgLTI3NDYsNiArMjc0NywzNiBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0 dGluZ19sb2NhbF9zdG9yYWdlX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGVuYWJsZSkK IH0KIAogLyoqCisgKiBHZXRzIHRoZSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisgKgor ICogQHBhcmFtIG8gdmlldyBvYmplY3QgdG8gZ2V0IHRoZSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNl IHBhdGguCisgKiBAcmV0dXJuIHRoZSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisgKi8K K2NvbnN0IGNoYXIqIGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRo X2dldChjb25zdCBFdmFzX09iamVjdCogbykKK3sKKyAgICBFV0tfVklFV19TRF9HRVRfT1JfUkVU VVJOKG8sIHNkLCAwKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc2QsIHByaXYs IDApOworICAgIHJldHVybiBwcml2LT5zZXR0aW5ncy5sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3Bh dGg7Cit9CisKKy8qKgorICogU2V0cyB0aGUgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBwYXRoLgor ICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIHNldCB0aGUgbG9jYWwgc3RvcmFnZSBkYXRh YmFzZSBwYXRoLgorICogQHJldHVybiBAYyBFSU5BX1RSVUUgb24gc3VjY2VzcyBhbmQgQGMgRUlO QV9GQUxTRSBvbiBmYWlsdXJlCisgKi8KK0VpbmFfQm9vbCBld2tfdmlld19zZXR0aW5nX2xvY2Fs X3N0b3JhZ2VfZGF0YWJhc2VfcGF0aF9zZXQoRXZhc19PYmplY3QqIG8sIGNvbnN0IGNoYXIqIHBh dGgpCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgRUlOQV9GQUxTRSk7 CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCBFSU5BX0ZBTFNFKTsK KyAgICBpZiAoZWluYV9zdHJpbmdzaGFyZV9yZXBsYWNlKCZwcml2LT5zZXR0aW5ncy5sb2NhbF9z dG9yYWdlX2RhdGFiYXNlX3BhdGgsIHBhdGgpKSB7CisgICAgICAgIFdURjo6QXRvbWljU3RyaW5n IHMgPSBXVEY6OlN0cmluZzo6ZnJvbVVURjgocGF0aCk7CisgICAgICAgIHByaXYtPnBhZ2Vfc2V0 dGluZ3MtPnNldExvY2FsU3RvcmFnZURhdGFiYXNlUGF0aChzKTsKKyAgICB9CisgICAgcmV0dXJu IEVJTkFfVFJVRTsKK30KKworLyoqCiAgKiBTaW1pbGFyIHRvIGV2YXNfb2JqZWN0X3NtYXJ0X2Rh dGFfZ2V0KCksIGJ1dCBkb2VzIHR5cGUgY2hlY2tpbmcuCiAgKgogICogQHBhcmFtIG8gdmlldyBv YmplY3QgdG8gcXVlcnkgaW50ZXJuYWwgZGF0YS4KZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvZXdr L2V3a192aWV3LmggYi9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCmluZGV4IGM1ZDJkNDUuLjQ5 MDdhNWYgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgKKysrIGIvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtNDQ5LDYgKzQ0OSw4IEBAIEVBUEkgRWluYV9Cb29sICAg IGV3a192aWV3X3NldHRpbmdfc3BhdGlhbF9uYXZpZ2F0aW9uX3NldChFdmFzX09iamVjdCogbywg RWluYV9CCiAKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFn ZV9nZXQoRXZhc19PYmplY3QqIG8pOwogRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGlu Z19sb2NhbF9zdG9yYWdlX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGVuYWJsZSk7CitF QVBJIGNvbnN0IGNoYXIgICpld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJhc2Vf cGF0aF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworRUFQSSBFaW5hX0Jvb2wgICAgZXdrX3Zp ZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGhfc2V0KEV2YXNfT2JqZWN0ICpv LCBjb25zdCBjaGFyICpwYXRoKTsKIAogLyogdG8gYmUgdXNlZCBieSBzdWJjbGFzcyBpbXBsZW1l bnRhdGlvbnMgKi8KIEVBUEkgRXdrX1ZpZXdfU21hcnRfRGF0YSAqZXdrX3ZpZXdfc21hcnRfZGF0 YV9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IGI4ZGJkYWMuLmY0ZTMyMGUgMTAw NjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wOS0wOSAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcu a2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSB0byBzZXQgYSBsb2NhbCBzdG9yYWdlIGRh dGFiYXNlIHBhdGguCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00NTQ0NgorCisgICAgICAgIEFkZCBhIHNldHRpbmcgQVBJIHRvIHNldCBsb2NhbCBzdG9y YWdlIGRhdGFiYXNlIHBhdGguCisKKyAgICAgICAgKiBFV2ViTGF1bmNoZXIvbWFpbi5jOgorICAg ICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAoYnJvd3NlckNyZWF0ZSk6CisgICAgICAgICht YWluKToKKwogMjAxMC0wOS0wOCAgVmljdG9yIFdhbmcgIDx2aWN0b3J3QGNocm9taXVtLm9yZz4K IAogICAgICAgICBSZXZpZXdlZCBieSBPamFuIFZhZmFpLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9v bHMvRVdlYkxhdW5jaGVyL21haW4uYyBiL1dlYktpdFRvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMK aW5kZXggYzE5NTZhMi4uNjdlMmU2MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRVdlYkxhdW5j aGVyL21haW4uYworKysgYi9XZWJLaXRUb29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCkBAIC0xNDcs NyArMTQ3LDcgQEAgdHlwZWRlZiBzdHJ1Y3QgX0VMYXVuY2hlciB7CiAKIHN0YXRpYyB2b2lkIGJy b3dzZXJEZXN0cm95KEVjb3JlX0V2YXMgKmVlKTsKIHN0YXRpYyB2b2lkIGNsb3NlV2luZG93KEVj b3JlX0V2YXMgKmVlKTsKLXN0YXRpYyBpbnQgYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmws IGNvbnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xl IGdlb21ldHJ5LCBjb25zdCBjaGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVu KTsKK3N0YXRpYyBpbnQgYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNvbnN0IGNoYXIg KnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xlIGdlb21ldHJ5LCBj b25zdCBjaGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVuLCBjb25zdCBjaGFy ICpkYXRhYmFzZVBhdGgpOwogCiBzdGF0aWMgdm9pZAogcHJpbnRfaGlzdG9yeShFaW5hX0xpc3Qg Kmxpc3QpCkBAIC01NjIsNyArNTYyLDcgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAq ZSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgaW5mbygiQ3Jl YXRlIG5ldyB3aW5kb3cgKEY5KSB3YXMgcHJlc3NlZC5cbiIpOwogICAgICAgICBFaW5hX1JlY3Rh bmdsZSBnZW9tZXRyeSA9IHswLCAwLCAwLCAwfTsKICAgICAgICAgYnJvd3NlckNyZWF0ZSgiaHR0 cDovL3d3dy5nb29nbGUuY29tIiwKLSAgICAgICAgICAgICAgICAgICAgICAgYXBwLT50aGVtZSwg YXBwLT51c2VyQWdlbnQsIGdlb21ldHJ5LCBOVUxMLCAwKTsKKyAgICAgICAgICAgICAgICAgICAg ICAgYXBwLT50aGVtZSwgYXBwLT51c2VyQWdlbnQsIGdlb21ldHJ5LCBOVUxMLCAwLCBOVUxMKTsK ICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwgIkYxMCIpKSB7CiAgICAgICAgIEV2YXNf Q29vcmQgeCwgeSwgdywgaDsKICAgICAgICAgRXZhc19PYmplY3QgKmZyYW1lID0gZXdrX3ZpZXdf ZnJhbWVfbWFpbl9nZXQob2JqKTsKQEAgLTYxNCw3ICs2MTQsNyBAQCBxdWl0KEVpbmFfQm9vbCBz dWNjZXNzLCBjb25zdCBjaGFyICptc2cpCiB9CiAKIHN0YXRpYyBpbnQKLWJyb3dzZXJDcmVhdGUo Y29uc3QgY2hhciAqdXJsLCBjb25zdCBjaGFyICp0aGVtZSwgY29uc3QgY2hhciAqdXNlckFnZW50 LCBFaW5hX1JlY3RhbmdsZSBnZW9tZXRyeSwgY29uc3QgY2hhciAqZW5naW5lLCB1bnNpZ25lZCBj aGFyIGlzRnVsbHNjcmVlbikKK2Jyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsLCBjb25zdCBj aGFyICp0aGVtZSwgY29uc3QgY2hhciAqdXNlckFnZW50LCBFaW5hX1JlY3RhbmdsZSBnZW9tZXRy eSwgY29uc3QgY2hhciAqZW5naW5lLCB1bnNpZ25lZCBjaGFyIGlzRnVsbHNjcmVlbiwgY29uc3Qg Y2hhciAqZGF0YWJhc2VQYXRoKQogewogICAgIGlmICgoZ2VvbWV0cnkudyA8PSAwKSAmJiAoZ2Vv bWV0cnkuaCA8PSAwKSkgewogICAgICAgICBnZW9tZXRyeS53ID0gREVGQVVMVF9XSURUSDsKQEAg LTY2MCw2ICs2NjAsOSBAQCBicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hh ciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9SZQogICAgIGV3a192aWV3X3Ro ZW1lX3NldChhcHAtPmJyb3dzZXIsIHRoZW1lKTsKICAgICBpZiAodXNlckFnZW50KQogICAgICAg ICBld2tfdmlld19zZXR0aW5nX3VzZXJfYWdlbnRfc2V0KGFwcC0+YnJvd3NlciwgdXNlckFnZW50 KTsKKworICAgIGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3Nl dChhcHAtPmJyb3dzZXIsIGRhdGFiYXNlUGF0aCk7CisKICAgICBldmFzX29iamVjdF9uYW1lX3Nl dChhcHAtPmJyb3dzZXIsICJicm93c2VyIik7CiAKICAgICBldmFzX29iamVjdF9zbWFydF9jYWxs YmFja19hZGQoYXBwLT5icm93c2VyLCAidGl0bGUsY2hhbmdlZCIsIG9uX3RpdGxlX2NoYW5nZWQs IGFwcCk7CkBAIC04MzksNyArODQyLDcgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqYXJndltdKQog ICAgIGlmIChwcm94eVVyaSkKICAgICAgICAgZXdrX3NldHRpbmdzX3Byb3h5X3VyaV9zZXQocHJv eHlVcmkpOwogCi0gICAgYnJvd3NlckNyZWF0ZSh1cmwsIHRoZW1lLCB1c2VyQWdlbnQsIGdlb21l dHJ5LCBlbmdpbmUsIGlzRnVsbHNjcmVlbik7CisgICAgYnJvd3NlckNyZWF0ZSh1cmwsIHRoZW1l LCB1c2VyQWdlbnQsIGdlb21ldHJ5LCBlbmdpbmUsIGlzRnVsbHNjcmVlbiwgcGF0aCk7CiAgICAg ZWNvcmVfZXZlbnRfaGFuZGxlcl9hZGQoRUNPUkVfRVZFTlRfU0lHTkFMX0VYSVQsIG1haW5fc2ln bmFsX2V4aXQsICZ3aW5kb3dzKTsKIAogICAgIGVjb3JlX21haW5fbG9vcF9iZWdpbigpOwo= 67629 2010-09-14 18:35:22 -0700 2010-09-26 18:56:11 -0700 Patch patch-local-db.txt text/plain 7557 gyuyoung.kim ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggMjdhYjVhMC4uMWI2Zjc2NiAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMC0wOS0xNCAg R3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSB0 byBzZXQgYSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQ0NgorCisgICAgICAgIEFkZCBhIHNldHRp bmcgQVBJIHRvIHNldCBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisKKyAgICAgICAgKiBl d2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfZGVsKToKKyAgICAgICAg KGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX2dldCk6IEFkZGVk LgorICAgICAgICAoZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGhf c2V0KTogQWRkZWQuCisgICAgICAgICogZXdrL2V3a192aWV3Lmg6CisKIDIwMTAtMDktMTMgIFJh ZmFlbCBBbnRvZ25vbGxpICA8YW50b2dub2xsaUBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBV bnJldmlld2VkIGJ1aWxkIGZpeC4KZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmNwcCBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA2YmMxMWRkLi44YjI2OTAz IDEwMDY0NAotLS0gYS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKKysrIGIvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCkBAIC05MCw2ICs5MCw3IEBAIHN0cnVjdCBfRXdrX1ZpZXdfUHJp dmF0ZV9EYXRhIHsKICAgICAgICAgY29uc3QgY2hhciogZW5jb2RpbmdfZGVmYXVsdDsKICAgICAg ICAgY29uc3QgY2hhciogZW5jb2RpbmdfY3VzdG9tOwogICAgICAgICBjb25zdCBjaGFyKiBjYWNo ZV9kaXJlY3Rvcnk7CisgICAgICAgIGNvbnN0IGNoYXIqIGxvY2FsX3N0b3JhZ2VfZGF0YWJhc2Vf cGF0aDsKICAgICAgICAgaW50IGZvbnRfbWluaW11bV9zaXplOwogICAgICAgICBpbnQgZm9udF9t aW5pbXVtX2xvZ2ljYWxfc2l6ZTsKICAgICAgICAgaW50IGZvbnRfZGVmYXVsdF9zaXplOwpAQCAt NTc4LDYgKzU3OSw5IEBAIHN0YXRpYyBFd2tfVmlld19Qcml2YXRlX0RhdGEqIF9ld2tfdmlld19w cml2X25ldyhFd2tfVmlld19TbWFydF9EYXRhKiBzZCkKICAgICBwcml2LT5zZXR0aW5ncy5jYWNo ZV9kaXJlY3RvcnkgPSBlaW5hX3N0cmluZ3NoYXJlX2FkZAogICAgICAgICAoV2ViQ29yZTo6Y2Fj aGVTdG9yYWdlKCkuY2FjaGVEaXJlY3RvcnkoKS51dGY4KCkuZGF0YSgpKTsKIAorICAgIHMgPSBw cml2LT5wYWdlX3NldHRpbmdzLT5sb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgoKTsKKyAgICBwcml2 LT5zZXR0aW5ncy5sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGggPSBlaW5hX3N0cmluZ3NoYXJl X2FkZChzLnN0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworCiAgICAgcHJpdi0+c2V0dGluZ3MuZm9u dF9taW5pbXVtX3NpemUgPSBwcml2LT5wYWdlX3NldHRpbmdzLT5taW5pbXVtRm9udFNpemUoKTsK ICAgICBwcml2LT5zZXR0aW5ncy5mb250X21pbmltdW1fbG9naWNhbF9zaXplID0gcHJpdi0+cGFn ZV9zZXR0aW5ncy0+bWluaW11bUxvZ2ljYWxGb250U2l6ZSgpOwogICAgIHByaXYtPnNldHRpbmdz LmZvbnRfZGVmYXVsdF9zaXplID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+ZGVmYXVsdEZvbnRTaXpl KCk7CkBAIC02NjEsNiArNjY1LDcgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3ByaXZfZGVsKEV3 a19WaWV3X1ByaXZhdGVfRGF0YSogcHJpdikKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2 LT5zZXR0aW5ncy5mb250X2ZhbnRhc3kpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYt PnNldHRpbmdzLmZvbnRfc2VyaWYpOwogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNl dHRpbmdzLmZvbnRfc2Fuc19zZXJpZik7CisgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+ c2V0dGluZ3MubG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoKTsKIAogICAgIGlmIChwcml2LT5h bmltYXRlZF96b29tLmFuaW1hdG9yKQogICAgICAgICBlY29yZV9hbmltYXRvcl9kZWwocHJpdi0+ YW5pbWF0ZWRfem9vbS5hbmltYXRvcik7CkBAIC0yNzgwLDYgKzI3ODUsMzYgQEAgRWluYV9Cb29s IGV3a192aWV3X3NldHRpbmdfcGFnZV9jYWNoZV9zZXQoRXZhc19PYmplY3QqIG8sIEVpbmFfQm9v bCBlbmFibGUpCiB9CiAKIC8qKgorICogR2V0cyB0aGUgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBw YXRoLgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGdldCB0aGUgbG9jYWwgc3RvcmFn ZSBkYXRhYmFzZSBwYXRoLgorICogQHJldHVybiB0aGUgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBw YXRoLgorICovCitjb25zdCBjaGFyKiBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0 YWJhc2VfcGF0aF9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8pCit7CisgICAgRVdLX1ZJRVdfU0Rf R0VUX09SX1JFVFVSTihvLCBzZCwgMCk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJO KHNkLCBwcml2LCAwKTsKKyAgICByZXR1cm4gcHJpdi0+c2V0dGluZ3MubG9jYWxfc3RvcmFnZV9k YXRhYmFzZV9wYXRoOworfQorCisvKioKKyAqIFNldHMgdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJh c2UgcGF0aC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgdGhlIGxvY2FsIHN0 b3JhZ2UgZGF0YWJhc2UgcGF0aC4KKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3Mg YW5kIEBjIEVJTkFfRkFMU0Ugb24gZmFpbHVyZQorICovCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0 dGluZ19sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGhfc2V0KEV2YXNfT2JqZWN0KiBvLCBjb25z dCBjaGFyKiBwYXRoKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJ TkFfRkFMU0UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlO QV9GQUxTRSk7CisgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGlu Z3MubG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoLCBwYXRoKSkgeworICAgICAgICBXVEY6OkF0 b21pY1N0cmluZyBzID0gV1RGOjpTdHJpbmc6OmZyb21VVEY4KHBhdGgpOworICAgICAgICBwcml2 LT5wYWdlX3NldHRpbmdzLT5zZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgocyk7CisgICAgfQor ICAgIHJldHVybiBFSU5BX1RSVUU7Cit9CisKKy8qKgogICogU2ltaWxhciB0byBldmFzX29iamVj dF9zbWFydF9kYXRhX2dldCgpLCBidXQgZG9lcyB0eXBlIGNoZWNraW5nLgogICoKICAqIEBwYXJh bSBvIHZpZXcgb2JqZWN0IHRvIHF1ZXJ5IGludGVybmFsIGRhdGEuCmRpZmYgLS1naXQgYS9XZWJL aXQvZWZsL2V3ay9ld2tfdmlldy5oIGIvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRleCBi ZTI3ZjY4Li5jNTIwNmQyIDEwMDY0NAotLS0gYS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCisr KyBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgKQEAgLTQ0OSw2ICs0NDksOCBAQCBFQVBJIEVp bmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3NwYXRpYWxfbmF2aWdhdGlvbl9zZXQoRXZhc19P YmplY3QqIG8sIEVpbmFfQgogCiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX2xv Y2FsX3N0b3JhZ2VfZ2V0KEV2YXNfT2JqZWN0KiBvKTsKIEVBUEkgRWluYV9Cb29sICAgIGV3a192 aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9zZXQoRXZhc19PYmplY3QqIG8sIEVpbmFfQm9vbCBl bmFibGUpOworRUFQSSBjb25zdCBjaGFyICAqZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdl X2RhdGFiYXNlX3BhdGhfZ2V0KGNvbnN0IEV2YXNfT2JqZWN0ICpvKTsKK0VBUEkgRWluYV9Cb29s ICAgIGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3NldChFdmFz X09iamVjdCAqbywgY29uc3QgY2hhciAqcGF0aCk7CiAKIEVBUEkgRWluYV9Cb29sICAgIGV3a192 aWV3X3NldHRpbmdfcGFnZV9jYWNoZV9nZXQoRXZhc19PYmplY3QqIG8pOwogRUFQSSBFaW5hX0Jv b2wgICAgZXdrX3ZpZXdfc2V0dGluZ19wYWdlX2NhY2hlX3NldChFdmFzX09iamVjdCogbywgRWlu YV9Cb29sIGVuYWJsZSk7CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cgYi9XZWJL aXRUb29scy9DaGFuZ2VMb2cKaW5kZXggNmM0MDkyYy4uNmM4MmU1YiAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvQ2hhbmdlTG9nCisrKyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE3IEBACisyMDEwLTA5LTE0ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ac2Ftc3VuZy5j b20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0VG TF0gQWRkIHNldHRpbmcgQVBJIHRvIHNldCBhIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UgcGF0aC4K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1NDQ2CisK KyAgICAgICAgQWRkIGEgc2V0dGluZyBBUEkgdG8gc2V0IGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2Ug cGF0aC4KKworICAgICAgICAqIEVXZWJMYXVuY2hlci9tYWluLmM6CisgICAgICAgIChvbl9rZXlf ZG93bik6CisgICAgICAgIChicm93c2VyQ3JlYXRlKToKKyAgICAgICAgKG1haW4pOgorCiAyMDEw LTA5LTEzICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZpZXdl ZCBieSBBZGFtIEJhcnRoLgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRVdlYkxhdW5jaGVyL21h aW4uYyBiL1dlYktpdFRvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKaW5kZXggYzE5NTZhMi4uOWNl Mjk3OCAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYworKysgYi9X ZWJLaXRUb29scy9FV2ViTGF1bmNoZXIvbWFpbi5jCkBAIC0xNDcsNyArMTQ3LDcgQEAgdHlwZWRl ZiBzdHJ1Y3QgX0VMYXVuY2hlciB7CiAKIHN0YXRpYyB2b2lkIGJyb3dzZXJEZXN0cm95KEVjb3Jl X0V2YXMgKmVlKTsKIHN0YXRpYyB2b2lkIGNsb3NlV2luZG93KEVjb3JlX0V2YXMgKmVlKTsKLXN0 YXRpYyBpbnQgYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNvbnN0IGNoYXIgKnRoZW1l LCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25zdCBj aGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVuKTsKK3N0YXRpYyBpbnQgYnJv d3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNvbnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFy ICp1c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25zdCBjaGFyICplbmdpbmUs IHVuc2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVuLCBjb25zdCBjaGFyICpkYXRhYmFzZVBhdGgpOwog CiBzdGF0aWMgdm9pZAogcHJpbnRfaGlzdG9yeShFaW5hX0xpc3QgKmxpc3QpCkBAIC01NjIsNyAr NTYyLDcgQEAgb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKm9i aiwgdm9pZCAqZXZlbnRfaW5mbykKICAgICAgICAgaW5mbygiQ3JlYXRlIG5ldyB3aW5kb3cgKEY5 KSB3YXMgcHJlc3NlZC5cbiIpOwogICAgICAgICBFaW5hX1JlY3RhbmdsZSBnZW9tZXRyeSA9IHsw LCAwLCAwLCAwfTsKICAgICAgICAgYnJvd3NlckNyZWF0ZSgiaHR0cDovL3d3dy5nb29nbGUuY29t IiwKLSAgICAgICAgICAgICAgICAgICAgICAgYXBwLT50aGVtZSwgYXBwLT51c2VyQWdlbnQsIGdl b21ldHJ5LCBOVUxMLCAwKTsKKyAgICAgICAgICAgICAgICAgICAgICAgYXBwLT50aGVtZSwgYXBw LT51c2VyQWdlbnQsIGdlb21ldHJ5LCBOVUxMLCAwLCBOVUxMKTsKICAgICB9IGVsc2UgaWYgKCFz dHJjbXAoZXYtPmtleSwgIkYxMCIpKSB7CiAgICAgICAgIEV2YXNfQ29vcmQgeCwgeSwgdywgaDsK ICAgICAgICAgRXZhc19PYmplY3QgKmZyYW1lID0gZXdrX3ZpZXdfZnJhbWVfbWFpbl9nZXQob2Jq KTsKQEAgLTYxNCw3ICs2MTQsNyBAQCBxdWl0KEVpbmFfQm9vbCBzdWNjZXNzLCBjb25zdCBjaGFy ICptc2cpCiB9CiAKIHN0YXRpYyBpbnQKLWJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsLCBj b25zdCBjaGFyICp0aGVtZSwgY29uc3QgY2hhciAqdXNlckFnZW50LCBFaW5hX1JlY3RhbmdsZSBn ZW9tZXRyeSwgY29uc3QgY2hhciAqZW5naW5lLCB1bnNpZ25lZCBjaGFyIGlzRnVsbHNjcmVlbikK K2Jyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsLCBjb25zdCBjaGFyICp0aGVtZSwgY29uc3Qg Y2hhciAqdXNlckFnZW50LCBFaW5hX1JlY3RhbmdsZSBnZW9tZXRyeSwgY29uc3QgY2hhciAqZW5n aW5lLCB1bnNpZ25lZCBjaGFyIGlzRnVsbHNjcmVlbiwgY29uc3QgY2hhciAqZGF0YWJhc2VQYXRo KQogewogICAgIGlmICgoZ2VvbWV0cnkudyA8PSAwKSAmJiAoZ2VvbWV0cnkuaCA8PSAwKSkgewog ICAgICAgICBnZW9tZXRyeS53ID0gREVGQVVMVF9XSURUSDsKQEAgLTY2MCw2ICs2NjAsOCBAQCBi cm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUsIGNvbnN0IGNo YXIgKnVzZXJBZ2VudCwgRWluYV9SZQogICAgIGV3a192aWV3X3RoZW1lX3NldChhcHAtPmJyb3dz ZXIsIHRoZW1lKTsKICAgICBpZiAodXNlckFnZW50KQogICAgICAgICBld2tfdmlld19zZXR0aW5n X3VzZXJfYWdlbnRfc2V0KGFwcC0+YnJvd3NlciwgdXNlckFnZW50KTsKKyAgICBld2tfdmlld19z ZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aF9zZXQoYXBwLT5icm93c2VyLCBkYXRh YmFzZVBhdGgpOworCiAgICAgZXZhc19vYmplY3RfbmFtZV9zZXQoYXBwLT5icm93c2VyLCAiYnJv d3NlciIpOwogCiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKGFwcC0+YnJvd3Nl ciwgInRpdGxlLGNoYW5nZWQiLCBvbl90aXRsZV9jaGFuZ2VkLCBhcHApOwpAQCAtODM5LDcgKzg0 MSw3IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBpZiAocHJveHlVcmkpCiAg ICAgICAgIGV3a19zZXR0aW5nc19wcm94eV91cmlfc2V0KHByb3h5VXJpKTsKIAotICAgIGJyb3dz ZXJDcmVhdGUodXJsLCB0aGVtZSwgdXNlckFnZW50LCBnZW9tZXRyeSwgZW5naW5lLCBpc0Z1bGxz Y3JlZW4pOworICAgIGJyb3dzZXJDcmVhdGUodXJsLCB0aGVtZSwgdXNlckFnZW50LCBnZW9tZXRy eSwgZW5naW5lLCBpc0Z1bGxzY3JlZW4sIHBhdGgpOwogICAgIGVjb3JlX2V2ZW50X2hhbmRsZXJf YWRkKEVDT1JFX0VWRU5UX1NJR05BTF9FWElULCBtYWluX3NpZ25hbF9leGl0LCAmd2luZG93cyk7 CiAKICAgICBlY29yZV9tYWluX2xvb3BfYmVnaW4oKTsK 68045 2010-09-19 18:45:38 -0700 2010-09-26 18:56:28 -0700 Patch patch-local-db.txt text/plain 7526 gyuyoung.kim ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggODc5YTFhZi4uOGY0MmU1NiAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOS0xOSAg R3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSB0 byBzZXQgYSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQ0NiAKKworICAgICAgICBBZGQgYSBzZXR0 aW5nIEFQSSB0byBzZXQgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBwYXRoLgorCisgICAgICAgICog ZXdrL2V3a192aWV3LmNwcDoKKyAgICAgICAgKF9ld2tfdmlld19wcml2X25ldyk6CisgICAgICAg IChfZXdrX3ZpZXdfcHJpdl9kZWwpOgorICAgICAgICAoZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9z dG9yYWdlX2RhdGFiYXNlX3BhdGhfZ2V0KTogQWRkZWQuCisgICAgICAgIChld2tfdmlld19zZXR0 aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aF9zZXQpOiBBZGRlZC4KKyAgICAgICAgKiBl d2svZXdrX3ZpZXcuaDoKKwogMjAxMC0wOS0xNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1dlYktp dC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRl eCA3NmU0YmY1Li45NjJkMmQ2IDEwMDY0NAotLS0gYS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5j cHAKKysrIGIvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCkBAIC05MSw2ICs5MSw3IEBAIHN0 cnVjdCBfRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhIHsKICAgICAgICAgY29uc3QgY2hhciogZW5jb2Rp bmdfY3VzdG9tOwogICAgICAgICBjb25zdCBjaGFyKiBjYWNoZV9kaXJlY3Rvcnk7CiAgICAgICAg IGNvbnN0IGNoYXIqIHRoZW1lOworICAgICAgICBjb25zdCBjaGFyKiBsb2NhbF9zdG9yYWdlX2Rh dGFiYXNlX3BhdGg7CiAgICAgICAgIGludCBmb250X21pbmltdW1fc2l6ZTsKICAgICAgICAgaW50 IGZvbnRfbWluaW11bV9sb2dpY2FsX3NpemU7CiAgICAgICAgIGludCBmb250X2RlZmF1bHRfc2l6 ZTsKQEAgLTU3OSw2ICs1ODAsOSBAQCBzdGF0aWMgRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBfZXdr X3ZpZXdfcHJpdl9uZXcoRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QpCiAgICAgcHJpdi0+c2V0dGlu Z3MuY2FjaGVfZGlyZWN0b3J5ID0gZWluYV9zdHJpbmdzaGFyZV9hZGQKICAgICAgICAgKFdlYkNv cmU6OmNhY2hlU3RvcmFnZSgpLmNhY2hlRGlyZWN0b3J5KCkudXRmOCgpLmRhdGEoKSk7CiAKKyAg ICBzID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+bG9jYWxTdG9yYWdlRGF0YWJhc2VQYXRoKCk7Cisg ICAgcHJpdi0+c2V0dGluZ3MubG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoID0gZWluYV9zdHJp bmdzaGFyZV9hZGQocy5zdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKwogICAgIHByaXYtPnNldHRp bmdzLmZvbnRfbWluaW11bV9zaXplID0gcHJpdi0+cGFnZV9zZXR0aW5ncy0+bWluaW11bUZvbnRT aXplKCk7CiAgICAgcHJpdi0+c2V0dGluZ3MuZm9udF9taW5pbXVtX2xvZ2ljYWxfc2l6ZSA9IHBy aXYtPnBhZ2Vfc2V0dGluZ3MtPm1pbmltdW1Mb2dpY2FsRm9udFNpemUoKTsKICAgICBwcml2LT5z ZXR0aW5ncy5mb250X2RlZmF1bHRfc2l6ZSA9IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPmRlZmF1bHRG b250U2l6ZSgpOwpAQCAtNjYyLDYgKzY2Niw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19wcml2 X2RlbChFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYpCiAgICAgZWluYV9zdHJpbmdzaGFyZV9k ZWwocHJpdi0+c2V0dGluZ3MuZm9udF9mYW50YXN5KTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2Rl bChwcml2LT5zZXR0aW5ncy5mb250X3NlcmlmKTsKICAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChw cml2LT5zZXR0aW5ncy5mb250X3NhbnNfc2VyaWYpOworICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVs KHByaXYtPnNldHRpbmdzLmxvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aCk7CiAKICAgICBpZiAo cHJpdi0+YW5pbWF0ZWRfem9vbS5hbmltYXRvcikKICAgICAgICAgZWNvcmVfYW5pbWF0b3JfZGVs KHByaXYtPmFuaW1hdGVkX3pvb20uYW5pbWF0b3IpOwpAQCAtMjc4NCw2ICsyNzg5LDM2IEBAIEVp bmFfQm9vbCBld2tfdmlld19zZXR0aW5nX3BhZ2VfY2FjaGVfc2V0KEV2YXNfT2JqZWN0KiBvLCBF aW5hX0Jvb2wgZW5hYmxlKQogICAgIHJldHVybiBFSU5BX1RSVUU7CiB9CiAKKy8qCisqIEdldHMg dGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UgcGF0aC4KKyoKKyogQHBhcmFtIG8gdmlldyBvYmpl Y3QgdG8gZ2V0IHRoZSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisqIEByZXR1cm4gdGhl IGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UgcGF0aC4KKyovCitjb25zdCBjaGFyKiBld2tfdmlld19z ZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aF9nZXQoY29uc3QgRXZhc19PYmplY3Qq IG8pCit7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihvLCBzZCwgMCk7CisgICAgRVdL X1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNkLCBwcml2LCAwKTsKKyAgICByZXR1cm4gcHJpdi0+ c2V0dGluZ3MubG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoOworfQorCisvKioKKyogU2V0cyB0 aGUgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBwYXRoLgorKgorKiBAcGFyYW0gbyB2aWV3IG9iamVj dCB0byBzZXQgdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UgcGF0aC4KKyogQHJldHVybiBAYyBF SU5BX1RSVUUgb24gc3VjY2VzcyBhbmQgQGMgRUlOQV9GQUxTRSBvbiBmYWlsdXJlCisqLworRWlu YV9Cb29sIGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3NldChF dmFzX09iamVjdCogbywgY29uc3QgY2hhciogcGF0aCkKK3sKKyAgICBFV0tfVklFV19TRF9HRVRf T1JfUkVUVVJOKG8sIHNkLCBFSU5BX0ZBTFNFKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9S RVRVUk4oc2QsIHByaXYsIEVJTkFfRkFMU0UpOworICAgIGlmIChlaW5hX3N0cmluZ3NoYXJlX3Jl cGxhY2UoJnByaXYtPnNldHRpbmdzLmxvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aCwgcGF0aCkp IHsKKyAgICAgICAgV1RGOjpBdG9taWNTdHJpbmcgcyA9IFdURjo6U3RyaW5nOjpmcm9tVVRGOChw YXRoKTsKKyAgICAgICAgcHJpdi0+cGFnZV9zZXR0aW5ncy0+c2V0TG9jYWxTdG9yYWdlRGF0YWJh c2VQYXRoKHMpOworICAgIH0KKyAgICByZXR1cm4gRUlOQV9UUlVFOworfQorCiAvKioKICAqIFNp bWlsYXIgdG8gZXZhc19vYmplY3Rfc21hcnRfZGF0YV9nZXQoKSwgYnV0IGRvZXMgdHlwZSBjaGVj a2luZy4KICAqCmRpZmYgLS1naXQgYS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oIGIvV2ViS2l0 L2VmbC9ld2svZXdrX3ZpZXcuaAppbmRleCBiZTI3ZjY4Li4yOGEzZDk1IDEwMDY0NAotLS0gYS9X ZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCisrKyBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmgK QEAgLTQ0OSw2ICs0NDksOCBAQCBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3Nw YXRpYWxfbmF2aWdhdGlvbl9zZXQoRXZhc19PYmplY3QqIG8sIEVpbmFfQgogCiBFQVBJIEVpbmFf Qm9vbCAgICBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZ2V0KEV2YXNfT2JqZWN0KiBv KTsKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9zZXQo RXZhc19PYmplY3QqIG8sIEVpbmFfQm9vbCBlbmFibGUpOworRUFQSSBjb25zdCBjaGFyICpld2tf dmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aF9nZXQoY29uc3QgRXZhc19P YmplY3QgKm8pOworRUFQSSBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdl X2RhdGFiYXNlX3BhdGhfc2V0KEV2YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFyICpwYXRoKTsKIAog RUFQSSBFaW5hX0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19wYWdlX2NhY2hlX2dldChFdmFzX09i amVjdCogbyk7CiBFQVBJIEVpbmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3BhZ2VfY2FjaGVf c2V0KEV2YXNfT2JqZWN0KiBvLCBFaW5hX0Jvb2wgZW5hYmxlKTsKZGlmZiAtLWdpdCBhL1dlYktp dFRvb2xzL0NoYW5nZUxvZyBiL1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCBjY2E1YTRhLi5k MDkzZjA5IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMDktMTkgIEd5dXlvdW5nIEtpbSAg PGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBbRUZMXSBBZGQgc2V0dGluZyBBUEkgdG8gc2V0IGEgbG9jYWwg c3RvcmFnZSBkYXRhYmFzZSBwYXRoLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDU0NDYKKworICAgICAgICBBZGQgYSBzZXR0aW5nIEFQSSB0byBzZXQg bG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBwYXRoLgorCisgICAgICAgICogRVdlYkxhdW5jaGVyL21h aW4uYzoKKyAgICAgICAgKG9uX2tleV9kb3duKToKKyAgICAgICAgKGJyb3dzZXJDcmVhdGUpOgor ICAgICAgICAobWFpbik6CisKIDIwMTAtMDktMTkgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBbmRlcnMgQ2FybHNzb24uCmRpZmYgLS1naXQgYS9X ZWJLaXRUb29scy9FV2ViTGF1bmNoZXIvbWFpbi5jIGIvV2ViS2l0VG9vbHMvRVdlYkxhdW5jaGVy L21haW4uYwppbmRleCBjMTk1NmEyLi45Y2UyOTc4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9F V2ViTGF1bmNoZXIvbWFpbi5jCisrKyBiL1dlYktpdFRvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMK QEAgLTE0Nyw3ICsxNDcsNyBAQCB0eXBlZGVmIHN0cnVjdCBfRUxhdW5jaGVyIHsKIAogc3RhdGlj IHZvaWQgYnJvd3NlckRlc3Ryb3koRWNvcmVfRXZhcyAqZWUpOwogc3RhdGljIHZvaWQgY2xvc2VX aW5kb3coRWNvcmVfRXZhcyAqZWUpOwotc3RhdGljIGludCBicm93c2VyQ3JlYXRlKGNvbnN0IGNo YXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9S ZWN0YW5nbGUgZ2VvbWV0cnksIGNvbnN0IGNoYXIgKmVuZ2luZSwgdW5zaWduZWQgY2hhciBpc0Z1 bGxzY3JlZW4pOworc3RhdGljIGludCBicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29u c3QgY2hhciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9SZWN0YW5nbGUgZ2Vv bWV0cnksIGNvbnN0IGNoYXIgKmVuZ2luZSwgdW5zaWduZWQgY2hhciBpc0Z1bGxzY3JlZW4sIGNv bnN0IGNoYXIgKmRhdGFiYXNlUGF0aCk7CiAKIHN0YXRpYyB2b2lkCiBwcmludF9oaXN0b3J5KEVp bmFfTGlzdCAqbGlzdCkKQEAgLTU2Miw3ICs1NjIsNyBAQCBvbl9rZXlfZG93bih2b2lkICpkYXRh LCBFdmFzICplLCBFdmFzX09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgICAgICBp bmZvKCJDcmVhdGUgbmV3IHdpbmRvdyAoRjkpIHdhcyBwcmVzc2VkLlxuIik7CiAgICAgICAgIEVp bmFfUmVjdGFuZ2xlIGdlb21ldHJ5ID0gezAsIDAsIDAsIDB9OwogICAgICAgICBicm93c2VyQ3Jl YXRlKCJodHRwOi8vd3d3Lmdvb2dsZS5jb20iLAotICAgICAgICAgICAgICAgICAgICAgICBhcHAt PnRoZW1lLCBhcHAtPnVzZXJBZ2VudCwgZ2VvbWV0cnksIE5VTEwsIDApOworICAgICAgICAgICAg ICAgICAgICAgICBhcHAtPnRoZW1lLCBhcHAtPnVzZXJBZ2VudCwgZ2VvbWV0cnksIE5VTEwsIDAs IE5VTEwpOwogICAgIH0gZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjEwIikpIHsKICAgICAg ICAgRXZhc19Db29yZCB4LCB5LCB3LCBoOwogICAgICAgICBFdmFzX09iamVjdCAqZnJhbWUgPSBl d2tfdmlld19mcmFtZV9tYWluX2dldChvYmopOwpAQCAtNjE0LDcgKzYxNCw3IEBAIHF1aXQoRWlu YV9Cb29sIHN1Y2Nlc3MsIGNvbnN0IGNoYXIgKm1zZykKIH0KIAogc3RhdGljIGludAotYnJvd3Nl ckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNvbnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFyICp1 c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25zdCBjaGFyICplbmdpbmUsIHVu c2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVuKQorYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmws IGNvbnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xl IGdlb21ldHJ5LCBjb25zdCBjaGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVu LCBjb25zdCBjaGFyICpkYXRhYmFzZVBhdGgpCiB7CiAgICAgaWYgKChnZW9tZXRyeS53IDw9IDAp ICYmIChnZW9tZXRyeS5oIDw9IDApKSB7CiAgICAgICAgIGdlb21ldHJ5LncgPSBERUZBVUxUX1dJ RFRIOwpAQCAtNjYwLDYgKzY2MCw4IEBAIGJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsLCBj b25zdCBjaGFyICp0aGVtZSwgY29uc3QgY2hhciAqdXNlckFnZW50LCBFaW5hX1JlCiAgICAgZXdr X3ZpZXdfdGhlbWVfc2V0KGFwcC0+YnJvd3NlciwgdGhlbWUpOwogICAgIGlmICh1c2VyQWdlbnQp CiAgICAgICAgIGV3a192aWV3X3NldHRpbmdfdXNlcl9hZ2VudF9zZXQoYXBwLT5icm93c2VyLCB1 c2VyQWdlbnQpOworICAgIGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9w YXRoX3NldChhcHAtPmJyb3dzZXIsIGRhdGFiYXNlUGF0aCk7CisKICAgICBldmFzX29iamVjdF9u YW1lX3NldChhcHAtPmJyb3dzZXIsICJicm93c2VyIik7CiAKICAgICBldmFzX29iamVjdF9zbWFy dF9jYWxsYmFja19hZGQoYXBwLT5icm93c2VyLCAidGl0bGUsY2hhbmdlZCIsIG9uX3RpdGxlX2No YW5nZWQsIGFwcCk7CkBAIC04MzksNyArODQxLDcgQEAgbWFpbihpbnQgYXJnYywgY2hhciAqYXJn dltdKQogICAgIGlmIChwcm94eVVyaSkKICAgICAgICAgZXdrX3NldHRpbmdzX3Byb3h5X3VyaV9z ZXQocHJveHlVcmkpOwogCi0gICAgYnJvd3NlckNyZWF0ZSh1cmwsIHRoZW1lLCB1c2VyQWdlbnQs IGdlb21ldHJ5LCBlbmdpbmUsIGlzRnVsbHNjcmVlbik7CisgICAgYnJvd3NlckNyZWF0ZSh1cmws IHRoZW1lLCB1c2VyQWdlbnQsIGdlb21ldHJ5LCBlbmdpbmUsIGlzRnVsbHNjcmVlbiwgcGF0aCk7 CiAgICAgZWNvcmVfZXZlbnRfaGFuZGxlcl9hZGQoRUNPUkVfRVZFTlRfU0lHTkFMX0VYSVQsIG1h aW5fc2lnbmFsX2V4aXQsICZ3aW5kb3dzKTsKIAogICAgIGVjb3JlX21haW5fbG9vcF9iZWdpbigp Owo= 68866 2010-09-26 17:13:45 -0700 2010-09-26 18:56:45 -0700 Patch patch-local-db.txt text/plain 7581 gyuyoung.kim ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggY2NmMDQyMi4uNmU1MjQxZiAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOS0yNiAg R3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSB0 byBzZXQgYSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQ0NgorCisgICAgICAgIEFkZCBhIHNldHRp bmcgQVBJIHRvIHNldCBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisKKyAgICAgICAgKiBl d2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KToKKyAgICAgICAg KF9ld2tfdmlld19wcml2X2RlbCk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0 b3JhZ2VfZGF0YWJhc2VfcGF0aF9nZXQpOiBBZGRlZC4KKyAgICAgICAgKGV3a192aWV3X3NldHRp bmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3NldCk6IEFkZGVkLgorICAgICAgICAqIGV3 ay9ld2tfdmlldy5oOgorCiAyMDEwLTA5LTIzICBMdWNhcyBEZSBNYXJjaGkgIDxsdWNhcy5kZW1h cmNoaUBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdlZCBieSBDc2FiYSBPc3p0cm9n b27DoWMuCmRpZmYgLS1naXQgYS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXggYWNkZGNkMi4uMTllZmJmYSAxMDA2NDQKLS0tIGEv V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmNwcApAQCAtOTEsNiArOTEsNyBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAg ICAgICAgIGNvbnN0IGNoYXIqIGVuY29kaW5nX2N1c3RvbTsKICAgICAgICAgY29uc3QgY2hhciog Y2FjaGVfZGlyZWN0b3J5OwogICAgICAgICBjb25zdCBjaGFyKiB0aGVtZTsKKyAgICAgICAgY29u c3QgY2hhciogbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoOwogICAgICAgICBpbnQgZm9udF9t aW5pbXVtX3NpemU7CiAgICAgICAgIGludCBmb250X21pbmltdW1fbG9naWNhbF9zaXplOwogICAg ICAgICBpbnQgZm9udF9kZWZhdWx0X3NpemU7CkBAIC01NzksNiArNTgwLDkgQEAgc3RhdGljIEV3 a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192aWV3X3ByaXZfbmV3KEV3a19WaWV3X1NtYXJ0X0Rh dGEqIHNkKQogICAgIHByaXYtPnNldHRpbmdzLmNhY2hlX2RpcmVjdG9yeSA9IGVpbmFfc3RyaW5n c2hhcmVfYWRkCiAgICAgICAgIChXZWJDb3JlOjpjYWNoZVN0b3JhZ2UoKS5jYWNoZURpcmVjdG9y eSgpLnV0ZjgoKS5kYXRhKCkpOwogCisgICAgcyA9IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPmxvY2Fs U3RvcmFnZURhdGFiYXNlUGF0aCgpOworICAgIHByaXYtPnNldHRpbmdzLmxvY2FsX3N0b3JhZ2Vf ZGF0YWJhc2VfcGF0aCA9IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHMuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSk7CisKICAgICBwcml2LT5zZXR0aW5ncy5mb250X21pbmltdW1fc2l6ZSA9IHByaXYtPnBh Z2Vfc2V0dGluZ3MtPm1pbmltdW1Gb250U2l6ZSgpOwogICAgIHByaXYtPnNldHRpbmdzLmZvbnRf bWluaW11bV9sb2dpY2FsX3NpemUgPSBwcml2LT5wYWdlX3NldHRpbmdzLT5taW5pbXVtTG9naWNh bEZvbnRTaXplKCk7CiAgICAgcHJpdi0+c2V0dGluZ3MuZm9udF9kZWZhdWx0X3NpemUgPSBwcml2 LT5wYWdlX3NldHRpbmdzLT5kZWZhdWx0Rm9udFNpemUoKTsKQEAgLTY2Miw2ICs2NjYsNyBAQCBz dGF0aWMgdm9pZCBfZXdrX3ZpZXdfcHJpdl9kZWwoRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBwcml2 KQogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmZvbnRfZmFudGFzeSk7 CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MuZm9udF9zZXJpZik7CiAg ICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MuZm9udF9zYW5zX3NlcmlmKTsK KyAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy5sb2NhbF9zdG9yYWdlX2Rh dGFiYXNlX3BhdGgpOwogCiAgICAgaWYgKHByaXYtPmFuaW1hdGVkX3pvb20uYW5pbWF0b3IpCiAg ICAgICAgIGVjb3JlX2FuaW1hdG9yX2RlbChwcml2LT5hbmltYXRlZF96b29tLmFuaW1hdG9yKTsK QEAgLTI3ODQsNiArMjc4OSwzNiBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19wYWdlX2Nh Y2hlX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGVuYWJsZSkKICAgICByZXR1cm4gRUlO QV9UUlVFOwogfQogCisvKgorICogR2V0cyB0aGUgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBwYXRo LgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGdldCB0aGUgbG9jYWwgc3RvcmFnZSBk YXRhYmFzZSBwYXRoLgorICogQHJldHVybiB0aGUgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBwYXRo LgorICovCitjb25zdCBjaGFyKiBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJh c2VfcGF0aF9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8pCit7CisgICAgRVdLX1ZJRVdfU0RfR0VU X09SX1JFVFVSTihvLCBzZCwgMCk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNk LCBwcml2LCAwKTsKKyAgICByZXR1cm4gcHJpdi0+c2V0dGluZ3MubG9jYWxfc3RvcmFnZV9kYXRh YmFzZV9wYXRoOworfQorCisvKioKKyAqIFNldHMgdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2Ug cGF0aC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgdGhlIGxvY2FsIHN0b3Jh Z2UgZGF0YWJhc2UgcGF0aC4KKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3MgYW5k IEBjIEVJTkFfRkFMU0Ugb24gZmFpbHVyZQorICovCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGlu Z19sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGhfc2V0KEV2YXNfT2JqZWN0KiBvLCBjb25zdCBj aGFyKiBwYXRoKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFf RkFMU0UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9G QUxTRSk7CisgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3Mu bG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoLCBwYXRoKSkgeworICAgICAgICBXVEY6OkF0b21p Y1N0cmluZyBzID0gV1RGOjpTdHJpbmc6OmZyb21VVEY4KHBhdGgpOworICAgICAgICBwcml2LT5w YWdlX3NldHRpbmdzLT5zZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgocyk7CisgICAgfQorICAg IHJldHVybiBFSU5BX1RSVUU7Cit9CisKIC8qKgogICogU2ltaWxhciB0byBldmFzX29iamVjdF9z bWFydF9kYXRhX2dldCgpLCBidXQgZG9lcyB0eXBlIGNoZWNraW5nLgogICoKZGlmZiAtLWdpdCBh L1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCmlu ZGV4IDEwMmY0NTUuLjI2YmY5N2MgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmgKKysrIGIvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtNDQ5LDYgKzQ0OSw4IEBAIEVB UEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfc3BhdGlhbF9uYXZpZ2F0aW9uX3NldChF dmFzX09iamVjdCogbywgRWluYV9CCiAKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRp bmdfbG9jYWxfc3RvcmFnZV9nZXQoRXZhc19PYmplY3QqIG8pOwogRUFQSSBFaW5hX0Jvb2wgICAg ZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX3NldChFdmFzX09iamVjdCogbywgRWluYV9C b29sIGVuYWJsZSk7CitFQVBJIGNvbnN0IGNoYXIgICpld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0 b3JhZ2VfZGF0YWJhc2VfcGF0aF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworRUFQSSBFaW5h X0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGhfc2V0 KEV2YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFyICpwYXRoKTsKIAogRUFQSSBFaW5hX0Jvb2wgICAg ZXdrX3ZpZXdfc2V0dGluZ19wYWdlX2NhY2hlX2dldChFdmFzX09iamVjdCogbyk7CiBFQVBJIEVp bmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3BhZ2VfY2FjaGVfc2V0KEV2YXNfT2JqZWN0KiBv LCBFaW5hX0Jvb2wgZW5hYmxlKTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBi L1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCBlYzY3MWY1Li5kNzgxNzUxIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTAtMDktMjYgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1z dW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbRUZMXSBBZGQgc2V0dGluZyBBUEkgdG8gc2V0IGEgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBw YXRoLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU0 NDYKKworICAgICAgICBBZGQgYSBzZXR0aW5nIEFQSSB0byBzZXQgbG9jYWwgc3RvcmFnZSBkYXRh YmFzZSBwYXRoLgorCisgICAgICAgICogRVdlYkxhdW5jaGVyL21haW4uYzoKKyAgICAgICAgKG9u X2tleV9kb3duKToKKyAgICAgICAgKGJyb3dzZXJDcmVhdGUpOgorICAgICAgICAobWFpbik6CisK IDIwMTAtMDktMjUgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9FV2Vi TGF1bmNoZXIvbWFpbi5jIGIvV2ViS2l0VG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwppbmRleCA3 YmRmYzcyLi4yMDIxMDliIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9FV2ViTGF1bmNoZXIvbWFp bi5jCisrKyBiL1dlYktpdFRvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKQEAgLTE0Nyw3ICsxNDcs NyBAQCB0eXBlZGVmIHN0cnVjdCBfRUxhdW5jaGVyIHsKIAogc3RhdGljIHZvaWQgYnJvd3NlckRl c3Ryb3koRWNvcmVfRXZhcyAqZWUpOwogc3RhdGljIHZvaWQgY2xvc2VXaW5kb3coRWNvcmVfRXZh cyAqZWUpOwotc3RhdGljIGludCBicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3Qg Y2hhciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9SZWN0YW5nbGUgZ2VvbWV0 cnksIGNvbnN0IGNoYXIgKmVuZ2luZSwgdW5zaWduZWQgY2hhciBpc0Z1bGxzY3JlZW4pOworc3Rh dGljIGludCBicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUs IGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9SZWN0YW5nbGUgZ2VvbWV0cnksIGNvbnN0IGNo YXIgKmVuZ2luZSwgdW5zaWduZWQgY2hhciBpc0Z1bGxzY3JlZW4sIGNvbnN0IGNoYXIgKmRhdGFi YXNlUGF0aCk7CiAKIHN0YXRpYyB2b2lkCiBwcmludF9oaXN0b3J5KEVpbmFfTGlzdCAqbGlzdCkK QEAgLTU2Miw3ICs1NjIsNyBAQCBvbl9rZXlfZG93bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFz X09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgICAgICBpbmZvKCJDcmVhdGUgbmV3 IHdpbmRvdyAoRjkpIHdhcyBwcmVzc2VkLlxuIik7CiAgICAgICAgIEVpbmFfUmVjdGFuZ2xlIGdl b21ldHJ5ID0gezAsIDAsIDAsIDB9OwogICAgICAgICBicm93c2VyQ3JlYXRlKCJodHRwOi8vd3d3 Lmdvb2dsZS5jb20iLAotICAgICAgICAgICAgICAgICAgICAgICBhcHAtPnRoZW1lLCBhcHAtPnVz ZXJBZ2VudCwgZ2VvbWV0cnksIE5VTEwsIDApOworICAgICAgICAgICAgICAgICAgICAgICBhcHAt PnRoZW1lLCBhcHAtPnVzZXJBZ2VudCwgZ2VvbWV0cnksIE5VTEwsIDAsIE5VTEwpOwogICAgIH0g ZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjEwIikpIHsKICAgICAgICAgRXZhc19Db29yZCB4 LCB5LCB3LCBoOwogICAgICAgICBFdmFzX09iamVjdCAqZnJhbWUgPSBld2tfdmlld19mcmFtZV9t YWluX2dldChvYmopOwpAQCAtNjE3LDcgKzYxNyw3IEBAIHF1aXQoRWluYV9Cb29sIHN1Y2Nlc3Ms IGNvbnN0IGNoYXIgKm1zZykKIH0KIAogc3RhdGljIGludAotYnJvd3NlckNyZWF0ZShjb25zdCBj aGFyICp1cmwsIGNvbnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFf UmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25zdCBjaGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNG dWxsc2NyZWVuKQorYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNvbnN0IGNoYXIgKnRo ZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25z dCBjaGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVubiwgY29uc3QgY2hhciAq ZGF0YWJhc2VQYXRoKQogewogICAgIGlmICgoZ2VvbWV0cnkudyA8PSAwKSAmJiAoZ2VvbWV0cnku aCA8PSAwKSkgewogICAgICAgICBnZW9tZXRyeS53ID0gREVGQVVMVF9XSURUSDsKQEAgLTY2MCw2 ICs2NjAsOCBAQCBicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhl bWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9SZQogICAgIGV3a192aWV3X3RoZW1lX3Nl dChhcHAtPmJyb3dzZXIsIHRoZW1lKTsKICAgICBpZiAodXNlckFnZW50KQogICAgICAgICBld2tf dmlld19zZXR0aW5nX3VzZXJfYWdlbnRfc2V0KGFwcC0+YnJvd3NlciwgdXNlckFnZW50KTsKKyAg ICBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJhc2VfcGF0aF9zZXQoYXBwLT5i cm93c2VyLCBkYXRhYmFzZVBhdGgpOworICAgIAogICAgIGV2YXNfb2JqZWN0X25hbWVfc2V0KGFw cC0+YnJvd3NlciwgImJyb3dzZXIiKTsKIAogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNr X2FkZChhcHAtPmJyb3dzZXIsICJ0aXRsZSxjaGFuZ2VkIiwgb25fdGl0bGVfY2hhbmdlZCwgYXBw KTsKQEAgLTg0MCw3ICs4NDIsNyBAQCBtYWluKGludCBhcmdjLCBjaGFyICphcmd2W10pCiAgICAg aWYgKHByb3h5VXJpKQogICAgICAgICBld2tfc2V0dGluZ3NfcHJveHlfdXJpX3NldChwcm94eVVy aSk7CiAKLSAgICBicm93c2VyQ3JlYXRlKHVybCwgdGhlbWVQYXRoLCB1c2VyQWdlbnQsIGdlb21l dHJ5LCBlbmdpbmUsIGlzRnVsbHNjcmVlbik7CisgICAgYnJvd3NlckNyZWF0ZSh1cmwsIHRoZW1l UGF0aCwgdXNlckFnZW50LCBnZW9tZXRyeSwgZW5naW5lLCBpc0Z1bGxzY3JlZW4sIHBhdGgpOwog ICAgIGVjb3JlX2V2ZW50X2hhbmRsZXJfYWRkKEVDT1JFX0VWRU5UX1NJR05BTF9FWElULCBtYWlu X3NpZ25hbF9leGl0LCAmd2luZG93cyk7CiAKICAgICBlY29yZV9tYWluX2xvb3BfYmVnaW4oKTsK 68868 2010-09-26 18:29:32 -0700 2010-09-26 19:43:34 -0700 Patch patch-local-db.txt text/plain 7580 gyuyoung.kim ZGlmZiAtLWdpdCBhL1dlYktpdC9lZmwvQ2hhbmdlTG9nIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK aW5kZXggY2NmMDQyMi4uNmU1MjQxZiAxMDA2NDQKLS0tIGEvV2ViS2l0L2VmbC9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMC0wOS0yNiAg R3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1bmcuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtFRkxdIEFkZCBzZXR0aW5nIEFQSSB0 byBzZXQgYSBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTQ0NgorCisgICAgICAgIEFkZCBhIHNldHRp bmcgQVBJIHRvIHNldCBsb2NhbCBzdG9yYWdlIGRhdGFiYXNlIHBhdGguCisKKyAgICAgICAgKiBl d2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3X3ByaXZfbmV3KToKKyAgICAgICAg KF9ld2tfdmlld19wcml2X2RlbCk6CisgICAgICAgIChld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0 b3JhZ2VfZGF0YWJhc2VfcGF0aF9nZXQpOiBBZGRlZC4KKyAgICAgICAgKGV3a192aWV3X3NldHRp bmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3NldCk6IEFkZGVkLgorICAgICAgICAqIGV3 ay9ld2tfdmlldy5oOgorCiAyMDEwLTA5LTIzICBMdWNhcyBEZSBNYXJjaGkgIDxsdWNhcy5kZW1h cmNoaUBwcm9mdXNpb24ubW9iaT4KIAogICAgICAgICBSZXZpZXdlZCBieSBDc2FiYSBPc3p0cm9n b27DoWMuCmRpZmYgLS1naXQgYS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9XZWJLaXQv ZWZsL2V3ay9ld2tfdmlldy5jcHAKaW5kZXggYWNkZGNkMi4uMTllZmJmYSAxMDA2NDQKLS0tIGEv V2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmNwcApAQCAtOTEsNiArOTEsNyBAQCBzdHJ1Y3QgX0V3a19WaWV3X1ByaXZhdGVfRGF0YSB7CiAg ICAgICAgIGNvbnN0IGNoYXIqIGVuY29kaW5nX2N1c3RvbTsKICAgICAgICAgY29uc3QgY2hhciog Y2FjaGVfZGlyZWN0b3J5OwogICAgICAgICBjb25zdCBjaGFyKiB0aGVtZTsKKyAgICAgICAgY29u c3QgY2hhciogbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoOwogICAgICAgICBpbnQgZm9udF9t aW5pbXVtX3NpemU7CiAgICAgICAgIGludCBmb250X21pbmltdW1fbG9naWNhbF9zaXplOwogICAg ICAgICBpbnQgZm9udF9kZWZhdWx0X3NpemU7CkBAIC01NzksNiArNTgwLDkgQEAgc3RhdGljIEV3 a19WaWV3X1ByaXZhdGVfRGF0YSogX2V3a192aWV3X3ByaXZfbmV3KEV3a19WaWV3X1NtYXJ0X0Rh dGEqIHNkKQogICAgIHByaXYtPnNldHRpbmdzLmNhY2hlX2RpcmVjdG9yeSA9IGVpbmFfc3RyaW5n c2hhcmVfYWRkCiAgICAgICAgIChXZWJDb3JlOjpjYWNoZVN0b3JhZ2UoKS5jYWNoZURpcmVjdG9y eSgpLnV0ZjgoKS5kYXRhKCkpOwogCisgICAgcyA9IHByaXYtPnBhZ2Vfc2V0dGluZ3MtPmxvY2Fs U3RvcmFnZURhdGFiYXNlUGF0aCgpOworICAgIHByaXYtPnNldHRpbmdzLmxvY2FsX3N0b3JhZ2Vf ZGF0YWJhc2VfcGF0aCA9IGVpbmFfc3RyaW5nc2hhcmVfYWRkKHMuc3RyaW5nKCkudXRmOCgpLmRh dGEoKSk7CisKICAgICBwcml2LT5zZXR0aW5ncy5mb250X21pbmltdW1fc2l6ZSA9IHByaXYtPnBh Z2Vfc2V0dGluZ3MtPm1pbmltdW1Gb250U2l6ZSgpOwogICAgIHByaXYtPnNldHRpbmdzLmZvbnRf bWluaW11bV9sb2dpY2FsX3NpemUgPSBwcml2LT5wYWdlX3NldHRpbmdzLT5taW5pbXVtTG9naWNh bEZvbnRTaXplKCk7CiAgICAgcHJpdi0+c2V0dGluZ3MuZm9udF9kZWZhdWx0X3NpemUgPSBwcml2 LT5wYWdlX3NldHRpbmdzLT5kZWZhdWx0Rm9udFNpemUoKTsKQEAgLTY2Miw2ICs2NjYsNyBAQCBz dGF0aWMgdm9pZCBfZXdrX3ZpZXdfcHJpdl9kZWwoRXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBwcml2 KQogICAgIGVpbmFfc3RyaW5nc2hhcmVfZGVsKHByaXYtPnNldHRpbmdzLmZvbnRfZmFudGFzeSk7 CiAgICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MuZm9udF9zZXJpZik7CiAg ICAgZWluYV9zdHJpbmdzaGFyZV9kZWwocHJpdi0+c2V0dGluZ3MuZm9udF9zYW5zX3NlcmlmKTsK KyAgICBlaW5hX3N0cmluZ3NoYXJlX2RlbChwcml2LT5zZXR0aW5ncy5sb2NhbF9zdG9yYWdlX2Rh dGFiYXNlX3BhdGgpOwogCiAgICAgaWYgKHByaXYtPmFuaW1hdGVkX3pvb20uYW5pbWF0b3IpCiAg ICAgICAgIGVjb3JlX2FuaW1hdG9yX2RlbChwcml2LT5hbmltYXRlZF96b29tLmFuaW1hdG9yKTsK QEAgLTI3ODQsNiArMjc4OSwzNiBAQCBFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGluZ19wYWdlX2Nh Y2hlX3NldChFdmFzX09iamVjdCogbywgRWluYV9Cb29sIGVuYWJsZSkKICAgICByZXR1cm4gRUlO QV9UUlVFOwogfQogCisvKgorICogR2V0cyB0aGUgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBwYXRo LgorICoKKyAqIEBwYXJhbSBvIHZpZXcgb2JqZWN0IHRvIGdldCB0aGUgbG9jYWwgc3RvcmFnZSBk YXRhYmFzZSBwYXRoLgorICogQHJldHVybiB0aGUgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBwYXRo LgorICovCitjb25zdCBjaGFyKiBld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0b3JhZ2VfZGF0YWJh c2VfcGF0aF9nZXQoY29uc3QgRXZhc19PYmplY3QqIG8pCit7CisgICAgRVdLX1ZJRVdfU0RfR0VU X09SX1JFVFVSTihvLCBzZCwgMCk7CisgICAgRVdLX1ZJRVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNk LCBwcml2LCAwKTsKKyAgICByZXR1cm4gcHJpdi0+c2V0dGluZ3MubG9jYWxfc3RvcmFnZV9kYXRh YmFzZV9wYXRoOworfQorCisvKioKKyAqIFNldHMgdGhlIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2Ug cGF0aC4KKyAqCisgKiBAcGFyYW0gbyB2aWV3IG9iamVjdCB0byBzZXQgdGhlIGxvY2FsIHN0b3Jh Z2UgZGF0YWJhc2UgcGF0aC4KKyAqIEByZXR1cm4gQGMgRUlOQV9UUlVFIG9uIHN1Y2Nlc3MgYW5k IEBjIEVJTkFfRkFMU0Ugb24gZmFpbHVyZQorICovCitFaW5hX0Jvb2wgZXdrX3ZpZXdfc2V0dGlu Z19sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGhfc2V0KEV2YXNfT2JqZWN0KiBvLCBjb25zdCBj aGFyKiBwYXRoKQoreworICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4obywgc2QsIEVJTkFf RkFMU0UpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzZCwgcHJpdiwgRUlOQV9G QUxTRSk7CisgICAgaWYgKGVpbmFfc3RyaW5nc2hhcmVfcmVwbGFjZSgmcHJpdi0+c2V0dGluZ3Mu bG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoLCBwYXRoKSkgeworICAgICAgICBXVEY6OkF0b21p Y1N0cmluZyBzID0gV1RGOjpTdHJpbmc6OmZyb21VVEY4KHBhdGgpOworICAgICAgICBwcml2LT5w YWdlX3NldHRpbmdzLT5zZXRMb2NhbFN0b3JhZ2VEYXRhYmFzZVBhdGgocyk7CisgICAgfQorICAg IHJldHVybiBFSU5BX1RSVUU7Cit9CisKIC8qKgogICogU2ltaWxhciB0byBldmFzX29iamVjdF9z bWFydF9kYXRhX2dldCgpLCBidXQgZG9lcyB0eXBlIGNoZWNraW5nLgogICoKZGlmZiAtLWdpdCBh L1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmggYi9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5oCmlu ZGV4IDEwMmY0NTUuLjI2YmY5N2MgMTAwNjQ0Ci0tLSBhL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 LmgKKysrIGIvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuaApAQCAtNDQ5LDYgKzQ0OSw4IEBAIEVB UEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRpbmdfc3BhdGlhbF9uYXZpZ2F0aW9uX3NldChF dmFzX09iamVjdCogbywgRWluYV9CCiAKIEVBUEkgRWluYV9Cb29sICAgIGV3a192aWV3X3NldHRp bmdfbG9jYWxfc3RvcmFnZV9nZXQoRXZhc19PYmplY3QqIG8pOwogRUFQSSBFaW5hX0Jvb2wgICAg ZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX3NldChFdmFzX09iamVjdCogbywgRWluYV9C b29sIGVuYWJsZSk7CitFQVBJIGNvbnN0IGNoYXIgICpld2tfdmlld19zZXR0aW5nX2xvY2FsX3N0 b3JhZ2VfZGF0YWJhc2VfcGF0aF9nZXQoY29uc3QgRXZhc19PYmplY3QgKm8pOworRUFQSSBFaW5h X0Jvb2wgICAgZXdrX3ZpZXdfc2V0dGluZ19sb2NhbF9zdG9yYWdlX2RhdGFiYXNlX3BhdGhfc2V0 KEV2YXNfT2JqZWN0ICpvLCBjb25zdCBjaGFyICpwYXRoKTsKIAogRUFQSSBFaW5hX0Jvb2wgICAg ZXdrX3ZpZXdfc2V0dGluZ19wYWdlX2NhY2hlX2dldChFdmFzX09iamVjdCogbyk7CiBFQVBJIEVp bmFfQm9vbCAgICBld2tfdmlld19zZXR0aW5nX3BhZ2VfY2FjaGVfc2V0KEV2YXNfT2JqZWN0KiBv LCBFaW5hX0Jvb2wgZW5hYmxlKTsKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZyBi L1dlYktpdFRvb2xzL0NoYW5nZUxvZwppbmRleCBlYzY3MWY1Li5kNzgxNzUxIDEwMDY0NAotLS0g YS9XZWJLaXRUb29scy9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTcgQEAKKzIwMTAtMDktMjYgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1z dW5nLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBbRUZMXSBBZGQgc2V0dGluZyBBUEkgdG8gc2V0IGEgbG9jYWwgc3RvcmFnZSBkYXRhYmFzZSBw YXRoLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDU0 NDYKKworICAgICAgICBBZGQgYSBzZXR0aW5nIEFQSSB0byBzZXQgbG9jYWwgc3RvcmFnZSBkYXRh YmFzZSBwYXRoLgorCisgICAgICAgICogRVdlYkxhdW5jaGVyL21haW4uYzoKKyAgICAgICAgKG9u X2tleV9kb3duKToKKyAgICAgICAgKGJyb3dzZXJDcmVhdGUpOgorICAgICAgICAobWFpbik6CisK IDIwMTAtMDktMjUgIE5pY29sYXMgV2ViZXIgIDx0aGFraXNAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9FV2Vi TGF1bmNoZXIvbWFpbi5jIGIvV2ViS2l0VG9vbHMvRVdlYkxhdW5jaGVyL21haW4uYwppbmRleCA3 YmRmYzcyLi44OTY1YzQyIDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9FV2ViTGF1bmNoZXIvbWFp bi5jCisrKyBiL1dlYktpdFRvb2xzL0VXZWJMYXVuY2hlci9tYWluLmMKQEAgLTE0Nyw3ICsxNDcs NyBAQCB0eXBlZGVmIHN0cnVjdCBfRUxhdW5jaGVyIHsKIAogc3RhdGljIHZvaWQgYnJvd3NlckRl c3Ryb3koRWNvcmVfRXZhcyAqZWUpOwogc3RhdGljIHZvaWQgY2xvc2VXaW5kb3coRWNvcmVfRXZh cyAqZWUpOwotc3RhdGljIGludCBicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3Qg Y2hhciAqdGhlbWUsIGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9SZWN0YW5nbGUgZ2VvbWV0 cnksIGNvbnN0IGNoYXIgKmVuZ2luZSwgdW5zaWduZWQgY2hhciBpc0Z1bGxzY3JlZW4pOworc3Rh dGljIGludCBicm93c2VyQ3JlYXRlKGNvbnN0IGNoYXIgKnVybCwgY29uc3QgY2hhciAqdGhlbWUs IGNvbnN0IGNoYXIgKnVzZXJBZ2VudCwgRWluYV9SZWN0YW5nbGUgZ2VvbWV0cnksIGNvbnN0IGNo YXIgKmVuZ2luZSwgdW5zaWduZWQgY2hhciBpc0Z1bGxzY3JlZW4sIGNvbnN0IGNoYXIgKmRhdGFi YXNlUGF0aCk7CiAKIHN0YXRpYyB2b2lkCiBwcmludF9oaXN0b3J5KEVpbmFfTGlzdCAqbGlzdCkK QEAgLTU2Miw3ICs1NjIsNyBAQCBvbl9rZXlfZG93bih2b2lkICpkYXRhLCBFdmFzICplLCBFdmFz X09iamVjdCAqb2JqLCB2b2lkICpldmVudF9pbmZvKQogICAgICAgICBpbmZvKCJDcmVhdGUgbmV3 IHdpbmRvdyAoRjkpIHdhcyBwcmVzc2VkLlxuIik7CiAgICAgICAgIEVpbmFfUmVjdGFuZ2xlIGdl b21ldHJ5ID0gezAsIDAsIDAsIDB9OwogICAgICAgICBicm93c2VyQ3JlYXRlKCJodHRwOi8vd3d3 Lmdvb2dsZS5jb20iLAotICAgICAgICAgICAgICAgICAgICAgICBhcHAtPnRoZW1lLCBhcHAtPnVz ZXJBZ2VudCwgZ2VvbWV0cnksIE5VTEwsIDApOworICAgICAgICAgICAgICAgICAgICAgICBhcHAt PnRoZW1lLCBhcHAtPnVzZXJBZ2VudCwgZ2VvbWV0cnksIE5VTEwsIDAsIE5VTEwpOwogICAgIH0g ZWxzZSBpZiAoIXN0cmNtcChldi0+a2V5LCAiRjEwIikpIHsKICAgICAgICAgRXZhc19Db29yZCB4 LCB5LCB3LCBoOwogICAgICAgICBFdmFzX09iamVjdCAqZnJhbWUgPSBld2tfdmlld19mcmFtZV9t YWluX2dldChvYmopOwpAQCAtNjE3LDcgKzYxNyw3IEBAIHF1aXQoRWluYV9Cb29sIHN1Y2Nlc3Ms IGNvbnN0IGNoYXIgKm1zZykKIH0KIAogc3RhdGljIGludAotYnJvd3NlckNyZWF0ZShjb25zdCBj aGFyICp1cmwsIGNvbnN0IGNoYXIgKnRoZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFf UmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25zdCBjaGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNG dWxsc2NyZWVuKQorYnJvd3NlckNyZWF0ZShjb25zdCBjaGFyICp1cmwsIGNvbnN0IGNoYXIgKnRo ZW1lLCBjb25zdCBjaGFyICp1c2VyQWdlbnQsIEVpbmFfUmVjdGFuZ2xlIGdlb21ldHJ5LCBjb25z dCBjaGFyICplbmdpbmUsIHVuc2lnbmVkIGNoYXIgaXNGdWxsc2NyZWVuLCBjb25zdCBjaGFyICpk YXRhYmFzZVBhdGgpCiB7CiAgICAgaWYgKChnZW9tZXRyeS53IDw9IDApICYmIChnZW9tZXRyeS5o IDw9IDApKSB7CiAgICAgICAgIGdlb21ldHJ5LncgPSBERUZBVUxUX1dJRFRIOwpAQCAtNjYwLDYg KzY2MCw4IEBAIGJyb3dzZXJDcmVhdGUoY29uc3QgY2hhciAqdXJsLCBjb25zdCBjaGFyICp0aGVt ZSwgY29uc3QgY2hhciAqdXNlckFnZW50LCBFaW5hX1JlCiAgICAgZXdrX3ZpZXdfdGhlbWVfc2V0 KGFwcC0+YnJvd3NlciwgdGhlbWUpOwogICAgIGlmICh1c2VyQWdlbnQpCiAgICAgICAgIGV3a192 aWV3X3NldHRpbmdfdXNlcl9hZ2VudF9zZXQoYXBwLT5icm93c2VyLCB1c2VyQWdlbnQpOworICAg IGV3a192aWV3X3NldHRpbmdfbG9jYWxfc3RvcmFnZV9kYXRhYmFzZV9wYXRoX3NldChhcHAtPmJy b3dzZXIsIGRhdGFiYXNlUGF0aCk7CisgICAgCiAgICAgZXZhc19vYmplY3RfbmFtZV9zZXQoYXBw LT5icm93c2VyLCAiYnJvd3NlciIpOwogCiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tf YWRkKGFwcC0+YnJvd3NlciwgInRpdGxlLGNoYW5nZWQiLCBvbl90aXRsZV9jaGFuZ2VkLCBhcHAp OwpAQCAtODQwLDcgKzg0Miw3IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICBp ZiAocHJveHlVcmkpCiAgICAgICAgIGV3a19zZXR0aW5nc19wcm94eV91cmlfc2V0KHByb3h5VXJp KTsKIAotICAgIGJyb3dzZXJDcmVhdGUodXJsLCB0aGVtZVBhdGgsIHVzZXJBZ2VudCwgZ2VvbWV0 cnksIGVuZ2luZSwgaXNGdWxsc2NyZWVuKTsKKyAgICBicm93c2VyQ3JlYXRlKHVybCwgdGhlbWVQ YXRoLCB1c2VyQWdlbnQsIGdlb21ldHJ5LCBlbmdpbmUsIGlzRnVsbHNjcmVlbiwgcGF0aCk7CiAg ICAgZWNvcmVfZXZlbnRfaGFuZGxlcl9hZGQoRUNPUkVfRVZFTlRfU0lHTkFMX0VYSVQsIG1haW5f c2lnbmFsX2V4aXQsICZ3aW5kb3dzKTsKIAogICAgIGVjb3JlX21haW5fbG9vcF9iZWdpbigpOwo=