62221 2011-06-07 11:16:07 -0700 [Qt] Fix methods.html and methods-lower-case.html 2011-06-25 03:03:20 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 robert robert abarth kenneth luiz qi.2.zhang oldest_to_newest 416649 0 robert 2011-06-07 11:16:07 -0700 [Qt] Fix methods.html and methods-lower-case.html 416658 1 96265 robert 2011-06-07 11:27:13 -0700 Created attachment 96265 Patch 416668 2 96268 robert 2011-06-07 11:37:13 -0700 Created attachment 96268 Patch 416673 3 robert 2011-06-07 11:39:08 -0700 Fyi for the reviewer, this is how the Qt results for the unskipped methods-* tests compare to Mac: --- /tmp/layout-test-results/http/tests/xmlhttprequest/methods-expected.txt 2011-06-07 19:37:36.000000000 +0100 +++ /tmp/layout-test-results/http/tests/xmlhttprequest/methods-actual.txt 2011-06-07 19:37:36.000000000 +0100 @@ -4,17 +4,17 @@ GET(null): GET(null bytes), Content-Type: null GET("123"): GET(null bytes), Content-Type: null POST(""): POST(0 bytes), Content-Type: application/xml -POST(null): POST(0 bytes), Content-Type: null +POST(null): POST(0 bytes), Content-Type: application/octet-stream POST("123"): POST(3 bytes), Content-Type: application/xml PUT(""): PUT(0 bytes), Content-Type: application/xml PUT(null): PUT(0 bytes), Content-Type: null PUT("123"): PUT(3 bytes), Content-Type: application/xml -DELETE(""): DELETE(0 bytes), Content-Type: application/xml -DELETE(null): DELETE(0 bytes), Content-Type: null -DELETE("123"): DELETE(3 bytes), Content-Type: application/xml -HEAD(""): HEAD(0 bytes), Content-Type: null -HEAD(null): HEAD(0 bytes), Content-Type: null -HEAD("123"): HEAD(0 bytes), Content-Type: null +DELETE(""): DELETE(null bytes), Content-Type: null +DELETE(null): DELETE(null bytes), Content-Type: null +DELETE("123"): DELETE(null bytes), Content-Type: null +HEAD(""): HEAD(null bytes), Content-Type: null +HEAD(null): HEAD(null bytes), Content-Type: null +HEAD("123"): HEAD(null bytes), Content-Type: null WKFOOBAR(""): WKFOOBAR(0 bytes), Content-Type: application/xml WKFOOBAR(null): WKFOOBAR(0 bytes), Content-Type: null WKFOOBAR("123"): WKFOOBAR(3 bytes), Content-Type: application/xml The differences are described in the Changelog. This bug is a relative of https://bugs.webkit.org/show_bug.cgi?id=60440 so cc'ing Luiz and Adam. 417444 4 96268 luiz 2011-06-08 13:04:52 -0700 Comment on attachment 96268 Patch I am not an official reviewer but it LGTM. 418210 5 96268 kling 2011-06-09 13:10:14 -0700 Comment on attachment 96268 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=96268&action=review r=me > Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp:601 > +void QNetworkReplyHandler::clearContentsHeaders() clearContentHeaders() > Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp:603 > + // Clearing Contents-length and Contents-type of the requests that do not have contents. Content-length and Content-type > Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp:613 > + // We may be uploading files so prevent QNR from buffering data Period at end of Kenneth. 419288 6 robert 2011-06-12 04:52:35 -0700 Committed r88612: <http://trac.webkit.org/changeset/88612> 427346 7 robert 2011-06-25 03:03:20 -0700 *** Bug 60566 has been marked as a duplicate of this bug. *** 96265 2011-06-07 11:27:13 -0700 2011-06-07 11:37:07 -0700 Patch bug-62221-20110607192712.patch text/plain 9523 robert U3VidmVyc2lvbiBSZXZpc2lvbjogODgxNjgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzYzE2MjM5NzhjMWM1OWVhMzgzY2I4 MmZlZjk3MGJkMzg0YzkwNGEwLi43ODE4NzkzOTRjMzEyZDI0NzIyZmExZWY5NDU4ZDljOWIwMDU5 NjlkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMDcgIFJvYmVydCBIb2dhbiAgPHJv YmVydEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtRdF0gRml4IG1ldGhvZHMuaHRtbCBhbmQgbWV0aG9kcy1sb3dlci1jYXNlLmh0 bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMjIx CisKKyAgICAgICAgT3VyIGV4cGVjdGF0aW9ucyBmb3IgdGhpcyB0ZXN0IGhhdmUgdGhlIGZvbGxv d2luZyBkaWZmZXJlbmNlcyBmcm9tIHRoZSBtYWMKKyAgICAgICAgcGxhdGZvcm06CisgICAgICAg ICAgLSBQT1NUIHJlcXVlc3RzIHdpdGggbm8gZGF0YSBnZXQgYSBkZWZhdWx0IENvbnRlbnQtVHlw ZSBvZiAnYXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtJy4KKyAgICAgICAgICAgIFRoaXMgaXMgUXQt ZGVmaW5lZCBiZWhhdmlvdXIgaW4gUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyIChzZWUgUUh0dHBOZXR3 b3JrUmVxdWVzdFByaXZhdGU6OmhlYWRlcgorICAgICAgICAgICAgaW4gcWh0dHBuZXR3b3JrcmVx dWVzdC5jcHApCisgICAgICAgICAgLSBERUxFVEUgYW5kIEhFQUQgcmVxdWVzdHMgZ2V0IHRoZWly IENvbnRlbnRUeXBlIGFuZCBDb250ZW50TGVuZ3RoIGhlYWRlcnMgKGlmIHByZXNlbnQpIHJlbW92 ZWQKKyAgICAgICAgICAgIGJ5IFFOZXR3b3JrUmVwbHlIYW5kbGVyLiBRdFdlYktpdCBkb2VzIG5v dCBzZW5kIGRhdGEgZm9yIGVpdGhlciBvZiB0aGVzZSByZXF1ZXN0IHR5cGVzLgorICAgICAgICAq IHBsYXRmb3JtL3F0LWxpbnV4L2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvbWV0aG9kcy1leHBl Y3RlZC50eHQ6IEFkZGVkLgorCiAyMDExLTA2LTA2ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSA2IHRlc3RzIGhhdmUgZGlmZmVyZW50IHJlc3Vs dHMgb24gNjQgYml0IGNvbXBhcmVkIHRvIDMyIGJpdApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vcXQtbGludXgvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9tZXRob2RzLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0LWxpbnV4L2h0dHAvdGVzdHMveG1saHR0 cHJlcXVlc3QvbWV0aG9kcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXgg MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uY2FmM2Y2MjJhY2MzYzQy Mzk0Mjg0ZTkyMTFkMzliNWZiZDFkNDRkZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL3F0LWxpbnV4L2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvbWV0aG9kcy1leHBl Y3RlZC50eHQKQEAgLTAsMCArMSwyMyBAQAorVGVzdHMgZm9yIGJ1ZyAzODEyIC0gR0VUIGFuZCBQ T1NUIHNob3VsZCBub3QgYmUgdGhlIG9ubHkgSFRUUCBtZXRob2RzIGltcGxlbWVudGVkIGluIFhN TEh0dHBSZXF1ZXN0LgorCitHRVQoIiIpOiBHRVQobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTog bnVsbAorR0VUKG51bGwpOiBHRVQobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorR0VU KCIxMjMiKTogR0VUKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK1BPU1QoIiIpOiBQ T1NUKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorUE9TVChudWxsKTog UE9TVCgwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0KK1BP U1QoIjEyMyIpOiBQT1NUKDMgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAor UFVUKCIiKTogUFVUKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorUFVU KG51bGwpOiBQVVQoMCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorUFVUKCIxMjMiKTogUFVU KDMgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorREVMRVRFKCIiKTogREVM RVRFKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0RFTEVURShudWxsKTogREVMRVRF KG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0RFTEVURSgiMTIzIik6IERFTEVURShu dWxsIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitIRUFEKCIiKTogSEVBRChudWxsIGJ5dGVz KSwgQ29udGVudC1UeXBlOiBudWxsCitIRUFEKG51bGwpOiBIRUFEKG51bGwgYnl0ZXMpLCBDb250 ZW50LVR5cGU6IG51bGwKK0hFQUQoIjEyMyIpOiBIRUFEKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5 cGU6IG51bGwKK1dLRk9PQkFSKCIiKTogV0tGT09CQVIoMCBieXRlcyksIENvbnRlbnQtVHlwZTog YXBwbGljYXRpb24veG1sCitXS0ZPT0JBUihudWxsKTogV0tGT09CQVIoMCBieXRlcyksIENvbnRl bnQtVHlwZTogbnVsbAorV0tGT09CQVIoIjEyMyIpOiBXS0ZPT0JBUigzIGJ5dGVzKSwgQ29udGVu dC1UeXBlOiBhcHBsaWNhdGlvbi94bWwKK1NFQVJDSCgiIik6IFNFQVJDSCgwIGJ5dGVzKSwgQ29u dGVudC1UeXBlOiBhcHBsaWNhdGlvbi94bWwKK1NFQVJDSChudWxsKTogU0VBUkNIKDAgYnl0ZXMp LCBDb250ZW50LVR5cGU6IG51bGwKK1NFQVJDSCgiMTIzIik6IFNFQVJDSCgzIGJ5dGVzKSwgQ29u dGVudC1UeXBlOiBhcHBsaWNhdGlvbi94bWwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBmYTFkNDE0ZjgzNGI0ZmU0 ZjU5NzRlNzE5NGMwZjBjNmI3MDZmYzFkLi4wNTk5OGYwMmEzNTBjMTk5M2FiOWI1MzE4YjIwMzZm ZDU3YjU0MzFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDYtMDcgIFJvYmVy dCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IG1ldGhvZHMuaHRtbCBhbmQgbWV0aG9kcy1s b3dlci1jYXNlLmh0bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTYyMjIxCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVw bHlIYW5kbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpj bGVhckNvbnRlbnRzSGVhZGVycyk6IFJlZmFjdG9yIGNvZGUgZnJvbSBzZW5kTmV0d29ya1JlcXVl c3QKKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3b3JrUmVwbHlIYW5kbGVyOjpnZXRJT0RldmljZSk6 IGRpdHRvCisgICAgICAgIChXZWJDb3JlOjpRTmV0d29ya1JlcGx5SGFuZGxlcjo6c2VuZE5ldHdv cmtSZXF1ZXN0KToKKyAgICAgICAgICAgIC0gUmVtb3ZlIENvbnRlbnRUeXBlIGFuZCBDb250ZW50 TGVuZ3RoIGhlYWRlcnMgZnJvbSBHRVQsIERFTEVURSBhbmQgSEVBRCByZXF1ZXN0cyBzaW5jZQor ICAgICAgICAgICAgICB3ZSBkbyBub3Qgc2VuZCBkYXRhIHdpdGggYW55IG9mIHRoZXNlIHJlcXVl c3RzLgorICAgICAgICAgICAgLSBJZiBhIGN1c3RvbSBIVFRQIG9wZXJhdGlvbiBjb250YWlucyBk YXRhLCBzZW5kIGl0LgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBs eUhhbmRsZXIuaDoKKwogMjAxMS0wNi0wNiAgU3RldmUgQmxvY2sgIDxzdGV2ZWJsb2NrQGdvb2ds ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1pa2hhdHNreS4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5 SGFuZGxlci5jcHAKaW5kZXggNTlkMjI0NTU5NTM5MDljNzc1Nzg5ZmNhMGFlMWFjOTRiOGFiOTBl Ni4uMWMxODMxNzBhOWQ3MzU3ZDQ3NTFiNTNhY2Q5ODhhZGFhODMxMThlMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5 SGFuZGxlci5jcHAKQEAgLTU5OCw2ICs1OTgsMjQgQEAgdm9pZCBRTmV0d29ya1JlcGx5SGFuZGxl cjo6dXBsb2FkUHJvZ3Jlc3MocWludDY0IGJ5dGVzU2VudCwgcWludDY0IGJ5dGVzVG90YWwpCiAg ICAgY2xpZW50LT5kaWRTZW5kRGF0YShtX3Jlc291cmNlSGFuZGxlLCBieXRlc1NlbnQsIGJ5dGVz VG90YWwpOwogfQogCit2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpjbGVhckNvbnRlbnRzSGVh ZGVycygpCit7CisgICAgLy8gQ2xlYXJpbmcgQ29udGVudHMtbGVuZ3RoIGFuZCBDb250ZW50cy10 eXBlIG9mIHRoZSByZXF1ZXN0cyB0aGF0IGRvIG5vdCBoYXZlIGNvbnRlbnRzLgorICAgIC8vIFRo aXMgaXMgbmVjZXNzYXJ5IHRvIGVuc3VyZSBQT1NUIHJlcXVlc3RzIHJlZGlyZWN0ZWQgdG8gR0VU cyBkbyBub3QgbGVhayBtZXRhZGF0YQorICAgIC8vIGFib3V0IHRoZSBQT1NUIGNvbnRlbnQgdG8g dGhlIHNpdGUgdGhleSd2ZSBiZWVuIHJlZGlyZWN0ZWQgdG8uCisgICAgbV9yZXF1ZXN0LnNldEhl YWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRlbnRUeXBlSGVhZGVyLCBRVmFyaWFudCgpKTsKKyAg ICBtX3JlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudExlbmd0aEhlYWRl ciwgUVZhcmlhbnQoKSk7Cit9CisKK0Zvcm1EYXRhSU9EZXZpY2UqIFFOZXR3b3JrUmVwbHlIYW5k bGVyOjpnZXRJT0RldmljZShjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCit7CisgICAg Rm9ybURhdGFJT0RldmljZSogZGV2aWNlID0gbmV3IEZvcm1EYXRhSU9EZXZpY2UocmVxdWVzdC5o dHRwQm9keSgpKTsKKyAgICAvLyBXZSBtYXkgYmUgdXBsb2FkaW5nIGZpbGVzIHNvIHByZXZlbnQg UU5SIGZyb20gYnVmZmVyaW5nIGRhdGEKKyAgICBtX3JlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3Jr UmVxdWVzdDo6Q29udGVudExlbmd0aEhlYWRlciwgZGV2aWNlLT5nZXRGb3JtRGF0YVNpemUoKSk7 CisgICAgbV9yZXF1ZXN0LnNldEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OkRvTm90QnVmZmVy VXBsb2FkRGF0YUF0dHJpYnV0ZSwgUVZhcmlhbnQodHJ1ZSkpOworICAgIHJldHVybiBkZXZpY2U7 Cit9CisKIFFOZXR3b3JrUmVwbHkqIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjpzZW5kTmV0d29ya1Jl cXVlc3QoUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKiBtYW5hZ2VyLCBjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QpCiB7CiAgICAgaWYgKG1fbG9hZFR5cGUgPT0gU3luY2hyb25vdXNMb2FkKQpA QCAtNjE1LDQwICs2MzMsMzUgQEAgUU5ldHdvcmtSZXBseSogUU5ldHdvcmtSZXBseUhhbmRsZXI6 OnNlbmROZXR3b3JrUmVxdWVzdChRTmV0d29ya0FjY2Vzc01hbmFnZXIqIG0KICAgICAgICAgJiYg KCF1cmwudG9Mb2NhbEZpbGUoKS5pc0VtcHR5KCkgfHwgdXJsLnNjaGVtZSgpID09IFFMYXRpbjFT dHJpbmcoImRhdGEiKSkpCiAgICAgICAgIG1fbWV0aG9kID0gUU5ldHdvcmtBY2Nlc3NNYW5hZ2Vy OjpHZXRPcGVyYXRpb247CiAKLSAgICBpZiAobV9tZXRob2QgIT0gUU5ldHdvcmtBY2Nlc3NNYW5h Z2VyOjpQb3N0T3BlcmF0aW9uICYmIG1fbWV0aG9kICE9IFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6 UHV0T3BlcmF0aW9uKSB7Ci0gICAgICAgIC8vIGNsZWFyaW5nIENvbnRlbnRzLWxlbmd0aCBhbmQg Q29udGVudHMtdHlwZSBvZiB0aGUgcmVxdWVzdHMgdGhhdCBkbyBub3QgaGF2ZSBjb250ZW50cy4K LSAgICAgICAgbV9yZXF1ZXN0LnNldEhlYWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRlbnRUeXBl SGVhZGVyLCBRVmFyaWFudCgpKTsKLSAgICAgICAgbV9yZXF1ZXN0LnNldEhlYWRlcihRTmV0d29y a1JlcXVlc3Q6OkNvbnRlbnRMZW5ndGhIZWFkZXIsIFFWYXJpYW50KCkpOwotICAgIH0KLQogICAg IHN3aXRjaCAobV9tZXRob2QpIHsKICAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6 OkdldE9wZXJhdGlvbjoKKyAgICAgICAgICAgIGNsZWFyQ29udGVudHNIZWFkZXJzKCk7CiAgICAg ICAgICAgICByZXR1cm4gbWFuYWdlci0+Z2V0KG1fcmVxdWVzdCk7CiAgICAgICAgIGNhc2UgUU5l dHdvcmtBY2Nlc3NNYW5hZ2VyOjpQb3N0T3BlcmF0aW9uOiB7Ci0gICAgICAgICAgICBGb3JtRGF0 YUlPRGV2aWNlKiBwb3N0RGV2aWNlID0gbmV3IEZvcm1EYXRhSU9EZXZpY2UocmVxdWVzdC5odHRw Qm9keSgpKTsKLSAgICAgICAgICAgIC8vIFdlIG1heSBiZSB1cGxvYWRpbmcgZmlsZXMgc28gcHJl dmVudCBRTlIgZnJvbSBidWZmZXJpbmcgZGF0YQotICAgICAgICAgICAgbV9yZXF1ZXN0LnNldEhl YWRlcihRTmV0d29ya1JlcXVlc3Q6OkNvbnRlbnRMZW5ndGhIZWFkZXIsIHBvc3REZXZpY2UtPmdl dEZvcm1EYXRhU2l6ZSgpKTsKLSAgICAgICAgICAgIG1fcmVxdWVzdC5zZXRBdHRyaWJ1dGUoUU5l dHdvcmtSZXF1ZXN0OjpEb05vdEJ1ZmZlclVwbG9hZERhdGFBdHRyaWJ1dGUsIFFWYXJpYW50KHRy dWUpKTsKKyAgICAgICAgICAgIEZvcm1EYXRhSU9EZXZpY2UqIHBvc3REZXZpY2UgPSBnZXRJT0Rl dmljZShyZXF1ZXN0KTsKICAgICAgICAgICAgIFFOZXR3b3JrUmVwbHkqIHJlc3VsdCA9IG1hbmFn ZXItPnBvc3QobV9yZXF1ZXN0LCBwb3N0RGV2aWNlKTsKICAgICAgICAgICAgIHBvc3REZXZpY2Ut PnNldFBhcmVudChyZXN1bHQpOwogICAgICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAg fQogICAgICAgICBjYXNlIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6SGVhZE9wZXJhdGlvbjoKKyAg ICAgICAgICAgIGNsZWFyQ29udGVudHNIZWFkZXJzKCk7CiAgICAgICAgICAgICByZXR1cm4gbWFu YWdlci0+aGVhZChtX3JlcXVlc3QpOwogICAgICAgICBjYXNlIFFOZXR3b3JrQWNjZXNzTWFuYWdl cjo6UHV0T3BlcmF0aW9uOiB7Ci0gICAgICAgICAgICBGb3JtRGF0YUlPRGV2aWNlKiBwdXREZXZp Y2UgPSBuZXcgRm9ybURhdGFJT0RldmljZShyZXF1ZXN0Lmh0dHBCb2R5KCkpOwotICAgICAgICAg ICAgLy8gV2UgbWF5IGJlIHVwbG9hZGluZyBmaWxlcyBzbyBwcmV2ZW50IFFOUiBmcm9tIGJ1ZmZl cmluZyBkYXRhCi0gICAgICAgICAgICBtX3JlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVz dDo6Q29udGVudExlbmd0aEhlYWRlciwgcHV0RGV2aWNlLT5nZXRGb3JtRGF0YVNpemUoKSk7Ci0g ICAgICAgICAgICBtX3JlcXVlc3Quc2V0QXR0cmlidXRlKFFOZXR3b3JrUmVxdWVzdDo6RG9Ob3RC dWZmZXJVcGxvYWREYXRhQXR0cmlidXRlLCBRVmFyaWFudCh0cnVlKSk7CisgICAgICAgICAgICBG b3JtRGF0YUlPRGV2aWNlKiBwdXREZXZpY2UgPSBnZXRJT0RldmljZShyZXF1ZXN0KTsKICAgICAg ICAgICAgIFFOZXR3b3JrUmVwbHkqIHJlc3VsdCA9IG1hbmFnZXItPnB1dChtX3JlcXVlc3QsIHB1 dERldmljZSk7CiAgICAgICAgICAgICBwdXREZXZpY2UtPnNldFBhcmVudChyZXN1bHQpOwogICAg ICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICAgICAgfQogICAgICAgICBjYXNlIFFOZXR3b3Jr QWNjZXNzTWFuYWdlcjo6RGVsZXRlT3BlcmF0aW9uOiB7CisgICAgICAgICAgICBjbGVhckNvbnRl bnRzSGVhZGVycygpOwogICAgICAgICAgICAgcmV0dXJuIG1hbmFnZXItPmRlbGV0ZVJlc291cmNl KG1fcmVxdWVzdCk7CiAgICAgICAgIH0KLSAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFn ZXI6OkN1c3RvbU9wZXJhdGlvbjoKLSAgICAgICAgICAgIHJldHVybiBtYW5hZ2VyLT5zZW5kQ3Vz dG9tUmVxdWVzdChtX3JlcXVlc3QsIG1fcmVzb3VyY2VIYW5kbGUtPmZpcnN0UmVxdWVzdCgpLmh0 dHBNZXRob2QoKS5sYXRpbjEoKS5kYXRhKCkpOworICAgICAgICBjYXNlIFFOZXR3b3JrQWNjZXNz TWFuYWdlcjo6Q3VzdG9tT3BlcmF0aW9uOiB7CisgICAgICAgICAgICBGb3JtRGF0YUlPRGV2aWNl KiBjdXN0b21EZXZpY2UgPSBnZXRJT0RldmljZShyZXF1ZXN0KTsKKyAgICAgICAgICAgIFFOZXR3 b3JrUmVwbHkqIHJlc3VsdCA9IG1hbmFnZXItPnNlbmRDdXN0b21SZXF1ZXN0KG1fcmVxdWVzdCwg bV9yZXNvdXJjZUhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCkuaHR0cE1ldGhvZCgpLmxhdGluMSgpLmRh dGEoKSwgY3VzdG9tRGV2aWNlKTsKKyAgICAgICAgICAgIGN1c3RvbURldmljZS0+c2V0UGFyZW50 KHJlc3VsdCk7CisgICAgICAgICAgICByZXR1cm4gcmVzdWx0OworICAgICAgICB9CiAgICAgICAg IGNhc2UgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpVbmtub3duT3BlcmF0aW9uOgogICAgICAgICAg ICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgICAgICByZXR1cm4gMDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRs ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhh bmRsZXIuaAppbmRleCBkZWZlZWM0ODY1M2QyODQ3Yjc1YjY3MDg5ZTllMjFhNjMwNTE4NGE5Li43 YzEzNGZlYmQ0ZjEyOGUwZGJmMmY0YTIzODhmNDRhNjA1ODJmYzcwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxl ci5oCkBAIC0zNSw2ICszNSw3IEBAIFFUX0VORF9OQU1FU1BBQ0UKIAogbmFtZXNwYWNlIFdlYkNv cmUgewogCitjbGFzcyBGb3JtRGF0YUlPRGV2aWNlOwogY2xhc3MgUmVzb3VyY2VIYW5kbGU7CiBj bGFzcyBSZXNvdXJjZVJlcXVlc3Q7CiBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwpAQCAtMTQwLDYg KzE0MSw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCByZWRpcmVjdChSZXNvdXJjZVJlc3BvbnNlJiwg Y29uc3QgUVVybCYpOwogICAgIGJvb2wgd2FzQWJvcnRlZCgpIGNvbnN0IHsgcmV0dXJuICFtX3Jl c291cmNlSGFuZGxlOyB9CiAgICAgUU5ldHdvcmtSZXBseSogc2VuZE5ldHdvcmtSZXF1ZXN0KFFO ZXR3b3JrQWNjZXNzTWFuYWdlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOworICAgIEZvcm1E YXRhSU9EZXZpY2UqIGdldElPRGV2aWNlKGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOworICAgIHZv aWQgY2xlYXJDb250ZW50c0hlYWRlcnMoKTsKIAogICAgIE93blB0cjxRTmV0d29ya1JlcGx5V3Jh cHBlcj4gbV9yZXBseVdyYXBwZXI7CiAgICAgUmVzb3VyY2VIYW5kbGUqIG1fcmVzb3VyY2VIYW5k bGU7Cg== 96268 2011-06-07 11:37:13 -0700 2011-06-09 13:10:14 -0700 Patch bug-62221-20110607193712.patch text/plain 16275 robert U3VidmVyc2lvbiBSZXZpc2lvbjogODgxNjgKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAzYzE2MjM5NzhjMWM1OWVhMzgzY2I4 MmZlZjk3MGJkMzg0YzkwNGEwLi4wMjdmODc1MmJiN2I5YzFhMzQyMjNlZGUyMGE4OWE4OGQ1MDlk NGVhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDYtMDcgIFJvYmVydCBIb2dhbiAgPHJv YmVydEB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFtRdF0gRml4IG1ldGhvZHMuaHRtbCBhbmQgbWV0aG9kcy1sb3dlci1jYXNlLmh0 bWwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTYyMjIx CisKKyAgICAgICAgT3VyIGV4cGVjdGF0aW9ucyBmb3IgdGhlIHVuc2tpcHBlZCB0ZXN0cyBoYXZl IHRoZSBmb2xsb3dpbmcgZGlmZmVyZW5jZXMgZnJvbSB0aGUgbWFjCisgICAgICAgIHBsYXRmb3Jt OgorICAgICAgICAgIC0gUE9TVCByZXF1ZXN0cyB3aXRoIG5vIGRhdGEgZ2V0IGEgZGVmYXVsdCBD b250ZW50LVR5cGUgb2YgJ2FwcGxpY2F0aW9uL29jdGV0LXN0cmVhbScuCisgICAgICAgICAgICBU aGlzIGlzIFF0LWRlZmluZWQgYmVoYXZpb3VyIGluIFFOZXR3b3JrQWNjZXNzTWFuYWdlciAoc2Vl IFFIdHRwTmV0d29ya1JlcXVlc3RQcml2YXRlOjpoZWFkZXIKKyAgICAgICAgICAgIGluIHFodHRw bmV0d29ya3JlcXVlc3QuY3BwKQorICAgICAgICAgIC0gREVMRVRFIGFuZCBIRUFEIHJlcXVlc3Rz IGdldCB0aGVpciBDb250ZW50VHlwZSBhbmQgQ29udGVudExlbmd0aCBoZWFkZXJzIChpZiBwcmVz ZW50KSByZW1vdmVkCisgICAgICAgICAgICBieSBRTmV0d29ya1JlcGx5SGFuZGxlci4gUXRXZWJL aXQgZG9lcyBub3Qgc2VuZCBkYXRhIGZvciBlaXRoZXIgb2YgdGhlc2UgcmVxdWVzdCB0eXBlcy4K KworICAgICAgICAqIHBsYXRmb3JtL3F0L1NraXBwZWQ6IFVuc2tpcDogaHR0cC90ZXN0cy94bWxo dHRwcmVxdWVzdC9tZXRob2RzLmh0bWwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvbWV0aG9kcy1sb3dlci1jYXNlLmh0bWwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGh0dHAvdGVzdHMveG1saHR0 cHJlcXVlc3Qvd29ya2Vycy9tZXRob2RzLWFzeW5jLmh0bWwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvd29ya2Vycy9tZXRo b2RzLmh0bWwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGh0dHAvdGVz dHMveG1saHR0cHJlcXVlc3Qvd29ya2Vycy9zaGFyZWQtd29ya2VyLW1ldGhvZHMtYXN5bmMuaHRt bAorICAgICAgICAqIHBsYXRmb3JtL3F0L2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvbWV0aG9k cy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHBsYXRmb3JtL3F0L2h0dHAvdGVzdHMv eG1saHR0cHJlcXVlc3Qvd29ya2Vycy9tZXRob2RzLWFzeW5jLWV4cGVjdGVkLnR4dDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vcXQvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC93b3JrZXJz L21ldGhvZHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9xdC9odHRw L3Rlc3RzL3htbGh0dHByZXF1ZXN0L3dvcmtlcnMvc2hhcmVkLXdvcmtlci1tZXRob2RzLWFzeW5j LWV4cGVjdGVkLnR4dDogQWRkZWQuCisKIDIwMTEtMDYtMDYgIENzYWJhIE9zenRyb2dvbsOhYyAg PG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIDYgdGVzdHMgaGF2ZSBkaWZmZXJlbnQg cmVzdWx0cyBvbiA2NCBiaXQgY29tcGFyZWQgdG8gMzIgYml0CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBl ZAppbmRleCA3N2E5ODA3NjVjNWEzN2UxMjkyOTliZmI0MDVjOGI4NzU5ODU3ZjdjLi5jNzA5M2M4 ZjU1ZmJkZWYzNTk4NTdjNzM0MDk5YTRmMGEzNTdmZDU2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBw ZWQKQEAgLTM2OCwxMiArMzY4LDcgQEAgaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9jcm9zcy1v cmlnaW4tY29va2llLXN0b3JhZ2UuaHRtbAogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9jYWNo ZS1vdmVycmlkZS5odG1sCiBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L2Nyb3NzLW9yaWdpbi1h dXRob3JpemF0aW9uLmh0bWwKIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvY3Jvc3Mtb3JpZ2lu LW5vLWF1dGhvcml6YXRpb24uaHRtbAotaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9tZXRob2Rz LWxvd2VyLWNhc2UuaHRtbAotaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9tZXRob2RzLmh0bWwK IGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvcmVkaXJlY3QtY3Jvc3Mtb3JpZ2luLXRyaXBtaW5l Lmh0bWwKLWh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvd29ya2Vycy9tZXRob2RzLWFzeW5jLmh0 bWwKLWh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvd29ya2Vycy9tZXRob2RzLmh0bWwKLWh0dHAv dGVzdHMveG1saHR0cHJlcXVlc3Qvd29ya2Vycy9zaGFyZWQtd29ya2VyLW1ldGhvZHMtYXN5bmMu aHRtbAogCiAjID09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PSAjCiAjICAgICAgIEZhaWxpbmcgaW5zZXJ0aW5n IHRlc3RzLiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAjCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9odHRwL3Rlc3RzL3htbGh0dHByZXF1 ZXN0L21ldGhvZHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvaHR0cC90 ZXN0cy94bWxodHRwcmVxdWVzdC9tZXRob2RzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jYWYz ZjYyMmFjYzNjNDIzOTQyODRlOTIxMWQzOWI1ZmJkMWQ0NGRkCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9tZXRob2Rz LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDIzIEBACitUZXN0cyBmb3IgYnVnIDM4MTIgLSBHRVQg YW5kIFBPU1Qgc2hvdWxkIG5vdCBiZSB0aGUgb25seSBIVFRQIG1ldGhvZHMgaW1wbGVtZW50ZWQg aW4gWE1MSHR0cFJlcXVlc3QuCisKK0dFVCgiIik6IEdFVChudWxsIGJ5dGVzKSwgQ29udGVudC1U eXBlOiBudWxsCitHRVQobnVsbCk6IEdFVChudWxsIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxs CitHRVQoIjEyMyIpOiBHRVQobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorUE9TVCgi Iik6IFBPU1QoMCBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veG1sCitQT1NUKG51 bGwpOiBQT1NUKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL29jdGV0LXN0cmVh bQorUE9TVCgiMTIzIik6IFBPU1QoMyBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24v eG1sCitQVVQoIiIpOiBQVVQoMCBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veG1s CitQVVQobnVsbCk6IFBVVCgwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitQVVQoIjEyMyIp OiBQVVQoMyBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veG1sCitERUxFVEUoIiIp OiBERUxFVEUobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorREVMRVRFKG51bGwpOiBE RUxFVEUobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorREVMRVRFKCIxMjMiKTogREVM RVRFKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0hFQUQoIiIpOiBIRUFEKG51bGwg Ynl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0hFQUQobnVsbCk6IEhFQUQobnVsbCBieXRlcyks IENvbnRlbnQtVHlwZTogbnVsbAorSEVBRCgiMTIzIik6IEhFQUQobnVsbCBieXRlcyksIENvbnRl bnQtVHlwZTogbnVsbAorV0tGT09CQVIoIiIpOiBXS0ZPT0JBUigwIGJ5dGVzKSwgQ29udGVudC1U eXBlOiBhcHBsaWNhdGlvbi94bWwKK1dLRk9PQkFSKG51bGwpOiBXS0ZPT0JBUigwIGJ5dGVzKSwg Q29udGVudC1UeXBlOiBudWxsCitXS0ZPT0JBUigiMTIzIik6IFdLRk9PQkFSKDMgYnl0ZXMpLCBD b250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorU0VBUkNIKCIiKTogU0VBUkNIKDAgYnl0ZXMp LCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorU0VBUkNIKG51bGwpOiBTRUFSQ0goMCBi eXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorU0VBUkNIKCIxMjMiKTogU0VBUkNIKDMgYnl0ZXMp LCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv cGxhdGZvcm0vcXQvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC93b3JrZXJzL21ldGhvZHMtYXN5 bmMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvaHR0cC90ZXN0cy94bWxo dHRwcmVxdWVzdC93b3JrZXJzL21ldGhvZHMtYXN5bmMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1v ZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAu Ljg4OGIwNjE1ZWVjY2ZhNTRiZjU3ODViMWQ1YzZiMGY0Yjk0NzJiYmYKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3dv cmtlcnMvbWV0aG9kcy1hc3luYy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyNCBAQAorR0VUIGFu ZCBQT1NUIHNob3VsZCBub3QgYmUgdGhlIG9ubHkgSFRUUCBtZXRob2RzIGltcGxlbWVudGVkIGlu IFhNTEh0dHBSZXF1ZXN0IGZvciBXb3JrZXJzLgorCitHRVQoIiIpOiBHRVQobnVsbCBieXRlcyks IENvbnRlbnQtVHlwZTogbnVsbAorR0VUKG51bGwpOiBHRVQobnVsbCBieXRlcyksIENvbnRlbnQt VHlwZTogbnVsbAorR0VUKCIxMjMiKTogR0VUKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51 bGwKK1BPU1QoIiIpOiBQT1NUKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3ht bAorUE9TVChudWxsKTogUE9TVCgwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi9v Y3RldC1zdHJlYW0KK1BPU1QoIjEyMyIpOiBQT1NUKDMgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFw cGxpY2F0aW9uL3htbAorUFVUKCIiKTogUFVUKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxp Y2F0aW9uL3htbAorUFVUKG51bGwpOiBQVVQoMCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAor UFVUKCIxMjMiKTogUFVUKDMgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAor REVMRVRFKCIiKTogREVMRVRFKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0RFTEVU RShudWxsKTogREVMRVRFKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0RFTEVURSgi MTIzIik6IERFTEVURShudWxsIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitIRUFEKCIiKTog SEVBRChudWxsIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitIRUFEKG51bGwpOiBIRUFEKG51 bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0hFQUQoIjEyMyIpOiBIRUFEKG51bGwgYnl0 ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK1dLRk9PQkFSKCIiKTogV0tGT09CQVIoMCBieXRlcyks IENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veG1sCitXS0ZPT0JBUihudWxsKTogV0tGT09CQVIo MCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorV0tGT09CQVIoIjEyMyIpOiBXS0ZPT0JBUigz IGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94bWwKK1NFQVJDSCgiIik6IFNFQVJD SCgwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94bWwKK1NFQVJDSChudWxsKTog U0VBUkNIKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK1NFQVJDSCgiMTIzIik6IFNFQVJD SCgzIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94bWwKK0RPTkUKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvd29y a2Vycy9tZXRob2RzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L2h0dHAv dGVzdHMveG1saHR0cHJlcXVlc3Qvd29ya2Vycy9tZXRob2RzLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi44ODhiMDYxNWVlY2NmYTU0YmY1Nzg1YjFkNWM2YjBmNGI5NDcyYmJmCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVz dC93b3JrZXJzL21ldGhvZHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjQgQEAKK0dFVCBhbmQg UE9TVCBzaG91bGQgbm90IGJlIHRoZSBvbmx5IEhUVFAgbWV0aG9kcyBpbXBsZW1lbnRlZCBpbiBY TUxIdHRwUmVxdWVzdCBmb3IgV29ya2Vycy4KKworR0VUKCIiKTogR0VUKG51bGwgYnl0ZXMpLCBD b250ZW50LVR5cGU6IG51bGwKK0dFVChudWxsKTogR0VUKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5 cGU6IG51bGwKK0dFVCgiMTIzIik6IEdFVChudWxsIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxs CitQT1NUKCIiKTogUE9TVCgwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94bWwK K1BPU1QobnVsbCk6IFBPU1QoMCBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vb2N0 ZXQtc3RyZWFtCitQT1NUKCIxMjMiKTogUE9TVCgzIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBs aWNhdGlvbi94bWwKK1BVVCgiIik6IFBVVCgwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNh dGlvbi94bWwKK1BVVChudWxsKTogUFVUKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK1BV VCgiMTIzIik6IFBVVCgzIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94bWwKK0RF TEVURSgiIik6IERFTEVURShudWxsIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitERUxFVEUo bnVsbCk6IERFTEVURShudWxsIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitERUxFVEUoIjEy MyIpOiBERUxFVEUobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorSEVBRCgiIik6IEhF QUQobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorSEVBRChudWxsKTogSEVBRChudWxs IGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitIRUFEKCIxMjMiKTogSEVBRChudWxsIGJ5dGVz KSwgQ29udGVudC1UeXBlOiBudWxsCitXS0ZPT0JBUigiIik6IFdLRk9PQkFSKDAgYnl0ZXMpLCBD b250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorV0tGT09CQVIobnVsbCk6IFdLRk9PQkFSKDAg Ynl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK1dLRk9PQkFSKCIxMjMiKTogV0tGT09CQVIoMyBi eXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veG1sCitTRUFSQ0goIiIpOiBTRUFSQ0go MCBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veG1sCitTRUFSQ0gobnVsbCk6IFNF QVJDSCgwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitTRUFSQ0goIjEyMyIpOiBTRUFSQ0go MyBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24veG1sCitET05FCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3dvcmtl cnMvc2hhcmVkLXdvcmtlci1tZXRob2RzLWFzeW5jLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL3F0L2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvd29ya2Vycy9zaGFyZWQtd29y a2VyLW1ldGhvZHMtYXN5bmMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjU5OTFkZTVlZDAyNGU4 MTlmY2E4Mjk3NzIxYmRlOTAxYTE5NWFkMDMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3dvcmtlcnMvc2hhcmVkLXdv cmtlci1tZXRob2RzLWFzeW5jLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDI0IEBACitHRVQgYW5k IFBPU1Qgc2hvdWxkIG5vdCBiZSB0aGUgb25seSBIVFRQIG1ldGhvZHMgaW1wbGVtZW50ZWQgaW4g WE1MSHR0cFJlcXVlc3QgZm9yIFNoYXJlZFdvcmtlcnMuCisKK0dFVCgiIik6IEdFVChudWxsIGJ5 dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitHRVQobnVsbCk6IEdFVChudWxsIGJ5dGVzKSwgQ29u dGVudC1UeXBlOiBudWxsCitHRVQoIjEyMyIpOiBHRVQobnVsbCBieXRlcyksIENvbnRlbnQtVHlw ZTogbnVsbAorUE9TVCgiIik6IFBPU1QoMCBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRp b24veG1sCitQT1NUKG51bGwpOiBQT1NUKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0 aW9uL29jdGV0LXN0cmVhbQorUE9TVCgiMTIzIik6IFBPU1QoMyBieXRlcyksIENvbnRlbnQtVHlw ZTogYXBwbGljYXRpb24veG1sCitQVVQoIiIpOiBQVVQoMCBieXRlcyksIENvbnRlbnQtVHlwZTog YXBwbGljYXRpb24veG1sCitQVVQobnVsbCk6IFBVVCgwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBu dWxsCitQVVQoIjEyMyIpOiBQVVQoMyBieXRlcyksIENvbnRlbnQtVHlwZTogYXBwbGljYXRpb24v eG1sCitERUxFVEUoIiIpOiBERUxFVEUobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAor REVMRVRFKG51bGwpOiBERUxFVEUobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorREVM RVRFKCIxMjMiKTogREVMRVRFKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0hFQUQo IiIpOiBIRUFEKG51bGwgYnl0ZXMpLCBDb250ZW50LVR5cGU6IG51bGwKK0hFQUQobnVsbCk6IEhF QUQobnVsbCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorSEVBRCgiMTIzIik6IEhFQUQobnVs bCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorV0tGT09CQVIoIiIpOiBXS0ZPT0JBUigwIGJ5 dGVzKSwgQ29udGVudC1UeXBlOiBhcHBsaWNhdGlvbi94bWwKK1dLRk9PQkFSKG51bGwpOiBXS0ZP T0JBUigwIGJ5dGVzKSwgQ29udGVudC1UeXBlOiBudWxsCitXS0ZPT0JBUigiMTIzIik6IFdLRk9P QkFSKDMgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorU0VBUkNIKCIiKTog U0VBUkNIKDAgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorU0VBUkNIKG51 bGwpOiBTRUFSQ0goMCBieXRlcyksIENvbnRlbnQtVHlwZTogbnVsbAorU0VBUkNIKCIxMjMiKTog U0VBUkNIKDMgYnl0ZXMpLCBDb250ZW50LVR5cGU6IGFwcGxpY2F0aW9uL3htbAorRE9ORQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGZhMWQ0MTRmODM0YjRmZTRmNTk3NGU3MTk0YzBmMGM2YjcwNmZjMWQuLjA1OTk4 ZjAyYTM1MGMxOTkzYWI5YjUzMThiMjAzNmZkNTdiNTQzMWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxOSBAQAorMjAxMS0wNi0wNyAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBGaXgg bWV0aG9kcy5odG1sIGFuZCBtZXRob2RzLWxvd2VyLWNhc2UuaHRtbAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjIyMjEKKworICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvcXQvUU5ldHdvcmtSZXBseUhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UU5ldHdvcmtSZXBseUhhbmRsZXI6OmNsZWFyQ29udGVudHNIZWFkZXJzKTogUmVmYWN0b3Ig Y29kZSBmcm9tIHNlbmROZXR3b3JrUmVxdWVzdAorICAgICAgICAoV2ViQ29yZTo6UU5ldHdvcmtS ZXBseUhhbmRsZXI6OmdldElPRGV2aWNlKTogZGl0dG8KKyAgICAgICAgKFdlYkNvcmU6OlFOZXR3 b3JrUmVwbHlIYW5kbGVyOjpzZW5kTmV0d29ya1JlcXVlc3QpOgorICAgICAgICAgICAgLSBSZW1v dmUgQ29udGVudFR5cGUgYW5kIENvbnRlbnRMZW5ndGggaGVhZGVycyBmcm9tIEdFVCwgREVMRVRF IGFuZCBIRUFEIHJlcXVlc3RzIHNpbmNlCisgICAgICAgICAgICAgIHdlIGRvIG5vdCBzZW5kIGRh dGEgd2l0aCBhbnkgb2YgdGhlc2UgcmVxdWVzdHMuCisgICAgICAgICAgICAtIElmIGEgY3VzdG9t IEhUVFAgb3BlcmF0aW9uIGNvbnRhaW5zIGRhdGEsIHNlbmQgaXQuCisgICAgICAgICogcGxhdGZv cm0vbmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oOgorCiAyMDExLTA2LTA2ICBTdGV2 ZSBCbG9jayAgPHN0ZXZlYmxvY2tAZ29vZ2xlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBZ dXJ5IFNlbWlraGF0c2t5LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcAppbmRleCA1OWQyMjQ1NTk1Mzkw OWM3NzU3ODlmY2EwYWUxYWM5NGI4YWI5MGU2Li4xYzE4MzE3MGE5ZDczNTdkNDc1MWI1M2FjZDk4 OGFkYWE4MzExOGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9uZXR3b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmNwcApAQCAtNTk4LDYgKzU5OCwyNCBA QCB2b2lkIFFOZXR3b3JrUmVwbHlIYW5kbGVyOjp1cGxvYWRQcm9ncmVzcyhxaW50NjQgYnl0ZXNT ZW50LCBxaW50NjQgYnl0ZXNUb3RhbCkKICAgICBjbGllbnQtPmRpZFNlbmREYXRhKG1fcmVzb3Vy Y2VIYW5kbGUsIGJ5dGVzU2VudCwgYnl0ZXNUb3RhbCk7CiB9CiAKK3ZvaWQgUU5ldHdvcmtSZXBs eUhhbmRsZXI6OmNsZWFyQ29udGVudHNIZWFkZXJzKCkKK3sKKyAgICAvLyBDbGVhcmluZyBDb250 ZW50cy1sZW5ndGggYW5kIENvbnRlbnRzLXR5cGUgb2YgdGhlIHJlcXVlc3RzIHRoYXQgZG8gbm90 IGhhdmUgY29udGVudHMuCisgICAgLy8gVGhpcyBpcyBuZWNlc3NhcnkgdG8gZW5zdXJlIFBPU1Qg cmVxdWVzdHMgcmVkaXJlY3RlZCB0byBHRVRzIGRvIG5vdCBsZWFrIG1ldGFkYXRhCisgICAgLy8g YWJvdXQgdGhlIFBPU1QgY29udGVudCB0byB0aGUgc2l0ZSB0aGV5J3ZlIGJlZW4gcmVkaXJlY3Rl ZCB0by4KKyAgICBtX3JlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5 cGVIZWFkZXIsIFFWYXJpYW50KCkpOworICAgIG1fcmVxdWVzdC5zZXRIZWFkZXIoUU5ldHdvcmtS ZXF1ZXN0OjpDb250ZW50TGVuZ3RoSGVhZGVyLCBRVmFyaWFudCgpKTsKK30KKworRm9ybURhdGFJ T0RldmljZSogUU5ldHdvcmtSZXBseUhhbmRsZXI6OmdldElPRGV2aWNlKGNvbnN0IFJlc291cmNl UmVxdWVzdCYgcmVxdWVzdCkKK3sKKyAgICBGb3JtRGF0YUlPRGV2aWNlKiBkZXZpY2UgPSBuZXcg Rm9ybURhdGFJT0RldmljZShyZXF1ZXN0Lmh0dHBCb2R5KCkpOworICAgIC8vIFdlIG1heSBiZSB1 cGxvYWRpbmcgZmlsZXMgc28gcHJldmVudCBRTlIgZnJvbSBidWZmZXJpbmcgZGF0YQorICAgIG1f cmVxdWVzdC5zZXRIZWFkZXIoUU5ldHdvcmtSZXF1ZXN0OjpDb250ZW50TGVuZ3RoSGVhZGVyLCBk ZXZpY2UtPmdldEZvcm1EYXRhU2l6ZSgpKTsKKyAgICBtX3JlcXVlc3Quc2V0QXR0cmlidXRlKFFO ZXR3b3JrUmVxdWVzdDo6RG9Ob3RCdWZmZXJVcGxvYWREYXRhQXR0cmlidXRlLCBRVmFyaWFudCh0 cnVlKSk7CisgICAgcmV0dXJuIGRldmljZTsKK30KKwogUU5ldHdvcmtSZXBseSogUU5ldHdvcmtS ZXBseUhhbmRsZXI6OnNlbmROZXR3b3JrUmVxdWVzdChRTmV0d29ya0FjY2Vzc01hbmFnZXIqIG1h bmFnZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBpZiAobV9sb2Fk VHlwZSA9PSBTeW5jaHJvbm91c0xvYWQpCkBAIC02MTUsNDAgKzYzMywzNSBAQCBRTmV0d29ya1Jl cGx5KiBRTmV0d29ya1JlcGx5SGFuZGxlcjo6c2VuZE5ldHdvcmtSZXF1ZXN0KFFOZXR3b3JrQWNj ZXNzTWFuYWdlciogbQogICAgICAgICAmJiAoIXVybC50b0xvY2FsRmlsZSgpLmlzRW1wdHkoKSB8 fCB1cmwuc2NoZW1lKCkgPT0gUUxhdGluMVN0cmluZygiZGF0YSIpKSkKICAgICAgICAgbV9tZXRo b2QgPSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OkdldE9wZXJhdGlvbjsKIAotICAgIGlmIChtX21l dGhvZCAhPSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OlBvc3RPcGVyYXRpb24gJiYgbV9tZXRob2Qg IT0gUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpQdXRPcGVyYXRpb24pIHsKLSAgICAgICAgLy8gY2xl YXJpbmcgQ29udGVudHMtbGVuZ3RoIGFuZCBDb250ZW50cy10eXBlIG9mIHRoZSByZXF1ZXN0cyB0 aGF0IGRvIG5vdCBoYXZlIGNvbnRlbnRzLgotICAgICAgICBtX3JlcXVlc3Quc2V0SGVhZGVyKFFO ZXR3b3JrUmVxdWVzdDo6Q29udGVudFR5cGVIZWFkZXIsIFFWYXJpYW50KCkpOwotICAgICAgICBt X3JlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudExlbmd0aEhlYWRlciwg UVZhcmlhbnQoKSk7Ci0gICAgfQotCiAgICAgc3dpdGNoIChtX21ldGhvZCkgewogICAgICAgICBj YXNlIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6R2V0T3BlcmF0aW9uOgorICAgICAgICAgICAgY2xl YXJDb250ZW50c0hlYWRlcnMoKTsKICAgICAgICAgICAgIHJldHVybiBtYW5hZ2VyLT5nZXQobV9y ZXF1ZXN0KTsKICAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OlBvc3RPcGVyYXRp b246IHsKLSAgICAgICAgICAgIEZvcm1EYXRhSU9EZXZpY2UqIHBvc3REZXZpY2UgPSBuZXcgRm9y bURhdGFJT0RldmljZShyZXF1ZXN0Lmh0dHBCb2R5KCkpOwotICAgICAgICAgICAgLy8gV2UgbWF5 IGJlIHVwbG9hZGluZyBmaWxlcyBzbyBwcmV2ZW50IFFOUiBmcm9tIGJ1ZmZlcmluZyBkYXRhCi0g ICAgICAgICAgICBtX3JlcXVlc3Quc2V0SGVhZGVyKFFOZXR3b3JrUmVxdWVzdDo6Q29udGVudExl bmd0aEhlYWRlciwgcG9zdERldmljZS0+Z2V0Rm9ybURhdGFTaXplKCkpOwotICAgICAgICAgICAg bV9yZXF1ZXN0LnNldEF0dHJpYnV0ZShRTmV0d29ya1JlcXVlc3Q6OkRvTm90QnVmZmVyVXBsb2Fk RGF0YUF0dHJpYnV0ZSwgUVZhcmlhbnQodHJ1ZSkpOworICAgICAgICAgICAgRm9ybURhdGFJT0Rl dmljZSogcG9zdERldmljZSA9IGdldElPRGV2aWNlKHJlcXVlc3QpOwogICAgICAgICAgICAgUU5l dHdvcmtSZXBseSogcmVzdWx0ID0gbWFuYWdlci0+cG9zdChtX3JlcXVlc3QsIHBvc3REZXZpY2Up OwogICAgICAgICAgICAgcG9zdERldmljZS0+c2V0UGFyZW50KHJlc3VsdCk7CiAgICAgICAgICAg ICByZXR1cm4gcmVzdWx0OwogICAgICAgICB9CiAgICAgICAgIGNhc2UgUU5ldHdvcmtBY2Nlc3NN YW5hZ2VyOjpIZWFkT3BlcmF0aW9uOgorICAgICAgICAgICAgY2xlYXJDb250ZW50c0hlYWRlcnMo KTsKICAgICAgICAgICAgIHJldHVybiBtYW5hZ2VyLT5oZWFkKG1fcmVxdWVzdCk7CiAgICAgICAg IGNhc2UgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpQdXRPcGVyYXRpb246IHsKLSAgICAgICAgICAg IEZvcm1EYXRhSU9EZXZpY2UqIHB1dERldmljZSA9IG5ldyBGb3JtRGF0YUlPRGV2aWNlKHJlcXVl c3QuaHR0cEJvZHkoKSk7Ci0gICAgICAgICAgICAvLyBXZSBtYXkgYmUgdXBsb2FkaW5nIGZpbGVz IHNvIHByZXZlbnQgUU5SIGZyb20gYnVmZmVyaW5nIGRhdGEKLSAgICAgICAgICAgIG1fcmVxdWVz dC5zZXRIZWFkZXIoUU5ldHdvcmtSZXF1ZXN0OjpDb250ZW50TGVuZ3RoSGVhZGVyLCBwdXREZXZp Y2UtPmdldEZvcm1EYXRhU2l6ZSgpKTsKLSAgICAgICAgICAgIG1fcmVxdWVzdC5zZXRBdHRyaWJ1 dGUoUU5ldHdvcmtSZXF1ZXN0OjpEb05vdEJ1ZmZlclVwbG9hZERhdGFBdHRyaWJ1dGUsIFFWYXJp YW50KHRydWUpKTsKKyAgICAgICAgICAgIEZvcm1EYXRhSU9EZXZpY2UqIHB1dERldmljZSA9IGdl dElPRGV2aWNlKHJlcXVlc3QpOwogICAgICAgICAgICAgUU5ldHdvcmtSZXBseSogcmVzdWx0ID0g bWFuYWdlci0+cHV0KG1fcmVxdWVzdCwgcHV0RGV2aWNlKTsKICAgICAgICAgICAgIHB1dERldmlj ZS0+c2V0UGFyZW50KHJlc3VsdCk7CiAgICAgICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgICAg ICB9CiAgICAgICAgIGNhc2UgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpEZWxldGVPcGVyYXRpb246 IHsKKyAgICAgICAgICAgIGNsZWFyQ29udGVudHNIZWFkZXJzKCk7CiAgICAgICAgICAgICByZXR1 cm4gbWFuYWdlci0+ZGVsZXRlUmVzb3VyY2UobV9yZXF1ZXN0KTsKICAgICAgICAgfQotICAgICAg ICBjYXNlIFFOZXR3b3JrQWNjZXNzTWFuYWdlcjo6Q3VzdG9tT3BlcmF0aW9uOgotICAgICAgICAg ICAgcmV0dXJuIG1hbmFnZXItPnNlbmRDdXN0b21SZXF1ZXN0KG1fcmVxdWVzdCwgbV9yZXNvdXJj ZUhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCkuaHR0cE1ldGhvZCgpLmxhdGluMSgpLmRhdGEoKSk7Cisg ICAgICAgIGNhc2UgUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyOjpDdXN0b21PcGVyYXRpb246IHsKKyAg ICAgICAgICAgIEZvcm1EYXRhSU9EZXZpY2UqIGN1c3RvbURldmljZSA9IGdldElPRGV2aWNlKHJl cXVlc3QpOworICAgICAgICAgICAgUU5ldHdvcmtSZXBseSogcmVzdWx0ID0gbWFuYWdlci0+c2Vu ZEN1c3RvbVJlcXVlc3QobV9yZXF1ZXN0LCBtX3Jlc291cmNlSGFuZGxlLT5maXJzdFJlcXVlc3Qo KS5odHRwTWV0aG9kKCkubGF0aW4xKCkuZGF0YSgpLCBjdXN0b21EZXZpY2UpOworICAgICAgICAg ICAgY3VzdG9tRGV2aWNlLT5zZXRQYXJlbnQocmVzdWx0KTsKKyAgICAgICAgICAgIHJldHVybiBy ZXN1bHQ7CisgICAgICAgIH0KICAgICAgICAgY2FzZSBRTmV0d29ya0FjY2Vzc01hbmFnZXI6OlVu a25vd25PcGVyYXRpb246CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAg ICAgICAgIHJldHVybiAwOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9xdC9RTmV0d29ya1JlcGx5SGFuZGxlci5oCmluZGV4IGRlZmVlYzQ4NjUzZDI4NDdi NzViNjcwODllOWUyMWE2MzA1MTg0YTkuLjdjMTM0ZmViZDRmMTI4ZTBkYmYyZjRhMjM4OGY0NGE2 MDU4MmZjNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQv UU5ldHdvcmtSZXBseUhhbmRsZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3F0L1FOZXR3b3JrUmVwbHlIYW5kbGVyLmgKQEAgLTM1LDYgKzM1LDcgQEAgUVRfRU5EX05B TUVTUEFDRQogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK2NsYXNzIEZvcm1EYXRhSU9EZXZpY2U7 CiBjbGFzcyBSZXNvdXJjZUhhbmRsZTsKIGNsYXNzIFJlc291cmNlUmVxdWVzdDsKIGNsYXNzIFJl c291cmNlUmVzcG9uc2U7CkBAIC0xNDAsNiArMTQxLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIHJl ZGlyZWN0KFJlc291cmNlUmVzcG9uc2UmLCBjb25zdCBRVXJsJik7CiAgICAgYm9vbCB3YXNBYm9y dGVkKCkgY29uc3QgeyByZXR1cm4gIW1fcmVzb3VyY2VIYW5kbGU7IH0KICAgICBRTmV0d29ya1Jl cGx5KiBzZW5kTmV0d29ya1JlcXVlc3QoUU5ldHdvcmtBY2Nlc3NNYW5hZ2VyKiwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0Jik7CisgICAgRm9ybURhdGFJT0RldmljZSogZ2V0SU9EZXZpY2UoY29uc3Qg UmVzb3VyY2VSZXF1ZXN0Jik7CisgICAgdm9pZCBjbGVhckNvbnRlbnRzSGVhZGVycygpOwogCiAg ICAgT3duUHRyPFFOZXR3b3JrUmVwbHlXcmFwcGVyPiBtX3JlcGx5V3JhcHBlcjsKICAgICBSZXNv dXJjZUhhbmRsZSogbV9yZXNvdXJjZUhhbmRsZTsK