39029 2010-05-12 14:56:47 -0700 REGRESSION: (r47291): Upload progress events are not fired for simple cross-origin XHR 2010-06-23 10:00:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 levin levin abarth ap eric webkit.review.bot oldest_to_newest 224924 0 levin 2010-05-12 14:56:47 -0700 REGRESSION (r47291): Progress events are no longer fired for simple cross site xhr when the event was set-up before xhr.send is done. 224930 1 55906 levin 2010-05-12 15:02:57 -0700 Created attachment 55906 Patch 224940 2 levin 2010-05-12 15:16:50 -0700 This is basically a follow up to https://bugs.webkit.org/show_bug.cgi?id=37771 where I looked at the original behavior before r47291 and made the code behave as it did before. I know that this is a step in the right direction. However, I admit to not knowing if the behavior is as complete as before in every circumstance because there are a lot of place that did m_uploadEventsAllowed = true (if you look at http://trac.webkit.org/changeset/47291) which no longer do (a few in makeCrossOriginAccessRequestWithPreflight and one in handleAsynchronousPreflightResult), but I believe that these are handled by the "!isSimpleCrossOriginAccessRequest(m_method, m_requestHeaders)" clause that was already present. 224977 3 55911 levin 2010-05-12 16:43:09 -0700 Created attachment 55911 Proposed fix v2. 224986 4 55911 ap 2010-05-12 17:01:48 -0700 Comment on attachment 55911 Proposed fix v2. The code changes look good. Maybe I'd have renamed forcePreflight local variable to uploadEvents to match the current spec draft, and to make the code slightly less confusing. According to the spec, the upload events flag should be always set to false for sync requests. So, it's wrong to force preflight because of installed event listeners, and I'm not sure what we do with actual events in this case. + * http/tests/xmlhttprequest/simple-cross-origin-progress-events.html: Add a test which sets up + at least one the progress event listener before the XMLHttpRequest send is done. This only verifies the fix indirectly (by testing that preflight is forced, which is a great thing to test). Can you add a test to verify that progress events for successful upload are fired, too? r=me as is, but please consider investigating and testing the sync case, and adding a test for successful preflight. It may also be interesting to investigate the case where preflight is enabled for some other reason (such as a different content type), and event listeners are only added after send(). WebKit would dispatch upload events, and this seems to be the logical thing to do, but I'm not sure how interpret the spec text. 241645 5 levin 2010-06-22 21:39:57 -0700 Committed as http://trac.webkit.org/changeset/61654 241653 6 levin 2010-06-22 21:50:57 -0700 (In reply to comment #4) > (From update of attachment 55911 [details]) > Maybe I'd have renamed forcePreflight local variable to uploadEvents to match the current spec draft. Done. > According to the spec, the upload events flag should be always set to false for sync requests. So, it's wrong to force preflight because of installed event listeners, and I'm not sure what we do with actual events in this case. You were prescient: https://bugs.webkit.org/show_bug.cgi?id=40996 > This only verifies the fix indirectly (by testing that preflight is forced, which is a great thing to test). Can you add a test to verify that progress events for successful upload are fired, too? Filed: https://bugs.webkit.org/show_bug.cgi?id=41038 > > r=me as is, adding a test for successful preflight. Is this the same as bug 41038 or are you expecting something else? (If something else, I'll file another bug for myself.) > It may also be interesting to investigate the case where preflight is enabled for some other reason (such as a different content type), and event listeners are only added after send(). WebKit would dispatch upload events, and this seems to be the logical thing to do, but I'm not sure how interpret the spec text. Filed: https://bugs.webkit.org/show_bug.cgi?id=41041 241657 7 webkit.review.bot 2010-06-22 21:59:13 -0700 http://trac.webkit.org/changeset/61654 might have broken Qt Linux Release 241673 8 levin 2010-06-22 22:28:06 -0700 Follow fix to disable the test for Qt: http://trac.webkit.org/changeset/61657 241902 9 ap 2010-06-23 09:58:05 -0700 > Is this the same as bug 41038 Yes, thanks! 241906 10 ap 2010-06-23 10:00:37 -0700 <rdar://problem/8122461> 55906 2010-05-12 15:02:57 -0700 2010-05-12 16:43:09 -0700 Patch bug-39029-20100512150353.patch text/plain 5004 levin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZTQ5NTUyMmYwYWViY2YwZGUwNjQ1MTRlZTNiY2QzN2UwNGQ4MTZlLi44Y2E0Yzhi MWZmMDYwMDgxYjc5ZjJhOTk5MmM5NGQ3MTBiMmQxNmRlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTAtMDUtMTIgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT04gKHI0NzI5 MSk6IFByb2dyZXNzIGV2ZW50cyBhcmUgbm8gbG9uZ2VyIGZpcmVkIGZvciBzaW1wbGUgY3Jvc3Mg c2l0ZSB4aHIgd2hlbiB0aGUgZXZlbnQgd2FzIHNldC11cCBiZWZvcmUgeGhyLnNlbmQgaXMgZG9u ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MDI5 CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3NpbXBsZS1jcm9zcy1vcmln aW4tcHJvZ3Jlc3MtZXZlbnRzLWV4cGVjdGVkLnR4dDogVXBkYXRlIHJlc3VsdHMuCisgICAgICAg ICogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zaW1wbGUtY3Jvc3Mtb3JpZ2luLXByb2dyZXNz LWV2ZW50cy5odG1sOiBBZGQgYSB0ZXN0IHdoaWNoIHNldHMgdXAKKyAgICAgICAgICBhdCBsZWFz dCBvbmUgdGhlIHByb2dyZXNzIGV2ZW50IGxpc3RlbmVyIGJlZm9yZSB0aGUgWE1MSHR0cFJlcXVl c3Qgc2VuZCBpcyBkb25lLgorCiAyMDEwLTA1LTExICBBbnRvbmlvIEdvbWVzICA8dG9uaWtpdG9v QHdlYmtpdC5vcmc+CiAKICAgICAgICAgUnViYmVyLXN0YW1wZWQgYnkgS2VubmV0aCBDaHJpc3Rp YW5zZW4uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0 L3NpbXBsZS1jcm9zcy1vcmlnaW4tcHJvZ3Jlc3MtZXZlbnRzLWV4cGVjdGVkLnR4dCBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvc2ltcGxlLWNyb3NzLW9yaWdpbi1wcm9n cmVzcy1ldmVudHMtZXhwZWN0ZWQudHh0CmluZGV4IGY5NzZiMmM0MDRkMDA3NjEyZTQ3N2JjZTEw YTViZmNhYWQ2ZDEwMGYuLjJkYWM2N2JjMDY5YzYzZGYwNmNjNDZmMmY3OWE0YmI0YWM2YmQ0N2Ug MTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvc2ltcGxl LWNyb3NzLW9yaWdpbi1wcm9ncmVzcy1ldmVudHMtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvc2ltcGxlLWNyb3NzLW9yaWdpbi1wcm9ncmVz cy1ldmVudHMtZXhwZWN0ZWQudHh0CkBAIC05LDMgKzksOSBAQCBUZXN0IDI6IFRoZSBVUkwgaXMg bm90IGFsbG93ZWQgZm9yIGNyb3NzLW9yaWdpbiByZXF1ZXN0cwogb25lcnJvciAoZXhwZWN0ZWQp CiBSZXNwb25zZSBsZW5ndGg6IDAKIAorVGVzdCAzOiBUaGUgVVJMIGlzIG5vdCBhbGxvd2VkIGZv ciBjcm9zcy1vcmlnaW4gcmVxdWVzdHMgYW5kIGF0IGxlYXN0IG9uZSB1cGxvYWQgZXZlbnQgaXMg bGlzdGVuZWQgZm9yIGJlZm9yZSBkb2luZyB0aGUgc2VuZC4KK3VwbG9hZC5vbmxvYWRzdGFydAor b25lcnJvciAoZXhwZWN0ZWQpCitSZXNwb25zZSBsZW5ndGg6IDAKK3VwbG9hZC5vbmVycm9yIChl eHBlY3RlZCkKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy94bWxodHRwcmVx dWVzdC9zaW1wbGUtY3Jvc3Mtb3JpZ2luLXByb2dyZXNzLWV2ZW50cy5odG1sIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zaW1wbGUtY3Jvc3Mtb3JpZ2luLXByb2dyZXNz LWV2ZW50cy5odG1sCmluZGV4IGU3ZmEyMjYzZjcxYmE1ZGM0YzBlZmE1MzQzYjM3NTNkYzM4MjBi YTguLmFlN2I4MGUwZGM0Y2NmNDZmNjlmYzI0MTViZTg0OWNhMTBkOTAxMTkgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvc2ltcGxlLWNyb3NzLW9yaWdp bi1wcm9ncmVzcy1ldmVudHMuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0 dHByZXF1ZXN0L3NpbXBsZS1jcm9zcy1vcmlnaW4tcHJvZ3Jlc3MtZXZlbnRzLmh0bWwKQEAgLTc5 LDYgKzc5LDMyIEBAIGZ1bmN0aW9uIHRlc3QyKCkKICAgICB4aHIub25lcnJvciA9IGZ1bmN0aW9u KCkgewogICAgICAgICBsb2coIm9uZXJyb3IgKGV4cGVjdGVkKSIpOwogICAgICAgICBsb2coIlJl c3BvbnNlIGxlbmd0aDogIiArIHhoci5yZXNwb25zZVRleHQubGVuZ3RoKTsKKyAgICAgICAgdGVz dDMoKTsKKyAgICB9CisgICAgeGhyLm9ubG9hZCA9IGZ1bmN0aW9uKCkgeworICAgICAgICBsb2co Im9ubG9hZCIpOworICAgIH0KK30KKworZnVuY3Rpb24gdGVzdDMoKQoreworICAgIHNhd1Byb2dy ZXNzID0gZmFsc2U7CisgICAgc2F3VXBsb2FkUHJvZ3Jlc3MgPSBmYWxzZTsKKworICAgIGxvZygi XG5UZXN0IDM6IFRoZSBVUkwgaXMgbm90IGFsbG93ZWQgZm9yIGNyb3NzLW9yaWdpbiByZXF1ZXN0 cyBhbmQgYXQgbGVhc3Qgb25lIHVwbG9hZCBldmVudCBpcyBsaXN0ZW5lZCBmb3IgYmVmb3JlIGRv aW5nIHRoZSBzZW5kLiIpOworCisgICAgdmFyIHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOwor ICAgIHhoci5vbnByb2dyZXNzID0gcHJvZ3Jlc3M7CisgICAgeGhyLm9wZW4oIlBPU1QiLCAiaHR0 cDovL2xvY2FsaG9zdDo4MDAwL3htbGh0dHByZXF1ZXN0L3Jlc291cmNlcy9jcm9zcy1zaXRlLXBy b2dyZXNzLWV2ZW50cy5jZ2kiLCB0cnVlKTsKKyAgICB4aHIuc2V0UmVxdWVzdEhlYWRlcigiQ29u dGVudC1UeXBlIiwgInRleHQvcGxhaW4iKTsKKyAgICB4aHIudXBsb2FkLm9ubG9hZHN0YXJ0ID0g ZnVuY3Rpb24oKSB7IGxvZygidXBsb2FkLm9ubG9hZHN0YXJ0IikgfQorICAgIHhoci5zZW5kKHN0 cmluZ1RvU2VuZCk7CisgICAgeGhyLnVwbG9hZC5vbnByb2dyZXNzID0gdXBsb2FkUHJvZ3Jlc3M7 CisgICAgeGhyLnVwbG9hZC5vbmxvYWQgPSBmdW5jdGlvbigpIHsgbG9nKCJGQUlMOiB1cGxvYWQu b25sb2FkIikgfQorICAgIHhoci51cGxvYWQub25lcnJvciA9IGZ1bmN0aW9uKCkgeyBsb2coInVw bG9hZC5vbmVycm9yIChleHBlY3RlZCkiKSB9CisgICAgeGhyLm9uZXJyb3IgPSBmdW5jdGlvbigp IHsKKyAgICAgICAgbG9nKCJvbmVycm9yIChleHBlY3RlZCkiKTsKKyAgICAgICAgbG9nKCJSZXNw b25zZSBsZW5ndGg6ICIgKyB4aHIucmVzcG9uc2VUZXh0Lmxlbmd0aCk7CiAgICAgICAgIGlmICh3 aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpCiAgICAgICAgICAgICBsYXlvdXRUZXN0Q29udHJv bGxlci5ub3RpZnlEb25lKCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cg Yi9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2ZjEyNTRkZjE0MzZiNjE2M2JkNGJiZDM0ZGYyZDU2 ZWZkYmM5Yjg4Li5iYTJlYmQ3OWM5YzUyMjUyYTMwM2MxYzE5M2YzZDYyOTZjZjEwYTcwIDEwMDY0 NAotLS0gYS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDEwLTA1LTEyICBEYXZpZCBMZXZpbiAgPGxldmluQGNocm9taXVtLm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSRUdSRVNT SU9OIChyNDcyOTEpOiBQcm9ncmVzcyBldmVudHMgYXJlIG5vIGxvbmdlciBmaXJlZCBmb3Igc2lt cGxlIGNyb3NzIHNpdGUgeGhyIHdoZW4gdGhlIGV2ZW50IHdhcyBzZXQtdXAgYmVmb3JlIHhoci5z ZW5kIGlzIGRvbmUuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0zOTAyOQorCisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KTogQWxsb3cgdXBsb2FkIGV2 ZW50cyB0byBiZSBmaXJlZCB3aGVuIHRoZXJlIGFyZQorICAgICAgICBsaXN0ZW5lcnMgZm9yIHRo ZW0gaW4gdGhlIGNyb3NzLW9yaWdpbiBzaW1wbGUgcmVxdWVzdCBjYXNlLgorCiAyMDEwLTA1LTEx ICBKaWFuIExpICA8amlhbmxpQGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLiBG aXggY29tcGlsaW5nIGVycm9uIG9uIHNub3cgbGVvcGFyZC4KZGlmZiAtLWdpdCBhL1dlYkNvcmUv eG1sL1hNTEh0dHBSZXF1ZXN0LmNwcCBiL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcApp bmRleCA1Y2RlMjRkZTI5ZGI0NDIxMDAwMWEzMDIzMjQ0Y2E0Y2NkMjVjZmJiLi41ZTlhNjU5MmM0 YjdmYTc0MWFjNGM5ZDJiNGQzYTU1MmNjYjIwYzI3IDEwMDY0NAotLS0gYS9XZWJDb3JlL3htbC9Y TUxIdHRwUmVxdWVzdC5jcHAKKysrIGIvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCkBA IC01MjksNyArNTI5LDcgQEAgdm9pZCBYTUxIdHRwUmVxdWVzdDo6Y3JlYXRlUmVxdWVzdChFeGNl cHRpb25Db2RlJiBlYykKIAogICAgIC8vIFdlIGFsc28gcmVtZW1iZXIgd2hldGhlciB1cGxvYWQg ZXZlbnRzIHNob3VsZCBiZSBhbGxvd2VkIGZvciB0aGlzIHJlcXVlc3QgaW4gY2FzZSB0aGUgdXBs b2FkIGxpc3RlbmVycyBhcmUKICAgICAvLyBhZGRlZCBhZnRlciB0aGUgcmVxdWVzdCBpcyBzdGFy dGVkLgotICAgIG1fdXBsb2FkRXZlbnRzQWxsb3dlZCA9IG1fc2FtZU9yaWdpblJlcXVlc3QgfHwg IWlzU2ltcGxlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KG1fbWV0aG9kLCBtX3JlcXVlc3RIZWFk ZXJzKTsKKyAgICBtX3VwbG9hZEV2ZW50c0FsbG93ZWQgPSBtX3NhbWVPcmlnaW5SZXF1ZXN0IHx8 IGZvcmNlUHJlZmxpZ2h0IHx8ICFpc1NpbXBsZUNyb3NzT3JpZ2luQWNjZXNzUmVxdWVzdChtX21l dGhvZCwgbV9yZXF1ZXN0SGVhZGVycyk7CiAKICAgICBSZXNvdXJjZVJlcXVlc3QgcmVxdWVzdCht X3VybCk7CiAgICAgcmVxdWVzdC5zZXRIVFRQTWV0aG9kKG1fbWV0aG9kKTsK 55911 2010-05-12 16:43:09 -0700 2010-06-11 12:14:50 -0700 Proposed fix v2. bug39029.txt text/plain 4754 levin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZTQ5NTUyLi4xYmIxYzM0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDUt MTIgIERhdmlkIExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JFU1NJT046IChyNDcyOTEpOiBVcGxv YWQgcHJvZ3Jlc3MgZXZlbnRzIGFyZSBub3QgZmlyZWQgZm9yIHNpbXBsZSBjcm9zcy1zaXRlIFhI Ui4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM5MDI5 CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3NpbXBsZS1jcm9zcy1vcmln aW4tcHJvZ3Jlc3MtZXZlbnRzLWV4cGVjdGVkLnR4dDogVXBkYXRlIHJlc3VsdHMuCisgICAgICAg ICogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zaW1wbGUtY3Jvc3Mtb3JpZ2luLXByb2dyZXNz LWV2ZW50cy5odG1sOiBBZGQgYSB0ZXN0IHdoaWNoIGFkZHMKKyAgICAgICAgICBhbiB1cGxvYWQg cHJvZ3Jlc3MgZXZlbnQgaGFuZGxlciBiZWZvcmUgWE1MSHR0cFJlcXVlc3Quc2VuZCgpIGlzIGNh bGxlZC4KKwogMjAxMC0wNS0xMSAgQW50b25pbyBHb21lcyAgPHRvbmlraXRvb0B3ZWJraXQub3Jn PgogCiAgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEtlbm5ldGggQ2hyaXN0aWFuc2VuLgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zaW1wbGUtY3Jv c3Mtb3JpZ2luLXByb2dyZXNzLWV2ZW50cy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL3htbGh0dHByZXF1ZXN0L3NpbXBsZS1jcm9zcy1vcmlnaW4tcHJvZ3Jlc3MtZXZlbnRz LWV4cGVjdGVkLnR4dAppbmRleCBmOTc2YjJjLi4yZGFjNjdiIDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3NpbXBsZS1jcm9zcy1vcmlnaW4tcHJvZ3Jl c3MtZXZlbnRzLWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0 dHByZXF1ZXN0L3NpbXBsZS1jcm9zcy1vcmlnaW4tcHJvZ3Jlc3MtZXZlbnRzLWV4cGVjdGVkLnR4 dApAQCAtOSwzICs5LDkgQEAgVGVzdCAyOiBUaGUgVVJMIGlzIG5vdCBhbGxvd2VkIGZvciBjcm9z cy1vcmlnaW4gcmVxdWVzdHMKIG9uZXJyb3IgKGV4cGVjdGVkKQogUmVzcG9uc2UgbGVuZ3RoOiAw CiAKK1Rlc3QgMzogVGhlIFVSTCBpcyBub3QgYWxsb3dlZCBmb3IgY3Jvc3Mtb3JpZ2luIHJlcXVl c3RzIGFuZCBhdCBsZWFzdCBvbmUgdXBsb2FkIGV2ZW50IGlzIGxpc3RlbmVkIGZvciBiZWZvcmUg ZG9pbmcgdGhlIHNlbmQuCit1cGxvYWQub25sb2Fkc3RhcnQKK29uZXJyb3IgKGV4cGVjdGVkKQor UmVzcG9uc2UgbGVuZ3RoOiAwCit1cGxvYWQub25lcnJvciAoZXhwZWN0ZWQpCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3Qvc2ltcGxlLWNyb3NzLW9y aWdpbi1wcm9ncmVzcy1ldmVudHMuaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0 cHJlcXVlc3Qvc2ltcGxlLWNyb3NzLW9yaWdpbi1wcm9ncmVzcy1ldmVudHMuaHRtbAppbmRleCBl N2ZhMjI2Li5hZTdiODBlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0 dHByZXF1ZXN0L3NpbXBsZS1jcm9zcy1vcmlnaW4tcHJvZ3Jlc3MtZXZlbnRzLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC9zaW1wbGUtY3Jvc3Mtb3JpZ2lu LXByb2dyZXNzLWV2ZW50cy5odG1sCkBAIC03OSw2ICs3OSwzMiBAQCBmdW5jdGlvbiB0ZXN0Migp CiAgICAgeGhyLm9uZXJyb3IgPSBmdW5jdGlvbigpIHsKICAgICAgICAgbG9nKCJvbmVycm9yIChl eHBlY3RlZCkiKTsKICAgICAgICAgbG9nKCJSZXNwb25zZSBsZW5ndGg6ICIgKyB4aHIucmVzcG9u c2VUZXh0Lmxlbmd0aCk7CisgICAgICAgIHRlc3QzKCk7CisgICAgfQorICAgIHhoci5vbmxvYWQg PSBmdW5jdGlvbigpIHsKKyAgICAgICAgbG9nKCJvbmxvYWQiKTsKKyAgICB9Cit9CisKK2Z1bmN0 aW9uIHRlc3QzKCkKK3sKKyAgICBzYXdQcm9ncmVzcyA9IGZhbHNlOworICAgIHNhd1VwbG9hZFBy b2dyZXNzID0gZmFsc2U7CisKKyAgICBsb2coIlxuVGVzdCAzOiBUaGUgVVJMIGlzIG5vdCBhbGxv d2VkIGZvciBjcm9zcy1vcmlnaW4gcmVxdWVzdHMgYW5kIGF0IGxlYXN0IG9uZSB1cGxvYWQgZXZl bnQgaXMgbGlzdGVuZWQgZm9yIGJlZm9yZSBkb2luZyB0aGUgc2VuZC4iKTsKKworICAgIHZhciB4 aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKKyAgICB4aHIub25wcm9ncmVzcyA9IHByb2dyZXNz OworICAgIHhoci5vcGVuKCJQT1NUIiwgImh0dHA6Ly9sb2NhbGhvc3Q6ODAwMC94bWxodHRwcmVx dWVzdC9yZXNvdXJjZXMvY3Jvc3Mtc2l0ZS1wcm9ncmVzcy1ldmVudHMuY2dpIiwgdHJ1ZSk7Cisg ICAgeGhyLnNldFJlcXVlc3RIZWFkZXIoIkNvbnRlbnQtVHlwZSIsICJ0ZXh0L3BsYWluIik7Cisg ICAgeGhyLnVwbG9hZC5vbmxvYWRzdGFydCA9IGZ1bmN0aW9uKCkgeyBsb2coInVwbG9hZC5vbmxv YWRzdGFydCIpIH0KKyAgICB4aHIuc2VuZChzdHJpbmdUb1NlbmQpOworICAgIHhoci51cGxvYWQu b25wcm9ncmVzcyA9IHVwbG9hZFByb2dyZXNzOworICAgIHhoci51cGxvYWQub25sb2FkID0gZnVu Y3Rpb24oKSB7IGxvZygiRkFJTDogdXBsb2FkLm9ubG9hZCIpIH0KKyAgICB4aHIudXBsb2FkLm9u ZXJyb3IgPSBmdW5jdGlvbigpIHsgbG9nKCJ1cGxvYWQub25lcnJvciAoZXhwZWN0ZWQpIikgfQor ICAgIHhoci5vbmVycm9yID0gZnVuY3Rpb24oKSB7CisgICAgICAgIGxvZygib25lcnJvciAoZXhw ZWN0ZWQpIik7CisgICAgICAgIGxvZygiUmVzcG9uc2UgbGVuZ3RoOiAiICsgeGhyLnJlc3BvbnNl VGV4dC5sZW5ndGgpOwogICAgICAgICBpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQog ICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOwogICAgIH0KZGlm ZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmYx MjU0ZC4uYzlmNzZlZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29y ZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0wNS0xMiAgRGF2aWQgTGV2aW4gIDxs ZXZpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUkVHUkVTU0lPTjogKHI0NzI5MSk6IFVwbG9hZCBwcm9ncmVzcyBldmVudHMg YXJlIG5vdCBmaXJlZCBmb3Igc2ltcGxlIGNyb3NzLXNpdGUgWEhSLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzkwMjkKKworICAgICAgICBTcGVjaWZp Y2FsbHksIFdlYktpdCBzaG91bGQgZmlyZSB1cGxvYWQgZXZlbnRzIGlmIG9uZSBvciBtb3JlIGV2 ZW50IGxpc3RlbmVycyBhcmUKKyAgICAgICAgcmVnaXN0ZXJlZCBvbiB0aGUgWE1MSHR0cFJlcXVl c3RVcGxvYWQgb2JqZWN0IHdoZW4gc2VuZCBpcyBjYWxsZWQgaW4gYW4gYXN5bmMgbWFubmVyLgor CisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhN TEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KTogQWxsb3cgdXBsb2FkIGV2ZW50cyB0byBiZSBm aXJlZCB3aGVuIHRoZXJlIGFyZQorICAgICAgICBoYW5kbGVycyBmb3IgdGhlbSBpbiB0aGUgY3Jv c3Mtb3JpZ2luIHNpbXBsZSByZXF1ZXN0IGNhc2UuCisKIDIwMTAtMDUtMTEgIEppYW4gTGkgIDxq aWFubGlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBjb21waWxpbmcg ZXJyb24gb24gc25vdyBsZW9wYXJkLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS94bWwvWE1MSHR0cFJl cXVlc3QuY3BwIGIvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCmluZGV4IDVjZGUyNGQu LjVlOWE2NTkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAorKysg Yi9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTUyOSw3ICs1MjksNyBAQCB2b2lk IFhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KEV4Y2VwdGlvbkNvZGUmIGVjKQogCiAgICAg Ly8gV2UgYWxzbyByZW1lbWJlciB3aGV0aGVyIHVwbG9hZCBldmVudHMgc2hvdWxkIGJlIGFsbG93 ZWQgZm9yIHRoaXMgcmVxdWVzdCBpbiBjYXNlIHRoZSB1cGxvYWQgbGlzdGVuZXJzIGFyZQogICAg IC8vIGFkZGVkIGFmdGVyIHRoZSByZXF1ZXN0IGlzIHN0YXJ0ZWQuCi0gICAgbV91cGxvYWRFdmVu dHNBbGxvd2VkID0gbV9zYW1lT3JpZ2luUmVxdWVzdCB8fCAhaXNTaW1wbGVDcm9zc09yaWdpbkFj Y2Vzc1JlcXVlc3QobV9tZXRob2QsIG1fcmVxdWVzdEhlYWRlcnMpOworICAgIG1fdXBsb2FkRXZl bnRzQWxsb3dlZCA9IG1fc2FtZU9yaWdpblJlcXVlc3QgfHwgZm9yY2VQcmVmbGlnaHQgfHwgIWlz U2ltcGxlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KG1fbWV0aG9kLCBtX3JlcXVlc3RIZWFkZXJz KTsKIAogICAgIFJlc291cmNlUmVxdWVzdCByZXF1ZXN0KG1fdXJsKTsKICAgICByZXF1ZXN0LnNl dEhUVFBNZXRob2QobV9tZXRob2QpOwo=