From 083c73e7e93ed8fa994086e82efce1fe603e688d Mon Sep 17 00:00:00 2001 From: Andy Green Date: Mon, 8 Feb 2016 08:44:21 +0800 Subject: [PATCH] license clarification and test apps CC zero Signed-off-by: Andy Green --- LICENSE | 20 ++++++++++++++++++++ lib/base64-decode.c | 2 +- lib/daemonize.c | 3 ++- test-server/test-client.c | 23 +++++++++++------------ test-server/test-echo.c | 28 ++++++++++++---------------- test-server/test-fraggle.c | 25 ++++++++++++------------- test-server/test-ping.c | 25 ++++++++++++------------- test-server/test-server-dumb-increment.c | 25 ++++++++++++------------- test-server/test-server-echogen.c | 25 ++++++++++++------------- test-server/test-server-http.c | 25 ++++++++++++------------- test-server/test-server-libev.c | 28 +++++++++++++--------------- test-server/test-server-mirror.c | 25 ++++++++++++------------- test-server/test-server-pthreads.c | 23 +++++++++++------------ test-server/test-server.c | 27 +++++++++++++-------------- test-server/test-server.h | 20 ++++++++++++++++++++ 15 files changed, 175 insertions(+), 149 deletions(-) diff --git a/LICENSE b/LICENSE index 7c89865..e093d53 100644 --- a/LICENSE +++ b/LICENSE @@ -22,6 +22,26 @@ satisfy this requirement: "[program] is based in part on the work of the libwebsockets project (http://libwebsockets.org)" +3) Some sources included have their own, more liberal licenses, or options +to get original sources with the liberal terms. + +Original liberal license retained + + - lib/sha-1.c - 3-clause BSD license retained, link to original + - win32port/zlib - ZLIB license (see zlib.h) + +Relicensed to libwebsocket license + + - lib/base64-decode.c - relicensed to LGPL2.1+SLE, link to original + - lib/daemonize.c - relicensed from Public Domain to LGPL2.1+SLE, + link to original Public Domain version + +Public Domain (CC-zero) to simplify reuse + + - test-server/*.c + - test-server/*.h + + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 diff --git a/lib/base64-decode.c b/lib/base64-decode.c index bb074fc..3309b44 100644 --- a/lib/base64-decode.c +++ b/lib/base64-decode.c @@ -33,7 +33,7 @@ * Bob Trower 08/04/01 -- Create Version 0.00.00B * * I cleaned it up quite a bit to match the (linux kernel) style of the rest - * of libwebsockets; this version is under LGPL2 like the rest of libwebsockets + * of libwebsockets; this version is under LGPL2.1 + SLE like the rest of lws * since he explicitly allows sublicensing, but I give the URL above so you can * get the original with Bob's super-liberal terms directly if you prefer. */ diff --git a/lib/daemonize.c b/lib/daemonize.c index 8a461f5..96eb179 100644 --- a/lib/daemonize.c +++ b/lib/daemonize.c @@ -7,7 +7,8 @@ * he replied it is Public Domain. Use the URL above to get the original * Public Domain version if you want it. * - * This version is LGPL2 and is (c)2006 - 2013 Andy Green + * This version is LGPL2.1+SLE like the rest of libwebsockets and is + * Copyright (c)2006 - 2013 Andy Green */ #include diff --git a/test-server/test-client.c b/test-server/test-client.c index 709f0b2..2f6ea10 100644 --- a/test-server/test-client.c +++ b/test-server/test-client.c @@ -3,20 +3,19 @@ * * Copyright (C) 2011-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include diff --git a/test-server/test-echo.c b/test-server/test-echo.c index 4f0a275..6c1729e 100644 --- a/test-server/test-echo.c +++ b/test-server/test-echo.c @@ -1,25 +1,21 @@ /* - * libwebsockets-test-echo - libwebsockets echo test implementation - * - * This implements both the client and server sides. It defaults to - * serving, use --client to connect as client. + * libwebsockets-test-echo * * Copyright (C) 2010-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include diff --git a/test-server/test-fraggle.c b/test-server/test-fraggle.c index 7fe4bd9..2188799 100644 --- a/test-server/test-fraggle.c +++ b/test-server/test-fraggle.c @@ -1,22 +1,21 @@ /* * libwebsockets-test-fraggle - random fragmentation test * - * Copyright (C) 2010-2016 Andy Green + * Copyright (C) 2011-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include diff --git a/test-server/test-ping.c b/test-server/test-ping.c index 9a8a277..1548f1c 100644 --- a/test-server/test-ping.c +++ b/test-server/test-ping.c @@ -1,22 +1,21 @@ /* - * libwebsockets-test-ping - libwebsockets floodping + * libwebsockets-test-ping - libwebsockets test floodping * * Copyright (C) 2011-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include diff --git a/test-server/test-server-dumb-increment.c b/test-server/test-server-dumb-increment.c index 709c8a1..e1baf49 100644 --- a/test-server/test-server-dumb-increment.c +++ b/test-server/test-server-dumb-increment.c @@ -1,22 +1,21 @@ /* * libwebsockets-test-server - libwebsockets test implementation * - * Copyright (C) 2010-2015 Andy Green + * Copyright (C) 2010-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include "test-server.h" diff --git a/test-server/test-server-echogen.c b/test-server/test-server-echogen.c index 2ae27e1..f2a134a 100644 --- a/test-server/test-server-echogen.c +++ b/test-server/test-server-echogen.c @@ -1,22 +1,21 @@ /* * libwebsockets-test-server - libwebsockets test implementation * - * Copyright (C) 2016 Andy Green + * Copyright (C) 2010-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include "test-server.h" diff --git a/test-server/test-server-http.c b/test-server/test-server-http.c index 76b004f..6b05c82 100644 --- a/test-server/test-server-http.c +++ b/test-server/test-server-http.c @@ -1,22 +1,21 @@ /* * libwebsockets-test-server - libwebsockets test implementation * - * Copyright (C) 2010-2015 Andy Green + * Copyright (C) 2010-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include "test-server.h" diff --git a/test-server/test-server-libev.c b/test-server/test-server-libev.c index 0af1d9b..1a35f18 100644 --- a/test-server/test-server-libev.c +++ b/test-server/test-server-libev.c @@ -1,24 +1,22 @@ /* - * libwebsockets-test-server for libev - libwebsockets test implementation + * libwebsockets-test-server - libwebsockets test implementation * - * Copyright (C) 2010-2015 Andy Green + * Copyright (C) 2011-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ - #include "test-server.h" int close_testing; diff --git a/test-server/test-server-mirror.c b/test-server/test-server-mirror.c index 274c53b..f0d6111 100644 --- a/test-server/test-server-mirror.c +++ b/test-server/test-server-mirror.c @@ -1,22 +1,21 @@ /* * libwebsockets-test-server - libwebsockets test implementation * - * Copyright (C) 2010-2015 Andy Green + * Copyright (C) 2010-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include "test-server.h" diff --git a/test-server/test-server-pthreads.c b/test-server/test-server-pthreads.c index 5793bee..ed61419 100644 --- a/test-server/test-server-pthreads.c +++ b/test-server/test-server-pthreads.c @@ -3,20 +3,19 @@ * * Copyright (C) 2010-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include "test-server.h" diff --git a/test-server/test-server.c b/test-server/test-server.c index 0fcdd46..1a3e157 100644 --- a/test-server/test-server.c +++ b/test-server/test-server.c @@ -1,22 +1,21 @@ /* - * libwebsockets-test-server - libwebsockets test implementation + * libwebsockets-test-servet - libwebsockets test implementation * - * Copyright (C) 2010-2015 Andy Green + * Copyright (C) 2010-2016 Andy Green * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation: - * version 2.1 of the License. + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301 USA + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. */ #include "test-server.h" diff --git a/test-server/test-server.h b/test-server/test-server.h index 89c64a4..0055651 100644 --- a/test-server/test-server.h +++ b/test-server/test-server.h @@ -1,3 +1,23 @@ +/* + * libwebsockets-test-server - libwebsockets test implementation + * + * Copyright (C) 2010-2016 Andy Green + * + * This file is made available under the Creative Commons CC0 1.0 + * Universal Public Domain Dedication. + * + * The person who associated a work with this deed has dedicated + * the work to the public domain by waiving all of his or her rights + * to the work worldwide under copyright law, including all related + * and neighboring rights, to the extent allowed by law. You can copy, + * modify, distribute and perform the work, even for commercial purposes, + * all without asking permission. + * + * The test apps are intended to be adapted for use in your code, which + * may be proprietary. So unlike the library itself, they are licensed + * Public Domain. + */ + #if defined(_WIN32) && defined(EXTERNAL_POLL) #define WINVER 0x0600 #define _WIN32_WINNT 0x0600 -- 2.7.4