X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LICENSE;h=9ce0f416084b8f2df8cc703ef9ee057abe312a9a;hb=ce2e74e5e38ba8c03620946e947e86dad0b81a76;hp=ef462df47f029252bd199c32eb6eb3b2c978ea57;hpb=cd0c696a0d879f66c8142ace0619b944efd08915;p=platform%2Fupstream%2Flibwebsockets.git

diff --git a/LICENSE b/LICENSE
index ef462df..9ce0f41 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,13 @@
 Libwebsockets and included programs are provided under the terms of the GNU
 Library General Public License (LGPL) 2.1, with the following exceptions:
 
-1) Static linking of programs with the libwebsockets library does not
+1) Any reference, whether in these modifications or in the GNU
+Library General Public License 2.1, to this License, these terms, the
+GNU Lesser Public License,  GNU Library General Public License, LGPL, or
+any similar reference shall refer to the GNU Library General Public
+License 2.1 as modified by these paragraphs 1) through 4).
+
+2) Static linking of programs with the libwebsockets library does not
 constitute a derivative work and does not require the author to provide 
 source code for the program, use the shared libwebsockets libraries, or
 link their program against a user-supplied version of libwebsockets.
@@ -10,7 +16,7 @@ If you link the program to a modified version of libwebsockets, then the
 changes to libwebsockets must be provided under the terms of the LGPL in
 sections 1, 2, and 4.
 
-2) You do not have to provide a copy of the libwebsockets license with
+3) You do not have to provide a copy of the libwebsockets license with
 programs that are linked to the libwebsockets library, nor do you have to
 identify the libwebsockets license in your program or documentation as
 required by section 6 of the LGPL.
@@ -22,7 +28,7 @@ satisfy this requirement:
 "[program] is based in part on the work of the libwebsockets  project
 (https://libwebsockets.org)"
 
-3) Some sources included have their own, more liberal licenses, or options
+4) Some sources included have their own, more liberal licenses, or options
 to get original sources with the liberal terms.
 
 Original liberal license retained
@@ -40,18 +46,10 @@ Public Domain (CC-zero) to simplify reuse
 
   - test-server/*.c
   - test-server/*.h
-  
-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
-
-
+  - lwsws/*
 
+------ end of exceptions
+ 
                   GNU LESSER GENERAL PUBLIC LICENSE
                        Version 2.1, February 1999