colder Tue Feb 13 11:46:43 2007 UTC
Modified files:
/phpdoc/en/reference/sockets/functions socket-select.xml
/phpdoc/en/reference/stream/functions stream-select.xml
/phpdoc/en/reference/readline/functions
readline-callback-handler-install.xml
Log:
- Fix #40137 ( = NULL pass by ref)
- Remove other occurences of it
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sockets/functions/socket-select.xml?r1=1.13&r2=1.14&diff_format=u
Index: phpdoc/en/reference/sockets/functions/socket-select.xml
diff -u phpdoc/en/reference/sockets/functions/socket-select.xml:1.13
phpdoc/en/reference/sockets/functions/socket-select.xml:1.14
--- phpdoc/en/reference/sockets/functions/socket-select.xml:1.13 Sun Feb
13 14:19:01 2005
+++ phpdoc/en/reference/sockets/functions/socket-select.xml Tue Feb 13
11:46:43 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 -->
<refentry id="function.socket-select">
<refnamediv>
@@ -61,9 +61,10 @@
<![CDATA[
<?php
/* Prepare the read array */
-$read = array($socket1, $socket2);
-
-$num_changed_sockets = socket_select($read, $write = NULL, $except = NULL, 0);
+$read = array($socket1, $socket2);
+$write = NULL;
+$except = NULL;
+$num_changed_sockets = socket_select($read, $write, $except, 0);
if ($num_changed_sockets === false) {
/* Error handling */
@@ -87,7 +88,8 @@
<programlisting role="php">
<![CDATA[
<?php
-socket_select($r, $w, $e = NULL, 0);
+$e = NULL;
+socket_select($r, $w, $e, 0);
?>
]]>
</programlisting>
@@ -121,7 +123,8 @@
<programlisting role="php">
<![CDATA[
<?php
-if (false === socket_select($r, $w, $e = NULL, 0)) {
+$e = NULL;
+if (false === socket_select($r, $w, $e, 0)) {
echo "socket_select() failed, reason: " .
socket_strerror(socket_last_error()) . "\n";
}
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/stream/functions/stream-select.xml?r1=1.12&r2=1.13&diff_format=u
Index: phpdoc/en/reference/stream/functions/stream-select.xml
diff -u phpdoc/en/reference/stream/functions/stream-select.xml:1.12
phpdoc/en/reference/stream/functions/stream-select.xml:1.13
--- phpdoc/en/reference/stream/functions/stream-select.xml:1.12 Wed Apr 13
11:59:00 2005
+++ phpdoc/en/reference/stream/functions/stream-select.xml Tue Feb 13
11:46:43 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<refentry id="function.stream-select">
<refnamediv>
<refname>stream_select</refname>
@@ -102,9 +102,10 @@
<![CDATA[
<?php
/* Prepare the read array */
-$read = array($stream1, $stream2);
-
-if (false === ($num_changed_streams = stream_select($read, $write = NULL,
$except = NULL, 0))) {
+$read = array($stream1, $stream2);
+$write = NULL;
+$except = NULL;
+if (false === ($num_changed_streams = stream_select($read, $write, $except,
0))) {
/* Error handling */
} elseif ($num_changed_streams > 0) {
/* At least on one of the streams something interesting happened */
@@ -123,7 +124,8 @@
<programlisting role="php">
<![CDATA[
<?php
-stream_select($r, $w, $e = NULL, 0);
+$e = NULL;
+stream_select($r, $w, $e, 0);
?>
]]>
</programlisting>
@@ -137,7 +139,8 @@
<programlisting role="php">
<![CDATA[
<?php
-if (false === stream_select($r, $w, $e = NULL, 0)) {
+$e = NULL;
+if (false === stream_select($r, $w, $e, 0)) {
echo "stream_select() failed\n";
}
?>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/readline/functions/readline-callback-handler-install.xml?r1=1.2&r2=1.3&diff_format=u
Index:
phpdoc/en/reference/readline/functions/readline-callback-handler-install.xml
diff -u
phpdoc/en/reference/readline/functions/readline-callback-handler-install.xml:1.2
phpdoc/en/reference/readline/functions/readline-callback-handler-install.xml:1.3
---
phpdoc/en/reference/readline/functions/readline-callback-handler-install.xml:1.2
Sun Feb 4 02:47:03 2007
+++
phpdoc/en/reference/readline/functions/readline-callback-handler-install.xml
Tue Feb 13 11:46:43 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry id="function.readline-callback-handler-install">
<refnamediv>
<refname>readline_callback_handler_install</refname>
@@ -88,7 +88,9 @@
readline_callback_handler_install("[$c] Enter something: ", 'rl_callback');
while ($prompting) {
- $n = stream_select($r = array(STDIN), $w = null, $e = null, null);
+ $w = NULL;
+ $e = NULL;
+ $n = stream_select($r = array(STDIN), $w, $e, null);
if ($n && in_array(STDIN, $r)) {
// read a character, will call the callback when a newline is entered
readline_callback_read_char();
