5 files changed, 47 insertions, 58 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c079a49..229fcbf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,8 +25,10 @@ jobs:
         uses: luarocks/gh-actions-lua@v10
         with:
           luaVersion: ${{ matrix.luaVersion }}
+          buildCache: false
       - name: Setup ‘luarocks’
-        uses: luarocks/gh-actions-luarocks@v5
+        # master branch until tagged release has luajit & msvcrt fixes
+        uses: luarocks/gh-actions-luarocks@master
       - name: Make and install
         run: |
           luarocks make -- luasocket-scm-3.rockspec
diff --git a/docs/installation.html b/docs/installation.html
index 25c0bba..b56f50f 100644
--- a/docs/installation.html
+++ b/docs/installation.html
@@ -37,70 +37,30 @@ Installation">
 
 <!-- installation ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 
-<h2>Installation</h2>
-
-<p> Here we describe the standard distribution.  If the
-standard doesn't meet your needs, we refer you to the Lua
-discussion list, where any question about the package scheme
-will likely already have been answered.  </p>
-
-<h3>Directory structure</h3>
-
-<p> On Unix systems, the standard distribution uses two base
-directories, one for system dependent files, and another for system
-independent files. Let's call these directories <tt>&lt;CDIR&gt;</tt>
-and <tt>&lt;LDIR&gt;</tt>, respectively.
-For example, in my laptp, Lua&nbsp;5.1 is configured to
-use '<tt>/usr/local/lib/lua/5.1</tt>' for
-<tt>&lt;CDIR&gt;</tt> and '<tt>/usr/local/share/lua/5.1</tt>' for
-<tt>&lt;LDIR&gt;</tt>. On Windows, <tt>&lt;CDIR&gt;</tt>
-usually points to the directory where the Lua executable is
-found, and <tt>&lt;LDIR&gt;</tt> points to a
-<tt>lua/</tt> directory inside <tt>&lt;CDIR&gt;</tt>. (These
-settings can be overridden by environment variables
-<tt>LUA_PATH</tt> and <tt>LUA_CPATH</tt>. See the Lua
-documentation for details.) Here is the standard LuaSocket
-distribution directory structure:</p>
+<h2>Installation via luarocks</h2>
 
-<pre class=example>
-&lt;LDIR&gt;/ltn12.lua
-&lt;LDIR&gt;/socket.lua
-&lt;CDIR&gt;/socket/core.dll
-&lt;LDIR&gt;/socket/http.lua
-&lt;LDIR&gt;/socket/tp.lua
-&lt;LDIR&gt;/socket/ftp.lua
-&lt;LDIR&gt;/socket/smtp.lua
-&lt;LDIR&gt;/socket/url.lua
-&lt;LDIR&gt;/mime.lua
-&lt;CDIR&gt;/mime/core.dll
-</pre>
 
-<p> Naturally, on Unix systems, <tt>core.dll</tt>
-would be replaced by <tt>core.so</tt>.
-</p>
 
-<h3>Using LuaSocket</h3>
+<p>LuaSocket can be easily installed using <a href="https://luarocks.org/" target="_blank">LuaRocks</a>, the Lua package manager.</p>
 
-<p> With the above setup, and an interpreter with shared library support,
-it should be easy to use LuaSocket. Just fire the interpreter and use the
-<tt>require</tt> function to gain access to whatever module you need:</p>
+<h3>Installing via LuaRocks</h3>
 
+<p>Run the following command in your terminal:</p>
 <pre class=example>
-Lua 5.2.2  Copyright (C) 1994-2013 Lua.org, PUC-Rio
-&gt; socket = require("socket")
-&gt; print(socket._VERSION)
---&gt; LuaSocket 3.1.0
+luarocks install luasocket
 </pre>
 
-<p> Each module loads their dependencies automatically, so you only need to
-load the modules you directly depend upon: </p>
+<h3>Verification</h3>
+    <p>To verify that LuaSocket is installed correctly, open Lua and run:</p>
+    <pre class=example><code>
+   local socket = require("socket")
+   print(socket._VERSION)
+    </code></pre>
 
-<pre class=example>
-Lua 5.2.2  Copyright (C) 1994-2013 Lua.org, PUC-Rio
-&gt; http = require("socket.http")
-&gt; print(http.request("http://www.impa.br/~diego/software/luasocket"))
---&gt; homepage gets dumped to terminal
-</pre>
+<p>If you see output like <strong>LuaSocket 3.0</strong>, the installation was successful.</p>
+
+<h3>More Information</h3>
+<p>For more details, visit the <a href="https://github.com/lunarmodules/luasocket" target="_blank">LuaSocket GitHub repository</a>.</p>
 
 <!-- footer +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -->
 
diff --git a/makefile b/makefile
index 63d9985..227ad70 100644
--- a/makefile
+++ b/makefile
@@ -10,7 +10,7 @@
 #   print                  print the build settings
 
 PLAT?= linux
-PLATS= macosx linux win32 win64 mingw freebsd solaris
+PLATS= macosx linux win32 win64 mingw freebsd solaris ucrt64
 
 all: $(PLAT)
 
diff --git a/src/makefile b/src/makefile
index 25b293c..868f98c 100644
--- a/src/makefile
+++ b/src/makefile
@@ -74,6 +74,13 @@ LUAPREFIX_mingw?=/usr
 CDIR_mingw?=lua/$(LUAV)
 LDIR_mingw?=lua/$(LUAV)/lua
 
+# where lua headers are found for ucrt64 builds
+# LUAINC_ucrt64:
+LUAINC_ucrt64?=/ucrt64/include
+LUALIB_ucrt64?=/ucrt64/bin/lua$(subst .,,$(LUAV)).dll
+LUAPREFIX_ucrt64?=/ucrt64
+CDIR_ucrt64?=lib/lua/$(LUAV)
+LDIR_ucrt64?=share/lua/$(LUAV)
 
 # LUAINC_win32:
 # LUALIB_win32:
@@ -153,7 +160,7 @@ print:
 #------
 # Supported platforms
 #
-PLATS= macosx linux win32 win64 mingw solaris
+PLATS= macosx linux win32 win64 mingw solaris ucrt64
 
 #------
 # Compiler and linker settings
@@ -219,6 +226,21 @@ LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
 LD_mingw=gcc
 SOCKET_mingw=wsocket.o
 
+#------
+# Compiler and linker settings
+# for ucrt64
+SO_ucrt64=dll
+O_ucrt64=o
+CC_ucrt64=gcc
+DEF_ucrt64= -DLUASOCKET_$(DEBUG) \
+        -DWINVER=0x0501
+CFLAGS_ucrt64= -I$(LUAINC) $(DEF) -Wall -O2 -fno-common 
+# \
+        -fvisibility=hidden
+LDFLAGS_ucrt64= $(LUALIB) -shared -Wl,-s -lws2_32 -o
+LD_ucrt64=gcc
+SOCKET_ucrt64=wsocket.o
+
 
 #------
 # Compiler and linker settings
@@ -384,6 +406,9 @@ linux:
 mingw:
         $(MAKE) all PLAT=mingw
 
+ucrt64:
+        $(MAKE) all PLAT=ucrt64
+
 solaris:
         $(MAKE) all-unix PLAT=solaris
 
diff --git a/src/udp.h b/src/udp.h
index 07d5247..cc14619 100644
--- a/src/udp.h
+++ b/src/udp.h
@@ -17,7 +17,9 @@
 #include "timeout.h"
 #include "socket.h"
 
+#ifndef UDP_DATAGRAMSIZE
 #define UDP_DATAGRAMSIZE 8192
+#endif
 
 typedef struct t_udp_ {
     t_socket sock;