Skip to content

Commit 9f7e27a

Browse files
doubaokuncmb69
authored andcommitted
Fix: sockets constants
Closes GH-9533.
1 parent d1fc001 commit 9f7e27a

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ PHP NEWS
22
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
33
?? ??? ????, PHP 8.2.0RC3
44

5+
- Sockets:
6+
. Fixed socket constants regression as of PHP 8.2.0beta3. (Bruce Dou)
57

68
15 Sep 2022, PHP 8.2.0RC2
79

ext/sockets/php_sockets.h

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,14 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket
183183
#define PHP_SOCKET_EINVAL EINVAL
184184
#endif
185185

186+
#ifdef ENFILE
187+
#define PHP_SOCKET_ENFILE ENFILE
188+
#endif
189+
186190
#ifdef WIN32
187191
#define PHP_SOCKET_EMFILE WSAEMFILE
188192
#elif defined(EMFILE)
189-
#define PHP_SOCKET_ENFILE EMFILE
193+
#define PHP_SOCKET_EMFILE EMFILE
190194
#endif
191195

192196
#ifdef WIN32
@@ -257,7 +261,7 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket
257261

258262
#ifdef WIN32
259263
#define PHP_SOCKET_EPFNOSUPPORT WSAEPFNOSUPPORT
260-
#elif defined(EOPNOTSUPP)
264+
#elif defined(EPFNOSUPPORT)
261265
#define PHP_SOCKET_EPFNOSUPPORT EPFNOSUPPORT
262266
#endif
263267

@@ -293,8 +297,8 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket
293297

294298
#ifdef WIN32
295299
#define PHP_SOCKET_ENETRESET WSAENETRESET
296-
#elif defined(WSAENETRESET)
297-
#define PHP_SOCKET_ENETRESET ENETUNREACH
300+
#elif defined(ENETRESET)
301+
#define PHP_SOCKET_ENETRESET ENETRESET
298302
#endif
299303

300304
#ifdef WIN32
@@ -304,9 +308,9 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket
304308
#endif
305309

306310
#ifdef WIN32
307-
#define PHP_SOCKET_ECONNRESET WSAECONNABORTED
308-
#elif defined(ECONNABORTED)
309-
#define PHP_SOCKET_ECONNRESET ECONNABORTED
311+
#define PHP_SOCKET_ECONNRESET WSAECONNRESET
312+
#elif defined(ECONNRESET)
313+
#define PHP_SOCKET_ECONNRESET ECONNRESET
310314
#endif
311315

312316
#ifdef WIN32
@@ -329,16 +333,10 @@ PHP_SOCKETS_API int socket_import_file_descriptor(PHP_SOCKET socket, php_socket
329333

330334
#ifdef WIN32
331335
#define PHP_SOCKET_ESHUTDOWN WSAESHUTDOWN
332-
#elif defined(EISCONN)
336+
#elif defined(ESHUTDOWN)
333337
#define PHP_SOCKET_ESHUTDOWN ESHUTDOWN
334338
#endif
335339

336-
#ifdef WIN32
337-
#define PHP_SOCKET_ETOOMANYREFS WSAETOOMANYREFS
338-
#elif defined(EISCONN)
339-
#define PHP_SOCKET_ETOOMANYREFS ETOOMANYREFS
340-
#endif
341-
342340
#ifdef WIN32
343341
#define PHP_SOCKET_ETOOMANYREFS WSAETOOMANYREFS
344342
#elif defined(ETOOMANYREFS)

0 commit comments

Comments
 (0)