126291 2013-12-30 08:10:24 -0800 [SOUP] Implement ResourceHandle::continueWillSendRequest() 2013-12-31 00:26:54 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Soup P2 Normal --- 126290 126114 1 cgarcia webkit-unassigned danw gustavo svillar oldest_to_newest 963322 0 cgarcia 2013-12-30 08:10:24 -0800 This is needed to support willSendRequest() after a redirection when using network process. $ WEBKIT_USE_NETWORK_PROCESS=1 Programs/WebKit2APITests/TestResources -p /webkit2/WebKitWebPage/send-request /webkit2/WebKitWebPage/send-request: ** ERROR:../../Source/WebKit2/UIProcess/API/gtk/tests/TestResources.cpp:585:virtual void SendRequestTest::resourceFailed(WebKitWebResource*, GError*): assertion failed (webkit_web_resource_get_uri(resource) == m_expectedCancelledResourceURI.data()): ("http://127.0.0.1:41610/javascript.js" == "http://127.0.0.1:41610/cancel-this.js") This is the result of the test after applying patch attached to bug #126290 963323 1 220110 cgarcia 2013-12-30 08:13:09 -0800 Created attachment 220110 Patch 963324 2 cgarcia 2013-12-30 08:13:46 -0800 $ WEBKIT_USE_NETWORK_PROCESS=1 Programs/WebKit2APITests/TestResources -p /webkit2/WebKitWebPage/send-request /webkit2/WebKitWebPage/send-request: OK 963490 3 cgarcia 2013-12-31 00:26:54 -0800 Committed r161177: <http://trac.webkit.org/changeset/161177> 220110 2013-12-30 08:13:09 -0800 2013-12-30 08:37:27 -0800 Patch wk2-soup-continue-will-send-request.diff text/plain 3267 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBjNDAwOWUzLi42NjdiM2Y1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAg QEAKIDIwMTMtMTItMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtTT1VQXSBJbXBsZW1lbnQgUmVzb3VyY2VIYW5kbGU6OmNvbnRpbnVlV2ls bFNlbmRSZXF1ZXN0KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNjI5MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpjb250aW51ZUFmdGVyV2lsbFNlbmRSZXF1ZXN0KTogSGVscGVyIGZ1 bmN0aW9uIHRoYXQKKyAgICAgICAgY29udGludWVzIHdpdGggdGhlIGxvYWQgYWZ0ZXIgd2lsbFNl bmRSZXF1ZXN0IGhhcyBiZWVuIGNhbGxlZC4KKyAgICAgICAgKFdlYkNvcmU6OmRvUmVkaXJlY3Qp OiBDYWxsIGNvbnRpbnVlQWZ0ZXJXaWxsU2VuZFJlcXVlc3QoKSB3aGVuCisgICAgICAgIGNsaWVu dCBkb2Vzbid0IHVzZSBhc3luYyBjYWxsYmFja3MuCisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJj ZUhhbmRsZTo6Y29udGludWVXaWxsU2VuZFJlcXVlc3QpOiBDYWxsCisgICAgICAgIGNvbnRpbnVl QWZ0ZXJXaWxsU2VuZFJlcXVlc3QoKS4KKworMjAxMy0xMi0zMCAgQ2FybG9zIEdhcmNpYSBDYW1w b3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CisKICAgICAgICAgW1NPVVBdIHdpbGxTZW5kUmVxdWVz dCBkb2Vzbid0IHdvcmsgYWZ0ZXIgYSByZWRpcmVjdAogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MjkwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKaW5k ZXggNzNlYzkwNi4uNzE5MGI4MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9zb3VwL1Jlc291cmNlSGFuZGxlU291cC5jcHAKQEAgLTQ1NSw2ICs0 NTUsMjAgQEAgc3RhdGljIGJvb2wgc2hvdWxkUmVkaXJlY3RBc0dFVChTb3VwTWVzc2FnZSogbWVz c2FnZSwgVVJMJiBuZXdVUkwsIGJvb2wgY3Jvc3NPcmkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK K3N0YXRpYyB2b2lkIGNvbnRpbnVlQWZ0ZXJXaWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VIYW5kbGUq IGhhbmRsZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0KQoreworICAgIC8vIHdp bGxTZW5kUmVxdWVzdCBtaWdodCBjYW5jZWwgdGhlIGxvYWQuCisgICAgaWYgKGhhbmRsZS0+Y2Fu Y2VsbGVkT3JDbGllbnRsZXNzKCkpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICghY3JlYXRl U291cFJlcXVlc3RBbmRNZXNzYWdlRm9ySGFuZGxlKGhhbmRsZSwgbmV3UmVxdWVzdCwgdHJ1ZSkp IHsKKyAgICAgICAgaGFuZGxlLT5nZXRJbnRlcm5hbCgpLT5jbGllbnQoKS0+Y2Fubm90U2hvd1VS TChoYW5kbGUpOworICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaGFuZGxlLT5zZW5kUGVu ZGluZ1JlcXVlc3QoKTsKK30KKwogc3RhdGljIHZvaWQgZG9SZWRpcmVjdChSZXNvdXJjZUhhbmRs ZSogaGFuZGxlKQogewogICAgIFJlc291cmNlSGFuZGxlSW50ZXJuYWwqIGQgPSBoYW5kbGUtPmdl dEludGVybmFsKCk7CkBAIC01MDYsMjMgKzUyMCwxNSBAQCBzdGF0aWMgdm9pZCBkb1JlZGlyZWN0 KFJlc291cmNlSGFuZGxlKiBoYW5kbGUpCiAgICAgLy8gdGhlIFdlYktpdCBsYXllci4gVGhleSB3 ZXJlIG9ubHkgcGxhY2VkIGluIHRoZSBVUkwgZm9yIHRoZSBiZW5lZml0IG9mIGxpYnNvdXAuCiAg ICAgbmV3UmVxdWVzdC5yZW1vdmVDcmVkZW50aWFscygpOwogCisgICAgY2xlYW51cFNvdXBSZXF1 ZXN0T3BlcmF0aW9uKGhhbmRsZSk7CisKICAgICBpZiAoZC0+Y2xpZW50KCktPnVzZXNBc3luY0Nh bGxiYWNrcygpKQogICAgICAgICBkLT5jbGllbnQoKS0+d2lsbFNlbmRSZXF1ZXN0QXN5bmMoaGFu ZGxlLCBuZXdSZXF1ZXN0LCBkLT5tX3Jlc3BvbnNlKTsKLSAgICBlbHNlCisgICAgZWxzZSB7CiAg ICAgICAgIGQtPmNsaWVudCgpLT53aWxsU2VuZFJlcXVlc3QoaGFuZGxlLCBuZXdSZXF1ZXN0LCBk LT5tX3Jlc3BvbnNlKTsKLQotICAgIGNsZWFudXBTb3VwUmVxdWVzdE9wZXJhdGlvbihoYW5kbGUp OwotCi0gICAgLy8gd2lsbFNlbmRSZXF1ZXN0IG1pZ2h0IGNhbmNlbCB0aGUgbG9hZC4KLSAgICBp ZiAoaGFuZGxlLT5jYW5jZWxsZWRPckNsaWVudGxlc3MoKSkKLSAgICAgICAgcmV0dXJuOwotCi0g ICAgaWYgKCFjcmVhdGVTb3VwUmVxdWVzdEFuZE1lc3NhZ2VGb3JIYW5kbGUoaGFuZGxlLCBuZXdS ZXF1ZXN0LCB0cnVlKSkgewotICAgICAgICBkLT5jbGllbnQoKS0+Y2Fubm90U2hvd1VSTChoYW5k bGUpOwotICAgICAgICByZXR1cm47CisgICAgICAgIGNvbnRpbnVlQWZ0ZXJXaWxsU2VuZFJlcXVl c3QoaGFuZGxlLCBuZXdSZXF1ZXN0KTsKICAgICB9CiAKLSAgICBoYW5kbGUtPnNlbmRQZW5kaW5n UmVxdWVzdCgpOwogfQogCiBzdGF0aWMgdm9pZCByZWRpcmVjdFNraXBDYWxsYmFjayhHT2JqZWN0 KiwgR0FzeW5jUmVzdWx0KiBhc3luY1Jlc3VsdCwgZ3BvaW50ZXIgZGF0YSkKQEAgLTEzOTksNyAr MTQwNSw3IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGU6OmNvbnRpbnVlV2lsbFNlbmRSZXF1ZXN0KGNv bnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCkKIHsKICAgICBBU1NFUlQoY2xpZW50KCkpOwog ICAgIEFTU0VSVChjbGllbnQoKS0+dXNlc0FzeW5jQ2FsbGJhY2tzKCkpOwotICAgIC8vIEZJWE1F OiBJbXBsZW1lbnQgdGhpcyBtZXRob2QgaWYgbmVlZGVkOiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MTE0LgorICAgIGNvbnRpbnVlQWZ0ZXJXaWxsU2VuZFJlcXVl c3QodGhpcywgcmVxdWVzdCk7CiB9CiAKIHZvaWQgUmVzb3VyY2VIYW5kbGU6OmNvbnRpbnVlRGlk UmVjZWl2ZVJlc3BvbnNlKCkK