18302 2008-04-03 10:29:18 -0700 DumpRenderTree Resources out of Order causes failures in tests 2008-04-08 10:31:18 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Mac All RESOLVED FIXED P2 Normal --- 1 me beidson beidson oldest_to_newest 76244 0 me 2008-04-03 10:29:18 -0700 One test, the webarchive/test-css-import.html one, appears to fail on my system. This is not because anything is incorrect, but simply because the files are received in the opposite order as to how they are expected. This occurs on some systems only, such as within chat: <bradee-oh> ah! on my Mac Pro I get the out-of-orderness, but not on my MacBookPro 76245 1 20314 me 2008-04-03 10:30:47 -0700 Created attachment 20314 Example of the diffs within a test where two resources are recieved in the opposite order. Added example from Dump Render Tree. 76320 2 20314 me 2008-04-04 07:43:45 -0700 Comment on attachment 20314 Example of the diffs within a test where two resources are recieved in the opposite order. Placed space in description where accidentally omitted previously. 76621 3 20408 beidson 2008-04-08 10:11:00 -0700 Created attachment 20408 Proposed fix, and 3 updated layout tests 76622 4 20408 mitz 2008-04-08 10:27:24 -0700 Comment on attachment 20408 Proposed fix, and 3 updated layout tests +static NSInteger resourceURLSort(id resource1, id resource2, void *reverse) I'd really prefer the name compareResourceURLs. + if (NSArray* newSubresource = [subresources sortedArrayUsingFunction:resourceURLSort context:&reverseSort]) The * should go next to newSubresource, which I'd call "newSubresourceS" or "sortedSubresources". Since the compare function does not use the context argument ("reverse"), just pass 0, and don't call it "reverse". r=me but please try to address some of my comments 76623 5 beidson 2008-04-08 10:31:18 -0700 Landed in 31722 20314 2008-04-03 10:30:47 -0700 2008-04-04 07:43:45 -0700 Example of the diffs within a test where two resources are recieved in the opposite order. test-css-import-diffs.txt text/plain 1975 me LS0tIC90bXAvbGF5b3V0LXRlc3QtcmVzdWx0cy93ZWJhcmNoaXZlL3Rlc3QtY3NzLWltcG9ydC1l eHBlY3RlZC50eHQJMjAwOC0wNC0wMyAxODowMzoyMy4wMDAwMDAwMDAgKzAxMDAKKysrIC90bXAv bGF5b3V0LXRlc3QtcmVzdWx0cy93ZWJhcmNoaXZlL3Rlc3QtY3NzLWltcG9ydC1hY3R1YWwudHh0 CTIwMDgtMDQtMDMgMTg6MDM6MjMuMDAwMDAwMDAwICswMTAwCkBAIC03Myw4ICs3Myw4IEBACiAJ CTwvZGljdD4KIAkJPGRpY3Q+CiAJCQk8a2V5PldlYlJlc291cmNlRGF0YTwva2V5PgotCQkJPHN0 cmluZz5AaW1wb3J0IHVybCgndGVzdC1jc3MtaW1wb3J0LmNzcycpOwotLmdyZWVuIHsgY29sb3I6 IGdyZWVuOyB9CisJCQk8c3RyaW5nPkBpbXBvcnQgdXJsKCd0ZXN0LWNzcy1pbXBvcnQtcmVjdXJz ZS5jc3MnKTsKKy5ibHVlIHsgY29sb3I6IGJsdWU7IH0KIDwvc3RyaW5nPgogCQkJPGtleT5XZWJS ZXNvdXJjZU1JTUVUeXBlPC9rZXk+CiAJCQk8c3RyaW5nPnRleHQvY3NzPC9zdHJpbmc+CkBAIC04 MywxNyArODMsMTcgQEAKIAkJCQk8a2V5Pk1JTUVUeXBlPC9rZXk+CiAJCQkJPHN0cmluZz50ZXh0 L2Nzczwvc3RyaW5nPgogCQkJCTxrZXk+VVJMPC9rZXk+Ci0JCQkJPHN0cmluZz5maWxlOi8vL0xh eW91dFRlc3RzL3dlYmFyY2hpdmUvcmVzb3VyY2VzL3Rlc3QtY3NzLWltcG9ydC1yZWN1cnNlLmNz czwvc3RyaW5nPgorCQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jl c291cmNlcy90ZXN0LWNzcy1pbXBvcnQuY3NzPC9zdHJpbmc+CiAJCQkJPGtleT5leHBlY3RlZENv bnRlbnRMZW5ndGg8L2tleT4KLQkJCQk8aW50ZWdlcj42MTwvaW50ZWdlcj4KKwkJCQk8aW50ZWdl cj42NzwvaW50ZWdlcj4KIAkJCTwvZGljdD4KIAkJCTxrZXk+V2ViUmVzb3VyY2VVUkw8L2tleT4K LQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0 LWNzcy1pbXBvcnQtcmVjdXJzZS5jc3M8L3N0cmluZz4KKwkJCTxzdHJpbmc+ZmlsZTovLy9MYXlv dXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1pbXBvcnQuY3NzPC9zdHJpbmc+ CiAJCTwvZGljdD4KIAkJPGRpY3Q+CiAJCQk8a2V5PldlYlJlc291cmNlRGF0YTwva2V5PgotCQkJ PHN0cmluZz5AaW1wb3J0IHVybCgndGVzdC1jc3MtaW1wb3J0LXJlY3Vyc2UuY3NzJyk7Ci0uYmx1 ZSB7IGNvbG9yOiBibHVlOyB9CisJCQk8c3RyaW5nPkBpbXBvcnQgdXJsKCd0ZXN0LWNzcy1pbXBv cnQuY3NzJyk7CisuZ3JlZW4geyBjb2xvcjogZ3JlZW47IH0KIDwvc3RyaW5nPgogCQkJPGtleT5X ZWJSZXNvdXJjZU1JTUVUeXBlPC9rZXk+CiAJCQk8c3RyaW5nPnRleHQvY3NzPC9zdHJpbmc+CkBA IC0xMDIsMTIgKzEwMiwxMiBAQAogCQkJCTxrZXk+TUlNRVR5cGU8L2tleT4KIAkJCQk8c3RyaW5n PnRleHQvY3NzPC9zdHJpbmc+CiAJCQkJPGtleT5VUkw8L2tleT4KLQkJCQk8c3RyaW5nPmZpbGU6 Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMvdGVzdC1jc3MtaW1wb3J0LmNzczwv c3RyaW5nPgorCQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291 cmNlcy90ZXN0LWNzcy1pbXBvcnQtcmVjdXJzZS5jc3M8L3N0cmluZz4KIAkJCQk8a2V5PmV4cGVj dGVkQ29udGVudExlbmd0aDwva2V5PgotCQkJCTxpbnRlZ2VyPjY3PC9pbnRlZ2VyPgorCQkJCTxp bnRlZ2VyPjYxPC9pbnRlZ2VyPgogCQkJPC9kaWN0PgogCQkJPGtleT5XZWJSZXNvdXJjZVVSTDwv a2V5PgotCQkJPHN0cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hpdmUvcmVzb3VyY2Vz L3Rlc3QtY3NzLWltcG9ydC5jc3M8L3N0cmluZz4KKwkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRU ZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1pbXBvcnQtcmVjdXJzZS5jc3M8L3N0 cmluZz4KIAkJPC9kaWN0PgogCTwvYXJyYXk+CiA8L2RpY3Q+Cg== 20408 2008-04-08 10:11:00 -0700 2008-04-08 10:27:24 -0700 Proposed fix, and 3 updated layout tests OrderPatch.txt text/plain 12973 beidson SW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9EdW1wUmVuZGVyVHJlZS5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvRHVtcFJlbmRlclRy ZWUubW0JKHJldmlzaW9uIDMxNzA3KQorKysgV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFj L0R1bXBSZW5kZXJUcmVlLm1tCSh3b3JraW5nIGNvcHkpCkBAIC02MDgsNiArNjA4LDE0IEBACiAg ICAgW3Jlc3BvbnNlRGljdGlvbmFyeSByZWxlYXNlXTsKIH0KIAorc3RhdGljIE5TSW50ZWdlciBy ZXNvdXJjZVVSTFNvcnQoaWQgcmVzb3VyY2UxLCBpZCByZXNvdXJjZTIsIHZvaWQgKnJldmVyc2Up Cit7CisgICAgTlNTdHJpbmcgKnVybDEgPSBbcmVzb3VyY2UxIG9iamVjdEZvcktleTpAIldlYlJl c291cmNlVVJMIl07CisgICAgTlNTdHJpbmcgKnVybDIgPSBbcmVzb3VyY2UyIG9iamVjdEZvcktl eTpAIldlYlJlc291cmNlVVJMIl07CisgCisgICAgcmV0dXJuIFt1cmwxIGNvbXBhcmU6dXJsMl07 Cit9CisKIHN0YXRpYyBOU1N0cmluZyAqc2VyaWFsaXplV2ViQXJjaGl2ZVRvWE1MKFdlYkFyY2hp dmUgKndlYkFyY2hpdmUpCiB7CiAgICAgTlNTdHJpbmcgKmVycm9yU3RyaW5nOwpAQCAtNjQyLDYg KzY1MCwxMSBAQAogICAgICAgICAgICAgY29udmVydFdlYlJlc291cmNlUmVzcG9uc2VUb0RpY3Rp b25hcnkoc3VicmVzb3VyY2VQcm9wZXJ0eUxpc3QpOwogICAgICAgICAgICAgY29udmVydFdlYlJl c291cmNlRGF0YVRvU3RyaW5nKHN1YnJlc291cmNlUHJvcGVydHlMaXN0KTsKICAgICAgICAgfQor ICAgICAgICAKKyAgICAgICAgLy8gU29ydCB0aGUgc3VicmVzb3VyY2VzIHNvIHRoZXkncmUgYWx3 YXlzIGluIGEgcHJlZGljdGFibGUgb3JkZXIgZm9yIHRoZSBkdW1wCisgICAgICAgIEJPT0wgcmV2 ZXJzZVNvcnQgPSBOTzsKKyAgICAgICAgaWYgKE5TQXJyYXkqIG5ld1N1YnJlc291cmNlID0gW3N1 YnJlc291cmNlcyBzb3J0ZWRBcnJheVVzaW5nRnVuY3Rpb246cmVzb3VyY2VVUkxTb3J0IGNvbnRl eHQ6JnJldmVyc2VTb3J0XSkKKyAgICAgICAgICAgIFtyZXNvdXJjZVByb3BlcnR5TGlzdCBzZXRP YmplY3Q6bmV3U3VicmVzb3VyY2UgZm9yS2V5OkAiV2ViU3VicmVzb3VyY2VzIl07CiAgICAgfQog CiAgICAgTlNEYXRhICp4bWxEYXRhID0gW05TUHJvcGVydHlMaXN0U2VyaWFsaXphdGlvbiBkYXRh RnJvbVByb3BlcnR5TGlzdDpwcm9wZXJ0eUxpc3QKSW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxv Zwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDMxNzIwKQor KysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAK KzIwMDgtMDQtMDggIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGh0dHA6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzAyCisgICAgICAgIC1XZWJBcmNoaXZlIHN1 YnJlc291cmNlcyBkdW1wIGluIHJhbmRvbSBvcmRlcgorCisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvbWFjL0R1bXBSZW5kZXJUcmVlLm1tOgorICAgICAgICAocmVzb3VyY2VVUkxTb3J0KTogU29y dGluZyBmdW5jdGlvbiBiYXNlZCBvbiB0aGUgcmVzb3VyY2UgVVJMcworICAgICAgICAoc2VyaWFs aXplV2ViQXJjaGl2ZVRvWE1MKTogU29ydCB0aGUgc3VicmVzb3VyY2UgYXJyYXkKKwogMjAwOC0w NC0wNyAgQnJhZHkgRWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgT01HLCBC VUlMRCAtIHBsZWFzZSEKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDMxNzIwKQorKysgTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMDgtMDQtMDggIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeGVkIGh0dHA6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4MzAyCisgICAgICAgIC1XZWJBcmNoaXZlIHN1YnJlc291cmNlcyBkdW1w IGluIHJhbmRvbSBvcmRlcgorCisgICAgICAgIE5vdyB0aGF0IGEgRFJUIGZpeCBoYXMgc2V0IHRo ZSBvcmRlciwgdGhlc2UgMyB0ZXN0cyBuZWVkZWQgbmV3IHJlc3VsdHMKKworICAgICAgICAqIHdl YmFyY2hpdmUvdGVzdC1jc3MtaW1wb3J0LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiB3ZWJhcmNo aXZlL3Rlc3QtZHVwbGljYXRlLXJlc291cmNlcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogd2Vi YXJjaGl2ZS90ZXN0LWZyYW1lc2V0LWV4cGVjdGVkLnR4dDoKKwogMjAwOC0wNC0wNyAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUnViYmVyc3RhbXBlZCBieSBH ZW9mZiBHYXJlbgpJbmRleDogTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS90ZXN0LWR1cGxpY2F0ZS1y ZXNvdXJjZXMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3dlYmFyY2hp dmUvdGVzdC1kdXBsaWNhdGUtcmVzb3VyY2VzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMzE3MDcp CisrKyBMYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Rlc3QtZHVwbGljYXRlLXJlc291cmNlcy1leHBl Y3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTY3LDI0ICs2Nyw2IEBACiAJCQk8YXJyYXk+CiAJ CQkJPGRpY3Q+CiAJCQkJCTxrZXk+V2ViUmVzb3VyY2VEYXRhPC9rZXk+Ci0JCQkJCTxzdHJpbmc+ ZGl2IHsgZm9udC1mYW1pbHk6IEFyaWFsLCBIZWx2ZXRpY2EsIHNhbnMtc2VyaWY7IGNvbG9yOiBy ZWQ7IH0KLTwvc3RyaW5nPgotCQkJCQk8a2V5PldlYlJlc291cmNlTUlNRVR5cGU8L2tleT4KLQkJ CQkJPHN0cmluZz50ZXh0L2Nzczwvc3RyaW5nPgotCQkJCQk8a2V5PldlYlJlc291cmNlUmVzcG9u c2U8L2tleT4KLQkJCQkJPGRpY3Q+Ci0JCQkJCQk8a2V5Pk1JTUVUeXBlPC9rZXk+Ci0JCQkJCQk8 c3RyaW5nPnRleHQvY3NzPC9zdHJpbmc+Ci0JCQkJCQk8a2V5PlVSTDwva2V5PgotCQkJCQkJPHN0 cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hpdmUvcmVzb3VyY2VzL3Rlc3Qtc3R5bGUu Y3NzPC9zdHJpbmc+Ci0JCQkJCQk8a2V5PmV4cGVjdGVkQ29udGVudExlbmd0aDwva2V5PgotCQkJ CQkJPGludGVnZXI+NjM8L2ludGVnZXI+Ci0JCQkJCTwvZGljdD4KLQkJCQkJPGtleT5XZWJSZXNv dXJjZVVSTDwva2V5PgotCQkJCQk8c3RyaW5nPmZpbGU6Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2 ZS9yZXNvdXJjZXMvdGVzdC1zdHlsZS5jc3M8L3N0cmluZz4KLQkJCQk8L2RpY3Q+Ci0JCQkJPGRp Y3Q+Ci0JCQkJCTxrZXk+V2ViUmVzb3VyY2VEYXRhPC9rZXk+CiAJCQkJCTxkYXRhPgogCQkJCQlS MGxHT0RsaE5BQkFBTVFmQUdKaVl2THo5SW1LaXR2YjIvMzkKIAkJCQkJL2NuSnlhU2twT1BqNDlU VTFNSEJ3YlcxdGVycTdMdTd1L1gxCkBAIC0xNTYsNiArMTM4LDI0IEBACiAJCQkJCTxrZXk+V2Vi UmVzb3VyY2VVUkw8L2tleT4KIAkJCQkJPHN0cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFy Y2hpdmUvcmVzb3VyY2VzL2FwcGxlLmdpZjwvc3RyaW5nPgogCQkJCTwvZGljdD4KKwkJCQk8ZGlj dD4KKwkJCQkJPGtleT5XZWJSZXNvdXJjZURhdGE8L2tleT4KKwkJCQkJPHN0cmluZz5kaXYgeyBm b250LWZhbWlseTogQXJpYWwsIEhlbHZldGljYSwgc2Fucy1zZXJpZjsgY29sb3I6IHJlZDsgfQor PC9zdHJpbmc+CisJCQkJCTxrZXk+V2ViUmVzb3VyY2VNSU1FVHlwZTwva2V5PgorCQkJCQk8c3Ry aW5nPnRleHQvY3NzPC9zdHJpbmc+CisJCQkJCTxrZXk+V2ViUmVzb3VyY2VSZXNwb25zZTwva2V5 PgorCQkJCQk8ZGljdD4KKwkJCQkJCTxrZXk+TUlNRVR5cGU8L2tleT4KKwkJCQkJCTxzdHJpbmc+ dGV4dC9jc3M8L3N0cmluZz4KKwkJCQkJCTxrZXk+VVJMPC9rZXk+CisJCQkJCQk8c3RyaW5nPmZp bGU6Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMvdGVzdC1zdHlsZS5jc3M8L3N0 cmluZz4KKwkJCQkJCTxrZXk+ZXhwZWN0ZWRDb250ZW50TGVuZ3RoPC9rZXk+CisJCQkJCQk8aW50 ZWdlcj42MzwvaW50ZWdlcj4KKwkJCQkJPC9kaWN0PgorCQkJCQk8a2V5PldlYlJlc291cmNlVVJM PC9rZXk+CisJCQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291 cmNlcy90ZXN0LXN0eWxlLmNzczwvc3RyaW5nPgorCQkJCTwvZGljdD4KIAkJCTwvYXJyYXk+CiAJ CTwvZGljdD4KIAk8L2FycmF5PgpAQCAtMTYzLDQzICsxNjMsNiBAQAogCTxhcnJheT4KIAkJPGRp Y3Q+CiAJCQk8a2V5PldlYlJlc291cmNlRGF0YTwva2V5PgotCQkJPHN0cmluZz5pZiAod2luZG93 LmxheW91dFRlc3RDb250cm9sbGVyKQotICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBET01B c1dlYkFyY2hpdmUoKTsKLTwvc3RyaW5nPgotCQkJPGtleT5XZWJSZXNvdXJjZU1JTUVUeXBlPC9r ZXk+Ci0JCQk8c3RyaW5nPnRleHQvamF2YXNjcmlwdDwvc3RyaW5nPgotCQkJPGtleT5XZWJSZXNv dXJjZVJlc3BvbnNlPC9rZXk+Ci0JCQk8ZGljdD4KLQkJCQk8a2V5Pk1JTUVUeXBlPC9rZXk+Ci0J CQkJPHN0cmluZz50ZXh0L2phdmFzY3JpcHQ8L3N0cmluZz4KLQkJCQk8a2V5PlVSTDwva2V5Pgot CQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy9kdW1w LXdlYmFyY2hpdmUuanM8L3N0cmluZz4KLQkJCQk8a2V5PmV4cGVjdGVkQ29udGVudExlbmd0aDwv a2V5PgotCQkJCTxpbnRlZ2VyPjgxPC9pbnRlZ2VyPgotCQkJPC9kaWN0PgotCQkJPGtleT5XZWJS ZXNvdXJjZVVSTDwva2V5PgotCQkJPHN0cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hp dmUvcmVzb3VyY2VzL2R1bXAtd2ViYXJjaGl2ZS5qczwvc3RyaW5nPgotCQk8L2RpY3Q+Ci0JCTxk aWN0PgotCQkJPGtleT5XZWJSZXNvdXJjZURhdGE8L2tleT4KLQkJCTxzdHJpbmc+ZGl2IHsgZm9u dC1mYW1pbHk6IEFyaWFsLCBIZWx2ZXRpY2EsIHNhbnMtc2VyaWY7IGNvbG9yOiByZWQ7IH0KLTwv c3RyaW5nPgotCQkJPGtleT5XZWJSZXNvdXJjZU1JTUVUeXBlPC9rZXk+Ci0JCQk8c3RyaW5nPnRl eHQvY3NzPC9zdHJpbmc+Ci0JCQk8a2V5PldlYlJlc291cmNlUmVzcG9uc2U8L2tleT4KLQkJCTxk aWN0PgotCQkJCTxrZXk+TUlNRVR5cGU8L2tleT4KLQkJCQk8c3RyaW5nPnRleHQvY3NzPC9zdHJp bmc+Ci0JCQkJPGtleT5VUkw8L2tleT4KLQkJCQk8c3RyaW5nPmZpbGU6Ly8vTGF5b3V0VGVzdHMv d2ViYXJjaGl2ZS9yZXNvdXJjZXMvdGVzdC1zdHlsZS5jc3M8L3N0cmluZz4KLQkJCQk8a2V5PmV4 cGVjdGVkQ29udGVudExlbmd0aDwva2V5PgotCQkJCTxpbnRlZ2VyPjYzPC9pbnRlZ2VyPgotCQkJ PC9kaWN0PgotCQkJPGtleT5XZWJSZXNvdXJjZVVSTDwva2V5PgotCQkJPHN0cmluZz5maWxlOi8v L0xheW91dFRlc3RzL3dlYmFyY2hpdmUvcmVzb3VyY2VzL3Rlc3Qtc3R5bGUuY3NzPC9zdHJpbmc+ Ci0JCTwvZGljdD4KLQkJPGRpY3Q+Ci0JCQk8a2V5PldlYlJlc291cmNlRGF0YTwva2V5PgogCQkJ PGRhdGE+CiAJCQlSMGxHT0RsaE5BQkFBTVFmQUdKaVl2THo5SW1LaXR2YjIvMzkvY25KeWFTa3BP UGo0OVRVCiAJCQkxTUhCd2JXMXRlcnE3THU3dS9YMTl1WG01KzN1NytmbzZlRGc0ZS93OHQ3ZTMv bjUrUmNYCkBAIC0yNTQsNiArMjE3LDQzIEBACiAJCQk8a2V5PldlYlJlc291cmNlVVJMPC9rZXk+ CiAJCQk8c3RyaW5nPmZpbGU6Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMvYXBw bGUuZ2lmPC9zdHJpbmc+CiAJCTwvZGljdD4KKwkJPGRpY3Q+CisJCQk8a2V5PldlYlJlc291cmNl RGF0YTwva2V5PgorCQkJPHN0cmluZz5pZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKQor ICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBET01Bc1dlYkFyY2hpdmUoKTsKKzwvc3RyaW5n PgorCQkJPGtleT5XZWJSZXNvdXJjZU1JTUVUeXBlPC9rZXk+CisJCQk8c3RyaW5nPnRleHQvamF2 YXNjcmlwdDwvc3RyaW5nPgorCQkJPGtleT5XZWJSZXNvdXJjZVJlc3BvbnNlPC9rZXk+CisJCQk8 ZGljdD4KKwkJCQk8a2V5Pk1JTUVUeXBlPC9rZXk+CisJCQkJPHN0cmluZz50ZXh0L2phdmFzY3Jp cHQ8L3N0cmluZz4KKwkJCQk8a2V5PlVSTDwva2V5PgorCQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlv dXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy9kdW1wLXdlYmFyY2hpdmUuanM8L3N0cmluZz4K KwkJCQk8a2V5PmV4cGVjdGVkQ29udGVudExlbmd0aDwva2V5PgorCQkJCTxpbnRlZ2VyPjgxPC9p bnRlZ2VyPgorCQkJPC9kaWN0PgorCQkJPGtleT5XZWJSZXNvdXJjZVVSTDwva2V5PgorCQkJPHN0 cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hpdmUvcmVzb3VyY2VzL2R1bXAtd2ViYXJj aGl2ZS5qczwvc3RyaW5nPgorCQk8L2RpY3Q+CisJCTxkaWN0PgorCQkJPGtleT5XZWJSZXNvdXJj ZURhdGE8L2tleT4KKwkJCTxzdHJpbmc+ZGl2IHsgZm9udC1mYW1pbHk6IEFyaWFsLCBIZWx2ZXRp Y2EsIHNhbnMtc2VyaWY7IGNvbG9yOiByZWQ7IH0KKzwvc3RyaW5nPgorCQkJPGtleT5XZWJSZXNv dXJjZU1JTUVUeXBlPC9rZXk+CisJCQk8c3RyaW5nPnRleHQvY3NzPC9zdHJpbmc+CisJCQk8a2V5 PldlYlJlc291cmNlUmVzcG9uc2U8L2tleT4KKwkJCTxkaWN0PgorCQkJCTxrZXk+TUlNRVR5cGU8 L2tleT4KKwkJCQk8c3RyaW5nPnRleHQvY3NzPC9zdHJpbmc+CisJCQkJPGtleT5VUkw8L2tleT4K KwkJCQk8c3RyaW5nPmZpbGU6Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMvdGVz dC1zdHlsZS5jc3M8L3N0cmluZz4KKwkJCQk8a2V5PmV4cGVjdGVkQ29udGVudExlbmd0aDwva2V5 PgorCQkJCTxpbnRlZ2VyPjYzPC9pbnRlZ2VyPgorCQkJPC9kaWN0PgorCQkJPGtleT5XZWJSZXNv dXJjZVVSTDwva2V5PgorCQkJPHN0cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hpdmUv cmVzb3VyY2VzL3Rlc3Qtc3R5bGUuY3NzPC9zdHJpbmc+CisJCTwvZGljdD4KIAk8L2FycmF5Pgog PC9kaWN0PgogPC9wbGlzdD4KSW5kZXg6IExheW91dFRlc3RzL3dlYmFyY2hpdmUvdGVzdC1jc3Mt aW1wb3J0LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy93ZWJhcmNoaXZl L3Rlc3QtY3NzLWltcG9ydC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDMxNzA3KQorKysgTGF5b3V0 VGVzdHMvd2ViYXJjaGl2ZS90ZXN0LWNzcy1pbXBvcnQtZXhwZWN0ZWQudHh0CSh3b3JraW5nIGNv cHkpCkBAIC0zNSw4ICszNSw4IEBACiAJPGFycmF5PgogCQk8ZGljdD4KIAkJCTxrZXk+V2ViUmVz b3VyY2VEYXRhPC9rZXk+Ci0JCQk8c3RyaW5nPkBpbXBvcnQgdXJsKCd0ZXN0LWNzcy1saW5rLXJl Y3Vyc2UuY3NzJyk7Ci0ucmVkIHsgY29sb3I6IHJlZDsgfQorCQkJPHN0cmluZz5AaW1wb3J0IHVy bCgndGVzdC1jc3MtaW1wb3J0LmNzcycpOworLmdyZWVuIHsgY29sb3I6IGdyZWVuOyB9CiA8L3N0 cmluZz4KIAkJCTxrZXk+V2ViUmVzb3VyY2VNSU1FVHlwZTwva2V5PgogCQkJPHN0cmluZz50ZXh0 L2Nzczwvc3RyaW5nPgpAQCAtNDUsMTcgKzQ1LDE3IEBACiAJCQkJPGtleT5NSU1FVHlwZTwva2V5 PgogCQkJCTxzdHJpbmc+dGV4dC9jc3M8L3N0cmluZz4KIAkJCQk8a2V5PlVSTDwva2V5PgotCQkJ CTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNz cy1saW5rLmNzczwvc3RyaW5nPgorCQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJh cmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1pbXBvcnQtcmVjdXJzZS5jc3M8L3N0cmluZz4KIAkJ CQk8a2V5PmV4cGVjdGVkQ29udGVudExlbmd0aDwva2V5PgotCQkJCTxpbnRlZ2VyPjYzPC9pbnRl Z2VyPgorCQkJCTxpbnRlZ2VyPjYxPC9pbnRlZ2VyPgogCQkJPC9kaWN0PgogCQkJPGtleT5XZWJS ZXNvdXJjZVVSTDwva2V5PgotCQkJPHN0cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hp dmUvcmVzb3VyY2VzL3Rlc3QtY3NzLWxpbmsuY3NzPC9zdHJpbmc+CisJCQk8c3RyaW5nPmZpbGU6 Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMvdGVzdC1jc3MtaW1wb3J0LXJlY3Vy c2UuY3NzPC9zdHJpbmc+CiAJCTwvZGljdD4KIAkJPGRpY3Q+CiAJCQk8a2V5PldlYlJlc291cmNl RGF0YTwva2V5PgotCQkJPHN0cmluZz5AaW1wb3J0IHVybCgndGVzdC1jc3MtbGluay1yZWN1cnNl LmNzcycpOwotLnB1cnBsZSB7IGNvbG9yOiBwdXJwbGU7IH0KKwkJCTxzdHJpbmc+QGltcG9ydCB1 cmwoJ3Rlc3QtY3NzLWltcG9ydC1yZWN1cnNlLmNzcycpOworLmJsdWUgeyBjb2xvcjogYmx1ZTsg fQogPC9zdHJpbmc+CiAJCQk8a2V5PldlYlJlc291cmNlTUlNRVR5cGU8L2tleT4KIAkJCTxzdHJp bmc+dGV4dC9jc3M8L3N0cmluZz4KQEAgLTY0LDE3ICs2NCwxNyBAQAogCQkJCTxrZXk+TUlNRVR5 cGU8L2tleT4KIAkJCQk8c3RyaW5nPnRleHQvY3NzPC9zdHJpbmc+CiAJCQkJPGtleT5VUkw8L2tl eT4KLQkJCQk8c3RyaW5nPmZpbGU6Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMv dGVzdC1jc3MtbGluay1yZWN1cnNlLmNzczwvc3RyaW5nPgorCQkJCTxzdHJpbmc+ZmlsZTovLy9M YXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1pbXBvcnQuY3NzPC9zdHJp bmc+CiAJCQkJPGtleT5leHBlY3RlZENvbnRlbnRMZW5ndGg8L2tleT4KLQkJCQk8aW50ZWdlcj42 OTwvaW50ZWdlcj4KKwkJCQk8aW50ZWdlcj42NzwvaW50ZWdlcj4KIAkJCTwvZGljdD4KIAkJCTxr ZXk+V2ViUmVzb3VyY2VVUkw8L2tleT4KLQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93 ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1saW5rLXJlY3Vyc2UuY3NzPC9zdHJpbmc+CisJ CQk8c3RyaW5nPmZpbGU6Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMvdGVzdC1j c3MtaW1wb3J0LmNzczwvc3RyaW5nPgogCQk8L2RpY3Q+CiAJCTxkaWN0PgogCQkJPGtleT5XZWJS ZXNvdXJjZURhdGE8L2tleT4KLQkJCTxzdHJpbmc+QGltcG9ydCB1cmwoJ3Rlc3QtY3NzLWltcG9y dC5jc3MnKTsKLS5ncmVlbiB7IGNvbG9yOiBncmVlbjsgfQorCQkJPHN0cmluZz5AaW1wb3J0IHVy bCgndGVzdC1jc3MtbGluay1yZWN1cnNlLmNzcycpOworLnB1cnBsZSB7IGNvbG9yOiBwdXJwbGU7 IH0KIDwvc3RyaW5nPgogCQkJPGtleT5XZWJSZXNvdXJjZU1JTUVUeXBlPC9rZXk+CiAJCQk8c3Ry aW5nPnRleHQvY3NzPC9zdHJpbmc+CkBAIC04MywxNyArODMsMTcgQEAKIAkJCQk8a2V5Pk1JTUVU eXBlPC9rZXk+CiAJCQkJPHN0cmluZz50ZXh0L2Nzczwvc3RyaW5nPgogCQkJCTxrZXk+VVJMPC9r ZXk+Ci0JCQkJPHN0cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hpdmUvcmVzb3VyY2Vz L3Rlc3QtY3NzLWltcG9ydC1yZWN1cnNlLmNzczwvc3RyaW5nPgorCQkJCTxzdHJpbmc+ZmlsZTov Ly9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1saW5rLXJlY3Vyc2Uu Y3NzPC9zdHJpbmc+CiAJCQkJPGtleT5leHBlY3RlZENvbnRlbnRMZW5ndGg8L2tleT4KLQkJCQk8 aW50ZWdlcj42MTwvaW50ZWdlcj4KKwkJCQk8aW50ZWdlcj42OTwvaW50ZWdlcj4KIAkJCTwvZGlj dD4KIAkJCTxrZXk+V2ViUmVzb3VyY2VVUkw8L2tleT4KLQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlv dXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1pbXBvcnQtcmVjdXJzZS5jc3M8 L3N0cmluZz4KKwkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291 cmNlcy90ZXN0LWNzcy1saW5rLXJlY3Vyc2UuY3NzPC9zdHJpbmc+CiAJCTwvZGljdD4KIAkJPGRp Y3Q+CiAJCQk8a2V5PldlYlJlc291cmNlRGF0YTwva2V5PgotCQkJPHN0cmluZz5AaW1wb3J0IHVy bCgndGVzdC1jc3MtaW1wb3J0LXJlY3Vyc2UuY3NzJyk7Ci0uYmx1ZSB7IGNvbG9yOiBibHVlOyB9 CisJCQk8c3RyaW5nPkBpbXBvcnQgdXJsKCd0ZXN0LWNzcy1saW5rLXJlY3Vyc2UuY3NzJyk7Cisu cmVkIHsgY29sb3I6IHJlZDsgfQogPC9zdHJpbmc+CiAJCQk8a2V5PldlYlJlc291cmNlTUlNRVR5 cGU8L2tleT4KIAkJCTxzdHJpbmc+dGV4dC9jc3M8L3N0cmluZz4KQEAgLTEwMiwxMiArMTAyLDEy IEBACiAJCQkJPGtleT5NSU1FVHlwZTwva2V5PgogCQkJCTxzdHJpbmc+dGV4dC9jc3M8L3N0cmlu Zz4KIAkJCQk8a2V5PlVSTDwva2V5PgotCQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93 ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1pbXBvcnQuY3NzPC9zdHJpbmc+CisJCQkJPHN0 cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dlYmFyY2hpdmUvcmVzb3VyY2VzL3Rlc3QtY3NzLWxp bmsuY3NzPC9zdHJpbmc+CiAJCQkJPGtleT5leHBlY3RlZENvbnRlbnRMZW5ndGg8L2tleT4KLQkJ CQk8aW50ZWdlcj42NzwvaW50ZWdlcj4KKwkJCQk8aW50ZWdlcj42MzwvaW50ZWdlcj4KIAkJCTwv ZGljdD4KIAkJCTxrZXk+V2ViUmVzb3VyY2VVUkw8L2tleT4KLQkJCTxzdHJpbmc+ZmlsZTovLy9M YXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LWNzcy1pbXBvcnQuY3NzPC9zdHJp bmc+CisJCQk8c3RyaW5nPmZpbGU6Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMv dGVzdC1jc3MtbGluay5jc3M8L3N0cmluZz4KIAkJPC9kaWN0PgogCTwvYXJyYXk+CiA8L2RpY3Q+ CkluZGV4OiBMYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Rlc3QtZnJhbWVzZXQtZXhwZWN0ZWQudHh0 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3dlYmFyY2hpdmUvdGVzdC1mcmFtZXNldC1leHBl Y3RlZC50eHQJKHJldmlzaW9uIDMxNzA3KQorKysgTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS90ZXN0 LWZyYW1lc2V0LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtNTYsMjQgKzU2LDYgQEAK IAkJCTxhcnJheT4KIAkJCQk8ZGljdD4KIAkJCQkJPGtleT5XZWJSZXNvdXJjZURhdGE8L2tleT4K LQkJCQkJPHN0cmluZz5kaXYgeyBmb250LWZhbWlseTogQXJpYWwsIEhlbHZldGljYSwgc2Fucy1z ZXJpZjsgY29sb3I6IHJlZDsgfQotPC9zdHJpbmc+Ci0JCQkJCTxrZXk+V2ViUmVzb3VyY2VNSU1F VHlwZTwva2V5PgotCQkJCQk8c3RyaW5nPnRleHQvY3NzPC9zdHJpbmc+Ci0JCQkJCTxrZXk+V2Vi UmVzb3VyY2VSZXNwb25zZTwva2V5PgotCQkJCQk8ZGljdD4KLQkJCQkJCTxrZXk+TUlNRVR5cGU8 L2tleT4KLQkJCQkJCTxzdHJpbmc+dGV4dC9jc3M8L3N0cmluZz4KLQkJCQkJCTxrZXk+VVJMPC9r ZXk+Ci0JCQkJCQk8c3RyaW5nPmZpbGU6Ly8vTGF5b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJj ZXMvdGVzdC1zdHlsZS5jc3M8L3N0cmluZz4KLQkJCQkJCTxrZXk+ZXhwZWN0ZWRDb250ZW50TGVu Z3RoPC9rZXk+Ci0JCQkJCQk8aW50ZWdlcj42MzwvaW50ZWdlcj4KLQkJCQkJPC9kaWN0PgotCQkJ CQk8a2V5PldlYlJlc291cmNlVVJMPC9rZXk+Ci0JCQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRU ZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0LXN0eWxlLmNzczwvc3RyaW5nPgotCQkJCTwv ZGljdD4KLQkJCQk8ZGljdD4KLQkJCQkJPGtleT5XZWJSZXNvdXJjZURhdGE8L2tleT4KIAkJCQkJ PGRhdGE+CiAJCQkJCVIwbEdPRGxoTkFCQUFNUWZBR0ppWXZMejlJbUtpdHZiMi8zOQogCQkJCQkv Y25KeWFTa3BPUGo0OVRVMU1IQndiVzF0ZXJxN0x1N3UvWDEKQEAgLTE0NSw2ICsxMjcsMjQgQEAK IAkJCQkJPGtleT5XZWJSZXNvdXJjZVVSTDwva2V5PgogCQkJCQk8c3RyaW5nPmZpbGU6Ly8vTGF5 b3V0VGVzdHMvd2ViYXJjaGl2ZS9yZXNvdXJjZXMvYXBwbGUuZ2lmPC9zdHJpbmc+CiAJCQkJPC9k aWN0PgorCQkJCTxkaWN0PgorCQkJCQk8a2V5PldlYlJlc291cmNlRGF0YTwva2V5PgorCQkJCQk8 c3RyaW5nPmRpdiB7IGZvbnQtZmFtaWx5OiBBcmlhbCwgSGVsdmV0aWNhLCBzYW5zLXNlcmlmOyBj b2xvcjogcmVkOyB9Cis8L3N0cmluZz4KKwkJCQkJPGtleT5XZWJSZXNvdXJjZU1JTUVUeXBlPC9r ZXk+CisJCQkJCTxzdHJpbmc+dGV4dC9jc3M8L3N0cmluZz4KKwkJCQkJPGtleT5XZWJSZXNvdXJj ZVJlc3BvbnNlPC9rZXk+CisJCQkJCTxkaWN0PgorCQkJCQkJPGtleT5NSU1FVHlwZTwva2V5Pgor CQkJCQkJPHN0cmluZz50ZXh0L2Nzczwvc3RyaW5nPgorCQkJCQkJPGtleT5VUkw8L2tleT4KKwkJ CQkJCTxzdHJpbmc+ZmlsZTovLy9MYXlvdXRUZXN0cy93ZWJhcmNoaXZlL3Jlc291cmNlcy90ZXN0 LXN0eWxlLmNzczwvc3RyaW5nPgorCQkJCQkJPGtleT5leHBlY3RlZENvbnRlbnRMZW5ndGg8L2tl eT4KKwkJCQkJCTxpbnRlZ2VyPjYzPC9pbnRlZ2VyPgorCQkJCQk8L2RpY3Q+CisJCQkJCTxrZXk+ V2ViUmVzb3VyY2VVUkw8L2tleT4KKwkJCQkJPHN0cmluZz5maWxlOi8vL0xheW91dFRlc3RzL3dl YmFyY2hpdmUvcmVzb3VyY2VzL3Rlc3Qtc3R5bGUuY3NzPC9zdHJpbmc+CisJCQkJPC9kaWN0Pgog CQkJPC9hcnJheT4KIAkJPC9kaWN0PgogCTwvYXJyYXk+Cg==