ljbuesch Thu Jun 7 01:55:00 2007 UTC
Modified files:
/phpdoc/en/reference/curl/functions curl-multi-add-handle.xml
curl-multi-close.xml
curl-multi-exec.xml
curl-multi-init.xml
Log:
Updated the examples again. Fix for bug#41598.
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/curl/functions/curl-multi-add-handle.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/curl/functions/curl-multi-add-handle.xml
diff -u phpdoc/en/reference/curl/functions/curl-multi-add-handle.xml:1.5
phpdoc/en/reference/curl/functions/curl-multi-add-handle.xml:1.6
--- phpdoc/en/reference/curl/functions/curl-multi-add-handle.xml:1.5 Sat Jun
2 21:23:05 2007
+++ phpdoc/en/reference/curl/functions/curl-multi-add-handle.xml Thu Jun
7 01:55:00 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry id="function.curl-multi-add-handle">
<refnamediv>
<refname>curl_multi_add_handle</refname>
@@ -54,10 +54,10 @@
$ch2 = curl_init();
// set URL and other appropriate options
-curl_setopt($ch, CURLOPT_URL, "http://www.example.com/";);
-curl_setopt($ch, CURLOPT_HEADER, 0);
-curl_setopt($ch, CURLOPT_URL, "http://www.php.net/";);
-curl_setopt($ch, CURLOPT_HEADER, 0);
+curl_setopt($ch1, CURLOPT_URL, "http://www.example.com/";);
+curl_setopt($ch1, CURLOPT_HEADER, 0);
+curl_setopt($ch2, CURLOPT_URL, "http://www.php.net/";);
+curl_setopt($ch2, CURLOPT_HEADER, 0);
//create the multiple cURL handle
$mh = curl_multi_init();
@@ -66,10 +66,15 @@
curl_multi_add_handle($mh,$ch1);
curl_multi_add_handle($mh,$ch2);
+$running=null;
//execute the handles
-curl_multi_exec($mh);
+do {
+ curl_multi_exec($mh);
+} while($running > 0);
//close all the handles
+curl_multi_remove_handle($ch1);
+curl_multi_remove_handle($ch2);
curl_multi_close($mh);
?>
]]>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/curl/functions/curl-multi-close.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/curl/functions/curl-multi-close.xml
diff -u phpdoc/en/reference/curl/functions/curl-multi-close.xml:1.5
phpdoc/en/reference/curl/functions/curl-multi-close.xml:1.6
--- phpdoc/en/reference/curl/functions/curl-multi-close.xml:1.5 Sat Jun 2
21:23:05 2007
+++ phpdoc/en/reference/curl/functions/curl-multi-close.xml Thu Jun 7
01:55:00 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry id="function.curl-multi-close">
<refnamediv>
<refname>curl_multi_close</refname>
@@ -50,10 +50,10 @@
$ch2 = curl_init();
// set URL and other appropriate options
-curl_setopt($ch, CURLOPT_URL, "http://www.example.com/";);
-curl_setopt($ch, CURLOPT_HEADER, 0);
-curl_setopt($ch, CURLOPT_URL, "http://www.php.net/";);
-curl_setopt($ch, CURLOPT_HEADER, 0);
+curl_setopt($ch1, CURLOPT_URL, "http://www.example.com/";);
+curl_setopt($ch1, CURLOPT_HEADER, 0);
+curl_setopt($ch2, CURLOPT_URL, "http://www.php.net/";);
+curl_setopt($ch2, CURLOPT_HEADER, 0);
//create the multiple cURL handle
$mh = curl_multi_init();
@@ -62,10 +62,14 @@
curl_multi_add_handle($mh,$ch1);
curl_multi_add_handle($mh,$ch2);
+$running=null;
//execute the handles
-curl_multi_exec($mh);
-
+do {
+ curl_multi_exec($mh,$running);
+} while ($running > 0)
//close the handles
+curl_multi_remove_handle($ch1);
+curl_multi_remove_handle($ch2);
curl_multi_close($mh);
?>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/curl/functions/curl-multi-exec.xml?r1=1.7&r2=1.8&diff_format=u
Index: phpdoc/en/reference/curl/functions/curl-multi-exec.xml
diff -u phpdoc/en/reference/curl/functions/curl-multi-exec.xml:1.7
phpdoc/en/reference/curl/functions/curl-multi-exec.xml:1.8
--- phpdoc/en/reference/curl/functions/curl-multi-exec.xml:1.7 Sat Jun 2
21:23:05 2007
+++ phpdoc/en/reference/curl/functions/curl-multi-exec.xml Thu Jun 7
01:55:00 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<refentry id="function.curl-multi-exec">
<refnamediv>
<refname>curl_multi_exec</refname>
@@ -67,10 +67,10 @@
$ch2 = curl_init();
// set URL and other appropriate options
-curl_setopt($ch, CURLOPT_URL, "http://www.example.com/";);
-curl_setopt($ch, CURLOPT_HEADER, 0);
-curl_setopt($ch, CURLOPT_URL, "http://www.php.net/";);
-curl_setopt($ch, CURLOPT_HEADER, 0);
+curl_setopt($ch1, CURLOPT_URL, "http://www.example.com/";);
+curl_setopt($ch1, CURLOPT_HEADER, 0);
+curl_setopt($ch2, CURLOPT_URL, "http://www.php.net/";);
+curl_setopt($ch2, CURLOPT_HEADER, 0);
//create the multiple cURL handle
$mh = curl_multi_init();
@@ -79,10 +79,14 @@
curl_multi_add_handle($mh,$ch1);
curl_multi_add_handle($mh,$ch2);
+$running=null;
//execute the handles
-curl_multi_exec($mh);
-
+do {
+ curl_multi_exec($mh,$running);
+} while ($running > 0);
//close the handles
+curl_multi_remove_handle($ch1);
+curl_multi_remove_handle($ch2);
curl_multi_close($mh);
?>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/curl/functions/curl-multi-init.xml?r1=1.5&r2=1.6&diff_format=u
Index: phpdoc/en/reference/curl/functions/curl-multi-init.xml
diff -u phpdoc/en/reference/curl/functions/curl-multi-init.xml:1.5
phpdoc/en/reference/curl/functions/curl-multi-init.xml:1.6
--- phpdoc/en/reference/curl/functions/curl-multi-init.xml:1.5 Sat Jun 2
21:23:05 2007
+++ phpdoc/en/reference/curl/functions/curl-multi-init.xml Thu Jun 7
01:55:00 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<refentry id="function.curl-multi-init">
<refnamediv>
<refname>curl_multi_init</refname>
@@ -50,10 +50,10 @@
$ch2 = curl_init();
// set URL and other appropriate options
-curl_setopt($ch, CURLOPT_URL, "http://www.example.com/";);
-curl_setopt($ch, CURLOPT_HEADER, 0);
-curl_setopt($ch, CURLOPT_URL, "http://www.php.net/";);
-curl_setopt($ch, CURLOPT_HEADER, 0);
+curl_setopt($ch1, CURLOPT_URL, "http://www.example.com/";);
+curl_setopt($ch1, CURLOPT_HEADER, 0);
+curl_setopt($ch2, CURLOPT_URL, "http://www.php.net/";);
+curl_setopt($ch2, CURLOPT_HEADER, 0);
//create the multiple cURL handle
$mh = curl_multi_init();
@@ -62,10 +62,15 @@
curl_multi_add_handle($mh,$ch1);
curl_multi_add_handle($mh,$ch2);
+$running=null;
//execute the handles
-curl_multi_exec($mh);
+do {
+ curl_multi_exec($mh,$running);
+} while ($running > 0);
//close the handles
+curl_multi_remove_handle($ch1);
+curl_multi_remove_handle($ch2);
curl_multi_close($mh);
?>
