Index: doc/tls.html
==================================================================
--- doc/tls.html
+++ doc/tls.html
@@ -312,10 +312,14 @@
         <dd>Can the session be resumed or not.</dd>
         <dt><strong>start_time</strong> <em>seconds</em></dt>
         <dd>Time since session started in seconds since epoch.</dd>
         <dt><strong>timeout</strong> <em>seconds</em></dt>
         <dd>Max duration of session in seconds before time-out.</dd>
+        <dt><strong>compression</strong> <em>mode</em></dt>
+        <dd>Compression method.</dd>
+        <dt><strong>expansion</strong> <em>mode</em></dt>
+        <dd>Expansion method.</dd>
         <dt><strong>session_cache_mode</strong> <em>mode</em></dt>
         <dd>Server cache mode (client, server, or both).</dd>
     </dl>
 </blockquote>
 

Index: generic/tls.c
==================================================================
--- generic/tls.c
+++ generic/tls.c
@@ -579,11 +579,10 @@
  */
 static int
 SNICallback(const SSL *ssl, int *alert, void *arg) {
     State *statePtr = (State*)arg;
     Tcl_Interp *interp	= statePtr->interp;
-/*    SSL_CTX* ctx; */
     Tcl_Obj *cmdPtr;
     int code;
     char *servername = NULL;
 
     dprintf("Called");
@@ -593,16 +592,13 @@
     } else if (ssl == NULL) {
 	return SSL_TLSEXT_ERR_NOACK;
     }
 
     servername = SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
-    if (!servername || servername[0] == '\0')
+    if (!servername || servername[0] == '\0') {
         return SSL_TLSEXT_ERR_NOACK;
-
-    /* Use SSL_set_SSL_CTX to change the SSL connection object to use another
-       context created from SSL_CTX() for the certificate corresponding to,
-       the the server name provided by the client. */
+    }
 
     cmdPtr = Tcl_DuplicateObj(statePtr->callback);
 
     Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj( "sni", -1));
     Tcl_ListObjAppendElement(interp, cmdPtr, Tcl_NewStringObj(servername , -1));
@@ -1805,13 +1801,10 @@
     const SSL_CIPHER *cipher;
     const SSL_SESSION *session;
     const unsigned char *proto;
     unsigned int len;
     long mode;
-#if defined(HAVE_SSL_COMPRESSION)
-    const COMP_METHOD *comp;
-#endif
 
     if (objc != 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "channel");
 	return(TCL_ERROR);
     }
@@ -1929,21 +1922,28 @@
 	/* Timeout value */
 	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("timeout", -1));
 	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewLongObj(SSL_SESSION_get_timeout(session)));
     }
 
-#if defined(HAVE_SSL_COMPRESSION)
     /* Compression info */
-    comp = SSL_get_current_compression(ssl);
-    if (comp != NULL) {
+    if (ssl != NULL) {
+#ifdef HAVE_SSL_COMPRESSION
+	const COMP_METHOD *comp, *expn;
+	comp = SSL_get_current_compression(ssl);
+	expn = SSL_get_current_expansion(ssl);
+
+	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("compression", -1));
+	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj(comp ? SSL_COMP_get_name(comp) : "NONE", -1));
+	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("expansion", -1));
+	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj(expn ? SSL_COMP_get_name(expn) : "NONE", -1));
+#else
 	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("compression", -1));
-	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj(SSL_COMP_get_name(comp), -1));
-	comp = SSL_get_current_expansion(ssl);
+	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("NONE", -1));
 	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("expansion", -1));
-	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj(SSL_COMP_get_name(comp), -1));
-    }
+	Tcl_ListObjAppendElement(interp, objPtr, Tcl_NewStringObj("NONE", -1));
 #endif
+    }
 
     /* Server info */
     mode = SSL_CTX_get_session_cache_mode(statePtr->ctx);
     if (mode & SSL_SESS_CACHE_OFF) {
 	proto = "off";