Merge ccef3bc4e2aa6ee5b997a80aabb58f4ff0b0e98f into 1fad1626900a128be724cba9e9c19a6b2fe2bf6b

chore: Remove the executable permission bit from some source files (#434 )
Changed return text for ETIMEDOUT/ WSAETIMEDOUT
2025-04-23 08:56:44 +02:00 · 2024-07-12 11:22:37 +05:30 · 2024-06-29 14:33:47 +03:00 · 2015-09-03 15:24:22 +02:00
16 changed files with 1 additions and 1 deletions
--- a/Lua.props
+++ b/Lua.props
--- a/0
+++ b/0
--- a/mime.vcxproj
+++ b/mime.vcxproj
--- a/socket.vcxproj
+++ b/socket.vcxproj
--- a/src/inet.c
+++ b/src/inet.c
--- a/src/luasocket.c
+++ b/src/luasocket.c
--- a/src/makefile
+++ b/src/makefile
--- a/src/mime.c
+++ b/src/mime.c
--- a/src/pierror.h
+++ b/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"
--- a/src/socket.h
+++ b/src/socket.h
--- a/src/udp.c
+++ b/src/udp.c
--- a/src/wsocket.c
+++ b/src/wsocket.c
--- a/vc32.bat
+++ b/vc32.bat
--- a/vc64.bat
+++ b/vc64.bat
--- a/win32.cmd
+++ b/win32.cmd
--- a/win64.cmd
+++ b/win64.cmd
Author	SHA1	Message	Date
Egil Hjelmeland	86de264874	Merge ccef3bc4e2aa6ee5b997a80aabb58f4ff0b0e98f into 1fad1626900a128be724cba9e9c19a6b2fe2bf6b	2024-07-12 11:22:37 +05:30
Tianjia Zhang	1fad162690	chore: Remove the executable permission bit from some source files (#434 )	2024-06-29 14:33:47 +03:00
Egil Hjelmeland	ccef3bc4e2	Changed return text for ETIMEDOUT/ WSAETIMEDOUT 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”.	2015-09-03 15:24:22 +02:00