Skip to content

Commit 38cbdaa

Browse files
committed
curl: Remove curl_close() from all examples
php/doc-en@fc9a0a8
1 parent 6c39ca6 commit 38cbdaa

18 files changed

+20
-81
lines changed

reference/curl/curlfile/construct.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 5017547fee4dd0873d2ced02e2bb90b696f26a24 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
55

66
<refentry xml:id="curlfile.construct" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -185,8 +185,6 @@ curl_setopt($request, CURLOPT_RETURNTRANSFER, true);
185185
echo curl_exec($request);
186186
187187
var_dump(curl_getinfo($request));
188-
189-
curl_close($request);
190188
]]>
191189
</programlisting>
192190
<para>&style.procedural;</para>
@@ -207,8 +205,6 @@ curl_setopt($request, CURLOPT_RETURNTRANSFER, true);
207205
echo curl_exec($request);
208206
209207
var_dump(curl_getinfo($request));
210-
211-
curl_close($request);
212208
]]>
213209
</programlisting>
214210
&example.outputs;

reference/curl/examples.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 217fa0d006cf292e837bab6458b81341718eb35e Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: takagi Status: ready -->
44
<!-- CREDITS: shimooka,hirokawa,mumumu -->
55

66
<chapter xml:id="curl.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
@@ -12,8 +12,8 @@
1212
curl 関数を使用可能となります。cURL 関数の基本的な使用法は、
1313
<function>curl_init</function>により cURL セッションを初期化、
1414
<function>curl_setopt</function> により転送時のオプションを設定、
15-
続いて<function>curl_exec</function> により転送を実行し、
16-
<function>curl_close</function> によりセッションを終了するというものになります
15+
続いて<function>curl_exec</function>
16+
により転送を実行するというものになります
1717
cURL 関数を使用して example.com ホームページをファイルに取得する例を示します。
1818
<example>
1919
<title>PHP の cURL モジュールを使用して example.com のホームページを取得する</title>
@@ -31,7 +31,6 @@ curl_exec($ch);
3131
if(curl_error($ch)) {
3232
fwrite($fp, curl_error($ch));
3333
}
34-
curl_close($ch);
3534
fclose($fp);
3635
?>
3736
]]>

reference/curl/functions/curl-copy-handle.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="function.curl-copy-handle" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -81,10 +81,6 @@ $ch2 = curl_copy_handle($ch);
8181
8282
// URL (http://www.example.com/) を取得し、ブラウザに渡します
8383
curl_exec($ch2);
84-
85-
// cURL リソースを閉じ、システムリソースを開放します
86-
curl_close($ch2);
87-
curl_close($ch);
8884
?>
8985
]]>
9086
</programlisting>

reference/curl/functions/curl-errno.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka -->
55
<refentry xml:id="function.curl-errno" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -73,9 +73,6 @@ if(curl_errno($ch))
7373
{
7474
echo 'Curl error: ' . curl_error($ch);
7575
}
76-
77-
// ハンドルを閉じます
78-
curl_close($ch);
7976
?>
8077
]]>
8178
</programlisting>

reference/curl/functions/curl-error.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka -->
55
<refentry xml:id="function.curl-error" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -73,9 +73,6 @@ else
7373
{
7474
echo 'Operation completed without any errors';
7575
}
76-
77-
// ハンドルを閉じます
78-
curl_close($ch);
7976
?>
8077
]]>
8178
</programlisting>

reference/curl/functions/curl-escape.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: takagi Status: ready -->
44

55
<refentry xml:id="function.curl-escape" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -83,7 +83,6 @@ $url = "http://example.com/add_location.php?location={$location}";
8383
curl_setopt($ch, CURLOPT_URL, $url);
8484
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
8585
curl_exec($ch);
86-
curl_close($ch);
8786
?>
8887
]]>
8988
</programlisting>

reference/curl/functions/curl-exec.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 6c60e8e8fcd92bdaa469f7292b12179e841dfd39 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: shimooka,mumumu -->
55
<refentry xml:id="function.curl-exec" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -86,9 +86,6 @@ curl_setopt($ch, CURLOPT_HEADER, 0);
8686
8787
// URL を取得し、ブラウザに渡します
8888
curl_exec($ch);
89-
90-
// cURL リソースを閉じ、システムリソースを解放します
91-
curl_close($ch);
9289
?>
9390
]]>
9491
</programlisting>

reference/curl/functions/curl-getinfo.xml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: f34918d8b2761af5b596b1b762753ee825c19cd8 Maintainer: mumumu Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: mumumu Status: ready -->
44
<refentry xml:id="function.curl-getinfo" xmlns="http://docbook.org/ns/docbook">
55
<refnamediv>
66
<refname>curl_getinfo</refname>
@@ -282,9 +282,6 @@ if (!curl_errno($ch)) {
282282
$info = curl_getinfo($ch);
283283
echo 'Took ', $info['total_time'], ' seconds to send a request to ', $info['url'], "\n";
284284
}
285-
286-
// ハンドルを閉じます
287-
curl_close($ch);
288285
?>
289286
]]>
290287
</programlisting>
@@ -311,9 +308,6 @@ if (!curl_errno($ch)) {
311308
echo 'Unexpected HTTP code: ', $http_code, "\n";
312309
}
313310
}
314-
315-
// ハンドルを閉じます
316-
curl_close($ch);
317311
?>
318312
]]>
319313
</programlisting>

reference/curl/functions/curl-multi-close.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: e59d2eff8265de6b53b5e392a6ea62cec39ef7af Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: takagi Status: ready -->
44
<!-- Credits: mumumu -->
55
<refentry xml:id="function.curl-multi-close" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -67,7 +67,6 @@
6767
<para>
6868
<simplelist>
6969
<member><function>curl_multi_init</function></member>
70-
<member><function>curl_close</function></member>
7170
</simplelist>
7271
</para>
7372
</refsect1>

reference/curl/functions/curl-reset.xml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: b7f8c11e56ff1c57a2993e2ed7e5c5ace18637fd Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: fc9a0a8b29a7a099998bdd71fe5350a10b18fe62 Maintainer: takagi Status: ready -->
44

55
<refentry xml:id="function.curl-reset" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
66
<refnamediv>
@@ -71,9 +71,6 @@ curl_reset($ch);
7171
// HTTP リクエストを送信します
7272
curl_setopt($ch, CURLOPT_URL, 'http://example.com/');
7373
curl_exec($ch); // 事前に設定した user-agent は送信されません。curl_reset で初期化されたからです
74-
75-
// ハンドルを閉じます
76-
curl_close($ch);
7774
?>
7875
]]>
7976
</programlisting>

0 commit comments

Comments
 (0)