1 files changed, 49 insertions, 18 deletions
diff --git a/src/websockets/qwebsocketserver.cpp b/src/websockets/qwebsocketserver.cpp
index 20aa009..59cfd89 100644
--- a/src/websockets/qwebsocketserver.cpp
+++ b/src/websockets/qwebsocketserver.cpp
@@ -5,36 +5,28 @@
 **
 ** This file is part of the QtWebSockets module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -43,6 +35,7 @@
     \class QWebSocketServer
 
     \inmodule QtWebSockets
+    \since 5.3
 
     \brief Implements a WebSocket-based server.
 
@@ -495,6 +488,44 @@ quint16 QWebSocketServer::serverPort() const
 }
 
 /*!
+    Returns a URL clients can use to connect to this server if the server is listening for connections.
+    Otherwise an invalid URL is returned.
+
+    \sa serverPort(), serverAddress(), listen()
+ */
+QUrl QWebSocketServer::serverUrl() const
+{
+    QUrl url;
+
+    if (!isListening()) {
+        return url;
+    }
+
+    switch (secureMode()) {
+    case NonSecureMode:
+        url.setScheme(QStringLiteral("ws"));
+        break;
+    #ifndef QT_NO_SSL
+    case SecureMode:
+        url.setScheme(QStringLiteral("wss"));
+        break;
+    #endif
+    }
+
+    url.setPort(serverPort());
+
+    if (serverAddress() == QHostAddress(QHostAddress::Any)) {
+        // NOTE: On Windows at least, clients cannot connect to QHostAddress::Any
+        // so in that case we always return LocalHost instead.
+        url.setHost(QHostAddress(QHostAddress::LocalHost).toString());
+    } else {
+        url.setHost(serverAddress().toString());
+    }
+
+    return url;
+}
+
+/*!
     Sets the maximum number of pending accepted connections to \a numConnections.
     WebSocketServer will accept no more than \a numConnections incoming connections before
     nextPendingConnection() is called.