Attachment #24870 for bug #56924

Attachment #24870: YA patch, getting closer, still one issue for bug #56924

View | Details | Raw Unified | Return to bug 56924
Collapse All | Expand All





	if (rv < 0) {
	    PRErrorCode err = PR_GetError();
	    if (err == PR_WOULD_BLOCK_ERROR) {
		ss->lastWriteBlocked = 1;
		return count ? count : rv;
	    }
	    ss->lastWriteBlocked = 0;
	    MAP_ERROR(PR_CONNECT_ABORTED_ERROR, PR_CONNECT_RESET_ERROR)
	    /* Loser */
	    return rv;

	}
	break;
    }
    ss->lastWriteBlocked = 0;
    return count;
}


	if (rv < 0) {
	    PRErrorCode err = PR_GetError();
	    if (err == PR_WOULD_BLOCK_ERROR) {
		ss->lastWriteBlocked = 1;
		return count ? count : rv;
	    }
	    ss->lastWriteBlocked = 0;
	    MAP_ERROR(PR_CONNECT_ABORTED_ERROR, PR_CONNECT_RESET_ERROR)
	    /* Loser */
	    return rv;

	}
	break;
    }
    ss->lastWriteBlocked = 0;
    return count;
}


(-)sslimpl.h (+1 lines)

Line	Link Here

Lines 268-273	Link Here

268

    unsigned int     detectRollBack   	: 1; /* Detect rollback to SSL v3 */

268

    unsigned int     detectRollBack   	: 1; /* Detect rollback to SSL v3 */

269

    unsigned int     connected		: 1; /* initial handshake is complete. */

269

    unsigned int     connected		: 1; /* initial handshake is complete. */

270

    unsigned int     recvdCloseNotify	: 1; /* received SSL EOF. */

270

    unsigned int     recvdCloseNotify	: 1; /* received SSL EOF. */

271

    unsigned int     lastWriteBlocked   : 1;

271

272

    /* version of the protocol to use */

273

    /* version of the protocol to use */

273

    SSL3ProtocolVersion version;

274

    SSL3ProtocolVersion version;





 * may use your version of this file under either the MPL or the
 * GPL.
 *
 * $Id: sslsock.c,v 1.12 2001/02/09 00:32:08 nelsonb%netscape.com Exp $
 */
#include "seccomon.h"
#include "cert.h"

	return 0;	/* don't poll on this socket */
    }

    if (ss->useSecurity && !ss->connected) {
	/* XXX There needs to be a better test than the following. */
	if ((ss->handshake == ssl2_BeginClientHandshake) &&
	    (ret_flags & (PR_POLL_READ | PR_POLL_WRITE))) {
	    /* The user is waiting to read or write, but the first 
	    ** handshake record hasn't been sent yet, so lie and 
	    ** say it's ready so the user will try a read or write.
	    */
	    *out_flags = (ret_flags & (PR_POLL_READ | PR_POLL_WRITE));
	    return ret_flags;
	}
	/* The application is waiting for data to be received, 
	** but the initial handshake is blocked on write.
	** The code should select on write, not read.
	*/
	if ((ret_flags & PR_POLL_READ) && ss->lastWriteBlocked) {
	    ret_flags ^=  PR_POLL_READ;		/* don't select on write. */
	    ret_flags |=  PR_POLL_WRITE;        /* do    select on read. */
	} else if ((ret_flags & PR_POLL_WRITE) && 
	       /* XXX There needs to be a better test than the following. */
	       /* Don't check ss->securityHandshake. */
	    (ss->handshake || ss->nextHandshake)) {
	    /* The user is trying to write, but the handshake is blocked 
	    ** waiting to read, so tell NSPR NOT to poll on write.
	    */
	    ret_flags ^=  PR_POLL_WRITE;	/* don't select on write. */
	    ret_flags |=  PR_POLL_READ;	        /* do    select on read. */
	}
    } else if ((ret_flags & PR_POLL_READ) && (SSL_DataPending(fd) > 0)) {
	*out_flags = PR_POLL_READ;	/* it's ready already. */
	return ret_flags;
    } 
    if (ret_flags && (fd->lower->methods->poll != NULL)) {
        ret_flags = fd->lower->methods->poll(fd->lower, ret_flags, out_flags);
    }


Return to bug 56924