wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 507370 - ssltunnel may hang with 100% CPU load, breaking the tests execution, r=ted

Browse Source
This commit is contained in:
Honza Bambas 2009-08-17 18:41:27 +02:00
parent 710cbd9853
commit 5133867cfa
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/manager/ssl/tests/mochitest/mixedcontent/Makefile.in
View File

@ -68,6 +68,7 @@ _TEST_FILES = \
somestyle.css \
test_bug383369.html \
test_bug455367.html \
test_bug472986.html \
test_cssBefore1.html \
test_cssContent1.html \
test_cssContent2.html \
@ -99,7 +100,6 @@ _TEST_FILES = \
# test_bug329869.html \ leaks, bug 452401
# test_dynUnsecureRedirect.html \ intermitently fails, quit often, bug 487402
# test_unsecureIframeMetaRedirect.html \ also intermittently fails, less often, bug 487632
# test_bug472986.html \ causes timeout of this and all following tests
libs:: $(_TEST_FILES)

6
testing/mochitest/ssltunnel/ssltunnel.cpp
View File

@ -402,9 +402,13 @@ void HandleConnection(void* data)
PRInt16 &in_flags2 = sockets[s2].in_flags;
sockets[s].out_flags = 0;
if (out_flags & PR_POLL_EXCEPT)
if (out_flags & (PR_POLL_EXCEPT | PR_POLL_ERR | PR_POLL_HUP))
{
client_error = true;
// We got a fatal error state on the socket. Clear the output buffer
// for this socket to break the main loop, we will never more be able
// to send those data anyway.
buffers[s2].bufferhead = buffers[s2].buffertail = buffers[s2].buffer;
continue;
} // PR_POLL_EXCEPT handling