Merge pull request #12 from francois-normandin/master

Fixes
MediaMongrels-Ltd · Dec 8, 2023 · a98c727 · a98c727
2 parents ca98d38 + df2ec54
commit a98c727
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 15 deletions.
diff --git a/Source/WebSockets Examples.aliases b/Source/WebSockets Examples.aliases
diff --git a/Source/WebSockets/WebSocket/Internal Read.vi b/Source/WebSockets/WebSocket/Internal Read.vi
diff --git a/Source/WebSockets/WebSocket/Read Return Header.vi b/Source/WebSockets/WebSocket/Read Return Header.vi
diff --git a/Source/WebSockets/WebSocket/Set Return Header.vi b/Source/WebSockets/WebSocket/Set Return Header.vi
diff --git a/WebSockets API.vipb b/WebSockets API.vipb
@@ -1,15 +1,15 @@
-<VI_Package_Builder_Settings Version="2018" Created_Date="2014-11-21 13:05:45" Modified_Date="2019-11-30 16:04:10" Creator="Sam Sharp" Comments="" ID="7df77f4077d5cca1e15bd3ea18a066cc">
+<VI_Package_Builder_Settings Version="2018" Created_Date="2014-11-21 13:05:45" Modified_Date="2023-10-13 05:59:39" Creator="Sam Sharp" Comments="" ID="495c6232a908970e8e07f6cb76d28720">
   <Library_General_Settings>
     <Package_File_Name>MediaMongrels_Ltd_lib_WebSockets_API</Package_File_Name>
-    <Library_Version>2.0.1.41</Library_Version>
+    <Library_Version>2.0.2.42</Library_Version>
     <Auto_Increment_Version>false</Auto_Increment_Version>
     <Library_Source_Folder>Source</Library_Source_Folder>
     <Library_Output_Folder>Builds</Library_Output_Folder>
     <Company_Name>MediaMongrels Ltd</Company_Name>
     <Library_Summary/>
     <Library_License>MIT License</Library_License>
     <Package_LabVIEW_Version>13.0</Package_LabVIEW_Version>
-    <Community_Edition>false</Community_Edition>
+    <Community_Edition>true</Community_Edition>
     <Package_Icon>00000D7E002800000C9A00000400000200020022002200080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA0000888888888888000077777777777700005555555555550000444444444444000022222222222200001111111111110000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF724E4E24242B5DB9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9FFFF72724E4E242B5DFAFAFAFAF8B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9FFFF9672724E4E4F5DB9B9B9B9FAF8B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9FFFFBA967272724F5DFFB9B9B9FFFAFFFFFFB9FFFFFFB9B9B9B9B9B9FFFFFFB9FFFFBABABA96724F4FFF75FFB9FFFAFFB9B9B9FFB9B9FFB9B9B9B9FFB9B9B9B9FFFFBA9697734F7425FF76FF79FFFAFFFFB9B9FFFFFFB9B9FFFFB9B9FFFFB9B9FFFF5632322A9A764925FFC1FF7BF8FFB9B9B9FFB9B9FFB9B9B9B9B9B9B9FFB9FFFF5757562AC29A7672FFC2FFA6B9FFFFFFB9FFFFFFB9B9B9B9B9FFFFFFB9B9FFFF3232564EC7C3C1C0C0CACBC9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9FFFF2BF6324EC7C7C9C4C7C8CAA5B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9B9FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF0000000000000000FF000000FF00FFFFFF00FFFFFF000000000000000000FFFF0000000000000000FF00FF00FF00FF000000FF0000FF0000000000000000FFFF0000000000000000FF00FF00FF00FFFF0000FFFFFF000000000000000000FFFF000000000000000000FF00FF0000FF000000FF0000FF0000000000000000FFFF000000000000000000FF00FF0000FFFFFF00FFFFFF000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF0000FFFFFF0000FFFF000000FFFF0000FF0000FF00FFFFFF00FFFFFF0000FFFF00FF00000000FF0000FF00FF0000FF00FF00FF0000FF00000000FF000000FFFF0000FFFF0000FF0000FF00FF00000000FFFF000000FFFF000000FF000000FFFF00000000FF00FF0000FF00FF0000FF00FF00FF0000FF00000000FF000000FFFF00FFFFFF000000FFFF000000FFFF0000FF0000FF00FFFFFF0000FF000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFF000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF002900000012000000020000000D01000000000100000000000A000000080000000000240024002900000012000000020000000D00B2B2B900010000000000100000001000000002002300000000000000000023002900000012000000020000000D00FCFCFD00010000000000100000001000000002002200010001000100010022002900000012000000020000000D00B2B2B900010000000000100000001000000002000000240024002400240000002900000012000000020000000D0080808A00010000000000100000001000000002000100230023002300230001</Package_Icon>
     <Product_Name>WebSockets</Product_Name>
     <Was_Built>true</Was_Built>
@@ -34,7 +34,8 @@
       <Copyright/>
       <Packager>Sam Sharp</Packager>
       <URL>http://www.mediamongrels.com/websockets-library</URL>
-      <Release_Notes>- Fix issue where the Sec-WebSocket-Key is not correctly generated (not Base64-encoded)</Release_Notes>
+      <Release_Notes>[Fix: 7] Handshake header is now case-insensitive match as per RFC2616
+[Fix: 9] Fix for an infinite loop on Read is no connection (no socket) </Release_Notes>
     </Description>
     <Destinations>
       <Toolkit_VIs>
@@ -213,6 +214,7 @@
       <close_labview_before_install>false</close_labview_before_install>
       <restart_labview_after_install>false</restart_labview_after_install>
       <skip_mass_compile_after_install>false</skip_mass_compile_after_install>
+      <install_into_global_environment>false</install_into_global_environment>
     </LabVIEW>
     <VI_Docs>
       <Edit_VI_Description>true</Edit_VI_Description>
@@ -411,7 +413,7 @@
         <Path>Source\WebSockets\WebSocket</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>34F4A39545D97552068FD01C813DED0B</GUID>
+      <GUID>C80197D037E44B143860465A60A97BAF</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -488,7 +490,7 @@
         <Path>Source\VISA Socket Listener</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>76C166D38719864D0A17B73A5372A802</GUID>
+      <GUID>0F1FDEFF996396CC0DBBD46B6377C45B</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>1</Parent_Palette_Index>
@@ -551,7 +553,7 @@
         <Path>Source\Sockets\Socket\Close.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>29D6E2E68E1A0690328544B8EBCDEB73</GUID>
+      <GUID>0622334091E8BA671A59C5A0A4F123AC</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>1</Parent_Palette_Index>
@@ -642,7 +644,7 @@
         <Path>Source\Sockets\VISA TCP Socket\New TCP Socket Connection.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>5A7457B22B5C49A4E4F896A0DD858F63</GUID>
+      <GUID>E4376F2FE79904FFE9EBB1E467273ED3</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -747,7 +749,7 @@
         <Path>Source\WebSockets\GetHeader.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>43DFDF2A78916BAC4819A76DBB53CDFC</GUID>
+      <GUID>CDAE7AB32AC660F88AE72E553BA010A9</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>0</Parent_Palette_Index>
@@ -866,7 +868,7 @@
         <Path>Source\WebSockets\WebSocket\Write Send Headers.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>62DDA265A1506499311735A2033195D4</GUID>
+      <GUID>EBF6BEDEB0BEE367A726CAD10280D444</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>1</Parent_Palette_Index>
@@ -929,7 +931,7 @@
         <Path>Source\Sockets\Socket Listener\Close.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>29B18571E4F42BAC11625CE82E213E55</GUID>
+      <GUID>0D791DC7861F56FDEEAF1E46DB6BAED5</GUID>
     </Functions_Palette_Data>
     <Functions_Palette_Data>
       <Parent_Palette_Index>1</Parent_Palette_Index>
@@ -1006,7 +1008,7 @@
         <Path>Source\Sockets\VISA TCP Listener\New VISA TCP Listener.vi</Path>
         <VI_Title/>
       </Items_Data>
-      <GUID>D0A0BD3DE130BE828EAAE7AA915DD410</GUID>
+      <GUID>94C8602694DC3C6EE2766380803BB7F4</GUID>
     </Functions_Palette_Data>
   </Library_Palette_Definition>
 </VI_Package_Builder_Settings>