46383 2010-09-23 12:01:11 -0700 Fix ResourceHandleWin::cancel() for network resources 2010-09-23 12:55:29 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) PC Windows XP RESOLVED FIXED P2 Normal --- 43712 1 paroga paroga aroben commit-queue oldest_to_newest 283818 0 paroga 2010-09-23 12:01:11 -0700 see patch 283820 1 68558 paroga 2010-09-23 12:04:43 -0700 Created attachment 68558 Patch 283842 2 68558 aroben 2010-09-23 12:22:14 -0700 Comment on attachment 68558 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68558&action=review > WebCore/platform/network/win/ResourceHandleWin.cpp:561 > + if (d->m_requestHandle) { > + d->m_internetHandle = 0; > + InternetCloseHandle(d->m_requestHandle); > + InternetCloseHandle(d->m_connectHandle); > + } else Do we need to clear out d->m_requestHandle, too? 283845 3 paroga 2010-09-23 12:25:31 -0700 (In reply to comment #2) > Do we need to clear out d->m_requestHandle, too? No, d->m_requestHandle indicates if it is a network request and won't be used after cancel(). 283864 4 aroben 2010-09-23 12:49:43 -0700 (In reply to comment #3) > (In reply to comment #2) > > Do we need to clear out d->m_requestHandle, too? > No, d->m_requestHandle indicates if it is a network request and won't be used after cancel(). That seems like a tricky rule to follow. Maybe we should have a separate member that indicates whether it's a network request or not? 283867 5 paroga 2010-09-23 12:52:41 -0700 (In reply to comment #4) > (In reply to comment #3) > > (In reply to comment #2) > > > Do we need to clear out d->m_requestHandle, too? > > No, d->m_requestHandle indicates if it is a network request and won't be used after cancel(). > > That seems like a tricky rule to follow. Maybe we should have a separate member that indicates whether it's a network request or not? Might be a good idea. Maybe we can address this when adding handling for data:// urls? 283873 6 68558 commit-queue 2010-09-23 12:55:24 -0700 Comment on attachment 68558 Patch Clearing flags on attachment: 68558 Committed r68184: <http://trac.webkit.org/changeset/68184> 283874 7 commit-queue 2010-09-23 12:55:29 -0700 All reviewed patches have been landed. Closing bug. 68558 2010-09-23 12:04:43 -0700 2010-09-23 12:55:23 -0700 Patch bug-46383.patch text/plain 2186 paroga ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZjIyODhiOC4uMWNhMWY3OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wOS0yMyAgUGF0cmljayBHYW5z dGVyZXIgIDxwYXJvZ2FAd2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBGaXggUmVzb3VyY2VIYW5kbGVXaW46OmNhbmNlbCgpIGZvciBu ZXR3b3JrIHJlc291cmNlcyAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTQ2MzgzCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJj ZUhhbmRsZVdpbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUhhbmRsZTo6b25SZXF1 ZXN0Q29tcGxldGUpOiBDaGVjayBpdCByZXF1ZXN0SGFuZGxlIGlzIG5vdCAwLgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VIYW5kbGU6OmNhbmNlbCk6IFNldCByZXF1ZXN0SGFuZGxlIHRvIDAu CisKIDIwMTAtMDktMjMgIFJlbmF0YSBIb2RvdmFuICA8cmVuaUBpbmYudS1zemVnZWQuaHU+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRGlyayBTY2h1bHplLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9w bGF0Zm9ybS9uZXR3b3JrL3dpbi9SZXNvdXJjZUhhbmRsZVdpbi5jcHAgYi9XZWJDb3JlL3BsYXRm b3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFuZGxlV2luLmNwcAppbmRleCA5Y2VlYmE4Li4yY2Yw MzljIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFu ZGxlV2luLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvd2luL1Jlc291cmNlSGFu ZGxlV2luLmNwcApAQCAtMzIzLDYgKzMyMywxMSBAQCB2b2lkIFJlc291cmNlSGFuZGxlOjpvblJl ZGlyZWN0KCkKIAogYm9vbCBSZXNvdXJjZUhhbmRsZTo6b25SZXF1ZXN0Q29tcGxldGUoKQogewor ICAgIGlmICghZC0+bV9pbnRlcm5ldEhhbmRsZSkgeyAvLyAwIGlmIGNhbmNlbGVkLgorICAgICAg ICBkZXJlZigpOyAvLyBiYWxhbmNlcyByZWYgaW4gc3RhcnQKKyAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIH0KKwogICAgIGlmIChkLT5tX2J5dGVzUmVtYWluaW5nVG9Xcml0ZSkgewogICAgICAg ICBEV09SRCBieXRlc1dyaXR0ZW47CiAgICAgICAgIEludGVybmV0V3JpdGVGaWxlKGQtPm1fcmVx dWVzdEhhbmRsZSwKQEAgLTU0OSwxNyArNTU0LDEyIEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OmZp bGVMb2FkVGltZXIoVGltZXI8UmVzb3VyY2VIYW5kbGU+KikKIAogdm9pZCBSZXNvdXJjZUhhbmRs ZTo6Y2FuY2VsKCkKIHsKLSAgICBpZiAoZC0+bV9yZXNvdXJjZUhhbmRsZSkKLSAgICAgICAgSW50 ZXJuZXRDbG9zZUhhbmRsZShkLT5tX3Jlc291cmNlSGFuZGxlKTsKLSAgICBlbHNlCisgICAgaWYg KGQtPm1fcmVxdWVzdEhhbmRsZSkgeworICAgICAgICBkLT5tX2ludGVybmV0SGFuZGxlID0gMDsK KyAgICAgICAgSW50ZXJuZXRDbG9zZUhhbmRsZShkLT5tX3JlcXVlc3RIYW5kbGUpOworICAgICAg ICBJbnRlcm5ldENsb3NlSGFuZGxlKGQtPm1fY29ubmVjdEhhbmRsZSk7CisgICAgfSBlbHNlCiAg ICAgICAgIGQtPm1fZmlsZUxvYWRUaW1lci5zdG9wKCk7Ci0KLSAgICBjbGllbnQoKS0+ZGlkRmlu aXNoTG9hZGluZyh0aGlzLCAwKTsgCi0KLSAgICBpZiAoIWQtPm1fcmVzb3VyY2VIYW5kbGUpCi0g ICAgICAgIC8vIEFzeW5jIGxvYWQgY2FuY2VsZWQgYmVmb3JlIHdlIGhhdmUgYSBoYW5kbGUgLS0g bWFyayBvdXJzZWx2ZXMgYXMgaW4gZXJyb3IsIHRvIGJlIGRlbGV0ZWQgbGF0ZXIuCi0gICAgICAg IC8vIEZJWE1FOiBuZWVkIHJlYWwgY2FuY2VsIGVycm9yCi0gICAgICAgIGNsaWVudCgpLT5kaWRG YWlsKHRoaXMsIFJlc291cmNlRXJyb3IoKSk7CiB9CiAKIHZvaWQgUmVzb3VyY2VIYW5kbGU6Omxv YWRSZXNvdXJjZVN5bmNocm9ub3VzbHkoTmV0d29ya2luZ0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgU3RvcmVkQ3JlZGVudGlhbHMgc3RvcmVkQ3JlZGVu dGlhbHMsIFJlc291cmNlRXJyb3ImIGVycm9yLCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSwg VmVjdG9yPGNoYXI+JiBkYXRhKQo=