From: Andy Green <andy.green@linaro.org>
Date: Sun, 21 Feb 2016 02:42:46 +0000 (+0800)
Subject: libwebsockets.org url updates
X-Git-Tag: upstream/2.0.3~218
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ce0326b83946887522e63433e751c2df10d40fd0;p=platform%2Fupstream%2Flibwebsockets.git

libwebsockets.org url updates

Signed-off-by: Andy Green <andy.green@linaro.org>
---

diff --git a/LICENSE b/LICENSE
index e093d53..da87198 100644
--- a/LICENSE
+++ b/LICENSE
@@ -20,7 +20,7 @@ following example statement can be included in user documentation to
 satisfy this requirement:
 
 "[program] is based in part on the work of the libwebsockets  project
-(http://libwebsockets.org)"
+(https://libwebsockets.org)"
 
 3) Some sources included have their own, more liberal licenses, or options
 to get original sources with the liberal terms.
diff --git a/README.md b/README.md
index 082f199..ec24329 100644
--- a/README.md
+++ b/README.md
@@ -8,16 +8,21 @@ libwebsockets
 This is the libwebsockets C library for lightweight websocket clients and
 servers.  For support, visit
 
- http://libwebsockets.org
+ https://libwebsockets.org
+ https://github.com/warmcat/libwebsockets
 
 and consider joining the project mailing list at
 
- http://ml.libwebsockets.org/mailman/listinfo/libwebsockets
+ https://libwebsockets.org/mailman/listinfo/libwebsockets
 
-You can get the latest version of the library from git
+| News |
+------
+| We have updated https://libwebsockets.org, if you would like your project using lws featured in the image carousel, send an image, project URL and brief summary to andy@warmcat.com |
+
+You can get the latest version of the library from git:
 
-- http://git.libwebsockets.org
 - https://github.com/warmcat/libwebsockets
+- https://libwebsockets.org/git
 
 for more information:
 
diff --git a/libwebsockets.spec b/libwebsockets.spec
index f8e1766..9a28708 100644
--- a/libwebsockets.spec
+++ b/libwebsockets.spec
@@ -5,7 +5,7 @@ Summary: Websocket Server and Client Library
 
 Group: System Environment/Libraries
 License: LGPLv2 with exceptions
-URL: http://warmcat.com
+URL: https://libwebsockets.org
 Source0: %{name}-%{version}.tar.gz
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
diff --git a/test-server/test.html b/test-server/test.html
index 235c21f..43ca340 100644
--- a/test-server/test.html
+++ b/test-server/test.html
@@ -19,7 +19,7 @@
 
 <table><tr><td>
 
-<table width="100%"><tr><td valign=middle align=center><a href="http://libwebsockets.org"><img src="/libwebsockets.org-logo.png"></a></td><td>
+<table width="100%"><tr><td valign=middle align=center><a href="https://libwebsockets.org"><img src="/libwebsockets.org-logo.png"></a></td><td>
 <section class="browser">Detected Browser: <div id=brow>...</div></section></td></tr></table>
 
 </td></tr><tr><td>
@@ -98,8 +98,8 @@ initiate the close.
 <br>
 
 </td></tr><tr><td>
-Looking for support? <a href="http://libwebsockets.org">http://libwebsockets.org</a><br/>
-Join the mailing list: ​<a href="http://ml.libwebsockets.org/mailman/listinfo/libwebsockets">http://ml.libwebsockets.org/mailman/listinfo/libwebsockets</a>
+Looking for support? <a href="https://libwebsockets.org">https://libwebsockets.org</a>, <a href="https://github.com/warmcat/libwebsockets">https://github.com/warmcat/libwebsockets</a></a><br/>
+Join the mailing list: <a href="https://libwebsockets.org/mailman/listinfo/libwebsockets">https://libwebsockets.org/mailman/listinfo/libwebsockets</a>
 
 </td></tr></table>
 
diff --git a/win32port/libwebsockets.nsi b/win32port/libwebsockets.nsi
index f701265..32b8264 100644
--- a/win32port/libwebsockets.nsi
+++ b/win32port/libwebsockets.nsi
@@ -69,7 +69,7 @@ Section "Files" SecInstall
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libwebsockets" "DisplayName" "libwebsockets library and clients"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libwebsockets" "UninstallString" "$\"$INSTDIR\Uninstall.exe$\""
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libwebsockets" "QuietUninstallString" "$\"$INSTDIR\Uninstall.exe$\" /S"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libwebsockets" "HelpLink" "http://libwebsockets.org/"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libwebsockets" "HelpLink" "https://libwebsockets.org/"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libwebsockets" "URLInfoAbout" "http://libwebsockets.org/"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libwebsockets" "DisplayVersion" "${VERSION}"
 	WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\libwebsockets" "NoModify" "1"