multi use: call multi_perform even on select() timeouts

This commit is contained in:
Daniel Stenberg 2010-11-04 11:37:23 +01:00
parent 909e711e74
commit 542318b113
4 changed files with 7 additions and 19 deletions

View File

@ -180,12 +180,9 @@ fill_buffer(URL_FILE *file,int want,int waittime)
break;
case 0:
break;
default:
/* timeout or readable/writable sockets */
curl_multi_perform(multi_handle, &file->still_running);
break;
/* timeout or readable/writable sockets */
curl_multi_perform(multi_handle, &file->still_running);
break;
}
} while(file->still_running && (file->buffer_pos < want));
return 1;

View File

@ -101,12 +101,8 @@ int main(int argc, char **argv)
case -1:
/* select error */
break;
case 0:
/* timeout, do something else */
break;
default:
/* one or more of curl's file descriptors say there's data to read
or write */
case 0: /* timeout */
default: /* action */
curl_multi_perform(multi_handle, &still_running);
break;
}

View File

@ -112,7 +112,6 @@ int main(int argc, char *argv[])
/* select error */
break;
case 0:
printf("timeout!\n");
default:
/* timeout or readable/writable sockets */
printf("perform!\n");

View File

@ -174,12 +174,8 @@ int main(void)
case -1:
/* select error */
break;
case 0:
/* timeout, do something else */
break;
default:
/* one or more of curl's file descriptors say there's data to read
or write */
case 0: /* timeout */
default: /* action */
curl_multi_perform(mcurl, &still_running);
break;
}