13693 2007-05-12 00:28:13 -0700 REGRESSION (r13615): Acid2 Test Eyes render improperly after a page refresh 2021-10-29 10:24:00 -0700 1 1 1 Unclassified WebKit Page Loading 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED http://www.webstandards.org/files/acid2/test.html HasReduction, InRadar, Regression P1 Normal --- 4911 1 esprehn zwarich ap beidson ddkilzer gavin.sharp ian jarilittlenen mehmetgelisin oliver trey webkit zwarich oldest_to_newest 10248 0 esprehn 2007-05-12 00:28:13 -0700 Steps to reproduce: 1. Load the acid 2 test 2. Click "Take the Test" 3. Press Apple+R 4. Click "Take the Test" again. The checked background behind the eyes should now be visible, and the eyes shouldn't be rendered. Reproducible in the latest nightly. (Fri May 11 22:54:47 GMT 2007, r21420). 5372 1 ap 2007-07-06 06:04:15 -0700 Wow. Confirmed with r23922. Please note that one doesn't get to step 4 with 10.4 WebKit - the page automatically reloads to its test view. 5261 2 ddkilzer 2007-07-07 13:14:33 -0700 <rdar://problem/5319523> 2998 3 zwarich 2007-08-06 03:11:28 -0700 The bug first occurs between the r13594 and r13626 nightlies. The most obvious candidate for the introduction of the bug is r13615: <http://trac.webkit.org/projects/webkit/changeset/13615> 2924 4 zwarich 2007-08-06 14:43:59 -0700 As expected, it is indeed r13615 that introduces this bug. 64143 5 lethalman88 2007-12-14 03:10:18 -0800 I see eyes correctly using WebKit/Gtk+ after refreshing the page, using r28711. 64152 6 ap 2007-12-14 05:30:09 -0800 Still an issue on Mac OS X (r28711). 72632 7 rsecor 2008-03-03 16:41:23 -0800 This appears to have nothing to do with Safari. There is something wrong with the stylesheet information on this page. It doesn't even come up right the first time in Firefox. 73878 8 19791 zwarich 2008-03-16 03:05:24 -0700 Created attachment 19791 Reduction Here is a reduction of the bug. The problem seems to be occurring because of the navigation to #top. It reloads fine without that. 73879 9 oliver 2008-03-16 03:14:44 -0700 Much craziness: once you've gotit to the point that the eyes are gone doing "View source" on the page produces the source for about:blank 73913 10 19801 zwarich 2008-03-16 11:20:29 -0700 Created attachment 19801 Further reduction The fallback content doesn't need to be a data URL for this to work, it can even be text. 73916 11 zwarich 2008-03-16 11:26:25 -0700 (In reply to comment #9) > Much craziness: once you've gotit to the point that the eyes are gone doing > "View source" on the page produces the source for about:blank Viewing the source works for me with Safari 3.0.4, with both the shipping WebKit and ToT. 74131 12 zwarich 2008-03-17 11:49:51 -0700 When the loading of the fallback content should occur in MainResourceLoader::continueAfterContentPolicy(), the URL of the object resource is blanked out along with the fact that it is an HTTP resource. 74226 13 zwarich 2008-03-18 00:06:15 -0700 Something triggered by the call to the FrameLoadDelegate in WebFrameLoaderClient::dispatchDidChangeLocationWithinPage() is causing this problem to occur. Commenting out the call makes it go away. 74234 14 zwarich 2008-03-18 02:29:21 -0700 The URL gets blanked out by the line URL = [NSURL _web_URLWithDataAsString:childItem->originalURLString()]; in the middle of loadURL in WebFrame.mm. The backtrace on the call to HistoryItem::setOriginalURLString() that sets it to "about:blank" is #0 WebCore::HistoryItem::setOriginalURLString (this=0x117d3960, urlString=@0xbfffe110) at /Users/Cameron/WebKit/WebCore/history/HistoryItem.cpp:224 #1 0x01596e4c in WebCore::FrameLoader::createHistoryItem (this=0x31b4000, useOriginal=true) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:3849 #2 0x01596f80 in WebCore::FrameLoader::createHistoryItemTree (this=0x31b4000, targetFrame=0x2cf18f0, clipAtTarget=false) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:3891 #3 0x01597042 in WebCore::FrameLoader::createHistoryItemTree (this=0x30a0400, targetFrame=0x2cf18f0, clipAtTarget=false) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:3898 #4 0x01597225 in WebCore::FrameLoader::addBackForwardItemClippedAtTarget (this=0x30a0400, doClip=false) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:3884 #5 0x015981a5 in WebCore::FrameLoader::addHistoryItemForFragmentScroll (this=0x30a0400) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:3785 #6 0x0159828c in WebCore::FrameLoader::continueFragmentScrollAfterNavigationPolicy (this=0x30a0400, request=@0xbfffe4a4, shouldContinue=true) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:3438 #7 0x01598332 in WebCore::FrameLoader::callContinueFragmentScrollAfterNavigationPolicy (argument=0x30a0400, request=@0xbfffe4a4, shouldContinue=true) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:3408 #8 0x01589768 in WebCore::PolicyCheck::call (this=0xbfffe4a4, shouldContinue=true) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:4563 #9 0x0158df5f in WebCore::FrameLoader::continueAfterNavigationPolicy (this=0x30a0400, policy=WebCore::PolicyUse) at /Users/Cameron/WebKit/WebCore/loader/FrameLoader.cpp:3581 warning: internal error: no C/C++ fundamental type 1 #10 0x001b6792 in WebFrameLoaderClient::receivedPolicyDecison (this=0x2cf1a70, action=WebCore::PolicyUse) at /Users/Cameron/WebKit/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm:1068 74236 15 zwarich 2008-03-18 02:52:23 -0700 The problem is that FrameLoader::createHistoryItem() is being called to create the history items generated by the internal navigation, one of which is used to reload the <object>. There are checks in createHistoryItem() which cause something that never loaded to be given an "about:blank" URL in the history, but this is clearly wrong in this case. How do we change the behaviour of createHistoryItem() so it is correct in this case but doesn't cause any issues with histories? The only real constraint seems to be that HistoryItem URLs can't be null. 74285 16 zwarich 2008-03-18 11:42:40 -0700 It seems that none of the URLs that are considered in FrameLoader::createHistoryItem() are the correct one. What's the best way to get the correct URL from the <object> element to place it in the history? 74723 17 zwarich 2008-03-21 19:00:16 -0700 I think the bug here is that there is even a HistoryItem being created in the first place. If the <object> data is set to a page that actually loads, then we have the following sequence: On load: - HistoryItem created for the main document - HistoryItem created for the <object> data On internal anchor navigation: - HistoryItem created for new URL with anchor - HIstoryItem created for <object> data, even though it hasn't changed If the <object> data 404s, and we go to fallback content, then we have the following sequence: On load: - HistoryItem created for the main document - HistoryItem *not* created for the <object> data, which never loaded On internal anchor navigation: - HistoryItem created for new URL with anchor - HIstoryItem created for <object> data, even though it never loaded, which gets sent to about:blank because the DocumentLoader doesn't have any information (is this a bug in itself?) The HistoryItem for the <object> confuses the reload into thinking it should use that information. I think the way to fix this is to change the code so that a HistoryItem doesn't get created for an <object> inside of a document on an internal navigation if the data never loaded. I don't think this is the same as bug 3580, although one could probably find other bugs related to bug 3580 and fallback content, e.g. if content loaded properly I don't think reloading would actually reload it and check for a 404. 74727 18 19948 zwarich 2008-03-21 19:52:27 -0700 Created attachment 19948 Proposed patch Here is a patch that fixes the bug. There are some test failures, but they all occur in my tree with or without this patch. I didn't ask for review because I don't have any layout tests. I will add one and upload a new patch. 74735 19 19952 zwarich 2008-03-21 21:13:09 -0700 Created attachment 19952 Revised proposed patch Here is the patch with a test added. The test fails with no output under ToT. Oliver suggested that I make local variables for the things that appear in the if statement to make it a bit clearer, so I did. 74755 20 19957 zwarich 2008-03-21 23:30:23 -0700 Created attachment 19957 Revised proposed patch Weinig noticed a typo in the comment. Thanks! 74756 21 19957 oliver 2008-03-21 23:38:47 -0700 Comment on attachment 19957 Revised proposed patch Looking at their implementations i think it might be better to change this to: if (!(!hasChildLoaded && childLoader->isHostedByObjectElement())) as isHostedByObjectElement doesn't look to be zero cost, and appears to be the more expensive of those calls... 74763 22 19959 zwarich 2008-03-21 23:55:47 -0700 Created attachment 19959 Revised proposed patch Here are the changes you requested, Oliver. 74764 23 19959 oliver 2008-03-21 23:57:51 -0700 Comment on attachment 19959 Revised proposed patch r=me!!! 74767 24 oliver 2008-03-22 00:20:34 -0700 Landed r31228 19791 2008-03-16 03:05:24 -0700 2008-03-16 11:20:29 -0700 Reduction acid2.html text/html 2836 zwarich PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIj4KPGh0bWw+ CjxoZWFkPgo8dGl0bGU+UmVsb2FkIGV5ZXM8L3RpdGxlPgo8L2hlYWQ+Cjxib2R5PgoKPGRpdj4K PGEgaHJlZj0iI3RvcCI+Q2xpY2s8L2E+CjwvZGl2PgoKPGgyIGlkPSJ0b3AiPjwvaDI+Cgo8b2Jq ZWN0IGRhdGE9Imh0dHA6Ly93d3cud2Vic3RhbmRhcmRzLm9yZy80MDQvIiB0eXBlPSJ0ZXh0L2h0 bWwiPjxvYmplY3QgZGF0YT0iZGF0YTppbWFnZS9wbmc7YmFzZTY0LGlWQk9SdzBLR2dvQUFBQU5T VWhFVWdBQUFHQUFBQUFZQ0FZQUFBRnk3c2dDQUFBR3NVbEVRVlJvM3UyWmJXd2NaeEhIZjNzJTJC N0xOYk8zWmpYQnRvd3ByR09EUlgwcXBOUUNqbUpLdVZLaE1sMVAyQWtDd2hGT0lLa0NCU205SVhh dkdGS0FpeElBRUN3a21XbzVNcmhSSTNVYjQwSUV3UWdwNmFJRGczQ2Q2ZUVxeUlIRXRlYWglMkIx RTY5dmh3JTJCWnRUYVg4NzA0WnprS2pIUzYyNzFuWjU2WlolMkJZJTJGJTJGJTJCZFpLRiUyRkN3 WXNoeDNFa2tnZ0xzRDF2NEZRa0VaWllMQ2JBS3lHOSUyQmE5RUlzRzZoblVBZjh4NzRLM2FVQzNq NCUyQk01NEhjc1Iyb0FJb213Wk9lemt2JTJGblNIcFlOaCUyQk5DbUFFN3h2OTR6dkZkZDFiSHNq TVptUWtQU3hBSlAlMkIlMkZmdUJMd0s1NFBDN0paRktBVkptelhMQnQydyUyRk12Y0RMd0liOFFT OENlSjRua1VSWUlvbXc3SiUyRllKOEJ2U2lpWHB0R0d4V2RzMiUyRmE5JTJCbmF4aCUyQllBRCUy Qmd0MDRORGdBQlRwUVkyY3Z2U0ZMenc4NmdXZUJWd0M4U3psT1N2MlllQlBmbURCb0JIZ0ttUjlM QkVFbUhaZkRUcUd5a3Fma1VFMG5BNzhCelFHZlNnVWVQM3dOZVRYd1hnN013WkRodzRVSEw2cmEy dGk3OSUyRk92bGpnRzhBWjRINjRMaG00TXZBb2N4c1JwcEdHJTJGeGNYaWhsd0xJczZSJTJGZktW MkhPJTJGMjZ1QTk0cGREWVVLVVpVVTdXMVJRWVhBOThHbmhhZjUlMkZYV1gwSGVBSFlvUW9ucWE0 c1pTT3NTV01DV2VDOVlrbyUyQkNRd0JlNEU2b05jMFRjOTFYVGwxJTJCYVRzbjlnbkklMkJsaHlj NW5aV3hzckJJa0tTYmwydGlpYzN0VzUzWURFd09LYW9GQnJjT2ZxS2VlNTNsRzl4c1BNalY3ODRy JTJGNGxPJTJGcFB2eUo5aXlaY3V2RlNhWEs1WFllQVo0Q0RnR3ZCM01TNEI1NExRdVdZUGV1eTRp UkZzZXZzWHFwdVlvcVZRS0lIMmJLMUN1RFFObzExbzRYVXpoJTJGY0RXWUllMUxFdHl1Wng0bmll ZTU0bmpPR0thcGdmc3FsTCUyQmwyT2pFWGc4bnhyYzFkSjBoM2hidEwlMkJHQ3R6N0tQQkY0Q3VC ZTl1QjE1VmFmRThocjlxeWxJM0hnRzhDMiUyRks3VnlIWm9KajdNckJSbTMwcUZvdEpNcGtVMjdZ bEhvJTJGN0hhNWElMkJWJTJGS1JrU0o0S3VLUkxWTEthcFRqQjFTekFWSWpZMk5TWFklMkJLeVBw WWRrJTJGc1U5T1hUNHBydXY2QmRaYkJRZktzVkdudldsSWUxVkI2VlFPOEp4QzF2WllMQ2JaJTJC YXhzUGhwZFpEeVJSRmhHMHNQaU9FNmxkS0JnMmxSZzR4RjFZQ0RJSUlLTjdER2dEM2dIJTJCQlh3 ZWpLWmZQcnMydFBzJTJGdlBOMmJLdVlSMW5kN3hMS0JTU0plcW9YS25FUmpQd05XQUclMkJMbjJy WnVNJTJCNFRwbWw2dmFXbHA0ZUxjeFZ1c1pxNWxDZ1ZnT1ZLSmpScWRYODZmZkw0RDV3SW9aQUNu VHB3NHdSTWRUOTZpJTJGSW1PSnhFUkFzNHVWeXF4VWFjRiUyRlBkaUNqJTJCamRSQlJHRnR3WFZk RzBzUFNkYmhUbWtZYnBIOThwMlJtTTJKWmxpZzF2bDBHV280TlElMkZuJTJCczVwS1JYZndqd2Vh eHk3VE5EM0hjUlpiZkM2WDh4VlBWUWxHeTdXeFZXbE81WFJYRlhtNkVabXJRdVNYWXlQRTNTaVZv RWhFNld5cjB1MnJ1bU82enYlMkIyMUFGZFFBc3dDMXdDTXVVQ1hDbXlXUXVzMTAzUWc4cWxETzBs eHdPYiUyRmw0RmlLM0FCM1ZTJTJGdUtLTHRLJTJGZ2JlQW53RyUyRnZVT0R1UnclMkZGclIwSDFV Qzc1Znd1OG9KJTJGaEZzVzVWSUclMkZCVWdFSU42WTY1TzRBSHU0QXAwelE5eTdMRWNaeWI5bFJC VUhRY1J5ekw4dW5aVkJXNWJGV0F2QXAlMkJoRFEyZzRGNDdkVVl0bFU2b2JYQTU0RG5WZEZMZWtq VUdHaWZoNEFGeTdMRWRWM3hqM1g5STY2bTBRWnBHbTJRcnNPZDBqJTJCJTJCVTBiU3c1S1p6WWpy dW42SFdsQWQ5NjFpNEZmQ2owYU4xVXNhdSUyQmMxbG11WFBGd3ZBRXVtVXV0N3RRUXZBYiUyRlhi JTJGVDBiQ0FlajljT0RnN3l0JTJCbSUyRjhxMiUyRjdPVUhaNzZQbloxazJwMG1Kemx5a21QYW5j Yk9Ubkwwd2hIczdDUWZiJTJCNW14MmQzc0g3OSUyQnRDUkkwYzZGZWFPcjlJQ3JJUWZMdkElMkI4 QkdOWHhpNFI2SHJpc0pWVVdyeEFWVzJvTUZmMEFjemltOG8za1Y2ZW5vd0RJUGpGOSUyRmslMkJN VTNTM3JyanpNTWc1NmVIciUyQnhQN3FLRmJBU2Zvakc2a3BlREdzMXRpVzUzUnh3V1QlMkJpbjVx OHc0eHBRSzVldlFwQVIzMEg3Wkgya2hOdmo3VFRVZDhCZ0Q0cnFtdTFaS1g4cU5lWSUyQmZIejR6 bFhEZ1Q1RTh0cENUVXE3WFNCQzRFdXY4MjI3VFY5ZlgxRTczJTJCWXR2bzI3Qm1iUzljdkZWVFkz YlNSRnphOXlPY2Y2R2ZteWd5N2QlMkIlMkZtJTJGUG56RjREdnJzQkxobkpsSmZ3SUtYeHYxUGhl QUU0cUs2cDRIOUFHYk5LVHVobmdCUEJQWFlSZTRJZW1hVDVrV1piUjE5ZkhOYm1HbloxazRyM1U0 Z2xEUjMwSG01cWpiR2pzSW1KRU9IYnNHSHYyN0pGejU4NjlvMGVGcTAxSnElMkJtSEFYd0k2RkZL YWdNVGdITTdHekZEUyUyQm9lTFNNdjd6anpDOXg0WTdneEZvdlZEQXdNRUkxR2FXbHBXU3pSVkNy RndZTUglMkZYZnhaNEFmQWE4QiUyRjdsRGFHZzElMkZRZ3A0M2xmSzB5cXRSTXVKYTNjZUtlNURm Z1lzQ1lBWjJuZ0Q4Q2ZBa3pxVHBXN3hZJTJGJTJGU3pueVglMkZWZVViMmtWbVg0QUFBQUFFbEZU a1N1UW1DQyI+PC9vYmplY3Q+PC9vYmplY3Q+CjwvYm9keT4KPC9odG1sPg== 19801 2008-03-16 11:20:29 -0700 2008-03-16 11:20:29 -0700 Further reduction acid2.html text/html 273 zwarich PCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIj4KPGh0bWw+ CjxoZWFkPgo8dGl0bGU+UmVsb2FkIGV5ZXM8L3RpdGxlPgo8L2hlYWQ+Cjxib2R5PgoKPGRpdj4K PGEgaHJlZj0iI3RvcCI+Q2xpY2s8L2E+CjwvZGl2PgoKPGgyIGlkPSJ0b3AiPjwvaDI+Cgo8b2Jq ZWN0IGRhdGE9Imh0dHA6Ly93d3cud2Vic3RhbmRhcmRzLm9yZy80MDQvIiB0eXBlPSJ0ZXh0L2h0 bWwiPkZhbGxiYWNrIGNvbnRlbnQ8L29iamVjdD4KPC9ib2R5Pgo8L2h0bWw+ 19948 2008-03-21 19:52:27 -0700 2008-03-21 21:13:09 -0700 Proposed patch acid2.diff text/plain 2116 zwarich SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTIyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDMtMjEgIENhbWVyb24gWndhcmljaCAgPGN3endhcmljaEB1 d2F0ZXJsb28uY2E+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQnVnIDEzNjkzOiBSRUdSRVNTSU9OIChyMTM2MTUpOiBBY2lkMiBUZXN0IEV5ZXMgcmVu ZGVyIGltcHJvcGVybHkgYWZ0ZXIgYSBwYWdlIHJlZnJlc2gKKyAgICAgICAgPGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjkzPgorCisgICAgICAgIERvIG5vdCBjcmVh dGUgYm9ndXMgaGlzdG9yeSBpdGVtcyBmb3IgdW5sb2FkZWQgPG9iamVjdD4gZWxlbWVudHMsIGJl Y2F1c2UgdGhleQorICAgICAgICBjYXVzZSBmYWxsYmFjayBjb250ZW50IHRvIGJlIGlnbm9yZWQg b24gcmVsb2FkLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjcmVhdGVIaXN0b3J5SXRlbVRyZWUpOgorCiAyMDA4LTAz LTIxICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg T2xpdmVyIEh1bnQuCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAzMTIxOCkK KysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzg4 Niw4ICszODg2LDE2IEBAIFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IEZyYW1lTG9hZGVyOjpjcmUK ICAgICBpZiAoIShjbGlwQXRUYXJnZXQgJiYgbV9mcmFtZSA9PSB0YXJnZXRGcmFtZSkpIHsKICAg ICAgICAgLy8gc2F2ZSBmcmFtZSBzdGF0ZSBmb3IgaXRlbXMgdGhhdCBhcmVuJ3QgbG9hZGluZyAo a2h0bWwgZG9lc24ndCBzYXZlIHRob3NlKQogICAgICAgICBzYXZlRG9jdW1lbnRTdGF0ZSgpOwot ICAgICAgICBmb3IgKEZyYW1lKiBjaGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgp OyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+dHJlZSgpLT5uZXh0U2libGluZygpKQotICAgICAgICAg ICAgYmZJdGVtLT5hZGRDaGlsZEl0ZW0oY2hpbGQtPmxvYWRlcigpLT5jcmVhdGVIaXN0b3J5SXRl bVRyZWUodGFyZ2V0RnJhbWUsIGNsaXBBdFRhcmdldCkpOworICAgICAgICBmb3IgKEZyYW1lKiBj aGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGls ZC0+dHJlZSgpLT5uZXh0U2libGluZygpKSB7CisgICAgICAgICAgICBGcmFtZUxvYWRlciogY2hp bGRMb2FkZXIgPSBjaGlsZC0+bG9hZGVyKCk7CisgICAgICAgICAgICAKKyAgICAgICAgICAgIC8v IElmIHRoZSBjaGlsZCBpcyBhIHRoZSBmcmFtZSBjb3JyZXNwb25kaW5nIHRvIGFuIDxvYmplY3Q+ IGVsZW1lbnQgdGhhdCBuZXZlcgorICAgICAgICAgICAgLy8gbG9hZGVkLCB3ZSBkb24ndCB3YW50 IHRvIGNyZWF0ZSBhIGhpc3RvcnkgaXRlbSwgYmVjYXVzZSB0aGF0IGNhdXNlcyBmYWxsYmFjawor ICAgICAgICAgICAgLy8gY29udGVudCB0byBiZSBpZ25vcmVkIG9uIHJlbG9hZC4KKyAgICAgICAg ICAgIAorICAgICAgICAgICAgaWYgKCEoY2hpbGRMb2FkZXItPmlzSG9zdGVkQnlPYmplY3RFbGVt ZW50KCkgJiYgIWNoaWxkTG9hZGVyLT5mcmFtZUhhc0xvYWRlZCgpKSkKKyAgICAgICAgICAgICAg ICBiZkl0ZW0tPmFkZENoaWxkSXRlbShjaGlsZExvYWRlci0+Y3JlYXRlSGlzdG9yeUl0ZW1UcmVl KHRhcmdldEZyYW1lLCBjbGlwQXRUYXJnZXQpKTsKKyAgICAgICAgfQogICAgIH0KICAgICBpZiAo bV9mcmFtZSA9PSB0YXJnZXRGcmFtZSkKICAgICAgICAgYmZJdGVtLT5zZXRJc1RhcmdldEl0ZW0o dHJ1ZSk7Cg== 19952 2008-03-21 21:13:09 -0700 2008-03-21 23:30:23 -0700 Revised proposed patch acid2.diff text/plain 3957 zwarich SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTIyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDMtMjEgIENhbWVyb24gWndhcmljaCAgPGN3endhcmljaEB1 d2F0ZXJsb28uY2E+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQnVnIDEzNjkzOiBSRUdSRVNTSU9OIChyMTM2MTUpOiBBY2lkMiBUZXN0IEV5ZXMgcmVu ZGVyIGltcHJvcGVybHkgYWZ0ZXIgYSBwYWdlIHJlZnJlc2gKKyAgICAgICAgPGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjkzPgorCisgICAgICAgIERvIG5vdCBjcmVh dGUgYm9ndXMgaGlzdG9yeSBpdGVtcyBmb3IgdW5sb2FkZWQgPG9iamVjdD4gZWxlbWVudHMsIGJl Y2F1c2UgdGhleQorICAgICAgICBjYXVzZSBmYWxsYmFjayBjb250ZW50IHRvIGJlIGlnbm9yZWQg b24gcmVsb2FkLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjcmVhdGVIaXN0b3J5SXRlbVRyZWUpOgorCiAyMDA4LTAz LTIxICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg T2xpdmVyIEh1bnQuCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAzMTIxOCkK KysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzg4 Niw4ICszODg2LDE4IEBAIFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IEZyYW1lTG9hZGVyOjpjcmUK ICAgICBpZiAoIShjbGlwQXRUYXJnZXQgJiYgbV9mcmFtZSA9PSB0YXJnZXRGcmFtZSkpIHsKICAg ICAgICAgLy8gc2F2ZSBmcmFtZSBzdGF0ZSBmb3IgaXRlbXMgdGhhdCBhcmVuJ3QgbG9hZGluZyAo a2h0bWwgZG9lc24ndCBzYXZlIHRob3NlKQogICAgICAgICBzYXZlRG9jdW1lbnRTdGF0ZSgpOwot ICAgICAgICBmb3IgKEZyYW1lKiBjaGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgp OyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+dHJlZSgpLT5uZXh0U2libGluZygpKQotICAgICAgICAg ICAgYmZJdGVtLT5hZGRDaGlsZEl0ZW0oY2hpbGQtPmxvYWRlcigpLT5jcmVhdGVIaXN0b3J5SXRl bVRyZWUodGFyZ2V0RnJhbWUsIGNsaXBBdFRhcmdldCkpOworICAgICAgICBmb3IgKEZyYW1lKiBj aGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGls ZC0+dHJlZSgpLT5uZXh0U2libGluZygpKSB7CisgICAgICAgICAgICBGcmFtZUxvYWRlciogY2hp bGRMb2FkZXIgPSBjaGlsZC0+bG9hZGVyKCk7CisgICAgICAgICAgICBib29sIGlzQ2hpbGRPYmpl Y3QgPSBjaGlsZExvYWRlci0+aXNIb3N0ZWRCeU9iamVjdEVsZW1lbnQoKTsKKyAgICAgICAgICAg IGJvb2wgaGFzQ2hpbGRMb2FkZWQgPSBjaGlsZExvYWRlci0+ZnJhbWVIYXNMb2FkZWQoKTsKKyAg ICAgICAgICAgIAorICAgICAgICAgICAgLy8gSWYgdGhlIGNoaWxkIGlzIGEgdGhlIGZyYW1lIGNv cnJlc3BvbmRpbmcgdG8gYW4gPG9iamVjdD4gZWxlbWVudCB0aGF0IG5ldmVyCisgICAgICAgICAg ICAvLyBsb2FkZWQsIHdlIGRvbid0IHdhbnQgdG8gY3JlYXRlIGEgaGlzdG9yeSBpdGVtLCBiZWNh dXNlIHRoYXQgY2F1c2VzIGZhbGxiYWNrCisgICAgICAgICAgICAvLyBjb250ZW50IHRvIGJlIGln bm9yZWQgb24gcmVsb2FkLgorICAgICAgICAgICAgCisgICAgICAgICAgICBpZiAoIShpc0NoaWxk T2JqZWN0ICYmICFoYXNDaGlsZExvYWRlZCkpCisgICAgICAgICAgICAgICAgYmZJdGVtLT5hZGRD aGlsZEl0ZW0oY2hpbGRMb2FkZXItPmNyZWF0ZUhpc3RvcnlJdGVtVHJlZSh0YXJnZXRGcmFtZSwg Y2xpcEF0VGFyZ2V0KSk7CisgICAgICAgIH0KICAgICB9CiAgICAgaWYgKG1fZnJhbWUgPT0gdGFy Z2V0RnJhbWUpCiAgICAgICAgIGJmSXRlbS0+c2V0SXNUYXJnZXRJdGVtKHRydWUpOwpJbmRleDog TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxv ZwkocmV2aXNpb24gMzEyMjUpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29w eSkKQEAgLTEsMyArMSwxMyBAQAorMjAwOC0wMy0yMSAgQ2FtZXJvbiBad2FyaWNoICA8Y3d6d2Fy aWNoQHV3YXRlcmxvby5jYT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUZXN0IGZvciA8aHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTM2OTM+CisgICAgICAgIEJ1ZyAxMzY5MzogUkVHUkVTU0lPTiAocjEzNjE1KTogQWNpZDIg VGVzdCBFeWVzIHJlbmRlciBpbXByb3Blcmx5IGFmdGVyIGEgcGFnZSByZWZyZXNoCisKKyAgICAg ICAgKiBodHRwL3Rlc3RzL25hdmlnYXRpb24vZmFsbGJhY2stYW5jaG9yLXJlbG9hZC1leHBlY3Rl ZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvbmF2aWdhdGlvbi9mYWxsYmFjay1h bmNob3ItcmVsb2FkLmh0bWw6IEFkZGVkLgorCiAyMDA4LTAzLTIxICBPbGl2ZXIgSHVudCAgPG9s aXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYgR2FyZW4uCkluZGV4 OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL25hdmlnYXRpb24vZmFsbGJhY2stYW5jaG9yLXJlbG9h ZC1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9uYXZp Z2F0aW9uL2ZhbGxiYWNrLWFuY2hvci1yZWxvYWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQor KysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL2ZhbGxiYWNrLWFuY2hvci1yZWxv YWQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxIEBACitGYWxsYmFjayBjb250 ZW50CkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL25hdmlnYXRpb24vZmFsbGJhY2stYW5j aG9yLXJlbG9hZC5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbmF2 aWdhdGlvbi9mYWxsYmFjay1hbmNob3ItcmVsb2FkLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlv dXRUZXN0cy9odHRwL3Rlc3RzL25hdmlnYXRpb24vZmFsbGJhY2stYW5jaG9yLXJlbG9hZC5odG1s CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE4IEBACis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCB0 eXBlPSJ0ZXh0L2phdmFzY3JpcHQiPgorZnVuY3Rpb24gc3RhcnRUZXN0KCkKK3sKKyAgICBsYXlv dXRUZXN0Q29udHJvbGxlci5kdW1wQXNUZXh0KCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIu cXVldWVTY3JpcHQoIndpbmRvdy5sb2NhdGlvbi5oYXNoID0gJ2FuY2hvcic7Iik7CisgICAgbGF5 b3V0VGVzdENvbnRyb2xsZXIucXVldWVSZWxvYWQoKTsKK30KKzwvc2NyaXB0PgorPC9oZWFkPgor PGJvZHkgb25sb2FkPSJzdGFydFRlc3QoKTsiPgorCis8aDIgaWQ9ImFuY2hvciI+PC9oMj4KKwor PG9iamVjdCBkYXRhPSJyZXNvdXJjZXMvZXJyb3I0MDQucGwiPkZhbGxiYWNrIGNvbnRlbnQ8L29i amVjdD4KKzwvYm9keT4KKzwvaHRtbD4K 19957 2008-03-21 23:30:23 -0700 2008-03-21 23:55:47 -0700 Revised proposed patch acid2.diff text/plain 3953 zwarich SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTIyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDMtMjEgIENhbWVyb24gWndhcmljaCAgPGN3endhcmljaEB1 d2F0ZXJsb28uY2E+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQnVnIDEzNjkzOiBSRUdSRVNTSU9OIChyMTM2MTUpOiBBY2lkMiBUZXN0IEV5ZXMgcmVu ZGVyIGltcHJvcGVybHkgYWZ0ZXIgYSBwYWdlIHJlZnJlc2gKKyAgICAgICAgPGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjkzPgorCisgICAgICAgIERvIG5vdCBjcmVh dGUgYm9ndXMgaGlzdG9yeSBpdGVtcyBmb3IgdW5sb2FkZWQgPG9iamVjdD4gZWxlbWVudHMsIGJl Y2F1c2UgdGhleQorICAgICAgICBjYXVzZSBmYWxsYmFjayBjb250ZW50IHRvIGJlIGlnbm9yZWQg b24gcmVsb2FkLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjcmVhdGVIaXN0b3J5SXRlbVRyZWUpOgorCiAyMDA4LTAz LTIxICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg T2xpdmVyIEh1bnQuCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAzMTIxOCkK KysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzg4 Niw4ICszODg2LDE4IEBAIFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IEZyYW1lTG9hZGVyOjpjcmUK ICAgICBpZiAoIShjbGlwQXRUYXJnZXQgJiYgbV9mcmFtZSA9PSB0YXJnZXRGcmFtZSkpIHsKICAg ICAgICAgLy8gc2F2ZSBmcmFtZSBzdGF0ZSBmb3IgaXRlbXMgdGhhdCBhcmVuJ3QgbG9hZGluZyAo a2h0bWwgZG9lc24ndCBzYXZlIHRob3NlKQogICAgICAgICBzYXZlRG9jdW1lbnRTdGF0ZSgpOwot ICAgICAgICBmb3IgKEZyYW1lKiBjaGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgp OyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+dHJlZSgpLT5uZXh0U2libGluZygpKQotICAgICAgICAg ICAgYmZJdGVtLT5hZGRDaGlsZEl0ZW0oY2hpbGQtPmxvYWRlcigpLT5jcmVhdGVIaXN0b3J5SXRl bVRyZWUodGFyZ2V0RnJhbWUsIGNsaXBBdFRhcmdldCkpOworICAgICAgICBmb3IgKEZyYW1lKiBj aGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGls ZC0+dHJlZSgpLT5uZXh0U2libGluZygpKSB7CisgICAgICAgICAgICBGcmFtZUxvYWRlciogY2hp bGRMb2FkZXIgPSBjaGlsZC0+bG9hZGVyKCk7CisgICAgICAgICAgICBib29sIGlzQ2hpbGRPYmpl Y3QgPSBjaGlsZExvYWRlci0+aXNIb3N0ZWRCeU9iamVjdEVsZW1lbnQoKTsKKyAgICAgICAgICAg IGJvb2wgaGFzQ2hpbGRMb2FkZWQgPSBjaGlsZExvYWRlci0+ZnJhbWVIYXNMb2FkZWQoKTsKKyAg ICAgICAgICAgIAorICAgICAgICAgICAgLy8gSWYgdGhlIGNoaWxkIGlzIGEgZnJhbWUgY29ycmVz cG9uZGluZyB0byBhbiA8b2JqZWN0PiBlbGVtZW50IHRoYXQgbmV2ZXIgbG9hZGVkLAorICAgICAg ICAgICAgLy8gd2UgZG9uJ3Qgd2FudCB0byBjcmVhdGUgYSBoaXN0b3J5IGl0ZW0sIGJlY2F1c2Ug dGhhdCBjYXVzZXMgZmFsbGJhY2sgY29udGVudAorICAgICAgICAgICAgLy8gdG8gYmUgaWdub3Jl ZCBvbiByZWxvYWQuCisgICAgICAgICAgICAKKyAgICAgICAgICAgIGlmICghKGlzQ2hpbGRPYmpl Y3QgJiYgIWhhc0NoaWxkTG9hZGVkKSkKKyAgICAgICAgICAgICAgICBiZkl0ZW0tPmFkZENoaWxk SXRlbShjaGlsZExvYWRlci0+Y3JlYXRlSGlzdG9yeUl0ZW1UcmVlKHRhcmdldEZyYW1lLCBjbGlw QXRUYXJnZXQpKTsKKyAgICAgICAgfQogICAgIH0KICAgICBpZiAobV9mcmFtZSA9PSB0YXJnZXRG cmFtZSkKICAgICAgICAgYmZJdGVtLT5zZXRJc1RhcmdldEl0ZW0odHJ1ZSk7CkluZGV4OiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiAzMTIyNSkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDA4LTAzLTIxICBDYW1lcm9uIFp3YXJpY2ggIDxjd3p3YXJpY2hA dXdhdGVybG9vLmNhPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRlc3QgZm9yIDxodHRwOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MzY5Mz4KKyAgICAgICAgQnVnIDEzNjkzOiBSRUdSRVNTSU9OIChyMTM2MTUpOiBBY2lkMiBUZXN0 IEV5ZXMgcmVuZGVyIGltcHJvcGVybHkgYWZ0ZXIgYSBwYWdlIHJlZnJlc2gKKworICAgICAgICAq IGh0dHAvdGVzdHMvbmF2aWdhdGlvbi9mYWxsYmFjay1hbmNob3ItcmVsb2FkLWV4cGVjdGVkLnR4 dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL2ZhbGxiYWNrLWFuY2hv ci1yZWxvYWQuaHRtbDogQWRkZWQuCisKIDIwMDgtMDMtMjEgIE9saXZlciBIdW50ICA8b2xpdmVy QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBHZW9mZiBHYXJlbi4KSW5kZXg6IExh eW91dFRlc3RzL2h0dHAvdGVzdHMvbmF2aWdhdGlvbi9mYWxsYmFjay1hbmNob3ItcmVsb2FkLWV4 cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL25hdmlnYXRp b24vZmFsbGJhY2stYW5jaG9yLXJlbG9hZC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9odHRwL3Rlc3RzL25hdmlnYXRpb24vZmFsbGJhY2stYW5jaG9yLXJlbG9hZC1l eHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEgQEAKK0ZhbGxiYWNrIGNvbnRlbnQK SW5kZXg6IExheW91dFRlc3RzL2h0dHAvdGVzdHMvbmF2aWdhdGlvbi9mYWxsYmFjay1hbmNob3It cmVsb2FkLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9uYXZpZ2F0 aW9uL2ZhbGxiYWNrLWFuY2hvci1yZWxvYWQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL2h0dHAvdGVzdHMvbmF2aWdhdGlvbi9mYWxsYmFjay1hbmNob3ItcmVsb2FkLmh0bWwJKHJl dmlzaW9uIDApCkBAIC0wLDAgKzEsMTggQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHR5cGU9 InRleHQvamF2YXNjcmlwdCI+CitmdW5jdGlvbiBzdGFydFRlc3QoKQoreworICAgIGxheW91dFRl c3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5xdWV1 ZVNjcmlwdCgid2luZG93LmxvY2F0aW9uLmhhc2ggPSAnYW5jaG9yJzsiKTsKKyAgICBsYXlvdXRU ZXN0Q29udHJvbGxlci5xdWV1ZVJlbG9hZCgpOworfQorPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eSBvbmxvYWQ9InN0YXJ0VGVzdCgpOyI+CisKKzxoMiBpZD0iYW5jaG9yIj48L2gyPgorCis8b2Jq ZWN0IGRhdGE9InJlc291cmNlcy9lcnJvcjQwNC5wbCI+RmFsbGJhY2sgY29udGVudDwvb2JqZWN0 PgorPC9ib2R5PgorPC9odG1sPgo= 19959 2008-03-21 23:55:47 -0700 2008-03-21 23:57:51 -0700 Revised proposed patch acid2.diff text/plain 3904 zwarich SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzMTIyNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDgtMDMtMjEgIENhbWVyb24gWndhcmljaCAgPGN3endhcmljaEB1 d2F0ZXJsb28uY2E+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQnVnIDEzNjkzOiBSRUdSRVNTSU9OIChyMTM2MTUpOiBBY2lkMiBUZXN0IEV5ZXMgcmVu ZGVyIGltcHJvcGVybHkgYWZ0ZXIgYSBwYWdlIHJlZnJlc2gKKyAgICAgICAgPGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNjkzPgorCisgICAgICAgIERvIG5vdCBjcmVh dGUgYm9ndXMgaGlzdG9yeSBpdGVtcyBmb3IgdW5sb2FkZWQgPG9iamVjdD4gZWxlbWVudHMsIGJl Y2F1c2UgdGhleQorICAgICAgICBjYXVzZSBmYWxsYmFjayBjb250ZW50IHRvIGJlIGlnbm9yZWQg b24gcmVsb2FkLgorCisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpjcmVhdGVIaXN0b3J5SXRlbVRyZWUpOgorCiAyMDA4LTAz LTIxICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg T2xpdmVyIEh1bnQuCkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAzMTIxOCkK KysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzg4 Niw4ICszODg2LDE3IEBAIFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+IEZyYW1lTG9hZGVyOjpjcmUK ICAgICBpZiAoIShjbGlwQXRUYXJnZXQgJiYgbV9mcmFtZSA9PSB0YXJnZXRGcmFtZSkpIHsKICAg ICAgICAgLy8gc2F2ZSBmcmFtZSBzdGF0ZSBmb3IgaXRlbXMgdGhhdCBhcmVuJ3QgbG9hZGluZyAo a2h0bWwgZG9lc24ndCBzYXZlIHRob3NlKQogICAgICAgICBzYXZlRG9jdW1lbnRTdGF0ZSgpOwot ICAgICAgICBmb3IgKEZyYW1lKiBjaGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgp OyBjaGlsZDsgY2hpbGQgPSBjaGlsZC0+dHJlZSgpLT5uZXh0U2libGluZygpKQotICAgICAgICAg ICAgYmZJdGVtLT5hZGRDaGlsZEl0ZW0oY2hpbGQtPmxvYWRlcigpLT5jcmVhdGVIaXN0b3J5SXRl bVRyZWUodGFyZ2V0RnJhbWUsIGNsaXBBdFRhcmdldCkpOworICAgICAgICBmb3IgKEZyYW1lKiBj aGlsZCA9IG1fZnJhbWUtPnRyZWUoKS0+Zmlyc3RDaGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBjaGls ZC0+dHJlZSgpLT5uZXh0U2libGluZygpKSB7CisgICAgICAgICAgICBGcmFtZUxvYWRlciogY2hp bGRMb2FkZXIgPSBjaGlsZC0+bG9hZGVyKCk7CisgICAgICAgICAgICBib29sIGhhc0NoaWxkTG9h ZGVkID0gY2hpbGRMb2FkZXItPmZyYW1lSGFzTG9hZGVkKCk7CisgICAgICAgICAgICAKKyAgICAg ICAgICAgIC8vIElmIHRoZSBjaGlsZCBpcyBhIGZyYW1lIGNvcnJlc3BvbmRpbmcgdG8gYW4gPG9i amVjdD4gZWxlbWVudCB0aGF0IG5ldmVyIGxvYWRlZCwKKyAgICAgICAgICAgIC8vIHdlIGRvbid0 IHdhbnQgdG8gY3JlYXRlIGEgaGlzdG9yeSBpdGVtLCBiZWNhdXNlIHRoYXQgY2F1c2VzIGZhbGxi YWNrIGNvbnRlbnQKKyAgICAgICAgICAgIC8vIHRvIGJlIGlnbm9yZWQgb24gcmVsb2FkLgorICAg ICAgICAgICAgCisgICAgICAgICAgICBpZiAoISghaGFzQ2hpbGRMb2FkZWQgJiYgY2hpbGRMb2Fk ZXItPmlzSG9zdGVkQnlPYmplY3RFbGVtZW50KCkpKQorICAgICAgICAgICAgICAgIGJmSXRlbS0+ YWRkQ2hpbGRJdGVtKGNoaWxkTG9hZGVyLT5jcmVhdGVIaXN0b3J5SXRlbVRyZWUodGFyZ2V0RnJh bWUsIGNsaXBBdFRhcmdldCkpOworICAgICAgICB9CiAgICAgfQogICAgIGlmIChtX2ZyYW1lID09 IHRhcmdldEZyYW1lKQogICAgICAgICBiZkl0ZW0tPnNldElzVGFyZ2V0SXRlbSh0cnVlKTsKSW5k ZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJKHJldmlzaW9uIDMxMjI1KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDgtMDMtMjEgIENhbWVyb24gWndhcmljaCAgPGN3 endhcmljaEB1d2F0ZXJsb28uY2E+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgVGVzdCBmb3IgPGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEzNjkzPgorICAgICAgICBCdWcgMTM2OTM6IFJFR1JFU1NJT04gKHIxMzYxNSk6IEFj aWQyIFRlc3QgRXllcyByZW5kZXIgaW1wcm9wZXJseSBhZnRlciBhIHBhZ2UgcmVmcmVzaAorCisg ICAgICAgICogaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL2ZhbGxiYWNrLWFuY2hvci1yZWxvYWQtZXhw ZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL25hdmlnYXRpb24vZmFsbGJh Y2stYW5jaG9yLXJlbG9hZC5odG1sOiBBZGRlZC4KKwogMjAwOC0wMy0yMSAgT2xpdmVyIEh1bnQg IDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgpJ bmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL2ZhbGxiYWNrLWFuY2hvci1y ZWxvYWQtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv bmF2aWdhdGlvbi9mYWxsYmFjay1hbmNob3ItcmVsb2FkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbmF2aWdhdGlvbi9mYWxsYmFjay1hbmNob3It cmVsb2FkLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSBAQAorRmFsbGJhY2sg Y29udGVudApJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL2ZhbGxiYWNr LWFuY2hvci1yZWxvYWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L25hdmlnYXRpb24vZmFsbGJhY2stYW5jaG9yLXJlbG9hZC5odG1sCShyZXZpc2lvbiAwKQorKysg TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9uYXZpZ2F0aW9uL2ZhbGxiYWNrLWFuY2hvci1yZWxvYWQu aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwxOCBAQAorPGh0bWw+Cis8aGVhZD4KKzxzY3Jp cHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0Ij4KK2Z1bmN0aW9uIHN0YXJ0VGVzdCgpCit7CisgICAg bGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9s bGVyLnF1ZXVlU2NyaXB0KCJ3aW5kb3cubG9jYXRpb24uaGFzaCA9ICdhbmNob3InOyIpOworICAg IGxheW91dFRlc3RDb250cm9sbGVyLnF1ZXVlUmVsb2FkKCk7Cit9Cis8L3NjcmlwdD4KKzwvaGVh ZD4KKzxib2R5IG9ubG9hZD0ic3RhcnRUZXN0KCk7Ij4KKworPGgyIGlkPSJhbmNob3IiPjwvaDI+ CisKKzxvYmplY3QgZGF0YT0icmVzb3VyY2VzL2Vycm9yNDA0LnBsIj5GYWxsYmFjayBjb250ZW50 PC9vYmplY3Q+Cis8L2JvZHk+Cis8L2h0bWw+Cg==