96899 2012-09-17 00:27:45 -0700 [GTK] fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html failing after r128645 2012-09-17 23:56:08 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan mrobinson pnormand oldest_to_newest 721719 0 zan 2012-09-17 00:27:45 -0700 fast/loader/display-image-unset-can-block-image-and-can-reload-in-place.html is failing after introduced in r128645. http://trac.webkit.org/changeset/128645 --- /home/slave/webkitgtk/gtk-linux-64-release/build/layout-test-results/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place-expected.txt +++ /home/slave/webkitgtk/gtk-linux-64-release/build/layout-test-results/fast/loader/display-image-unset-can-block-image-and-can-reload-in-place-actual.txt @@ -1,3 +1,3 @@ Test that DisplayImages disabled can block http image and can be reloaded in-place when toggled. -SUCCESS +FAILURE: Image should not be loaded when DisplayImage is unset The test overrides WebKitDisplayImagesKey preference, but that's not yet supported. 722121 1 164428 zan 2012-09-17 11:46:25 -0700 Created attachment 164428 Patch 722186 2 164428 mrobinson 2012-09-17 12:46:10 -0700 Comment on attachment 164428 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164428&action=review > Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:707 > +void DumpRenderTreeSupportGtk::setLoadsImagesAutomatically(WebKitWebView* webView, bool enabled) > +{ > + core(webView)->settings()->setLoadsImagesAutomatically(enabled); > +} Why not just use the auto-load-images setting in WebKitWebSettings? 722189 3 164428 zan 2012-09-17 12:50:02 -0700 Comment on attachment 164428 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=164428&action=review >> Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp:707 >> +} > > Why not just use the auto-load-images setting in WebKitWebSettings? Ah, didn't see that when I was grepping. Of course, using that would be better. 722228 4 164449 zan 2012-09-17 13:43:35 -0700 Created attachment 164449 Patch 722237 5 164449 mrobinson 2012-09-17 13:49:56 -0700 Comment on attachment 164449 Patch Thanks! 722530 6 164449 zan 2012-09-17 23:56:03 -0700 Comment on attachment 164449 Patch Clearing flags on attachment: 164449 Committed r128854: <http://trac.webkit.org/changeset/128854> 722531 7 zan 2012-09-17 23:56:08 -0700 All reviewed patches have been landed. Closing bug. 164428 2012-09-17 11:46:25 -0700 2012-09-17 13:43:31 -0700 Patch bug-96899-20120917114554.patch text/plain 6989 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggNTdjYjk0YWJi ZDQ0M2ZiNzg3MzA0MTljMjljZmFlMzg4MjEyNGEwZi4uYWIwMWM3YmZlMjUzNjc3MjA4YWM3MTQw ODZhYzY1ZWRiMDg0ZGJiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEy LTA5LTE3ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisKKyAgICAgICAg W0dUS10gZmFzdC9sb2FkZXIvZGlzcGxheS1pbWFnZS11bnNldC1jYW4tYmxvY2staW1hZ2UtYW5k LWNhbi1yZWxvYWQtaW4tcGxhY2UuaHRtbCBmYWlsaW5nIGFmdGVyIHIxMjg2NDUKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2ODk5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGEgc3VwcG9ydCBtZXRo b2QgZm9yIG1hbmFnaW5nIHRoZSB2YWx1ZSBvZiB0aGUgYXV0b21hdGljIGltYWdlIGxvYWRpbmcg c2V0dGluZworICAgICAgICB0byB0aGUgRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrIGNsYXNzLgor CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrLmNwcDoK KyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0azo6c2V0TG9hZHNJbWFnZXNBdXRvbWF0 aWNhbGx5KToKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRH dGsuaDoKKyAgICAgICAgKER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0ayk6CisKIDIwMTItMDktMTQg IFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KIAogICAgICAgICBbR1RLXSBD bGVhciBhcHBsaWNhdGlvbiBjYWNoZSBiZXR3ZWVuIHRlc3RzIGluIER1bXBSZW5kZXJUcmVlCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJl ZVN1cHBvcnRHdGsuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRHVtcFJl bmRlclRyZWVTdXBwb3J0R3RrLmNwcAppbmRleCBlNWQ2OTg5ZDFkOTU3NTM3MjY2NDM4NjI4NzAz MWJlMTgyYjkxOThkLi4zMWVkOTNmMDA3NGQ3MzFhMDYzZGI0MWU0NjkzZjVlZTcwOWY0YTdjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1wUmVuZGVyVHJl ZVN1cHBvcnRHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0R1 bXBSZW5kZXJUcmVlU3VwcG9ydEd0ay5jcHAKQEAgLTcwMSw2ICs3MDEsMTEgQEAgdm9pZCBEdW1w UmVuZGVyVHJlZVN1cHBvcnRHdGs6OnNldENTU1JlZ2lvbnNFbmFibGVkKFdlYktpdFdlYlZpZXcq IHdlYlZpZXcsIGJvb2wKICAgICBjb3JlKHdlYlZpZXcpLT5zZXR0aW5ncygpLT5zZXRDU1NSZWdp b25zRW5hYmxlZChlbmFibGVkKTsKIH0KIAordm9pZCBEdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGs6 OnNldExvYWRzSW1hZ2VzQXV0b21hdGljYWxseShXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBib29s IGVuYWJsZWQpCit7CisgICAgY29yZSh3ZWJWaWV3KS0+c2V0dGluZ3MoKS0+c2V0TG9hZHNJbWFn ZXNBdXRvbWF0aWNhbGx5KGVuYWJsZWQpOworfQorCiBib29sIER1bXBSZW5kZXJUcmVlU3VwcG9y dEd0azo6ZWxlbWVudERvZXNBdXRvQ29tcGxldGVGb3JFbGVtZW50V2l0aElkKFdlYktpdFdlYkZy YW1lKiBmcmFtZSwgSlNTdHJpbmdSZWYgaWQpCiB7CiAgICAgRnJhbWUqIGNvcmVGcmFtZSA9IGNv cmUoZnJhbWUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQv RHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrLmggYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGsuaAppbmRleCAzNzUwMjBkN2I5NDFhMTdhZTQ4 NWFlNzM2ZWY2ODQ4NjBjODk4MjRkLi5jM2Y3OGM4MWI0MDkxNTY3MjViYWMyMDg4YjY0MmFkNGYw YjhjYTY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3VwcG9ydC9EdW1w UmVuZGVyVHJlZVN1cHBvcnRHdGsuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9XZWJDb3JlU3Vw cG9ydC9EdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGsuaApAQCAtMTE3LDYgKzExNyw3IEBAIHB1Ymxp YzoKICAgICBzdGF0aWMgdm9pZCBzZXRQYWdlQ2FjaGVTdXBwb3J0c1BsdWdpbnMoV2ViS2l0V2Vi VmlldyosIGJvb2wgZW5hYmxlZCk7CiAgICAgc3RhdGljIHZvaWQgc2V0Q1NTR3JpZExheW91dEVu YWJsZWQoV2ViS2l0V2ViVmlldyosIGJvb2wgZW5hYmxlZCk7CiAgICAgc3RhdGljIHZvaWQgc2V0 Q1NTUmVnaW9uc0VuYWJsZWQoV2ViS2l0V2ViVmlldyosIGJvb2wgZW5hYmxlZCk7CisgICAgc3Rh dGljIHZvaWQgc2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KFdlYktpdFdlYlZpZXcqLCBib29s IGVuYWJsZWQpOwogCiAgICAgc3RhdGljIHZvaWQgZGVsaXZlckFsbE11dGF0aW9uc0lmTmVjZXNz YXJ5KCk7CiAgICAgc3RhdGljIHZvaWQgc2V0RG9tYWluUmVsYXhhdGlvbkZvcmJpZGRlbkZvclVS TFNjaGVtZShib29sIGZvcmJpZGRlbiwgY29uc3QgY2hhciogdXJsU2NoZW1lKTsKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjMzNhZmIxNjVmNTRk MzVlZmVlYTViNzgzYWJhOGVjODEyNTA0NDQzLi40ZTA0MTMwYzczZDk1Njg0MzdkZjk1NWRiZWNi YTAwNGJjZmNmMzI0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDktMTcgIFphbiBEb2JlcnNlayAgPHphbmRv YmVyc2VrQGdtYWlsLmNvbT4KKworICAgICAgICBbR1RLXSBmYXN0L2xvYWRlci9kaXNwbGF5LWlt YWdlLXVuc2V0LWNhbi1ibG9jay1pbWFnZS1hbmQtY2FuLXJlbG9hZC1pbi1wbGFjZS5odG1sIGZh aWxpbmcgYWZ0ZXIgcjEyODY0NQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9OTY4OTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZGQgc3VwcG9ydCBmb3Igb3ZlcnJpZGluZyB0aGUgJ1dlYktpdERpc3BsYXlJ bWFnZXNLZXknIHByZWZlcmVuY2UgYnkKKyAgICAgICAgY2FsbGluZyB0aGUgbmV3IER1bXBSZW5k ZXJUcmVlU3VwcG9ydEd0ayBtZXRob2QgdGhhdCBlbmFibGVzIG9yIGRpc2FibGVzCisgICAgICAg IGF1dG9tYXRpYyBpbWFnZSBsb2FkaW5nLiBXaGVuIHJlc2V0dGluZyB0byBkZWZhdWx0cywgdGhp cyBtZXRob2QgaXMgY2FsbGVkCisgICAgICAgIGFzIHdlbGwsIHNldHRpbmcgdGhlIG9wdGlvbiB0 byB0cnVlIGJ5IGRlZmF1bHQuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJl bmRlclRyZWUuY3BwOgorICAgICAgICAocmVzZXREZWZhdWx0c1RvQ29uc2lzdGVudFZhbHVlcyk6 CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL1Rlc3RSdW5uZXJHdGsuY3BwOgorICAgICAg ICAoVGVzdFJ1bm5lcjo6b3ZlcnJpZGVQcmVmZXJlbmNlKToKKwogMjAxMi0wOS0xNCAgRGlyayBQ cmFua2UgIDxkcHJhbmtlQGNocm9taXVtLm9yZz4KIAogICAgICAgICBucnd0OiAtLWFkZGl0aW9u YWwtcGxhdGZvcm0tZGlyIGlzIGJyb2tlbiBvbiBjaHJvbWl1bSBwb3J0cwpkaWZmIC0tZ2l0IGEv VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcCBiL1Rvb2xzL0R1bXBS ZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKaW5kZXggZWVjYWRlOTdjN2NjYTMwNTc1 ZWQ4ZTQ3NTcyMGRkYThjZTk4MzNiOC4uZDQyMDU4M2NhOTRmNWY5YzJiOWMwMWQ3NmYxYzU5Y2Qw MWI4ZWUyNiAxMDA2NDQKLS0tIGEvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJU cmVlLmNwcAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3Bw CkBAIC01MTYsNiArNTE2LDcgQEAgc3RhdGljIHZvaWQgcmVzZXREZWZhdWx0c1RvQ29uc2lzdGVu dFZhbHVlcygpCiAKICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGs6OnNldENTU0dyaWRMYXlv dXRFbmFibGVkKHdlYlZpZXcsIGZhbHNlKTsKICAgICBEdW1wUmVuZGVyVHJlZVN1cHBvcnRHdGs6 OnNldENTU1JlZ2lvbnNFbmFibGVkKHdlYlZpZXcsIHRydWUpOworICAgIER1bXBSZW5kZXJUcmVl U3VwcG9ydEd0azo6c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KHdlYlZpZXcsIHRydWUpOwog fQogCiBzdGF0aWMgYm9vbCB1c2VMb25nUnVubmluZ1NlcnZlck1vZGUoaW50IGFyZ2MsIGNoYXIg KmFyZ3ZbXSkKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9UZXN0UnVubmVy R3RrLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9UZXN0UnVubmVyR3RrLmNwcAppbmRl eCAzNGQyY2M4YzA1OThkMWMwODc5OWMyM2VhNmNmNzgxMmIyMTYxMzAzLi42NzYzMTRlNDEyOGYx Njg4ZGZiZWFmNTNhNGQ0YTYzYWRhYmVlMmIzIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVy VHJlZS9ndGsvVGVzdFJ1bm5lckd0ay5jcHAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3Rr L1Rlc3RSdW5uZXJHdGsuY3BwCkBAIC03ODgsNiArNzg4LDkgQEAgdm9pZCBUZXN0UnVubmVyOjpv dmVycmlkZVByZWZlcmVuY2UoSlNTdHJpbmdSZWYga2V5LCBKU1N0cmluZ1JlZiB2YWx1ZSkKICAg ICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFsKG9yaWdpbmFsTmFtZS5nZXQoKSwgIldlYktpdENTU1Jl Z2lvbnNFbmFibGVkIikpIHsKICAgICAgICAgRHVtcFJlbmRlclRyZWVTdXBwb3J0R3RrOjpzZXRD U1NSZWdpb25zRW5hYmxlZCh3ZWJraXRfd2ViX2ZyYW1lX2dldF93ZWJfdmlldyhtYWluRnJhbWUp LCBib29sZWFuRnJvbVZhbHVlKHZhbHVlQXNTdHJpbmcuZ2V0KCkpKTsKICAgICAgICAgcmV0dXJu OworICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwob3JpZ2luYWxOYW1lLmdldCgpLCAiV2ViS2l0 RGlzcGxheUltYWdlc0tleSIpKSB7CisgICAgICAgIER1bXBSZW5kZXJUcmVlU3VwcG9ydEd0azo6 c2V0TG9hZHNJbWFnZXNBdXRvbWF0aWNhbGx5KHdlYmtpdF93ZWJfZnJhbWVfZ2V0X3dlYl92aWV3 KG1haW5GcmFtZSksIGJvb2xlYW5Gcm9tVmFsdWUodmFsdWVBc1N0cmluZy5nZXQoKSkpOworICAg ICAgICByZXR1cm47CiAgICAgfSBlbHNlIHsKICAgICAgICAgZnByaW50ZihzdGRlcnIsICJUZXN0 UnVubmVyOjpvdmVycmlkZVByZWZlcmVuY2UgdHJpZWQgdG8gb3ZlcnJpZGUgIgogICAgICAgICAg ICAgICAgICJ1bmtub3duIHByZWZlcmVuY2UgJyVzJy5cbiIsIG9yaWdpbmFsTmFtZS5nZXQoKSk7 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggZTBmNTIwMmQxY2Y1NmQyYzdjYTYxODc0ODBmMDA3NzZkODM1MDVkMS4uYTMyZjE2 MDJkNWQ4MWFhYTk4MGJkMmIzMTM1NzM4MTRmODczODZmNSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBA CisyMDEyLTA5LTE3ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisKKyAg ICAgICAgW0dUS10gZmFzdC9sb2FkZXIvZGlzcGxheS1pbWFnZS11bnNldC1jYW4tYmxvY2staW1h Z2UtYW5kLWNhbi1yZWxvYWQtaW4tcGxhY2UuaHRtbCBmYWlsaW5nIGFmdGVyIHIxMjg2NDUKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2ODk5CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGZhaWx1 cmUgZXhwZWN0YXRpb24gZm9yIHRoZSB0ZXN0IGluIHRpdGxlLgorCisgICAgICAgICogcGxhdGZv cm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTItMDktMTcgIEFsZWphbmRybyBQacOxZWly byAgPGFwaW5oZWlyb0BpZ2FsaWEuY29tPgogCiAgICAgICAgIEFYOiBSZWdyZXNzaW9uIChyMTI2 MzY5KSAtIHRvZ2dsZSBidXR0b25zIG5vIGxvbmdlciByZXR1cm4gYWNjZXNzaWJsZSB0aXRsZXMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggOTdmNGQ1ZDIx ZmFmNzZjOGZjMTA2Y2Y0YWZlZGZjMmUwYzY3MDRlYi4uYmI4MTk1NWI2ZDVjOGQwMDZkMDg4ZGQ2 NzFhMTkwMDI4ZjdiYjdlNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rl c3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3Rh dGlvbnMKQEAgLTEzNTgsOCArMTM1OCw2IEBAIEJVR1dLNzMwMDMgREVCVUcgOiBlZGl0aW5nL3Nw ZWxsaW5nL3NwZWxsY2hlY2stYXN5bmMuaHRtbCA9IFRFWFQKIEJVR1dLNzMwMDMgREVCVUcgOiBl ZGl0aW5nL3NwZWxsaW5nL3NwZWxsY2hlY2stcGFzdGUuaHRtbCA9IFBBU1MKIEJVR1dLNTA3NDAg REVCVUcgOiBlZGl0aW5nL3NwZWxsaW5nL3NwZWxsY2hlY2stcXVldWUuaHRtbCA9IFRFWFQKIAot QlVHV0s5Njg5OSA6IGZhc3QvbG9hZGVyL2Rpc3BsYXktaW1hZ2UtdW5zZXQtY2FuLWJsb2NrLWlt YWdlLWFuZC1jYW4tcmVsb2FkLWluLXBsYWNlLmh0bWwgPSBURVhUCi0KIEJVR1dLOTY5MDAgOiBm YXN0L3RleHQvc3RhbGUtVGV4dExheW91dC1mcm9tLWZpcnN0LWxpbmUuaHRtbCA9IElNQUdFCiAK IC8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwo= 164449 2012-09-17 13:43:35 -0700 2012-09-17 23:56:03 -0700 Patch bug-96899-20120917134304.patch text/plain 3348 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4Nzk0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjRiMmJmMGU5OTBmM2Q4YWY5MTBkNjNhYTczZDFlZjQz ODJiOGI4Ni4uZTc5ZGZhZjA0ZjZjZjRhNWYzNGJhODc0ZGEzMTQ1Y2VkMDFhMDY0ZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDEyLTA5LTE3ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisK KyAgICAgICAgW0dUS10gZmFzdC9sb2FkZXIvZGlzcGxheS1pbWFnZS11bnNldC1jYW4tYmxvY2st aW1hZ2UtYW5kLWNhbi1yZWxvYWQtaW4tcGxhY2UuaHRtbCBmYWlsaW5nIGFmdGVyIHIxMjg2NDUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2ODk5CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2hlbiBvdmVy cmlkaW5nIHRoZSAnV2ViS2l0RGlzcGxheUltYWdlS2V5JyBwcmVmZXJlbmNlLCB1c2UgdGhlCisg ICAgICAgICdhdXRvLWxvYWQtaW1hZ2VzJyBwcm9wZXJ0eSBvZiBXZWJLaXRXZWJTZXR0aW5ncyBh cyB0aGUgcHJvcGVydHkgd2hpY2gKKyAgICAgICAgc2hvdWxkIGJlIHVwZGF0ZWQgd2l0aCB0aGUg Y29ycmVzcG9uZGluZyBwcmVmZXJlbmNlIHZhbHVlLgorCisgICAgICAgICogRHVtcFJlbmRlclRy ZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKHJlc2V0RGVmYXVsdHNUb0NvbnNp c3RlbnRWYWx1ZXMpOgorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2d0ay9UZXN0UnVubmVyR3Rr LmNwcDoKKyAgICAgICAgKFRlc3RSdW5uZXI6Om92ZXJyaWRlUHJlZmVyZW5jZSk6CisKIDIwMTIt MDktMTcgIFJpY2sgQnllcnMgIDxyYnllcnNAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFkZCBo YW5kbGluZyBvZiBuZXcgR2VzdHVyZVRhcENhbmNlbCBpbiBEUlQKZGlmZiAtLWdpdCBhL1Rvb2xz L0R1bXBSZW5kZXJUcmVlL2d0ay9UZXN0UnVubmVyR3RrLmNwcCBiL1Rvb2xzL0R1bXBSZW5kZXJU cmVlL2d0ay9UZXN0UnVubmVyR3RrLmNwcAppbmRleCAzNGQyY2M4YzA1OThkMWMwODc5OWMyM2Vh NmNmNzgxMmIyMTYxMzAzLi4wOTI5Y2FkZjYyMTczYTljZTljOWM5MzFlYjQ3MjZkOGMwZGYxYWE2 IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9ndGsvVGVzdFJ1bm5lckd0ay5jcHAK KysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL1Rlc3RSdW5uZXJHdGsuY3BwCkBAIC03NzYs NiArNzc2LDggQEAgdm9pZCBUZXN0UnVubmVyOjpvdmVycmlkZVByZWZlcmVuY2UoSlNTdHJpbmdS ZWYga2V5LCBKU1N0cmluZ1JlZiB2YWx1ZSkKICAgICAgICAgcHJvcGVydHlOYW1lID0gImVuYWJs ZS13ZWJnbCI7CiAgICAgZWxzZSBpZiAoZ19zdHJfZXF1YWwob3JpZ2luYWxOYW1lLmdldCgpLCAi V2ViS2l0V2ViQXVkaW9FbmFibGVkIikpCiAgICAgICAgIHByb3BlcnR5TmFtZSA9ICJlbmFibGUt d2ViYXVkaW8iOworICAgIGVsc2UgaWYgKGdfc3RyX2VxdWFsKG9yaWdpbmFsTmFtZS5nZXQoKSwg IldlYktpdERpc3BsYXlJbWFnZXNLZXkiKSkKKyAgICAgICAgcHJvcGVydHlOYW1lID0gImF1dG8t bG9hZC1pbWFnZXMiOwogICAgIGVsc2UgaWYgKGdfc3RyX2VxdWFsKG9yaWdpbmFsTmFtZS5nZXQo KSwgIldlYktpdFRhYlRvTGlua3NQcmVmZXJlbmNlS2V5IikpIHsKICAgICAgICAgRHVtcFJlbmRl clRyZWVTdXBwb3J0R3RrOjpzZXRMaW5rc0luY2x1ZGVkSW5Gb2N1c0NoYWluKGJvb2xlYW5Gcm9t VmFsdWUodmFsdWVBc1N0cmluZy5nZXQoKSkpOwogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggOGY3 OTI1ZGFhOGQ5YjYxNDlkZjBhYTI3YjBkMDBjYjE0MjhmYmU5Yy4uZjlhZmU3NzliYTI1OTU4MjJi NGMwYmMzYTg3ZDAwOTU3NmZiNzFjZiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA5LTE3 ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisKKyAgICAgICAgW0dUS10g ZmFzdC9sb2FkZXIvZGlzcGxheS1pbWFnZS11bnNldC1jYW4tYmxvY2staW1hZ2UtYW5kLWNhbi1y ZWxvYWQtaW4tcGxhY2UuaHRtbCBmYWlsaW5nIGFmdGVyIHIxMjg2NDUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2ODk5CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIGZhaWx1cmUgZXhwZWN0YXRp b24gZm9yIHRoZSB0ZXN0IGluIHRpdGxlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3RrL1Rlc3RF eHBlY3RhdGlvbnM6CisKIDIwMTItMDktMTcgIEFsZXhleSBQcm9za3VyeWFrb3YgIDxhcEBhcHBs ZS5jb20+CiAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk2OTQyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0 aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDk3 ZjRkNWQyMWZhZjc2YzhmYzEwNmNmNGFmZWRmYzJlMGM2NzA0ZWIuLmJiODE5NTViNmQ1YzhkMDA2 ZDA4OGRkNjcxYTE5MDAyOGY3YmI3ZTcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0 RXhwZWN0YXRpb25zCkBAIC0xMzU4LDggKzEzNTgsNiBAQCBCVUdXSzczMDAzIERFQlVHIDogZWRp dGluZy9zcGVsbGluZy9zcGVsbGNoZWNrLWFzeW5jLmh0bWwgPSBURVhUCiBCVUdXSzczMDAzIERF QlVHIDogZWRpdGluZy9zcGVsbGluZy9zcGVsbGNoZWNrLXBhc3RlLmh0bWwgPSBQQVNTCiBCVUdX SzUwNzQwIERFQlVHIDogZWRpdGluZy9zcGVsbGluZy9zcGVsbGNoZWNrLXF1ZXVlLmh0bWwgPSBU RVhUCiAKLUJVR1dLOTY4OTkgOiBmYXN0L2xvYWRlci9kaXNwbGF5LWltYWdlLXVuc2V0LWNhbi1i bG9jay1pbWFnZS1hbmQtY2FuLXJlbG9hZC1pbi1wbGFjZS5odG1sID0gVEVYVAotCiBCVUdXSzk2 OTAwIDogZmFzdC90ZXh0L3N0YWxlLVRleHRMYXlvdXQtZnJvbS1maXJzdC1saW5lLmh0bWwgPSBJ TUFHRQogCiAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8K