reference/stream/functions/stream-socket-accept.xml
c3067ab0a7f55632c87da73368fd3c739e110a57
c3067ab0a7f55632c87da73368fd3c739e110a57
...
...
@@ -9,10 +9,10 @@
9
9
<refsect1 role="description">
10
10
&reftitle.description;
11
11
<methodsynopsis>
12
-
<type>resource</type><methodname>stream_socket_accept</methodname>
13
-
<methodparam><type>resource</type><parameter>server_socket</parameter></methodparam>
14
-
<methodparam choice="opt"><type>float</type><parameter>timeout</parameter><initializer>ini_get("default_socket_timeout")</initializer></methodparam>
15
-
<methodparam choice="opt"><type>string</type><parameter role="reference">peername</parameter></methodparam>
12
+
<type class="union"><type>resource</type><type>false</type></type><methodname>stream_socket_accept</methodname>
13
+
<methodparam><type>resource</type><parameter>socket</parameter></methodparam>
14
+
<methodparam choice="opt"><type class="union"><type>float</type><type>null</type></type><parameter>timeout</parameter><initializer>&null;</initializer></methodparam>
15
+
<methodparam choice="opt"><type>string</type><parameter role="reference">peer_name</parameter><initializer>&null;</initializer></methodparam>
16
16
</methodsynopsis>
17
17
<para>
18
18
Accept a connection on a socket previously created by
...
...
@@ -25,7 +25,7 @@
25
25
<para>
26
26
<variablelist>
27
27
<varlistentry>
28
-
<term><parameter>server_socket</parameter></term>
28
+
<term><parameter>socket</parameter></term>
29
29
<listitem>
30
30
<para>
31
31
The server socket to accept a connection from.
...
...
@@ -37,12 +37,13 @@
37
37
<listitem>
38
38
<para>
39
39
Override the default socket accept timeout. Time should be given in
40
-
seconds.
40
+
seconds. By default, <link linkend="ini.default-socket-timeout">default_socket_timeout</link>
41
+
is used.
41
42
</para>
42
43
</listitem>
43
44
</varlistentry>
44
45
<varlistentry>
45
-
<term><parameter>peername</parameter></term>
46
+
<term><parameter>peer_name</parameter></term>
46
47
<listitem>
47
48
<para>
48
49
Will be set to the name (address) of the client which connected, if
...
...
@@ -67,6 +68,28 @@
67
68
</para>
68
69
</refsect1><!-- }}} -->
69
70
71
+
<refsect1 role="changelog">
72
+
&reftitle.changelog;
73
+
<informaltable>
74
+
<tgroup cols="2">
75
+
<thead>
76
+
<row>
77
+
<entry>&Version;</entry>
78
+
<entry>&Description;</entry>
79
+
</row>
80
+
</thead>
81
+
<tbody>
82
+
<row>
83
+
<entry>8.0.0</entry>
84
+
<entry>
85
+
<parameter>timeout</parameter> is now nullable.
86
+
</entry>
87
+
</row>
88
+
</tbody>
89
+
</tgroup>
90
+
</informaltable>
91
+
</refsect1>
92
+
70
93
<refsect1 role="notes"><!-- {{{ -->
71
94
&reftitle.notes;
72
95
<warning>
...
...
@@ -91,13 +114,12 @@
91
114
<member><function>fwrite</function></member>
92
115
<member><function>fclose</function></member>
93
116
<member><function>feof</function></member>
94
-
<member><xref linkend="ref.curl" /></member>
117
+
<member><xref linkend="ref.curl"/></member>
95
118
</simplelist>
96
119
</para>
97
120
</refsect1><!-- }}} -->
98
121
99
122
</refentry>
100
-
101
123
<!-- Keep this comment at the end of the file
102
124
Local variables:
103
125
mode: sgml
104
126