65694 2011-08-04 09:20:16 -0700 Make it possible to explicitly prevent a preflight via ThreadableLoaderOptions 2011-08-16 17:16:41 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 61862 0 per-erik.brodin webkit-unassigned ap dglazkov ian per-erik.brodin webkit.review.bot oldest_to_newest 446548 0 per-erik.brodin 2011-08-04 09:20:16 -0700 Some APIs, like EventSource, will never trigger a preflight so there is really no need to check the preflight conditions. We should make it possible to explicitly prevent a preflight via an option in ThreadableLoaderOptions. One way would be to let the existing forcePreflight option become a condition/force/prevent policy option. 446552 1 102933 per-erik.brodin 2011-08-04 09:28:00 -0700 Created attachment 102933 proposed patch 446561 2 102933 ap 2011-08-04 09:37:36 -0700 Comment on attachment 102933 proposed patch I don't see why this change is needed. Both DenyCrossOriginRequests and AllowCrossOriginRequests never use preflight, so that's what EventSource should be using. 446569 3 per-erik.brodin 2011-08-04 09:47:21 -0700 (In reply to comment #2) > (From update of attachment 102933 [details]) > I don't see why this change is needed. Both DenyCrossOriginRequests and AllowCrossOriginRequests never use preflight, so that's what EventSource should be using. The change is needed to add CORS support to EventSource. I think that both those two options disable CORS. 446573 4 102933 webkit-ews 2011-08-04 09:49:36 -0700 Comment on attachment 102933 proposed patch Attachment 102933 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/9303514 446589 5 102933 webkit.review.bot 2011-08-04 10:17:11 -0700 Comment on attachment 102933 proposed patch Attachment 102933 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9305486 446653 6 ap 2011-08-04 11:47:20 -0700 I guess the patch is OK then, although I'm still surprised that EventSource doesn't use preflight, and can hit unprepared servers with a new kind of request. 446724 7 ian 2011-08-04 13:14:04 -0700 In what sense is the request a new kind of request? Do you just mean that new HTTP headers? 446728 8 102966 per-erik.brodin 2011-08-04 13:15:52 -0700 Created attachment 102966 updated patch Tweaked if-statement to avoid compiler warning. 446732 9 per-erik.brodin 2011-08-04 13:21:08 -0700 (In reply to comment #6) > I guess the patch is OK then, although I'm still surprised that EventSource doesn't use preflight, and can hit unprepared servers with a new kind of request. Since the request method will always be GET and the headers can't be affected by script authors I don't think the request will be any different from what can already be accomplished with an image or script load. Also, the Last-Event-ID header will never be present in the first request. 446749 10 102966 webkit.review.bot 2011-08-04 13:49:30 -0700 Comment on attachment 102966 updated patch Attachment 102966 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9304609 446774 11 ap 2011-08-04 14:19:10 -0700 (In reply to comment #7) > In what sense is the request a new kind of request? Do you just mean that new HTTP headers? Yes. Even though headers cannot be changed by script authors, the ability to choose which headers to hit a different origin server with by choosing a particular HTML API is a bit unsettling. 446789 12 ian 2011-08-04 14:34:30 -0700 I agree that the new headers could be problematic. We should definitely keep an eye out for problems. However, I think the risk is worth it. (Much like the risk of the new headers introduced by CORS are probably worth it.) 446799 13 102966 ap 2011-08-04 14:47:02 -0700 Comment on attachment 102966 updated patch View in context: https://bugs.webkit.org/attachment.cgi?id=102966&action=review r=me assuming build fix and a better name for enum value. > Source/WebCore/loader/DocumentThreadableLoader.cpp:101 > + if ((m_options.preflightPolicy == ConditionPreflight && isSimpleCrossOriginAccessRequest(crossOriginRequest->httpMethod(), crossOriginRequest->httpHeaderFields())) || m_options.preflightPolicy == PreventPreflight) I'd order this differently to avoid calling into isSimpleCrossOriginAccessRequest() when PreventPreflight is specified. > Source/WebCore/loader/DocumentThreadableLoader.cpp:115 > + ASSERT(m_options.preflightPolicy == PreventPreflight || isSimpleCrossOriginAccessRequest(request.httpMethod(), request.httpHeaderFields())); Please add ASSERT(m_options.preflightPolicy != ForcePreflight) for completeness. > Source/WebCore/loader/ThreadableLoader.h:60 > + ConditionPreflight, Condition as a verb has a different meaning than you want here. Maybe "MayUsePreflight" or "AllowPreflight"? 447197 14 103070 per-erik.brodin 2011-08-05 07:20:17 -0700 Created attachment 103070 patch 3 (In reply to comment #13) > (From update of attachment 102966 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=102966&action=review > > r=me assuming build fix and a better name for enum value. > Fixed chromium issue. > > Source/WebCore/loader/DocumentThreadableLoader.cpp:101 > > + if ((m_options.preflightPolicy == ConditionPreflight && isSimpleCrossOriginAccessRequest(crossOriginRequest->httpMethod(), crossOriginRequest->httpHeaderFields())) || m_options.preflightPolicy == PreventPreflight) > > I'd order this differently to avoid calling into isSimpleCrossOriginAccessRequest() when PreventPreflight is specified. > The first evaluation will ensure that isSimpleCrossOriginAccessRequest() is not called if preflightPolicy is ForcePreflight or PreventPreflight. That is the default case and probably the most common one so that's why I put it first. > > Source/WebCore/loader/DocumentThreadableLoader.cpp:115 > > + ASSERT(m_options.preflightPolicy == PreventPreflight || isSimpleCrossOriginAccessRequest(request.httpMethod(), request.httpHeaderFields())); > > Please add ASSERT(m_options.preflightPolicy != ForcePreflight) for completeness. > Fixed. > > Source/WebCore/loader/ThreadableLoader.h:60 > > + ConditionPreflight, > > Condition as a verb has a different meaning than you want here. Maybe "MayUsePreflight" or "AllowPreflight"? I wasn't entirely happy with that name but I still would like the option to reflect that CORS rules will determine whether a preflight is made when that policy is set. My new proposal is 'ConsiderPreflight'. If you don't like that name I have no problem changing to one of the two that you suggested. 447200 15 per-erik.brodin 2011-08-05 07:25:44 -0700 (In reply to comment #12) > I agree that the new headers could be problematic. We should definitely keep an eye out for problems. However, I think the risk is worth it. (Much like the risk of the new headers introduced by CORS are probably worth it.) What headers are you talking about? The only special headers sent in an initial EventSource request are (except any CORS headers): Accept: text/event-stream Cache-Control: no-cache (for the Last-Event-ID header ever to be sent the server must allow the origin and also provide a valid event-stream with id fields in it) Since Accept is in the simple header whitelist, it can already be sent without preflight using XHR. That leaves Cache-Control, but isn't that header sent cross-origin in some other cases? Anyway it seems rather harmless to me. 447203 16 ian 2011-08-05 07:33:57 -0700 Last-Event-ID could end up sent to a random host if there is a redirect after a reconnect. 447206 17 per-erik.brodin 2011-08-05 07:39:16 -0700 (In reply to comment #16) > Last-Event-ID could end up sent to a random host if there is a redirect after a reconnect. Ahh, clever. Should that be allowed? 447237 18 103070 ap 2011-08-05 09:23:11 -0700 Comment on attachment 103070 patch 3 ConsiderPreflight is fine with me. I don't have a strong enough opinion about getting rid of preflight for EventSource. Note however that EventSource connections are long lived, so the cost of preflight is low. 451790 19 per-erik.brodin 2011-08-16 12:00:43 -0700 (In reply to comment #18) > I don't have a strong enough opinion about getting rid of preflight for EventSource. Note however that EventSource connections are long lived, so the cost of preflight is low. It's more work for the event-stream provider to handle the preflight request, so I don't think we should have it unless we're convinced that it's needed. Can we land this patch? The patch to CORS-enable EventSource depends on it. 451826 20 ap 2011-08-16 13:35:30 -0700 As far as I'm concerned, yes, you can land this patch. 451880 21 per-erik.brodin 2011-08-16 14:43:20 -0700 (In reply to comment #20) > As far as I'm concerned, yes, you can land this patch. OK, then I would appreciate if you could cq+ 452008 22 103070 webkit.review.bot 2011-08-16 17:16:35 -0700 Comment on attachment 103070 patch 3 Clearing flags on attachment: 103070 Committed r93182: <http://trac.webkit.org/changeset/93182> 452009 23 webkit.review.bot 2011-08-16 17:16:41 -0700 All reviewed patches have been landed. Closing bug. 102933 2011-08-04 09:28:00 -0700 2011-08-04 13:15:52 -0700 proposed patch prevent_preflight_1.patch text/plain 6466 per-erik.brodin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MjdmYTFlLi5mZjQxMjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTEtMDgtMDQgIFBlci1FcmlrIEJyb2RpbiAgPHBlci1lcmlrLmJyb2RpbkBlcmljc3Nv bi5jb20+CisKKyAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBleHBsaWNpdGx5IHByZXZlbnQg YSBwcmVmbGlnaHQgdmlhIFRocmVhZGFibGVMb2FkZXJPcHRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTY5NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGVyZSBp cyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBmaWxlYXBpL0ZpbGVSZWFkZXJM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlckxvYWRlcjo6c3RhcnQpOgor ICAgICAgICAqIGxvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpEb2N1bWVudFRocmVhZGFibGVMb2Fk ZXIpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjptYWtlU2lt cGxlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvVGhyZWFkYWJs ZUxvYWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6VGhyZWFkYWJsZUxvYWRlck9wdGlvbnM6OlRo cmVhZGFibGVMb2FkZXJPcHRpb25zKToKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlmaWNh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb246OnN0YXJ0TG9hZGluZyk6 CisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhN TEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KToKKwogMjAxMS0wOC0wNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVuYW1l IHNvdXJjZUlkIC0+IHNjcmlwdElkIGluIHRoZSBwcm90b2NvbCBhbmQgdGhlIHNvdXJjZSBjb2Rl LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyTG9hZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRlckxvYWRlci5jcHAKaW5kZXggNTBl YTBhZi4uNDM5OTkxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVh ZGVyTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFkZXJMb2Fk ZXIuY3BwCkBAIC04OCw3ICs4OCw3IEBAIHZvaWQgRmlsZVJlYWRlckxvYWRlcjo6c3RhcnQoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgQmxvCiAgICAgVGhy ZWFkYWJsZUxvYWRlck9wdGlvbnMgb3B0aW9uczsKICAgICBvcHRpb25zLnNlbmRMb2FkQ2FsbGJh Y2tzID0gdHJ1ZTsKICAgICBvcHRpb25zLnNuaWZmQ29udGVudCA9IGZhbHNlOwotICAgIG9wdGlv bnMuZm9yY2VQcmVmbGlnaHQgPSBmYWxzZTsKKyAgICBvcHRpb25zLnByZWZsaWdodFBvbGljeSA9 IENvbmRpdGlvblByZWZsaWdodDsKICAgICBvcHRpb25zLmFsbG93Q3JlZGVudGlhbHMgPSB0cnVl OwogICAgIG9wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID0gRGVueUNyb3NzT3JpZ2lu UmVxdWVzdHM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRo cmVhZGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFk YWJsZUxvYWRlci5jcHAKaW5kZXggNDY1NmQyYy4uMGVhM2EzNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKQEAgLTk4LDcgKzk4 LDcgQEAgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXIo RG9jdW1lbnQqIGRvY3VtZW50LCBUaHJlYWRhYmwKICAgICBPd25QdHI8UmVzb3VyY2VSZXF1ZXN0 PiBjcm9zc09yaWdpblJlcXVlc3QgPSBhZG9wdFB0cihuZXcgUmVzb3VyY2VSZXF1ZXN0KHJlcXVl c3QpKTsKICAgICB1cGRhdGVSZXF1ZXN0Rm9yQWNjZXNzQ29udHJvbCgqY3Jvc3NPcmlnaW5SZXF1 ZXN0LCBzZWN1cml0eU9yaWdpbigpLCBtX29wdGlvbnMuYWxsb3dDcmVkZW50aWFscyk7CiAKLSAg ICBpZiAoIW1fb3B0aW9ucy5mb3JjZVByZWZsaWdodCAmJiBpc1NpbXBsZUNyb3NzT3JpZ2luQWNj ZXNzUmVxdWVzdChjcm9zc09yaWdpblJlcXVlc3QtPmh0dHBNZXRob2QoKSwgY3Jvc3NPcmlnaW5S ZXF1ZXN0LT5odHRwSGVhZGVyRmllbGRzKCkpKQorICAgIGlmIChtX29wdGlvbnMucHJlZmxpZ2h0 UG9saWN5ID09IFByZXZlbnRQcmVmbGlnaHQgfHwgbV9vcHRpb25zLnByZWZsaWdodFBvbGljeSA9 PSBDb25kaXRpb25QcmVmbGlnaHQgJiYgaXNTaW1wbGVDcm9zc09yaWdpbkFjY2Vzc1JlcXVlc3Qo Y3Jvc3NPcmlnaW5SZXF1ZXN0LT5odHRwTWV0aG9kKCksIGNyb3NzT3JpZ2luUmVxdWVzdC0+aHR0 cEhlYWRlckZpZWxkcygpKSkKICAgICAgICAgbWFrZVNpbXBsZUNyb3NzT3JpZ2luQWNjZXNzUmVx dWVzdCgqY3Jvc3NPcmlnaW5SZXF1ZXN0KTsKICAgICBlbHNlIHsKICAgICAgICAgbV9hY3R1YWxS ZXF1ZXN0ID0gY3Jvc3NPcmlnaW5SZXF1ZXN0LnJlbGVhc2UoKTsKQEAgLTExMiw3ICsxMTIsNyBA QCBEb2N1bWVudFRocmVhZGFibGVMb2FkZXI6OkRvY3VtZW50VGhyZWFkYWJsZUxvYWRlcihEb2N1 bWVudCogZG9jdW1lbnQsIFRocmVhZGFibAogCiB2b2lkIERvY3VtZW50VGhyZWFkYWJsZUxvYWRl cjo6bWFrZVNpbXBsZUNyb3NzT3JpZ2luQWNjZXNzUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVl c3QmIHJlcXVlc3QpCiB7Ci0gICAgQVNTRVJUKGlzU2ltcGxlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1 ZXN0KHJlcXVlc3QuaHR0cE1ldGhvZCgpLCByZXF1ZXN0Lmh0dHBIZWFkZXJGaWVsZHMoKSkpOwor ICAgIEFTU0VSVChtX29wdGlvbnMucHJlZmxpZ2h0UG9saWN5ID09IFByZXZlbnRQcmVmbGlnaHQg fHwgaXNTaW1wbGVDcm9zc09yaWdpbkFjY2Vzc1JlcXVlc3QocmVxdWVzdC5odHRwTWV0aG9kKCks IHJlcXVlc3QuaHR0cEhlYWRlckZpZWxkcygpKSk7CiAKICAgICAvLyBDcm9zcy1vcmlnaW4gcmVx dWVzdHMgYXJlIG9ubHkgZGVmaW5lZCBmb3IgSFRUUC4gV2Ugd291bGQgY2F0Y2ggdGhpcyB3aGVu IGNoZWNraW5nIHJlc3BvbnNlIGhlYWRlcnMgbGF0ZXIsIGJ1dCB0aGVyZSBpcyBubyByZWFzb24g dG8gc2VuZCBhIHJlcXVlc3QgdGhhdCdzIGd1YXJhbnRlZWQgdG8gYmUgZGVuaWVkLgogICAgIC8v IEZJWE1FOiBDb25zaWRlciBhbGxvd2luZyBzaW1wbGUgQ09SUyByZXF1ZXN0cyB0byBub24tSFRU UCBVUkxzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2Fk ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmgKaW5kZXggYzAy YjRhNS4uZDRlN2E5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFi bGVMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5o CkBAIC01NSwxMyArNTUsMTkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBVc2VBY2Nl c3NDb250cm9sLAogICAgICAgICBBbGxvd0Nyb3NzT3JpZ2luUmVxdWVzdHMKICAgICB9OwotICAg IAorCisgICAgZW51bSBQcmVmbGlnaHRQb2xpY3kgeworICAgICAgICBDb25kaXRpb25QcmVmbGln aHQsCisgICAgICAgIEZvcmNlUHJlZmxpZ2h0LAorICAgICAgICBQcmV2ZW50UHJlZmxpZ2h0Cisg ICAgfTsKKwogICAgIHN0cnVjdCBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyB7Ci0gICAgICAgIFRo cmVhZGFibGVMb2FkZXJPcHRpb25zKCkgOiBzZW5kTG9hZENhbGxiYWNrcyhmYWxzZSksIHNuaWZm Q29udGVudChmYWxzZSksIGFsbG93Q3JlZGVudGlhbHMoZmFsc2UpLCBmb3JjZVByZWZsaWdodChm YWxzZSksIGNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeShEZW55Q3Jvc3NPcmlnaW5SZXF1ZXN0cyks IHNob3VsZEJ1ZmZlckRhdGEodHJ1ZSkgeyB9CisgICAgICAgIFRocmVhZGFibGVMb2FkZXJPcHRp b25zKCkgOiBzZW5kTG9hZENhbGxiYWNrcyhmYWxzZSksIHNuaWZmQ29udGVudChmYWxzZSksIGFs bG93Q3JlZGVudGlhbHMoZmFsc2UpLCBwcmVmbGlnaHRQb2xpY3koQ29uZGl0aW9uUHJlZmxpZ2h0 KSwgY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5KERlbnlDcm9zc09yaWdpblJlcXVlc3RzKSwgc2hv dWxkQnVmZmVyRGF0YSh0cnVlKSB7IH0KICAgICAgICAgYm9vbCBzZW5kTG9hZENhbGxiYWNrczsK ICAgICAgICAgYm9vbCBzbmlmZkNvbnRlbnQ7CiAgICAgICAgIGJvb2wgYWxsb3dDcmVkZW50aWFs czsgIC8vIFdoZXRoZXIgSFRUUCBjcmVkZW50aWFscyBhbmQgY29va2llcyBhcmUgc2VudCB3aXRo IHRoZSByZXF1ZXN0LgotICAgICAgICBib29sIGZvcmNlUHJlZmxpZ2h0OyAgLy8gSWYgQWNjZXNz Q29udHJvbCBpcyB1c2VkLCB3aGV0aGVyIHRvIGZvcmNlIGEgcHJlZmxpZ2h0LgorICAgICAgICBQ cmVmbGlnaHRQb2xpY3kgcHJlZmxpZ2h0UG9saWN5OyAvLyBJZiBBY2Nlc3NDb250cm9sIGlzIHVz ZWQsIGhvdyB0byBkZXRlcm1pbmUgaWYgYSBwcmVmbGlnaHQgaXMgbmVlZGVkLgogICAgICAgICBD cm9zc09yaWdpblJlcXVlc3RQb2xpY3kgY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5OwogICAgICAg ICBib29sIHNob3VsZEJ1ZmZlckRhdGE7CiAgICAgICAgIFJlZlB0cjxTZWN1cml0eU9yaWdpbj4g c2VjdXJpdHlPcmlnaW47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9ub3RpZmljYXRpb25z L05vdGlmaWNhdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNh dGlvbi5jcHAKaW5kZXggMzA4ZGJiMS4uMGRhZTMxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL25v dGlmaWNhdGlvbnMvTm90aWZpY2F0aW9uLmNwcApAQCAtMTY4LDcgKzE2OCw3IEBAIHZvaWQgTm90 aWZpY2F0aW9uOjpzdGFydExvYWRpbmcoKQogICAgIFRocmVhZGFibGVMb2FkZXJPcHRpb25zIG9w dGlvbnM7CiAgICAgb3B0aW9ucy5zZW5kTG9hZENhbGxiYWNrcyA9IGZhbHNlOwogICAgIG9wdGlv bnMuc25pZmZDb250ZW50ID0gZmFsc2U7Ci0gICAgb3B0aW9ucy5mb3JjZVByZWZsaWdodCA9IGZh bHNlOworICAgIG9wdGlvbnMucHJlZmxpZ2h0UG9saWN5ID0gQ29uZGl0aW9uUHJlZmxpZ2h0Owog ICAgIG9wdGlvbnMuYWxsb3dDcmVkZW50aWFscyA9IEFsbG93U3RvcmVkQ3JlZGVudGlhbHM7CiAg ICAgb3B0aW9ucy5jcm9zc09yaWdpblJlcXVlc3RQb2xpY3kgPSBBbGxvd0Nyb3NzT3JpZ2luUmVx dWVzdHM7CiAgICAgbV9sb2FkZXIgPSBUaHJlYWRhYmxlTG9hZGVyOjpjcmVhdGUoc2NyaXB0RXhl Y3V0aW9uQ29udGV4dCgpLCB0aGlzLCBSZXNvdXJjZVJlcXVlc3QoaWNvblVSTCgpKSwgb3B0aW9u cyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIv U291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCA2NjM0MTY3Li5lMTdh ZmI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTY0OSw3ICs2NDks NyBAQCB2b2lkIFhNTEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KEV4Y2VwdGlvbkNvZGUmIGVj KQogICAgIFRocmVhZGFibGVMb2FkZXJPcHRpb25zIG9wdGlvbnM7CiAgICAgb3B0aW9ucy5zZW5k TG9hZENhbGxiYWNrcyA9IHRydWU7CiAgICAgb3B0aW9ucy5zbmlmZkNvbnRlbnQgPSBmYWxzZTsK LSAgICBvcHRpb25zLmZvcmNlUHJlZmxpZ2h0ID0gdXBsb2FkRXZlbnRzOworICAgIG9wdGlvbnMu cHJlZmxpZ2h0UG9saWN5ID0gdXBsb2FkRXZlbnRzID8gRm9yY2VQcmVmbGlnaHQgOiBDb25kaXRp b25QcmVmbGlnaHQ7CiAgICAgb3B0aW9ucy5hbGxvd0NyZWRlbnRpYWxzID0gbV9zYW1lT3JpZ2lu UmVxdWVzdCB8fCBtX2luY2x1ZGVDcmVkZW50aWFsczsKICAgICBvcHRpb25zLmNyb3NzT3JpZ2lu UmVxdWVzdFBvbGljeSA9IFVzZUFjY2Vzc0NvbnRyb2w7CiAgICAgb3B0aW9ucy5zZWN1cml0eU9y aWdpbiA9IHNlY3VyaXR5T3JpZ2luKCk7Cg== 102966 2011-08-04 13:15:52 -0700 2011-08-05 07:20:17 -0700 updated patch prevent_preflight_2.patch text/plain 6468 per-erik.brodin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3MjdmYTFlLi5mZjQxMjRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTEtMDgtMDQgIFBlci1FcmlrIEJyb2RpbiAgPHBlci1lcmlrLmJyb2RpbkBlcmljc3Nv bi5jb20+CisKKyAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBleHBsaWNpdGx5IHByZXZlbnQg YSBwcmVmbGlnaHQgdmlhIFRocmVhZGFibGVMb2FkZXJPcHRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTY5NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGVyZSBp cyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBmaWxlYXBpL0ZpbGVSZWFkZXJM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlckxvYWRlcjo6c3RhcnQpOgor ICAgICAgICAqIGxvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpEb2N1bWVudFRocmVhZGFibGVMb2Fk ZXIpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjptYWtlU2lt cGxlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvVGhyZWFkYWJs ZUxvYWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6VGhyZWFkYWJsZUxvYWRlck9wdGlvbnM6OlRo cmVhZGFibGVMb2FkZXJPcHRpb25zKToKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlmaWNh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb246OnN0YXJ0TG9hZGluZyk6 CisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhN TEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KToKKwogMjAxMS0wOC0wNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGdvb2dsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUmVuYW1l IHNvdXJjZUlkIC0+IHNjcmlwdElkIGluIHRoZSBwcm90b2NvbCBhbmQgdGhlIHNvdXJjZSBjb2Rl LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyTG9hZGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRlckxvYWRlci5jcHAKaW5kZXggNTBl YTBhZi4uNDM5OTkxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZmlsZWFwaS9GaWxlUmVh ZGVyTG9hZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFkZXJMb2Fk ZXIuY3BwCkBAIC04OCw3ICs4OCw3IEBAIHZvaWQgRmlsZVJlYWRlckxvYWRlcjo6c3RhcnQoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgQmxvCiAgICAgVGhy ZWFkYWJsZUxvYWRlck9wdGlvbnMgb3B0aW9uczsKICAgICBvcHRpb25zLnNlbmRMb2FkQ2FsbGJh Y2tzID0gdHJ1ZTsKICAgICBvcHRpb25zLnNuaWZmQ29udGVudCA9IGZhbHNlOwotICAgIG9wdGlv bnMuZm9yY2VQcmVmbGlnaHQgPSBmYWxzZTsKKyAgICBvcHRpb25zLnByZWZsaWdodFBvbGljeSA9 IENvbmRpdGlvblByZWZsaWdodDsKICAgICBvcHRpb25zLmFsbG93Q3JlZGVudGlhbHMgPSB0cnVl OwogICAgIG9wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID0gRGVueUNyb3NzT3JpZ2lu UmVxdWVzdHM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRo cmVhZGFibGVMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFk YWJsZUxvYWRlci5jcHAKaW5kZXggNDY1NmQyYy4uMGVhM2EzNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50VGhyZWFkYWJsZUxvYWRlci5jcHAKQEAgLTk4LDcgKzk4 LDcgQEAgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpEb2N1bWVudFRocmVhZGFibGVMb2FkZXIo RG9jdW1lbnQqIGRvY3VtZW50LCBUaHJlYWRhYmwKICAgICBPd25QdHI8UmVzb3VyY2VSZXF1ZXN0 PiBjcm9zc09yaWdpblJlcXVlc3QgPSBhZG9wdFB0cihuZXcgUmVzb3VyY2VSZXF1ZXN0KHJlcXVl c3QpKTsKICAgICB1cGRhdGVSZXF1ZXN0Rm9yQWNjZXNzQ29udHJvbCgqY3Jvc3NPcmlnaW5SZXF1 ZXN0LCBzZWN1cml0eU9yaWdpbigpLCBtX29wdGlvbnMuYWxsb3dDcmVkZW50aWFscyk7CiAKLSAg ICBpZiAoIW1fb3B0aW9ucy5mb3JjZVByZWZsaWdodCAmJiBpc1NpbXBsZUNyb3NzT3JpZ2luQWNj ZXNzUmVxdWVzdChjcm9zc09yaWdpblJlcXVlc3QtPmh0dHBNZXRob2QoKSwgY3Jvc3NPcmlnaW5S ZXF1ZXN0LT5odHRwSGVhZGVyRmllbGRzKCkpKQorICAgIGlmICgobV9vcHRpb25zLnByZWZsaWdo dFBvbGljeSA9PSBDb25kaXRpb25QcmVmbGlnaHQgJiYgaXNTaW1wbGVDcm9zc09yaWdpbkFjY2Vz c1JlcXVlc3QoY3Jvc3NPcmlnaW5SZXF1ZXN0LT5odHRwTWV0aG9kKCksIGNyb3NzT3JpZ2luUmVx dWVzdC0+aHR0cEhlYWRlckZpZWxkcygpKSkgfHwgbV9vcHRpb25zLnByZWZsaWdodFBvbGljeSA9 PSBQcmV2ZW50UHJlZmxpZ2h0KQogICAgICAgICBtYWtlU2ltcGxlQ3Jvc3NPcmlnaW5BY2Nlc3NS ZXF1ZXN0KCpjcm9zc09yaWdpblJlcXVlc3QpOwogICAgIGVsc2UgewogICAgICAgICBtX2FjdHVh bFJlcXVlc3QgPSBjcm9zc09yaWdpblJlcXVlc3QucmVsZWFzZSgpOwpAQCAtMTEyLDcgKzExMiw3 IEBAIERvY3VtZW50VGhyZWFkYWJsZUxvYWRlcjo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyKERv Y3VtZW50KiBkb2N1bWVudCwgVGhyZWFkYWJsCiAKIHZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9h ZGVyOjptYWtlU2ltcGxlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KGNvbnN0IFJlc291cmNlUmVx dWVzdCYgcmVxdWVzdCkKIHsKLSAgICBBU1NFUlQoaXNTaW1wbGVDcm9zc09yaWdpbkFjY2Vzc1Jl cXVlc3QocmVxdWVzdC5odHRwTWV0aG9kKCksIHJlcXVlc3QuaHR0cEhlYWRlckZpZWxkcygpKSk7 CisgICAgQVNTRVJUKG1fb3B0aW9ucy5wcmVmbGlnaHRQb2xpY3kgPT0gUHJldmVudFByZWZsaWdo dCB8fCBpc1NpbXBsZUNyb3NzT3JpZ2luQWNjZXNzUmVxdWVzdChyZXF1ZXN0Lmh0dHBNZXRob2Qo KSwgcmVxdWVzdC5odHRwSGVhZGVyRmllbGRzKCkpKTsKIAogICAgIC8vIENyb3NzLW9yaWdpbiBy ZXF1ZXN0cyBhcmUgb25seSBkZWZpbmVkIGZvciBIVFRQLiBXZSB3b3VsZCBjYXRjaCB0aGlzIHdo ZW4gY2hlY2tpbmcgcmVzcG9uc2UgaGVhZGVycyBsYXRlciwgYnV0IHRoZXJlIGlzIG5vIHJlYXNv biB0byBzZW5kIGEgcmVxdWVzdCB0aGF0J3MgZ3VhcmFudGVlZCB0byBiZSBkZW5pZWQuCiAgICAg Ly8gRklYTUU6IENvbnNpZGVyIGFsbG93aW5nIHNpbXBsZSBDT1JTIHJlcXVlc3RzIHRvIG5vbi1I VFRQIFVSTHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxv YWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuaAppbmRleCBj MDJiNGE1Li5kNGU3YTk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFk YWJsZUxvYWRlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9hZGVy LmgKQEAgLTU1LDEzICs1NSwxOSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIFVzZUFj Y2Vzc0NvbnRyb2wsCiAgICAgICAgIEFsbG93Q3Jvc3NPcmlnaW5SZXF1ZXN0cwogICAgIH07Ci0g ICAgCisKKyAgICBlbnVtIFByZWZsaWdodFBvbGljeSB7CisgICAgICAgIENvbmRpdGlvblByZWZs aWdodCwKKyAgICAgICAgRm9yY2VQcmVmbGlnaHQsCisgICAgICAgIFByZXZlbnRQcmVmbGlnaHQK KyAgICB9OworCiAgICAgc3RydWN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zIHsKLSAgICAgICAg VGhyZWFkYWJsZUxvYWRlck9wdGlvbnMoKSA6IHNlbmRMb2FkQ2FsbGJhY2tzKGZhbHNlKSwgc25p ZmZDb250ZW50KGZhbHNlKSwgYWxsb3dDcmVkZW50aWFscyhmYWxzZSksIGZvcmNlUHJlZmxpZ2h0 KGZhbHNlKSwgY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5KERlbnlDcm9zc09yaWdpblJlcXVlc3Rz KSwgc2hvdWxkQnVmZmVyRGF0YSh0cnVlKSB7IH0KKyAgICAgICAgVGhyZWFkYWJsZUxvYWRlck9w dGlvbnMoKSA6IHNlbmRMb2FkQ2FsbGJhY2tzKGZhbHNlKSwgc25pZmZDb250ZW50KGZhbHNlKSwg YWxsb3dDcmVkZW50aWFscyhmYWxzZSksIHByZWZsaWdodFBvbGljeShDb25kaXRpb25QcmVmbGln aHQpLCBjcm9zc09yaWdpblJlcXVlc3RQb2xpY3koRGVueUNyb3NzT3JpZ2luUmVxdWVzdHMpLCBz aG91bGRCdWZmZXJEYXRhKHRydWUpIHsgfQogICAgICAgICBib29sIHNlbmRMb2FkQ2FsbGJhY2tz OwogICAgICAgICBib29sIHNuaWZmQ29udGVudDsKICAgICAgICAgYm9vbCBhbGxvd0NyZWRlbnRp YWxzOyAgLy8gV2hldGhlciBIVFRQIGNyZWRlbnRpYWxzIGFuZCBjb29raWVzIGFyZSBzZW50IHdp dGggdGhlIHJlcXVlc3QuCi0gICAgICAgIGJvb2wgZm9yY2VQcmVmbGlnaHQ7ICAvLyBJZiBBY2Nl c3NDb250cm9sIGlzIHVzZWQsIHdoZXRoZXIgdG8gZm9yY2UgYSBwcmVmbGlnaHQuCisgICAgICAg IFByZWZsaWdodFBvbGljeSBwcmVmbGlnaHRQb2xpY3k7IC8vIElmIEFjY2Vzc0NvbnRyb2wgaXMg dXNlZCwgaG93IHRvIGRldGVybWluZSBpZiBhIHByZWZsaWdodCBpcyBuZWVkZWQuCiAgICAgICAg IENyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSBjcm9zc09yaWdpblJlcXVlc3RQb2xpY3k7CiAgICAg ICAgIGJvb2wgc2hvdWxkQnVmZmVyRGF0YTsKICAgICAgICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2lu PiBzZWN1cml0eU9yaWdpbjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL25vdGlmaWNhdGlv bnMvTm90aWZpY2F0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL25vdGlmaWNhdGlvbnMvTm90aWZp Y2F0aW9uLmNwcAppbmRleCAzMDhkYmIxLi4wZGFlMzE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9ub3RpZmljYXRpb25zL05vdGlmaWNhdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv bm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uY3BwCkBAIC0xNjgsNyArMTY4LDcgQEAgdm9pZCBO b3RpZmljYXRpb246OnN0YXJ0TG9hZGluZygpCiAgICAgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMg b3B0aW9uczsKICAgICBvcHRpb25zLnNlbmRMb2FkQ2FsbGJhY2tzID0gZmFsc2U7CiAgICAgb3B0 aW9ucy5zbmlmZkNvbnRlbnQgPSBmYWxzZTsKLSAgICBvcHRpb25zLmZvcmNlUHJlZmxpZ2h0ID0g ZmFsc2U7CisgICAgb3B0aW9ucy5wcmVmbGlnaHRQb2xpY3kgPSBDb25kaXRpb25QcmVmbGlnaHQ7 CiAgICAgb3B0aW9ucy5hbGxvd0NyZWRlbnRpYWxzID0gQWxsb3dTdG9yZWRDcmVkZW50aWFsczsK ICAgICBvcHRpb25zLmNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSA9IEFsbG93Q3Jvc3NPcmlnaW5S ZXF1ZXN0czsKICAgICBtX2xvYWRlciA9IFRocmVhZGFibGVMb2FkZXI6OmNyZWF0ZShzY3JpcHRF eGVjdXRpb25Db250ZXh0KCksIHRoaXMsIFJlc291cmNlUmVxdWVzdChpY29uVVJMKCkpLCBvcHRp b25zKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCmluZGV4IDY2MzQxNjcuLmUx N2FmYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcApAQCAtNjQ5LDcgKzY0 OSw3IEBAIHZvaWQgWE1MSHR0cFJlcXVlc3Q6OmNyZWF0ZVJlcXVlc3QoRXhjZXB0aW9uQ29kZSYg ZWMpCiAgICAgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMgb3B0aW9uczsKICAgICBvcHRpb25zLnNl bmRMb2FkQ2FsbGJhY2tzID0gdHJ1ZTsKICAgICBvcHRpb25zLnNuaWZmQ29udGVudCA9IGZhbHNl OwotICAgIG9wdGlvbnMuZm9yY2VQcmVmbGlnaHQgPSB1cGxvYWRFdmVudHM7CisgICAgb3B0aW9u cy5wcmVmbGlnaHRQb2xpY3kgPSB1cGxvYWRFdmVudHMgPyBGb3JjZVByZWZsaWdodCA6IENvbmRp dGlvblByZWZsaWdodDsKICAgICBvcHRpb25zLmFsbG93Q3JlZGVudGlhbHMgPSBtX3NhbWVPcmln aW5SZXF1ZXN0IHx8IG1faW5jbHVkZUNyZWRlbnRpYWxzOwogICAgIG9wdGlvbnMuY3Jvc3NPcmln aW5SZXF1ZXN0UG9saWN5ID0gVXNlQWNjZXNzQ29udHJvbDsKICAgICBvcHRpb25zLnNlY3VyaXR5 T3JpZ2luID0gc2VjdXJpdHlPcmlnaW4oKTsK 103070 2011-08-05 07:20:17 -0700 2011-08-16 17:16:35 -0700 patch 3 prevent_preflight_3.patch text/plain 8004 per-erik.brodin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA4NDhhODIyLi4xYmE0YzJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTEtMDgtMDUgIFBlci1FcmlrIEJyb2RpbiAgPHBlci1lcmlrLmJyb2RpbkBlcmljc3Nv bi5jb20+CisKKyAgICAgICAgTWFrZSBpdCBwb3NzaWJsZSB0byBleHBsaWNpdGx5IHByZXZlbnQg YSBwcmVmbGlnaHQgdmlhIFRocmVhZGFibGVMb2FkZXJPcHRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTY5NAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cyBzaW5jZSB0aGVyZSBp cyBubyBjaGFuZ2UgaW4gYmVoYXZpb3IuCisKKyAgICAgICAgKiBmaWxlYXBpL0ZpbGVSZWFkZXJM b2FkZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RmlsZVJlYWRlckxvYWRlcjo6c3RhcnQpOgor ICAgICAgICAqIGxvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjpEb2N1bWVudFRocmVhZGFibGVMb2Fk ZXIpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjptYWtlU2lt cGxlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KToKKyAgICAgICAgKiBsb2FkZXIvVGhyZWFkYWJs ZUxvYWRlci5oOgorICAgICAgICAoV2ViQ29yZTo6VGhyZWFkYWJsZUxvYWRlck9wdGlvbnM6OlRo cmVhZGFibGVMb2FkZXJPcHRpb25zKToKKyAgICAgICAgKiBub3RpZmljYXRpb25zL05vdGlmaWNh dGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb3RpZmljYXRpb246OnN0YXJ0TG9hZGluZyk6 CisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhN TEh0dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KToKKwogMjAxMS0wOC0wNSAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBjb25z dHJhaW4gbWF4aW11bSBkZXB0aCBmb3IgcmV0dXJuQnlWYWx1ZSBvYmplY3RzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFkZXJMb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvZmlsZWFwaS9GaWxlUmVhZGVyTG9hZGVyLmNwcAppbmRleCA1MGVhMGFmLi4xNTEzN2U3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9maWxlYXBpL0ZpbGVSZWFkZXJMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2ZpbGVhcGkvRmlsZVJlYWRlckxvYWRlci5jcHAKQEAgLTg4 LDcgKzg4LDcgQEAgdm9pZCBGaWxlUmVhZGVyTG9hZGVyOjpzdGFydChTY3JpcHRFeGVjdXRpb25D b250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0LCBCbG8KICAgICBUaHJlYWRhYmxlTG9hZGVy T3B0aW9ucyBvcHRpb25zOwogICAgIG9wdGlvbnMuc2VuZExvYWRDYWxsYmFja3MgPSB0cnVlOwog ICAgIG9wdGlvbnMuc25pZmZDb250ZW50ID0gZmFsc2U7Ci0gICAgb3B0aW9ucy5mb3JjZVByZWZs aWdodCA9IGZhbHNlOworICAgIG9wdGlvbnMucHJlZmxpZ2h0UG9saWN5ID0gQ29uc2lkZXJQcmVm bGlnaHQ7CiAgICAgb3B0aW9ucy5hbGxvd0NyZWRlbnRpYWxzID0gdHJ1ZTsKICAgICBvcHRpb25z LmNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSA9IERlbnlDcm9zc09yaWdpblJlcXVlc3RzOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3Bw CmluZGV4IDQ2NTZkMmMuLmEwYWMxZTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9Eb2N1bWVudFRocmVhZGFibGVMb2FkZXIuY3BwCkBAIC05OCw3ICs5OCw3IEBAIERvY3VtZW50 VGhyZWFkYWJsZUxvYWRlcjo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyKERvY3VtZW50KiBkb2N1 bWVudCwgVGhyZWFkYWJsCiAgICAgT3duUHRyPFJlc291cmNlUmVxdWVzdD4gY3Jvc3NPcmlnaW5S ZXF1ZXN0ID0gYWRvcHRQdHIobmV3IFJlc291cmNlUmVxdWVzdChyZXF1ZXN0KSk7CiAgICAgdXBk YXRlUmVxdWVzdEZvckFjY2Vzc0NvbnRyb2woKmNyb3NzT3JpZ2luUmVxdWVzdCwgc2VjdXJpdHlP cmlnaW4oKSwgbV9vcHRpb25zLmFsbG93Q3JlZGVudGlhbHMpOwogCi0gICAgaWYgKCFtX29wdGlv bnMuZm9yY2VQcmVmbGlnaHQgJiYgaXNTaW1wbGVDcm9zc09yaWdpbkFjY2Vzc1JlcXVlc3QoY3Jv c3NPcmlnaW5SZXF1ZXN0LT5odHRwTWV0aG9kKCksIGNyb3NzT3JpZ2luUmVxdWVzdC0+aHR0cEhl YWRlckZpZWxkcygpKSkKKyAgICBpZiAoKG1fb3B0aW9ucy5wcmVmbGlnaHRQb2xpY3kgPT0gQ29u c2lkZXJQcmVmbGlnaHQgJiYgaXNTaW1wbGVDcm9zc09yaWdpbkFjY2Vzc1JlcXVlc3QoY3Jvc3NP cmlnaW5SZXF1ZXN0LT5odHRwTWV0aG9kKCksIGNyb3NzT3JpZ2luUmVxdWVzdC0+aHR0cEhlYWRl ckZpZWxkcygpKSkgfHwgbV9vcHRpb25zLnByZWZsaWdodFBvbGljeSA9PSBQcmV2ZW50UHJlZmxp Z2h0KQogICAgICAgICBtYWtlU2ltcGxlQ3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KCpjcm9zc09y aWdpblJlcXVlc3QpOwogICAgIGVsc2UgewogICAgICAgICBtX2FjdHVhbFJlcXVlc3QgPSBjcm9z c09yaWdpblJlcXVlc3QucmVsZWFzZSgpOwpAQCAtMTEyLDcgKzExMiw4IEBAIERvY3VtZW50VGhy ZWFkYWJsZUxvYWRlcjo6RG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyKERvY3VtZW50KiBkb2N1bWVu dCwgVGhyZWFkYWJsCiAKIHZvaWQgRG9jdW1lbnRUaHJlYWRhYmxlTG9hZGVyOjptYWtlU2ltcGxl Q3Jvc3NPcmlnaW5BY2Nlc3NSZXF1ZXN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkK IHsKLSAgICBBU1NFUlQoaXNTaW1wbGVDcm9zc09yaWdpbkFjY2Vzc1JlcXVlc3QocmVxdWVzdC5o dHRwTWV0aG9kKCksIHJlcXVlc3QuaHR0cEhlYWRlckZpZWxkcygpKSk7CisgICAgQVNTRVJUKG1f b3B0aW9ucy5wcmVmbGlnaHRQb2xpY3kgIT0gRm9yY2VQcmVmbGlnaHQpOworICAgIEFTU0VSVCht X29wdGlvbnMucHJlZmxpZ2h0UG9saWN5ID09IFByZXZlbnRQcmVmbGlnaHQgfHwgaXNTaW1wbGVD cm9zc09yaWdpbkFjY2Vzc1JlcXVlc3QocmVxdWVzdC5odHRwTWV0aG9kKCksIHJlcXVlc3QuaHR0 cEhlYWRlckZpZWxkcygpKSk7CiAKICAgICAvLyBDcm9zcy1vcmlnaW4gcmVxdWVzdHMgYXJlIG9u bHkgZGVmaW5lZCBmb3IgSFRUUC4gV2Ugd291bGQgY2F0Y2ggdGhpcyB3aGVuIGNoZWNraW5nIHJl c3BvbnNlIGhlYWRlcnMgbGF0ZXIsIGJ1dCB0aGVyZSBpcyBubyByZWFzb24gdG8gc2VuZCBhIHJl cXVlc3QgdGhhdCdzIGd1YXJhbnRlZWQgdG8gYmUgZGVuaWVkLgogICAgIC8vIEZJWE1FOiBDb25z aWRlciBhbGxvd2luZyBzaW1wbGUgQ09SUyByZXF1ZXN0cyB0byBub24tSFRUUCBVUkxzLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL2xvYWRlci9UaHJlYWRhYmxlTG9hZGVyLmgKaW5kZXggYzAyYjRhNS4uNDMwYTYw YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1RocmVhZGFibGVMb2FkZXIuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvVGhyZWFkYWJsZUxvYWRlci5oCkBAIC01NSwxMyAr NTUsMTkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBVc2VBY2Nlc3NDb250cm9sLAog ICAgICAgICBBbGxvd0Nyb3NzT3JpZ2luUmVxdWVzdHMKICAgICB9OwotICAgIAorCisgICAgZW51 bSBQcmVmbGlnaHRQb2xpY3kgeworICAgICAgICBDb25zaWRlclByZWZsaWdodCwKKyAgICAgICAg Rm9yY2VQcmVmbGlnaHQsCisgICAgICAgIFByZXZlbnRQcmVmbGlnaHQKKyAgICB9OworCiAgICAg c3RydWN0IFRocmVhZGFibGVMb2FkZXJPcHRpb25zIHsKLSAgICAgICAgVGhyZWFkYWJsZUxvYWRl ck9wdGlvbnMoKSA6IHNlbmRMb2FkQ2FsbGJhY2tzKGZhbHNlKSwgc25pZmZDb250ZW50KGZhbHNl KSwgYWxsb3dDcmVkZW50aWFscyhmYWxzZSksIGZvcmNlUHJlZmxpZ2h0KGZhbHNlKSwgY3Jvc3NP cmlnaW5SZXF1ZXN0UG9saWN5KERlbnlDcm9zc09yaWdpblJlcXVlc3RzKSwgc2hvdWxkQnVmZmVy RGF0YSh0cnVlKSB7IH0KKyAgICAgICAgVGhyZWFkYWJsZUxvYWRlck9wdGlvbnMoKSA6IHNlbmRM b2FkQ2FsbGJhY2tzKGZhbHNlKSwgc25pZmZDb250ZW50KGZhbHNlKSwgYWxsb3dDcmVkZW50aWFs cyhmYWxzZSksIHByZWZsaWdodFBvbGljeShDb25zaWRlclByZWZsaWdodCksIGNyb3NzT3JpZ2lu UmVxdWVzdFBvbGljeShEZW55Q3Jvc3NPcmlnaW5SZXF1ZXN0cyksIHNob3VsZEJ1ZmZlckRhdGEo dHJ1ZSkgeyB9CiAgICAgICAgIGJvb2wgc2VuZExvYWRDYWxsYmFja3M7CiAgICAgICAgIGJvb2wg c25pZmZDb250ZW50OwogICAgICAgICBib29sIGFsbG93Q3JlZGVudGlhbHM7ICAvLyBXaGV0aGVy IEhUVFAgY3JlZGVudGlhbHMgYW5kIGNvb2tpZXMgYXJlIHNlbnQgd2l0aCB0aGUgcmVxdWVzdC4K LSAgICAgICAgYm9vbCBmb3JjZVByZWZsaWdodDsgIC8vIElmIEFjY2Vzc0NvbnRyb2wgaXMgdXNl ZCwgd2hldGhlciB0byBmb3JjZSBhIHByZWZsaWdodC4KKyAgICAgICAgUHJlZmxpZ2h0UG9saWN5 IHByZWZsaWdodFBvbGljeTsgLy8gSWYgQWNjZXNzQ29udHJvbCBpcyB1c2VkLCBob3cgdG8gZGV0 ZXJtaW5lIGlmIGEgcHJlZmxpZ2h0IGlzIG5lZWRlZC4KICAgICAgICAgQ3Jvc3NPcmlnaW5SZXF1 ZXN0UG9saWN5IGNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeTsKICAgICAgICAgYm9vbCBzaG91bGRC dWZmZXJEYXRhOwogICAgICAgICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IHNlY3VyaXR5T3JpZ2lu OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24u Y3BwIGIvU291cmNlL1dlYkNvcmUvbm90aWZpY2F0aW9ucy9Ob3RpZmljYXRpb24uY3BwCmluZGV4 IDMwOGRiYjEuLjY4ODU1YTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL25vdGlmaWNhdGlv bnMvTm90aWZpY2F0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9ub3RpZmljYXRpb25zL05v dGlmaWNhdGlvbi5jcHAKQEAgLTE2OCw3ICsxNjgsNyBAQCB2b2lkIE5vdGlmaWNhdGlvbjo6c3Rh cnRMb2FkaW5nKCkKICAgICBUaHJlYWRhYmxlTG9hZGVyT3B0aW9ucyBvcHRpb25zOwogICAgIG9w dGlvbnMuc2VuZExvYWRDYWxsYmFja3MgPSBmYWxzZTsKICAgICBvcHRpb25zLnNuaWZmQ29udGVu dCA9IGZhbHNlOwotICAgIG9wdGlvbnMuZm9yY2VQcmVmbGlnaHQgPSBmYWxzZTsKKyAgICBvcHRp b25zLnByZWZsaWdodFBvbGljeSA9IENvbnNpZGVyUHJlZmxpZ2h0OwogICAgIG9wdGlvbnMuYWxs b3dDcmVkZW50aWFscyA9IEFsbG93U3RvcmVkQ3JlZGVudGlhbHM7CiAgICAgb3B0aW9ucy5jcm9z c09yaWdpblJlcXVlc3RQb2xpY3kgPSBBbGxvd0Nyb3NzT3JpZ2luUmVxdWVzdHM7CiAgICAgbV9s b2FkZXIgPSBUaHJlYWRhYmxlTG9hZGVyOjpjcmVhdGUoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgp LCB0aGlzLCBSZXNvdXJjZVJlcXVlc3QoaWNvblVSTCgpKSwgb3B0aW9ucyk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNvcmUv eG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCA2NjM0MTY3Li5kY2I4YWU1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTY0OSw3ICs2NDksNyBAQCB2b2lkIFhNTEh0 dHBSZXF1ZXN0OjpjcmVhdGVSZXF1ZXN0KEV4Y2VwdGlvbkNvZGUmIGVjKQogICAgIFRocmVhZGFi bGVMb2FkZXJPcHRpb25zIG9wdGlvbnM7CiAgICAgb3B0aW9ucy5zZW5kTG9hZENhbGxiYWNrcyA9 IHRydWU7CiAgICAgb3B0aW9ucy5zbmlmZkNvbnRlbnQgPSBmYWxzZTsKLSAgICBvcHRpb25zLmZv cmNlUHJlZmxpZ2h0ID0gdXBsb2FkRXZlbnRzOworICAgIG9wdGlvbnMucHJlZmxpZ2h0UG9saWN5 ID0gdXBsb2FkRXZlbnRzID8gRm9yY2VQcmVmbGlnaHQgOiBDb25zaWRlclByZWZsaWdodDsKICAg ICBvcHRpb25zLmFsbG93Q3JlZGVudGlhbHMgPSBtX3NhbWVPcmlnaW5SZXF1ZXN0IHx8IG1faW5j bHVkZUNyZWRlbnRpYWxzOwogICAgIG9wdGlvbnMuY3Jvc3NPcmlnaW5SZXF1ZXN0UG9saWN5ID0g VXNlQWNjZXNzQ29udHJvbDsKICAgICBvcHRpb25zLnNlY3VyaXR5T3JpZ2luID0gc2VjdXJpdHlP cmlnaW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggNDIxYzFmZS4uOWM4M2E0OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wOC0wNSAg UGVyLUVyaWsgQnJvZGluICA8cGVyLWVyaWsuYnJvZGluQGVyaWNzc29uLmNvbT4KKworICAgICAg ICBNYWtlIGl0IHBvc3NpYmxlIHRvIGV4cGxpY2l0bHkgcHJldmVudCBhIHByZWZsaWdodCB2aWEg VGhyZWFkYWJsZUxvYWRlck9wdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTY1Njk0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBzcmMvQXNzb2NpYXRlZFVSTExvYWRlci5jcHA6CisgICAgICAgIChX ZWJLaXQ6OkFzc29jaWF0ZWRVUkxMb2FkZXI6OmxvYWRBc3luY2hyb25vdXNseSk6CisKIDIwMTEt MDgtMDQgIEphbWVzIFJvYmluc29uICA8amFtZXNyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBV bnJldmlld2VkLiAgUm9sbGVkIERFUFMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3NyYy9Bc3NvY2lhdGVkVVJMTG9hZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v c3JjL0Fzc29jaWF0ZWRVUkxMb2FkZXIuY3BwCmluZGV4IDc3MGVjOWMuLjc4OWZlNzMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Fzc29jaWF0ZWRVUkxMb2FkZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0Fzc29jaWF0ZWRVUkxMb2FkZXIuY3Bw CkBAIC0yMjksNyArMjI5LDcgQEAgdm9pZCBBc3NvY2lhdGVkVVJMTG9hZGVyOjpsb2FkQXN5bmNo cm9ub3VzbHkoY29uc3QgV2ViVVJMUmVxdWVzdCYgcmVxdWVzdCwgV2ViVVIKICAgICBvcHRpb25z LnNlbmRMb2FkQ2FsbGJhY2tzID0gdHJ1ZTsgLy8gQWx3YXlzIHNlbmQgY2FsbGJhY2tzLgogICAg IG9wdGlvbnMuc25pZmZDb250ZW50ID0gbV9vcHRpb25zLnNuaWZmQ29udGVudDsKICAgICBvcHRp b25zLmFsbG93Q3JlZGVudGlhbHMgPSBtX29wdGlvbnMuYWxsb3dDcmVkZW50aWFsczsKLSAgICBv cHRpb25zLmZvcmNlUHJlZmxpZ2h0ID0gbV9vcHRpb25zLmZvcmNlUHJlZmxpZ2h0OworICAgIG9w dGlvbnMucHJlZmxpZ2h0UG9saWN5ID0gbV9vcHRpb25zLmZvcmNlUHJlZmxpZ2h0ID8gRm9yY2VQ cmVmbGlnaHQgOiBDb25zaWRlclByZWZsaWdodDsKICAgICBvcHRpb25zLmNyb3NzT3JpZ2luUmVx dWVzdFBvbGljeSA9IHN0YXRpY19jYXN0PFdlYkNvcmU6OkNyb3NzT3JpZ2luUmVxdWVzdFBvbGlj eT4obV9vcHRpb25zLmNyb3NzT3JpZ2luUmVxdWVzdFBvbGljeSk7CiAgICAgb3B0aW9ucy5zaG91 bGRCdWZmZXJEYXRhID0gZmFsc2U7CiAK