From 7521c0a209955a55878c88ea7d022bcc638efea9 Mon Sep 17 00:00:00 2001
From: Logan Buesching <ljbuesch@php.net>
Date: Thu, 7 Jun 2007 01:55:00 +0000
Subject: [PATCH] Updated the examples again.  Fix for bug#41598.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@237144 c90b9560-bf6c-de11-be94-00142212c4b1
---
 .../curl/functions/curl-multi-add-handle.xml   | 17 +++++++++++------
 reference/curl/functions/curl-multi-close.xml  | 18 +++++++++++-------
 reference/curl/functions/curl-multi-exec.xml   | 18 +++++++++++-------
 reference/curl/functions/curl-multi-init.xml   | 17 +++++++++++------
 4 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/reference/curl/functions/curl-multi-add-handle.xml b/reference/curl/functions/curl-multi-add-handle.xml
index 2aa91bce29..c09d1abdd4 100644
--- a/reference/curl/functions/curl-multi-add-handle.xml
+++ b/reference/curl/functions/curl-multi-add-handle.xml
@@ -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 @@ $ch1 = curl_init();
 $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 @@ $mh = curl_multi_init();
 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);
 ?>
 ]]>
diff --git a/reference/curl/functions/curl-multi-close.xml b/reference/curl/functions/curl-multi-close.xml
index 39bd82b72f..9d62420866 100644
--- a/reference/curl/functions/curl-multi-close.xml
+++ b/reference/curl/functions/curl-multi-close.xml
@@ -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 @@ $ch1 = curl_init();
 $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 @@ $mh = curl_multi_init();
 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);
 
 ?>
diff --git a/reference/curl/functions/curl-multi-exec.xml b/reference/curl/functions/curl-multi-exec.xml
index e87901a773..13091d69c6 100644
--- a/reference/curl/functions/curl-multi-exec.xml
+++ b/reference/curl/functions/curl-multi-exec.xml
@@ -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 @@ $ch1 = curl_init();
 $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 @@ $mh = curl_multi_init();
 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);
 
 ?>
diff --git a/reference/curl/functions/curl-multi-init.xml b/reference/curl/functions/curl-multi-init.xml
index b00ee56181..14d42c28e1 100644
--- a/reference/curl/functions/curl-multi-init.xml
+++ b/reference/curl/functions/curl-multi-init.xml
@@ -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 @@ $ch1 = curl_init();
 $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 @@ $mh = curl_multi_init();
 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);
 
 ?>