lwsws license to cc0

https://github.com/warmcat/libwebsockets/issues/629
This commit is contained in:
Andy Green 2016-09-19 19:16:47 +08:00
parent a496700b3a
commit 0c984014f0
3 changed files with 25 additions and 36 deletions

12
LICENSE
View file

@ -40,17 +40,7 @@ Public Domain (CC-zero) to simplify reuse
- test-server/*.c - test-server/*.c
- test-server/*.h - test-server/*.h
- lwsws/*
4) lwsws (Libwebsocket web server) is a bundled application that is not
part of the libwebsockets library, it's a separate application that uses
the library. The related sources are in a separate directory. If you don't
distribute lwsws, you do not need to observe its license.
- lwsws/lejp.c - LGPL2.1
- lwsws/lejp.h - LGPL2.1
- lwsws/[all else] - GPL2.1
GNU LESSER GENERAL PUBLIC LICENSE GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999 Version 2.1, February 1999

View file

@ -3,17 +3,17 @@
* *
* Copyright (C) 2010-2016 Andy Green <andy@warmcat.com> * Copyright (C) 2010-2016 Andy Green <andy@warmcat.com>
* *
* This program is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation: * License as published by the Free Software Foundation:
* version 2.1 of the License. * version 2.1 of the License.
* *
* This library is distributed in the hope that it will be useful, * This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software * License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301 USA * MA 02110-1301 USA

View file

@ -3,20 +3,19 @@
* *
* Copyright (C) 2010-2016 Andy Green <andy@warmcat.com> * Copyright (C) 2010-2016 Andy Green <andy@warmcat.com>
* *
* This program is free software; you can redistribute it and/or * This file is made available under the Creative Commons CC0 1.0
* modify it under the terms of the GNU General Public * Universal Public Domain Dedication.
* License as published by the Free Software Foundation:
* version 2.1 of the License.
* *
* This library is distributed in the hope that it will be useful, * The person who associated a work with this deed has dedicated
* but WITHOUT ANY WARRANTY; without even the implied warranty of * the work to the public domain by waiving all of his or her rights
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * to the work worldwide under copyright law, including all related
* General Public License for more details. * 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 General Public * The test apps are intended to be adapted for use in your code, which
* License along with this library; if not, write to the Free Software * may be proprietary. So unlike the library itself, they are licensed
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, * Public Domain.
* MA 02110-1301 USA
*/ */
#include "lws_config.h" #include "lws_config.h"
@ -151,7 +150,7 @@ int main(int argc, char **argv)
lws_set_log_level(debug_level, lwsl_emit_syslog); lws_set_log_level(debug_level, lwsl_emit_syslog);
lwsl_notice("lwsws libwebsockets web server - license GPL2.1\n"); lwsl_notice("lwsws libwebsockets web server - license CC0 + LGPL2.1\n");
lwsl_notice("(C) Copyright 2010-2016 Andy Green <andy@warmcat.com>\n"); lwsl_notice("(C) Copyright 2010-2016 Andy Green <andy@warmcat.com>\n");
cs = config_strings = malloc(LWSWS_CONFIG_STRING_SIZE); cs = config_strings = malloc(LWSWS_CONFIG_STRING_SIZE);