75049 2011-12-21 15:33:44 -0800 [filesystem/Chromium] filesystem URLs are not fully supported 2012-04-20 05:02:19 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 ericu ericu abarth brettw dglazkov fishd jamesr kinuko michaeln serya webkit.review.bot oldest_to_newest 525731 0 ericu 2011-12-21 15:33:44 -0800 The current implementation of filesystem URLs does the bare minimum to load simple URLs. URLs for filesystem objects with interesting characters in their names [e.g. % and non-ASCII] either don't work or look terrible. Queries and references aren't implemented at all. Escaping is missing. As soon as https://bugs.webkit.org/show_bug.cgi?id=62813 lands, this will be a much bigger problem, as users will be free to make whatever interesting filenames they want, but it's already a problem. This change will depend on changes to the googleurl library [up for review at http://codereview.appspot.com/4961060/], and won't actually fix Chromium until the corresponding Chromium-side changes are made [in progress at http://codereview.chromium.org/7811006, not quite in review yet]. This CL won't build without the googleURL changes, but once they're in, should be harmless [not change any behavior] until the Chromium code hits with the #define that turns on the new googleurl behavior. 525758 1 120229 ericu 2011-12-21 15:57:35 -0800 Created attachment 120229 Small plumbing changes; the real work's done in googleURL and the Chromium codebase. This won't build until the googleurl changes land. 525761 2 webkit.review.bot 2011-12-21 15:59:34 -0800 Attachment 120229 did not pass style-queue: Failed to run "['Tools/Scripts/update-webkit']" exit_code: 9 Updating OpenSource A LayoutTests/fast/html/font-weight-bold-for-b-and-strong-expected.png A LayoutTests/fast/html/font-weight-bold-for-b-and-strong-expected.txt A LayoutTests/fast/html/font-weight-bold-for-b-and-strong.html M LayoutTests/ChangeLog M Source/WebCore/ChangeLog M Source/WebCore/css/html.css r103468 = 97efa88a66ff7f597257cf86d0f8315cd016e1e3 (refs/remotes/origin/master) First, rewinding head to replay your work on top of it... Applying: Inform the scrolling coordinator when scrollbar layers come and go Using index info to reconstruct a base tree... <stdin>:474806: trailing whitespace. [Chromium] DatabaseTrackerChromium: iterating DatabaseSet races with Database disposal on worker thread <stdin>:474827: trailing whitespace. Nothing to test, just removing redundant code. Correct behavior tested by <stdin>:475346: trailing whitespace. warning: 3 lines add whitespace errors. Falling back to patching base and 3-way merge... warning: too many files (created: 167254 deleted: 3), skipping inexact rename detection Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Auto-merging LayoutTests/platform/chromium/test_expectations.txt CONFLICT (content): Merge conflict in LayoutTests/platform/chromium/test_expectations.txt Auto-merging Source/WebCore/ChangeLog CONFLICT (content): Merge conflict in Source/WebCore/ChangeLog Auto-merging Source/WebCore/page/ScrollingCoordinator.h CONFLICT (content): Merge conflict in Source/WebCore/page/ScrollingCoordinator.h Auto-merging Source/WebCore/page/mac/ScrollingCoordinatorMac.mm CONFLICT (content): Merge conflict in Source/WebCore/page/mac/ScrollingCoordinatorMac.mm Auto-merging Source/WebCore/platform/ScrollView.cpp Auto-merging Source/WebCore/rendering/RenderLayerCompositor.cpp CONFLICT (content): Merge conflict in Source/WebCore/rendering/RenderLayerCompositor.cpp Auto-merging Source/WebKit2/ChangeLog CONFLICT (content): Merge conflict in Source/WebKit2/ChangeLog Auto-merging Tools/ChangeLog CONFLICT (content): Merge conflict in Tools/ChangeLog Auto-merging Tools/Scripts/build-webkit Auto-merging Tools/Scripts/webkitdirs.pm CONFLICT (content): Merge conflict in Tools/Scripts/webkitdirs.pm Failed to merge in the changes. Patch failed at 0001 Inform the scrolling coordinator when scrollbar layers come and go When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 158. If any of these errors are false positives, please file a bug against check-webkit-style. 525790 3 120229 webkit.review.bot 2011-12-21 16:19:36 -0800 Comment on attachment 120229 Small plumbing changes; the real work's done in googleURL and the Chromium codebase. Attachment 120229 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10997176 526028 4 120229 abarth 2011-12-21 23:01:22 -0800 Comment on attachment 120229 Small plumbing changes; the real work's done in googleURL and the Chromium codebase. View in context: https://bugs.webkit.org/attachment.cgi?id=120229&action=review > Source/WebCore/page/SecurityOrigin.cpp:85 > +#if ENABLE(FILE_SYSTEM) This shouldn't be guarded with ENABLE(FILE_SYSTEM). It has nothing to do with FILE_SYSTEM. > Source/WebCore/platform/KURL.h:226 > +#if ENABLE(FILE_SYSTEM) This shouldn't be guarded with ENABLE(FILE_SYSTEM). It has nothing to do with FILE_SYSTEM. > Source/WebCore/platform/KURLGoogle.cpp:292 > +void KURLGooglePrivate::initInnerURL() { { should be on the next line. > Source/WebCore/platform/KURLGoogle.cpp:337 > + if (m_innerURL) { > + dest->m_innerURL = adoptPtr(new KURL(m_innerURL->copy())); > + } > + else > + dest->m_innerURL.clear(); Bad indent and we can drop the { } 541718 5 123813 ericu 2012-01-24 14:43:24 -0800 Created attachment 123813 Patch 541719 6 123813 ericu 2012-01-24 14:44:34 -0800 Comment on attachment 123813 Patch Rolled in code review feedback. Also, the googleurl changes are now in, so the bots should be happy with the change now. 541750 7 123813 kinuko 2012-01-24 15:09:40 -0800 Comment on attachment 123813 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123813&action=review > Source/WebCore/fileapi/EntryBase.cpp:78 > + result.append(encodeWithURLEscapeSequences(m_fullPath)); Based on what I experienced on my reverted change this will break the chromeos tests. (The tests expect toURL() return URL with unescaped directory separators) This will escape all the directory separators as well-- I want to make sure this is what we want. 541768 8 ericu 2012-01-24 15:28:31 -0800 (In reply to comment #7) > (From update of attachment 123813 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=123813&action=review > > > Source/WebCore/fileapi/EntryBase.cpp:78 > > + result.append(encodeWithURLEscapeSequences(m_fullPath)); > > Based on what I experienced on my reverted change this will break the chromeos tests. (The tests expect toURL() return URL with unescaped directory separators) > > This will escape all the directory separators as well-- I want to make sure this is what we want. That's taken care of in WebCore::encodeWithURLEscapeSequences. After everything's escaped, I unescape just the directory separators. 541787 9 123813 kinuko 2012-01-24 15:45:36 -0800 Comment on attachment 123813 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=123813&action=review >>> Source/WebCore/fileapi/EntryBase.cpp:78 >>> + result.append(encodeWithURLEscapeSequences(m_fullPath)); >> >> Based on what I experienced on my reverted change this will break the chromeos tests. (The tests expect toURL() return URL with unescaped directory separators) >> >> This will escape all the directory separators as well-- I want to make sure this is what we want. > > That's taken care of in WebCore::encodeWithURLEscapeSequences. After everything's escaped, I unescape just the directory separators. Oh I see, now I found the corresponding change in the function. Cool so I no longer need to work around the escaping issue when I try relanding my change. 541814 10 123813 webkit-ews 2012-01-24 16:16:48 -0800 Comment on attachment 123813 Patch Attachment 123813 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11342115 541815 11 123813 gyuyoung.kim 2012-01-24 16:17:24 -0800 Comment on attachment 123813 Patch Attachment 123813 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/11344106 541882 12 123853 ericu 2012-01-24 17:24:39 -0800 Created attachment 123853 Patch 541883 13 123853 ericu 2012-01-24 17:25:08 -0800 Comment on attachment 123853 Patch Added missing header include. 541942 14 123853 webkit.review.bot 2012-01-24 18:20:16 -0800 Comment on attachment 123853 Patch Clearing flags on attachment: 123853 Committed r105843: <http://trac.webkit.org/changeset/105843> 541943 15 webkit.review.bot 2012-01-24 18:20:22 -0800 All reviewed patches have been landed. Closing bug. 541991 16 jamesr 2012-01-24 21:19:33 -0800 This patch appears to have broken KURLTest.Encode: http://build.webkit.org/builders/Chromium%20Mac%20Release%20%28Tests%29/builds/12331/steps/webkit-unit-tests/logs/stdio [ RUN ] KURLTest.Encode /Users/chrome-bot/Desktop/WebKit-BuildSlave/chromium-mac-release-tests/build/Source/WebKit/chromium/tests/KURLTest.cpp:336: Failure Value of: output Actual: 4-byte object <60-8A 36-00> Expected: expectedOutput Which is: 4-byte object <50-64 32-00> Was this change in behavior intentional? If so, please update the test. 542576 17 123998 ericu 2012-01-25 13:28:07 -0800 Created attachment 123998 Patch 542577 18 123998 ericu 2012-01-25 13:28:39 -0800 Comment on attachment 123998 Patch Fixed a test expectation I missed last time. 542645 19 123998 webkit.review.bot 2012-01-25 14:43:36 -0800 Comment on attachment 123998 Patch Clearing flags on attachment: 123998 Committed r105930: <http://trac.webkit.org/changeset/105930> 542646 20 webkit.review.bot 2012-01-25 14:43:42 -0800 All reviewed patches have been landed. Closing bug. 542786 21 mrowe 2012-01-25 17:05:30 -0800 As with the first time you landed this patch, r105930 broke the Mac build. The build has been broken red for over two hours at this point because of this. Please fix it, and pay attention to the build bots in the future. 542808 22 mrowe 2012-01-25 17:25:33 -0800 Since people really love to be able to compile WebKit, I fixed this in r105950 by reapplying the exact same build fix that was made the first time this was landed. 548004 23 ericu 2012-02-02 11:17:17 -0800 This patch was removed due to a Chromium test failure. 548017 24 ericu 2012-02-02 11:30:28 -0800 Scratch that--apparently I misunderstood. The patch is still in there. Sorry for the noise. 606513 25 serya 2012-04-20 05:02:19 -0700 *** Bug 75701 has been marked as a duplicate of this bug. *** 120229 2011-12-21 15:57:35 -0800 2012-01-24 14:43:20 -0800 Small plumbing changes; the real work's done in googleURL and the Chromium codebase. webkit_cl.diff text/plain 8283 ericu ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzNWZjNzdmLi44NGRhNjIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEg QEAKKzIwMTEtMTItMjEgIEVyaWMgVWhyaGFuZSAgPGVyaWN1QGNocm9taXVtLm9yZz4KKworICAg ICAgICBBZGQgZnVsbCBzdXBwb3J0IGZvciBmaWxlc3lzdGVtIFVSTHMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTA0OQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0czsgZXhpc3Rpbmcg bGF5b3V0IHRlc3RzIGNvdmVyIHRoZSBiYXNpYyBmdW5jdGlvbmFsaXR5LCBhbmQKKyAgICAgICAg dGhlIG5ldyBmdW5jdGlvbmFsaXR5IHdvbid0IGJlIHRoZXJlIHVudGlsIENocm9taXVtIGFkZHMg aXQuICBUaGlzIHBhdGNoCisgICAgICAgIG1lcmVseSBlbmFibGVzIHRoYXQsIHdpdGhvdXQgY2hh bmdpbmcgYmVoYXZpb3IuCisKKyAgICAgICAgKiBmaWxlYXBpL0VudHJ5QmFzZS5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpFbnRyeUJhc2U6OnRvVVJMKTogQWRkIG1pc3NpbmcgZXNjYXBpbmcgb2Yg VVJMIHBhdGguCisKKyAgICAgICAgKiBwYWdlL1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OmV4dHJhY3RJbm5lclVSTCk6IFVzZSBpbm5lclVSTCBtZW1iZXIsIGlmIGl0J3Mg cG9wdWxhdGVkLgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTC5oOgorICAgICAgICAoV2ViQ29y ZTo6S1VSTDo6aW5uZXJVUkwpOiBBZGQgaW5uZXJVUkwgbWVtYmVyLgorCisgICAgICAgICogcGxh dGZvcm0vS1VSTEdvb2dsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0 ZTo6S1VSTEdvb2dsZVByaXZhdGUpOgorICAgICAgICAoV2ViQ29yZTo6S1VSTEdvb2dsZVByaXZh dGU6Om9wZXJhdG9yPSk6CisgICAgICAgIEFkZCBjb3B5IGNvbnN0cnVjdG9yIGFuZCBvcGVyYXRv cj0sIHdoaWNoIGFyZSBub3cgbmVlZGVkIHNpbmNlCisgICAgICAgIG1faW5uZXJVUkwgbmVlZHMg c3BlY2lhbCBoYW5kbGluZy4KKyAgICAgICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjpz ZXRVdGY4KToKKyAgICAgICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjpzZXRBc2NpaSk6 CisgICAgICAgIEFkZCBjYWxscyB0byBpbml0SW5uZXJVUkwuCisgICAgICAgIChXZWJDb3JlOjpL VVJMR29vZ2xlUHJpdmF0ZTo6aW5pdElubmVyVVJMKToKKyAgICAgICAgQWRkIG1ldGhvZCB0byBp bml0L2NvcHkgbV9pbm5lclVSTC4KKyAgICAgICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRl Ojpjb3B5VG8pOgorICAgICAgICBIYW5kbGUgbV9pbm5lclVSTCBkdXJpbmcgY29waWVzLgorICAg ICAgICAoV2ViQ29yZTo6ZW5jb2RlV2l0aFVSTEVzY2FwZVNlcXVlbmNlcyk6CisgICAgICAgIFVu ZXNjYXBlICUyRiBbJy8nXSBpbiBwYXRoczsgaXQncyBtdWNoIG1vcmUgcmVhZGFibGUsIGFuZCBp dCdzIHNhZmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oOgorICAg ICAgICAoV2ViQ29yZTo6S1VSTEdvb2dsZVByaXZhdGU6OmlubmVyVVJMKTogQWRkIGFjY2Vzc29y IGZvciBuZXcgbV9pbm5lclVSTC4KKwogMjAxMS0xMi0xOSAgRXJpYyBDYXJsc29uICA8ZXJpYy5j YXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW5kZXIgdGV4dCB0cmFja3MKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRW50cnlCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2ZpbGVhcGkvRW50cnlCYXNlLmNwcAppbmRleCAzOTQ1M2Y2Li41M2Y2MmU3IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0VudHJ5QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZmlsZWFwaS9FbnRyeUJhc2UuY3BwCkBAIC03NSw3ICs3NSw3IEBAIFN0cmluZyBFbnRyeUJh c2U6OnRvVVJMKCkKICAgICAgICAgcmVzdWx0LmFwcGVuZChET01GaWxlU3lzdGVtQmFzZTo6a0V4 dGVybmFsUGF0aFByZWZpeCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICByZXN1bHQuYXBw ZW5kKG1fZnVsbFBhdGgpOworICAgIHJlc3VsdC5hcHBlbmQoZW5jb2RlV2l0aFVSTEVzY2FwZVNl cXVlbmNlcyhtX2Z1bGxQYXRoKSk7CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCmluZGV4IDQ0MzY2OTQuLmY1ODI4 ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCkBAIC04Miw2ICs4Miwx MCBAQCBzdGF0aWMgYm9vbCBzaG91bGRVc2VJbm5lclVSTChjb25zdCBLVVJMJiB1cmwpCiAvLyBz ZWN1cml0eSBvcmlnaW4gY2FuIGJlIHBhcnNlZCB1c2luZyB0aGlzIGFsZ29yaXRobS4KIHN0YXRp YyBLVVJMIGV4dHJhY3RJbm5lclVSTChjb25zdCBLVVJMJiB1cmwpCiB7CisjaWYgRU5BQkxFKEZJ TEVfU1lTVEVNKQorICAgIGlmICh1cmwuaW5uZXJVUkwoKSkKKyAgICAgICAgcmV0dXJuICp1cmwu aW5uZXJVUkwoKTsKKyNlbmRpZgogICAgIC8vIEZJWE1FOiBVcGRhdGUgdGhpcyBjYWxsc2l0ZSB0 byB1c2UgdGhlIGlubmVyVVJMIG1lbWJlciBmdW5jdGlvbiB3aGVuCiAgICAgLy8gd2UgZmluaXNo IGltcGxlbWVudGluZyBpdC4KICAgICByZXR1cm4gS1VSTChQYXJzZWRVUkxTdHJpbmcsIGRlY29k ZVVSTEVzY2FwZVNlcXVlbmNlcyh1cmwucGF0aCgpKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9LVVJMLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgKaW5k ZXggNDljZDk1MS4uODljODAzMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v S1VSTC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuaApAQCAtMjIyLDYgKzIy MiwxNSBAQCBwdWJsaWM6CiAgICAgY29uc3QgQ1N0cmluZyYgdXRmOFN0cmluZygpIGNvbnN0IHsg cmV0dXJuIG1fdXJsLnV0ZjhTdHJpbmcoKTsgfQogI2VuZGlmCiAKKworI2lmIEVOQUJMRShGSUxF X1NZU1RFTSkKKyNpZiBVU0UoR09PR0xFVVJMKQorICAgIGNvbnN0IEtVUkwqIGlubmVyVVJMKCkg Y29uc3QgeyByZXR1cm4gbV91cmwuaW5uZXJVUkwoKTsgfQorI2Vsc2UKKyAgICBjb25zdCBLVVJM KiBpbm5lclVSTCgpIGNvbnN0IHsgbm90SW1wbGVtZW50ZWQoKTsgcmV0dXJuIDA7IH0KKyNlbmRp ZgorI2VuZGlmCisKICNpZm5kZWYgTkRFQlVHCiAgICAgdm9pZCBwcmludCgpIGNvbnN0OwogI2Vu ZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCmluZGV4IDZiZjlmY2MuLmUz ZDc0ZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCkBAIC0xNzQsNiAr MTc0LDM1IEBAIEtVUkxHb29nbGVQcml2YXRlOjpLVVJMR29vZ2xlUHJpdmF0ZShXVEY6Okhhc2hU YWJsZURlbGV0ZWRWYWx1ZVR5cGUpCiB7CiB9CiAgCitLVVJMR29vZ2xlUHJpdmF0ZTo6S1VSTEdv b2dsZVByaXZhdGUoY29uc3QgS1VSTEdvb2dsZVByaXZhdGUmIG8pCisgICAgOiBtX2lzVmFsaWQo by5tX2lzVmFsaWQpCisgICAgLCBtX3Byb3RvY29sSXNJbkhUVFBGYW1pbHkoby5tX3Byb3RvY29s SXNJbkhUVFBGYW1pbHkpCisgICAgLCBtX3BhcnNlZChvLm1fcGFyc2VkKQorICAgICwgbV91dGY4 KG8ubV91dGY4KQorICAgICwgbV91dGY4SXNBU0NJSShvLm1fdXRmOElzQVNDSUkpCisgICAgLCBt X3N0cmluZ0lzVmFsaWQoby5tX3N0cmluZ0lzVmFsaWQpCisgICAgLCBtX3N0cmluZyhvLm1fc3Ry aW5nKQoreworICAgIGlmIChvLm1faW5uZXJVUkwuZ2V0KCkpCisgICAgICAgIG1faW5uZXJVUkwg PSBhZG9wdFB0cihuZXcgS1VSTChvLm1faW5uZXJVUkwtPmNvcHkoKSkpOworfQorCitLVVJMR29v Z2xlUHJpdmF0ZSYgS1VSTEdvb2dsZVByaXZhdGU6Om9wZXJhdG9yPShjb25zdCBLVVJMR29vZ2xl UHJpdmF0ZSYgbykKK3sKKyAgICBtX2lzVmFsaWQgPSBvLm1faXNWYWxpZDsKKyAgICBtX3Byb3Rv Y29sSXNJbkhUVFBGYW1pbHkgPSBvLm1fcHJvdG9jb2xJc0luSFRUUEZhbWlseTsKKyAgICBtX3Bh cnNlZCA9IG8ubV9wYXJzZWQ7CisgICAgbV91dGY4ID0gby5tX3V0Zjg7CisgICAgbV91dGY4SXNB U0NJSSA9IG8ubV91dGY4SXNBU0NJSTsKKyAgICBtX3N0cmluZ0lzVmFsaWQgPSBvLm1fc3RyaW5n SXNWYWxpZDsKKyAgICBtX3N0cmluZyA9IG8ubV9zdHJpbmc7CisgICAgaWYgKG8ubV9pbm5lclVS TC5nZXQoKSkKKyAgICAgICAgbV9pbm5lclVSTCA9IGFkb3B0UHRyKG5ldyBLVVJMKG8ubV9pbm5l clVSTC0+Y29weSgpKSk7CisgICAgZWxzZQorICAgICAgICBtX2lubmVyVVJMLmNsZWFyKCk7Cisg ICAgcmV0dXJuICp0aGlzOworfQorCiAvLyBTZXR0ZXJzIGZvciB0aGUgZGF0YS4gVXNpbmcgdGhl IEFTQ0lJIHZlcnNpb24gd2hlbiB5b3Uga25vdyB0aGUKIC8vIGRhdGEgaXMgQVNDSUkgd2lsbCBi ZSBzbGlnaHRseSBtb3JlIGVmZmljaWVudC4gVGhlIFVURi04IHZlcnNpb24KIC8vIHdpbGwgYWx3 YXlzIGJlIGNvcnJlY3QgaWYgdGhlIGNhbGxlciBpcyB1bnN1cmUuCkBAIC0xOTcsNiArMjI2LDcg QEAgdm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6c2V0VXRmOChjb25zdCBDU3RyaW5nJiBzdHIpCiAg ICAgbV91dGY4ID0gc3RyOwogICAgIG1fc3RyaW5nSXNWYWxpZCA9IGZhbHNlOwogICAgIGluaXRQ cm90b2NvbElzSW5IVFRQRmFtaWx5KCk7CisgICAgaW5pdElubmVyVVJMKCk7CiB9CiAKIHZvaWQg S1VSTEdvb2dsZVByaXZhdGU6OnNldEFzY2lpKGNvbnN0IENTdHJpbmcmIHN0cikKQEAgLTIwNSw2 ICsyMzUsNyBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjpzZXRBc2NpaShjb25zdCBDU3RyaW5n JiBzdHIpCiAgICAgbV91dGY4SXNBU0NJSSA9IHRydWU7CiAgICAgbV9zdHJpbmdJc1ZhbGlkID0g ZmFsc2U7CiAgICAgaW5pdFByb3RvY29sSXNJbkhUVFBGYW1pbHkoKTsKKyAgICBpbml0SW5uZXJV UkwoKTsKIH0KIAogdm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNl LApAQCAtMjU4LDYgKzI4OSwyMCBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0KGNvbnN0 IEtVUkwmIGJhc2UsIGNvbnN0IENIQVIqIHJlbCwgaW50IHJlbExlbmd0aCwKICAgICB9CiB9CiAK K3ZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXRJbm5lclVSTCgpIHsKKyAgICBpZiAoIW1faXNW YWxpZCkgeworICAgICAgICBtX2lubmVyVVJMLmNsZWFyKCk7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisgICAgdXJsX3BhcnNlOjpQYXJzZWQqIGlubmVyUGFyc2VkID0gbV9wYXJzZWQuaW5uZXJf cGFyc2VkKCk7CisgICAgaWYgKGlubmVyUGFyc2VkKQorICAgICAgICBtX2lubmVyVVJMID0gYWRv cHRQdHIobmV3IEtVUkwoCisgICAgICAgICAgICBQYXJzZWRVUkxTdHJpbmcsCisgICAgICAgICAg ICBTdHJpbmcobV91dGY4LmRhdGEoKSArIGlubmVyUGFyc2VkLT5zY2hlbWUuYmVnaW4sIGlubmVy UGFyc2VkLT5MZW5ndGgoKSAtIGlubmVyUGFyc2VkLT5zY2hlbWUuYmVnaW4pKSk7CisgICAgZWxz ZQorICAgICAgICBtX2lubmVyVVJMLmNsZWFyKCk7Cit9CisKIHZvaWQgS1VSTEdvb2dsZVByaXZh dGU6OmluaXRQcm90b2NvbElzSW5IVFRQRmFtaWx5KCkKIHsKICAgICBpZiAoIW1faXNWYWxpZCkg ewpAQCAtMjg1LDYgKzMzMCwxMSBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjpjb3B5VG8oS1VS TEdvb2dsZVByaXZhdGUqIGRlc3QpIGNvbnN0CiAgICAgZGVzdC0+bV91dGY4SXNBU0NJSSA9IG1f dXRmOElzQVNDSUk7CiAgICAgZGVzdC0+bV9zdHJpbmdJc1ZhbGlkID0gZmFsc2U7CiAgICAgZGVz dC0+bV9zdHJpbmcgPSBTdHJpbmcoKTsgLy8gQ2xlYXIgdGhlIGludmFsaWQgc3RyaW5nIHRvIGF2 b2lkIGNyb3NzIHRocmVhZCByZWYgY291bnRpbmcuCisgICAgaWYgKG1faW5uZXJVUkwpIHsKKyAg ICAgIGRlc3QtPm1faW5uZXJVUkwgPSBhZG9wdFB0cihuZXcgS1VSTChtX2lubmVyVVJMLT5jb3B5 KCkpKTsKKyAgICB9CisgICAgZWxzZQorICAgICAgZGVzdC0+bV9pbm5lclVSTC5jbGVhcigpOwog fQogCiBTdHJpbmcgS1VSTEdvb2dsZVByaXZhdGU6OmNvbXBvbmVudFN0cmluZyhjb25zdCB1cmxf cGFyc2U6OkNvbXBvbmVudCYgY29tcCkgY29uc3QKQEAgLTgyNyw3ICs4NzcsMTAgQEAgU3RyaW5n IGVuY29kZVdpdGhVUkxFc2NhcGVTZXF1ZW5jZXMoY29uc3QgU3RyaW5nJiBub3RFbmNvZGVkU3Ry aW5nKQogICAgICAgICBidWZmZXIuUmVzaXplKGlucHV0TGVuZ3RoICogMyk7CiAKICAgICB1cmxf dXRpbDo6RW5jb2RlVVJJQ29tcG9uZW50KGlucHV0LCBpbnB1dExlbmd0aCwgJmJ1ZmZlcik7Ci0g ICAgcmV0dXJuIFN0cmluZyhidWZmZXIuZGF0YSgpLCBidWZmZXIubGVuZ3RoKCkpOworICAgIFN0 cmluZyBlc2NhcGVkKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5sZW5ndGgoKSk7CisgICAgLy8gVW5l c2NhcGUgJy8nOyBpdCdzIHNhZmUgYW5kIG11Y2ggcHJldHRpZXIuCisgICAgZXNjYXBlZC5yZXBs YWNlKCIlMkYiLCAiLyIpOworICAgIHJldHVybiBlc2NhcGVkOwogfQogCiBib29sIEtVUkw6Omlz SGllcmFyY2hpY2FsKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0tVUkxHb29nbGVQcml2YXRlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xl UHJpdmF0ZS5oCmluZGV4IDMxZWZkNjQuLmUwOWMxZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaApAQCAtMzIsNiArMzIsNyBAQAogI2RlZmluZSBLVVJM R29vZ2xlUHJpdmF0ZV9oCiAKICNpbmNsdWRlIDx3dGYvdGV4dC9DU3RyaW5nLmg+CisjaW5jbHVk ZSA8d3RmL093blB0ci5oPgogCiAjaW5jbHVkZSA8Z29vZ2xldXJsL3NyYy91cmxfcGFyc2UuaD4K ICNpbmNsdWRlIDxnb29nbGV1cmwvc3JjL3VybF9jYW5vbi5oPgpAQCAtNDksNiArNTAsOCBAQCBu YW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEtVUkxHb29nbGVQcml2YXRlKCk7CiAgICAgICAg IEtVUkxHb29nbGVQcml2YXRlKGNvbnN0IHVybF9wYXJzZTo6UGFyc2VkJiwgYm9vbCBpc1ZhbGlk KTsKICAgICAgICAgS1VSTEdvb2dsZVByaXZhdGUoV1RGOjpIYXNoVGFibGVEZWxldGVkVmFsdWVU eXBlKTsKKyAgICAgICAgS1VSTEdvb2dsZVByaXZhdGUoY29uc3QgS1VSTEdvb2dsZVByaXZhdGUm KTsKKyAgICAgICAgS1VSTEdvb2dsZVByaXZhdGUmIG9wZXJhdG9yPShjb25zdCBLVVJMR29vZ2xl UHJpdmF0ZSYpOwogCiAgICAgICAgIC8vIEluaXRpYWxpemVzIHRoZSBvYmplY3QuIFRoaXMgd2ls bCBjYWxsIHRocm91Z2ggdGhlIGJhY2tlbmQgaW5pdGlhbGl6ZXIKICAgICAgICAgLy8gYmVsb3cu CkBAIC05NCw3ICs5NywxMCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIGJvb2wgbV9w cm90b2NvbElzSW5IVFRQRmFtaWx5OwogICAgICAgICB1cmxfcGFyc2U6OlBhcnNlZCBtX3BhcnNl ZDsgLy8gSW5kZXhlcyBpbnRvIHRoZSBVVEYtOCB2ZXJzaW9uIG9mIHRoZSBzdHJpbmcuCiAKKyAg ICAgICAgS1VSTCogaW5uZXJVUkwoKSBjb25zdCB7IHJldHVybiBtX2lubmVyVVJMLmdldCgpOyB9 CisKICAgICBwcml2YXRlOgorICAgICAgICB2b2lkIGluaXRJbm5lclVSTCgpOwogICAgICAgICB2 b2lkIGluaXRQcm90b2NvbElzSW5IVFRQRmFtaWx5KCk7CiAKICAgICAgICAgQ1N0cmluZyBtX3V0 Zjg7CkBAIC0xMDcsNiArMTEzLDggQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgICAgIG11 dGFibGUgYm9vbCBtX3N0cmluZ0lzVmFsaWQ7CiAgICAgICAgIG11dGFibGUgU3RyaW5nIG1fc3Ry aW5nOworCisgICAgICAgIE93blB0cjxLVVJMPiBtX2lubmVyVVJMOwogICAgIH07CiAKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUK 123813 2012-01-24 14:43:24 -0800 2012-01-24 17:24:35 -0800 Patch bug-75049-20120124144323.patch text/plain 8683 ericu U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1Nzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzhkOWZkY2I5YzBl M2IyMDEyYTVlNTFiZjhlZjJkOWRhOTg5Mi4uYzM1OGI0ZTIzOGFmZThkNjJiNTE4NTdlOWVlYmU5 NjZmN2ViYWViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTAxLTI0ICBFcmlj IFVocmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIGZ1bGwgc3VwcG9y dCBmb3IgZmlsZXN5c3RlbSBVUkxzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzUwNDkKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgor CisgICAgICAgIE5vIG5ldyB0ZXN0czsgZXhpc3RpbmcgbGF5b3V0IHRlc3RzIGNvdmVyIHRoZSBi YXNpYyBmdW5jdGlvbmFsaXR5LCBhbmQKKyAgICAgICAgdGhlIG5ldyBmdW5jdGlvbmFsaXR5IHdv bid0IGJlIHRoZXJlIHVudGlsIENocm9taXVtIGFkZHMgaXQuICBUaGlzIHBhdGNoCisgICAgICAg IG1lcmVseSBlbmFibGVzIHRoYXQsIHdpdGhvdXQgY2hhbmdpbmcgYmVoYXZpb3IuCisKKyAgICAg ICAgKiBmaWxlYXBpL0VudHJ5QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbnRyeUJhc2U6 OnRvVVJMKTogQWRkIG1pc3NpbmcgZXNjYXBpbmcgb2YgVVJMIHBhdGguCisKKyAgICAgICAgKiBw YWdlL1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmV4dHJhY3RJbm5lclVS TCk6IFVzZSBpbm5lclVSTCBtZW1iZXIsIGlmIGl0J3MgcG9wdWxhdGVkLgorCisgICAgICAgICog cGxhdGZvcm0vS1VSTC5oOgorICAgICAgICAoV2ViQ29yZTo6S1VSTDo6aW5uZXJVUkwpOiBBZGQg aW5uZXJVUkwgbWVtYmVyLgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6S1VSTEdvb2dsZVByaXZhdGUpOgor ICAgICAgICAoV2ViQ29yZTo6S1VSTEdvb2dsZVByaXZhdGU6Om9wZXJhdG9yPSk6CisgICAgICAg IEFkZCBjb3B5IGNvbnN0cnVjdG9yIGFuZCBvcGVyYXRvcj0sIHdoaWNoIGFyZSBub3cgbmVlZGVk IHNpbmNlCisgICAgICAgIG1faW5uZXJVUkwgbmVlZHMgc3BlY2lhbCBoYW5kbGluZy4KKyAgICAg ICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjpzZXRVdGY4KToKKyAgICAgICAgKFdlYkNv cmU6OktVUkxHb29nbGVQcml2YXRlOjpzZXRBc2NpaSk6CisgICAgICAgIEFkZCBjYWxscyB0byBp bml0SW5uZXJVUkwuCisgICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdElu bmVyVVJMKToKKyAgICAgICAgQWRkIG1ldGhvZCB0byBpbml0L2NvcHkgbV9pbm5lclVSTC4KKyAg ICAgICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjpjb3B5VG8pOgorICAgICAgICBIYW5k bGUgbV9pbm5lclVSTCBkdXJpbmcgY29waWVzLgorICAgICAgICAoV2ViQ29yZTo6ZW5jb2RlV2l0 aFVSTEVzY2FwZVNlcXVlbmNlcyk6CisgICAgICAgIFVuZXNjYXBlICUyRiBbJy8nXSBpbiBwYXRo czsgaXQncyBtdWNoIG1vcmUgcmVhZGFibGUsIGFuZCBpdCdzIHNhZmUuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6S1VSTEdvb2ds ZVByaXZhdGU6OmlubmVyVVJMKTogQWRkIGFjY2Vzc29yIGZvciBuZXcgbV9pbm5lclVSTC4KKwog MjAxMi0wMS0xNiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAg UkVHUkVTU0lPTiAocjEwMjA0MCk6IFdyb25nIGNvbHVtbiB3aWR0aHMgd2hlbiByb3cgaGFzIGNv bHNwYW4gYW5kIHVud3JhcHBhYmxlIHRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Zp bGVhcGkvRW50cnlCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRW50cnlCYXNlLmNw cAppbmRleCAzOTQ1M2Y2MWM2MWMwYzg1YmYyZGNlMmZlYWFmZmQ4NmU0ZmEzMzhhLi41M2Y2MmU3 ODNiYWYxNDVmYWNiODRmYmI2YWY1ODlhMTIxNzUyYTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9maWxlYXBpL0VudHJ5QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9F bnRyeUJhc2UuY3BwCkBAIC03NSw3ICs3NSw3IEBAIFN0cmluZyBFbnRyeUJhc2U6OnRvVVJMKCkK ICAgICAgICAgcmVzdWx0LmFwcGVuZChET01GaWxlU3lzdGVtQmFzZTo6a0V4dGVybmFsUGF0aFBy ZWZpeCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICByZXN1bHQuYXBwZW5kKG1fZnVsbFBh dGgpOworICAgIHJlc3VsdC5hcHBlbmQoZW5jb2RlV2l0aFVSTEVzY2FwZVNlcXVlbmNlcyhtX2Z1 bGxQYXRoKSk7CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCmluZGV4IDQ0MzY2OTRmYzYwMTRjYTczZjRlZDE5NTBl YThiYmMyYWUxNzY2ZTkuLjE4ZTRmYTJmNzFlMDA3MTc2ZTUxMzFiMjBkYjc2NGRjZmExYzUxNzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCkBAIC04Miw2ICs4Miw4IEBA IHN0YXRpYyBib29sIHNob3VsZFVzZUlubmVyVVJMKGNvbnN0IEtVUkwmIHVybCkKIC8vIHNlY3Vy aXR5IG9yaWdpbiBjYW4gYmUgcGFyc2VkIHVzaW5nIHRoaXMgYWxnb3JpdGhtLgogc3RhdGljIEtV UkwgZXh0cmFjdElubmVyVVJMKGNvbnN0IEtVUkwmIHVybCkKIHsKKyAgICBpZiAodXJsLmlubmVy VVJMKCkpCisgICAgICAgIHJldHVybiAqdXJsLmlubmVyVVJMKCk7CiAgICAgLy8gRklYTUU6IFVw ZGF0ZSB0aGlzIGNhbGxzaXRlIHRvIHVzZSB0aGUgaW5uZXJVUkwgbWVtYmVyIGZ1bmN0aW9uIHdo ZW4KICAgICAvLyB3ZSBmaW5pc2ggaW1wbGVtZW50aW5nIGl0LgogICAgIHJldHVybiBLVVJMKFBh cnNlZFVSTFN0cmluZywgZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHVybC5wYXRoKCkpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0tVUkwuaAppbmRleCA4ZGVjODFmNzAzMjEzOTZjZTZkOGMxYjAxZjE4ZDNjOWQz YTNmOWZhLi40NDQyOWZhYmE5ODhmZTlhZDU5NTAxMmUwMTQ5ZTQ1NDFhYTNjMWQ2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vS1VSTC5oCkBAIC0yMTgsNiArMjE4LDEzIEBAIHB1YmxpYzoKICAgICBjb25zdCBD U3RyaW5nJiB1dGY4U3RyaW5nKCkgY29uc3QgeyByZXR1cm4gbV91cmwudXRmOFN0cmluZygpOyB9 CiAjZW5kaWYKIAorCisjaWYgVVNFKEdPT0dMRVVSTCkKKyAgICBjb25zdCBLVVJMKiBpbm5lclVS TCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsLmlubmVyVVJMKCk7IH0KKyNlbHNlCisgICAgY29uc3Qg S1VSTCogaW5uZXJVUkwoKSBjb25zdCB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiAwOyB9Cisj ZW5kaWYKKwogI2lmbmRlZiBOREVCVUcKICAgICB2b2lkIHByaW50KCkgY29uc3Q7CiAjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKaW5kZXggNmJmOWZjY2IxZTlmZTE5 MmU4ZGM1YjMwMjk1OGNkZjExZjQ3OTI0Yy4uMDUwN2EyNDEyNjdkZWU0OWU2ZTExMTMwMWM0MDJm MTkwZjQ5YzU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2ds ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKQEAgLTE3 NCw2ICsxNzQsMzUgQEAgS1VSTEdvb2dsZVByaXZhdGU6OktVUkxHb29nbGVQcml2YXRlKFdURjo6 SGFzaFRhYmxlRGVsZXRlZFZhbHVlVHlwZSkKIHsKIH0KICAKK0tVUkxHb29nbGVQcml2YXRlOjpL VVJMR29vZ2xlUHJpdmF0ZShjb25zdCBLVVJMR29vZ2xlUHJpdmF0ZSYgbykKKyAgICA6IG1faXNW YWxpZChvLm1faXNWYWxpZCkKKyAgICAsIG1fcHJvdG9jb2xJc0luSFRUUEZhbWlseShvLm1fcHJv dG9jb2xJc0luSFRUUEZhbWlseSkKKyAgICAsIG1fcGFyc2VkKG8ubV9wYXJzZWQpCisgICAgLCBt X3V0Zjgoby5tX3V0ZjgpCisgICAgLCBtX3V0ZjhJc0FTQ0lJKG8ubV91dGY4SXNBU0NJSSkKKyAg ICAsIG1fc3RyaW5nSXNWYWxpZChvLm1fc3RyaW5nSXNWYWxpZCkKKyAgICAsIG1fc3RyaW5nKG8u bV9zdHJpbmcpCit7CisgICAgaWYgKG8ubV9pbm5lclVSTC5nZXQoKSkKKyAgICAgICAgbV9pbm5l clVSTCA9IGFkb3B0UHRyKG5ldyBLVVJMKG8ubV9pbm5lclVSTC0+Y29weSgpKSk7Cit9CisKK0tV UkxHb29nbGVQcml2YXRlJiBLVVJMR29vZ2xlUHJpdmF0ZTo6b3BlcmF0b3I9KGNvbnN0IEtVUkxH b29nbGVQcml2YXRlJiBvKQoreworICAgIG1faXNWYWxpZCA9IG8ubV9pc1ZhbGlkOworICAgIG1f cHJvdG9jb2xJc0luSFRUUEZhbWlseSA9IG8ubV9wcm90b2NvbElzSW5IVFRQRmFtaWx5OworICAg IG1fcGFyc2VkID0gby5tX3BhcnNlZDsKKyAgICBtX3V0ZjggPSBvLm1fdXRmODsKKyAgICBtX3V0 ZjhJc0FTQ0lJID0gby5tX3V0ZjhJc0FTQ0lJOworICAgIG1fc3RyaW5nSXNWYWxpZCA9IG8ubV9z dHJpbmdJc1ZhbGlkOworICAgIG1fc3RyaW5nID0gby5tX3N0cmluZzsKKyAgICBpZiAoby5tX2lu bmVyVVJMLmdldCgpKQorICAgICAgICBtX2lubmVyVVJMID0gYWRvcHRQdHIobmV3IEtVUkwoby5t X2lubmVyVVJMLT5jb3B5KCkpKTsKKyAgICBlbHNlCisgICAgICAgIG1faW5uZXJVUkwuY2xlYXIo KTsKKyAgICByZXR1cm4gKnRoaXM7Cit9CisKIC8vIFNldHRlcnMgZm9yIHRoZSBkYXRhLiBVc2lu ZyB0aGUgQVNDSUkgdmVyc2lvbiB3aGVuIHlvdSBrbm93IHRoZQogLy8gZGF0YSBpcyBBU0NJSSB3 aWxsIGJlIHNsaWdodGx5IG1vcmUgZWZmaWNpZW50LiBUaGUgVVRGLTggdmVyc2lvbgogLy8gd2ls bCBhbHdheXMgYmUgY29ycmVjdCBpZiB0aGUgY2FsbGVyIGlzIHVuc3VyZS4KQEAgLTE5Nyw2ICsy MjYsNyBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjpzZXRVdGY4KGNvbnN0IENTdHJpbmcmIHN0 cikKICAgICBtX3V0ZjggPSBzdHI7CiAgICAgbV9zdHJpbmdJc1ZhbGlkID0gZmFsc2U7CiAgICAg aW5pdFByb3RvY29sSXNJbkhUVFBGYW1pbHkoKTsKKyAgICBpbml0SW5uZXJVUkwoKTsKIH0KIAog dm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6c2V0QXNjaWkoY29uc3QgQ1N0cmluZyYgc3RyKQpAQCAt MjA1LDYgKzIzNSw3IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OnNldEFzY2lpKGNvbnN0IENT dHJpbmcmIHN0cikKICAgICBtX3V0ZjhJc0FTQ0lJID0gdHJ1ZTsKICAgICBtX3N0cmluZ0lzVmFs aWQgPSBmYWxzZTsKICAgICBpbml0UHJvdG9jb2xJc0luSFRUUEZhbWlseSgpOworICAgIGluaXRJ bm5lclVSTCgpOwogfQogCiB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0KGNvbnN0IEtVUkwm IGJhc2UsCkBAIC0yNTgsNiArMjg5LDIxIEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXQo Y29uc3QgS1VSTCYgYmFzZSwgY29uc3QgQ0hBUiogcmVsLCBpbnQgcmVsTGVuZ3RoLAogICAgIH0K IH0KIAordm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdElubmVyVVJMKCkKK3sKKyAgICBpZiAo IW1faXNWYWxpZCkgeworICAgICAgICBtX2lubmVyVVJMLmNsZWFyKCk7CisgICAgICAgIHJldHVy bjsKKyAgICB9CisgICAgdXJsX3BhcnNlOjpQYXJzZWQqIGlubmVyUGFyc2VkID0gbV9wYXJzZWQu aW5uZXJfcGFyc2VkKCk7CisgICAgaWYgKGlubmVyUGFyc2VkKQorICAgICAgICBtX2lubmVyVVJM ID0gYWRvcHRQdHIobmV3IEtVUkwoCisgICAgICAgICAgICBQYXJzZWRVUkxTdHJpbmcsCisgICAg ICAgICAgICBTdHJpbmcobV91dGY4LmRhdGEoKSArIGlubmVyUGFyc2VkLT5zY2hlbWUuYmVnaW4s IGlubmVyUGFyc2VkLT5MZW5ndGgoKSAtIGlubmVyUGFyc2VkLT5zY2hlbWUuYmVnaW4pKSk7Cisg ICAgZWxzZQorICAgICAgICBtX2lubmVyVVJMLmNsZWFyKCk7Cit9CisKIHZvaWQgS1VSTEdvb2ds ZVByaXZhdGU6OmluaXRQcm90b2NvbElzSW5IVFRQRmFtaWx5KCkKIHsKICAgICBpZiAoIW1faXNW YWxpZCkgewpAQCAtMjg1LDYgKzMzMSwxMCBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjpjb3B5 VG8oS1VSTEdvb2dsZVByaXZhdGUqIGRlc3QpIGNvbnN0CiAgICAgZGVzdC0+bV91dGY4SXNBU0NJ SSA9IG1fdXRmOElzQVNDSUk7CiAgICAgZGVzdC0+bV9zdHJpbmdJc1ZhbGlkID0gZmFsc2U7CiAg ICAgZGVzdC0+bV9zdHJpbmcgPSBTdHJpbmcoKTsgLy8gQ2xlYXIgdGhlIGludmFsaWQgc3RyaW5n IHRvIGF2b2lkIGNyb3NzIHRocmVhZCByZWYgY291bnRpbmcuCisgICAgaWYgKG1faW5uZXJVUkwp CisgICAgICAgIGRlc3QtPm1faW5uZXJVUkwgPSBhZG9wdFB0cihuZXcgS1VSTChtX2lubmVyVVJM LT5jb3B5KCkpKTsKKyAgICBlbHNlCisgICAgICAgIGRlc3QtPm1faW5uZXJVUkwuY2xlYXIoKTsK IH0KIAogU3RyaW5nIEtVUkxHb29nbGVQcml2YXRlOjpjb21wb25lbnRTdHJpbmcoY29uc3QgdXJs X3BhcnNlOjpDb21wb25lbnQmIGNvbXApIGNvbnN0CkBAIC04MjcsNyArODc3LDEwIEBAIFN0cmlu ZyBlbmNvZGVXaXRoVVJMRXNjYXBlU2VxdWVuY2VzKGNvbnN0IFN0cmluZyYgbm90RW5jb2RlZFN0 cmluZykKICAgICAgICAgYnVmZmVyLlJlc2l6ZShpbnB1dExlbmd0aCAqIDMpOwogCiAgICAgdXJs X3V0aWw6OkVuY29kZVVSSUNvbXBvbmVudChpbnB1dCwgaW5wdXRMZW5ndGgsICZidWZmZXIpOwot ICAgIHJldHVybiBTdHJpbmcoYnVmZmVyLmRhdGEoKSwgYnVmZmVyLmxlbmd0aCgpKTsKKyAgICBT dHJpbmcgZXNjYXBlZChidWZmZXIuZGF0YSgpLCBidWZmZXIubGVuZ3RoKCkpOworICAgIC8vIFVu ZXNjYXBlICcvJzsgaXQncyBzYWZlIGFuZCBtdWNoIHByZXR0aWVyLgorICAgIGVzY2FwZWQucmVw bGFjZSgiJTJGIiwgIi8iKTsKKyAgICByZXR1cm4gZXNjYXBlZDsKIH0KIAogYm9vbCBLVVJMOjpp c0hpZXJhcmNoaWNhbCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9LVVJMR29vZ2xlUHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2ds ZVByaXZhdGUuaAppbmRleCAzMWVmZDY0ZWVjZmQ3OGY2OWI2ZDU4NTM2YzcyYmMyYmY3NzFjNGFi Li4zNzRkMGQ3MjYxNWQ2Y2I3NmNhNTBjZmNmMjc5MDE4YzQ1ZTgxYmUzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNp Zm5kZWYgS1VSTEdvb2dsZVByaXZhdGVfaAogI2RlZmluZSBLVVJMR29vZ2xlUHJpdmF0ZV9oCiAK KyNpbmNsdWRlIDx3dGYvT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgog CiAjaW5jbHVkZSA8Z29vZ2xldXJsL3NyYy91cmxfcGFyc2UuaD4KQEAgLTQ5LDYgKzUwLDggQEAg bmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBLVVJMR29vZ2xlUHJpdmF0ZSgpOwogICAgICAg ICBLVVJMR29vZ2xlUHJpdmF0ZShjb25zdCB1cmxfcGFyc2U6OlBhcnNlZCYsIGJvb2wgaXNWYWxp ZCk7CiAgICAgICAgIEtVUkxHb29nbGVQcml2YXRlKFdURjo6SGFzaFRhYmxlRGVsZXRlZFZhbHVl VHlwZSk7CisgICAgICAgIEtVUkxHb29nbGVQcml2YXRlKGNvbnN0IEtVUkxHb29nbGVQcml2YXRl Jik7CisgICAgICAgIEtVUkxHb29nbGVQcml2YXRlJiBvcGVyYXRvcj0oY29uc3QgS1VSTEdvb2ds ZVByaXZhdGUmKTsKIAogICAgICAgICAvLyBJbml0aWFsaXplcyB0aGUgb2JqZWN0LiBUaGlzIHdp bGwgY2FsbCB0aHJvdWdoIHRoZSBiYWNrZW5kIGluaXRpYWxpemVyCiAgICAgICAgIC8vIGJlbG93 LgpAQCAtOTQsNyArOTcsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1f cHJvdG9jb2xJc0luSFRUUEZhbWlseTsKICAgICAgICAgdXJsX3BhcnNlOjpQYXJzZWQgbV9wYXJz ZWQ7IC8vIEluZGV4ZXMgaW50byB0aGUgVVRGLTggdmVyc2lvbiBvZiB0aGUgc3RyaW5nLgogCisg ICAgICAgIEtVUkwqIGlubmVyVVJMKCkgY29uc3QgeyByZXR1cm4gbV9pbm5lclVSTC5nZXQoKTsg fQorCiAgICAgcHJpdmF0ZToKKyAgICAgICAgdm9pZCBpbml0SW5uZXJVUkwoKTsKICAgICAgICAg dm9pZCBpbml0UHJvdG9jb2xJc0luSFRUUEZhbWlseSgpOwogCiAgICAgICAgIENTdHJpbmcgbV91 dGY4OwpAQCAtMTA3LDYgKzExMyw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBt dXRhYmxlIGJvb2wgbV9zdHJpbmdJc1ZhbGlkOwogICAgICAgICBtdXRhYmxlIFN0cmluZyBtX3N0 cmluZzsKKworICAgICAgICBPd25QdHI8S1VSTD4gbV9pbm5lclVSTDsKICAgICB9OwogCiB9IC8v IG5hbWVzcGFjZSBXZWJDb3JlCg== 123853 2012-01-24 17:24:39 -0800 2012-01-25 13:28:02 -0800 Patch bug-75049-20120124172437.patch text/plain 8843 ericu U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1Nzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2QyMzhkOWZkY2I5YzBl M2IyMDEyYTVlNTFiZjhlZjJkOWRhOTg5Mi4uYzM1OGI0ZTIzOGFmZThkNjJiNTE4NTdlOWVlYmU5 NjZmN2ViYWViOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTAxLTI0ICBFcmlj IFVocmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIGZ1bGwgc3VwcG9y dCBmb3IgZmlsZXN5c3RlbSBVUkxzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzUwNDkKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgor CisgICAgICAgIE5vIG5ldyB0ZXN0czsgZXhpc3RpbmcgbGF5b3V0IHRlc3RzIGNvdmVyIHRoZSBi YXNpYyBmdW5jdGlvbmFsaXR5LCBhbmQKKyAgICAgICAgdGhlIG5ldyBmdW5jdGlvbmFsaXR5IHdv bid0IGJlIHRoZXJlIHVudGlsIENocm9taXVtIGFkZHMgaXQuICBUaGlzIHBhdGNoCisgICAgICAg IG1lcmVseSBlbmFibGVzIHRoYXQsIHdpdGhvdXQgY2hhbmdpbmcgYmVoYXZpb3IuCisKKyAgICAg ICAgKiBmaWxlYXBpL0VudHJ5QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbnRyeUJhc2U6 OnRvVVJMKTogQWRkIG1pc3NpbmcgZXNjYXBpbmcgb2YgVVJMIHBhdGguCisKKyAgICAgICAgKiBw YWdlL1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmV4dHJhY3RJbm5lclVS TCk6IFVzZSBpbm5lclVSTCBtZW1iZXIsIGlmIGl0J3MgcG9wdWxhdGVkLgorCisgICAgICAgICog cGxhdGZvcm0vS1VSTC5oOgorICAgICAgICAoV2ViQ29yZTo6S1VSTDo6aW5uZXJVUkwpOiBBZGQg aW5uZXJVUkwgbWVtYmVyLgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6S1VSTEdvb2dsZVByaXZhdGUpOgor ICAgICAgICAoV2ViQ29yZTo6S1VSTEdvb2dsZVByaXZhdGU6Om9wZXJhdG9yPSk6CisgICAgICAg IEFkZCBjb3B5IGNvbnN0cnVjdG9yIGFuZCBvcGVyYXRvcj0sIHdoaWNoIGFyZSBub3cgbmVlZGVk IHNpbmNlCisgICAgICAgIG1faW5uZXJVUkwgbmVlZHMgc3BlY2lhbCBoYW5kbGluZy4KKyAgICAg ICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjpzZXRVdGY4KToKKyAgICAgICAgKFdlYkNv cmU6OktVUkxHb29nbGVQcml2YXRlOjpzZXRBc2NpaSk6CisgICAgICAgIEFkZCBjYWxscyB0byBp bml0SW5uZXJVUkwuCisgICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdElu bmVyVVJMKToKKyAgICAgICAgQWRkIG1ldGhvZCB0byBpbml0L2NvcHkgbV9pbm5lclVSTC4KKyAg ICAgICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjpjb3B5VG8pOgorICAgICAgICBIYW5k bGUgbV9pbm5lclVSTCBkdXJpbmcgY29waWVzLgorICAgICAgICAoV2ViQ29yZTo6ZW5jb2RlV2l0 aFVSTEVzY2FwZVNlcXVlbmNlcyk6CisgICAgICAgIFVuZXNjYXBlICUyRiBbJy8nXSBpbiBwYXRo czsgaXQncyBtdWNoIG1vcmUgcmVhZGFibGUsIGFuZCBpdCdzIHNhZmUuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6S1VSTEdvb2ds ZVByaXZhdGU6OmlubmVyVVJMKTogQWRkIGFjY2Vzc29yIGZvciBuZXcgbV9pbm5lclVSTC4KKwog MjAxMi0wMS0xNiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAg UkVHUkVTU0lPTiAocjEwMjA0MCk6IFdyb25nIGNvbHVtbiB3aWR0aHMgd2hlbiByb3cgaGFzIGNv bHNwYW4gYW5kIHVud3JhcHBhYmxlIHRleHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Zp bGVhcGkvRW50cnlCYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRW50cnlCYXNlLmNw cAppbmRleCAzOTQ1M2Y2MWM2MWMwYzg1YmYyZGNlMmZlYWFmZmQ4NmU0ZmEzMzhhLi41M2Y2MmU3 ODNiYWYxNDVmYWNiODRmYmI2YWY1ODlhMTIxNzUyYTM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9maWxlYXBpL0VudHJ5QmFzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9F bnRyeUJhc2UuY3BwCkBAIC03NSw3ICs3NSw3IEBAIFN0cmluZyBFbnRyeUJhc2U6OnRvVVJMKCkK ICAgICAgICAgcmVzdWx0LmFwcGVuZChET01GaWxlU3lzdGVtQmFzZTo6a0V4dGVybmFsUGF0aFBy ZWZpeCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KLSAgICByZXN1bHQuYXBwZW5kKG1fZnVsbFBh dGgpOworICAgIHJlc3VsdC5hcHBlbmQoZW5jb2RlV2l0aFVSTEVzY2FwZVNlcXVlbmNlcyhtX2Z1 bGxQYXRoKSk7CiAgICAgcmV0dXJuIHJlc3VsdC50b1N0cmluZygpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCmluZGV4IDQ0MzY2OTRmYzYwMTRjYTczZjRlZDE5NTBl YThiYmMyYWUxNzY2ZTkuLjE4ZTRmYTJmNzFlMDA3MTc2ZTUxMzFiMjBkYjc2NGRjZmExYzUxNzAg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCkBAIC04Miw2ICs4Miw4IEBA IHN0YXRpYyBib29sIHNob3VsZFVzZUlubmVyVVJMKGNvbnN0IEtVUkwmIHVybCkKIC8vIHNlY3Vy aXR5IG9yaWdpbiBjYW4gYmUgcGFyc2VkIHVzaW5nIHRoaXMgYWxnb3JpdGhtLgogc3RhdGljIEtV UkwgZXh0cmFjdElubmVyVVJMKGNvbnN0IEtVUkwmIHVybCkKIHsKKyAgICBpZiAodXJsLmlubmVy VVJMKCkpCisgICAgICAgIHJldHVybiAqdXJsLmlubmVyVVJMKCk7CiAgICAgLy8gRklYTUU6IFVw ZGF0ZSB0aGlzIGNhbGxzaXRlIHRvIHVzZSB0aGUgaW5uZXJVUkwgbWVtYmVyIGZ1bmN0aW9uIHdo ZW4KICAgICAvLyB3ZSBmaW5pc2ggaW1wbGVtZW50aW5nIGl0LgogICAgIHJldHVybiBLVVJMKFBh cnNlZFVSTFN0cmluZywgZGVjb2RlVVJMRXNjYXBlU2VxdWVuY2VzKHVybC5wYXRoKCkpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0tVUkwuaAppbmRleCA4ZGVjODFmNzAzMjEzOTZjZTZkOGMxYjAxZjE4ZDNjOWQz YTNmOWZhLi4zYjU0MGViNTEyMmY4MWI0YjYwNTdhZGE4OGE4MDJiOTNlNzhhNGIxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vS1VSTC5oCkBAIC0yNiw2ICsyNiw3IEBACiAjaWZuZGVmIEtVUkxfaAogI2RlZmlu ZSBLVVJMX2gKIAorI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAjaW5jbHVkZSAiUGxhdGZv cm1TdHJpbmcuaCIKICNpbmNsdWRlICJVUkxTdHJpbmcuaCIKICNpbmNsdWRlIDx3dGYvSGFzaE1h cC5oPgpAQCAtMjE4LDYgKzIxOSwxMyBAQCBwdWJsaWM6CiAgICAgY29uc3QgQ1N0cmluZyYgdXRm OFN0cmluZygpIGNvbnN0IHsgcmV0dXJuIG1fdXJsLnV0ZjhTdHJpbmcoKTsgfQogI2VuZGlmCiAK KworI2lmIFVTRShHT09HTEVVUkwpCisgICAgY29uc3QgS1VSTCogaW5uZXJVUkwoKSBjb25zdCB7 IHJldHVybiBtX3VybC5pbm5lclVSTCgpOyB9CisjZWxzZQorICAgIGNvbnN0IEtVUkwqIGlubmVy VVJMKCkgY29uc3QgeyBub3RJbXBsZW1lbnRlZCgpOyByZXR1cm4gMDsgfQorI2VuZGlmCisKICNp Zm5kZWYgTkRFQlVHCiAgICAgdm9pZCBwcmludCgpIGNvbnN0OwogI2VuZGlmCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xlLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCmluZGV4IDZiZjlmY2NiMWU5ZmUxOTJlOGRjNWIzMDI5 NThjZGYxMWY0NzkyNGMuLjA1MDdhMjQxMjY3ZGVlNDllNmUxMTEzMDFjNDAyZjE5MGY0OWM1N2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwCkBAIC0xNzQsNiArMTc0LDM1 IEBAIEtVUkxHb29nbGVQcml2YXRlOjpLVVJMR29vZ2xlUHJpdmF0ZShXVEY6Okhhc2hUYWJsZURl bGV0ZWRWYWx1ZVR5cGUpCiB7CiB9CiAgCitLVVJMR29vZ2xlUHJpdmF0ZTo6S1VSTEdvb2dsZVBy aXZhdGUoY29uc3QgS1VSTEdvb2dsZVByaXZhdGUmIG8pCisgICAgOiBtX2lzVmFsaWQoby5tX2lz VmFsaWQpCisgICAgLCBtX3Byb3RvY29sSXNJbkhUVFBGYW1pbHkoby5tX3Byb3RvY29sSXNJbkhU VFBGYW1pbHkpCisgICAgLCBtX3BhcnNlZChvLm1fcGFyc2VkKQorICAgICwgbV91dGY4KG8ubV91 dGY4KQorICAgICwgbV91dGY4SXNBU0NJSShvLm1fdXRmOElzQVNDSUkpCisgICAgLCBtX3N0cmlu Z0lzVmFsaWQoby5tX3N0cmluZ0lzVmFsaWQpCisgICAgLCBtX3N0cmluZyhvLm1fc3RyaW5nKQor eworICAgIGlmIChvLm1faW5uZXJVUkwuZ2V0KCkpCisgICAgICAgIG1faW5uZXJVUkwgPSBhZG9w dFB0cihuZXcgS1VSTChvLm1faW5uZXJVUkwtPmNvcHkoKSkpOworfQorCitLVVJMR29vZ2xlUHJp dmF0ZSYgS1VSTEdvb2dsZVByaXZhdGU6Om9wZXJhdG9yPShjb25zdCBLVVJMR29vZ2xlUHJpdmF0 ZSYgbykKK3sKKyAgICBtX2lzVmFsaWQgPSBvLm1faXNWYWxpZDsKKyAgICBtX3Byb3RvY29sSXNJ bkhUVFBGYW1pbHkgPSBvLm1fcHJvdG9jb2xJc0luSFRUUEZhbWlseTsKKyAgICBtX3BhcnNlZCA9 IG8ubV9wYXJzZWQ7CisgICAgbV91dGY4ID0gby5tX3V0Zjg7CisgICAgbV91dGY4SXNBU0NJSSA9 IG8ubV91dGY4SXNBU0NJSTsKKyAgICBtX3N0cmluZ0lzVmFsaWQgPSBvLm1fc3RyaW5nSXNWYWxp ZDsKKyAgICBtX3N0cmluZyA9IG8ubV9zdHJpbmc7CisgICAgaWYgKG8ubV9pbm5lclVSTC5nZXQo KSkKKyAgICAgICAgbV9pbm5lclVSTCA9IGFkb3B0UHRyKG5ldyBLVVJMKG8ubV9pbm5lclVSTC0+ Y29weSgpKSk7CisgICAgZWxzZQorICAgICAgICBtX2lubmVyVVJMLmNsZWFyKCk7CisgICAgcmV0 dXJuICp0aGlzOworfQorCiAvLyBTZXR0ZXJzIGZvciB0aGUgZGF0YS4gVXNpbmcgdGhlIEFTQ0lJ IHZlcnNpb24gd2hlbiB5b3Uga25vdyB0aGUKIC8vIGRhdGEgaXMgQVNDSUkgd2lsbCBiZSBzbGln aHRseSBtb3JlIGVmZmljaWVudC4gVGhlIFVURi04IHZlcnNpb24KIC8vIHdpbGwgYWx3YXlzIGJl IGNvcnJlY3QgaWYgdGhlIGNhbGxlciBpcyB1bnN1cmUuCkBAIC0xOTcsNiArMjI2LDcgQEAgdm9p ZCBLVVJMR29vZ2xlUHJpdmF0ZTo6c2V0VXRmOChjb25zdCBDU3RyaW5nJiBzdHIpCiAgICAgbV91 dGY4ID0gc3RyOwogICAgIG1fc3RyaW5nSXNWYWxpZCA9IGZhbHNlOwogICAgIGluaXRQcm90b2Nv bElzSW5IVFRQRmFtaWx5KCk7CisgICAgaW5pdElubmVyVVJMKCk7CiB9CiAKIHZvaWQgS1VSTEdv b2dsZVByaXZhdGU6OnNldEFzY2lpKGNvbnN0IENTdHJpbmcmIHN0cikKQEAgLTIwNSw2ICsyMzUs NyBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjpzZXRBc2NpaShjb25zdCBDU3RyaW5nJiBzdHIp CiAgICAgbV91dGY4SXNBU0NJSSA9IHRydWU7CiAgICAgbV9zdHJpbmdJc1ZhbGlkID0gZmFsc2U7 CiAgICAgaW5pdFByb3RvY29sSXNJbkhUVFBGYW1pbHkoKTsKKyAgICBpbml0SW5uZXJVUkwoKTsK IH0KIAogdm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdChjb25zdCBLVVJMJiBiYXNlLApAQCAt MjU4LDYgKzI4OSwyMSBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0KGNvbnN0IEtVUkwm IGJhc2UsIGNvbnN0IENIQVIqIHJlbCwgaW50IHJlbExlbmd0aCwKICAgICB9CiB9CiAKK3ZvaWQg S1VSTEdvb2dsZVByaXZhdGU6OmluaXRJbm5lclVSTCgpCit7CisgICAgaWYgKCFtX2lzVmFsaWQp IHsKKyAgICAgICAgbV9pbm5lclVSTC5jbGVhcigpOworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIHVybF9wYXJzZTo6UGFyc2VkKiBpbm5lclBhcnNlZCA9IG1fcGFyc2VkLmlubmVyX3BhcnNl ZCgpOworICAgIGlmIChpbm5lclBhcnNlZCkKKyAgICAgICAgbV9pbm5lclVSTCA9IGFkb3B0UHRy KG5ldyBLVVJMKAorICAgICAgICAgICAgUGFyc2VkVVJMU3RyaW5nLAorICAgICAgICAgICAgU3Ry aW5nKG1fdXRmOC5kYXRhKCkgKyBpbm5lclBhcnNlZC0+c2NoZW1lLmJlZ2luLCBpbm5lclBhcnNl ZC0+TGVuZ3RoKCkgLSBpbm5lclBhcnNlZC0+c2NoZW1lLmJlZ2luKSkpOworICAgIGVsc2UKKyAg ICAgICAgbV9pbm5lclVSTC5jbGVhcigpOworfQorCiB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjpp bml0UHJvdG9jb2xJc0luSFRUUEZhbWlseSgpCiB7CiAgICAgaWYgKCFtX2lzVmFsaWQpIHsKQEAg LTI4NSw2ICszMzEsMTAgQEAgdm9pZCBLVVJMR29vZ2xlUHJpdmF0ZTo6Y29weVRvKEtVUkxHb29n bGVQcml2YXRlKiBkZXN0KSBjb25zdAogICAgIGRlc3QtPm1fdXRmOElzQVNDSUkgPSBtX3V0ZjhJ c0FTQ0lJOwogICAgIGRlc3QtPm1fc3RyaW5nSXNWYWxpZCA9IGZhbHNlOwogICAgIGRlc3QtPm1f c3RyaW5nID0gU3RyaW5nKCk7IC8vIENsZWFyIHRoZSBpbnZhbGlkIHN0cmluZyB0byBhdm9pZCBj cm9zcyB0aHJlYWQgcmVmIGNvdW50aW5nLgorICAgIGlmIChtX2lubmVyVVJMKQorICAgICAgICBk ZXN0LT5tX2lubmVyVVJMID0gYWRvcHRQdHIobmV3IEtVUkwobV9pbm5lclVSTC0+Y29weSgpKSk7 CisgICAgZWxzZQorICAgICAgICBkZXN0LT5tX2lubmVyVVJMLmNsZWFyKCk7CiB9CiAKIFN0cmlu ZyBLVVJMR29vZ2xlUHJpdmF0ZTo6Y29tcG9uZW50U3RyaW5nKGNvbnN0IHVybF9wYXJzZTo6Q29t cG9uZW50JiBjb21wKSBjb25zdApAQCAtODI3LDcgKzg3NywxMCBAQCBTdHJpbmcgZW5jb2RlV2l0 aFVSTEVzY2FwZVNlcXVlbmNlcyhjb25zdCBTdHJpbmcmIG5vdEVuY29kZWRTdHJpbmcpCiAgICAg ICAgIGJ1ZmZlci5SZXNpemUoaW5wdXRMZW5ndGggKiAzKTsKIAogICAgIHVybF91dGlsOjpFbmNv ZGVVUklDb21wb25lbnQoaW5wdXQsIGlucHV0TGVuZ3RoLCAmYnVmZmVyKTsKLSAgICByZXR1cm4g U3RyaW5nKGJ1ZmZlci5kYXRhKCksIGJ1ZmZlci5sZW5ndGgoKSk7CisgICAgU3RyaW5nIGVzY2Fw ZWQoYnVmZmVyLmRhdGEoKSwgYnVmZmVyLmxlbmd0aCgpKTsKKyAgICAvLyBVbmVzY2FwZSAnLyc7 IGl0J3Mgc2FmZSBhbmQgbXVjaCBwcmV0dGllci4KKyAgICBlc2NhcGVkLnJlcGxhY2UoIiUyRiIs ICIvIik7CisgICAgcmV0dXJuIGVzY2FwZWQ7CiB9CiAKIGJvb2wgS1VSTDo6aXNIaWVyYXJjaGlj YWwoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2ds ZVByaXZhdGUuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGVQcml2YXRlLmgK aW5kZXggMzFlZmQ2NGVlY2ZkNzhmNjliNmQ1ODUzNmM3MmJjMmJmNzcxYzRhYi4uMzc0ZDBkNzI2 MTVkNmNiNzZjYTUwY2ZjZjI3OTAxOGM0NWU4MWJlMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oCkBAIC0zMSw2ICszMSw3IEBACiAjaWZuZGVmIEtVUkxH b29nbGVQcml2YXRlX2gKICNkZWZpbmUgS1VSTEdvb2dsZVByaXZhdGVfaAogCisjaW5jbHVkZSA8 d3RmL093blB0ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcuaD4KIAogI2luY2x1ZGUg PGdvb2dsZXVybC9zcmMvdXJsX3BhcnNlLmg+CkBAIC00OSw2ICs1MCw4IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgS1VSTEdvb2dsZVByaXZhdGUoKTsKICAgICAgICAgS1VSTEdvb2ds ZVByaXZhdGUoY29uc3QgdXJsX3BhcnNlOjpQYXJzZWQmLCBib29sIGlzVmFsaWQpOwogICAgICAg ICBLVVJMR29vZ2xlUHJpdmF0ZShXVEY6Okhhc2hUYWJsZURlbGV0ZWRWYWx1ZVR5cGUpOworICAg ICAgICBLVVJMR29vZ2xlUHJpdmF0ZShjb25zdCBLVVJMR29vZ2xlUHJpdmF0ZSYpOworICAgICAg ICBLVVJMR29vZ2xlUHJpdmF0ZSYgb3BlcmF0b3I9KGNvbnN0IEtVUkxHb29nbGVQcml2YXRlJik7 CiAKICAgICAgICAgLy8gSW5pdGlhbGl6ZXMgdGhlIG9iamVjdC4gVGhpcyB3aWxsIGNhbGwgdGhy b3VnaCB0aGUgYmFja2VuZCBpbml0aWFsaXplcgogICAgICAgICAvLyBiZWxvdy4KQEAgLTk0LDcg Kzk3LDEwIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX3Byb3RvY29sSXNJ bkhUVFBGYW1pbHk7CiAgICAgICAgIHVybF9wYXJzZTo6UGFyc2VkIG1fcGFyc2VkOyAvLyBJbmRl eGVzIGludG8gdGhlIFVURi04IHZlcnNpb24gb2YgdGhlIHN0cmluZy4KIAorICAgICAgICBLVVJM KiBpbm5lclVSTCgpIGNvbnN0IHsgcmV0dXJuIG1faW5uZXJVUkwuZ2V0KCk7IH0KKwogICAgIHBy aXZhdGU6CisgICAgICAgIHZvaWQgaW5pdElubmVyVVJMKCk7CiAgICAgICAgIHZvaWQgaW5pdFBy b3RvY29sSXNJbkhUVFBGYW1pbHkoKTsKIAogICAgICAgICBDU3RyaW5nIG1fdXRmODsKQEAgLTEw Nyw2ICsxMTMsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKICAgICAgICAgbXV0YWJsZSBib29s IG1fc3RyaW5nSXNWYWxpZDsKICAgICAgICAgbXV0YWJsZSBTdHJpbmcgbV9zdHJpbmc7CisKKyAg ICAgICAgT3duUHRyPEtVUkw+IG1faW5uZXJVUkw7CiAgICAgfTsKIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQo= 123998 2012-01-25 13:28:07 -0800 2012-01-25 14:43:36 -0800 Patch bug-75049-20120125132806.patch text/plain 10406 ericu U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWE0MjNhZDgyNDk3NTdl YjhlZGQwMjgzNWYzNzIyZGUyNGU1Nzk4Mi4uMTI3MjU4ODIxZDk0ZDA4ZWQ5YTlkNDEwNmJmYzg2 NGUwMzcxYzhlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQxIEBACisyMDEyLTAxLTI1ICBFcmlj IFVocmhhbmUgIDxlcmljdUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgQWRkIGZ1bGwgc3VwcG9y dCBmb3IgZmlsZXN5c3RlbSBVUkxzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NzUwNDkKKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgor CisgICAgICAgIE5vIG5ldyB0ZXN0czsgZXhpc3RpbmcgbGF5b3V0IHRlc3RzIGNvdmVyIHRoZSBi YXNpYyBmdW5jdGlvbmFsaXR5LCBhbmQKKyAgICAgICAgdGhlIG5ldyBmdW5jdGlvbmFsaXR5IHdv bid0IGJlIHRoZXJlIHVudGlsIENocm9taXVtIGFkZHMgaXQuICBUaGlzIHBhdGNoCisgICAgICAg IG1lcmVseSBlbmFibGVzIHRoYXQsIHdpdGhvdXQgY2hhbmdpbmcgYmVoYXZpb3IuCisKKyAgICAg ICAgKiBmaWxlYXBpL0VudHJ5QmFzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpFbnRyeUJhc2U6 OnRvVVJMKTogQWRkIG1pc3NpbmcgZXNjYXBpbmcgb2YgVVJMIHBhdGguCisKKyAgICAgICAgKiBw YWdlL1NlY3VyaXR5T3JpZ2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmV4dHJhY3RJbm5lclVS TCk6IFVzZSBpbm5lclVSTCBtZW1iZXIsIGlmIGl0J3MgcG9wdWxhdGVkLgorCisgICAgICAgICog cGxhdGZvcm0vS1VSTC5oOgorICAgICAgICAoV2ViQ29yZTo6S1VSTDo6aW5uZXJVUkwpOiBBZGQg aW5uZXJVUkwgbWVtYmVyLgorCisgICAgICAgICogcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6S1VSTEdvb2dsZVByaXZhdGUpOgor ICAgICAgICAoV2ViQ29yZTo6S1VSTEdvb2dsZVByaXZhdGU6Om9wZXJhdG9yPSk6CisgICAgICAg IEFkZCBjb3B5IGNvbnN0cnVjdG9yIGFuZCBvcGVyYXRvcj0sIHdoaWNoIGFyZSBub3cgbmVlZGVk IHNpbmNlCisgICAgICAgIG1faW5uZXJVUkwgbmVlZHMgc3BlY2lhbCBoYW5kbGluZy4KKyAgICAg ICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjpzZXRVdGY4KToKKyAgICAgICAgKFdlYkNv cmU6OktVUkxHb29nbGVQcml2YXRlOjpzZXRBc2NpaSk6CisgICAgICAgIEFkZCBjYWxscyB0byBp bml0SW5uZXJVUkwuCisgICAgICAgIChXZWJDb3JlOjpLVVJMR29vZ2xlUHJpdmF0ZTo6aW5pdElu bmVyVVJMKToKKyAgICAgICAgQWRkIG1ldGhvZCB0byBpbml0L2NvcHkgbV9pbm5lclVSTC4KKyAg ICAgICAgKFdlYkNvcmU6OktVUkxHb29nbGVQcml2YXRlOjpjb3B5VG8pOgorICAgICAgICBIYW5k bGUgbV9pbm5lclVSTCBkdXJpbmcgY29waWVzLgorICAgICAgICAoV2ViQ29yZTo6ZW5jb2RlV2l0 aFVSTEVzY2FwZVNlcXVlbmNlcyk6CisgICAgICAgIFVuZXNjYXBlICUyRiBbJy8nXSBpbiBwYXRo czsgaXQncyBtdWNoIG1vcmUgcmVhZGFibGUsIGFuZCBpdCdzIHNhZmUuCisKKyAgICAgICAgKiBw bGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6S1VSTEdvb2ds ZVByaXZhdGU6OmlubmVyVVJMKTogQWRkIGFjY2Vzc29yIGZvciBuZXcgbV9pbm5lclVSTC4KKwog MjAxMi0wMS0yNSAgWW9uZyBMaSAgPHlvbGlAcmltLmNvbT4KIAogICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjUzNzcKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VM b2cKaW5kZXggNmRjMDBjZDliM2IzODA4OWRjNTE1OTNlZjY1Njc0OWU0YmNhODE0NC4uOWE4ODY3 YTdjNDEyZjJkYWY1Y2M4ZjYxMzllNTgyZGE5YmJiNjMzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wMS0yNSAgRXJpYyBVaHJoYW5lICA8ZXJpY3VA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIEFkZCBmdWxsIHN1cHBvcnQgZm9yIGZpbGVzeXN0ZW0g VVJMcy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1 MDQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAgICBObyBuZXcg dGVzdHM7IGV4aXN0aW5nIGxheW91dCB0ZXN0cyBjb3ZlciB0aGUgYmFzaWMgZnVuY3Rpb25hbGl0 eSwgYW5kCisgICAgICAgIHRoZSBuZXcgZnVuY3Rpb25hbGl0eSB3b24ndCBiZSB0aGVyZSB1bnRp bCBDaHJvbWl1bSBhZGRzIGl0LiAgVGhpcyBwYXRjaAorICAgICAgICBtZXJlbHkgZW5hYmxlcyB0 aGF0LCB3aXRob3V0IGNoYW5naW5nIGJlaGF2aW9yLgorCisgICAgICAgICogdGVzdHMvS1VSTFRl c3QuY3BwOgorICAgICAgICBURVNUKEtVUkxUZXN0LCBFbmNvZGUpOiBVcGRhdGUgZXhwZWN0YXRp b24gdGhhdCAnLycgc2FpbHMgdGhyb3VnaCB1bmVzY2FwZWQuCisgICAgICAgIAogMjAxMi0wMS0y NCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJl dmlld2VkIGNocm9taXVtIHRlc3QgZml4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZmls ZWFwaS9FbnRyeUJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9FbnRyeUJhc2UuY3Bw CmluZGV4IDM5NDUzZjYxYzYxYzBjODViZjJkY2UyZmVhYWZmZDg2ZTRmYTMzOGEuLjUzZjYyZTc4 M2JhZjE0NWZhY2I4NGZiYjZhZjU4OWExMjE3NTJhMzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2ZpbGVhcGkvRW50cnlCYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0Vu dHJ5QmFzZS5jcHAKQEAgLTc1LDcgKzc1LDcgQEAgU3RyaW5nIEVudHJ5QmFzZTo6dG9VUkwoKQog ICAgICAgICByZXN1bHQuYXBwZW5kKERPTUZpbGVTeXN0ZW1CYXNlOjprRXh0ZXJuYWxQYXRoUHJl Zml4KTsKICAgICAgICAgYnJlYWs7CiAgICAgfQotICAgIHJlc3VsdC5hcHBlbmQobV9mdWxsUGF0 aCk7CisgICAgcmVzdWx0LmFwcGVuZChlbmNvZGVXaXRoVVJMRXNjYXBlU2VxdWVuY2VzKG1fZnVs bFBhdGgpKTsKICAgICByZXR1cm4gcmVzdWx0LnRvU3RyaW5nKCk7CiB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwIGIvU291cmNlL1dlYkNvcmUv cGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKaW5kZXggNDQzNjY5NGZjNjAxNGNhNzNmNGVkMTk1MGVh OGJiYzJhZTE3NjZlOS4uMThlNGZhMmY3MWUwMDcxNzZlNTEzMWIyMGRiNzY0ZGNmYTFjNTE3MCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAKQEAgLTgyLDYgKzgyLDggQEAg c3RhdGljIGJvb2wgc2hvdWxkVXNlSW5uZXJVUkwoY29uc3QgS1VSTCYgdXJsKQogLy8gc2VjdXJp dHkgb3JpZ2luIGNhbiBiZSBwYXJzZWQgdXNpbmcgdGhpcyBhbGdvcml0aG0uCiBzdGF0aWMgS1VS TCBleHRyYWN0SW5uZXJVUkwoY29uc3QgS1VSTCYgdXJsKQogeworICAgIGlmICh1cmwuaW5uZXJV UkwoKSkKKyAgICAgICAgcmV0dXJuICp1cmwuaW5uZXJVUkwoKTsKICAgICAvLyBGSVhNRTogVXBk YXRlIHRoaXMgY2FsbHNpdGUgdG8gdXNlIHRoZSBpbm5lclVSTCBtZW1iZXIgZnVuY3Rpb24gd2hl bgogICAgIC8vIHdlIGZpbmlzaCBpbXBsZW1lbnRpbmcgaXQuCiAgICAgcmV0dXJuIEtVUkwoUGFy c2VkVVJMU3RyaW5nLCBkZWNvZGVVUkxFc2NhcGVTZXF1ZW5jZXModXJsLnBhdGgoKSkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vS1VSTC5oCmluZGV4IDhkZWM4MWY3MDMyMTM5NmNlNmQ4YzFiMDFmMThkM2M5ZDNh M2Y5ZmEuLjNiNTQwZWI1MTIyZjgxYjRiNjA1N2FkYTg4YTgwMmI5M2U3OGE0YjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9LVVJMLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNpZm5kZWYgS1VSTF9oCiAjZGVmaW5l IEtVUkxfaAogCisjaW5jbHVkZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQbGF0Zm9y bVN0cmluZy5oIgogI2luY2x1ZGUgIlVSTFN0cmluZy5oIgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFw Lmg+CkBAIC0yMTgsNiArMjE5LDEzIEBAIHB1YmxpYzoKICAgICBjb25zdCBDU3RyaW5nJiB1dGY4 U3RyaW5nKCkgY29uc3QgeyByZXR1cm4gbV91cmwudXRmOFN0cmluZygpOyB9CiAjZW5kaWYKIAor CisjaWYgVVNFKEdPT0dMRVVSTCkKKyAgICBjb25zdCBLVVJMKiBpbm5lclVSTCgpIGNvbnN0IHsg cmV0dXJuIG1fdXJsLmlubmVyVVJMKCk7IH0KKyNlbHNlCisgICAgY29uc3QgS1VSTCogaW5uZXJV UkwoKSBjb25zdCB7IG5vdEltcGxlbWVudGVkKCk7IHJldHVybiAwOyB9CisjZW5kaWYKKwogI2lm bmRlZiBOREVCVUcKICAgICB2b2lkIHByaW50KCkgY29uc3Q7CiAjZW5kaWYKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkxHb29nbGUuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKaW5kZXggNmJmOWZjY2IxZTlmZTE5MmU4ZGM1YjMwMjk1 OGNkZjExZjQ3OTI0Yy4uMDUwN2EyNDEyNjdkZWU0OWU2ZTExMTMwMWM0MDJmMTkwZjQ5YzU3ZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZS5jcHAKQEAgLTE3NCw2ICsxNzQsMzUg QEAgS1VSTEdvb2dsZVByaXZhdGU6OktVUkxHb29nbGVQcml2YXRlKFdURjo6SGFzaFRhYmxlRGVs ZXRlZFZhbHVlVHlwZSkKIHsKIH0KICAKK0tVUkxHb29nbGVQcml2YXRlOjpLVVJMR29vZ2xlUHJp dmF0ZShjb25zdCBLVVJMR29vZ2xlUHJpdmF0ZSYgbykKKyAgICA6IG1faXNWYWxpZChvLm1faXNW YWxpZCkKKyAgICAsIG1fcHJvdG9jb2xJc0luSFRUUEZhbWlseShvLm1fcHJvdG9jb2xJc0luSFRU UEZhbWlseSkKKyAgICAsIG1fcGFyc2VkKG8ubV9wYXJzZWQpCisgICAgLCBtX3V0Zjgoby5tX3V0 ZjgpCisgICAgLCBtX3V0ZjhJc0FTQ0lJKG8ubV91dGY4SXNBU0NJSSkKKyAgICAsIG1fc3RyaW5n SXNWYWxpZChvLm1fc3RyaW5nSXNWYWxpZCkKKyAgICAsIG1fc3RyaW5nKG8ubV9zdHJpbmcpCit7 CisgICAgaWYgKG8ubV9pbm5lclVSTC5nZXQoKSkKKyAgICAgICAgbV9pbm5lclVSTCA9IGFkb3B0 UHRyKG5ldyBLVVJMKG8ubV9pbm5lclVSTC0+Y29weSgpKSk7Cit9CisKK0tVUkxHb29nbGVQcml2 YXRlJiBLVVJMR29vZ2xlUHJpdmF0ZTo6b3BlcmF0b3I9KGNvbnN0IEtVUkxHb29nbGVQcml2YXRl JiBvKQoreworICAgIG1faXNWYWxpZCA9IG8ubV9pc1ZhbGlkOworICAgIG1fcHJvdG9jb2xJc0lu SFRUUEZhbWlseSA9IG8ubV9wcm90b2NvbElzSW5IVFRQRmFtaWx5OworICAgIG1fcGFyc2VkID0g by5tX3BhcnNlZDsKKyAgICBtX3V0ZjggPSBvLm1fdXRmODsKKyAgICBtX3V0ZjhJc0FTQ0lJID0g by5tX3V0ZjhJc0FTQ0lJOworICAgIG1fc3RyaW5nSXNWYWxpZCA9IG8ubV9zdHJpbmdJc1ZhbGlk OworICAgIG1fc3RyaW5nID0gby5tX3N0cmluZzsKKyAgICBpZiAoby5tX2lubmVyVVJMLmdldCgp KQorICAgICAgICBtX2lubmVyVVJMID0gYWRvcHRQdHIobmV3IEtVUkwoby5tX2lubmVyVVJMLT5j b3B5KCkpKTsKKyAgICBlbHNlCisgICAgICAgIG1faW5uZXJVUkwuY2xlYXIoKTsKKyAgICByZXR1 cm4gKnRoaXM7Cit9CisKIC8vIFNldHRlcnMgZm9yIHRoZSBkYXRhLiBVc2luZyB0aGUgQVNDSUkg dmVyc2lvbiB3aGVuIHlvdSBrbm93IHRoZQogLy8gZGF0YSBpcyBBU0NJSSB3aWxsIGJlIHNsaWdo dGx5IG1vcmUgZWZmaWNpZW50LiBUaGUgVVRGLTggdmVyc2lvbgogLy8gd2lsbCBhbHdheXMgYmUg Y29ycmVjdCBpZiB0aGUgY2FsbGVyIGlzIHVuc3VyZS4KQEAgLTE5Nyw2ICsyMjYsNyBAQCB2b2lk IEtVUkxHb29nbGVQcml2YXRlOjpzZXRVdGY4KGNvbnN0IENTdHJpbmcmIHN0cikKICAgICBtX3V0 ZjggPSBzdHI7CiAgICAgbV9zdHJpbmdJc1ZhbGlkID0gZmFsc2U7CiAgICAgaW5pdFByb3RvY29s SXNJbkhUVFBGYW1pbHkoKTsKKyAgICBpbml0SW5uZXJVUkwoKTsKIH0KIAogdm9pZCBLVVJMR29v Z2xlUHJpdmF0ZTo6c2V0QXNjaWkoY29uc3QgQ1N0cmluZyYgc3RyKQpAQCAtMjA1LDYgKzIzNSw3 IEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OnNldEFzY2lpKGNvbnN0IENTdHJpbmcmIHN0cikK ICAgICBtX3V0ZjhJc0FTQ0lJID0gdHJ1ZTsKICAgICBtX3N0cmluZ0lzVmFsaWQgPSBmYWxzZTsK ICAgICBpbml0UHJvdG9jb2xJc0luSFRUUEZhbWlseSgpOworICAgIGluaXRJbm5lclVSTCgpOwog fQogCiB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjppbml0KGNvbnN0IEtVUkwmIGJhc2UsCkBAIC0y NTgsNiArMjg5LDIxIEBAIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6OmluaXQoY29uc3QgS1VSTCYg YmFzZSwgY29uc3QgQ0hBUiogcmVsLCBpbnQgcmVsTGVuZ3RoLAogICAgIH0KIH0KIAordm9pZCBL VVJMR29vZ2xlUHJpdmF0ZTo6aW5pdElubmVyVVJMKCkKK3sKKyAgICBpZiAoIW1faXNWYWxpZCkg eworICAgICAgICBtX2lubmVyVVJMLmNsZWFyKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9Cisg ICAgdXJsX3BhcnNlOjpQYXJzZWQqIGlubmVyUGFyc2VkID0gbV9wYXJzZWQuaW5uZXJfcGFyc2Vk KCk7CisgICAgaWYgKGlubmVyUGFyc2VkKQorICAgICAgICBtX2lubmVyVVJMID0gYWRvcHRQdHIo bmV3IEtVUkwoCisgICAgICAgICAgICBQYXJzZWRVUkxTdHJpbmcsCisgICAgICAgICAgICBTdHJp bmcobV91dGY4LmRhdGEoKSArIGlubmVyUGFyc2VkLT5zY2hlbWUuYmVnaW4sIGlubmVyUGFyc2Vk LT5MZW5ndGgoKSAtIGlubmVyUGFyc2VkLT5zY2hlbWUuYmVnaW4pKSk7CisgICAgZWxzZQorICAg ICAgICBtX2lubmVyVVJMLmNsZWFyKCk7Cit9CisKIHZvaWQgS1VSTEdvb2dsZVByaXZhdGU6Omlu aXRQcm90b2NvbElzSW5IVFRQRmFtaWx5KCkKIHsKICAgICBpZiAoIW1faXNWYWxpZCkgewpAQCAt Mjg1LDYgKzMzMSwxMCBAQCB2b2lkIEtVUkxHb29nbGVQcml2YXRlOjpjb3B5VG8oS1VSTEdvb2ds ZVByaXZhdGUqIGRlc3QpIGNvbnN0CiAgICAgZGVzdC0+bV91dGY4SXNBU0NJSSA9IG1fdXRmOElz QVNDSUk7CiAgICAgZGVzdC0+bV9zdHJpbmdJc1ZhbGlkID0gZmFsc2U7CiAgICAgZGVzdC0+bV9z dHJpbmcgPSBTdHJpbmcoKTsgLy8gQ2xlYXIgdGhlIGludmFsaWQgc3RyaW5nIHRvIGF2b2lkIGNy b3NzIHRocmVhZCByZWYgY291bnRpbmcuCisgICAgaWYgKG1faW5uZXJVUkwpCisgICAgICAgIGRl c3QtPm1faW5uZXJVUkwgPSBhZG9wdFB0cihuZXcgS1VSTChtX2lubmVyVVJMLT5jb3B5KCkpKTsK KyAgICBlbHNlCisgICAgICAgIGRlc3QtPm1faW5uZXJVUkwuY2xlYXIoKTsKIH0KIAogU3RyaW5n IEtVUkxHb29nbGVQcml2YXRlOjpjb21wb25lbnRTdHJpbmcoY29uc3QgdXJsX3BhcnNlOjpDb21w b25lbnQmIGNvbXApIGNvbnN0CkBAIC04MjcsNyArODc3LDEwIEBAIFN0cmluZyBlbmNvZGVXaXRo VVJMRXNjYXBlU2VxdWVuY2VzKGNvbnN0IFN0cmluZyYgbm90RW5jb2RlZFN0cmluZykKICAgICAg ICAgYnVmZmVyLlJlc2l6ZShpbnB1dExlbmd0aCAqIDMpOwogCiAgICAgdXJsX3V0aWw6OkVuY29k ZVVSSUNvbXBvbmVudChpbnB1dCwgaW5wdXRMZW5ndGgsICZidWZmZXIpOwotICAgIHJldHVybiBT dHJpbmcoYnVmZmVyLmRhdGEoKSwgYnVmZmVyLmxlbmd0aCgpKTsKKyAgICBTdHJpbmcgZXNjYXBl ZChidWZmZXIuZGF0YSgpLCBidWZmZXIubGVuZ3RoKCkpOworICAgIC8vIFVuZXNjYXBlICcvJzsg aXQncyBzYWZlIGFuZCBtdWNoIHByZXR0aWVyLgorICAgIGVzY2FwZWQucmVwbGFjZSgiJTJGIiwg Ii8iKTsKKyAgICByZXR1cm4gZXNjYXBlZDsKIH0KIAogYm9vbCBLVVJMOjppc0hpZXJhcmNoaWNh bCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMR29vZ2xl UHJpdmF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTEdvb2dsZVByaXZhdGUuaApp bmRleCAzMWVmZDY0ZWVjZmQ3OGY2OWI2ZDU4NTM2YzcyYmMyYmY3NzFjNGFiLi4zNzRkMGQ3MjYx NWQ2Y2I3NmNhNTBjZmNmMjc5MDE4YzQ1ZTgxYmUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9LVVJMR29vZ2xlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL0tVUkxHb29nbGVQcml2YXRlLmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpZm5kZWYgS1VSTEdv b2dsZVByaXZhdGVfaAogI2RlZmluZSBLVVJMR29vZ2xlUHJpdmF0ZV9oCiAKKyNpbmNsdWRlIDx3 dGYvT3duUHRyLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCiAjaW5jbHVkZSA8 Z29vZ2xldXJsL3NyYy91cmxfcGFyc2UuaD4KQEAgLTQ5LDYgKzUwLDggQEAgbmFtZXNwYWNlIFdl YkNvcmUgewogICAgICAgICBLVVJMR29vZ2xlUHJpdmF0ZSgpOwogICAgICAgICBLVVJMR29vZ2xl UHJpdmF0ZShjb25zdCB1cmxfcGFyc2U6OlBhcnNlZCYsIGJvb2wgaXNWYWxpZCk7CiAgICAgICAg IEtVUkxHb29nbGVQcml2YXRlKFdURjo6SGFzaFRhYmxlRGVsZXRlZFZhbHVlVHlwZSk7CisgICAg ICAgIEtVUkxHb29nbGVQcml2YXRlKGNvbnN0IEtVUkxHb29nbGVQcml2YXRlJik7CisgICAgICAg IEtVUkxHb29nbGVQcml2YXRlJiBvcGVyYXRvcj0oY29uc3QgS1VSTEdvb2dsZVByaXZhdGUmKTsK IAogICAgICAgICAvLyBJbml0aWFsaXplcyB0aGUgb2JqZWN0LiBUaGlzIHdpbGwgY2FsbCB0aHJv dWdoIHRoZSBiYWNrZW5kIGluaXRpYWxpemVyCiAgICAgICAgIC8vIGJlbG93LgpAQCAtOTQsNyAr OTcsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBib29sIG1fcHJvdG9jb2xJc0lu SFRUUEZhbWlseTsKICAgICAgICAgdXJsX3BhcnNlOjpQYXJzZWQgbV9wYXJzZWQ7IC8vIEluZGV4 ZXMgaW50byB0aGUgVVRGLTggdmVyc2lvbiBvZiB0aGUgc3RyaW5nLgogCisgICAgICAgIEtVUkwq IGlubmVyVVJMKCkgY29uc3QgeyByZXR1cm4gbV9pbm5lclVSTC5nZXQoKTsgfQorCiAgICAgcHJp dmF0ZToKKyAgICAgICAgdm9pZCBpbml0SW5uZXJVUkwoKTsKICAgICAgICAgdm9pZCBpbml0UHJv dG9jb2xJc0luSFRUUEZhbWlseSgpOwogCiAgICAgICAgIENTdHJpbmcgbV91dGY4OwpAQCAtMTA3 LDYgKzExMyw4IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICBtdXRhYmxlIGJvb2wg bV9zdHJpbmdJc1ZhbGlkOwogICAgICAgICBtdXRhYmxlIFN0cmluZyBtX3N0cmluZzsKKworICAg ICAgICBPd25QdHI8S1VSTD4gbV9pbm5lclVSTDsKICAgICB9OwogCiB9IC8vIG5hbWVzcGFjZSBX ZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0tVUkxUZXN0 LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvS1VSTFRlc3QuY3BwCmluZGV4IGYy YWJkYTU2YjU1MGVjNjljZTg0NDdmOGRmZWY3Mzg3YmMwMzc1NzkuLjM5NGM2NjRiMTdlMTAwMzJh MGYyOGM3ZDc4NDg5ZjQ5MDZhNTU4ZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vdGVzdHMvS1VSTFRlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMv S1VSTFRlc3QuY3BwCkBAIC0zMTYsNyArMzE2LDcgQEAgVEVTVChLVVJMVGVzdCwgRW5jb2RlKQog ICAgICAgICB7Ilx4MTBceDExXHgxMlx4MTNceDE0XHgxNVx4MTZceDE3XHgxOFx4MTlceDFBXHgx Qlx4MUNceDFEXHgxRVx4MUYiLAogICAgICAgICAgICIlMTAlMTElMTIlMTMlMTQlMTUlMTYlMTcl MTglMTklMUElMUIlMUMlMUQlMUUlMUYifSwKICAgICAgICAgeyIgIVwiIyQlJicoKSorLC0uLyIs Ci0gICAgICAgICAgIiUyMCElMjIlMjMlMjQlMjUlMjYnKCkqJTJCJTJDLS4lMkYifSwKKyAgICAg ICAgICAiJTIwISUyMiUyMyUyNCUyNSUyNicoKSolMkIlMkMtLi8ifSwKICAgICAgICAgeyIwMTIz NDU2Nzg5Ojs8PT4/IiwKICAgICAgICAgICAiMDEyMzQ1Njc4OSUzQSUzQiUzQyUzRCUzRSUzRiJ9 LAogICAgICAgICB7IkBBQkNERUZHSElKS0xNTk8iLAo=