85072 2012-04-27 09:12:55 -0700 [soup] URL of the ResourceResponse passed to willSendRequest is incorrect 2012-05-04 13:27:36 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 82704 85173 1 cdumez cdumez danw d-r gustavo mrobinson rakuco svillar webkit.review.bot oldest_to_newest 611566 0 cdumez 2012-04-27 09:12:55 -0700 In case on redirection, the ResourceHandleSoup::restartedCallback() will be called. This will construct a ResourceRequest and a ResourceResponse (redirect response) and pass them to willSendRequest(). In case of a redirection from X to Y, one would expect that the objects passed to willSendRequest() are: 1. ResourceRequest.url() == Y 2. ResourceResponse.url() == X Unfortunately, this is currently not the case because the uri of the SoupMessage passed to ResourceHandleSoup::restartedCallback() was already updated to the redirected one. Therefore, we end up with: 1. ResourceRequest.url() == Y 2. ResourceResponse.url() == Y As a consequence, the FrameLoaderClient has no way to know the original URL before redirection and we cannot display it properly in the DRT if dumpResourceLoadCallbacks() is enabled. It is possible to notice the issue with: http/tests/misc/will-send-request-returns-null-on-redirect.html 611574 1 139218 cdumez 2012-04-27 09:23:48 -0700 Created attachment 139218 Proposed patch 611579 2 139218 mrobinson 2012-04-27 09:32:58 -0700 Comment on attachment 139218 Proposed patch This looks reasonable to me, but I'm unfamiliar with what the correct behavior is. Does this affect tests? The patch should probably include new results so we can confirm that this is progression. 611591 3 cdumez 2012-04-27 09:39:57 -0700 FYI, only those 3 tests expect redirect responses in willSendRequest: - http/tests/misc/will-send-request-returns-null-on-redirect.html - http/tests/loading/redirect-methods.html - http/tests/loading/307-after-303-after-post.html All 3 of them are currently skipped in both GTK and EFL ports. 611593 4 mrobinson 2012-04-27 09:44:10 -0700 (In reply to comment #3) > FYI, only those 3 tests expect redirect responses in willSendRequest: > > - http/tests/misc/will-send-request-returns-null-on-redirect.html > - http/tests/loading/redirect-methods.html > - http/tests/loading/307-after-303-after-post.html > > All 3 of them are currently skipped in both GTK and EFL ports. Perhaps we can unskip them after this change? That would be awesome. 612531 5 cdumez 2012-04-30 03:54:56 -0700 Unfortunately, those tests cannot be unskipped at this point because they are missing other functionality. I will implement those missing functionality in separate patches so that the tests can be unskipped in this bug report. 612533 6 mrobinson 2012-04-30 03:57:53 -0700 The GTK+ port's DRT has a bit more functionality than than the EFL port's. What's still missing for GTK+? This patch looks okay to me, but you should probably make a note in the ChangeLog that this will fix these three tests in the future. I'd also like to get an informal review from some people more familiar with the soup backend. 612536 7 cdumez 2012-04-30 04:02:33 -0700 I added the other bugs (for EFL port) as dependency and I will wait for those to land before rebasing this path and unskipping the 3 test cases for EFL port. The GTK port is also missing similar functionality to unskip the tests (at least willSendRequestReturnsNullOnRedirect) but I'm less familiar with the code. I can take a look at it afterwards though. 612541 8 cdumez 2012-04-30 04:30:52 -0700 With this patch, it appears the following tests can be unskipped in GTK port: - http/tests/loading/redirect-methods.html - http/tests/loading/307-after-303-after-post.html The following test does not pass yet because of missing support for willSendRequestReturnsNullOnRedirect(). I'll look into it. 612552 9 cdumez 2012-04-30 04:59:45 -0700 (In reply to comment #8) > With this patch, it appears the following tests can be unskipped in GTK port: > - http/tests/loading/redirect-methods.html > - http/tests/loading/307-after-303-after-post.html > > The following test does not pass yet because of missing support for willSendRequestReturnsNullOnRedirect(). I'll look into it. Please disregard this last comment, none of the tests are passing on GTK port (test_expectations.txt fooled me). Based on the output, it seems it is due to the following features missing: - willSendRequestReturnsNullOnRedirect() - Missing "willPerformClientRedirectToURL" messages (part of dumpFrameLoadCallbacks) - Missing "didReceiveServerRedirectForProvisionalLoadForFrame" messages (part of dumpFrameLoadCallbacks) - Missing "didCancelClientRedirectForFrame" messages (part of dumpFrameLoadCallbacks) 612578 10 139218 gustavo 2012-04-30 06:44:46 -0700 Comment on attachment 139218 Proposed patch Hmm. I think you are right, but this is only a partial fix. The URL will be the old one, but all the headers will be the new ones, which is also not expected. I think we'll need to store the response we get earlier by reintroducing a got-headers signal handler, and then use it here. 614057 11 139760 cdumez 2012-05-02 00:41:40 -0700 Created attachment 139760 Patch Proper fix proposal based on Gustavo Noronha's input. 614062 12 139760 cdumez 2012-05-02 00:48:08 -0700 Comment on attachment 139760 Patch Clearing flags as the patch is wrong (Response storing code) 614091 13 139766 cdumez 2012-05-02 01:42:52 -0700 Created attachment 139766 Patch Ok, here is the fixed patch. 2 things I would like to mention: - The m_response is now probably updated twice (first in gotHeadersCallback() when we get the headers and then in sendRequestCallback()) - Would it make sense to move the WEB_TIMING receiveHeadersEnd update code from sendRequestCallback() to gotHeadersCallback() now that we listen for the "got-headers" signal? 614133 14 svillar 2012-05-02 02:52:14 -0700 (In reply to comment #13) > Created an attachment (id=139766) [details] > Patch > > Ok, here is the fixed patch. > > 2 things I would like to mention: > - The m_response is now probably updated twice (first in gotHeadersCallback() when we get the headers and then in sendRequestCallback()) Indeed, thing is that content sniffing has not happened by the time got-headers is emitted so we need to wait for sendRequestCallback in that case > - Would it make sense to move the WEB_TIMING receiveHeadersEnd update code from sendRequestCallback() to gotHeadersCallback() now that we listen for the "got-headers" signal? I think it'd make total sense In any case I think that this patch should include the unskipping of the 3 tests you mention. I think we should wait till you land the required DRT stuff to push this in. Anyway if Gustavo and Martin are ok with that, they're the reviewers :) 614147 15 139782 cdumez 2012-05-02 03:13:26 -0700 Created attachment 139782 Patch Move WEB_TIMING receiveHeadersEnd update code from sendRequestCallback() to new gotHeadersCallback() callback based on Sergio Villar Senin's feedback. 614330 16 139782 gustavo 2012-05-02 08:45:17 -0700 Comment on attachment 139782 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=139782&action=review I agree with Sergio it would be better to land this while unskipping the tests. I had a couple of nits, so I'll mark this r- so it gets out of the review queue, but the code looks good to me. > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:218 > +// Called afer receiving all headers for the message. I don't think this comment adds value, I suggest removing it. However, it may be puzzling for someone reading the code to understand exactly why we handle got-headers and update d->m_response while doing it, so... > Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp:236 > + ResourceResponse response; > + response.updateFromSoupMessage(msg); > + > + d->m_response = response; ... if you could add something to the effect of 'We need to have the original response to feed to willSendRequest in case we are redirected, so we store it here.' close to these lines, I think it would help our future readers =) 615024 17 139959 cdumez 2012-05-02 23:04:35 -0700 Created attachment 139959 Patch Update the patch to take Gustavo Noronha's feedback into consideration. Note that I cannot unskip the 3 tests until the 2 bugs in dependency get closed (need formal review). 616426 18 139959 gustavo 2012-05-04 10:56:10 -0700 Comment on attachment 139959 Patch OK, looks like we can now unskip those tests (thus cq-), rest of the patch looks good, though. 616458 19 140283 cdumez 2012-05-04 11:28:22 -0700 Created attachment 140283 Patch Here is the updated patch which unskips: - http/tests/misc/will-send-request-returns-null-on-redirect.html - http/tests/loading/307-after-303-after-post.html To my surprise the following test was not passing on my machine anymore due to part of the output being missing: - http/tests/loading/redirect-methods.html After browsing the bug tracker, I found: Bug 66873 - http/tests/loading/redirect-methods.html occasionally missing chunks of output It seems there is another unrelated bug which causes http/tests/loading/redirect-methods.html to fail sometimes to I'm keeping it in test_expectations (and updating its bug number). 616570 20 140283 gustavo 2012-05-04 13:18:33 -0700 Comment on attachment 140283 Patch Good catch, thanks! 616579 21 140283 webkit.review.bot 2012-05-04 13:27:30 -0700 Comment on attachment 140283 Patch Clearing flags on attachment: 140283 Committed r116160: <http://trac.webkit.org/changeset/116160> 616581 22 webkit.review.bot 2012-05-04 13:27:36 -0700 All reviewed patches have been landed. Closing bug. 139218 2012-04-27 09:23:48 -0700 2012-05-02 00:41:40 -0700 Proposed patch 85072_resourceresponse_url.patch text/plain 1946 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1ZjRlODU3Li44YTVmNTgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTItMDQtMjcgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbc291cF0gVVJMIG9mIHRoZSBSZXNvdXJjZVJlc3BvbnNlIHBhc3Nl ZCB0byB3aWxsU2VuZFJlcXVlc3QgaXMgaW5jb3JyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBSZXNvdXJjZUhhbmRsZVNvdXA6OnJlc3RhcnRl ZENhbGxiYWNrKCkgdG8gbWFrZSBzdXJlIHRoZSBVUkwgb2YgdGhlCisgICAgICAgIFJlc291cmNl UmVzcG9uc2UgcGFzc2VkIHRvIHdpbGxTZW5kUmVxdWVzdCgpIGlzIHRoZSBvcmlnaW5hbCBVUkwg YmVmb3JlCisgICAgICAgIHJlZGlyZWN0aW9uLiBUaGlzIGlzIHdoYXQgaXMgZXhwZWN0ZWQgYnkg d2lsbFNlbmRSZXF1ZXN0KCkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVz b3VyY2VIYW5kbGVTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnJlc3RhcnRlZENhbGxiYWNr KToKKwogMjAxMi0wNC0yNiAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IEltcGxlbWVudCB0aGUgIkRpc2FibGUgSmF2YVNj cmlwdCIgb3B0aW9uIGluIHRoZSBzZXR0aW5ncyBkaWFsb2cKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAK aW5kZXggZjk0ZmUyNi4uZWE4NzZkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAgLTIzMSwx MCArMjMxLDE1IEBAIHN0YXRpYyB2b2lkIHJlc3RhcnRlZENhbGxiYWNrKFNvdXBNZXNzYWdlKiBt c2csIGdwb2ludGVyIGRhdGEpCiAgICAgS1VSTCBuZXdVUkwgPSBLVVJMKGhhbmRsZS0+Zmlyc3RS ZXF1ZXN0KCkudXJsKCksIGxvY2F0aW9uKTsKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0 ID0gaGFuZGxlLT5maXJzdFJlcXVlc3QoKTsKKyAgICBLVVJMIG9sZFVSTCA9IHJlcXVlc3QudXJs KCk7CiAgICAgUmVzb3VyY2VSZXNwb25zZSByZXNwb25zZTsKICAgICByZXF1ZXN0LnNldFVSTChu ZXdVUkwpOwogICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZChtc2ctPm1ldGhvZCk7CiAgICAgcmVz cG9uc2UudXBkYXRlRnJvbVNvdXBNZXNzYWdlKG1zZyk7CisgICAgLy8gVGhlIFVSTCBpbiB0aGUg U291cE1lc3NhZ2UgaXMgYWxyZWFkeSB0aGUgbmV3IG9uZQorICAgIC8vIE92ZXJyaWRlIHdpdGgg dGhlIG9sZCBVUkwgKGJlZm9yZSByZWRpcmVjdGlvbikgc2luY2UKKyAgICAvLyB0aGlzIGlzIHdo YXQgaXMgZXhwZWN0ZWQgaGVyZQorICAgIHJlc3BvbnNlLnNldFVSTChvbGRVUkwpOwogCiAgICAg Ly8gU2hvdWxkIG5vdCBzZXQgUmVmZXJlciBhZnRlciBhIHJlZGlyZWN0IGZyb20gYSBzZWN1cmUg cmVzb3VyY2UgdG8gbm9uLXNlY3VyZSBvbmUuCiAgICAgaWYgKCFyZXF1ZXN0LnVybCgpLnByb3Rv Y29sSXMoImh0dHBzIikgJiYgcHJvdG9jb2xJcyhyZXF1ZXN0Lmh0dHBSZWZlcnJlcigpLCAiaHR0 cHMiKSkgewo= 139760 2012-05-02 00:41:40 -0700 2012-05-02 01:42:52 -0700 Patch 85072_resourceresponse_url.patch text/plain 4379 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyOWU2OGRkLi4wNDRjNjg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTItMDUtMDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbc291cF0gVVJMIG9mIHRoZSBSZXNvdXJjZVJlc3BvbnNlIHBhc3Nl ZCB0byB3aWxsU2VuZFJlcXVlc3QgaXMgaW5jb3JyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIHRoZSByZXNwb25zZSBtZXNzYWdlIGJ5IGNh dGNoaW5nIHRoZSAiZ290LWhlYWRlcnMiIHNpZ25hbCBzbworICAgICAgICB0aGF0IGl0IGNhbiBi ZSBwYXNzZWQgbGF0ZXIgdG8gd2lsbFNlbmRSZXF1ZXN0KCkgaW4gY2FzZSBvZgorICAgICAgICBy ZWRpcmVjdGlvbi4gVGhpcyBpcyByZXF1aXJlZCBiZWNhdXNlIHRoZSBTb3VwTWVzc2FnZSBoZWFk ZXJzIGFuZCBVUkwKKyAgICAgICAgaGF2ZSBhbHJlYWR5IGJlZW4gdXBkYXRlZCBvbmNlIHJlc3Rh cnRlZENhbGxiYWNrKCkgaXMgY2FsbGVkLgorCisgICAgICAgIFRoaXMgd2lsbCBhbGxvdyB1bnNr aXBwaW5nIG9mIHRoZSBmb2xsb3dpbmcgdGVzdCBjYXNlcyBpbiB0aGUgbmVhcgorICAgICAgICBm dXR1cmU6CisgICAgICAgICAgLSBodHRwL3Rlc3RzL21pc2Mvd2lsbC1zZW5kLXJlcXVlc3QtcmV0 dXJucy1udWxsLW9uLXJlZGlyZWN0Lmh0bWwKKyAgICAgICAgICAtIGh0dHAvdGVzdHMvbG9hZGlu Zy9yZWRpcmVjdC1tZXRob2RzLmh0bWwKKyAgICAgICAgICAtIGh0dHAvdGVzdHMvbG9hZGluZy8z MDctYWZ0ZXItMzAzLWFmdGVyLXBvc3QuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9jaHJvbWl1bS9SZXNvdXJjZUhhbmRsZUludGVybmFsLmg6CisgICAgICAgIChSZXNvdXJjZUhh bmRsZUludGVybmFsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VI YW5kbGVTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6Z290 SGVhZGVyc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OnJlc3RhcnRlZENhbGxiYWNrKToK KyAgICAgICAgKFdlYkNvcmU6OnN0YXJ0SFRUUFJlcXVlc3QpOgorCiAyMDEyLTA1LTAxICBWaW5j ZW50IFNjaGVpYiAgPHNjaGVpYkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgRnVsbHNjcmVlbiBw b3AtdXAgbG9naWMgcmVzdG9yZWQgdG8gdXNpbmcgcHJvY2Vzc2luZ1VzZXJHZXN0dXJlLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jaHJvbWl1bS9SZXNvdXJj ZUhhbmRsZUludGVybmFsLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9t aXVtL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaAppbmRleCA5ZWVmZWU4Li4xMmQzYzJlIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nocm9taXVtL1Jlc291cmNl SGFuZGxlSW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2No cm9taXVtL1Jlc291cmNlSGFuZGxlSW50ZXJuYWwuaApAQCAtODMsNiArODMsNyBAQCBwdWJsaWM6 CiAKIHByaXZhdGU6CiAgICAgUmVzb3VyY2VSZXF1ZXN0IG1fcmVxdWVzdDsKKyAgICBSZXNvdXJj ZVJlc3BvbnNlIG1fcmVzcG9uc2U7CiAgICAgUmVzb3VyY2VIYW5kbGUqIG1fb3duZXI7CiAgICAg UmVzb3VyY2VIYW5kbGVDbGllbnQqIG1fY2xpZW50OwogICAgIE93blB0cjxXZWJLaXQ6OldlYlVS TExvYWRlcj4gbV9sb2FkZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IGY5NGZlMjYuLjRh MDRkZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9S ZXNvdXJjZUhhbmRsZVNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBAIC0yMTUsNiArMjE1LDIyIEBAIHN0YXRp YyB2b2lkIGVuc3VyZVNlc3Npb25Jc0luaXRpYWxpemVkKFNvdXBTZXNzaW9uKiBzZXNzaW9uKQog ICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKHNlc3Npb24pLCAid2Via2l0LWluaXQiLCBy ZWludGVycHJldF9jYXN0PHZvaWQqPigweGRlYWRiZWVmKSk7CiB9CiAKKy8vIENhbGxlZCBhZmVy IHJlY2VpdmluZyBhbGwgaGVhZGVycyBmb3IgdGhlIG1lc3NhZ2UuCitzdGF0aWMgdm9pZCBnb3RI ZWFkZXJzQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkKK3sKKyAgICBS ZXNvdXJjZUhhbmRsZSogaGFuZGxlID0gc3RhdGljX2Nhc3Q8UmVzb3VyY2VIYW5kbGUqPihkYXRh KTsKKyAgICBpZiAoIWhhbmRsZSkKKyAgICAgICAgcmV0dXJuOworICAgIFJlc291cmNlSGFuZGxl SW50ZXJuYWwqIGQgPSBoYW5kbGUtPmdldEludGVybmFsKCk7CisgICAgaWYgKGQtPm1fY2FuY2Vs bGVkKQorICAgICAgICByZXR1cm47CisKKyAgICBSZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlOwor ICAgIHJlc3BvbnNlLnVwZGF0ZUZyb21Tb3VwTWVzc2FnZShtc2cpOworCisgICAgZC0+bV9yZXNw b25zZSA9IHJlc3BvbnNlOworfQorCiAvLyBDYWxsZWQgZWFjaCB0aW1lIHRoZSBtZXNzYWdlIGlz IGdvaW5nIHRvIGJlIHNlbnQgYWdhaW4gZXhjZXB0IHRoZSBmaXJzdCB0aW1lLgogLy8gSXQncyB1 c2VkIG1vc3RseSB0byBsZXQgd2Via2l0IGtub3cgYWJvdXQgcmVkaXJlY3RzLgogc3RhdGljIHZv aWQgcmVzdGFydGVkQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkKQEAg LTIzMSwxMCArMjQ3LDggQEAgc3RhdGljIHZvaWQgcmVzdGFydGVkQ2FsbGJhY2soU291cE1lc3Nh Z2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkKICAgICBLVVJMIG5ld1VSTCA9IEtVUkwoaGFuZGxlLT5m aXJzdFJlcXVlc3QoKS51cmwoKSwgbG9jYXRpb24pOwogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJl cXVlc3QgPSBoYW5kbGUtPmZpcnN0UmVxdWVzdCgpOwotICAgIFJlc291cmNlUmVzcG9uc2UgcmVz cG9uc2U7CiAgICAgcmVxdWVzdC5zZXRVUkwobmV3VVJMKTsKICAgICByZXF1ZXN0LnNldEhUVFBN ZXRob2QobXNnLT5tZXRob2QpOwotICAgIHJlc3BvbnNlLnVwZGF0ZUZyb21Tb3VwTWVzc2FnZSht c2cpOwogCiAgICAgLy8gU2hvdWxkIG5vdCBzZXQgUmVmZXJlciBhZnRlciBhIHJlZGlyZWN0IGZy b20gYSBzZWN1cmUgcmVzb3VyY2UgdG8gbm9uLXNlY3VyZSBvbmUuCiAgICAgaWYgKCFyZXF1ZXN0 LnVybCgpLnByb3RvY29sSXMoImh0dHBzIikgJiYgcHJvdG9jb2xJcyhyZXF1ZXN0Lmh0dHBSZWZl cnJlcigpLCAiaHR0cHMiKSkgewpAQCAtMjQzLDcgKzI1Nyw3IEBAIHN0YXRpYyB2b2lkIHJlc3Rh cnRlZENhbGxiYWNrKFNvdXBNZXNzYWdlKiBtc2csIGdwb2ludGVyIGRhdGEpCiAgICAgfQogCiAg ICAgaWYgKGQtPmNsaWVudCgpKQotICAgICAgICBkLT5jbGllbnQoKS0+d2lsbFNlbmRSZXF1ZXN0 KGhhbmRsZSwgcmVxdWVzdCwgcmVzcG9uc2UpOworICAgICAgICBkLT5jbGllbnQoKS0+d2lsbFNl bmRSZXF1ZXN0KGhhbmRsZSwgcmVxdWVzdCwgZC0+bV9yZXNwb25zZSk7CiAKICAgICBpZiAoZC0+ bV9jYW5jZWxsZWQpCiAgICAgICAgIHJldHVybjsKQEAgLTYxMCw2ICs2MjQsNyBAQCBzdGF0aWMg Ym9vbCBzdGFydEhUVFBSZXF1ZXN0KFJlc291cmNlSGFuZGxlKiBoYW5kbGUpCiAgICAgaWYgKCFo YW5kbGUtPnNob3VsZENvbnRlbnRTbmlmZigpKQogICAgICAgICBzb3VwX21lc3NhZ2VfZGlzYWJs ZV9mZWF0dXJlKHNvdXBNZXNzYWdlLCBTT1VQX1RZUEVfQ09OVEVOVF9TTklGRkVSKTsKIAorICAg IGdfc2lnbmFsX2Nvbm5lY3Qoc291cE1lc3NhZ2UsICJnb3QtaGVhZGVycyIsIEdfQ0FMTEJBQ0so Z290SGVhZGVyc0NhbGxiYWNrKSwgaGFuZGxlKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHNvdXBN ZXNzYWdlLCAicmVzdGFydGVkIiwgR19DQUxMQkFDSyhyZXN0YXJ0ZWRDYWxsYmFjayksIGhhbmRs ZSk7CiAgICAgZ19zaWduYWxfY29ubmVjdChzb3VwTWVzc2FnZSwgIndyb3RlLWJvZHktZGF0YSIs IEdfQ0FMTEJBQ0sod3JvdGVCb2R5RGF0YUNhbGxiYWNrKSwgaGFuZGxlKTsKIAo= 139766 2012-05-02 01:42:52 -0700 2012-05-02 03:13:26 -0700 Patch 85072_resourceresponse_url.patch text/plain 3745 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyOWU2OGRkLi44ZWUxMGY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTItMDUtMDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbc291cF0gVVJMIG9mIHRoZSBSZXNvdXJjZVJlc3BvbnNlIHBhc3Nl ZCB0byB3aWxsU2VuZFJlcXVlc3QgaXMgaW5jb3JyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIHRoZSByZXNwb25zZSBtZXNzYWdlIGJ5IGNh dGNoaW5nIHRoZSAiZ290LWhlYWRlcnMiIHNpZ25hbCBzbworICAgICAgICB0aGF0IGl0IGNhbiBi ZSBwYXNzZWQgbGF0ZXIgdG8gd2lsbFNlbmRSZXF1ZXN0KCkgaW4gY2FzZSBvZgorICAgICAgICBy ZWRpcmVjdGlvbi4gVGhpcyBpcyByZXF1aXJlZCBiZWNhdXNlIHRoZSBTb3VwTWVzc2FnZSBoZWFk ZXJzIGFuZCBVUkwKKyAgICAgICAgaGF2ZSBhbHJlYWR5IGJlZW4gdXBkYXRlZCBvbmNlIHJlc3Rh cnRlZENhbGxiYWNrKCkgaXMgY2FsbGVkLgorCisgICAgICAgIFRoaXMgd2lsbCBhbGxvdyB1bnNr aXBwaW5nIG9mIHRoZSBmb2xsb3dpbmcgdGVzdCBjYXNlcyBpbiB0aGUgbmVhcgorICAgICAgICBm dXR1cmU6CisgICAgICAgICAgLSBodHRwL3Rlc3RzL21pc2Mvd2lsbC1zZW5kLXJlcXVlc3QtcmV0 dXJucy1udWxsLW9uLXJlZGlyZWN0Lmh0bWwKKyAgICAgICAgICAtIGh0dHAvdGVzdHMvbG9hZGlu Zy9yZWRpcmVjdC1tZXRob2RzLmh0bWwKKyAgICAgICAgICAtIGh0dHAvdGVzdHMvbG9hZGluZy8z MDctYWZ0ZXItMzAzLWFmdGVyLXBvc3QuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6OmdvdEhlYWRlcnNDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpyZXN0 YXJ0ZWRDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpzdGFydEhUVFBSZXF1ZXN0KToKKwog MjAxMi0wNS0wMSAgVmluY2VudCBTY2hlaWIgIDxzY2hlaWJAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIEZ1bGxzY3JlZW4gcG9wLXVwIGxvZ2ljIHJlc3RvcmVkIHRvIHVzaW5nIHByb2Nlc3NpbmdV c2VyR2VzdHVyZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5kZXggZjk0ZmUyNi4uNGEwNGRlMiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNl SGFuZGxlU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3Vw L1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAgLTIxNSw2ICsyMTUsMjIgQEAgc3RhdGljIHZvaWQg ZW5zdXJlU2Vzc2lvbklzSW5pdGlhbGl6ZWQoU291cFNlc3Npb24qIHNlc3Npb24pCiAgICAgZ19v YmplY3Rfc2V0X2RhdGEoR19PQkpFQ1Qoc2Vzc2lvbiksICJ3ZWJraXQtaW5pdCIsIHJlaW50ZXJw cmV0X2Nhc3Q8dm9pZCo+KDB4ZGVhZGJlZWYpKTsKIH0KIAorLy8gQ2FsbGVkIGFmZXIgcmVjZWl2 aW5nIGFsbCBoZWFkZXJzIGZvciB0aGUgbWVzc2FnZS4KK3N0YXRpYyB2b2lkIGdvdEhlYWRlcnND YWxsYmFjayhTb3VwTWVzc2FnZSogbXNnLCBncG9pbnRlciBkYXRhKQoreworICAgIFJlc291cmNl SGFuZGxlKiBoYW5kbGUgPSBzdGF0aWNfY2FzdDxSZXNvdXJjZUhhbmRsZSo+KGRhdGEpOworICAg IGlmICghaGFuZGxlKQorICAgICAgICByZXR1cm47CisgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5h bCogZCA9IGhhbmRsZS0+Z2V0SW50ZXJuYWwoKTsKKyAgICBpZiAoZC0+bV9jYW5jZWxsZWQpCisg ICAgICAgIHJldHVybjsKKworICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2U7CisgICAgcmVz cG9uc2UudXBkYXRlRnJvbVNvdXBNZXNzYWdlKG1zZyk7CisKKyAgICBkLT5tX3Jlc3BvbnNlID0g cmVzcG9uc2U7Cit9CisKIC8vIENhbGxlZCBlYWNoIHRpbWUgdGhlIG1lc3NhZ2UgaXMgZ29pbmcg dG8gYmUgc2VudCBhZ2FpbiBleGNlcHQgdGhlIGZpcnN0IHRpbWUuCiAvLyBJdCdzIHVzZWQgbW9z dGx5IHRvIGxldCB3ZWJraXQga25vdyBhYm91dCByZWRpcmVjdHMuCiBzdGF0aWMgdm9pZCByZXN0 YXJ0ZWRDYWxsYmFjayhTb3VwTWVzc2FnZSogbXNnLCBncG9pbnRlciBkYXRhKQpAQCAtMjMxLDEw ICsyNDcsOCBAQCBzdGF0aWMgdm9pZCByZXN0YXJ0ZWRDYWxsYmFjayhTb3VwTWVzc2FnZSogbXNn LCBncG9pbnRlciBkYXRhKQogICAgIEtVUkwgbmV3VVJMID0gS1VSTChoYW5kbGUtPmZpcnN0UmVx dWVzdCgpLnVybCgpLCBsb2NhdGlvbik7CiAKICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCA9 IGhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCk7Ci0gICAgUmVzb3VyY2VSZXNwb25zZSByZXNwb25zZTsK ICAgICByZXF1ZXN0LnNldFVSTChuZXdVUkwpOwogICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZCht c2ctPm1ldGhvZCk7Ci0gICAgcmVzcG9uc2UudXBkYXRlRnJvbVNvdXBNZXNzYWdlKG1zZyk7CiAK ICAgICAvLyBTaG91bGQgbm90IHNldCBSZWZlcmVyIGFmdGVyIGEgcmVkaXJlY3QgZnJvbSBhIHNl Y3VyZSByZXNvdXJjZSB0byBub24tc2VjdXJlIG9uZS4KICAgICBpZiAoIXJlcXVlc3QudXJsKCku cHJvdG9jb2xJcygiaHR0cHMiKSAmJiBwcm90b2NvbElzKHJlcXVlc3QuaHR0cFJlZmVycmVyKCks ICJodHRwcyIpKSB7CkBAIC0yNDMsNyArMjU3LDcgQEAgc3RhdGljIHZvaWQgcmVzdGFydGVkQ2Fs bGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkKICAgICB9CiAKICAgICBpZiAo ZC0+Y2xpZW50KCkpCi0gICAgICAgIGQtPmNsaWVudCgpLT53aWxsU2VuZFJlcXVlc3QoaGFuZGxl LCByZXF1ZXN0LCByZXNwb25zZSk7CisgICAgICAgIGQtPmNsaWVudCgpLT53aWxsU2VuZFJlcXVl c3QoaGFuZGxlLCByZXF1ZXN0LCBkLT5tX3Jlc3BvbnNlKTsKIAogICAgIGlmIChkLT5tX2NhbmNl bGxlZCkKICAgICAgICAgcmV0dXJuOwpAQCAtNjEwLDYgKzYyNCw3IEBAIHN0YXRpYyBib29sIHN0 YXJ0SFRUUFJlcXVlc3QoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAgICBpZiAoIWhhbmRsZS0+ c2hvdWxkQ29udGVudFNuaWZmKCkpCiAgICAgICAgIHNvdXBfbWVzc2FnZV9kaXNhYmxlX2ZlYXR1 cmUoc291cE1lc3NhZ2UsIFNPVVBfVFlQRV9DT05URU5UX1NOSUZGRVIpOwogCisgICAgZ19zaWdu YWxfY29ubmVjdChzb3VwTWVzc2FnZSwgImdvdC1oZWFkZXJzIiwgR19DQUxMQkFDSyhnb3RIZWFk ZXJzQ2FsbGJhY2spLCBoYW5kbGUpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qoc291cE1lc3NhZ2Us ICJyZXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJlc3RhcnRlZENhbGxiYWNrKSwgaGFuZGxlKTsKICAg ICBnX3NpZ25hbF9jb25uZWN0KHNvdXBNZXNzYWdlLCAid3JvdGUtYm9keS1kYXRhIiwgR19DQUxM QkFDSyh3cm90ZUJvZHlEYXRhQ2FsbGJhY2spLCBoYW5kbGUpOwogCg== 139782 2012-05-02 03:13:26 -0700 2012-05-02 23:04:35 -0700 Patch 85072_resourceresponse_url.patch text/plain 4507 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA2YmU1MTE2Li5mYTM2NGVhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMDUtMDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbc291cF0gVVJMIG9mIHRoZSBSZXNvdXJjZVJlc3BvbnNlIHBhc3Nl ZCB0byB3aWxsU2VuZFJlcXVlc3QgaXMgaW5jb3JyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIHRoZSByZXNwb25zZSBtZXNzYWdlIGJ5IGNh dGNoaW5nIHRoZSAiZ290LWhlYWRlcnMiIHNpZ25hbCBzbworICAgICAgICB0aGF0IGl0IGNhbiBi ZSBwYXNzZWQgbGF0ZXIgdG8gd2lsbFNlbmRSZXF1ZXN0KCkgaW4gY2FzZSBvZgorICAgICAgICBy ZWRpcmVjdGlvbi4gVGhpcyBpcyByZXF1aXJlZCBiZWNhdXNlIHRoZSBTb3VwTWVzc2FnZSBoZWFk ZXJzIGFuZCBVUkwKKyAgICAgICAgaGF2ZSBhbHJlYWR5IGJlZW4gdXBkYXRlZCBvbmNlIHJlc3Rh cnRlZENhbGxiYWNrKCkgaXMgY2FsbGVkLgorCisgICAgICAgIFRoaXMgd2lsbCBhbGxvdyB1bnNr aXBwaW5nIG9mIHRoZSBmb2xsb3dpbmcgdGVzdCBjYXNlcyBpbiB0aGUgbmVhcgorICAgICAgICBm dXR1cmU6CisgICAgICAgICAgLSBodHRwL3Rlc3RzL21pc2Mvd2lsbC1zZW5kLXJlcXVlc3QtcmV0 dXJucy1udWxsLW9uLXJlZGlyZWN0Lmh0bWwKKyAgICAgICAgICAtIGh0dHAvdGVzdHMvbG9hZGlu Zy9yZWRpcmVjdC1tZXRob2RzLmh0bWwKKyAgICAgICAgICAtIGh0dHAvdGVzdHMvbG9hZGluZy8z MDctYWZ0ZXItMzAzLWFmdGVyLXBvc3QuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6OmdvdEhlYWRlcnNDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpyZXN0 YXJ0ZWRDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpzZW5kUmVxdWVzdENhbGxiYWNrKToK KyAgICAgICAgKFdlYkNvcmU6OnN0YXJ0SFRUUFJlcXVlc3QpOgorCiAyMDEyLTA1LTAyICBBbnR0 aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBTdHlsZVNoZWV0SW50ZXJu YWw6OnBhcnNlVXNlclN0eWxlU2hlZXQoKSBzaG91bGQgYmUgY2FsbGVkIHBhcnNlQXV0aG9yU3R5 bGVTaGVldCgpLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9z b3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcAppbmRleCBmOTRmZTI2Li5iZDRiZDFmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VI YW5kbGVTb3VwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAv UmVzb3VyY2VIYW5kbGVTb3VwLmNwcApAQCAtMjE1LDYgKzIxNSwyNyBAQCBzdGF0aWMgdm9pZCBl bnN1cmVTZXNzaW9uSXNJbml0aWFsaXplZChTb3VwU2Vzc2lvbiogc2Vzc2lvbikKICAgICBnX29i amVjdF9zZXRfZGF0YShHX09CSkVDVChzZXNzaW9uKSwgIndlYmtpdC1pbml0IiwgcmVpbnRlcnBy ZXRfY2FzdDx2b2lkKj4oMHhkZWFkYmVlZikpOwogfQogCisvLyBDYWxsZWQgYWZlciByZWNlaXZp bmcgYWxsIGhlYWRlcnMgZm9yIHRoZSBtZXNzYWdlLgorc3RhdGljIHZvaWQgZ290SGVhZGVyc0Nh bGxiYWNrKFNvdXBNZXNzYWdlKiBtc2csIGdwb2ludGVyIGRhdGEpCit7CisgICAgUmVzb3VyY2VI YW5kbGUqIGhhbmRsZSA9IHN0YXRpY19jYXN0PFJlc291cmNlSGFuZGxlKj4oZGF0YSk7CisgICAg aWYgKCFoYW5kbGUpCisgICAgICAgIHJldHVybjsKKyAgICBSZXNvdXJjZUhhbmRsZUludGVybmFs KiBkID0gaGFuZGxlLT5nZXRJbnRlcm5hbCgpOworICAgIGlmIChkLT5tX2NhbmNlbGxlZCkKKyAg ICAgICAgcmV0dXJuOworCisjaWYgRU5BQkxFKFdFQl9USU1JTkcpCisgICAgaWYgKGQtPm1fcmVz cG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCkpCisgICAgICAgIGQtPm1fcmVzcG9uc2UucmVzb3Vy Y2VMb2FkVGltaW5nKCktPnJlY2VpdmVIZWFkZXJzRW5kID0gbWlsaXNlY29uZHNTaW5jZVJlcXVl c3QoZC0+bV9yZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKS0+cmVxdWVzdFRpbWUpOworI2Vu ZGlmCisKKyAgICBSZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlOworICAgIHJlc3BvbnNlLnVwZGF0 ZUZyb21Tb3VwTWVzc2FnZShtc2cpOworCisgICAgZC0+bV9yZXNwb25zZSA9IHJlc3BvbnNlOwor fQorCiAvLyBDYWxsZWQgZWFjaCB0aW1lIHRoZSBtZXNzYWdlIGlzIGdvaW5nIHRvIGJlIHNlbnQg YWdhaW4gZXhjZXB0IHRoZSBmaXJzdCB0aW1lLgogLy8gSXQncyB1c2VkIG1vc3RseSB0byBsZXQg d2Via2l0IGtub3cgYWJvdXQgcmVkaXJlY3RzLgogc3RhdGljIHZvaWQgcmVzdGFydGVkQ2FsbGJh Y2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkKQEAgLTIzMSwxMCArMjUyLDggQEAg c3RhdGljIHZvaWQgcmVzdGFydGVkQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIg ZGF0YSkKICAgICBLVVJMIG5ld1VSTCA9IEtVUkwoaGFuZGxlLT5maXJzdFJlcXVlc3QoKS51cmwo KSwgbG9jYXRpb24pOwogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QgPSBoYW5kbGUtPmZp cnN0UmVxdWVzdCgpOwotICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2U7CiAgICAgcmVxdWVz dC5zZXRVUkwobmV3VVJMKTsKICAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QobXNnLT5tZXRob2Qp OwotICAgIHJlc3BvbnNlLnVwZGF0ZUZyb21Tb3VwTWVzc2FnZShtc2cpOwogCiAgICAgLy8gU2hv dWxkIG5vdCBzZXQgUmVmZXJlciBhZnRlciBhIHJlZGlyZWN0IGZyb20gYSBzZWN1cmUgcmVzb3Vy Y2UgdG8gbm9uLXNlY3VyZSBvbmUuCiAgICAgaWYgKCFyZXF1ZXN0LnVybCgpLnByb3RvY29sSXMo Imh0dHBzIikgJiYgcHJvdG9jb2xJcyhyZXF1ZXN0Lmh0dHBSZWZlcnJlcigpLCAiaHR0cHMiKSkg ewpAQCAtMjQzLDcgKzI2Miw3IEBAIHN0YXRpYyB2b2lkIHJlc3RhcnRlZENhbGxiYWNrKFNvdXBN ZXNzYWdlKiBtc2csIGdwb2ludGVyIGRhdGEpCiAgICAgfQogCiAgICAgaWYgKGQtPmNsaWVudCgp KQotICAgICAgICBkLT5jbGllbnQoKS0+d2lsbFNlbmRSZXF1ZXN0KGhhbmRsZSwgcmVxdWVzdCwg cmVzcG9uc2UpOworICAgICAgICBkLT5jbGllbnQoKS0+d2lsbFNlbmRSZXF1ZXN0KGhhbmRsZSwg cmVxdWVzdCwgZC0+bV9yZXNwb25zZSk7CiAKICAgICBpZiAoZC0+bV9jYW5jZWxsZWQpCiAgICAg ICAgIHJldHVybjsKQEAgLTM0MCwxMSArMzU5LDYgQEAgc3RhdGljIHZvaWQgc2VuZFJlcXVlc3RD YWxsYmFjayhHT2JqZWN0KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVzLCBncG9pbnRlciBkYXQK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotI2lmIEVOQUJMRShXRUJfVElNSU5HKQotICAgIGlm IChkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpKQotICAgICAgICBkLT5tX3Jlc3Bv bnNlLnJlc291cmNlTG9hZFRpbWluZygpLT5yZWNlaXZlSGVhZGVyc0VuZCA9IG1pbGlzZWNvbmRz U2luY2VSZXF1ZXN0KGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCktPnJlcXVlc3RU aW1lKTsKLSNlbmRpZgotCiAgICAgR093blB0cjxHRXJyb3I+IGVycm9yOwogICAgIEdJbnB1dFN0 cmVhbSogaW4gPSBzb3VwX3JlcXVlc3Rfc2VuZF9maW5pc2goZC0+bV9zb3VwUmVxdWVzdC5nZXQo KSwgcmVzLCAmZXJyb3Iub3V0UHRyKCkpOwogICAgIGlmIChlcnJvcikgewpAQCAtNjEwLDYgKzYy NCw3IEBAIHN0YXRpYyBib29sIHN0YXJ0SFRUUFJlcXVlc3QoUmVzb3VyY2VIYW5kbGUqIGhhbmRs ZSkKICAgICBpZiAoIWhhbmRsZS0+c2hvdWxkQ29udGVudFNuaWZmKCkpCiAgICAgICAgIHNvdXBf bWVzc2FnZV9kaXNhYmxlX2ZlYXR1cmUoc291cE1lc3NhZ2UsIFNPVVBfVFlQRV9DT05URU5UX1NO SUZGRVIpOwogCisgICAgZ19zaWduYWxfY29ubmVjdChzb3VwTWVzc2FnZSwgImdvdC1oZWFkZXJz IiwgR19DQUxMQkFDSyhnb3RIZWFkZXJzQ2FsbGJhY2spLCBoYW5kbGUpOwogICAgIGdfc2lnbmFs X2Nvbm5lY3Qoc291cE1lc3NhZ2UsICJyZXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJlc3RhcnRlZENh bGxiYWNrKSwgaGFuZGxlKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHNvdXBNZXNzYWdlLCAid3Jv dGUtYm9keS1kYXRhIiwgR19DQUxMQkFDSyh3cm90ZUJvZHlEYXRhQ2FsbGJhY2spLCBoYW5kbGUp OwogCg== 139959 2012-05-02 23:04:35 -0700 2012-05-04 11:28:22 -0700 Patch 85072_resourceresponse_url.patch text/plain 4609 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NGE4MzNkLi5iNTVkOGRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTItMDUtMDMgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbc291cF0gVVJMIG9mIHRoZSBSZXNvdXJjZVJlc3BvbnNlIHBhc3Nl ZCB0byB3aWxsU2VuZFJlcXVlc3QgaXMgaW5jb3JyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NTA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0b3JlIHRoZSByZXNwb25zZSBtZXNzYWdlIGJ5IGNh dGNoaW5nIHRoZSAiZ290LWhlYWRlcnMiIHNpZ25hbCBzbworICAgICAgICB0aGF0IGl0IGNhbiBi ZSBwYXNzZWQgbGF0ZXIgdG8gd2lsbFNlbmRSZXF1ZXN0KCkgaW4gY2FzZSBvZgorICAgICAgICBy ZWRpcmVjdGlvbi4gVGhpcyBpcyByZXF1aXJlZCBiZWNhdXNlIHRoZSBTb3VwTWVzc2FnZSBoZWFk ZXJzIGFuZCBVUkwKKyAgICAgICAgaGF2ZSBhbHJlYWR5IGJlZW4gdXBkYXRlZCBvbmNlIHJlc3Rh cnRlZENhbGxiYWNrKCkgaXMgY2FsbGVkLgorCisgICAgICAgIFRoaXMgd2lsbCBhbGxvdyB1bnNr aXBwaW5nIG9mIHRoZSBmb2xsb3dpbmcgdGVzdCBjYXNlcyBpbiB0aGUgbmVhcgorICAgICAgICBm dXR1cmU6CisgICAgICAgICAgLSBodHRwL3Rlc3RzL21pc2Mvd2lsbC1zZW5kLXJlcXVlc3QtcmV0 dXJucy1udWxsLW9uLXJlZGlyZWN0Lmh0bWwKKyAgICAgICAgICAtIGh0dHAvdGVzdHMvbG9hZGlu Zy9yZWRpcmVjdC1tZXRob2RzLmh0bWwKKyAgICAgICAgICAtIGh0dHAvdGVzdHMvbG9hZGluZy8z MDctYWZ0ZXItMzAzLWFmdGVyLXBvc3QuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29y ay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAg ICAgKFdlYkNvcmU6OmdvdEhlYWRlcnNDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpyZXN0 YXJ0ZWRDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpzZW5kUmVxdWVzdENhbGxiYWNrKToK KyAgICAgICAgKFdlYkNvcmU6OnN0YXJ0SFRUUFJlcXVlc3QpOgorCiAyMDEyLTA1LTAyICBHdXN0 YXZvIE5vcm9uaGEgU2lsdmEgIDxnbnNAZ25vbWUub3JnPgogCiAgICAgICAgIFtHVEtdIEZpbmlz aCBtb3ZpbmcgbW9kdWxlcyBpbnRvIGxpYldlYkNvcmVNb2R1bGVzLmxhCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNv dXAuY3BwCmluZGV4IGY5NGZlMjYuLjk4NDg2NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBA IC0yMTUsNiArMjE1LDI5IEBAIHN0YXRpYyB2b2lkIGVuc3VyZVNlc3Npb25Jc0luaXRpYWxpemVk KFNvdXBTZXNzaW9uKiBzZXNzaW9uKQogICAgIGdfb2JqZWN0X3NldF9kYXRhKEdfT0JKRUNUKHNl c3Npb24pLCAid2Via2l0LWluaXQiLCByZWludGVycHJldF9jYXN0PHZvaWQqPigweGRlYWRiZWVm KSk7CiB9CiAKK3N0YXRpYyB2b2lkIGdvdEhlYWRlcnNDYWxsYmFjayhTb3VwTWVzc2FnZSogbXNn LCBncG9pbnRlciBkYXRhKQoreworICAgIFJlc291cmNlSGFuZGxlKiBoYW5kbGUgPSBzdGF0aWNf Y2FzdDxSZXNvdXJjZUhhbmRsZSo+KGRhdGEpOworICAgIGlmICghaGFuZGxlKQorICAgICAgICBy ZXR1cm47CisgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IGhhbmRsZS0+Z2V0SW50ZXJu YWwoKTsKKyAgICBpZiAoZC0+bV9jYW5jZWxsZWQpCisgICAgICAgIHJldHVybjsKKworI2lmIEVO QUJMRShXRUJfVElNSU5HKQorICAgIGlmIChkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWlu ZygpKQorICAgICAgICBkLT5tX3Jlc3BvbnNlLnJlc291cmNlTG9hZFRpbWluZygpLT5yZWNlaXZl SGVhZGVyc0VuZCA9IG1pbGlzZWNvbmRzU2luY2VSZXF1ZXN0KGQtPm1fcmVzcG9uc2UucmVzb3Vy Y2VMb2FkVGltaW5nKCktPnJlcXVlc3RUaW1lKTsKKyNlbmRpZgorCisgICAgLy8gVGhlIG9yaWdp bmFsIHJlc3BvbnNlIHdpbGwgYmUgbmVlZGVkIGxhdGVyIHRvIGZlZWQgdG8gd2lsbFNlbmRSZXF1 ZXN0IGluCisgICAgLy8gcmVzdGFydGVkQ2FsbGJhY2soKSBpbiBjYXNlIHdlIGFyZSByZWRpcmVj dGVkLiBGb3IgdGhpcyByZWFzb24sIHNvIHdlIHN0b3JlIGl0CisgICAgLy8gaGVyZS4KKyAgICBS ZXNvdXJjZVJlc3BvbnNlIHJlc3BvbnNlOworICAgIHJlc3BvbnNlLnVwZGF0ZUZyb21Tb3VwTWVz c2FnZShtc2cpOworCisgICAgZC0+bV9yZXNwb25zZSA9IHJlc3BvbnNlOworfQorCiAvLyBDYWxs ZWQgZWFjaCB0aW1lIHRoZSBtZXNzYWdlIGlzIGdvaW5nIHRvIGJlIHNlbnQgYWdhaW4gZXhjZXB0 IHRoZSBmaXJzdCB0aW1lLgogLy8gSXQncyB1c2VkIG1vc3RseSB0byBsZXQgd2Via2l0IGtub3cg YWJvdXQgcmVkaXJlY3RzLgogc3RhdGljIHZvaWQgcmVzdGFydGVkQ2FsbGJhY2soU291cE1lc3Nh Z2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkKQEAgLTIzMSwxMCArMjU0LDggQEAgc3RhdGljIHZvaWQg cmVzdGFydGVkQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3BvaW50ZXIgZGF0YSkKICAgICBL VVJMIG5ld1VSTCA9IEtVUkwoaGFuZGxlLT5maXJzdFJlcXVlc3QoKS51cmwoKSwgbG9jYXRpb24p OwogCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJlcXVlc3QgPSBoYW5kbGUtPmZpcnN0UmVxdWVzdCgp OwotICAgIFJlc291cmNlUmVzcG9uc2UgcmVzcG9uc2U7CiAgICAgcmVxdWVzdC5zZXRVUkwobmV3 VVJMKTsKICAgICByZXF1ZXN0LnNldEhUVFBNZXRob2QobXNnLT5tZXRob2QpOwotICAgIHJlc3Bv bnNlLnVwZGF0ZUZyb21Tb3VwTWVzc2FnZShtc2cpOwogCiAgICAgLy8gU2hvdWxkIG5vdCBzZXQg UmVmZXJlciBhZnRlciBhIHJlZGlyZWN0IGZyb20gYSBzZWN1cmUgcmVzb3VyY2UgdG8gbm9uLXNl Y3VyZSBvbmUuCiAgICAgaWYgKCFyZXF1ZXN0LnVybCgpLnByb3RvY29sSXMoImh0dHBzIikgJiYg cHJvdG9jb2xJcyhyZXF1ZXN0Lmh0dHBSZWZlcnJlcigpLCAiaHR0cHMiKSkgewpAQCAtMjQzLDcg KzI2NCw3IEBAIHN0YXRpYyB2b2lkIHJlc3RhcnRlZENhbGxiYWNrKFNvdXBNZXNzYWdlKiBtc2cs IGdwb2ludGVyIGRhdGEpCiAgICAgfQogCiAgICAgaWYgKGQtPmNsaWVudCgpKQotICAgICAgICBk LT5jbGllbnQoKS0+d2lsbFNlbmRSZXF1ZXN0KGhhbmRsZSwgcmVxdWVzdCwgcmVzcG9uc2UpOwor ICAgICAgICBkLT5jbGllbnQoKS0+d2lsbFNlbmRSZXF1ZXN0KGhhbmRsZSwgcmVxdWVzdCwgZC0+ bV9yZXNwb25zZSk7CiAKICAgICBpZiAoZC0+bV9jYW5jZWxsZWQpCiAgICAgICAgIHJldHVybjsK QEAgLTM0MCwxMSArMzYxLDYgQEAgc3RhdGljIHZvaWQgc2VuZFJlcXVlc3RDYWxsYmFjayhHT2Jq ZWN0KiBzb3VyY2UsIEdBc3luY1Jlc3VsdCogcmVzLCBncG9pbnRlciBkYXQKICAgICAgICAgcmV0 dXJuOwogICAgIH0KIAotI2lmIEVOQUJMRShXRUJfVElNSU5HKQotICAgIGlmIChkLT5tX3Jlc3Bv bnNlLnJlc291cmNlTG9hZFRpbWluZygpKQotICAgICAgICBkLT5tX3Jlc3BvbnNlLnJlc291cmNl TG9hZFRpbWluZygpLT5yZWNlaXZlSGVhZGVyc0VuZCA9IG1pbGlzZWNvbmRzU2luY2VSZXF1ZXN0 KGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCktPnJlcXVlc3RUaW1lKTsKLSNlbmRp ZgotCiAgICAgR093blB0cjxHRXJyb3I+IGVycm9yOwogICAgIEdJbnB1dFN0cmVhbSogaW4gPSBz b3VwX3JlcXVlc3Rfc2VuZF9maW5pc2goZC0+bV9zb3VwUmVxdWVzdC5nZXQoKSwgcmVzLCAmZXJy b3Iub3V0UHRyKCkpOwogICAgIGlmIChlcnJvcikgewpAQCAtNjEwLDYgKzYyNiw3IEBAIHN0YXRp YyBib29sIHN0YXJ0SFRUUFJlcXVlc3QoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAgICBpZiAo IWhhbmRsZS0+c2hvdWxkQ29udGVudFNuaWZmKCkpCiAgICAgICAgIHNvdXBfbWVzc2FnZV9kaXNh YmxlX2ZlYXR1cmUoc291cE1lc3NhZ2UsIFNPVVBfVFlQRV9DT05URU5UX1NOSUZGRVIpOwogCisg ICAgZ19zaWduYWxfY29ubmVjdChzb3VwTWVzc2FnZSwgImdvdC1oZWFkZXJzIiwgR19DQUxMQkFD Syhnb3RIZWFkZXJzQ2FsbGJhY2spLCBoYW5kbGUpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qoc291 cE1lc3NhZ2UsICJyZXN0YXJ0ZWQiLCBHX0NBTExCQUNLKHJlc3RhcnRlZENhbGxiYWNrKSwgaGFu ZGxlKTsKICAgICBnX3NpZ25hbF9jb25uZWN0KHNvdXBNZXNzYWdlLCAid3JvdGUtYm9keS1kYXRh IiwgR19DQUxMQkFDSyh3cm90ZUJvZHlEYXRhQ2FsbGJhY2spLCBoYW5kbGUpOwogCg== 140283 2012-05-04 11:28:22 -0700 2012-05-04 13:27:30 -0700 Patch 85072_resourceresponse_url.patch text/plain 6258 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA1NTc5OTEzLi41NGZlNTg5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMTItMDUt MDQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KIAorICAg ICAgICBbc291cF0gVVJMIG9mIHRoZSBSZXNvdXJjZVJlc3BvbnNlIHBhc3NlZCB0byB3aWxsU2Vu ZFJlcXVlc3QgaXMgaW5jb3JyZWN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NTA3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFVuc2tpcCBodHRwL3Rlc3RzL21pc2Mvd2lsbC1zZW5kLXJlcXVlc3QtcmV0 dXJucy1udWxsLW9uLXJlZGlyZWN0Lmh0bWwKKyAgICAgICAgYW5kIGh0dHAvdGVzdHMvbG9hZGlu Zy8zMDctYWZ0ZXItMzAzLWFmdGVyLXBvc3QuaHRtbCBub3cgdGhhdCB0aGUKKyAgICAgICAgcmVz cG9uc2UgcGFzc2VkIHRvIHdpbGxTZW5kUmVxdWVzdCBpcyBjb3JyZWN0IGFuZCBub3cgdGhhdCB0 aGUgcmlnaHQKKyAgICAgICAgcmVkaXJlY3QgVVJMIGlzIGJlaW5nIHByaW50ZWQgaW4gRUZMIHBv cnQuCisKKyAgICAgICAgVW5mb3J0dW5hdGVseSwgaHR0cC90ZXN0cy9sb2FkaW5nL3JlZGlyZWN0 LW1ldGhvZHMuaHRtbCBjYW5ub3QgYmUKKyAgICAgICAgdW5za2lwcGVkIHlldCBkdWUgdG8gYnVn IDY2ODczLgorCisgICAgICAgICogcGxhdGZvcm0vZWZsL3Rlc3RfZXhwZWN0YXRpb25zLnR4dDoK KworMjAxMi0wNS0wNCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwu Y29tPgorCiAgICAgICAgIFtFRkxdIEZyYW1lIGxvYWQgY2FsbGJhY2tzIG91dHB1dCBpcyBtaXNz aW5nIGZvciByZWRpcmVjdGlvbnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTg1MTczCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2Vm bC90ZXN0X2V4cGVjdGF0aW9ucy50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwvdGVzdF9l eHBlY3RhdGlvbnMudHh0CmluZGV4IDU5NTQyMjMuLmMzZjk1NjcgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL2VmbC90ZXN0X2V4cGVjdGF0aW9ucy50eHQKKysrIGIvTGF5b3V0VGVz dHMvcGxhdGZvcm0vZWZsL3Rlc3RfZXhwZWN0YXRpb25zLnR4dApAQCAtMjYzLDEwICsyNjMsOCBA QCBCVUdXSzg1NDY2IDogY3NzMy9pbWFnZXMvY3Jvc3MtZmFkZS1iYWNrZ3JvdW5kLXNpemUuaHRt bCA9IFRFWFQKIAogQlVHV0s4NTQ5MiA6IGNzczMvem9vbS1jb29yZHMueGh0bWwgPSBURVhUCiAK LS8vIFJlZGlyZWN0IHJlc3BvbnNlIFVSTCBpcyBub3QgdGhlIG9uZSBleHBlY3RlZAotQlVHV0s4 NTA3MiA6IGh0dHAvdGVzdHMvbWlzYy93aWxsLXNlbmQtcmVxdWVzdC1yZXR1cm5zLW51bGwtb24t cmVkaXJlY3QuaHRtbCA9IFRFWFQKLUJVR1dLODUwNzIgOiBodHRwL3Rlc3RzL2xvYWRpbmcvMzA3 LWFmdGVyLTMwMy1hZnRlci1wb3N0Lmh0bWwgPSBURVhUCi1CVUdXSzg1MDcyIDogaHR0cC90ZXN0 cy9sb2FkaW5nL3JlZGlyZWN0LW1ldGhvZHMuaHRtbCA9IFRFWFQKKy8vIE9jY2FzaW9uYWxseSBt aXNzaW5nIGNodW5rcyBvZiBvdXRwdXQKK0JVR1dLNjY4NzM6ICBodHRwL3Rlc3RzL2xvYWRpbmcv cmVkaXJlY3QtbWV0aG9kcy5odG1sID0gVEVYVAogCiAvLyBObyBzdXBwb3J0IGZvciBvdmVycmlk aW5nIFdlYktpdExvYWRTaXRlSWNvbnNLZXkKIEJVR1dLODUxNzEgOiBodHRwL3Rlc3RzL21pc2Mv ZmF2aWNvbi1sb2Fkcy13aXRoLWljb24tbG9hZGluZy1vdmVycmlkZS5odG1sID0gVEVYVApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IGJiYmE2NTIuLjU3YjdhNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAor MjAxMi0wNS0wNCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50ZWwuY29t PgorCisgICAgICAgIFtzb3VwXSBVUkwgb2YgdGhlIFJlc291cmNlUmVzcG9uc2UgcGFzc2VkIHRv IHdpbGxTZW5kUmVxdWVzdCBpcyBpbmNvcnJlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg1MDcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgU3RvcmUgdGhlIHJlc3BvbnNlIG1lc3NhZ2UgYnkgY2F0Y2hp bmcgdGhlICJnb3QtaGVhZGVycyIgc2lnbmFsIHNvCisgICAgICAgIHRoYXQgaXQgY2FuIGJlIHBh c3NlZCBsYXRlciB0byB3aWxsU2VuZFJlcXVlc3QoKSBpbiBjYXNlIG9mCisgICAgICAgIHJlZGly ZWN0aW9uLiBUaGlzIGlzIHJlcXVpcmVkIGJlY2F1c2UgdGhlIFNvdXBNZXNzYWdlIGhlYWRlcnMg YW5kIFVSTAorICAgICAgICBoYXZlIGFscmVhZHkgYmVlbiB1cGRhdGVkIG9uY2UgcmVzdGFydGVk Q2FsbGJhY2soKSBpcyBjYWxsZWQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3NvdXAv UmVzb3VyY2VIYW5kbGVTb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2Vi Q29yZTo6Z290SGVhZGVyc0NhbGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OnJlc3RhcnRlZENh bGxiYWNrKToKKyAgICAgICAgKFdlYkNvcmU6OnNlbmRSZXF1ZXN0Q2FsbGJhY2spOgorICAgICAg ICAoV2ViQ29yZTo6c3RhcnRIVFRQUmVxdWVzdCk6CisKIDIwMTItMDUtMDQgIExldmkgV2VpbnRy YXViIDxsZXZpd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4aW5nIENo YW5nZUxvZyBjb25mbGljdCBtYXJrZXJzIGFmdGVyIDExNjAwOS4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5j cHAKaW5kZXggZmJmZjNlYi4uZGMwY2I2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAgLTIx NSw2ICsyMTUsMjkgQEAgc3RhdGljIHZvaWQgZW5zdXJlU2Vzc2lvbklzSW5pdGlhbGl6ZWQoU291 cFNlc3Npb24qIHNlc3Npb24pCiAgICAgZ19vYmplY3Rfc2V0X2RhdGEoR19PQkpFQ1Qoc2Vzc2lv biksICJ3ZWJraXQtaW5pdCIsIHJlaW50ZXJwcmV0X2Nhc3Q8dm9pZCo+KDB4ZGVhZGJlZWYpKTsK IH0KIAorc3RhdGljIHZvaWQgZ290SGVhZGVyc0NhbGxiYWNrKFNvdXBNZXNzYWdlKiBtc2csIGdw b2ludGVyIGRhdGEpCit7CisgICAgUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSA9IHN0YXRpY19jYXN0 PFJlc291cmNlSGFuZGxlKj4oZGF0YSk7CisgICAgaWYgKCFoYW5kbGUpCisgICAgICAgIHJldHVy bjsKKyAgICBSZXNvdXJjZUhhbmRsZUludGVybmFsKiBkID0gaGFuZGxlLT5nZXRJbnRlcm5hbCgp OworICAgIGlmIChkLT5tX2NhbmNlbGxlZCkKKyAgICAgICAgcmV0dXJuOworCisjaWYgRU5BQkxF KFdFQl9USU1JTkcpCisgICAgaWYgKGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCkp CisgICAgICAgIGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2FkVGltaW5nKCktPnJlY2VpdmVIZWFk ZXJzRW5kID0gbWlsaXNlY29uZHNTaW5jZVJlcXVlc3QoZC0+bV9yZXNwb25zZS5yZXNvdXJjZUxv YWRUaW1pbmcoKS0+cmVxdWVzdFRpbWUpOworI2VuZGlmCisKKyAgICAvLyBUaGUgb3JpZ2luYWwg cmVzcG9uc2Ugd2lsbCBiZSBuZWVkZWQgbGF0ZXIgdG8gZmVlZCB0byB3aWxsU2VuZFJlcXVlc3Qg aW4KKyAgICAvLyByZXN0YXJ0ZWRDYWxsYmFjaygpIGluIGNhc2Ugd2UgYXJlIHJlZGlyZWN0ZWQu IEZvciB0aGlzIHJlYXNvbiwgc28gd2Ugc3RvcmUgaXQKKyAgICAvLyBoZXJlLgorICAgIFJlc291 cmNlUmVzcG9uc2UgcmVzcG9uc2U7CisgICAgcmVzcG9uc2UudXBkYXRlRnJvbVNvdXBNZXNzYWdl KG1zZyk7CisKKyAgICBkLT5tX3Jlc3BvbnNlID0gcmVzcG9uc2U7Cit9CisKIC8vIENhbGxlZCBl YWNoIHRpbWUgdGhlIG1lc3NhZ2UgaXMgZ29pbmcgdG8gYmUgc2VudCBhZ2FpbiBleGNlcHQgdGhl IGZpcnN0IHRpbWUuCiAvLyBJdCdzIHVzZWQgbW9zdGx5IHRvIGxldCB3ZWJraXQga25vdyBhYm91 dCByZWRpcmVjdHMuCiBzdGF0aWMgdm9pZCByZXN0YXJ0ZWRDYWxsYmFjayhTb3VwTWVzc2FnZSog bXNnLCBncG9pbnRlciBkYXRhKQpAQCAtMjMxLDEwICsyNTQsOCBAQCBzdGF0aWMgdm9pZCByZXN0 YXJ0ZWRDYWxsYmFjayhTb3VwTWVzc2FnZSogbXNnLCBncG9pbnRlciBkYXRhKQogICAgIEtVUkwg bmV3VVJMID0gS1VSTChoYW5kbGUtPmZpcnN0UmVxdWVzdCgpLnVybCgpLCBsb2NhdGlvbik7CiAK ICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCA9IGhhbmRsZS0+Zmlyc3RSZXF1ZXN0KCk7Ci0g ICAgUmVzb3VyY2VSZXNwb25zZSByZXNwb25zZTsKICAgICByZXF1ZXN0LnNldFVSTChuZXdVUkwp OwogICAgIHJlcXVlc3Quc2V0SFRUUE1ldGhvZChtc2ctPm1ldGhvZCk7Ci0gICAgcmVzcG9uc2Uu dXBkYXRlRnJvbVNvdXBNZXNzYWdlKG1zZyk7CiAKICAgICAvLyBTaG91bGQgbm90IHNldCBSZWZl cmVyIGFmdGVyIGEgcmVkaXJlY3QgZnJvbSBhIHNlY3VyZSByZXNvdXJjZSB0byBub24tc2VjdXJl IG9uZS4KICAgICBpZiAoIXJlcXVlc3QudXJsKCkucHJvdG9jb2xJcygiaHR0cHMiKSAmJiBwcm90 b2NvbElzKHJlcXVlc3QuaHR0cFJlZmVycmVyKCksICJodHRwcyIpKSB7CkBAIC0yNDMsNyArMjY0 LDcgQEAgc3RhdGljIHZvaWQgcmVzdGFydGVkQ2FsbGJhY2soU291cE1lc3NhZ2UqIG1zZywgZ3Bv aW50ZXIgZGF0YSkKICAgICB9CiAKICAgICBpZiAoZC0+Y2xpZW50KCkpCi0gICAgICAgIGQtPmNs aWVudCgpLT53aWxsU2VuZFJlcXVlc3QoaGFuZGxlLCByZXF1ZXN0LCByZXNwb25zZSk7CisgICAg ICAgIGQtPmNsaWVudCgpLT53aWxsU2VuZFJlcXVlc3QoaGFuZGxlLCByZXF1ZXN0LCBkLT5tX3Jl c3BvbnNlKTsKIAogICAgIGlmIChkLT5tX2NhbmNlbGxlZCkKICAgICAgICAgcmV0dXJuOwpAQCAt MzQ1LDExICszNjYsNiBAQCBzdGF0aWMgdm9pZCBzZW5kUmVxdWVzdENhbGxiYWNrKEdPYmplY3Qq IHNvdXJjZSwgR0FzeW5jUmVzdWx0KiByZXMsIGdwb2ludGVyIGRhdAogICAgICAgICByZXR1cm47 CiAgICAgfQogCi0jaWYgRU5BQkxFKFdFQl9USU1JTkcpCi0gICAgaWYgKGQtPm1fcmVzcG9uc2Uu cmVzb3VyY2VMb2FkVGltaW5nKCkpCi0gICAgICAgIGQtPm1fcmVzcG9uc2UucmVzb3VyY2VMb2Fk VGltaW5nKCktPnJlY2VpdmVIZWFkZXJzRW5kID0gbWlsaXNlY29uZHNTaW5jZVJlcXVlc3QoZC0+ bV9yZXNwb25zZS5yZXNvdXJjZUxvYWRUaW1pbmcoKS0+cmVxdWVzdFRpbWUpOwotI2VuZGlmCi0K ICAgICBHT3duUHRyPEdFcnJvcj4gZXJyb3I7CiAgICAgR0lucHV0U3RyZWFtKiBpbiA9IHNvdXBf cmVxdWVzdF9zZW5kX2ZpbmlzaChkLT5tX3NvdXBSZXF1ZXN0LmdldCgpLCByZXMsICZlcnJvci5v dXRQdHIoKSk7CiAgICAgaWYgKGVycm9yKSB7CkBAIC02MTIsNiArNjI4LDcgQEAgc3RhdGljIGJv b2wgc3RhcnRIVFRQUmVxdWVzdChSZXNvdXJjZUhhbmRsZSogaGFuZGxlKQogICAgIGlmICghaGFu ZGxlLT5zaG91bGRDb250ZW50U25pZmYoKSkKICAgICAgICAgc291cF9tZXNzYWdlX2Rpc2FibGVf ZmVhdHVyZShzb3VwTWVzc2FnZSwgU09VUF9UWVBFX0NPTlRFTlRfU05JRkZFUik7CiAKKyAgICBn X3NpZ25hbF9jb25uZWN0KHNvdXBNZXNzYWdlLCAiZ290LWhlYWRlcnMiLCBHX0NBTExCQUNLKGdv dEhlYWRlcnNDYWxsYmFjayksIGhhbmRsZSk7CiAgICAgZ19zaWduYWxfY29ubmVjdChzb3VwTWVz c2FnZSwgInJlc3RhcnRlZCIsIEdfQ0FMTEJBQ0socmVzdGFydGVkQ2FsbGJhY2spLCBoYW5kbGUp OwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qoc291cE1lc3NhZ2UsICJ3cm90ZS1ib2R5LWRhdGEiLCBH X0NBTExCQUNLKHdyb3RlQm9keURhdGFDYWxsYmFjayksIGhhbmRsZSk7CiAK