93214 2012-08-05 18:19:26 -0700 [EFL][DRT] http/tests/loading/307-after-303-after-post.html times out 2013-02-19 10:29:58 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 joone webkit-unassigned cdumez danw gustavo gyuyoung.kim laszlo.gombos lucas.de.marchi mrobinson rakuco svillar webkit.review.bot youennf oldest_to_newest 687691 0 joone 2012-08-05 18:19:26 -0700 http/tests/loading/307-after-303-after-post.html times out on EFL64bit-debug-WK1 727474 1 rakuco 2012-09-25 03:42:34 -0700 For the record: as of r129481, it is failing on the WK2 bot with [ Failure Timeout Pass ]. 825241 2 186569 youennf 2013-02-05 00:57:37 -0800 Created attachment 186569 Patch 825448 3 186569 danw 2013-02-05 06:45:43 -0800 Comment on attachment 186569 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=186569&action=review > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:425 > if (message->method == SOUP_METHOD_GET) > - return false; > + return request.httpMethod() != "GET"; Why are message->method and request.httpMethod() different? 828557 4 youennf 2013-02-08 07:31:56 -0800 request->httpMethod() is set from POST to GET after the 303 redirection in doRedirect. But handle->firstRequest().httpMethod() is left unchanged. On the next call to doRedirect, request->httpMethod() will be again set to POST. message and message->method are persistent over the redirection response. After the 303 redirection, message->method is set to GET and its value will remain as is. 828659 5 danw 2013-02-08 10:12:46 -0800 ah... kov and I were talking about this at one point... There's a lot of code that's using firstRequest when it really means "mostRecentRequest". I tried fixing this at one point but didn't get very far. But anyway, that's the problem here; the logic in shouldRedirectAsGET() is correct, it's just that "request" was initialized with the wrong method. So I think the right fix is to add request.setHTTPMethod(message->method); right after the request.setURL() line. 828684 6 danw 2013-02-08 11:07:04 -0800 ok, actually that won't work because firstRequest will still have the request body too... I guess your patch works, but the underlying problem is that we're using firstRequest to initialize the new request, and we really should be using the request that we sent last time instead. 828698 7 mrobinson 2013-02-08 11:35:35 -0800 (In reply to comment #6) > ok, actually that won't work because firstRequest will still have the request body too... > > I guess your patch works, but the underlying problem is that we're using firstRequest to initialize the new request, and we really should be using the request that we sent last time instead. Could we fix this problem by simply storing that request? 829304 8 youennf 2013-02-10 09:51:36 -0800 Ah, I thought keeping firstRequest as is was part of the design. I will look at this again with that in mind. Also, would it make sense to try renaming "firstRequest" in the source code? 829317 9 danw 2013-02-10 10:51:39 -0800 firstRequest is part of the platform-independent part of ResourceHandle, and there are places where it's used where they really do want the first request. (I think...) 829766 10 187594 youennf 2013-02-11 09:06:39 -0800 Created attachment 187594 Patch 829769 11 youennf 2013-02-11 09:09:26 -0800 After reading the code again, I would tend to stick with the current approach. Storing a modified ResourceRequest is deviating from other port strategies. It may also take more work to keep in sync things (referer, auth..) between the hops than go from firstRequest to the latest hop. In the newly submitted patch, shouldRedirectAsGET is not modified. The check is directly added in doRedirect. The check is a bit looser than in the previous patch but I hope it is fine as is. I also renamed request in newRequest, in the hope it makes the code clearer. In the same vein, there is some code that looks a bit suspicious in resourceHandleSoup.cpp/handleUnignoredTLSErrors. The host name that is used to retrieve certificates (that are not CA validated but granted by user) is coming from firstRequest. To properly handle redirections, it may be better to get it directly from the soup layer. 829820 12 187594 mrobinson 2013-02-11 10:01:56 -0800 Comment on attachment 187594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187594&action=review Perhaps it makes sense to unskip this test on GTK+ as well? > Source/WebCore/ChangeLog:5 > + [EFL][DRT] Ensured that GET verb is used for requests > + triggered from a succession of 307 and other 3XX responses. > + https://bugs.webkit.org/show_bug.cgi?id=93214 The first line should be the bug title and then the description should go underneath. > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:457 > - ResourceRequest request = handle->firstRequest(); > + ResourceRequest newRequest = handle->firstRequest(); I like this change a lot! > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:468 > + if (shouldRedirectAsGET(message, newURL, crossOrigin) || newRequest.httpMethod() != message->method) { > + newRequest.setHTTPMethod("GET"); > + newRequest.setHTTPBody(0); > + newRequest.clearHTTPContentType(); > } Hrm. Shouldn't this restore the original method instead of just unconditionally using GET? In any case, why not roll this into shouldRedirectAsGET? 829865 13 youennf 2013-02-11 10:37:15 -0800 > Perhaps it makes sense to unskip this test on GTK+ as well? On GTK+, there is a bug in the DRT that prevents printing the expected output (https://bugs.webkit.org/show_bug.cgi?id=35300) Once this bug is solved, it should be fine to unskip it. > The first line should be the bug title and then the description should go underneath. I will change this when reposting the patch. > Hrm. Shouldn't this restore the original method instead of just unconditionally using GET? In any case, why not roll this into shouldRedirectAsGET? It's right that the check is a bit loose. In theory, we should check equality of the methods only if the soup request is a GET. But in practice for HTTP, the methods will be different only if a redirect enforces the verb to go from value to GET. Should it be tightened? Concerning shouldRedirectAsGET, the test was included in the previous patch. I received the feedback that it would be better to decouple the pure http logic (implemented in shouldRedirectAsGET) from this test which is related to the implementation strategy (always start from the original request). 830897 14 danw 2013-02-12 06:44:24 -0800 *** Bug 109576 has been marked as a duplicate of this bug. *** 830932 15 svillar 2013-02-12 07:29:25 -0800 I worked on this same issue in bug 109576. I replaced the implementation of shouldRedirecAsGET() by a more simpler version, basically + if (((message->status_code == SOUP_STATUS_MOVED_PERMANENTLY) + || (message->status_code == SOUP_STATUS_FOUND) + || (message->status_code == SOUP_STATUS_SEE_OTHER)) + && (request.httpMethod() == "POST")) return true; Do we really need all the checks we have right now? 830949 16 danw 2013-02-12 07:57:20 -0800 (In reply to comment #15) > Do we really need all the checks we have right now? Yes. WebKit's tests don't test all of the possibilities. Removing some of those cases would break web pages. 833080 17 188352 youennf 2013-02-14 07:55:23 -0800 Created attachment 188352 Patch 833086 18 youennf 2013-02-14 08:00:52 -0800 http://greenbytes.de/tech/tc/httpredirects/ and http://www.mnot.net/javascript/xmlhttprequest/#mr.HEAD.301 are good pointers for shouldRedirectAsGET logic. I plan to work on adding some webkit tests based on that work. HEAD redirections could be improved for instance. 833101 19 188352 svillar 2013-02-14 08:30:35 -0800 Comment on attachment 188352 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=188352&action=review > LayoutTests/platform/efl/TestExpectations:763 > +webkit.org/b/93214 http/tests/loading/307-after-303-after-post.html [ Crash Pass Timeout ] Remove it also from Gtk's TestExpectations 833759 20 youennf 2013-02-15 00:12:34 -0800 (In reply to comment #19) > (From update of attachment 188352 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=188352&action=review > > > LayoutTests/platform/efl/TestExpectations:763 > > +webkit.org/b/93214 http/tests/loading/307-after-303-after-post.html [ Crash Pass Timeout ] > > Remove it also from Gtk's TestExpectations The test is failing with Gtk/wk1 (DRT is not printing the initial resource URL correctly, see also bug 35300). For Gtk/wk2, the test is failing, but that may be my setup (additional favicon.ico lines are printed..). Are you suggesting to create an expected test result file to pass the tests? 835299 21 svillar 2013-02-18 03:19:03 -0800 (In reply to comment #20) > (In reply to comment #19) > > (From update of attachment 188352 [details] [details]) > > View in context: https://bugs.webkit.org/attachment.cgi?id=188352&action=review > > > > > LayoutTests/platform/efl/TestExpectations:763 > > > +webkit.org/b/93214 http/tests/loading/307-after-303-after-post.html [ Crash Pass Timeout ] > > > > Remove it also from Gtk's TestExpectations > > The test is failing with Gtk/wk1 (DRT is not printing the initial resource URL correctly, see also bug 35300). > For Gtk/wk2, the test is failing, but that may be my setup (additional favicon.ico lines are printed..). > Are you suggesting to create an expected test result file to pass the tests? Yeah you're right, let's forget about WK1. Let's try to land this ASAP 836523 22 188352 webkit.review.bot 2013-02-19 10:29:52 -0800 Comment on attachment 188352 Patch Clearing flags on attachment: 188352 Committed r143352: <http://trac.webkit.org/changeset/143352> 836524 23 webkit.review.bot 2013-02-19 10:29:58 -0800 All reviewed patches have been landed. Closing bug. 186569 2013-02-05 00:57:37 -0800 2013-02-11 09:06:31 -0800 Patch bug-93214-20130205095414.patch text/plain 3655 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxODY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWNiYTk2M2JjODJmMjk0 ZDU1NTdhNmU2ZWZiYjEyZDBkMzczZjM1Zi4uODE5YjI5NjViNWQxMThmNTFjMjlmYjQ1MTAwZmQ2 YjQzZThiMWIzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTA1ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBFbnN1 cmVkIHRoYXQgR0VUIHZlcmIgaXMgdXNlZCBmb3IgcmVxdWVzdHMKKyAgICAgICAgdHJpZ2dlcmVk IGZyb20gYSBzdWNjZXNzaW9uIG9mIDMwNyBhbmQgb3RoZXIgM1hYIHJlc3BvbnNlcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMjE0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnNob3Vs ZFJlZGlyZWN0QXNHRVQpOgorICAgICAgICAoV2ViQ29yZTo6ZG9SZWRpcmVjdCk6CisKIDIwMTMt MDItMDUgIFByYXZlZW4gSmFkaGF2ICA8cHJhdmVlbi5qQHNhbXN1bmcuY29tPgogCiAgICAgICAg IEZsb2F0aW5nIHBvaW50IHByZWNpc2lvbiBlcnJvciBpbiBBdWRpb1Bhbm5lck5vZGUuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5k bGVTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJj ZUhhbmRsZVNvdXAuY3BwCmluZGV4IDFmNmFmM2NjMTQzYmRjMmYyOTY1YmIzNjE2NDZiMTZjMzkw OWI5ZGIuLmJhMWE4YjdiZDllZDU4NWZjZjVlMmRmNDBjY2RlYWY4YzIwYzI3ZjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNv dXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJj ZUhhbmRsZVNvdXAuY3BwCkBAIC00MTksMTAgKzQxOSwxMCBAQCBzdGF0aWMgYm9vbCBzaG91bGRS ZWRpcmVjdChSZXNvdXJjZUhhbmRsZSogaGFuZGxlKQogICAgIHJldHVybiB0cnVlOwogfQogCi1z dGF0aWMgYm9vbCBzaG91bGRSZWRpcmVjdEFzR0VUKFNvdXBNZXNzYWdlKiBtZXNzYWdlLCBLVVJM JiBuZXdVUkwsIGJvb2wgY3Jvc3NPcmlnaW4pCitzdGF0aWMgYm9vbCBzaG91bGRSZWRpcmVjdEFz R0VUKFJlc291cmNlUmVxdWVzdCAmcmVxdWVzdCwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIEtVUkwm IG5ld1VSTCwgYm9vbCBjcm9zc09yaWdpbikKIHsKICAgICBpZiAobWVzc2FnZS0+bWV0aG9kID09 IFNPVVBfTUVUSE9EX0dFVCkKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICByZXR1cm4g cmVxdWVzdC5odHRwTWV0aG9kKCkgIT0gIkdFVCI7CiAKICAgICBpZiAoIW5ld1VSTC5wcm90b2Nv bElzSW5IVFRQRmFtaWx5KCkpCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtNDYxLDcgKzQ2MSw3 IEBAIHN0YXRpYyB2b2lkIGRvUmVkaXJlY3QoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAgICBi b29sIGNyb3NzT3JpZ2luID0gIXByb3RvY29sSG9zdEFuZFBvcnRBcmVFcXVhbChyZXF1ZXN0LnVy bCgpLCBuZXdVUkwpOwogICAgIHJlcXVlc3Quc2V0VVJMKG5ld1VSTCk7CiAKLSAgICBpZiAoc2hv dWxkUmVkaXJlY3RBc0dFVChtZXNzYWdlLCBuZXdVUkwsIGNyb3NzT3JpZ2luKSkgeworICAgIGlm IChzaG91bGRSZWRpcmVjdEFzR0VUKHJlcXVlc3QsIG1lc3NhZ2UsIG5ld1VSTCwgY3Jvc3NPcmln aW4pKSB7CiAgICAgICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZCgiR0VUIik7CiAgICAgICAgIHJl cXVlc3Quc2V0SFRUUEJvZHkoMCk7CiAgICAgICAgIHJlcXVlc3QuY2xlYXJIVFRQQ29udGVudFR5 cGUoKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwppbmRleCAzODVhOGY4Y2NmNDAxMmNlODczNDc3ZmNhZjZmYTQxOTI5YTgwMGVjLi40 NWE4OGU4ZmYwMjE4MDlhMDQwYjRmNDkxMDI1ZjllMTJjNWNhYTc0IDEwMDY0NAotLS0gYS9MYXlv dXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTMgQEAKKzIwMTMtMDItMDUgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5mQGdtYWlsLmNvbT4KKwor ICAgICAgICBbRUZMXVtEUlRdIFJlbW92ZWQgRmFpbHVyZSBmcm9tIHBvdGVudGlhbCBvdXRjb21l IG9mIAorICAgICAgICBodHRwL3Rlc3RzL2xvYWRpbmcvMzA3LWFmdGVyLTMwMy1hZnRlci1wb3N0 Lmh0bWwgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTMyMTQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICAqIHBsYXRmb3JtL2VmbC9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDEzLTAyLTA1ICBQcmF2ZWVu IEphZGhhdiAgPHByYXZlZW4uakBzYW1zdW5nLmNvbT4KIAogICAgICAgICBGbG9hdGluZyBwb2lu dCBwcmVjaXNpb24gZXJyb3IgaW4gQXVkaW9QYW5uZXJOb2RlLgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vZWZsL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9y bS9lZmwvVGVzdEV4cGVjdGF0aW9ucwppbmRleCAwYjRkNWExOTQxOWVmNjMzODFiM2YxNDk3ZGZm NmI4MTEzNWI4YmNkLi4zYzI2ZGI0OGUwNzI4OTEyODFkZjI5N2NlNDI3YTZiOWRmZDBlMzc0IDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucworKysg Yi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9ucwpAQCAtNzYxLDcgKzc2 MSw3IEBAIHdlYmtpdC5vcmcvYi83NzYzMSBmYXN0L211bHRpY29sL3NwYW4vc3Bhbi1hcy1pbW1l ZGlhdGUtY2hpbGQtcHJvcGVydHktcmVtb3ZhbC5oCiB3ZWJraXQub3JnL2IvNzc2MzEgZmFzdC9t dWx0aWNvbC9zcGFuL3NwYW4tYXMtaW1tZWRpYXRlLWNvbHVtbnMtY2hpbGQtcmVtb3ZhbC5odG1s IFsgRmFpbHVyZSBQYXNzIF0KIAogd2Via2l0Lm9yZy9iLzkzMjEzIGZhc3QvdGV4dC9pbnRlcm5h dGlvbmFsL3RleHQtc3BsaWNlZC1mb250Lmh0bWwgWyBGYWlsdXJlIFBhc3MgXQotd2Via2l0Lm9y Zy9iLzkzMjE0IGh0dHAvdGVzdHMvbG9hZGluZy8zMDctYWZ0ZXItMzAzLWFmdGVyLXBvc3QuaHRt bCBbIENyYXNoIEZhaWx1cmUgUGFzcyBUaW1lb3V0IF0KK3dlYmtpdC5vcmcvYi85MzIxNCBodHRw L3Rlc3RzL2xvYWRpbmcvMzA3LWFmdGVyLTMwMy1hZnRlci1wb3N0Lmh0bWwgWyBDcmFzaCBQYXNz IFRpbWVvdXQgXQogd2Via2l0Lm9yZy9iLzkzMjEyIGh0dHAvdGVzdHMvaW5jcmVtZW50YWwvc2xv dy11dGY4LXRleHQucGwgWyBQYXNzIFRpbWVvdXQgXQogCiB3ZWJraXQub3JnL2IvODUxODAgbWVk aWEvYXVkaW8tZGVsZXRlLXdoaWxlLXN0ZXAtYnV0dG9uLWNsaWNrZWQuaHRtbCBbIEZhaWx1cmUg UGFzcyBdCg== 187594 2013-02-11 09:06:39 -0800 2013-02-14 07:55:16 -0800 Patch bug-93214-20130211180308.patch text/plain 4814 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyNDYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJjNjc0MWUxNTg5NmY5 NDAwMTJlYzVmMGNkMDNiNTIxY2MzMjlhYi4uNjQ1YWY0NDMxOWIwOGU0YzU5MWZjOWM4MmJlNzZm YjBjMTg0YTVlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEzLTAyLTExICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBFbnN1 cmVkIHRoYXQgR0VUIHZlcmIgaXMgdXNlZCBmb3IgcmVxdWVzdHMKKyAgICAgICAgdHJpZ2dlcmVk IGZyb20gYSBzdWNjZXNzaW9uIG9mIDMwNyBhbmQgb3RoZXIgM1hYIHJlc3BvbnNlcy4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMjE0CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRvUmVk aXJlY3QpOgorCiAyMDEzLTAyLTExICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXVtDbGFuZ10gQnVpbGQgZXJyb3JzIGluIExvY2FsaXplZFN0cmlu Z3NHdGsuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IGYzODdhZjUxMjkxNzRlNGE0NDQ3 ZjBiODFkOTBmYzFmOWNkZmU5MmEuLjlhMjQ5NzQxYzgzMWY4MDBlMWZkZDhmNmVjYjI4MDk3ZDJk OTZkMDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZUhhbmRsZVNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBAIC00NTQsNDggKzQ1NCw0OCBAQCBzdGF0 aWMgdm9pZCBkb1JlZGlyZWN0KFJlc291cmNlSGFuZGxlKiBoYW5kbGUpCiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKLSAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCA9IGhhbmRsZS0+Zmlyc3RS ZXF1ZXN0KCk7CisgICAgUmVzb3VyY2VSZXF1ZXN0IG5ld1JlcXVlc3QgPSBoYW5kbGUtPmZpcnN0 UmVxdWVzdCgpOwogICAgIFNvdXBNZXNzYWdlKiBtZXNzYWdlID0gZC0+bV9zb3VwTWVzc2FnZS5n ZXQoKTsKICAgICBjb25zdCBjaGFyKiBsb2NhdGlvbiA9IHNvdXBfbWVzc2FnZV9oZWFkZXJzX2dl dF9vbmUobWVzc2FnZS0+cmVzcG9uc2VfaGVhZGVycywgIkxvY2F0aW9uIik7CiAgICAgS1VSTCBu ZXdVUkwgPSBLVVJMKHNvdXBVUklUb0tVUkwoc291cF9tZXNzYWdlX2dldF91cmkobWVzc2FnZSkp LCBsb2NhdGlvbik7Ci0gICAgYm9vbCBjcm9zc09yaWdpbiA9ICFwcm90b2NvbEhvc3RBbmRQb3J0 QXJlRXF1YWwocmVxdWVzdC51cmwoKSwgbmV3VVJMKTsKLSAgICByZXF1ZXN0LnNldFVSTChuZXdV UkwpOworICAgIGJvb2wgY3Jvc3NPcmlnaW4gPSAhcHJvdG9jb2xIb3N0QW5kUG9ydEFyZUVxdWFs KG5ld1JlcXVlc3QudXJsKCksIG5ld1VSTCk7CisgICAgbmV3UmVxdWVzdC5zZXRVUkwobmV3VVJM KTsKIAotICAgIGlmIChzaG91bGRSZWRpcmVjdEFzR0VUKG1lc3NhZ2UsIG5ld1VSTCwgY3Jvc3NP cmlnaW4pKSB7Ci0gICAgICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZCgiR0VUIik7Ci0gICAgICAg IHJlcXVlc3Quc2V0SFRUUEJvZHkoMCk7Ci0gICAgICAgIHJlcXVlc3QuY2xlYXJIVFRQQ29udGVu dFR5cGUoKTsKKyAgICBpZiAoc2hvdWxkUmVkaXJlY3RBc0dFVChtZXNzYWdlLCBuZXdVUkwsIGNy b3NzT3JpZ2luKSB8fCBuZXdSZXF1ZXN0Lmh0dHBNZXRob2QoKSAhPSBtZXNzYWdlLT5tZXRob2Qp IHsKKyAgICAgICAgbmV3UmVxdWVzdC5zZXRIVFRQTWV0aG9kKCJHRVQiKTsKKyAgICAgICAgbmV3 UmVxdWVzdC5zZXRIVFRQQm9keSgwKTsKKyAgICAgICAgbmV3UmVxdWVzdC5jbGVhckhUVFBDb250 ZW50VHlwZSgpOwogICAgIH0KIAogICAgIC8vIFNob3VsZCBub3Qgc2V0IFJlZmVyZXIgYWZ0ZXIg YSByZWRpcmVjdCBmcm9tIGEgc2VjdXJlIHJlc291cmNlIHRvIG5vbi1zZWN1cmUgb25lLgotICAg IGlmICghbmV3VVJMLnByb3RvY29sSXMoImh0dHBzIikgJiYgcHJvdG9jb2xJcyhyZXF1ZXN0Lmh0 dHBSZWZlcnJlcigpLCAiaHR0cHMiKSAmJiBoYW5kbGUtPmNvbnRleHQoKS0+c2hvdWxkQ2xlYXJS ZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCgpKQotICAgICAgICByZXF1ZXN0LmNsZWFySFRU UFJlZmVycmVyKCk7CisgICAgaWYgKCFuZXdVUkwucHJvdG9jb2xJcygiaHR0cHMiKSAmJiBwcm90 b2NvbElzKG5ld1JlcXVlc3QuaHR0cFJlZmVycmVyKCksICJodHRwcyIpICYmIGhhbmRsZS0+Y29u dGV4dCgpLT5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KCkpCisgICAg ICAgIG5ld1JlcXVlc3QuY2xlYXJIVFRQUmVmZXJyZXIoKTsKIAogICAgIGQtPm1fdXNlciA9IG5l d1VSTC51c2VyKCk7CiAgICAgZC0+bV9wYXNzID0gbmV3VVJMLnBhc3MoKTsKLSAgICByZXF1ZXN0 LnJlbW92ZUNyZWRlbnRpYWxzKCk7CisgICAgbmV3UmVxdWVzdC5yZW1vdmVDcmVkZW50aWFscygp OwogCiAgICAgaWYgKGNyb3NzT3JpZ2luKSB7CiAgICAgICAgIC8vIElmIHRoZSBuZXR3b3JrIGxh eWVyIGNhcnJpZXMgb3ZlciBhdXRoZW50aWNhdGlvbiBoZWFkZXJzIGZyb20gdGhlIG9yaWdpbmFs IHJlcXVlc3QKICAgICAgICAgLy8gaW4gYSBjcm9zcy1vcmlnaW4gcmVkaXJlY3QsIHdlIHdhbnQg dG8gY2xlYXIgdGhvc2UgaGVhZGVycyBoZXJlLiAKLSAgICAgICAgcmVxdWVzdC5jbGVhckhUVFBB dXRob3JpemF0aW9uKCk7CisgICAgICAgIG5ld1JlcXVlc3QuY2xlYXJIVFRQQXV0aG9yaXphdGlv bigpOwogCiAgICAgICAgIC8vIFRPRE86IFdlIGFyZSBsb3NpbmcgYW55IHVzZXJuYW1lIGFuZCBw YXNzd29yZCBzcGVjaWZpZWQgaW4gdGhlIHJlZGlyZWN0IFVSTCwgYXMgdGhpcyBpcyB0aGUgCiAg ICAgICAgIC8vIHNhbWUgYmVoYXZpb3IgYXMgdGhlIENGTmV0IHBvcnQuIFdlIHNob3VsZCBpbnZl c3RpZ2F0ZSBpZiB0aGlzIGlzIHJlYWxseSB3aGF0IHdlIHdhbnQuCiAgICAgfSBlbHNlCi0gICAg ICAgIGFwcGx5QXV0aGVudGljYXRpb25Ub1JlcXVlc3QoaGFuZGxlLCByZXF1ZXN0LCB0cnVlKTsK KyAgICAgICAgYXBwbHlBdXRoZW50aWNhdGlvblRvUmVxdWVzdChoYW5kbGUsIG5ld1JlcXVlc3Qs IHRydWUpOwogCiAgICAgY2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9uKGhhbmRsZSk7Ci0gICAg aWYgKCFjcmVhdGVTb3VwUmVxdWVzdEFuZE1lc3NhZ2VGb3JIYW5kbGUoaGFuZGxlLCByZXF1ZXN0 LCB0cnVlKSkgeworICAgIGlmICghY3JlYXRlU291cFJlcXVlc3RBbmRNZXNzYWdlRm9ySGFuZGxl KGhhbmRsZSwgbmV3UmVxdWVzdCwgdHJ1ZSkpIHsKICAgICAgICAgZC0+Y2xpZW50KCktPmNhbm5v dFNob3dVUkwoaGFuZGxlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIC8vIElmIHdl IHNlbnQgY3JlZGVudGlhbHMgd2l0aCB0aGlzIHJlcXVlc3QncyBVUkwsIHdlIGRvbid0IHdhbnQg dGhlIHJlc3BvbnNlIHRvIGNhcnJ5IHRoZW0gdG8KICAgICAvLyB0aGUgV2ViS2l0IGxheWVyLiBU aGV5IHdlcmUgb25seSBwbGFjZWQgaW4gdGhlIFVSTCBmb3IgdGhlIGJlbmVmaXQgb2YgbGlic291 cC4KLSAgICByZXF1ZXN0LnJlbW92ZUNyZWRlbnRpYWxzKCk7CisgICAgbmV3UmVxdWVzdC5yZW1v dmVDcmVkZW50aWFscygpOwogCi0gICAgZC0+Y2xpZW50KCktPndpbGxTZW5kUmVxdWVzdChoYW5k bGUsIHJlcXVlc3QsIGQtPm1fcmVzcG9uc2UpOworICAgIGQtPmNsaWVudCgpLT53aWxsU2VuZFJl cXVlc3QoaGFuZGxlLCBuZXdSZXF1ZXN0LCBkLT5tX3Jlc3BvbnNlKTsKICAgICBoYW5kbGUtPnNl bmRQZW5kaW5nUmVxdWVzdCgpOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggYjEyNTQ2ZDkxODI5MDI3NTdjYzViOWQy YWNlNjA2NzA1ZGQxMzhlNC4uZWI5MWRjODNkMDEyNGM3ZjNiYTIzZGIwNjJmNWYwMmY3MjU3NWNh NSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEzLTAyLTExICBZb3Vlbm4gRmFibGV0ICA8eW91 ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBSZW1vdmVkIEZhaWx1cmUgZnJv bSBwb3RlbnRpYWwgb3V0Y29tZSBvZgorICAgICAgICBodHRwL3Rlc3RzL2xvYWRpbmcvMzA3LWFm dGVyLTMwMy1hZnRlci1wb3N0Lmh0bWwgdGVzdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTkzMjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9lZmwvVGVzdEV4cGVjdGF0aW9uczoKKwog MjAxMy0wMi0xMSAgQWxleGVpIEZpbGlwcG92ICA8YWxwaEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogU3BsaXQgUHJvZmlsZXIgZG9tYWluIGluIHByb3RvY29sIGludG8g UHJvZmlsZXIgYW5kIEhlYXBQcm9maWxlcgo= 188352 2013-02-14 07:55:23 -0800 2013-02-19 10:29:52 -0800 Patch bug-93214-20130214163434.patch text/plain 6147 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyODc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDEzZGNjMjYzMjg4YzA3 ZmE4YjkyZDMyMTNmMDRhNjZlZGJhNmNiMC4uZDFmYTkwNjI4MGFkMWI5ZDJkZjQwODcxZjUwZmM1 OTI1NTQyYTBkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEzLTAyLTE0ICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBodHRw L3Rlc3RzL2xvYWRpbmcvMzA3LWFmdGVyLTMwMy1hZnRlci1wb3N0Lmh0bWwgdGltZXMgb3V0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzIxNAorCisg ICAgICAgIEVuc3VyZWQgdGhhdCBHRVQgdmVyYiBpcyBjb25zaXN0ZW50bHkgdXNlZCBmb3IgYW55 IHJlcXVlc3QKKyAgICAgICAgY29taW5nIGFmdGVyIGEgcmVkaXJlY3Rpb24gdGhhdCB0cmlnZ2Vy cyBzd2l0Y2hpbmcgdG8gR0VULgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpkb1JlZGlyZWN0KToKKwogMjAxMy0wMi0xNCAgWXVyeSBT ZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9y OiBkb24ndCBjcmVhdGUgc3RhdGljIGxvY2FsIHN0cmluZyBmb3IgcHJvZ3JhbSBsaXRlcmFsIGlu IEluc3BlY3RvclRpbWVsaW5lQWdlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5kZXggZjM4N2Fm NTEyOTE3NGU0YTQ0NDdmMGI4MWQ5MGZjMWY5Y2RmZTkyYS4uYTRkYWNlM2NjZmNiMWNjNTgxZWQ1 MDViYzg1MGZjNzA1NDA3NzExYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAgLTQ1NCw0OCAr NDU0LDUyIEBAIHN0YXRpYyB2b2lkIGRvUmVkaXJlY3QoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0ID0g aGFuZGxlLT5maXJzdFJlcXVlc3QoKTsKKyAgICBSZXNvdXJjZVJlcXVlc3QgbmV3UmVxdWVzdCA9 IGhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCk7CiAgICAgU291cE1lc3NhZ2UqIG1lc3NhZ2UgPSBkLT5t X3NvdXBNZXNzYWdlLmdldCgpOwogICAgIGNvbnN0IGNoYXIqIGxvY2F0aW9uID0gc291cF9tZXNz YWdlX2hlYWRlcnNfZ2V0X29uZShtZXNzYWdlLT5yZXNwb25zZV9oZWFkZXJzLCAiTG9jYXRpb24i KTsKICAgICBLVVJMIG5ld1VSTCA9IEtVUkwoc291cFVSSVRvS1VSTChzb3VwX21lc3NhZ2VfZ2V0 X3VyaShtZXNzYWdlKSksIGxvY2F0aW9uKTsKLSAgICBib29sIGNyb3NzT3JpZ2luID0gIXByb3Rv Y29sSG9zdEFuZFBvcnRBcmVFcXVhbChyZXF1ZXN0LnVybCgpLCBuZXdVUkwpOwotICAgIHJlcXVl c3Quc2V0VVJMKG5ld1VSTCk7Ci0KLSAgICBpZiAoc2hvdWxkUmVkaXJlY3RBc0dFVChtZXNzYWdl LCBuZXdVUkwsIGNyb3NzT3JpZ2luKSkgewotICAgICAgICByZXF1ZXN0LnNldEhUVFBNZXRob2Qo IkdFVCIpOwotICAgICAgICByZXF1ZXN0LnNldEhUVFBCb2R5KDApOwotICAgICAgICByZXF1ZXN0 LmNsZWFySFRUUENvbnRlbnRUeXBlKCk7CisgICAgYm9vbCBjcm9zc09yaWdpbiA9ICFwcm90b2Nv bEhvc3RBbmRQb3J0QXJlRXF1YWwoaGFuZGxlLT5maXJzdFJlcXVlc3QoKS51cmwoKSwgbmV3VVJM KTsKKyAgICBuZXdSZXF1ZXN0LnNldFVSTChuZXdVUkwpOworCisgICAgaWYgKG5ld1JlcXVlc3Qu aHR0cE1ldGhvZCgpICE9ICJHRVQiKSB7CisgICAgICAgIC8vIENoYW5nZSBuZXdSZXF1ZXN0IG1l dGhvZCB0byBHRVQgaWYgY2hhbmdlIHdhcyBtYWRlIGR1cmluZyBhIHByZXZpb3VzIHJlZGlyZWN0 aW9uCisgICAgICAgIC8vIG9yIGlmIGN1cnJlbnQgcmVkaXJlY3Rpb24gc2F5cyBzbworICAgICAg ICBpZiAobWVzc2FnZS0+bWV0aG9kID09IFNPVVBfTUVUSE9EX0dFVCB8fCBzaG91bGRSZWRpcmVj dEFzR0VUKG1lc3NhZ2UsIG5ld1VSTCwgY3Jvc3NPcmlnaW4pKSB7CisgICAgICAgICAgICBuZXdS ZXF1ZXN0LnNldEhUVFBNZXRob2QoIkdFVCIpOworICAgICAgICAgICAgbmV3UmVxdWVzdC5zZXRI VFRQQm9keSgwKTsKKyAgICAgICAgICAgIG5ld1JlcXVlc3QuY2xlYXJIVFRQQ29udGVudFR5cGUo KTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIC8vIFNob3VsZCBub3Qgc2V0IFJlZmVyZXIgYWZ0 ZXIgYSByZWRpcmVjdCBmcm9tIGEgc2VjdXJlIHJlc291cmNlIHRvIG5vbi1zZWN1cmUgb25lLgot ICAgIGlmICghbmV3VVJMLnByb3RvY29sSXMoImh0dHBzIikgJiYgcHJvdG9jb2xJcyhyZXF1ZXN0 Lmh0dHBSZWZlcnJlcigpLCAiaHR0cHMiKSAmJiBoYW5kbGUtPmNvbnRleHQoKS0+c2hvdWxkQ2xl YXJSZWZlcnJlck9uSFRUUFNUb0hUVFBSZWRpcmVjdCgpKQotICAgICAgICByZXF1ZXN0LmNsZWFy SFRUUFJlZmVycmVyKCk7CisgICAgaWYgKCFuZXdVUkwucHJvdG9jb2xJcygiaHR0cHMiKSAmJiBw cm90b2NvbElzKG5ld1JlcXVlc3QuaHR0cFJlZmVycmVyKCksICJodHRwcyIpICYmIGhhbmRsZS0+ Y29udGV4dCgpLT5zaG91bGRDbGVhclJlZmVycmVyT25IVFRQU1RvSFRUUFJlZGlyZWN0KCkpCisg ICAgICAgIG5ld1JlcXVlc3QuY2xlYXJIVFRQUmVmZXJyZXIoKTsKIAogICAgIGQtPm1fdXNlciA9 IG5ld1VSTC51c2VyKCk7CiAgICAgZC0+bV9wYXNzID0gbmV3VVJMLnBhc3MoKTsKLSAgICByZXF1 ZXN0LnJlbW92ZUNyZWRlbnRpYWxzKCk7CisgICAgbmV3UmVxdWVzdC5yZW1vdmVDcmVkZW50aWFs cygpOwogCiAgICAgaWYgKGNyb3NzT3JpZ2luKSB7CiAgICAgICAgIC8vIElmIHRoZSBuZXR3b3Jr IGxheWVyIGNhcnJpZXMgb3ZlciBhdXRoZW50aWNhdGlvbiBoZWFkZXJzIGZyb20gdGhlIG9yaWdp bmFsIHJlcXVlc3QKICAgICAgICAgLy8gaW4gYSBjcm9zcy1vcmlnaW4gcmVkaXJlY3QsIHdlIHdh bnQgdG8gY2xlYXIgdGhvc2UgaGVhZGVycyBoZXJlLiAKLSAgICAgICAgcmVxdWVzdC5jbGVhckhU VFBBdXRob3JpemF0aW9uKCk7CisgICAgICAgIG5ld1JlcXVlc3QuY2xlYXJIVFRQQXV0aG9yaXph dGlvbigpOwogCiAgICAgICAgIC8vIFRPRE86IFdlIGFyZSBsb3NpbmcgYW55IHVzZXJuYW1lIGFu ZCBwYXNzd29yZCBzcGVjaWZpZWQgaW4gdGhlIHJlZGlyZWN0IFVSTCwgYXMgdGhpcyBpcyB0aGUg CiAgICAgICAgIC8vIHNhbWUgYmVoYXZpb3IgYXMgdGhlIENGTmV0IHBvcnQuIFdlIHNob3VsZCBp bnZlc3RpZ2F0ZSBpZiB0aGlzIGlzIHJlYWxseSB3aGF0IHdlIHdhbnQuCiAgICAgfSBlbHNlCi0g ICAgICAgIGFwcGx5QXV0aGVudGljYXRpb25Ub1JlcXVlc3QoaGFuZGxlLCByZXF1ZXN0LCB0cnVl KTsKKyAgICAgICAgYXBwbHlBdXRoZW50aWNhdGlvblRvUmVxdWVzdChoYW5kbGUsIG5ld1JlcXVl c3QsIHRydWUpOwogCiAgICAgY2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9uKGhhbmRsZSk7Ci0g ICAgaWYgKCFjcmVhdGVTb3VwUmVxdWVzdEFuZE1lc3NhZ2VGb3JIYW5kbGUoaGFuZGxlLCByZXF1 ZXN0LCB0cnVlKSkgeworICAgIGlmICghY3JlYXRlU291cFJlcXVlc3RBbmRNZXNzYWdlRm9ySGFu ZGxlKGhhbmRsZSwgbmV3UmVxdWVzdCwgdHJ1ZSkpIHsKICAgICAgICAgZC0+Y2xpZW50KCktPmNh bm5vdFNob3dVUkwoaGFuZGxlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAogICAgIC8vIElm IHdlIHNlbnQgY3JlZGVudGlhbHMgd2l0aCB0aGlzIHJlcXVlc3QncyBVUkwsIHdlIGRvbid0IHdh bnQgdGhlIHJlc3BvbnNlIHRvIGNhcnJ5IHRoZW0gdG8KICAgICAvLyB0aGUgV2ViS2l0IGxheWVy LiBUaGV5IHdlcmUgb25seSBwbGFjZWQgaW4gdGhlIFVSTCBmb3IgdGhlIGJlbmVmaXQgb2YgbGli c291cC4KLSAgICByZXF1ZXN0LnJlbW92ZUNyZWRlbnRpYWxzKCk7CisgICAgbmV3UmVxdWVzdC5y ZW1vdmVDcmVkZW50aWFscygpOwogCi0gICAgZC0+Y2xpZW50KCktPndpbGxTZW5kUmVxdWVzdCho YW5kbGUsIHJlcXVlc3QsIGQtPm1fcmVzcG9uc2UpOworICAgIGQtPmNsaWVudCgpLT53aWxsU2Vu ZFJlcXVlc3QoaGFuZGxlLCBuZXdSZXF1ZXN0LCBkLT5tX3Jlc3BvbnNlKTsKICAgICBoYW5kbGUt PnNlbmRQZW5kaW5nUmVxdWVzdCgpOwogfQogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNmE0N2EzMTM4YzdjMTVjNTEzZmIy Zjc0ODcxYTNmM2QzM2Q4ZjQ2OC4uODNhMDIyYjYwNzhkMWE1ZGJiM2ZhMmVjMjRkM2I5NWMwYjc3 NjEzYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTAyLTExICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uZkBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF1bRFJUXSBodHRwL3Rlc3RzL2xvYWRp bmcvMzA3LWFmdGVyLTMwMy1hZnRlci1wb3N0Lmh0bWwgdGltZXMgb3V0CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MzIxNAorCisgICAgICAgIFJlbW92 ZWQgRmFpbHVyZSBmcm9tIHBvdGVudGlhbCBvdXRjb21lIG9mCisgICAgICAgIGh0dHAvdGVzdHMv bG9hZGluZy8zMDctYWZ0ZXItMzAzLWFmdGVyLXBvc3QuaHRtbCB0ZXN0LgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL1Rlc3RF eHBlY3RhdGlvbnM6CisKIDIwMTMtMDItMTQgIMOBZMOhbSBLYWxsYWkgIDxrYWRhbUBpbmYudS1z emVnZWQuaHU+CiAKICAgICAgICAgW1F0XSBVbnJldmlld2VkIGdhcmRlbmluZy4gU2tpcCBmbGFr eSB0ZXN0IGFmdGVyIHIxNDA2ODkuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9l ZmwvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC9UZXN0RXhwZWN0 YXRpb25zCmluZGV4IDZjZjM1NzZiMGUyNDc3MjkzZDlmNTUwNzQwYWI0YjJhOTJhOTMyZDEuLmU2 NmNiODExMTc5OThkOGQ1OGExZDJjN2FmZWQ3NzQ3NDJjODc3NzIgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL2VmbC9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3Bs YXRmb3JtL2VmbC9UZXN0RXhwZWN0YXRpb25zCkBAIC03NjAsNyArNzYwLDcgQEAgd2Via2l0Lm9y Zy9iLzc3NjMxIGZhc3QvbXVsdGljb2wvc3Bhbi9zcGFuLWFzLWltbWVkaWF0ZS1jaGlsZC1wcm9w ZXJ0eS1yZW1vdmFsLmgKIHdlYmtpdC5vcmcvYi83NzYzMSBmYXN0L211bHRpY29sL3NwYW4vc3Bh bi1hcy1pbW1lZGlhdGUtY29sdW1ucy1jaGlsZC1yZW1vdmFsLmh0bWwgWyBGYWlsdXJlIFBhc3Mg XQogCiB3ZWJraXQub3JnL2IvOTMyMTMgZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvdGV4dC1zcGxp Y2VkLWZvbnQuaHRtbCBbIEZhaWx1cmUgUGFzcyBdCi13ZWJraXQub3JnL2IvOTMyMTQgaHR0cC90 ZXN0cy9sb2FkaW5nLzMwNy1hZnRlci0zMDMtYWZ0ZXItcG9zdC5odG1sIFsgQ3Jhc2ggRmFpbHVy ZSBQYXNzIFRpbWVvdXQgXQord2Via2l0Lm9yZy9iLzkzMjE0IGh0dHAvdGVzdHMvbG9hZGluZy8z MDctYWZ0ZXItMzAzLWFmdGVyLXBvc3QuaHRtbCBbIENyYXNoIFBhc3MgVGltZW91dCBdCiB3ZWJr aXQub3JnL2IvOTMyMTIgaHR0cC90ZXN0cy9pbmNyZW1lbnRhbC9zbG93LXV0ZjgtdGV4dC5wbCBb IFBhc3MgVGltZW91dCBdCiAKIHdlYmtpdC5vcmcvYi84NTE4MCBtZWRpYS9hdWRpby1kZWxldGUt d2hpbGUtc3RlcC1idXR0b24tY2xpY2tlZC5odG1sIFsgRmFpbHVyZSBQYXNzIF0K