Index: tlsIO.c
==================================================================
--- tlsIO.c
+++ tlsIO.c
@@ -25,10 +25,11 @@
 static int  TlsBlockModeProc _ANSI_ARGS_((ClientData instanceData, int mode));
 static int  TlsCloseProc _ANSI_ARGS_((ClientData instanceData, Tcl_Interp *interp));
 static int  TlsInputProc _ANSI_ARGS_((ClientData instanceData, char *buf, int bufSize, int *errorCodePtr));
 static int  TlsOutputProc _ANSI_ARGS_((ClientData instanceData, CONST char *buf, int toWrite, int *errorCodePtr));
 static int  TlsGetOptionProc _ANSI_ARGS_((ClientData instanceData, Tcl_Interp *interp, CONST84 char *optionName, Tcl_DString *dsPtr));
+static int  TlsSetOptionProc _ANSI_ARGS_((ClientData instanceData, Tcl_Interp *interp, CONST84 char *optionName, CONST84 char *optionValue));
 static void TlsWatchProc _ANSI_ARGS_((ClientData instanceData, int mask));
 static int  TlsGetHandleProc _ANSI_ARGS_((ClientData instanceData, int direction, ClientData *handlePtr));
 static int  TlsNotifyProc _ANSI_ARGS_((ClientData instanceData, int mask));
 #if 0
 static void TlsChannelHandler _ANSI_ARGS_((ClientData clientData, int mask));
@@ -90,10 +91,11 @@
 		tlsChannelType->typeName	= "tls";
 		tlsChannelType->closeProc	= TlsCloseProc;
 		tlsChannelType->inputProc	= TlsInputProc;
 		tlsChannelType->outputProc	= TlsOutputProc;
 		tlsChannelType->getOptionProc	= TlsGetOptionProc;
+		tlsChannelType->setOptionProc	= TlsSetOptionProc;
 		tlsChannelType->watchProc	= TlsWatchProc;
 		tlsChannelType->getHandleProc	= TlsGetHandleProc;
 
 		/*
 		 * Compiled against 8.3.2+. Direct access to all elements possible. Use
@@ -295,17 +297,17 @@
 
 			if (backingError == 0 && err == 0) {
 				dprintf("EOF reached")
 				*errorCodePtr = ECONNRESET;
 			} else if (backingError == 0 && err == -1) {
-				dprintf("I/O error occured (errno = %lu)", (unsigned long) Tcl_GetErrno());
+				dprintf("I/O error occurred (errno = %lu)", (unsigned long) Tcl_GetErrno());
 				*errorCodePtr = Tcl_GetErrno();
 				if (*errorCodePtr == ECONNRESET) {
 					*errorCodePtr = ECONNABORTED;
 				}
 			} else {
-				dprintf("I/O error occured (backingError = %lu)", backingError);
+				dprintf("I/O error occurred (backingError = %lu)", backingError);
 				*errorCodePtr = backingError;
 				if (*errorCodePtr == ECONNRESET) {
 					*errorCodePtr = ECONNABORTED;
 				}
 			}
@@ -450,15 +452,15 @@
 			if (backingError == 0 && bytesRead == 0) {
 				dprintf("EOF reached")
 				*errorCodePtr = 0;
 				bytesRead = 0;
 			} else if (backingError == 0 && bytesRead == -1) {
-				dprintf("I/O error occured (errno = %lu)", (unsigned long) Tcl_GetErrno());
+				dprintf("I/O error occurred (errno = %lu)", (unsigned long) Tcl_GetErrno());
 				*errorCodePtr = Tcl_GetErrno();
 				bytesRead = -1;
 			} else {
-				dprintf("I/O error occured (backingError = %lu)", backingError);
+				dprintf("I/O error occurred (backingError = %lu)", backingError);
 				*errorCodePtr = backingError;
 				bytesRead = -1;
 			}
 
 			break;
@@ -596,15 +598,15 @@
 			if (backingError == 0 && written == 0) {
 				dprintf("EOF reached")
 				*errorCodePtr = 0;
 				written = 0;
 			} else if (backingError == 0 && written == -1) {
-				dprintf("I/O error occured (errno = %lu)", (unsigned long) Tcl_GetErrno());
+				dprintf("I/O error occurred (errno = %lu)", (unsigned long) Tcl_GetErrno());
 				*errorCodePtr = Tcl_GetErrno();
 				written = -1;
 			} else {
-				dprintf("I/O error occured (backingError = %lu)", backingError);
+				dprintf("I/O error occurred (backingError = %lu)", backingError);
 				*errorCodePtr = backingError;
 				written = -1;
 			}
 
 			break;
@@ -619,10 +621,53 @@
 	}
 
 	dprintf("Output(%d) -> %d", toWrite, written);
 	return(written);
 }
+
+/*
+ *-------------------------------------------------------------------
+ *
+ * TlsSetOptionProc --
+ *
+ *	Sets an option value for a SSL socket based channel.
+ *
+ * Results:
+ *	A standard Tcl result.
+ *
+ * Side effects:
+ *	None.
+ *
+ *-------------------------------------------------------------------
+ */
+static int
+TlsSetOptionProc(ClientData instanceData,	/* Socket state. */
+	Tcl_Interp *interp,		/* For errors - can be NULL. */
+	CONST84 char *optionName,	/* Name of the option to
+					 * set the value for, or
+					 * NULL to get all options. */
+	CONST84 char *optionValue)	/* Value for option. */
+{
+    State *statePtr = (State *) instanceData;
+
+    Tcl_Channel downChan = Tls_GetParent(statePtr, TLS_TCL_FASTPATH);
+    Tcl_DriverSetOptionProc *setOptionProc;
+
+    setOptionProc = Tcl_ChannelSetOptionProc(Tcl_GetChannelType(downChan));
+    if (setOptionProc != NULL) {
+	return (*setOptionProc)(Tcl_GetChannelInstanceData(downChan), interp, optionName, optionValue);
+    } else if (optionName == (char*) NULL) {
+	/*
+	 * Request is query for all options, this is ok.
+	 */
+	return TCL_OK;
+    }
+    /*
+     * Request for a specific option has to fail, we don't have any.
+     */
+    return TCL_ERROR;
+}
 
 /*
  *-------------------------------------------------------------------
  *
  * TlsGetOptionProc --
@@ -650,12 +695,12 @@
 	Tcl_DString *dsPtr)		/* Where to store the computed value
 					 * initialized by caller. */
 {
     State *statePtr = (State *) instanceData;
 
-   Tcl_Channel downChan = Tls_GetParent(statePtr, TLS_TCL_FASTPATH);
-   Tcl_DriverGetOptionProc *getOptionProc;
+    Tcl_Channel downChan = Tls_GetParent(statePtr, TLS_TCL_FASTPATH);
+    Tcl_DriverGetOptionProc *getOptionProc;
 
     getOptionProc = Tcl_ChannelGetOptionProc(Tcl_GetChannelType(downChan));
     if (getOptionProc != NULL) {
         return (*getOptionProc)(Tcl_GetChannelInstanceData(downChan), interp, optionName, dsPtr);
     } else if (optionName == (char*) NULL) {
@@ -798,11 +843,11 @@
 static int TlsNotifyProc(ClientData instanceData, int mask) {
 	State *statePtr = (State *) instanceData;
 	int errorCode;
 
 	/*
-	 * An event occured in the underlying channel.  This
+	 * An event occurred in the underlying channel.  This
 	 * transformation doesn't process such events thus returns the
 	 * incoming mask unchanged.
 	 */
 	if (statePtr->timer != (Tcl_TimerToken) NULL) {
 		/*