Commit Graph

462 Commits

Author SHA1 Message Date
Gustavo Lopes
17540788ad Added missing return statements 2013-02-02 16:38:06 +01:00
Gustavo Lopes
0f849fe2aa Add test and slightly tweak another 2013-02-02 16:38:06 +01:00
Gustavo Lopes
73ab2385cb Support for IPV6_HOPLIMIT and IPV6_TCLASS 2013-02-02 16:38:05 +01:00
Gustavo Lopes
b27c22d627 Fix bug in from_zval_write_control_array() 2013-02-02 16:38:05 +01:00
Gustavo Lopes
b06f00477c Fix bug converting zval sockaddr
The bug ocurred when the family was not specified but was instead guessed.
2013-02-02 16:38:05 +01:00
Gustavo Lopes
806a6e6399 Add IPV6_UNICAST_HOPS option constant. 2013-02-02 16:38:05 +01:00
Gustavo Lopes
eb4b1f6d46 Add test for recvmsg() 2013-02-02 16:38:05 +01:00
Gustavo Lopes
5e51c85143 Wrap recvmsg() and sendmsg()
This introduces two new functions:

int socket_recvmsg(resource $socket, array &$msghdr, int $flags)
int socket_sendmsg(resource $socket, array $msghdr, int $flags)

The arrays representing struct msghdr follow the native counterpart
closely: structs are mapped to arrays, fields to array elements whose
key is the name of the field without the prefix (e.g. "name" instead
of "msg_name") and array are mapped to sequential numeric PHP arrays.

Right now the only type of ancillary data supported is fot the
level/type pair IPPROTO_IPV6/IPV6_PKTINFO.

I also refactored out the name resolution functions and made
sockets_strerror() a global function.
2013-02-02 16:38:05 +01:00
Gustavo Lopes
ac47448abb Ignore warnings on EAGAIN/EWOULDBLOCK/EINPROGRESS
See bug #63570
2013-02-02 15:43:05 +01:00
Gustavo Lopes
e8f0e863ae Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix wrong blocking state being set
  Fix tests (Windows)
  Remove a Windows only warning
  Move & improve PHP_SOCKET_ERROR def
  Move some declarations to sockets.c
  Fix overbroad skipif include
2013-02-02 15:32:03 +01:00
Gustavo Lopes
ac6342bbc0 Fix wrong blocking state being set 2013-02-02 15:29:18 +01:00
Gustavo Lopes
40663ede83 Fix tests (Windows) 2013-02-02 15:29:18 +01:00
Gustavo Lopes
9283b8aea4 Move & improve PHP_SOCKET_ERROR def 2013-02-02 15:29:11 +01:00
Gustavo Lopes
97d656fc82 Move some declarations to sockets.c 2013-02-02 14:06:23 +01:00
Gustavo Lopes
a100c25ea4 Fix overbroad skipif include 2013-02-02 14:06:23 +01:00
Remi Collet
4608341303 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Mark this test as requiring internet connecion.
2013-01-31 14:39:42 +01:00
Remi Collet
9d75bf35e9 Mark this test as requiring internet connecion. 2013-01-31 14:38:39 +01:00
Remi Collet
4ad5c82016 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18) old: Stale NFS file handle new: Stale file handle
2013-01-31 14:25:43 +01:00
Remi Collet
f7362232f4 Fix failed test: sys_errlist[116] have changed on recent glibc (Fedora 18)
old: Stale NFS file handle
new: Stale file handle
2013-01-31 14:22:56 +01:00
Xinchen Hui
a666285bc2 Happy New Year 2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009 Happy New Year 2013-01-01 16:28:54 +08:00
Remi Collet
828bb4d44d Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  fix failing test on Linux build
2012-12-19 10:25:05 +01:00
Remi Collet
3732fa95c5 fix failing test on Linux build 2012-12-19 10:23:57 +01:00
Anatoliy Belsky
17dd769ab0 Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Revert the previous test fix
2012-12-03 15:16:34 +01:00
Anatoliy Belsky
b8553d8494 Revert the previous test fix
The fail seems to be due to network error
2012-12-03 15:14:43 +01:00
Anatoliy Belsky
262decd35f Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
  Fix test with a slightly different warning in TS
2012-12-03 10:44:10 +01:00
Anatoliy Belsky
89e547ce7f Fix test with a slightly different warning in TS 2012-12-03 10:41:17 +01:00
Lars Strojny
575b983703 Merge branch 'PHP-5.4' into PHP-5.5 2012-12-02 19:42:25 +01:00
Igor Wiedler
ec2a132f9c Bug #49341: Add SO_REUSEPORT support for socket_set_option()
This is a BSD-only feature, and it will only be available on BSD.
On other platforms the constant will simply not be set.
2012-12-02 18:56:57 +01:00
Anatoliy Belsky
bc9f8030c7 Fixed sockets ext build on win 2012-11-13 14:53:32 +01:00
Gustavo Lopes
e7e57aea0a Use if_nametoindex in Vista
I missed this instance in bf19838c.
2012-10-23 11:52:31 +02:00
Gustavo Lopes
bf19838c87 Do not disable RFC3678 multicast API on Windows
The API is supported since Windows Vista and requires targeting Vista
when compiling PHP. Pierre had asked to disable this by default, even
when targeting Vista/Windows Server 2008.

Since XP will not be supported anymore on php-next, any rationale
for this option will not apply anymore.
2012-09-20 23:36:20 +02:00
Lars Strojny
188c124a57 Bug #63000: MCAST_JOIN_GROUP on OSX is broken
The multicast support in PHP 5.4 makes use of MCAST_JOIN_GROUP if it is present.
The problem is that OSX 10.7 added the constant, but did not correctly implement
the feature. This causes the setsockopt call to fail.

The solution to the problem is to not use MCAST_JOIN_GROUP on OSX.

For reference, this was also done in VLC:

* http://trac.videolan.org/vlc/ticket/6104#comment:19
2012-09-19 22:17:35 +02:00
Anatoliy Belsky
97b8798520 Fixed test bug #62312 (warnings changed one more time) 2012-07-09 18:21:51 +02:00
Marc Easen
896ac689c9 Fixed the common misspelling of the word occurred (occured -> occurred) 2012-06-30 16:54:03 -07:00
Anatoliy Belsky
280e3a4ec8 Fixed bug #62312 ext\sockets\tests\socket_import_stream-4.phpt fails 2012-06-14 18:02:53 +02:00
Felipe Pena
074d361d64 - Fix the fix (typo s/AIX/_AIX/g) 2012-05-21 08:54:59 -03:00
Felipe Pena
ffe8303f24 - Fixed bug #62025 (__ss_family was changed on AIX 5.3) 2012-05-20 19:37:20 -03:00
Anatoliy Belsky
024cd2a124 Fixed bug #61638 Test ext\sockets\tests\unixloop.phpt fails 2012-04-10 14:00:51 +02:00
Anatoliy Belsky
bbab846ada Fixed bug #61637 ext\sockets\tests\socket_sentto_recvfrom_unix.phpt 2012-04-10 14:00:50 +02:00
Anatoliy Belsky
70f2f30e67 Fixed bug #61635 ext\sockets\tests\socket_select-wrongparams-1.phpt 2012-04-10 14:00:50 +02:00
Anatoliy Belsky
006b04da4a Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
  Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails
  Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails
  Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails
  Fixed bug 61621 Test fail in ext/standard/tests/dir
2012-04-10 13:09:48 +02:00
Anatoliy Belsky
c4676ee99f Fixed bug #61634 Test ext\sockets\tests\socket_listen-wrongparams.phpt fails 2012-04-10 13:08:57 +02:00
Anatoliy Belsky
5b0e7203e6 Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails 2012-04-10 13:06:15 +02:00
Anatoliy Belsky
83b48280c7 Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails 2012-04-10 13:06:14 +02:00
Anatoliy Belsky
5594fcf423 Fixed bug #61633 Test ext\sockets\tests\socket_create_pair-wrongparams.phpt fails 2012-04-10 13:02:53 +02:00
Anatoliy Belsky
37cb29ae90 Fixed bug #61632 Test ext\sockets\tests\socket_create_listen.phpt fails 2012-04-10 12:57:10 +02:00
Felipe Pena
e4ca0ed09f - Year++ 2012-01-01 13:15:04 +00:00
Felipe Pena
4e19825281 - Year++ 2012-01-01 13:15:04 +00:00
Stanislav Malyshev
d42917b605 test fixes 2011-12-26 03:22:07 +00:00
Gustavo André dos Santos Lopes
5759a440f8 - Small ajustments to some multicast options. 2011-11-26 17:48:52 +00:00
Felipe Pena
4168e0dfe4 - Fixed bug #60048 (sa_len a #define on IRIX)
patch by: china at thewrittenword dot com
2011-10-13 22:56:05 +00:00
Felipe Pena
1694d78769 - Fixed bug #60048 (sa_len a #define on IRIX)
patch by: china at thewrittenword dot com
2011-10-13 22:56:05 +00:00
Xinchen Hui
0f672ac0ba fixed typo 2011-09-07 00:56:52 +00:00
Xinchen Hui
ab9db759b9 fixed typo 2011-09-07 00:56:52 +00:00
Florian Anderiasch
c5741472b0 MFH: Fixed ext/sockets/tests/socket_strerror.phpt
So it seems a missing ) killed the test.
2011-09-06 11:15:23 +00:00
Florian Anderiasch
52124aa09c MFH: Fixed ext/sockets/tests/socket_strerror.phpt
So it seems a missing ) killed the test.
2011-09-06 11:15:23 +00:00
Felipe Pena
23e438594d - Make usage of new PHP_FE_END macro 2011-07-25 11:42:53 +00:00
Felipe Pena
4b30846b50 - Make usage of new PHP_FE_END macro 2011-07-25 11:35:02 +00:00
Gustavo André dos Santos Lopes
b9b749b704 - Further fix for bug #55111 (compilation failure of ext/sockets in Mac OS X). 2011-07-11 08:29:39 +00:00
Gustavo André dos Santos Lopes
7a402242bc - Fixed bug #55111 (sockets extension fails to compile on Mac OSX). 2011-07-02 12:03:32 +00:00
Gustavo André dos Santos Lopes
f99938c6ee - Fixed socket_import_stream returning NULL on some errors and FALSE on others 2011-06-28 10:27:29 +00:00
Gustavo André dos Santos Lopes
bc9c089f3a - Fixed ext/sockets build on Mac OS X (hopefully).
- Improvements in the multicast tests.
- Very light refactoring in sockets.c.
2011-06-11 20:20:50 +00:00
Felipe Pena
ee920e12ec - Fix the fix
# Arghh, copy and paste error :(
2011-05-24 00:10:00 +00:00
Felipe Pena
b60f6774dc - Fix the fix
# Arghh, copy and paste error :(
2011-05-24 00:10:00 +00:00
Felipe Pena
e9f4cfd6af - Fixed stack buffer overflow in socket_connect().
Found by: Mateusz Kocielski, Marek Kroemeke and Filip Palian
2011-05-24 00:05:50 +00:00
Felipe Pena
70f4069138 - Fixed stack buffer overflow in socket_connect().
Found by: Mateusz Kocielski, Marek Kroemeke and Filip Palian
2011-05-24 00:05:50 +00:00
Antony Dovgal
278392a10b fix tests 2011-05-03 11:15:45 +00:00
Antony Dovgal
354cb67597 fix tests 2011-05-03 11:15:30 +00:00
Gustavo André dos Santos Lopes
c2d392e934 - Fixed build on Solaris. 2011-04-30 15:56:07 +00:00
Gustavo André dos Santos Lopes
a6c9737749 - Fixed SKIPIF section missing a semicolon. 2011-04-30 15:54:44 +00:00
Pierre Joye
27c0221dc9 - not used on win 2011-03-30 09:46:56 +00:00
Pierre Joye
f7249e7c5c - fix build, should fix that code too on non win (wondering if that part was working at all) 2011-03-30 09:46:20 +00:00
Pierre Joye
38bbbe3417 - attempt to fix build, 1st error 2011-03-30 09:42:21 +00:00
Gustavo André dos Santos Lopes
660aa6701d - Updating UPGRADING for r309516 and modest merge to 5.3. 2011-03-23 00:51:22 +00:00
Gustavo André dos Santos Lopes
0de2e61cab - Added socket_import_stream().
- Fixed socket_strerror.phpt
- Made php_set_sock_blocking return FAILURE on fcntl error.
- Made socket_set_block()/socket_set_nonblock() emit warning on error.
2011-03-22 00:44:23 +00:00
Gustavo André dos Santos Lopes
95a3bfb1bc - Fixed SKIPIF section of bug51958.phpt. 2011-03-20 22:12:11 +00:00
Gustavo André dos Santos Lopes
bc13636bfe - Fixed SKIPIF section of bug51958.phpt. 2011-03-20 22:12:11 +00:00
Gustavo André dos Santos Lopes
2ddfe19120 - Normalized line endings, added native eol-style. 2011-03-20 02:05:41 +00:00
Gustavo André dos Santos Lopes
c9d397d59f - Adding copyright headers to the new files, gotta do something about the
windows line endings too, but I'm separating the commits.
2011-03-20 02:03:29 +00:00
Gustavo André dos Santos Lopes
ff0fe17725 - Replaced calls to getprotobyname by constants to avoid
unnecessarily hitting /etc/protocols on MINIT.
2011-03-17 22:21:59 +00:00
Gustavo André dos Santos Lopes
be87834321 - Merged fix for bug #51958 socket_accept() fails on IPv6 server sockets.
See r309238 for commit in trunk.
2011-03-17 15:36:52 +00:00
Gustavo André dos Santos Lopes
76dd2d8e2c - Fixed bug #51958: socket_accept() fails on IPv6 sockets.
#On hold for 5.3
2011-03-14 22:59:05 +00:00
Gustavo André dos Santos Lopes
e4298bf0fb - Added multicast support to the sockets extension (bug #40510). 2011-03-14 00:08:29 +00:00
Felipe Pena
927bf09c29 - Year++ 2011-01-01 02:19:59 +00:00
Felipe Pena
0203cc3d44 - Year++ 2011-01-01 02:17:06 +00:00
Eyal Teutsch
8e47365a97 fixed 6 tests to pass on non-linux os, by removing the generic linux error string from the exp result. on socket_strerror on the other hand, added to the SKIPIF a condition to run on linux only, as the test checks specifically various error strings 2010-12-26 13:10:23 +00:00
Eyal Teutsch
f21100b7f9 fixed 6 tests to pass on non-linux os, by removing the generic linux error string from the exp result. on socket_strerror on the other hand, added to the SKIPIF a condition to run on linux only, as the test checks specifically various error strings 2010-12-26 13:10:23 +00:00
Pierre Joye
aea6771d19 - add phpize support for windows, need a nmake install for now (nmake devel-pkg version is coming), works exactly the same as on unix, or should :) 2010-12-13 18:43:10 +00:00
Pierre Joye
a7ffa09e18 - add PHP_INSTALL_HEADERS to all parts (core&exts) exposing headers, generate the install-headers cmd 2010-12-11 22:18:10 +00:00
Rob Richards
0a34d10783 revert change #298288: Remove old dsp/dsw/makefile files 2010-04-28 14:41:51 +00:00
Kalle Sommer Nielsen
518a17e7bf Remove old dsp/dsw/makefile files, these arent used by the build system anymore and are barely updated nor available for all extensions 2010-04-21 23:36:49 +00:00
Sebastian Bergmann
9ba1e81665 sed -i "s#1997-2009#1997-2010#g" **/*.c **/*.h **/*.php 2010-01-03 09:23:27 +00:00
Mikko Koppanen
29b7cd5dcf Share the php_sockets.h header
Share php_sockets_le_socket_name
2009-12-27 01:00:50 +00:00
Jani Taskinen
70a2b56337 fix test 2009-12-11 15:06:50 +00:00
Kalle Sommer Nielsen
1063c8346b MFT: VC10 build support 2009-12-03 11:50:32 +00:00
Jani Taskinen
91cc127ce4 - Fix bad section names (extra - in the end..) 2009-11-09 17:08:48 +00:00
Pierre Joye
a2cffa2590 - #49464, fix build 2009-09-04 19:53:39 +00:00
Sriram Natarajan
ac2d3990f2 - Fixed bug #49447 (php engine need to correctly check for socket API
return status on windows). (Sriram Natarajan)
2009-09-04 07:59:48 +00:00
Antony Dovgal
fe7e08432e export le_socket from ext/sockets 2009-08-31 08:41:03 +00:00
Zoe Slattery
4cc35aeaaf The last of the 2009 testfest tests 2009-08-30 18:18:50 +00:00
Zoe Slattery
6a22ec3eda More tests from 2009 testfest 2009-08-30 09:30:13 +00:00
Zoe Slattery
1c98e49afd Test from 2009 testfest 2009-08-26 17:17:58 +00:00
Rasmus Lerdorf
a2c564b9e6 Make these socket tests less Linux-specific 2009-08-09 14:50:51 +00:00
Antony Dovgal
5725982614 stop polluting my /tmp dir 2009-07-03 14:02:28 +00:00
Andrei Zmievski
1787a2272a MFB 2009-06-04 18:17:43 +00:00
Arnaud Le Blanc
808acd6b64 MFH: Fix skipif 2009-05-20 09:13:29 +00:00
Arnaud Le Blanc
73553e8c77 MFH: Fixed bug #48326 (constant MSG_DONTWAIT not defined) 2009-05-20 09:05:46 +00:00
Felipe Pena
47f87a58aa - New tests (testfest BerlinUG) 2009-05-17 18:08:09 +00:00
Felipe Pena
91bdeda644 - MFH: Fixed memory leak (patch by Christian Weiske) 2009-05-10 01:03:45 +00:00
Pierre Joye
ebc2912872 - #47978, typo in ext/sockets/sockets.c 2009-04-16 05:33:13 +00:00
Ilia Alshanetsky
59e6e127d2 MFB: Return empty string when recv() does not fetch any data 2009-02-03 19:22:55 +00:00
Antony Dovgal
8e2c587a51 fix build 2009-01-24 13:08:04 +00:00
Hannes Magnusson
cbd8949ab5 Fix build 2009-01-24 12:42:19 +00:00
Kalle Sommer Nielsen
73b17408fb MFH: Windows support for stream_socket_pair(), by moving the socketpair() implementation from ext/sockets to win32/ 2009-01-23 15:49:49 +00:00
Kalle Sommer Nielsen
2f2d910797 MFH:
[DOC] Renable socket_create_pair() on Windows

# ext/sockets have its own implementation of socketpair(), perhaps we should move it
# to the core. This will make stream_socket_pair() available on Windows aswell
2009-01-01 05:24:29 +00:00
Sebastian Bergmann
08659c2dcd MFH: Bump copyright year, 3 of 3. 2008-12-31 11:15:49 +00:00
Felipe Pena
fc2fb50d09 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-11-17 11:28:01 +00:00
Felipe Pena
7a37fa2d6b - Revert ZEND_BEGIN_ARG_INFO change 2008-11-02 21:19:39 +00:00
Felipe Pena
df10005563 - MFH: Added 'static' into ZEND_BEGIN_ARG_INFO_EX macro 2008-10-24 14:35:40 +00:00
Arnaud Le Blanc
15aced54b0 MFH: Fixed bug #46360 (TCP_NODELAY constant for socket_{get,set}_option) 2008-10-22 18:59:33 +00:00
Arnaud Le Blanc
1d5ba8bb21 MFH: initialize optional vars 2008-10-21 23:39:15 +00:00
Pierre Joye
2620304003 - MFH:
- drop bindlib usage on windows
 - inet_pton, inet_ntop and inet_aton are always available (VC9 uses the CRT implementation, VC6 our own)
2008-08-23 19:22:10 +00:00
Jani Taskinen
d91bc9eca2 MFH:- Fixed bug #44127 (UNIX abstract namespace socket connect does not work) 2008-07-16 14:08:38 +00:00
Felipe Pena
026d7fe232 - Added arginfo
- Removed #include "zend_arg_defs.c" (it's unnecessary now)
2008-07-04 14:08:16 +00:00
Pierre Joye
41976c7ab6 - do not enable an ext when a lib/header fails
- use MESSAGE in mysql*
- use correct CFLAGS for ext/libxml headers
2008-06-23 18:40:29 +00:00
Felipe Pena
079bfadbe7 MFB: Fixed Bug #44197 (socket array keys lost on socket_select) 2008-02-21 02:56:57 +00:00
Nuno Lopes
61eb7ae554 remove unused PHP_EXTNAME_API macros.
#in preparation for the gcc 4 visibility patch
2008-01-03 16:20:33 +00:00
Sebastian Bergmann
d1dded8751 MFH: Bump copyright year, 2 of 2. 2007-12-31 07:17:19 +00:00
Dmitry Stogov
6c810b0d4c Improved memory usage by movig constants to read only memory. (Dmitry, Pierre) 2007-09-27 18:00:48 +00:00
Antony Dovgal
72fc33ef6a MFH 2007-09-26 10:55:07 +00:00
Jani Taskinen
c96c5ca91f MFH:- Added missing MSG_EOR and MSG_EOF constants 2007-07-24 11:35:08 +00:00
Jani Taskinen
10da2d994b MFH: removed useless file 2007-07-24 11:15:59 +00:00
Jani Taskinen
0b40ec1f19 MFH:- Fixed bug #21197 (socket_read() outputs error with PHP_NORMAL_READ) 2007-07-22 23:01:20 +00:00
Jani Taskinen
815d8a9743 MFH: ws fix + sync U stuff for patches to MFB easier 2007-07-22 22:47:18 +00:00
Jani Taskinen
542d413277 MFH: sync 2007-07-22 22:22:09 +00:00
Jani Taskinen
257405eda6 - Test properly for socketpair inside an extension. 2007-07-22 22:18:41 +00:00
Ilia Alshanetsky
9db4812366 Remove pointless RINIT 2007-05-19 17:58:22 +00:00
Martin Kraemer
9c62ddde34 Typo 2007-03-14 09:58:14 +00:00
Antony Dovgal
b42addcc54 MFH: zerofill socket structs 2007-02-25 22:59:32 +00:00
Antony Dovgal
634615cd42 MFH: fix tests 2007-02-12 14:49:05 +00:00
Hannes Magnusson
4e0f1992ed Add missing ifdefs for shutdown() 2007-01-10 15:25:07 +00:00
Sebastian Bergmann
4223aa4d5e MFH: Bump year. 2007-01-01 09:36:18 +00:00
Antony Dovgal
fdfa403388 MFH 2006-12-28 14:17:38 +00:00
Ilia Alshanetsky
557838efa4 Last set of zend_hash_init() optimizations 2006-10-03 19:51:01 +00:00
Antony Dovgal
75b8cd741b last portion of z/Z fixes 2006-08-31 16:15:24 +00:00
Antony Dovgal
71df07ac9a improve checks and fix #38251 2006-07-30 11:54:17 +00:00
Dmitry Stogov
1dbaae2795 Added automatic module globals management 2006-06-15 18:33:09 +00:00
Pierre Joye
3511649498 - revert last commit, something else went wrong 2006-04-07 14:04:36 +00:00
Pierre Joye
670ed5d93f - fix leak when an error occured in socket_read, free tmpbuf 2006-04-07 13:33:55 +00:00