82100 2012-03-23 16:08:32 -0700 [WebSocket]Reserved bits test case should cover both extension and no-extension scenarios 2012-04-01 19:53:55 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 79666 0 li.yin webkit-unassigned bashi benjamin kadam ossy tkent webkit.review.bot yutak oldest_to_newest 586841 0 li.yin 2012-03-23 16:08:32 -0700 Maybe the test case should be redesigned, it had better cover both no-extension and extension scenarios. extension bit1 bit2 bit3 covered yes 0 1 0 yes yes 0 0 1 yes no 1 0 0 no no 0 1 0 no no 0 0 1 no The current test case only covered the 1st and 2nd. But the 3rd, 4th and 5th were not covered. What's your opinion? 586860 1 li.yin 2012-03-23 16:50:35 -0700 Hi yutak, bashi Do you think it is necessary to do that? Could you give some comments? Thanks in advance. 586893 2 133594 li.yin 2012-03-23 17:26:45 -0700 Created attachment 133594 Patch 587520 3 133594 bashi 2012-03-26 01:01:29 -0700 Comment on attachment 133594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133594&action=review > LayoutTests/ChangeLog:5 > + Please add description > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits.html:17 > +var bit_extension = ["1_0", "2_0", "3_0", "2_1", "3_1"]; They are not descriptive. Using query string like "compressed=true&bit_number=1" would be better. > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits_wsh.py:19 > + request.ws_extension_processors = [] # using no extension response This will cause unexpected behavior if another extension is added in the future. > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits_wsh.py:20 > + else: You can remove else clause here. 587655 4 li.yin 2012-03-26 06:10:15 -0700 (In reply to comment #3) > (From update of attachment 133594 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133594&action=review > > > LayoutTests/ChangeLog:5 > > + > > Please add description > > > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits.html:17 > > +var bit_extension = ["1_0", "2_0", "3_0", "2_1", "3_1"]; > > They are not descriptive. Using query string like "compressed=true&bit_number=1" would be better. > > > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits_wsh.py:19 > > + request.ws_extension_processors = [] # using no extension response > > This will cause unexpected behavior if another extension is added in the future. If another extension is added, I think the mod_pywebsocket will be updated to support it, meanwhile, many related test case will be required to update. In addition, the test case echo-with-no-extension_wsh.py also used that statement. > > > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits_wsh.py:20 > > + else: > > You can remove else clause here. 587658 5 li.yin 2012-03-26 06:22:59 -0700 (In reply to comment #3) > (From update of attachment 133594 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=133594&action=review > > > LayoutTests/ChangeLog:5 > > + > > Please add description > > > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits.html:17 > > +var bit_extension = ["1_0", "2_0", "3_0", "2_1", "3_1"]; > > They are not descriptive. Using query string like "compressed=true&bit_number=1" would be better. Good point, thanks. > > > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits_wsh.py:19 > > + request.ws_extension_processors = [] # using no extension response > > This will cause unexpected behavior if another extension is added in the future. > > > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits_wsh.py:20 > > + else: > > You can remove else clause here. 587661 6 133791 li.yin 2012-03-26 06:26:08 -0700 Created attachment 133791 Patch 587701 7 bashi 2012-03-26 07:13:01 -0700 (In reply to comment #4) > If another extension is added, I think the mod_pywebsocket will be updated to support it, meanwhile, many related test case will be required to update. > In addition, the test case echo-with-no-extension_wsh.py also used that statement. It would be true, but it's not a justification for adding such dependency. We should avoid adding unnecessary dependency like this. Maybe calling disable_outgoing_compression() (see deflate-frame_wsh.py) is enough. 588368 8 li.yin 2012-03-26 17:37:09 -0700 (In reply to comment #7) > (In reply to comment #4) > > If another extension is added, I think the mod_pywebsocket will be updated to support it, meanwhile, many related test case will be required to update. > > In addition, the test case echo-with-no-extension_wsh.py also used that statement. > > It would be true, but it's not a justification for adding such dependency. We should avoid adding unnecessary dependency like this. Maybe calling disable_outgoing_compression() (see deflate-frame_wsh.py) is enough. This test case needs two scenarios, extension and no-extension. disable_outgoing_compression() function just used uncompressed frame to transfer data, but it still had negotiated extension. This is not expected. And request.ws_extension_processors = [] specified no extension, not only compress extension, but also all the extensions, even if another extension will be added in the future. 588380 9 li.yin 2012-03-26 17:46:07 -0700 From the RFC6455 RSV1, RSV2, RSV3: MUST be 0 unless an extension is negotiated that defines meanings for non-zero values. If a nonzero value is received and none of the negotiated extensions defines the meaning of such a nonzero value, the receiving endpoint MUST _Fail the WebSocket Connection. 588390 10 bashi 2012-03-26 17:54:51 -0700 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #4) > > > If another extension is added, I think the mod_pywebsocket will be updated to support it, meanwhile, many related test case will be required to update. > > > In addition, the test case echo-with-no-extension_wsh.py also used that statement. > > > > It would be true, but it's not a justification for adding such dependency. We should avoid adding unnecessary dependency like this. Maybe calling disable_outgoing_compression() (see deflate-frame_wsh.py) is enough. > > This test case needs two scenarios, extension and no-extension. > disable_outgoing_compression() function just used uncompressed frame to transfer data, but it still had negotiated extension. This is not expected. > And request.ws_extension_processors = [] specified no extension, not only compress extension, but also all the extensions, even if another extension will be added in the future. Ok. Please wait formal review. 589756 11 133791 tkent 2012-03-28 01:57:39 -0700 Comment on attachment 133791 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133791&action=review > LayoutTests/http/tests/websocket/tests/hybi/reserved-bits.html:17 > +var compress_bitNumber = ["compressed=false&bit_number=1", nit: We usually use camelCase for variable names. compressedAndBitNumberParameters? 590668 12 134455 li.yin 2012-03-28 17:47:39 -0700 Created attachment 134455 Patch 590669 13 134455 tkent 2012-03-28 17:49:25 -0700 Comment on attachment 134455 Patch ok 590710 14 134455 webkit.review.bot 2012-03-28 18:32:44 -0700 Comment on attachment 134455 Patch Clearing flags on attachment: 134455 Committed r112488: <http://trac.webkit.org/changeset/112488> 590711 15 webkit.review.bot 2012-03-28 18:32:49 -0700 All reviewed patches have been landed. Closing bug. 590954 16 kadam 2012-03-29 01:56:53 -0700 This test fails on Qt. :( I will skip this test until It is fixed. * http/tests/websocket/tests/hybi/reserved-bits.html Diff: --- /ramdisk/qt-linux-64-release/build/layout-test-results/http/tests/websocket/tests/hybi/reserved-bits-expected.txt +++ /ramdisk/qt-linux-64-release/build/layout-test-results/http/tests/websocket/tests/hybi/reserved-bits-actual.txt @@ -1,4 +1,3 @@ -CONSOLE MESSAGE: Received unexpected compressed frame CONSOLE MESSAGE: One or more reserved bits are on: reserved2 = 1, reserved3 = 0 CONSOLE MESSAGE: One or more reserved bits are on: reserved2 = 0, reserved3 = 1 CONSOLE MESSAGE: One or more reserved bits are on: reserved2 = 1, reserved3 = 0 @@ -9,8 +8,9 @@ Case compressed=false&bitNumber=1: Test started. onopen() was called. +FAIL onmessage() was called. (message = "This message should be ignored.") onclose() was called. -PASS closeEvent.wasClean is false +FAIL closeEvent.wasClean should be false. Was true. Case compressed=false&bitNumber=2: Test started. onopen() was called. onclose() was called. Pretty Diff: http://build.webkit.sed.hu/results/x86-64%20Linux%20Qt%20Release/r112505%20(35556)/http/tests/websocket/tests/hybi/reserved-bits-pretty-diff.html 590969 17 kadam 2012-03-29 02:20:26 -0700 I skipped this test. Thanks for the investigation. Landed in: http://trac.webkit.org/changeset/112509 590977 18 ossy 2012-03-29 02:34:07 -0700 Reopen not to forget to fix it. 591768 19 li.yin 2012-03-29 17:53:31 -0700 Thanks for your report, I will investigate it. 591787 20 li.yin 2012-03-29 18:28:48 -0700 The root cause is that USE(ZLIB) is disabled, it can't use the negotiated extension "x-webkit-defalte-frame". So the test case which used the "x-webkit-defalte-frame" extension should be skipped in the Layout test. For example: # USE(ZLIB) is disabled. http/tests/websocket/tests/hybi/compressed-control-frame.html http/tests/websocket/tests/hybi/deflate-frame-invalid-parameter.html http/tests/websocket/tests/hybi/deflate-frame-parameter.html http/tests/websocket/tests/hybi/handshake-fail-by-extensions-header.html 591790 21 li.yin 2012-03-29 18:33:44 -0700 We add the "reserved-bits.html" in the Skipped in the QT and EFL platform, and wait for the USE(ZLIB) is enabled. What is your opinion? 591812 22 bashi 2012-03-29 18:59:10 -0700 (In reply to comment #21) > We add the "reserved-bits.html" in the Skipped in the QT and EFL platform, and wait for the USE(ZLIB) is enabled. > What is your opinion? Do they have such plan? AFAIK they don't. I think you can check whether the deflate-frame extension is enabled in web_socket_do_extra_handshake() and abort the test case. You may also need to prepare QT and EFL specific expectations. 591818 23 li.yin 2012-03-29 19:18:30 -0700 (In reply to comment #22) > (In reply to comment #21) > > We add the "reserved-bits.html" in the Skipped in the QT and EFL platform, and wait for the USE(ZLIB) is enabled. > > What is your opinion? > > Do they have such plan? AFAIK they don't. I think you can check whether the deflate-frame extension is enabled in web_socket_do_extra_handshake() and abort the test case. You may also need to prepare QT and EFL specific expectations. It sounds good. Can you provide some detailed information or example to do that? Thanks. 591828 24 bashi 2012-03-29 19:39:52 -0700 (In reply to comment #23) > It sounds good. Can you provide some detailed information or example to do that? > Thanks. If the port doesn't support deflate-frame extension, the opening handshake should not contain "Sec-WebSocket-Extensions: deflate-frame". You can check it via request.headers_in in web_socket_do_extra_handshake(). If "comressed=true" and there is no deflate-frame extension header in the request, you may want to abort the handshake in similar way handshake-error_wsh.py does. 592093 25 li.yin 2012-03-30 05:38:38 -0700 (In reply to comment #24) > (In reply to comment #23) > > It sounds good. Can you provide some detailed information or example to do that? > > Thanks. > > If the port doesn't support deflate-frame extension, the opening handshake should not contain "Sec-WebSocket-Extensions: deflate-frame". You can check it via request.headers_in in web_socket_do_extra_handshake(). If "comressed=true" and there is no deflate-frame extension header in the request, you may want to abort the handshake in similar way handshake-error_wsh.py does. Yeah, it can work, but it still had another issue. When it had no negotiated compressed extension, if browser received a frame with setting reserved-1(compressed) bit, browser should failed the connection, it makes sense, as chromium did. But it was checked in the #if ZLIB code segment, it can't work in Qt port because of disable ZLIB. WebKit qt-port can receive the unexpected frame and can't fail the connection. So maybe we need another obvious operation before calling m_deflateFramer.inflate function, like the reserved-2 and reserved-3 bit checking. But if we do that, it will have a duplicate check for reserved-1 bit in these enable ZLIB WebKit ports. 592103 26 li.yin 2012-03-30 05:53:04 -0700 As we know, EFL had enabled the ZLIB already, only QT webkit didn't do that. Who knows the plan of qt-webkit enabling ZLIB? 592110 27 bashi 2012-03-30 06:08:38 -0700 (In reply to comment #25) > (In reply to comment #24) > > (In reply to comment #23) > > > It sounds good. Can you provide some detailed information or example to do that? > > > Thanks. > > > > If the port doesn't support deflate-frame extension, the opening handshake should not contain "Sec-WebSocket-Extensions: deflate-frame". You can check it via request.headers_in in web_socket_do_extra_handshake(). If "comressed=true" and there is no deflate-frame extension header in the request, you may want to abort the handshake in similar way handshake-error_wsh.py does. > > Yeah, it can work, but it still had another issue. > When it had no negotiated compressed extension, if browser received a frame with setting reserved-1(compressed) bit, browser should failed the connection, it makes sense, as chromium did. > But it was checked in the #if ZLIB code segment, it can't work in Qt port because of disable ZLIB. WebKit qt-port can receive the unexpected frame and can't fail the connection. > > So maybe we need another obvious operation before calling m_deflateFramer.inflate function, like the reserved-2 and reserved-3 bit checking. > But if we do that, it will have a duplicate check for reserved-1 bit in these enable ZLIB WebKit ports. How about adding if (frame.compress) { result->fail("reserved1 bit is on"); return result.release(); } into #else block in WebSocketDeflateFramer::inflate() ? 592153 28 li.yin 2012-03-30 07:33:07 -0700 (In reply to comment #27) > How about adding > > if (frame.compress) { > result->fail("reserved1 bit is on"); > return result.release(); > } > > into #else block in WebSocketDeflateFramer::inflate() ? Yeah, good point, I am going to do that, thank you! 592170 29 134817 li.yin 2012-03-30 08:08:25 -0700 Created attachment 134817 Patch 592194 30 134817 bashi 2012-03-30 08:52:53 -0700 Comment on attachment 134817 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134817&action=review LGTM. kent-san, could you take a look? > Source/WebCore/ChangeLog:8 > + Test: http/tests/websocket/tests/hybi/reserved-bits.html nit: we usually put Test: line after the description. 592680 31 134918 li.yin 2012-03-30 17:42:24 -0700 Created attachment 134918 Patch 593121 32 134918 tkent 2012-04-01 18:48:14 -0700 Comment on attachment 134918 Patch Looks ok 593145 33 134918 webkit.review.bot 2012-04-01 19:53:48 -0700 Comment on attachment 134918 Patch Clearing flags on attachment: 134918 Committed r112826: <http://trac.webkit.org/changeset/112826> 593146 34 webkit.review.bot 2012-04-01 19:53:55 -0700 All reviewed patches have been landed. Closing bug. 133594 2012-03-23 17:26:45 -0700 2012-03-26 06:26:00 -0700 Patch bug-82100-20120325082853.patch text/plain 5481 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjIyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYWNiYzY3YTQzOGZiMmU5NThiZTA2 MDk2YWU3NWEzNGI1NDRkNGExMS4uNDQ0ZjJhNWQ5MzMzNWM0MWQ0N2EwOWNiNzYyZDQ2YzExYzNi NjJlMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTAzLTI0ICBMaSBZaW4gIDxsaS55aW5A aW50ZWwuY29tPgorCisgICAgICAgIFtXZWJTb2NrZXRdUmVzZXJ2ZWQgYml0cyB0ZXN0IGNhc2Ug c2hvdWxkIGNvdmVyIGJvdGggZXh0ZW5zaW9uIGFuZCBuby1leHRlbnNpb24gc2NlbmFyaW9zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjEwMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaHR0cC90ZXN0 cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzLWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRtbDoK KyAgICAgICAgKiBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHNf d3NoLnB5OgorICAgICAgICAod2ViX3NvY2tldF9kb19leHRyYV9oYW5kc2hha2UpOgorICAgICAg ICAod2ViX3NvY2tldF90cmFuc2Zlcl9kYXRhKToKKwogMjAxMi0wMy0yMSAgUmFwaGFlbCBLdWJv IGRhIENvc3RhICA8cmFrdWNvQEZyZWVCU0Qub3JnPgogCiAgICAgICAgIFtFRkxdIFVucmV2aWV3 ZWQgZ2FyZGVuaW5nOyBza2lwIGEgZmV3IHRlc3RzIHdoaWNoIGFyZSBub3QgcmVhbGx5IGJlaW5n IHJlbmRlcmVkIGNvcnJlY3RseS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv d2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMtZXhwZWN0 ZWQudHh0CmluZGV4IDYzYThkNjE3YmY2YjllNzhkNDMwZGE5ZGI5OGExZGRmMGVkNzE1OTUuLjM4 MTJkOWQ0MGRjNzMwOWMxZjdiNmM4ZmRkYjkyNTk2YjMzNzM3MTEgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHli aS9yZXNlcnZlZC1iaXRzLWV4cGVjdGVkLnR4dApAQCAtMSwxNCArMSwyOSBAQAorQ09OU09MRSBN RVNTQUdFOiBSZWNlaXZlZCB1bmV4cGVjdGVkIGNvbXByZXNzZWQgZnJhbWUKK0NPTlNPTEUgTUVT U0FHRTogT25lIG9yIG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJlc2VydmVkMiA9IDEsIHJl c2VydmVkMyA9IDAKK0NPTlNPTEUgTUVTU0FHRTogT25lIG9yIG1vcmUgcmVzZXJ2ZWQgYml0cyBh cmUgb246IHJlc2VydmVkMiA9IDAsIHJlc2VydmVkMyA9IDEKIENPTlNPTEUgTUVTU0FHRTogT25l IG9yIG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJlc2VydmVkMiA9IDEsIHJlc2VydmVkMyA9 IDAKIENPTlNPTEUgTUVTU0FHRTogT25lIG9yIG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJl c2VydmVkMiA9IDAsIHJlc2VydmVkMyA9IDEKIFRlc3Qgd2hldGhlciBXZWJTb2NrZXQgcmVqZWN0 cyBmcmFtZXMgd2hvc2UgcmVzZXJ2ZWQgYml0IGlzIG9uLgogCiBPbiBzdWNjZXNzLCB5b3Ugd2ls bCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01Q TEVURSIuCiAKLUJpdCAyOiBUZXN0IHN0YXJ0ZWQuCitDYXNlIDFfMDogVGVzdCBzdGFydGVkLgor b25vcGVuKCkgd2FzIGNhbGxlZC4KK29uY2xvc2UoKSB3YXMgY2FsbGVkLgorUEFTUyBjbG9zZUV2 ZW50Lndhc0NsZWFuIGlzIGZhbHNlCitDYXNlIDJfMDogVGVzdCBzdGFydGVkLgorb25vcGVuKCkg d2FzIGNhbGxlZC4KK29uY2xvc2UoKSB3YXMgY2FsbGVkLgorUEFTUyBjbG9zZUV2ZW50Lndhc0Ns ZWFuIGlzIGZhbHNlCitDYXNlIDNfMDogVGVzdCBzdGFydGVkLgorb25vcGVuKCkgd2FzIGNhbGxl ZC4KK29uY2xvc2UoKSB3YXMgY2FsbGVkLgorUEFTUyBjbG9zZUV2ZW50Lndhc0NsZWFuIGlzIGZh bHNlCitDYXNlIDJfMTogVGVzdCBzdGFydGVkLgogb25vcGVuKCkgd2FzIGNhbGxlZC4KIG9uY2xv c2UoKSB3YXMgY2FsbGVkLgogUEFTUyBjbG9zZUV2ZW50Lndhc0NsZWFuIGlzIGZhbHNlCi1CaXQg MzogVGVzdCBzdGFydGVkLgorQ2FzZSAzXzE6IFRlc3Qgc3RhcnRlZC4KIG9ub3BlbigpIHdhcyBj YWxsZWQuCiBvbmNsb3NlKCkgd2FzIGNhbGxlZC4KIFBBU1MgY2xvc2VFdmVudC53YXNDbGVhbiBp cyBmYWxzZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVz dHMvaHliaS9yZXNlcnZlZC1iaXRzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNv Y2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRtbAppbmRleCBlYzhkZDMzYTc1YmFiYTY2 NzZhMmNjYzMzNjkyZDk0M2QzMWNmNjgxLi5kYmY5MWMyYWMxZjkwNWY2ZGViOWRkYTAzNDMyMjk2 NTIzOWY4NTNhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90 ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRtbApAQCAtMTMsMTUgKzEzLDE2 IEBAIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKIGlmICh3aW5kb3cubGF5b3V0VGVzdENv bnRyb2xsZXIpCiAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIub3ZlcnJpZGVQcmVmZXJlbmNlKCJX ZWJLaXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkIiwgMCk7CiAKKy8vICIxXzEiIG11 c3Qgbm90IGJlIGluY2x1ZGVkIGluIGJpdF9leHRlbnNpb24uCit2YXIgYml0X2V4dGVuc2lvbiA9 IFsiMV8wIiwgIjJfMCIsICIzXzAiLCAiMl8xIiwgIjNfMSJdOwogdmFyIGNsb3NlRXZlbnQ7CiAK LS8vIGJpdE51bWJlciBtdXN0IGJlIDIgb3IgMy4KLWZ1bmN0aW9uIGRvVGVzdChiaXROdW1iZXIp CitmdW5jdGlvbiBkb1Rlc3QoY3VyVGVzdEluZGV4KQogewotICAgIHZhciB1cmwgPSAid3M6Ly9s b2NhbGhvc3Q6ODg4MC93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzP2JpdD0iICsg Yml0TnVtYmVyOworICAgIHZhciB1cmwgPSAid3M6Ly9sb2NhbGhvc3Q6ODg4MC93ZWJzb2NrZXQv dGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzP2Nhc2U9IiArIGJpdF9leHRlbnNpb25bY3VyVGVzdElu ZGV4XTsKICAgICB2YXIgd3MgPSBuZXcgV2ViU29ja2V0KHVybCk7CiAKLSAgICBkZWJ1ZygiQml0 ICIgKyBiaXROdW1iZXIgKyAiOiBUZXN0IHN0YXJ0ZWQuIik7CisgICAgZGVidWcoIkNhc2UgIiAr IGJpdF9leHRlbnNpb25bY3VyVGVzdEluZGV4XSArICI6IFRlc3Qgc3RhcnRlZC4iKTsKIAogICAg IHdzLm9ub3BlbiA9IGZ1bmN0aW9uKCkKICAgICB7CkBAIC0zOSwxNCArNDAsMTQgQEAgZnVuY3Rp b24gZG9UZXN0KGJpdE51bWJlcikKICAgICAgICAgZGVidWcoIm9uY2xvc2UoKSB3YXMgY2FsbGVk LiIpOwogICAgICAgICBjbG9zZUV2ZW50ID0gZXZlbnQ7CiAgICAgICAgIHNob3VsZEJlRmFsc2Uo ImNsb3NlRXZlbnQud2FzQ2xlYW4iKTsKLSAgICAgICAgaWYgKGJpdE51bWJlciA9PT0gMykKKyAg ICAgICAgaWYgKGN1clRlc3RJbmRleCA9PT0gYml0X2V4dGVuc2lvbi5sZW5ndGggLSAxKQogICAg ICAgICAgICAgZmluaXNoSlNUZXN0KCk7CiAgICAgICAgIGVsc2UKLSAgICAgICAgICAgIGRvVGVz dChiaXROdW1iZXIgKyAxKTsKKyAgICAgICAgICAgIGRvVGVzdChjdXJUZXN0SW5kZXggKyAxKTsK ICAgICB9OwogfQogCi1kb1Rlc3QoMik7Citkb1Rlc3QoMCk7CiAKIDwvc2NyaXB0PgogPHNjcmlw dCBzcmM9Ii4uLy4uLy4uLy4uL2pzLXRlc3QtcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9z Y3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0 cy9oeWJpL3Jlc2VydmVkLWJpdHNfd3NoLnB5IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJz b2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weQppbmRleCA0YWQwZGZkYzU1MWIw NjU1MTU2YTZhZTEyMDg1NTQ0ZGQzYThmZWEwLi4xMWM0M2I1NTNhNDk4YjYwMmQ3MzMwZjE2Njcx NDk1NGI2MDY1N2QzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tl dC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHNfd3NoLnB5CisrKyBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0c193c2gucHkKQEAgLTMsMTcg KzMsMjUgQEAgZnJvbSBtb2RfcHl3ZWJzb2NrZXQgaW1wb3J0IGNvbW1vbgogZnJvbSBtb2RfcHl3 ZWJzb2NrZXQgaW1wb3J0IHN0cmVhbQogCiAKLWRlZiB3ZWJfc29ja2V0X2RvX2V4dHJhX2hhbmRz aGFrZShyZXF1ZXN0KToKLSAgICBwYXNzCi0KK2JpdCA9IDAKIAotZGVmIHdlYl9zb2NrZXRfdHJh bnNmZXJfZGF0YShyZXF1ZXN0KToKLSAgICBtYXRjaCA9IHJlLnNlYXJjaChyJ1w/Yml0PShcZCsp JCcsIHJlcXVlc3Qud3NfcmVzb3VyY2UpCitkZWYgd2ViX3NvY2tldF9kb19leHRyYV9oYW5kc2hh a2UocmVxdWVzdCk6CisgICAgbWF0Y2ggPSByZS5zZWFyY2gocidcP2Nhc2U9KFxkK19cZCspJCcs IHJlcXVlc3Qud3NfcmVzb3VyY2UpCiAgICAgaWYgbWF0Y2ggaXMgTm9uZToKICAgICAgICAgbXNn dXRpbC5zZW5kX21lc3NhZ2UocmVxdWVzdCwgJ0ZBSUw6IFF1ZXJ5IHZhbHVlIGlzIGluY29ycmVj dCBvciBtaXNzaW5nJykKICAgICAgICAgcmV0dXJuCisgICAgCisgICAgZ2xvYmFsIGJpdAorICAg IGJpdCwgZXh0ZW5zaW9uID0gKG1hdGNoLmdyb3VwKDEpKS5zcGxpdCgnXycsIDEpCisgICAgYml0 ID0gaW50KGJpdCkKKyAgICBleHRlbnNpb24gPSBpbnQoZXh0ZW5zaW9uKQorICAgIGlmIGV4dGVu c2lvbiA9PSAwOgorICAgICAgICByZXF1ZXN0LndzX2V4dGVuc2lvbl9wcm9jZXNzb3JzID0gW10g IyB1c2luZyBubyBleHRlbnNpb24gcmVzcG9uc2UKKyAgICBlbHNlOgorICAgICAgICBwYXNzCisK IAotICAgIGJpdCA9IGludChtYXRjaC5ncm91cCgxKSkKK2RlZiB3ZWJfc29ja2V0X3RyYW5zZmVy X2RhdGEocmVxdWVzdCk6CiAgICAgbWVzc2FnZSA9ICJUaGlzIG1lc3NhZ2Ugc2hvdWxkIGJlIGln bm9yZWQuIgogICAgIGlmIGJpdCA9PSAxOgogICAgICAgICBmcmFtZSA9IHN0cmVhbS5jcmVhdGVf aGVhZGVyKGNvbW1vbi5PUENPREVfVEVYVCwgbGVuKG1lc3NhZ2UpLCAxLCAxLCAwLCAwLCAwKSAr IG1lc3NhZ2UK 133791 2012-03-26 06:26:08 -0700 2012-03-28 17:47:29 -0700 Patch bug-82100-20120327212820.patch text/plain 5964 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMDQxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjk0YjJlYzQ5OTUyNmZiNjM4YTcz NWZlZDU1OWIxMjQ5ZjQxZDZkNC4uN2UyMzRhMzk1YzEwZDQzMjRmNjI5Mjk2MmJlOWNjMjhkMTAy YjFmMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTI3ICBMaSBZaW4gIDxsaS55aW5A aW50ZWwuY29tPgorCisgICAgICAgIFtXZWJTb2NrZXRdUmVzZXJ2ZWQgYml0cyB0ZXN0IGNhc2Ug c2hvdWxkIGNvdmVyIGJvdGggZXh0ZW5zaW9uIGFuZCBuby1leHRlbnNpb24gc2NlbmFyaW9zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjEwMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhl IGN1cnJlbnQgcmVzZXJ2ZWQgYml0cyB0ZXN0IGNhc2Ugb25seSBzdXBwb3J0IGV4dGVuc2lvbiBj YXNlLAorICAgICAgICBJbXByb3ZlIHRlc3QgY2FzZSB0byBjb3ZlciBib3RoIG5vLWV4dGVuc2lv biBhbmQgZXh0ZW5zaW9uIHNjZW5hcmlvcy4KKworICAgICAgICAqIGh0dHAvdGVzdHMvd2Vic29j a2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0 cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzLmh0bWw6CisgICAgICAg ICogaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weToK KyAgICAgICAgKHdlYl9zb2NrZXRfZG9fZXh0cmFfaGFuZHNoYWtlKToKKwogMjAxMi0wMy0yNSAg UmFwaGFlbCBLdWJvIGRhIENvc3RhICA8cmFrdWNvQEZyZWVCU0Qub3JnPgogCiAgICAgICAgIFtF RkxdIFVucmV2aWV3ZWQgZ2FyZGVuaW5nLiBVcGRhdGUgc29tZSB0YWJsZXMvbGF5ZXJpbmcvIGJh c2VsaW5lcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rl c3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMtZXhwZWN0ZWQudHh0CmluZGV4 IDYzYThkNjE3YmY2YjllNzhkNDMwZGE5ZGI5OGExZGRmMGVkNzE1OTUuLjE4ZjU4ZWVkYTBlNDE4 YTY5ZDdlMmM5NThhZTUzMjg0YjM1NzY0NGQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1i aXRzLWV4cGVjdGVkLnR4dApAQCAtMSwxNCArMSwyOSBAQAorQ09OU09MRSBNRVNTQUdFOiBSZWNl aXZlZCB1bmV4cGVjdGVkIGNvbXByZXNzZWQgZnJhbWUKK0NPTlNPTEUgTUVTU0FHRTogT25lIG9y IG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJlc2VydmVkMiA9IDEsIHJlc2VydmVkMyA9IDAK K0NPTlNPTEUgTUVTU0FHRTogT25lIG9yIG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJlc2Vy dmVkMiA9IDAsIHJlc2VydmVkMyA9IDEKIENPTlNPTEUgTUVTU0FHRTogT25lIG9yIG1vcmUgcmVz ZXJ2ZWQgYml0cyBhcmUgb246IHJlc2VydmVkMiA9IDEsIHJlc2VydmVkMyA9IDAKIENPTlNPTEUg TUVTU0FHRTogT25lIG9yIG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJlc2VydmVkMiA9IDAs IHJlc2VydmVkMyA9IDEKIFRlc3Qgd2hldGhlciBXZWJTb2NrZXQgcmVqZWN0cyBmcmFtZXMgd2hv c2UgcmVzZXJ2ZWQgYml0IGlzIG9uLgogCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJp ZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAKLUJp dCAyOiBUZXN0IHN0YXJ0ZWQuCitDYXNlIGNvbXByZXNzZWQ9ZmFsc2UmYml0X251bWJlcj0xOiBU ZXN0IHN0YXJ0ZWQuCitvbm9wZW4oKSB3YXMgY2FsbGVkLgorb25jbG9zZSgpIHdhcyBjYWxsZWQu CitQQVNTIGNsb3NlRXZlbnQud2FzQ2xlYW4gaXMgZmFsc2UKK0Nhc2UgY29tcHJlc3NlZD1mYWxz ZSZiaXRfbnVtYmVyPTI6IFRlc3Qgc3RhcnRlZC4KK29ub3BlbigpIHdhcyBjYWxsZWQuCitvbmNs b3NlKCkgd2FzIGNhbGxlZC4KK1BBU1MgY2xvc2VFdmVudC53YXNDbGVhbiBpcyBmYWxzZQorQ2Fz ZSBjb21wcmVzc2VkPWZhbHNlJmJpdF9udW1iZXI9MzogVGVzdCBzdGFydGVkLgorb25vcGVuKCkg d2FzIGNhbGxlZC4KK29uY2xvc2UoKSB3YXMgY2FsbGVkLgorUEFTUyBjbG9zZUV2ZW50Lndhc0Ns ZWFuIGlzIGZhbHNlCitDYXNlIGNvbXByZXNzZWQ9dHJ1ZSZiaXRfbnVtYmVyPTI6IFRlc3Qgc3Rh cnRlZC4KIG9ub3BlbigpIHdhcyBjYWxsZWQuCiBvbmNsb3NlKCkgd2FzIGNhbGxlZC4KIFBBU1Mg Y2xvc2VFdmVudC53YXNDbGVhbiBpcyBmYWxzZQotQml0IDM6IFRlc3Qgc3RhcnRlZC4KK0Nhc2Ug Y29tcHJlc3NlZD10cnVlJmJpdF9udW1iZXI9MzogVGVzdCBzdGFydGVkLgogb25vcGVuKCkgd2Fz IGNhbGxlZC4KIG9uY2xvc2UoKSB3YXMgY2FsbGVkLgogUEFTUyBjbG9zZUV2ZW50Lndhc0NsZWFu IGlzIGZhbHNlCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90 ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vi c29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy5odG1sCmluZGV4IGVjOGRkMzNhNzViYWJh NjY3NmEyY2NjMzM2OTJkOTQzZDMxY2Y2ODEuLjRiOGY1OTk4N2NhNGFlYzk0MjMxYWZlMDFhNWNi OTYyMDRkNWU4NjAgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0 L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy5odG1sCkBAIC0xMywxNSArMTMs MjAgQEAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOwogaWYgKHdpbmRvdy5sYXlvdXRUZXN0 Q29udHJvbGxlcikKICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5vdmVycmlkZVByZWZlcmVuY2Uo IldlYktpdEhpeGllNzZXZWJTb2NrZXRQcm90b2NvbEVuYWJsZWQiLCAwKTsKIAorLy8gImNvbXBy ZXNzZWQ9dHJ1ZSZiaXRfbnVtYmVyPTEiIG11c3Qgbm90IGJlIGluY2x1ZGVkIGluIGNvbXByZXNz X2JpdE51bWJlciBhcnJheS4KK3ZhciBjb21wcmVzc19iaXROdW1iZXIgPSBbImNvbXByZXNzZWQ9 ZmFsc2UmYml0X251bWJlcj0xIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgImNvbXByZXNz ZWQ9ZmFsc2UmYml0X251bWJlcj0yIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgImNvbXBy ZXNzZWQ9ZmFsc2UmYml0X251bWJlcj0zIiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgImNv bXByZXNzZWQ9dHJ1ZSZiaXRfbnVtYmVyPTIiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAi Y29tcHJlc3NlZD10cnVlJmJpdF9udW1iZXI9MyJdOwogdmFyIGNsb3NlRXZlbnQ7CiAKLS8vIGJp dE51bWJlciBtdXN0IGJlIDIgb3IgMy4KLWZ1bmN0aW9uIGRvVGVzdChiaXROdW1iZXIpCitmdW5j dGlvbiBkb1Rlc3QoY3VyVGVzdEluZGV4KQogewotICAgIHZhciB1cmwgPSAid3M6Ly9sb2NhbGhv c3Q6ODg4MC93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzP2JpdD0iICsgYml0TnVt YmVyOworICAgIHZhciB1cmwgPSAid3M6Ly9sb2NhbGhvc3Q6ODg4MC93ZWJzb2NrZXQvdGVzdHMv aHliaS9yZXNlcnZlZC1iaXRzPyIgKyBjb21wcmVzc19iaXROdW1iZXJbY3VyVGVzdEluZGV4XTsK ICAgICB2YXIgd3MgPSBuZXcgV2ViU29ja2V0KHVybCk7CiAKLSAgICBkZWJ1ZygiQml0ICIgKyBi aXROdW1iZXIgKyAiOiBUZXN0IHN0YXJ0ZWQuIik7CisgICAgZGVidWcoIkNhc2UgIiArIGNvbXBy ZXNzX2JpdE51bWJlcltjdXJUZXN0SW5kZXhdICsgIjogVGVzdCBzdGFydGVkLiIpOwogCiAgICAg d3Mub25vcGVuID0gZnVuY3Rpb24oKQogICAgIHsKQEAgLTM5LDE0ICs0NCwxNCBAQCBmdW5jdGlv biBkb1Rlc3QoYml0TnVtYmVyKQogICAgICAgICBkZWJ1Zygib25jbG9zZSgpIHdhcyBjYWxsZWQu Iik7CiAgICAgICAgIGNsb3NlRXZlbnQgPSBldmVudDsKICAgICAgICAgc2hvdWxkQmVGYWxzZSgi Y2xvc2VFdmVudC53YXNDbGVhbiIpOwotICAgICAgICBpZiAoYml0TnVtYmVyID09PSAzKQorICAg ICAgICBpZiAoY3VyVGVzdEluZGV4ID09PSBjb21wcmVzc19iaXROdW1iZXIubGVuZ3RoIC0gMSkK ICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBk b1Rlc3QoYml0TnVtYmVyICsgMSk7CisgICAgICAgICAgICBkb1Rlc3QoY3VyVGVzdEluZGV4ICsg MSk7CiAgICAgfTsKIH0KIAotZG9UZXN0KDIpOworZG9UZXN0KDApOwogCiA8L3NjcmlwdD4KIDxz Y3JpcHQgc3JjPSIuLi8uLi8uLi8uLi9qcy10ZXN0LXJlc291cmNlcy9qcy10ZXN0LXBvc3QuanMi Pjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQv dGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weSBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv d2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0c193c2gucHkKaW5kZXggNGFkMGRmZGM1 NTFiMDY1NTE1NmE2YWUxMjA4NTU0NGRkM2E4ZmVhMC4uNzE0ZmI5Njk2ZWY0NjQ3ZDJmYjA4NjZh YTE2YzAzNDIyMTk0NzkzMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJz b2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weQorKysgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHNfd3NoLnB5CkBAIC0z LDE3ICszLDIyIEBAIGZyb20gbW9kX3B5d2Vic29ja2V0IGltcG9ydCBjb21tb24KIGZyb20gbW9k X3B5d2Vic29ja2V0IGltcG9ydCBzdHJlYW0KIAogCi1kZWYgd2ViX3NvY2tldF9kb19leHRyYV9o YW5kc2hha2UocmVxdWVzdCk6Ci0gICAgcGFzcwotCitiaXQgPSAwCiAKLWRlZiB3ZWJfc29ja2V0 X3RyYW5zZmVyX2RhdGEocmVxdWVzdCk6Ci0gICAgbWF0Y2ggPSByZS5zZWFyY2gocidcP2JpdD0o XGQrKSQnLCByZXF1ZXN0LndzX3Jlc291cmNlKQorZGVmIHdlYl9zb2NrZXRfZG9fZXh0cmFfaGFu ZHNoYWtlKHJlcXVlc3QpOgorICAgIG1hdGNoID0gcmUuc2VhcmNoKHInXD9jb21wcmVzc2VkPSh0 cnVlfGZhbHNlKSZiaXRfbnVtYmVyPShcZCkkJywgcmVxdWVzdC53c19yZXNvdXJjZSkKICAgICBp ZiBtYXRjaCBpcyBOb25lOgogICAgICAgICBtc2d1dGlsLnNlbmRfbWVzc2FnZShyZXF1ZXN0LCAn RkFJTDogUXVlcnkgdmFsdWUgaXMgaW5jb3JyZWN0IG9yIG1pc3NpbmcnKQogICAgICAgICByZXR1 cm4KKyAgICAKKyAgICBnbG9iYWwgYml0CisgICAgY29tcHJlc3NlZCA9IG1hdGNoLmdyb3VwKDEp CisgICAgYml0ID0gaW50KG1hdGNoLmdyb3VwKDIpKQorICAgIGlmIGNvbXByZXNzZWQgPT0gImZh bHNlIjoKKyAgICAgICAgcmVxdWVzdC53c19leHRlbnNpb25fcHJvY2Vzc29ycyA9IFtdICMgdXNp bmcgbm8gZXh0ZW5zaW9uIHJlc3BvbnNlCisKIAotICAgIGJpdCA9IGludChtYXRjaC5ncm91cCgx KSkKK2RlZiB3ZWJfc29ja2V0X3RyYW5zZmVyX2RhdGEocmVxdWVzdCk6CiAgICAgbWVzc2FnZSA9 ICJUaGlzIG1lc3NhZ2Ugc2hvdWxkIGJlIGlnbm9yZWQuIgogICAgIGlmIGJpdCA9PSAxOgogICAg ICAgICBmcmFtZSA9IHN0cmVhbS5jcmVhdGVfaGVhZGVyKGNvbW1vbi5PUENPREVfVEVYVCwgbGVu KG1lc3NhZ2UpLCAxLCAxLCAwLCAwLCAwKSArIG1lc3NhZ2UK 134455 2012-03-28 17:47:39 -0700 2012-03-30 08:05:01 -0700 Patch bug-82100-20120330084955.patch text/plain 6078 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyMDQxCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjk0YjJlYzQ5OTUyNmZiNjM4YTcz NWZlZDU1OWIxMjQ5ZjQxZDZkNC4uN2UyMzRhMzk1YzEwZDQzMjRmNjI5Mjk2MmJlOWNjMjhkMTAy YjFmMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTAzLTI3ICBMaSBZaW4gIDxsaS55aW5A aW50ZWwuY29tPgorCisgICAgICAgIFtXZWJTb2NrZXRdUmVzZXJ2ZWQgYml0cyB0ZXN0IGNhc2Ug c2hvdWxkIGNvdmVyIGJvdGggZXh0ZW5zaW9uIGFuZCBuby1leHRlbnNpb24gc2NlbmFyaW9zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjEwMAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhl IGN1cnJlbnQgcmVzZXJ2ZWQgYml0cyB0ZXN0IGNhc2Ugb25seSBzdXBwb3J0IGV4dGVuc2lvbiBj YXNlLAorICAgICAgICBJbXByb3ZlIHRlc3QgY2FzZSB0byBjb3ZlciBib3RoIG5vLWV4dGVuc2lv biBhbmQgZXh0ZW5zaW9uIHNjZW5hcmlvcy4KKworICAgICAgICAqIGh0dHAvdGVzdHMvd2Vic29j a2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0 cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzLmh0bWw6CisgICAgICAg ICogaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weToK KyAgICAgICAgKHdlYl9zb2NrZXRfZG9fZXh0cmFfaGFuZHNoYWtlKToKKwogMjAxMi0wMy0yNSAg UmFwaGFlbCBLdWJvIGRhIENvc3RhICA8cmFrdWNvQEZyZWVCU0Qub3JnPgogCiAgICAgICAgIFtF RkxdIFVucmV2aWV3ZWQgZ2FyZGVuaW5nLiBVcGRhdGUgc29tZSB0YWJsZXMvbGF5ZXJpbmcvIGJh c2VsaW5lcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rl c3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMtZXhwZWN0ZWQudHh0CmluZGV4 IDYzYThkNjE3YmY2YjllNzhkNDMwZGE5ZGI5OGExZGRmMGVkNzE1OTUuLjhjZjZhMzExZjNiODUz OThjM2I2NzA1MGYyMWRiZTE2NDM3MzE3ZTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1i aXRzLWV4cGVjdGVkLnR4dApAQCAtMSwxNCArMSwyOSBAQAorQ09OU09MRSBNRVNTQUdFOiBSZWNl aXZlZCB1bmV4cGVjdGVkIGNvbXByZXNzZWQgZnJhbWUKK0NPTlNPTEUgTUVTU0FHRTogT25lIG9y IG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJlc2VydmVkMiA9IDEsIHJlc2VydmVkMyA9IDAK K0NPTlNPTEUgTUVTU0FHRTogT25lIG9yIG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJlc2Vy dmVkMiA9IDAsIHJlc2VydmVkMyA9IDEKIENPTlNPTEUgTUVTU0FHRTogT25lIG9yIG1vcmUgcmVz ZXJ2ZWQgYml0cyBhcmUgb246IHJlc2VydmVkMiA9IDEsIHJlc2VydmVkMyA9IDAKIENPTlNPTEUg TUVTU0FHRTogT25lIG9yIG1vcmUgcmVzZXJ2ZWQgYml0cyBhcmUgb246IHJlc2VydmVkMiA9IDAs IHJlc2VydmVkMyA9IDEKIFRlc3Qgd2hldGhlciBXZWJTb2NrZXQgcmVqZWN0cyBmcmFtZXMgd2hv c2UgcmVzZXJ2ZWQgYml0IGlzIG9uLgogCiBPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJp ZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCiAKLUJp dCAyOiBUZXN0IHN0YXJ0ZWQuCitDYXNlIGNvbXByZXNzZWQ9ZmFsc2UmYml0TnVtYmVyPTE6IFRl c3Qgc3RhcnRlZC4KK29ub3BlbigpIHdhcyBjYWxsZWQuCitvbmNsb3NlKCkgd2FzIGNhbGxlZC4K K1BBU1MgY2xvc2VFdmVudC53YXNDbGVhbiBpcyBmYWxzZQorQ2FzZSBjb21wcmVzc2VkPWZhbHNl JmJpdE51bWJlcj0yOiBUZXN0IHN0YXJ0ZWQuCitvbm9wZW4oKSB3YXMgY2FsbGVkLgorb25jbG9z ZSgpIHdhcyBjYWxsZWQuCitQQVNTIGNsb3NlRXZlbnQud2FzQ2xlYW4gaXMgZmFsc2UKK0Nhc2Ug Y29tcHJlc3NlZD1mYWxzZSZiaXROdW1iZXI9MzogVGVzdCBzdGFydGVkLgorb25vcGVuKCkgd2Fz IGNhbGxlZC4KK29uY2xvc2UoKSB3YXMgY2FsbGVkLgorUEFTUyBjbG9zZUV2ZW50Lndhc0NsZWFu IGlzIGZhbHNlCitDYXNlIGNvbXByZXNzZWQ9dHJ1ZSZiaXROdW1iZXI9MjogVGVzdCBzdGFydGVk Lgogb25vcGVuKCkgd2FzIGNhbGxlZC4KIG9uY2xvc2UoKSB3YXMgY2FsbGVkLgogUEFTUyBjbG9z ZUV2ZW50Lndhc0NsZWFuIGlzIGZhbHNlCi1CaXQgMzogVGVzdCBzdGFydGVkLgorQ2FzZSBjb21w cmVzc2VkPXRydWUmYml0TnVtYmVyPTM6IFRlc3Qgc3RhcnRlZC4KIG9ub3BlbigpIHdhcyBjYWxs ZWQuCiBvbmNsb3NlKCkgd2FzIGNhbGxlZC4KIFBBU1MgY2xvc2VFdmVudC53YXNDbGVhbiBpcyBm YWxzZQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMv aHliaS9yZXNlcnZlZC1iaXRzLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tl dC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRtbAppbmRleCBlYzhkZDMzYTc1YmFiYTY2NzZh MmNjYzMzNjkyZDk0M2QzMWNmNjgxLi5hNjk3M2NmOWRmYmFkMjg4MmQxNWU1NTM3YmIyY2RlN2U3 NDNkMzY2IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0 cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dl YnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRtbApAQCAtMTMsMTUgKzEzLDIwIEBA IHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKIGlmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpCiAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIub3ZlcnJpZGVQcmVmZXJlbmNlKCJXZWJL aXRIaXhpZTc2V2ViU29ja2V0UHJvdG9jb2xFbmFibGVkIiwgMCk7CiAKKy8vICJjb21wcmVzc2Vk PXRydWUmYml0TnVtYmVyPTEiIG11c3Qgbm90IGJlIGluY2x1ZGVkIGluIGNvbXByZXNzZWRBbmRC aXROdW1iZXJQYXJhbWV0ZXJzIGFycmF5LgordmFyIGNvbXByZXNzZWRBbmRCaXROdW1iZXJQYXJh bWV0ZXJzID0gWyJjb21wcmVzc2VkPWZhbHNlJmJpdE51bWJlcj0xIiwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiY29tcHJlc3NlZD1mYWxzZSZiaXROdW1iZXI9MiIs CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImNvbXByZXNzZWQ9ZmFs c2UmYml0TnVtYmVyPTMiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJjb21wcmVzc2VkPXRydWUmYml0TnVtYmVyPTIiLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJjb21wcmVzc2VkPXRydWUmYml0TnVtYmVyPTMiXTsKIHZhciBjbG9z ZUV2ZW50OwogCi0vLyBiaXROdW1iZXIgbXVzdCBiZSAyIG9yIDMuCi1mdW5jdGlvbiBkb1Rlc3Qo Yml0TnVtYmVyKQorZnVuY3Rpb24gZG9UZXN0KGN1clRlc3RJbmRleCkKIHsKLSAgICB2YXIgdXJs ID0gIndzOi8vbG9jYWxob3N0Ojg4ODAvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0 cz9iaXQ9IiArIGJpdE51bWJlcjsKKyAgICB2YXIgdXJsID0gIndzOi8vbG9jYWxob3N0Ojg4ODAv d2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cz8iICsgY29tcHJlc3NlZEFuZEJpdE51 bWJlclBhcmFtZXRlcnNbY3VyVGVzdEluZGV4XTsKICAgICB2YXIgd3MgPSBuZXcgV2ViU29ja2V0 KHVybCk7CiAKLSAgICBkZWJ1ZygiQml0ICIgKyBiaXROdW1iZXIgKyAiOiBUZXN0IHN0YXJ0ZWQu Iik7CisgICAgZGVidWcoIkNhc2UgIiArIGNvbXByZXNzZWRBbmRCaXROdW1iZXJQYXJhbWV0ZXJz W2N1clRlc3RJbmRleF0gKyAiOiBUZXN0IHN0YXJ0ZWQuIik7CiAKICAgICB3cy5vbm9wZW4gPSBm dW5jdGlvbigpCiAgICAgewpAQCAtMzksMTQgKzQ0LDE0IEBAIGZ1bmN0aW9uIGRvVGVzdChiaXRO dW1iZXIpCiAgICAgICAgIGRlYnVnKCJvbmNsb3NlKCkgd2FzIGNhbGxlZC4iKTsKICAgICAgICAg Y2xvc2VFdmVudCA9IGV2ZW50OwogICAgICAgICBzaG91bGRCZUZhbHNlKCJjbG9zZUV2ZW50Lndh c0NsZWFuIik7Ci0gICAgICAgIGlmIChiaXROdW1iZXIgPT09IDMpCisgICAgICAgIGlmIChjdXJU ZXN0SW5kZXggPT09IGNvbXByZXNzZWRBbmRCaXROdW1iZXJQYXJhbWV0ZXJzLmxlbmd0aCAtIDEp CiAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAg ZG9UZXN0KGJpdE51bWJlciArIDEpOworICAgICAgICAgICAgZG9UZXN0KGN1clRlc3RJbmRleCAr IDEpOwogICAgIH07CiB9CiAKLWRvVGVzdCgyKTsKK2RvVGVzdCgwKTsKIAogPC9zY3JpcHQ+CiA8 c2NyaXB0IHNyYz0iLi4vLi4vLi4vLi4vanMtdGVzdC1yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz Ij48L3NjcmlwdD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0 L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0c193c2gucHkgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHNfd3NoLnB5CmluZGV4IDRhZDBkZmRj NTUxYjA2NTUxNTZhNmFlMTIwODU1NDRkZDNhOGZlYTAuLjk5MDg3YmVkNjk2ZjNjY2NmODIyYThi ZDk1OTI3ODVkMzAwNWQ1MjEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vi c29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0c193c2gucHkKKysrIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weQpAQCAt MywxNyArMywyMiBAQCBmcm9tIG1vZF9weXdlYnNvY2tldCBpbXBvcnQgY29tbW9uCiBmcm9tIG1v ZF9weXdlYnNvY2tldCBpbXBvcnQgc3RyZWFtCiAKIAotZGVmIHdlYl9zb2NrZXRfZG9fZXh0cmFf aGFuZHNoYWtlKHJlcXVlc3QpOgotICAgIHBhc3MKLQorYml0ID0gMAogCi1kZWYgd2ViX3NvY2tl dF90cmFuc2Zlcl9kYXRhKHJlcXVlc3QpOgotICAgIG1hdGNoID0gcmUuc2VhcmNoKHInXD9iaXQ9 KFxkKykkJywgcmVxdWVzdC53c19yZXNvdXJjZSkKK2RlZiB3ZWJfc29ja2V0X2RvX2V4dHJhX2hh bmRzaGFrZShyZXF1ZXN0KToKKyAgICBtYXRjaCA9IHJlLnNlYXJjaChyJ1w/Y29tcHJlc3NlZD0o dHJ1ZXxmYWxzZSkmYml0TnVtYmVyPShcZCkkJywgcmVxdWVzdC53c19yZXNvdXJjZSkKICAgICBp ZiBtYXRjaCBpcyBOb25lOgogICAgICAgICBtc2d1dGlsLnNlbmRfbWVzc2FnZShyZXF1ZXN0LCAn RkFJTDogUXVlcnkgdmFsdWUgaXMgaW5jb3JyZWN0IG9yIG1pc3NpbmcnKQogICAgICAgICByZXR1 cm4KKyAgICAKKyAgICBnbG9iYWwgYml0CisgICAgY29tcHJlc3NlZCA9IG1hdGNoLmdyb3VwKDEp CisgICAgYml0ID0gaW50KG1hdGNoLmdyb3VwKDIpKQorICAgIGlmIGNvbXByZXNzZWQgPT0gImZh bHNlIjoKKyAgICAgICAgcmVxdWVzdC53c19leHRlbnNpb25fcHJvY2Vzc29ycyA9IFtdICMgdXNp bmcgbm8gZXh0ZW5zaW9uIHJlc3BvbnNlCisKIAotICAgIGJpdCA9IGludChtYXRjaC5ncm91cCgx KSkKK2RlZiB3ZWJfc29ja2V0X3RyYW5zZmVyX2RhdGEocmVxdWVzdCk6CiAgICAgbWVzc2FnZSA9 ICJUaGlzIG1lc3NhZ2Ugc2hvdWxkIGJlIGlnbm9yZWQuIgogICAgIGlmIGJpdCA9PSAxOgogICAg ICAgICBmcmFtZSA9IHN0cmVhbS5jcmVhdGVfaGVhZGVyKGNvbW1vbi5PUENPREVfVEVYVCwgbGVu KG1lc3NhZ2UpLCAxLCAxLCAwLCAwLCAwKSArIG1lc3NhZ2UK 134817 2012-03-30 08:08:25 -0700 2012-03-30 17:42:13 -0700 Patch bug-82100-20120331231043.patch text/plain 5600 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE2YmE2YWZmMDVmOTli YTA4N2EyN2ViOTkyM2U5OGI1ZWZkOTFjMS4uMDUzODc5YmNhZTAxMWUxYThhMWNlYzc5NGFjNGI5 OWIzODNjNjUyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTMxICBMaSBZ aW4gIDxsaS55aW5AaW50ZWwuY29tPgorCisgICAgICAgIFtXZWJTb2NrZXRdUmVzZXJ2ZWQgYml0 cyB0ZXN0IGNhc2Ugc2hvdWxkIGNvdmVyIGJvdGggZXh0ZW5zaW9uIGFuZCBuby1leHRlbnNpb24g c2NlbmFyaW9zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MjEwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRlc3Q6ICBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMuaHRt bCAKKworICAgICAgICBXaGVuIGl0IGhhZCBubyBuZWdvdGlhdGVkIGRlZmxhdGUtZnJhbWUgZXh0 ZW5zaW9uLCBpZiBicm93c2VyIHJlY2VpdmVkIHRoZSBmcmFtZSB3aXRoCisgICAgICAgIHNldHRp bmcgY29tcHJlc3NlZCBiaXQsIGl0IHNob3VsZCBmYWlsIHRoZSBjb25uZWN0aW9uLCBhbmQgaXQg c2hvdWxkIGNvdmVyIGJvdGgKKyAgICAgICAgZW5hYmxpbmcgWkxJQiBwb3J0IGFuZCBkaXNhYmxp bmcgWkxJQiBwb3J0LgorCisgICAgICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldERl ZmxhdGVGcmFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0RGVmbGF0ZUZyYW1l cjo6aW5mbGF0ZSk6CisKIDIwMTItMDMtMzAgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBp Z2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFdlYkF1ZGlvIGNoYW5uZWxTaXplIGlzc3VlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0RGVm bGF0ZUZyYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29j a2V0RGVmbGF0ZUZyYW1lci5jcHAKaW5kZXggNjdmOTUzM2FiZWVlZGUwYmM4MDMyNjUxNDgyOTcx NDZjNDcyNTY4Yi4uNzZjMDQwZDFjOTM3MmFiNzBlMjI2NDYwYTg3ZDJhNTVmMmM4OGZmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldERlZmxh dGVGcmFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJT b2NrZXREZWZsYXRlRnJhbWVyLmNwcApAQCAtMjE3LDExICsyMTcsMTUgQEAgdm9pZCBXZWJTb2Nr ZXREZWZsYXRlRnJhbWVyOjpyZXNldERlZmxhdGVDb250ZXh0KCkKIAogUGFzc093blB0cjxJbmZs YXRlUmVzdWx0SG9sZGVyPiBXZWJTb2NrZXREZWZsYXRlRnJhbWVyOjppbmZsYXRlKFdlYlNvY2tl dEZyYW1lJiBmcmFtZSkKIHsKLSNpZiBVU0UoWkxJQikKICAgICBPd25QdHI8SW5mbGF0ZVJlc3Vs dEhvbGRlcj4gcmVzdWx0ID0gSW5mbGF0ZVJlc3VsdEhvbGRlcjo6Y3JlYXRlKHRoaXMpOworICAg IGlmICghZW5hYmxlZCgpICYmIGZyYW1lLmNvbXByZXNzKSB7CisgICAgICAgIHJlc3VsdC0+ZmFp bCgiQ29tcHJlc3NlZCBiaXQgbXVzdCBiZSAwIGlmIG5vIG5lZ290aWF0ZWQgZGVmbGF0ZS1mcmFt ZSBleHRlbnNpb24iKTsKKyAgICAgICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CisgICAgfQor I2lmIFVTRShaTElCKQogICAgIGlmICghZnJhbWUuY29tcHJlc3MpCiAgICAgICAgIHJldHVybiBy ZXN1bHQucmVsZWFzZSgpOwotICAgIGlmICghZW5hYmxlZCgpIHx8ICFXZWJTb2NrZXRGcmFtZTo6 aXNOb25Db250cm9sT3BDb2RlKGZyYW1lLm9wQ29kZSkpIHsKKyAgICBpZiAoIVdlYlNvY2tldEZy YW1lOjppc05vbkNvbnRyb2xPcENvZGUoZnJhbWUub3BDb2RlKSkgewogICAgICAgICByZXN1bHQt PmZhaWwoIlJlY2VpdmVkIHVuZXhwZWN0ZWQgY29tcHJlc3NlZCBmcmFtZSIpOwogICAgICAgICBy ZXR1cm4gcmVzdWx0LnJlbGVhc2UoKTsKICAgICB9CkBAIC0yMzQsNyArMjM4LDcgQEAgUGFzc093 blB0cjxJbmZsYXRlUmVzdWx0SG9sZGVyPiBXZWJTb2NrZXREZWZsYXRlRnJhbWVyOjppbmZsYXRl KFdlYlNvY2tldEZyYW1lJgogICAgIGZyYW1lLnBheWxvYWRMZW5ndGggPSBtX2luZmxhdGVyLT5z aXplKCk7CiAgICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CiAjZWxzZQotICAgIHJldHVybiBJ bmZsYXRlUmVzdWx0SG9sZGVyOjpjcmVhdGUodGhpcyk7CisgICAgcmV0dXJuIHJlc3VsdC5yZWxl YXNlKCk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDcwZWQ1NmMwM2M2NzQ1NDhhY2VhZDE3YjI3Y2E3 NGMzNjBmMTkwNzUuLjI1YWQxYjhhNWY5NGE0Mzg3MzA5ZTg4NDRkOTdhOWQxZTdhMjQ1ZDQgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wMy0zMSAgTGkgWWluICA8bGkueWluQGludGVsLmNv bT4KKworICAgICAgICBbV2ViU29ja2V0XVJlc2VydmVkIGJpdHMgdGVzdCBjYXNlIHNob3VsZCBj b3ZlciBib3RoIGV4dGVuc2lvbiBhbmQgbm8tZXh0ZW5zaW9uIHNjZW5hcmlvcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODIxMDAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb2x2ZSB0aGUgcHJvYmxlbSB0 aGF0IFF0IFdlYmtpdCBmYWlsZWQgd2hlbiBydW5pbmcgdGhlIHJlc2VydmVkLWJpdHMuaHRtbAor ICAgICAgICBTdXBwb3J0IGJvdGggZW5hYmxlZCBaTElCIGFuZCBkaXNhYmxlZCBaTElCIHNjZW5h cmlvcy4KKworICAgICAgICAqIGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2 ZWQtYml0cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVz dHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weToKKyAgICAgICAgKF9nZXRfZGVmbGF0ZV9mcmFt ZV9leHRlbnNpb25fcHJvY2Vzc29yKToKKyAgICAgICAgKHdlYl9zb2NrZXRfZG9fZXh0cmFfaGFu ZHNoYWtlKToKKwogMjAxMi0wMy0zMCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxp YS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RLIHJlYmFzZWxpbmUgYWZ0ZXIgcjExMjU4 MiBhbmQgcjExMjM5MS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29j a2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMtZXhwZWN0ZWQudHh0 CmluZGV4IDhjZjZhMzExZjNiODUzOThjM2I2NzA1MGYyMWRiZTE2NDM3MzE3ZTQuLmRmMjc1YjI0 OTdhOTRlNDRlNzVhZWM4MzI0ZDY3M2JmZDg2YzMyNTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNl cnZlZC1iaXRzLWV4cGVjdGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKLUNPTlNPTEUgTUVTU0FHRTog UmVjZWl2ZWQgdW5leHBlY3RlZCBjb21wcmVzc2VkIGZyYW1lCitDT05TT0xFIE1FU1NBR0U6IENv bXByZXNzZWQgYml0IG11c3QgYmUgMCBpZiBubyBuZWdvdGlhdGVkIGRlZmxhdGUtZnJhbWUgZXh0 ZW5zaW9uCiBDT05TT0xFIE1FU1NBR0U6IE9uZSBvciBtb3JlIHJlc2VydmVkIGJpdHMgYXJlIG9u OiByZXNlcnZlZDIgPSAxLCByZXNlcnZlZDMgPSAwCiBDT05TT0xFIE1FU1NBR0U6IE9uZSBvciBt b3JlIHJlc2VydmVkIGJpdHMgYXJlIG9uOiByZXNlcnZlZDIgPSAwLCByZXNlcnZlZDMgPSAxCiBD T05TT0xFIE1FU1NBR0U6IE9uZSBvciBtb3JlIHJlc2VydmVkIGJpdHMgYXJlIG9uOiByZXNlcnZl ZDIgPSAxLCByZXNlcnZlZDMgPSAwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHNfd3NoLnB5IGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weQppbmRl eCA5OTA4N2JlZDY5NmYzY2NjZjgyMmE4YmQ5NTkyNzg1ZDMwMDVkNTIxLi5kMTlkMWY3YmZlNWY3 MWNjOTdhN2ZjOTViOWI2M2ZkYTRkNjgyNTViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHNfd3NoLnB5CisrKyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0c193 c2gucHkKQEAgLTEsMTAgKzEsMTcgQEAKIGltcG9ydCByZQogZnJvbSBtb2RfcHl3ZWJzb2NrZXQg aW1wb3J0IGNvbW1vbgogZnJvbSBtb2RfcHl3ZWJzb2NrZXQgaW1wb3J0IHN0cmVhbQotCitmcm9t IG1vZF9weXdlYnNvY2tldC5leHRlbnNpb25zIGltcG9ydCBEZWZsYXRlRnJhbWVFeHRlbnNpb25Q cm9jZXNzb3IKIAogYml0ID0gMAogCitkZWYgX2dldF9kZWZsYXRlX2ZyYW1lX2V4dGVuc2lvbl9w cm9jZXNzb3IocmVxdWVzdCk6CisgICAgZm9yIGV4dGVuc2lvbl9wcm9jZXNzb3IgaW4gcmVxdWVz dC53c19leHRlbnNpb25fcHJvY2Vzc29yczoKKyAgICAgICAgaWYgaXNpbnN0YW5jZShleHRlbnNp b25fcHJvY2Vzc29yLCBEZWZsYXRlRnJhbWVFeHRlbnNpb25Qcm9jZXNzb3IpOgorICAgICAgICAg ICAgcmV0dXJuIGV4dGVuc2lvbl9wcm9jZXNzb3IKKyAgICByZXR1cm4gTm9uZQorCisKIGRlZiB3 ZWJfc29ja2V0X2RvX2V4dHJhX2hhbmRzaGFrZShyZXF1ZXN0KToKICAgICBtYXRjaCA9IHJlLnNl YXJjaChyJ1w/Y29tcHJlc3NlZD0odHJ1ZXxmYWxzZSkmYml0TnVtYmVyPShcZCkkJywgcmVxdWVz dC53c19yZXNvdXJjZSkKICAgICBpZiBtYXRjaCBpcyBOb25lOgpAQCAtMTYsNiArMjMsMTAgQEAg ZGVmIHdlYl9zb2NrZXRfZG9fZXh0cmFfaGFuZHNoYWtlKHJlcXVlc3QpOgogICAgIGJpdCA9IGlu dChtYXRjaC5ncm91cCgyKSkKICAgICBpZiBjb21wcmVzc2VkID09ICJmYWxzZSI6CiAgICAgICAg IHJlcXVlc3Qud3NfZXh0ZW5zaW9uX3Byb2Nlc3NvcnMgPSBbXSAjIHVzaW5nIG5vIGV4dGVuc2lv biByZXNwb25zZQorICAgIGVsc2U6CisgICAgICAgIHByb2Nlc3NvciA9IF9nZXRfZGVmbGF0ZV9m cmFtZV9leHRlbnNpb25fcHJvY2Vzc29yKHJlcXVlc3QpCisgICAgICAgIGlmIG5vdCBwcm9jZXNz b3I6CisgICAgICAgICAgICByZXF1ZXN0LndzX2V4dGVuc2lvbl9wcm9jZXNzb3JzID0gW10gIyB1 c2luZyBubyBleHRlbnNpb24gcmVzcG9uc2UKIAogCiBkZWYgd2ViX3NvY2tldF90cmFuc2Zlcl9k YXRhKHJlcXVlc3QpOgo= 134918 2012-03-30 17:42:24 -0700 2012-04-01 19:53:48 -0700 Patch bug-82100-20120401084442.patch text/plain 5600 li.yin U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODE2YmE2YWZmMDVmOTli YTA4N2EyN2ViOTkyM2U5OGI1ZWZkOTFjMS4uOTY3YWIxZmY1MjQ2NDQ4ZTQyNGI1YTBhZjI5NDE3 NTE0NGE2Yjg4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTMxICBMaSBZ aW4gIDxsaS55aW5AaW50ZWwuY29tPgorCisgICAgICAgIFtXZWJTb2NrZXRdUmVzZXJ2ZWQgYml0 cyB0ZXN0IGNhc2Ugc2hvdWxkIGNvdmVyIGJvdGggZXh0ZW5zaW9uIGFuZCBuby1leHRlbnNpb24g c2NlbmFyaW9zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD04MjEwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFdoZW4gaXQgaGFkIG5vIG5lZ290aWF0ZWQgZGVmbGF0ZS1mcmFtZSBleHRlbnNpb24sIGlmIGJy b3dzZXIgcmVjZWl2ZWQgdGhlIGZyYW1lIHdpdGgKKyAgICAgICAgc2V0dGluZyBjb21wcmVzc2Vk IGJpdCwgaXQgc2hvdWxkIGZhaWwgdGhlIGNvbm5lY3Rpb24sIGFuZCBpdCBzaG91bGQgY292ZXIg Ym90aAorICAgICAgICBlbmFibGluZyBaTElCIHBvcnQgYW5kIGRpc2FibGluZyBaTElCIHBvcnQu CisKKyAgICAgICAgVGVzdDogIGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2 ZWQtYml0cy5odG1sIAorCisgICAgICAgICogTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldERl ZmxhdGVGcmFtZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2ViU29ja2V0RGVmbGF0ZUZyYW1l cjo6aW5mbGF0ZSk6CisKIDIwMTItMDMtMzAgIFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBp Z2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFdlYkF1ZGlvIGNoYW5uZWxTaXplIGlzc3VlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29ja2V0RGVm bGF0ZUZyYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvV2ViU29j a2V0RGVmbGF0ZUZyYW1lci5jcHAKaW5kZXggNjdmOTUzM2FiZWVlZGUwYmM4MDMyNjUxNDgyOTcx NDZjNDcyNTY4Yi4uNzZjMDQwZDFjOTM3MmFiNzBlMjI2NDYwYTg3ZDJhNTVmMmM4OGZmMCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1dlYlNvY2tldERlZmxh dGVGcmFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9XZWJT b2NrZXREZWZsYXRlRnJhbWVyLmNwcApAQCAtMjE3LDExICsyMTcsMTUgQEAgdm9pZCBXZWJTb2Nr ZXREZWZsYXRlRnJhbWVyOjpyZXNldERlZmxhdGVDb250ZXh0KCkKIAogUGFzc093blB0cjxJbmZs YXRlUmVzdWx0SG9sZGVyPiBXZWJTb2NrZXREZWZsYXRlRnJhbWVyOjppbmZsYXRlKFdlYlNvY2tl dEZyYW1lJiBmcmFtZSkKIHsKLSNpZiBVU0UoWkxJQikKICAgICBPd25QdHI8SW5mbGF0ZVJlc3Vs dEhvbGRlcj4gcmVzdWx0ID0gSW5mbGF0ZVJlc3VsdEhvbGRlcjo6Y3JlYXRlKHRoaXMpOworICAg IGlmICghZW5hYmxlZCgpICYmIGZyYW1lLmNvbXByZXNzKSB7CisgICAgICAgIHJlc3VsdC0+ZmFp bCgiQ29tcHJlc3NlZCBiaXQgbXVzdCBiZSAwIGlmIG5vIG5lZ290aWF0ZWQgZGVmbGF0ZS1mcmFt ZSBleHRlbnNpb24iKTsKKyAgICAgICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CisgICAgfQor I2lmIFVTRShaTElCKQogICAgIGlmICghZnJhbWUuY29tcHJlc3MpCiAgICAgICAgIHJldHVybiBy ZXN1bHQucmVsZWFzZSgpOwotICAgIGlmICghZW5hYmxlZCgpIHx8ICFXZWJTb2NrZXRGcmFtZTo6 aXNOb25Db250cm9sT3BDb2RlKGZyYW1lLm9wQ29kZSkpIHsKKyAgICBpZiAoIVdlYlNvY2tldEZy YW1lOjppc05vbkNvbnRyb2xPcENvZGUoZnJhbWUub3BDb2RlKSkgewogICAgICAgICByZXN1bHQt PmZhaWwoIlJlY2VpdmVkIHVuZXhwZWN0ZWQgY29tcHJlc3NlZCBmcmFtZSIpOwogICAgICAgICBy ZXR1cm4gcmVzdWx0LnJlbGVhc2UoKTsKICAgICB9CkBAIC0yMzQsNyArMjM4LDcgQEAgUGFzc093 blB0cjxJbmZsYXRlUmVzdWx0SG9sZGVyPiBXZWJTb2NrZXREZWZsYXRlRnJhbWVyOjppbmZsYXRl KFdlYlNvY2tldEZyYW1lJgogICAgIGZyYW1lLnBheWxvYWRMZW5ndGggPSBtX2luZmxhdGVyLT5z aXplKCk7CiAgICAgcmV0dXJuIHJlc3VsdC5yZWxlYXNlKCk7CiAjZWxzZQotICAgIHJldHVybiBJ bmZsYXRlUmVzdWx0SG9sZGVyOjpjcmVhdGUodGhpcyk7CisgICAgcmV0dXJuIHJlc3VsdC5yZWxl YXNlKCk7CiAjZW5kaWYKIH0KIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDcwZWQ1NmMwM2M2NzQ1NDhhY2VhZDE3YjI3Y2E3 NGMzNjBmMTkwNzUuLjI1YWQxYjhhNWY5NGE0Mzg3MzA5ZTg4NDRkOTdhOWQxZTdhMjQ1ZDQgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxMi0wMy0zMSAgTGkgWWluICA8bGkueWluQGludGVsLmNv bT4KKworICAgICAgICBbV2ViU29ja2V0XVJlc2VydmVkIGJpdHMgdGVzdCBjYXNlIHNob3VsZCBj b3ZlciBib3RoIGV4dGVuc2lvbiBhbmQgbm8tZXh0ZW5zaW9uIHNjZW5hcmlvcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODIxMDAKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb2x2ZSB0aGUgcHJvYmxlbSB0 aGF0IFF0IFdlYmtpdCBmYWlsZWQgd2hlbiBydW5pbmcgdGhlIHJlc2VydmVkLWJpdHMuaHRtbAor ICAgICAgICBTdXBwb3J0IGJvdGggZW5hYmxlZCBaTElCIGFuZCBkaXNhYmxlZCBaTElCIHNjZW5h cmlvcy4KKworICAgICAgICAqIGh0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2 ZWQtYml0cy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVz dHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weToKKyAgICAgICAgKF9nZXRfZGVmbGF0ZV9mcmFt ZV9leHRlbnNpb25fcHJvY2Vzc29yKToKKyAgICAgICAgKHdlYl9zb2NrZXRfZG9fZXh0cmFfaGFu ZHNoYWtlKToKKwogMjAxMi0wMy0zMCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxp YS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgR1RLIHJlYmFzZWxpbmUgYWZ0ZXIgcjExMjU4 MiBhbmQgcjExMjM5MS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29j a2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9o dHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHMtZXhwZWN0ZWQudHh0 CmluZGV4IDhjZjZhMzExZjNiODUzOThjM2I2NzA1MGYyMWRiZTE2NDM3MzE3ZTQuLmRmMjc1YjI0 OTdhOTRlNDRlNzVhZWM4MzI0ZDY3M2JmZDg2YzMyNTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0cy1leHBlY3RlZC50 eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNl cnZlZC1iaXRzLWV4cGVjdGVkLnR4dApAQCAtMSw0ICsxLDQgQEAKLUNPTlNPTEUgTUVTU0FHRTog UmVjZWl2ZWQgdW5leHBlY3RlZCBjb21wcmVzc2VkIGZyYW1lCitDT05TT0xFIE1FU1NBR0U6IENv bXByZXNzZWQgYml0IG11c3QgYmUgMCBpZiBubyBuZWdvdGlhdGVkIGRlZmxhdGUtZnJhbWUgZXh0 ZW5zaW9uCiBDT05TT0xFIE1FU1NBR0U6IE9uZSBvciBtb3JlIHJlc2VydmVkIGJpdHMgYXJlIG9u OiByZXNlcnZlZDIgPSAxLCByZXNlcnZlZDMgPSAwCiBDT05TT0xFIE1FU1NBR0U6IE9uZSBvciBt b3JlIHJlc2VydmVkIGJpdHMgYXJlIG9uOiByZXNlcnZlZDIgPSAwLCByZXNlcnZlZDMgPSAxCiBD T05TT0xFIE1FU1NBR0U6IE9uZSBvciBtb3JlIHJlc2VydmVkIGJpdHMgYXJlIG9uOiByZXNlcnZl ZDIgPSAxLCByZXNlcnZlZDMgPSAwCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHNfd3NoLnB5IGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy93ZWJzb2NrZXQvdGVzdHMvaHliaS9yZXNlcnZlZC1iaXRzX3dzaC5weQppbmRl eCA5OTA4N2JlZDY5NmYzY2NjZjgyMmE4YmQ5NTkyNzg1ZDMwMDVkNTIxLi5kMTlkMWY3YmZlNWY3 MWNjOTdhN2ZjOTViOWI2M2ZkYTRkNjgyNTViIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3dlYnNvY2tldC90ZXN0cy9oeWJpL3Jlc2VydmVkLWJpdHNfd3NoLnB5CisrKyBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvd2Vic29ja2V0L3Rlc3RzL2h5YmkvcmVzZXJ2ZWQtYml0c193 c2gucHkKQEAgLTEsMTAgKzEsMTcgQEAKIGltcG9ydCByZQogZnJvbSBtb2RfcHl3ZWJzb2NrZXQg aW1wb3J0IGNvbW1vbgogZnJvbSBtb2RfcHl3ZWJzb2NrZXQgaW1wb3J0IHN0cmVhbQotCitmcm9t IG1vZF9weXdlYnNvY2tldC5leHRlbnNpb25zIGltcG9ydCBEZWZsYXRlRnJhbWVFeHRlbnNpb25Q cm9jZXNzb3IKIAogYml0ID0gMAogCitkZWYgX2dldF9kZWZsYXRlX2ZyYW1lX2V4dGVuc2lvbl9w cm9jZXNzb3IocmVxdWVzdCk6CisgICAgZm9yIGV4dGVuc2lvbl9wcm9jZXNzb3IgaW4gcmVxdWVz dC53c19leHRlbnNpb25fcHJvY2Vzc29yczoKKyAgICAgICAgaWYgaXNpbnN0YW5jZShleHRlbnNp b25fcHJvY2Vzc29yLCBEZWZsYXRlRnJhbWVFeHRlbnNpb25Qcm9jZXNzb3IpOgorICAgICAgICAg ICAgcmV0dXJuIGV4dGVuc2lvbl9wcm9jZXNzb3IKKyAgICByZXR1cm4gTm9uZQorCisKIGRlZiB3 ZWJfc29ja2V0X2RvX2V4dHJhX2hhbmRzaGFrZShyZXF1ZXN0KToKICAgICBtYXRjaCA9IHJlLnNl YXJjaChyJ1w/Y29tcHJlc3NlZD0odHJ1ZXxmYWxzZSkmYml0TnVtYmVyPShcZCkkJywgcmVxdWVz dC53c19yZXNvdXJjZSkKICAgICBpZiBtYXRjaCBpcyBOb25lOgpAQCAtMTYsNiArMjMsMTAgQEAg ZGVmIHdlYl9zb2NrZXRfZG9fZXh0cmFfaGFuZHNoYWtlKHJlcXVlc3QpOgogICAgIGJpdCA9IGlu dChtYXRjaC5ncm91cCgyKSkKICAgICBpZiBjb21wcmVzc2VkID09ICJmYWxzZSI6CiAgICAgICAg IHJlcXVlc3Qud3NfZXh0ZW5zaW9uX3Byb2Nlc3NvcnMgPSBbXSAjIHVzaW5nIG5vIGV4dGVuc2lv biByZXNwb25zZQorICAgIGVsc2U6CisgICAgICAgIHByb2Nlc3NvciA9IF9nZXRfZGVmbGF0ZV9m cmFtZV9leHRlbnNpb25fcHJvY2Vzc29yKHJlcXVlc3QpCisgICAgICAgIGlmIG5vdCBwcm9jZXNz b3I6CisgICAgICAgICAgICByZXF1ZXN0LndzX2V4dGVuc2lvbl9wcm9jZXNzb3JzID0gW10gIyB1 c2luZyBubyBleHRlbnNpb24gcmVzcG9uc2UKIAogCiBkZWYgd2ViX3NvY2tldF90cmFuc2Zlcl9k YXRhKHJlcXVlc3QpOgo=