34416 2010-02-01 04:45:03 -0800 [Qt] Build without SSL support is broken 2010-02-01 07:09:16 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC Windows XP RESOLVED FIXED P3 Normal --- 0 henry.haverinen webkit-unassigned hausmann kenneth laszlo.gombos yael oldest_to_newest 186361 0 henry.haverinen 2010-02-01 04:45:03 -0800 If Qt is configured without SSL support, then the build breaks in SocketStreamHandler. 186393 1 yael 2010-02-01 06:42:50 -0800 Sorry, I forgot about that. 186394 2 hausmann 2010-02-01 06:48:31 -0800 Henry has a patch coming up :) 186396 3 kenneth 2010-02-01 06:52:57 -0800 Our product manager is programming now? :-) rocks! 186399 4 47839 henry.haverinen 2010-02-01 06:59:24 -0800 Created attachment 47839 build fix 186401 5 47839 kenneth 2010-02-01 07:02:18 -0800 Comment on attachment 47839 build fix You need to put the patch up for review, I have done so now. > + } else > m_socket = new QTcpSocket(this); > + > + if (!m_socket) > + return; Why did you add this early return. The new is supposed to return something valid, unless we are out of memory. 186403 6 hausmann 2010-02-01 07:04:02 -0800 Committed r54134: <http://trac.webkit.org/changeset/54134> 186405 7 henry.haverinen 2010-02-01 07:07:42 -0800 (In reply to comment #5) > (From update of attachment 47839 [details]) > You need to put the patch up for review, I have done so now. > > + } else > > m_socket = new QTcpSocket(this); > > + > > + if (!m_socket) > > + return; > Why did you add this early return. The new is supposed to return something > valid, unless we are out of memory. The return is not related to the new just above it, but to an #ifndef'd new above it. Without SSL support, there's no way to create a valid socket for this case. 186407 8 kenneth 2010-02-01 07:09:16 -0800 (In reply to comment #7) > The return is not related to the new just above it, but to an #ifndef'd new > above it. Without SSL support, there's no way to create a valid socket for this > case. OK, great! :-) 47839 2010-02-01 06:59:24 -0800 2010-02-01 07:05:03 -0800 build fix build_error_fix text/plain 3028 henry.haverinen ZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9xdC9Tb2NrZXRTdHJlYW1IYW5k bGVQcml2YXRlLmggYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvU29ja2V0U3RyZWFtSGFu ZGxlUHJpdmF0ZS5oCmluZGV4IDk0MzNkM2YuLjIzNWYxYjEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9xdC9Tb2NrZXRTdHJlYW1IYW5kbGVQcml2YXRlLmgKKysrIGIvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1NvY2tldFN0cmVhbUhhbmRsZVByaXZhdGUuaApAQCAt NTksNyArNTksOSBAQCBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBzb2NrZXRFcnJvcihRQWJzdHJh Y3RTb2NrZXQ6OlNvY2tldEVycm9yKTsKICAgICB2b2lkIHNvY2tldENsb3NlZENhbGxiYWNrKCk7 CiAgICAgdm9pZCBzb2NrZXRFcnJvckNhbGxiYWNrKGludCk7CisjaWZuZGVmIFFUX05PX09QRU5T U0wKICAgICB2b2lkIHNvY2tldFNzbEVycm9ycyhjb25zdCBRTGlzdDxRU3NsRXJyb3I+Jik7Cisj ZW5kaWYKIHB1YmxpYzoKICAgICBRVGNwU29ja2V0KiBtX3NvY2tldDsKICAgICBTb2NrZXRTdHJl YW1IYW5kbGUqIG1fc3RyZWFtSGFuZGxlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3F0L1NvY2tldFN0cmVhbUhhbmRsZVF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vbmV0 d29yay9xdC9Tb2NrZXRTdHJlYW1IYW5kbGVRdC5jcHAKaW5kZXggZDYxZDkwMS4uZTY2NmZmNyAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L1NvY2tldFN0cmVhbUhhbmRs ZVF0LmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvU29ja2V0U3RyZWFtSGFu ZGxlUXQuY3BwCkBAIC00NSwxMCArNDUsMTcgQEAgU29ja2V0U3RyZWFtSGFuZGxlUHJpdmF0ZTo6 U29ja2V0U3RyZWFtSGFuZGxlUHJpdmF0ZShTb2NrZXRTdHJlYW1IYW5kbGUqIHN0cmVhbUgKICAg ICBtX3N0cmVhbUhhbmRsZSA9IHN0cmVhbUhhbmRsZTsKICAgICBtX3NvY2tldCA9IDA7CiAgICAg Ym9vbCBpc1NlY3VyZSA9IHVybC5wcm90b2NvbElzKCJ3c3MiKTsKLSAgICBpZiAoaXNTZWN1cmUp CisKKyAgICBpZiAoaXNTZWN1cmUpIHsKKyNpZm5kZWYgUVRfTk9fT1BFTlNTTAogICAgICAgICBt X3NvY2tldCA9IG5ldyBRU3NsU29ja2V0KHRoaXMpOwotICAgIGVsc2UKKyNlbmRpZgorICAgIH0g ZWxzZQogICAgICAgICBtX3NvY2tldCA9IG5ldyBRVGNwU29ja2V0KHRoaXMpOworCisgICAgaWYg KCFtX3NvY2tldCkKKyAgICAgICAgcmV0dXJuOworCiAgICAgY29ubmVjdChtX3NvY2tldCwgU0lH TkFMKGNvbm5lY3RlZCgpKSwgdGhpcywgU0xPVChzb2NrZXRDb25uZWN0ZWQoKSkpOwogICAgIGNv bm5lY3QobV9zb2NrZXQsIFNJR05BTChyZWFkeVJlYWQoKSksIHRoaXMsIFNMT1Qoc29ja2V0UmVh ZHlSZWFkKCkpKTsKICAgICBjb25uZWN0KG1fc29ja2V0LCBTSUdOQUwoZGlzY29ubmVjdGVkKCkp LCB0aGlzLCBTTE9UKHNvY2tldENsb3NlZCgpKSk7CkBAIC01OSw5ICs2NiwxMSBAQCBTb2NrZXRT dHJlYW1IYW5kbGVQcml2YXRlOjpTb2NrZXRTdHJlYW1IYW5kbGVQcml2YXRlKFNvY2tldFN0cmVh bUhhbmRsZSogc3RyZWFtSAogICAgIHVuc2lnbmVkIGludCBwb3J0ID0gdXJsLmhhc1BvcnQoKSA/ IHVybC5wb3J0KCkgOiAoaXNTZWN1cmUgPyA0NDMgOiA4MCk7CiAKICAgICBRU3RyaW5nIGhvc3Qg PSB1cmwuaG9zdCgpOwotICAgIGlmIChpc1NlY3VyZSkKKyAgICBpZiAoaXNTZWN1cmUpIHsKKyNp Zm5kZWYgUVRfTk9fT1BFTlNTTAogICAgICAgICBzdGF0aWNfY2FzdDxRU3NsU29ja2V0Kj4obV9z b2NrZXQpLT5jb25uZWN0VG9Ib3N0RW5jcnlwdGVkKGhvc3QsIHBvcnQpOwotICAgIGVsc2UKKyNl bmRpZgorICAgIH0gZWxzZQogICAgICAgICBtX3NvY2tldC0+Y29ubmVjdFRvSG9zdChob3N0LCBw b3J0KTsKIH0KIApAQCAtODgsNyArOTcsNyBAQCB2b2lkIFNvY2tldFN0cmVhbUhhbmRsZVByaXZh dGU6OnNvY2tldFJlYWR5UmVhZCgpCiAKIGludCBTb2NrZXRTdHJlYW1IYW5kbGVQcml2YXRlOjpz ZW5kKGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW4pCiB7Ci0gICAgaWYgKG1fc29ja2V0LT5zdGF0 ZSgpICE9IFFBYnN0cmFjdFNvY2tldDo6Q29ubmVjdGVkU3RhdGUpCisgICAgaWYgKCFtX3NvY2tl dCB8fCBtX3NvY2tldC0+c3RhdGUoKSAhPSBRQWJzdHJhY3RTb2NrZXQ6OkNvbm5lY3RlZFN0YXRl KQogICAgICAgICByZXR1cm4gMDsKICAgICBxdWludDY0IHNlbnRTaXplID0gbV9zb2NrZXQtPndy aXRlKGRhdGEsIGxlbik7CiAgICAgUU1ldGFPYmplY3Q6Omludm9rZU1ldGhvZCh0aGlzLCAic29j a2V0U2VudERhdGEiLCBRdDo6UXVldWVkQ29ubmVjdGlvbik7CkBAIC0xMzgsNiArMTQ3LDcgQEAg dm9pZCBTb2NrZXRTdHJlYW1IYW5kbGVQcml2YXRlOjpzb2NrZXRFcnJvckNhbGxiYWNrKGludCBl cnJvcikKICAgICB9CiB9CiAKKyNpZm5kZWYgUVRfTk9fT1BFTlNTTAogdm9pZCBTb2NrZXRTdHJl YW1IYW5kbGVQcml2YXRlOjpzb2NrZXRTc2xFcnJvcnMoY29uc3QgUUxpc3Q8UVNzbEVycm9yPiYp CiB7CiAgICAgLy8gRklYTUU6IGJhc2VkIG9uIGh0dHA6Ly90b29scy5pZXRmLm9yZy9odG1sL2Ry YWZ0LWhpeGllLXRoZXdlYnNvY2tldHByb3RvY29sLTY4I3BhZ2UtMTUKQEAgLTE0NSw2ICsxNTUs OCBAQCB2b2lkIFNvY2tldFN0cmVhbUhhbmRsZVByaXZhdGU6OnNvY2tldFNzbEVycm9ycyhjb25z dCBRTGlzdDxRU3NsRXJyb3I+JikKICAgICAvLyBXZSBkb24ndCBhYm9ydCB3aGlsZSB0aGlzIGlz IHN0aWxsIHdvcmsgaW4gcHJvZ3Jlc3MuCiAgICAgc3RhdGljX2Nhc3Q8UVNzbFNvY2tldCo+KG1f c29ja2V0KS0+aWdub3JlU3NsRXJyb3JzKCk7CiB9CisjZW5kaWYKKwogU29ja2V0U3RyZWFtSGFu ZGxlOjpTb2NrZXRTdHJlYW1IYW5kbGUoY29uc3QgS1VSTCYgdXJsLCBTb2NrZXRTdHJlYW1IYW5k bGVDbGllbnQqIGNsaWVudCkKICAgICA6IFNvY2tldFN0cmVhbUhhbmRsZUJhc2UodXJsLCBjbGll bnQpCiB7Cg==