colder Tue Jan 16 22:21:23 2007 UTC
Modified files:
/phpdoc/en/reference/sockets reference.xml
/phpdoc/en/reference/sockets/functions socket-create-pair.xml
socket-set-block.xml
socket-set-nonblock.xml
Log:
socket_strerror takes an int returned by socket_last_error which takes the
socket if any
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sockets/reference.xml?r1=1.22&r2=1.23&diff_format=u
Index: phpdoc/en/reference/sockets/reference.xml
diff -u phpdoc/en/reference/sockets/reference.xml:1.22
phpdoc/en/reference/sockets/reference.xml:1.23
--- phpdoc/en/reference/sockets/reference.xml:1.22 Sat Dec 9 13:22:39 2006
+++ phpdoc/en/reference/sockets/reference.xml Tue Jan 16 22:21:23 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
<!-- Purpose: remote.other -->
<!-- Membership: bundled -->
@@ -125,21 +125,21 @@
$address = '192.168.1.53';
$port = 10000;
-if (($sock = socket_create(AF_INET, SOCK_STREAM, SOL_TCP)) < 0) {
- echo "socket_create() failed: reason: " . socket_strerror($sock) . "\n";
+if (($sock = socket_create(AF_INET, SOCK_STREAM, SOL_TCP)) === false) {
+ echo "socket_create() failed: reason: " .
socket_strerror(socket_last_error()) . "\n";
}
-if (($ret = socket_bind($sock, $address, $port)) < 0) {
- echo "socket_bind() failed: reason: " . socket_strerror($ret) . "\n";
+if (socket_bind($sock, $address, $port) === false) {
+ echo "socket_bind() failed: reason: " .
socket_strerror(socket_last_error($sock)) . "\n";
}
-if (($ret = socket_listen($sock, 5)) < 0) {
- echo "socket_listen() failed: reason: " . socket_strerror($ret) . "\n";
+if (socket_listen($sock, 5) === false) {
+ echo "socket_listen() failed: reason: " .
socket_strerror(socket_last_error($sock)) . "\n";
}
do {
- if (($msgsock = socket_accept($sock)) < 0) {
- echo "socket_accept() failed: reason: " . socket_strerror($msgsock) .
"\n";
+ if (($msgsock = socket_accept($sock)) === false {
+ echo "socket_accept() failed: reason: " .
socket_strerror(socket_last_error($sock)) . "\n";
break;
}
/* Send instructions. */
@@ -149,7 +149,7 @@
do {
if (false === ($buf = socket_read($msgsock, 2048, PHP_NORMAL_READ))) {
- echo "socket_read() failed: reason: " . socket_strerror($ret) .
"\n";
+ echo "socket_read() failed: reason: " .
socket_strerror(socket_last_error($msgsock)) . "\n";
break 2;
}
if (!$buf = trim($buf)) {
@@ -198,16 +198,16 @@
/* Create a TCP/IP socket. */
$socket = socket_create(AF_INET, SOCK_STREAM, SOL_TCP);
-if ($socket < 0) {
- echo "socket_create() failed: reason: " . socket_strerror($socket) . "\n";
+if ($socket === false) {
+ echo "socket_create() failed: reason: " .
socket_strerror(socket_last_error()) . "\n";
} else {
echo "OK.\n";
}
echo "Attempting to connect to '$address' on port '$service_port'...";
$result = socket_connect($socket, $address, $service_port);
-if ($result < 0) {
- echo "socket_connect() failed.\nReason: ($result) " .
socket_strerror($result) . "\n";
+if ($result === false) {
+ echo "socket_connect() failed.\nReason: ($result) " .
socket_strerror(socket_last_error($socket)) . "\n";
} else {
echo "OK.\n";
}
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sockets/functions/socket-create-pair.xml?r1=1.12&r2=1.13&diff_format=u
Index: phpdoc/en/reference/sockets/functions/socket-create-pair.xml
diff -u phpdoc/en/reference/sockets/functions/socket-create-pair.xml:1.12
phpdoc/en/reference/sockets/functions/socket-create-pair.xml:1.13
--- phpdoc/en/reference/sockets/functions/socket-create-pair.xml:1.12 Fri May
27 09:19:25 2005
+++ phpdoc/en/reference/sockets/functions/socket-create-pair.xml Tue Jan
16 22:21:23 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
<refentry id="function.socket-create-pair">
<refnamediv>
@@ -174,15 +174,15 @@
<?php
$sockets = array();
/* Setup socket pair */
-if (!socket_create_pair(AF_UNIX, SOCK_STREAM, 0, $sockets)) {
- echo socket_strerror(socket_last_error());
+if (socket_create_pair(AF_UNIX, SOCK_STREAM, 0, $sockets) === false) {
+ echo "socket_create_pair failed. Reason:
".socket_strerror(socket_last_error());
}
/* Send and Recieve Data */
-if (!socket_write($sockets[0], "ABCdef123\n", strlen("ABCdef123\n"))) {
- echo socket_strerror(socket_last_error());
+if (socket_write($sockets[0], "ABCdef123\n", strlen("ABCdef123\n")) === false)
{
+ echo "socket_write() failed. Reason:
".socket_strerror(socket_last_error($sockets[0]));
}
-if (!$data = socket_read($sockets[1], strlen("ABCdef123\n"), PHP_BINARY_READ))
{
- echo socket_strerror(socket_last_error());
+if (($data = socket_read($sockets[1], strlen("ABCdef123\n"), PHP_BINARY_READ)
=== false) {
+ echo "socket_read() failed. Reason:
".socket_strerror(socket_last_error($sockets[1]));
}
var_dump($data);
@@ -203,8 +203,8 @@
$ary = array();
$strone = 'Message From Parent.';
$strtwo = 'Message From Child.';
-if (!socket_create_pair(AF_UNIX, SOCK_STREAM, 0, $ary)) {
- echo socket_strerror(socket_last_error());
+if (socket_create_pair(AF_UNIX, SOCK_STREAM, 0, $ary) === false) {
+ echo "socket_create_pair() failed. Reason:
".socket_strerror(socket_last_error());
}
$pid = pcntl_fork();
if ($pid == -1) {
@@ -212,8 +212,8 @@
} elseif ($pid) {
/*parent*/
socket_close($ary[0]);
- if (!socket_write($ary[1], $strone, strlen($strone))) {
- echo socket_strerror(socket_last_error());
+ if (socket_write($ary[1], $strone, strlen($strone)) === false) {
+ echo "socket_write() failed. Reason:
".socket_strerror(socket_last_error($ary[1]));
}
if (socket_read($ary[1], strlen($strtwo), PHP_BINARY_READ) == $strtwo) {
echo "Recieved $strtwo\n";
@@ -222,8 +222,8 @@
} else {
/*child*/
socket_close($ary[1]);
- if (!socket_write($ary[0], $strtwo, strlen($strtwo))) {
- echo socket_strerror(socket_last_error());
+ if (socket_write($ary[0], $strtwo, strlen($strtwo)) === false) {
+ echo "socket_write() failed. Reason:
".socket_strerror(socket_last_error($ary[0]));
}
if (socket_read($ary[0], strlen($strone), PHP_BINARY_READ) == $strone) {
echo "Recieved $strone\n";
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sockets/functions/socket-set-block.xml?r1=1.4&r2=1.5&diff_format=u
Index: phpdoc/en/reference/sockets/functions/socket-set-block.xml
diff -u phpdoc/en/reference/sockets/functions/socket-set-block.xml:1.4
phpdoc/en/reference/sockets/functions/socket-set-block.xml:1.5
--- phpdoc/en/reference/sockets/functions/socket-set-block.xml:1.4 Tue Apr
6 20:16:16 2004
+++ phpdoc/en/reference/sockets/functions/socket-set-block.xml Tue Jan 16
22:21:23 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<refentry id="function.socket-set-block">
<refnamediv>
<refname>socket_set_block</refname>
@@ -25,20 +25,20 @@
<?php
$port = 9090;
-if (!$socket = socket_create_listen($port)) {
- echo socket_strerror(socket_last_error());
+if (($socket = socket_create_listen($port)) === false) {
+ echo "socket_create_listen() failed. Reason:
".socket_strerror(socket_last_error());
}
-if (!socket_set_option($socket, SOL_SOCKET, SO_REUSEADDR, 1)) {
- echo socket_strerror(socket_last_error());
+if (socket_set_option($socket, SOL_SOCKET, SO_REUSEADDR, 1) === false) {
+ echo "socket_set_option() failed. Reason:
".socket_strerror(socket_last_error($socket));
}
-if (!socket_set_nonblock($socket)) { // $socket is now nonblocking
- echo socket_strerror(socket_last_error());
+if (socket_set_nonblock($socket) === false) { // $socket is now nonblocking
+ echo "socket_set_nonblock() failed. Reason:
".socket_strerror(socket_last_error($socket));
}
-if (!socket_set_block($socket)) { // $socket is now blocking
- echo socket_strerror(socket_last_error());
+if (socket_set_block($socket) === false) { // $socket is now blocking
+ echo "socket_set_block() failed. Reason: ".
socket_strerror(socket_last_error($socket));
}
?>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sockets/functions/socket-set-nonblock.xml?r1=1.7&r2=1.8&diff_format=u
Index: phpdoc/en/reference/sockets/functions/socket-set-nonblock.xml
diff -u phpdoc/en/reference/sockets/functions/socket-set-nonblock.xml:1.7
phpdoc/en/reference/sockets/functions/socket-set-nonblock.xml:1.8
--- phpdoc/en/reference/sockets/functions/socket-set-nonblock.xml:1.7 Sun Feb
13 14:19:01 2005
+++ phpdoc/en/reference/sockets/functions/socket-set-nonblock.xml Tue Jan
16 22:21:23 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
<refentry id="function.socket-set-nonblock">
<refnamediv>
@@ -23,16 +23,16 @@
<![CDATA[
<?php
$port = 9090;
-if (!$socket = socket_create_listen($port)) {
- echo socket_strerror(socket_last_error());
+if (($socket = socket_create_listen($port)) === false) {
+ echo "socket_create_listen() failed. Reason:
".socket_strerror(socket_last_error());
}
-if (!socket_set_option($socket, SOL_SOCKET, SO_REUSEADDR, 1)) {
- echo socket_strerror(socket_last_error());
+if (socket_set_option($socket, SOL_SOCKET, SO_REUSEADDR, 1) === false) {
+ echo "socket_set_option() failed. Reason:
".socket_strerror(socket_last_error($socket));
}
-if (!socket_set_nonblock($socket)) {
- echo socket_strerror(socket_last_error());
+if (socket_set_nonblock($socket) === false) {
+ echo "socket_set_nonblock() failed. Reason:
".socket_strerror(socket_last_error($socket));
}
?>
]]>
