--- a/src/network/ssl/qsslsocket.cpp	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/network/ssl/qsslsocket.cpp	Tue Feb 02 00:43:10 2010 +0200
@@ -467,6 +467,12 @@
     return retVal;
 }
 
+/*!
+    \since 4.6
+    Sets the given \a option to the value described by \a value.
+
+    \sa socketOption()
+*/
 void QSslSocket::setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value)
 {
     Q_D(QSslSocket);
@@ -474,6 +480,12 @@
         d->plainSocket->setSocketOption(option, value);
 }
 
+/*!
+    \since 4.6
+    Returns the value of the \a option option.
+
+    \sa setSocketOption()
+*/
 QVariant QSslSocket::socketOption(QAbstractSocket::SocketOption option)
 {
     Q_D(QSslSocket);
@@ -707,6 +719,8 @@
     qDebug() << "QSslSocket::close()";
 #endif
     Q_D(QSslSocket);
+    if (d->plainSocket)
+        d->plainSocket->close();
     QTcpSocket::close();
 
     // must be cleared, reading/writing not possible on closed socket: