Module: sip-router Branch: 4.1 Commit: 71463b06efa2997950aaf1ef088076258fe8a03a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71463b06...
Author: Peter Dunkley peter.dunkley@crocodile-rcs.com Committer: Victor Seva linuxmaniac@torreviejawireless.org Date: Sun Jan 5 18:16:04 2014 +0000
modules/websocket: added OpenSSL licensing exception
(cherry picked from commit 661d7d3a6231713861a8a1236dd7d783113c2890)
---
modules/websocket/config.c | 5 +++++ modules/websocket/config.h | 5 +++++ modules/websocket/ws_conn.c | 5 +++++ modules/websocket/ws_conn.h | 5 +++++ modules/websocket/ws_frame.c | 5 +++++ modules/websocket/ws_frame.h | 5 +++++ modules/websocket/ws_handshake.c | 5 +++++ modules/websocket/ws_handshake.h | 5 +++++ modules/websocket/ws_mod.c | 5 +++++ modules/websocket/ws_mod.h | 5 +++++ 10 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/modules/websocket/config.c b/modules/websocket/config.c index e6e6a50..a0607a7 100644 --- a/modules/websocket/config.c +++ b/modules/websocket/config.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
/*! diff --git a/modules/websocket/config.h b/modules/websocket/config.h index 690649e..64ed5bd 100644 --- a/modules/websocket/config.h +++ b/modules/websocket/config.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
/*! diff --git a/modules/websocket/ws_conn.c b/modules/websocket/ws_conn.c index 613f14e..9f2b672 100644 --- a/modules/websocket/ws_conn.c +++ b/modules/websocket/ws_conn.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
#include "../../locking.h" diff --git a/modules/websocket/ws_conn.h b/modules/websocket/ws_conn.h index d022d0e..0c7d639 100644 --- a/modules/websocket/ws_conn.h +++ b/modules/websocket/ws_conn.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
#ifndef _WS_CONN_H diff --git a/modules/websocket/ws_frame.c b/modules/websocket/ws_frame.c index a3a4cef..3ccb4d1 100644 --- a/modules/websocket/ws_frame.c +++ b/modules/websocket/ws_frame.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
#include <limits.h> diff --git a/modules/websocket/ws_frame.h b/modules/websocket/ws_frame.h index 1210c6c..815ec65 100644 --- a/modules/websocket/ws_frame.h +++ b/modules/websocket/ws_frame.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
#ifndef _WS_FRAME_H diff --git a/modules/websocket/ws_handshake.c b/modules/websocket/ws_handshake.c index c4e3143..05332e4 100644 --- a/modules/websocket/ws_handshake.c +++ b/modules/websocket/ws_handshake.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
#include <openssl/sha.h> diff --git a/modules/websocket/ws_handshake.h b/modules/websocket/ws_handshake.h index e7ff8e0..5c69fa2 100644 --- a/modules/websocket/ws_handshake.h +++ b/modules/websocket/ws_handshake.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
#ifndef _WS_HANDSHAKE_H diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index ec5e07c..8932769 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
#include "../../dprint.h" diff --git a/modules/websocket/ws_mod.h b/modules/websocket/ws_mod.h index 819d3ea..8db9fef 100644 --- a/modules/websocket/ws_mod.h +++ b/modules/websocket/ws_mod.h @@ -19,6 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * + * Exception: permission to copy, modify, propagate, and distribute a work + * formed by combining OpenSSL toolkit software and the code in this file, + * such as linking with software components and libraries released under + * OpenSSL project license. + * */
#ifndef _WS_MOD_H
-
Victor Seva