changeset 947:24a5068bb7f8 trunk

[svn] - only create a new thread if handle->cancel is 0.
author nenolod
date Thu, 12 Apr 2007 14:04:26 -0700
parents 2d06a4e9b032
children 8dd7c03376bb
files ChangeLog src/curl/curl.c
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 12 13:22:28 2007 -0700
+++ b/ChangeLog	Thu Apr 12 14:04:26 2007 -0700
@@ -1,3 +1,11 @@
+2007-04-12 20:22:28 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
+  revision [2022]
+  - use a g_cond_wait() to ensure curl has started up before we try to read.
+  
+  trunk/src/curl/curl.c |   25 +++++++++++++++++++++++--
+  1 file changed, 23 insertions(+), 2 deletions(-)
+
+
 2007-04-12 19:57:45 +0000  William Pitcock <nenolod@sacredspiral.co.uk>
   revision [2020]
   - back out r2016,2018.
--- a/src/curl/curl.c	Thu Apr 12 13:22:28 2007 -0700
+++ b/src/curl/curl.c	Thu Apr 12 14:04:26 2007 -0700
@@ -511,7 +511,7 @@
       handle->cancel = 1;
       return;
     }
-  if (!handle->thread)
+  if (!handle->thread && !handle->cancel)
     {
       handle->cancel = 0;
       handle->wr_index = 0;