27595 2009-07-22 22:19:00 -0700 WebCore/Kit has a few places that don't gracefully handle a null request returned from willSendRequest 2009-07-23 20:01:34 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 beidson webkit-unassigned oldest_to_newest 134021 0 beidson 2009-07-22 22:19:00 -0700 WebCore has a few places that don't gracefully handle a null request returned from willSendRequest. -Windows' WebFrameLoaderClient.cpp doesn't expect it as a return value -ResourceHandleCFNet.cpp doesn't respect it. -InspectorController.cpp chokes on the next load after a load is cancelled this way. 134022 1 33314 beidson 2009-07-22 22:22:36 -0700 Created attachment 33314 Proposed fix 134023 2 33314 ggaren 2009-07-22 22:24:39 -0700 Comment on attachment 33314 Proposed fix Can you add a test for this? For example, could we configure the DRT resource load delegate to return null when asked to? 134025 3 beidson 2009-07-22 22:41:34 -0700 Yah, that should be pretty easy. I love it when the layout test work is substantially more than the patch itself ;) I'll do that in the A.M. then attach a new patch. 134347 4 33403 beidson 2009-07-23 19:12:30 -0700 Created attachment 33403 DRT enhancements and layout test 134350 5 33403 ggaren 2009-07-23 19:30:48 -0700 Comment on attachment 33403 DRT enhancements and layout test A patch is temporary. A layout test is forever! :) 134355 6 beidson 2009-07-23 20:01:34 -0700 Sending LayoutTests/ChangeLog Adding LayoutTests/http/tests/misc/resources/redirect-to-http-url.php Adding LayoutTests/http/tests/misc/will-send-request-returns-null-on-redirect-expected.txt Adding LayoutTests/http/tests/misc/will-send-request-returns-null-on-redirect.html Sending LayoutTests/platform/gtk/Skipped Sending LayoutTests/platform/qt/Skipped Sending WebCore/ChangeLog Sending WebCore/inspector/InspectorController.cpp Sending WebCore/platform/network/cf/ResourceHandleCFNet.cpp Sending WebKit/win/ChangeLog Sending WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp Sending WebKitTools/ChangeLog Sending WebKitTools/DumpRenderTree/LayoutTestController.cpp Sending WebKitTools/DumpRenderTree/LayoutTestController.h Sending WebKitTools/DumpRenderTree/mac/LayoutTestControllerMac.mm Sending WebKitTools/DumpRenderTree/mac/ResourceLoadDelegate.mm Sending WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp Transmitting file data ................. Committed revision 46308. 33314 2009-07-22 22:22:36 -0700 2009-07-22 22:24:39 -0700 Proposed fix patch.txt text/plain 3236 beidson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjI1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTYgQEAKKzIwMDktMDctMjIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdl YkNvcmUgaGFzIGEgZmV3IHBsYWNlcyB0aGF0IGRvbid0IGdyYWNlZnVsbHkgaGFuZGxlIGEgbnVs bCByZXF1ZXN0IHJldHVybmVkIGZyb20gd2lsbFNlbmRSZXF1ZXN0LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1OTUKKyAgICAgICAgCisgICAgICAg ICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SW5zcGVjdG9yQ29udHJvbGxlcjo6cmVtb3ZlUmVzb3VyY2UpOiBOdWxsLWNoZWNrIHRoZSByZXF1 ZXN0IFVSTC4KKyAgICAgICAgCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJj ZUhhbmRsZUNGTmV0LmNwcDogRGl0dG8sIGFuZCByZXR1cm4gbnVsbCBpbnN0ZWFkIG9mIGNyZWF0 aW5nIGFuIGVtcHR5IG9uZS4KKyAgICAgICAgKFdlYkNvcmU6OndpbGxTZW5kUmVxdWVzdCk6CisK IDIwMDktMDctMjIgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBS ZXZpZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL2NmL1Jlc291cmNlSGFuZGxlQ0ZOZXQuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jZi9SZXNvdXJjZUhhbmRsZUNGTmV0LmNwcAkocmV2aXNpb24gNDYy NTMpCisrKyBXZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvUmVzb3VyY2VIYW5kbGVDRk5ldC5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTExOSw2ICsxMTksOSBAQAogICAgIFJlc291cmNlUmVxdWVz dCByZXF1ZXN0KGNmUmVxdWVzdCk7CiAgICAgaGFuZGxlLT53aWxsU2VuZFJlcXVlc3QocmVxdWVz dCwgY2ZSZWRpcmVjdFJlc3BvbnNlKTsKIAorICAgIGlmIChyZXF1ZXN0LmlzTnVsbCgpKQorICAg ICAgICByZXR1cm4gMDsKKwogICAgIGNmUmVxdWVzdCA9IHJlcXVlc3QuY2ZVUkxSZXF1ZXN0KCk7 CiAKICAgICBDRlJldGFpbihjZlJlcXVlc3QpOwpJbmRleDogV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yQ29udHJvbGxlci5jcHAJKHJldmlzaW9uIDQ2MjUzKQorKysgV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yQ29udHJvbGxlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg0NSw3ICs4NDUs OSBAQAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjpyZW1vdmVSZXNvdXJjZShJbnNwZWN0b3JS ZXNvdXJjZSogcmVzb3VyY2UpCiB7CiAgICAgbV9yZXNvdXJjZXMucmVtb3ZlKHJlc291cmNlLT5p ZGVudGlmaWVyKCkpOwotICAgIG1fa25vd25SZXNvdXJjZXMucmVtb3ZlKHJlc291cmNlLT5yZXF1 ZXN0VVJMKCkpOworICAgIFN0cmluZyByZXF1ZXN0VVJMID0gcmVzb3VyY2UtPnJlcXVlc3RVUkwo KTsKKyAgICBpZiAoIXJlcXVlc3RVUkwuaXNOdWxsKCkpCisgICAgICAgIG1fa25vd25SZXNvdXJj ZXMucmVtb3ZlKHJlcXVlc3RVUkwpOwogCiAgICAgRnJhbWUqIGZyYW1lID0gcmVzb3VyY2UtPmZy YW1lKCk7CiAgICAgUmVzb3VyY2VzTWFwKiByZXNvdXJjZU1hcCA9IG1fZnJhbWVSZXNvdXJjZXMu Z2V0KGZyYW1lKTsKSW5kZXg6IFdlYktpdC93aW4vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YktpdC93aW4vQ2hhbmdlTG9nCShyZXZpc2lvbiA0NjI1MykKKysrIFdlYktpdC93aW4vQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMDktMDctMjIgIEJyYWR5IEVp ZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFdlYkZyYW1lTG9hZGVyQ2xpZW50IG9uIFdpbmRvd3MgZG9lc24n dCBncmFjZWZ1bGx5IGhhbmRsZSBhIG51bGwgcmVxdWVzdCByZXR1cm5lZCBmcm9tIHdpbGxTZW5k UmVxdWVzdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTI3NTk1CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHA6CisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlzcGF0Y2hXaWxsU2VuZFJlcXVl c3QpOgorCiAyMDA5LTA3LTIyICBUYWtlc2hpIFlvc2hpbm8gIDx0eW9zaGlub0Bnb29nbGUuY29t PgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpJbmRleDogV2ViS2l0L3dpbi9X ZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5jcHAJKHJldmlzaW9u IDQ2MjUyKQorKysgV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE4Nyw2ICsxODcsMTEgQEAKICAgICBpZiAod2ViVVJM UmVxdWVzdCA9PSBuZXdXZWJVUkxSZXF1ZXN0KQogICAgICAgICByZXR1cm47CiAKKyAgICBpZiAo IW5ld1dlYlVSTFJlcXVlc3QpIHsKKyAgICAgICAgcmVxdWVzdCA9IFJlc291cmNlUmVxdWVzdCgp OworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgQ09NUHRyPFdlYk11dGFibGVVUkxSZXF1 ZXN0PiBuZXdXZWJVUkxSZXF1ZXN0SW1wbChRdWVyeSwgbmV3V2ViVVJMUmVxdWVzdCk7CiAgICAg aWYgKCFuZXdXZWJVUkxSZXF1ZXN0SW1wbCkKICAgICAgICAgcmV0dXJuOwo= 33403 2009-07-23 19:12:30 -0700 2009-07-23 19:30:48 -0700 DRT enhancements and layout test patch.txt text/plain 10789 beidson SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDQ2MzAzKQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMDktMDctMjMgIEJyYWR5IEVpZHNvbiAgPGJl aWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFdlYkNvcmUgaGFzIGEgZmV3IHBsYWNlcyB0aGF0IGRvbid0IGdyYWNlZnVsbHkg aGFuZGxlIGEgbnVsbCByZXF1ZXN0IHJldHVybmVkIGZyb20gd2lsbFNlbmRSZXF1ZXN0LgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjc1OTUKKworICAg ICAgICBBZGQgdGhlIGFiaWxpdHkgdG8gdGVsbCB0aGUgTGF5b3V0VGVzdENvbnRyb2xsZXIgdG8g cmV0dXJuIGEgbnVsbCByZXF1ZXN0IGZvciB3aWxsU2VuZFJlcXVlc3QKKyAgICAgICAgcmVkaXJl Y3QgY2FsbGJhY2tzLgorICAgICAgICAKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9MYXlvdXRU ZXN0Q29udHJvbGxlci5jcHA6CisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6TGF5b3V0 VGVzdENvbnRyb2xsZXIpOgorICAgICAgICAoc2V0V2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGxP blJlZGlyZWN0Q2FsbGJhY2spOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnN0YXRp Y0Z1bmN0aW9ucyk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xs ZXIuaDoKKyAgICAgICAgKExheW91dFRlc3RDb250cm9sbGVyOjp3aWxsU2VuZFJlcXVlc3RSZXR1 cm5zTnVsbE9uUmVkaXJlY3QpOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldFdp bGxTZW5kUmVxdWVzdFJldHVybnNOdWxsT25SZWRpcmVjdCk6CisKKyAgICAgICAgKiBEdW1wUmVu ZGVyVHJlZS9tYWMvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW06CisgICAgICAgICgtW1Jlc291cmNl TG9hZERlbGVnYXRlIHdlYlZpZXc6cmVzb3VyY2U6d2lsbFNlbmRSZXF1ZXN0OnJlZGlyZWN0UmVz cG9uc2U6ZnJvbURhdGFTb3VyY2U6XSk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvd2luL1Jl c291cmNlTG9hZERlbGVnYXRlLmNwcDoKKyAgICAgICAgKFJlc291cmNlTG9hZERlbGVnYXRlOjp3 aWxsU2VuZFJlcXVlc3QpOgorCiAyMDA5LTA3LTIzICBNYXJrIFJvd2UgIDxtcm93ZUBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCkluZGV4OiBXZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCShyZXZp c2lvbiA0NjMwMykKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250 cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNjAsNiArNjAsNyBAQCBMYXlvdXRUZXN0Q29u dHJvbGxlcjo6TGF5b3V0VGVzdENvbnRyb2xsCiAgICAgLCBtX3Rlc3RSZXBhaW50KGZhbHNlKQog ICAgICwgbV90ZXN0UmVwYWludFN3ZWVwSG9yaXpvbnRhbGx5KGZhbHNlKQogICAgICwgbV93YWl0 VG9EdW1wKGZhbHNlKQorICAgICwgbV93aWxsU2VuZFJlcXVlc3RSZXR1cm5zTnVsbE9uUmVkaXJl Y3QoZmFsc2UpCiAgICAgLCBtX3dpbmRvd0lzS2V5KHRydWUpCiAgICAgLCBtX2dsb2JhbEZsYWco ZmFsc2UpCiAgICAgLCBtX3Rlc3RQYXRoT3JVUkwodGVzdFBhdGhPclVSTCkKQEAgLTY3MSw2ICs2 NzIsMTggQEAgc3RhdGljIEpTVmFsdWVSZWYgc2V0VXNlclN0eWxlU2hlZXRMb2NhdAogICAgIHJl dHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKIH0KIAorc3RhdGljIEpTVmFsdWVS ZWYgc2V0V2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGxPblJlZGlyZWN0Q2FsbGJhY2soSlNDb250 ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09iamVjdFJlZiB0aGlzT2Jq ZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwg SlNWYWx1ZVJlZiogZXhjZXB0aW9uKQoreworICAgIC8vIEhhcyBjcm9zcy1wbGF0Zm9ybSBpbXBs ZW1lbnRhdGlvbgorICAgIGlmIChhcmd1bWVudENvdW50IDwgMSkKKyAgICAgICAgcmV0dXJuIEpT VmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOworCisgICAgTGF5b3V0VGVzdENvbnRyb2xsZXIq IGNvbnRyb2xsZXIgPSBzdGF0aWNfY2FzdDxMYXlvdXRUZXN0Q29udHJvbGxlcio+KEpTT2JqZWN0 R2V0UHJpdmF0ZSh0aGlzT2JqZWN0KSk7CisgICAgY29udHJvbGxlci0+c2V0V2lsbFNlbmRSZXF1 ZXN0UmV0dXJuc051bGxPblJlZGlyZWN0KEpTVmFsdWVUb0Jvb2xlYW4oY29udGV4dCwgYXJndW1l bnRzWzBdKSk7CisKKyAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7Cit9 CisKIHN0YXRpYyBKU1ZhbHVlUmVmIHNldFdpbmRvd0lzS2V5Q2FsbGJhY2soSlNDb250ZXh0UmVm IGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBz aXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1 ZVJlZiogZXhjZXB0aW9uKQogewogICAgIC8vIEhhcyBtYWMgaW1wbGVtZW50YXRpb24KQEAgLTky Niw2ICs5MzksNyBAQCBKU1N0YXRpY0Z1bmN0aW9uKiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6CiAg ICAgICAgIHsgInNldFVzZURhc2hib2FyZENvbXBhdGliaWxpdHlNb2RlIiwgc2V0VXNlRGFzaGJv YXJkQ29tcGF0aWJpbGl0eU1vZGVDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25s eSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJzZXRVc2Vy U3R5bGVTaGVldEVuYWJsZWQiLCBzZXRVc2VyU3R5bGVTaGVldEVuYWJsZWRDYWxsYmFjaywga0pT UHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0 ZSB9LAogICAgICAgICB7ICJzZXRVc2VyU3R5bGVTaGVldExvY2F0aW9uIiwgc2V0VXNlclN0eWxl U2hlZXRMb2NhdGlvbkNhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pT UHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCisgICAgICAgIHsgInNldFdpbGxTZW5kUmVx dWVzdFJldHVybnNOdWxsT25SZWRpcmVjdCIsIHNldFdpbGxTZW5kUmVxdWVzdFJldHVybnNOdWxs T25SZWRpcmVjdENhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJv cGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgInNldFdpbmRvd0lzS2V5Iiwg c2V0V2luZG93SXNLZXlDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtK U1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJ0ZXN0T25zY3JlZW4i LCB0ZXN0T25zY3JlZW5DYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtK U1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgICAgICB7ICJ0ZXN0UmVwYWludCIs IHRlc3RSZXBhaW50Q2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQ cm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuaAkocmV2aXNpb24gNDYzMDMpCisr KyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oCSh3b3Jr aW5nIGNvcHkpCkBAIC0xNTIsNiArMTUyLDkgQEAgcHVibGljOgogICAgIGJvb2wgd2FpdFRvRHVt cCgpIGNvbnN0IHsgcmV0dXJuIG1fd2FpdFRvRHVtcDsgfQogICAgIHZvaWQgc2V0V2FpdFRvRHVt cChib29sIHdhaXRUb0R1bXApOwogCisgICAgYm9vbCB3aWxsU2VuZFJlcXVlc3RSZXR1cm5zTnVs bE9uUmVkaXJlY3QoKSBjb25zdCB7IHJldHVybiBtX3dpbGxTZW5kUmVxdWVzdFJldHVybnNOdWxs T25SZWRpcmVjdDsgfQorICAgIHZvaWQgc2V0V2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGxPblJl ZGlyZWN0KGJvb2wgcmV0dXJuc051bGwpIHsgbV93aWxsU2VuZFJlcXVlc3RSZXR1cm5zTnVsbE9u UmVkaXJlY3QgPSByZXR1cm5zTnVsbDsgfQorCiAgICAgYm9vbCB3aW5kb3dJc0tleSgpIGNvbnN0 IHsgcmV0dXJuIG1fd2luZG93SXNLZXk7IH0KICAgICB2b2lkIHNldFdpbmRvd0lzS2V5KGJvb2wg d2luZG93SXNLZXkpOwogCkBAIC0xODksNiArMTkyLDcgQEAgcHJpdmF0ZToKICAgICBib29sIG1f dGVzdFJlcGFpbnQ7CiAgICAgYm9vbCBtX3Rlc3RSZXBhaW50U3dlZXBIb3Jpem9udGFsbHk7CiAg ICAgYm9vbCBtX3dhaXRUb0R1bXA7IC8vIFRydWUgaWYgd2FpdFVudGlsRG9uZSgpIGhhcyBiZWVu IGNhbGxlZCwgYnV0IG5vdGlmeURvbmUoKSBoYXMgbm90IHlldCBiZWVuIGNhbGxlZC4KKyAgICBi b29sIG1fd2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGxPblJlZGlyZWN0OwogICAgIGJvb2wgbV93 aW5kb3dJc0tleTsKIAogICAgIGJvb2wgbV9nbG9iYWxGbGFnOwpJbmRleDogV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvbWFjL1Jlc291cmNlTG9hZERlbGVnYXRlLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQko cmV2aXNpb24gNDYzMDMpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvUmVzb3Vy Y2VMb2FkRGVsZWdhdGUubW0JKHdvcmtpbmcgY29weSkKQEAgLTEzNiw2ICsxMzYsMTEgQEAKICAg ICBpZiAoZGlzYWxsb3dlZFVSTHMgJiYgQ0ZTZXRDb250YWluc1ZhbHVlKGRpc2FsbG93ZWRVUkxz LCB1cmwpKQogICAgICAgICByZXR1cm4gbmlsOwogCisgICAgaWYgKCFkb25lICYmIGdMYXlvdXRU ZXN0Q29udHJvbGxlci0+d2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051bGxPblJlZGlyZWN0KCkgJiYg cmVkaXJlY3RSZXNwb25zZSkgeworICAgICAgICBwcmludGYoIlJldHVybmluZyBudWxsIGZvciB0 aGlzIHJlZGlyZWN0XG4iKTsKKyAgICAgICAgcmV0dXJuIG5pbDsKKyAgICB9CisKICAgICByZXR1 cm4gbmV3UmVxdWVzdDsKIH0KIApJbmRleDogV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd2lu L1Jlc291cmNlTG9hZERlbGVnYXRlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9EdW1w UmVuZGVyVHJlZS93aW4vUmVzb3VyY2VMb2FkRGVsZWdhdGUuY3BwCShyZXZpc2lvbiA0NjMwMykK KysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5j cHAJKHdvcmtpbmcgY29weSkKQEAgLTIyOCw2ICsyMjgsMTIgQEAgSFJFU1VMVCBTVERNRVRIT0RD QUxMVFlQRSBSZXNvdXJjZUxvYWREZQogICAgICAgICAgICAgZGVzY3JpcHRpb25TdWl0YWJsZUZv clRlc3RSZXN1bHQocmVkaXJlY3RSZXNwb25zZSkuY19zdHIoKSk7CiAgICAgfQogCisgICAgaWYg KCFkb25lICYmIGdMYXlvdXRUZXN0Q29udHJvbGxlci0+d2lsbFNlbmRSZXF1ZXN0UmV0dXJuc051 bGxPblJlZGlyZWN0KCkgJiYgcmVkaXJlY3RSZXNwb25zZSkgeworICAgICAgICBwcmludGYoIlJl dHVybmluZyBudWxsIGZvciB0aGlzIHJlZGlyZWN0XG4iKTsKKyAgICAgICAgKm5ld1JlcXVlc3Qg PSAwOworICAgICAgICByZXR1cm4gU19PSzsKKyAgICB9CisKICAgICByZXF1ZXN0LT5BZGRSZWYo KTsKICAgICAqbmV3UmVxdWVzdCA9IHJlcXVlc3Q7CiAgICAgcmV0dXJuIFNfT0s7CkluZGV4OiBM YXlvdXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiA0NjMwMykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5 KQpAQCAtMSwzICsxLDE2IEBACisyMDA5LTA3LTIzICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFw cGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBXZWJDb3JlIGhhcyBhIGZldyBwbGFjZXMgdGhhdCBkb24ndCBncmFjZWZ1bGx5IGhhbmRsZSBh IG51bGwgcmVxdWVzdCByZXR1cm5lZCBmcm9tIHdpbGxTZW5kUmVxdWVzdC4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3NTk1CisKKyAgICAgICAgKiBo dHRwL3Rlc3RzL21pc2MvcmVzb3VyY2VzL3JlZGlyZWN0LXRvLWh0dHAtdXJsLnBocDogQWRkZWQu CisgICAgICAgICogaHR0cC90ZXN0cy9taXNjL3dpbGwtc2VuZC1yZXF1ZXN0LXJldHVybnMtbnVs bC1vbi1yZWRpcmVjdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMv bWlzYy93aWxsLXNlbmQtcmVxdWVzdC1yZXR1cm5zLW51bGwtb24tcmVkaXJlY3QuaHRtbDogQWRk ZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1NraXBwZWQ6CisgICAgICAgICogcGxhdGZvcm0v cXQvU2tpcHBlZDoKKwogMjAwOS0wNy0yMyAgUGllcnJlIGQnSGVyYmVtb250ICA8cGRoZXJiZW1v bnRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZyYXNlci4KSW5kZXg6 IExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWlzYy93aWxsLXNlbmQtcmVxdWVzdC1yZXR1cm5zLW51 bGwtb24tcmVkaXJlY3QtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0 dHAvdGVzdHMvbWlzYy93aWxsLXNlbmQtcmVxdWVzdC1yZXR1cm5zLW51bGwtb24tcmVkaXJlY3Qt ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9taXNj L3dpbGwtc2VuZC1yZXF1ZXN0LXJldHVybnMtbnVsbC1vbi1yZWRpcmVjdC1leHBlY3RlZC50eHQJ KHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNyBAQAoraHR0cDovLzEyNy4wLjAuMTo4MDAwL21pc2Mv cmVzb3VyY2VzL3JlZGlyZWN0LXRvLWh0dHAtdXJsLnBocCAtIHdpbGxTZW5kUmVxdWVzdCA8TlNV UkxSZXF1ZXN0IFVSTCBodHRwOi8vMTI3LjAuMC4xOjgwMDAvbWlzYy9yZXNvdXJjZXMvcmVkaXJl Y3QtdG8taHR0cC11cmwucGhwLCBtYWluIGRvY3VtZW50IFVSTCBodHRwOi8vMTI3LjAuMC4xOjgw MDAvbWlzYy93aWxsLXNlbmQtcmVxdWVzdC1yZXR1cm5zLW51bGwtb24tcmVkaXJlY3QuaHRtbD4g cmVkaXJlY3RSZXNwb25zZSAobnVsbCkKKzx1bmtub3duPiAtIGRpZEZpbmlzaExvYWRpbmcKK2h0 dHA6Ly8xMjcuMC4wLjE6ODAwMC9taXNjL3Jlc291cmNlcy9yZWRpcmVjdC10by1odHRwLXVybC5w aHAgLSB3aWxsU2VuZFJlcXVlc3QgPE5TVVJMUmVxdWVzdCBVUkwgaHR0cDovL3d3dy5leGFtcGxl LmNvbS8sIG1haW4gZG9jdW1lbnQgVVJMIGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9taXNjL3dpbGwt c2VuZC1yZXF1ZXN0LXJldHVybnMtbnVsbC1vbi1yZWRpcmVjdC5odG1sPiByZWRpcmVjdFJlc3Bv bnNlIDxOU1VSTFJlc3BvbnNlIGh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9taXNjL3Jlc291cmNlcy9y ZWRpcmVjdC10by1odHRwLXVybC5waHA+CitSZXR1cm5pbmcgbnVsbCBmb3IgdGhpcyByZWRpcmVj dAoraHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTI3NTk1CitUaGlzIHRl c3QgY2hlY2tzIHRvIG1ha2Ugc3VyZSB0aGF0IHRoaW5ncyBiZWhhdmUgYXMgZXhwZWN0ZWQgd2hl biB0aGUgcmVzb3VyY2UgbG9hZCBkZWxlZ2F0ZSByZXR1cm5zIG51bGwgaW4gcmVzcG9uc2UgdG8g d2lsbFNlbmRSZXF1ZXN0LgorCkluZGV4OiBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21pc2Mvd2ls bC1zZW5kLXJlcXVlc3QtcmV0dXJucy1udWxsLW9uLXJlZGlyZWN0Lmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9taXNjL3dpbGwtc2VuZC1yZXF1ZXN0LXJldHVybnMt bnVsbC1vbi1yZWRpcmVjdC5odG1sCShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9taXNjL3dpbGwtc2VuZC1yZXF1ZXN0LXJldHVybnMtbnVsbC1vbi1yZWRpcmVjdC5odG1s CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDE4IEBACis8aHRtbD4NCis8aGVhZD4NCis8c2NyaXB0 Pg0KKw0KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRyb2xsZXIpIHsNCisJbGF5b3V0VGVzdENv bnRyb2xsZXIuZHVtcEFzVGV4dCgpOw0KKwlsYXlvdXRUZXN0Q29udHJvbGxlci5kdW1wUmVzb3Vy Y2VMb2FkQ2FsbGJhY2tzKHRydWUpOw0KKwlsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRXaWxsU2Vu ZFJlcXVlc3RSZXR1cm5zTnVsbE9uUmVkaXJlY3QodHJ1ZSk7DQorfQ0KKw0KKzwvc2NyaXB0Pg0K KzwvaGVhZD4NCis8Ym9keT4NCitodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9Mjc1OTU8YnI+DQorVGhpcyB0ZXN0IGNoZWNrcyB0byBtYWtlIHN1cmUgdGhhdCB0aGluZ3Mg YmVoYXZlIGFzIGV4cGVjdGVkIHdoZW4gdGhlIHJlc291cmNlIGxvYWQgZGVsZWdhdGUgcmV0dXJu cyBudWxsIGluIHJlc3BvbnNlIHRvIHdpbGxTZW5kUmVxdWVzdC48YnI+DQorPGlmcmFtZSBzcmM9 InJlc291cmNlcy9yZWRpcmVjdC10by1odHRwLXVybC5waHAiPjwvaWZyYW1lPg0KKzwvYm9keT4N Cis8L2h0bWw+DQpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9taXNjL3Jlc291cmNlcy9y ZWRpcmVjdC10by1odHRwLXVybC5waHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9taXNjL3Jlc291cmNlcy9yZWRpcmVjdC10by1odHRwLXVybC5waHAJKHJldmlzaW9uIDAp CisrKyBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21pc2MvcmVzb3VyY2VzL3JlZGlyZWN0LXRvLWh0 dHAtdXJsLnBocAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw0IEBACis8P3BocAorICAgIGhlYWRl cignTG9jYXRpb246IGh0dHA6Ly93d3cuZXhhbXBsZS5jb20vJyk7CisgICAgaGVhZGVyKCdIVFRQ LzEuMCAzMDIgRm91bmQnKTsKKz8+CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tp cHBlZAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAkocmV2 aXNpb24gNDYzMDMpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAkod29ya2lu ZyBjb3B5KQpAQCAtNTk3MiwzICs1OTcyLDcgQEAgaHR0cC90ZXN0cy9zZWN1cml0eS9pc29sYXRl ZFdvcmxkL251bWJlcgogaHR0cC90ZXN0cy9zZWN1cml0eS9pc29sYXRlZFdvcmxkL29iamVjdC1w cm90b3R5cGUuaHRtbAogaHR0cC90ZXN0cy9zZWN1cml0eS9pc29sYXRlZFdvcmxkL3N0cmluZy1w cm90b3R5cGUuaHRtbAogaHR0cC90ZXN0cy9zZWN1cml0eS9pc29sYXRlZFdvcmxkL3dpbmRvdy1w cm9wZXJ0aWVzLmh0bWwKKworIyBNaXNzaW5nIERSVCBhYmlsaXR5IHJldHVybiBhIG51bGwgcmVx dWVzdCBmb3Igd2lsbFNlbmRSZXF1ZXN0IHJlZGlyZWN0IGNhbGxzCitodHRwL3Rlc3RzL21pc2Mv d2lsbC1zZW5kLXJlcXVlc3QtcmV0dXJucy1udWxsLW9uLXJlZGlyZWN0Lmh0bWwKKwpJbmRleDog TGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkCShyZXZpc2lvbiA0NjMwMykKKysrIExheW91dFRlc3RzL3Bs YXRmb3JtL3F0L1NraXBwZWQJKHdvcmtpbmcgY29weSkKQEAgLTUxMTksMyArNTExOSw2IEBAIGh0 dHAvdGVzdHMvc2VjdXJpdHkvaXNvbGF0ZWRXb3JsZC9udW1iZXIKIGh0dHAvdGVzdHMvc2VjdXJp dHkvaXNvbGF0ZWRXb3JsZC9vYmplY3QtcHJvdG90eXBlLmh0bWwKIGh0dHAvdGVzdHMvc2VjdXJp dHkvaXNvbGF0ZWRXb3JsZC9zdHJpbmctcHJvdG90eXBlLmh0bWwKIGh0dHAvdGVzdHMvc2VjdXJp dHkvaXNvbGF0ZWRXb3JsZC93aW5kb3ctcHJvcGVydGllcy5odG1sCisKKyMgTWlzc2luZyBEUlQg YWJpbGl0eSByZXR1cm4gYSBudWxsIHJlcXVlc3QgZm9yIHdpbGxTZW5kUmVxdWVzdCByZWRpcmVj dCBjYWxscworaHR0cC90ZXN0cy9taXNjL3dpbGwtc2VuZC1yZXF1ZXN0LXJldHVybnMtbnVsbC1v bi1yZWRpcmVjdC5odG1sCg==