Merge branch 'master' into hjelmeland-patch-1

Changed return text for ETIMEDOUT/ WSAETIMEDOUT to “connection timeout”.

This is needed for the application to be able tell to the difference between timeout of TCP connection (ETIMEDOUT/ WSAETIMEDOUT) and a normal return from a non-blocking socket (error codes EAGAIN/WSAEWOULDBLOCK). Both situations returned the text “timeout”.

.github/workflows/build.yml

@@ -8,19 +8,19 @@ on:
 
 jobs:
   build:
-    name: Test build on ${{ matrix.platform }}
+    name: Test ${{ matrix.luaVersion }} on ${{ matrix.platform }}
     strategy:
       fail-fast: false
       matrix:
         luaVersion: [ "5.4", "5.3", "5.2", "5.1", "luajit", "luajit-openresty" ]
-        platform: [ "ubuntu-20.04", "macos-11", "windows-2022" ]
+        platform: [ "ubuntu-22.04", "macos-11", "windows-2022" ]
     runs-on: ${{ matrix.platform }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Setup ’msvc’
+        if: ${{ startsWith(matrix.platform, 'windows') && !startsWith(matrix.luaVersion, 'luajit') }}
         uses: ilammy/msvc-dev-cmd@v1
-        if: ${{ !startsWith(matrix.luaVersion, 'luajit') }}
       - name: Setup ‘lua’
         uses: leso-kn/gh-actions-lua@v11-staging
         with:

.github/workflows/luacheck.yml

@@ -5,9 +5,9 @@ on: [push, pull_request]
 jobs:
 
   luacheck:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Luacheck
-        uses: lunarmodules/luacheck@v0
+        uses: lunarmodules/luacheck@v1

CMakeLists.txt

@@ -1,67 +0,0 @@
-project(luasocket)
-cmake_minimum_required(VERSION 2.8...3.20)
-include(CheckIncludeFile)
-check_include_file("lua.h" HAVE_LUA)
-set(socket_VERSION "3.0-rc1")
-set(MIME_VERSION "1.0.3")
-
-include_directories(BEFORE "${PROJECT_SOURCE_DIR}/src/")
-
-# add header files directory
-# include_directories()
-
-if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /O2 /Ot /MD /W3 /nologo")
-else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wshadow -Wextra -Wimplicit -O2 -ggdb3 -fpic")
-endif()
-
-
-if(WIN32)
-  if(${HAVE_LUA})
-    set(
-      SOURCE
-      "src/auxiliar.c"
-      "src/buffer.c"
-      "src/except.c"
-      "src/inet.c"
-      "src/io.c"
-      "src/options.c"
-      "src/select.c"
-      "src/tcp.c"
-      "src/udp.c"
-      "src/wsocket.c"
-    )
-  else()
-    message(FATAL_ERROR "can not found lua.h or lualib.h \n Maybe you can set \"include_directories(xxx/include)\"to solve this problem")  
-  endif()
-  add_library(socket SHARED "${SOURCE}")
-  add_library(mime SHARED "src/mime.c" "src/compat.c")
-  set_target_properties(socket PROPERTIES OUTPUT_NAME "socket")
-  set_target_properties(mime PROPERTIES OUTPUT_NAME "mime")
-elseif(APPLE)
-  #  MACOS build
-elseif(UNIX)
-  #  Linux or Unix build
-endif()
-
-set(
-  TO_SOCKET_LDIR
-  "src/http.lua"
-  "src/url.lua"
-  "src/tp.lua"
-  "src/ftp.lua"
-  "src/headers.lua"
-  "src/smtp.lua"
-)
-
-set(
-  TO_TOP_LDIR
-  "src/ltn12.lua"
-  "src/socket.lua"
-  "src/mime.lua"
-)
-
-install(TARGETS socket LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/luasocket/socket")
-install(FILES ${TO_SOCKET_LDIR} DESTINATION "${CMAKE_INSTALL_PREFIX}/luasocket/socket")
-install(FILES ${TO_TOP_LDIR} DESTINATION "${CMAKE_INSTALL_PREFIX}/luasocket")

src/pierror.h

@@ -12,7 +12,7 @@
 #define PIE_CONNREFUSED    "connection refused"
 #define PIE_CONNABORTED    "closed"
 #define PIE_CONNRESET      "closed"
-#define PIE_TIMEDOUT       "timeout"
+#define PIE_TIMEDOUT       "connection timeout"
 #define PIE_AGAIN          "temporary failure in name resolution"
 #define PIE_BADFLAGS       "invalid value for ai_flags"
 #define PIE_BADHINTS       "invalid value for hints"