Re: cvs: php-src(PHP_5_3) /ext/curl streams.c
| From: | Pierre Joye | Date: | Mon, 23 Feb 2009 16:03:21 +0000 |
| Subject: | Re: cvs: php-src(PHP_5_3) /ext/curl streams.c | ||
| References: | 1 | Groups: | php.cvs |
| Request: | Send a blank email to php-cvs+get-56359@lists.php.net to get a copy of this message | ||
hi Ilia,
NEWS? :)
thanks for your work!
On Mon, Feb 23, 2009 at 4:58 PM, Ilia Alshanetsky <iliaa@php.net> wrote:
> iliaa      Mon Feb 23 15:58:19 2009 UTC
>
> Â Modified files: Â Â Â Â Â Â Â (Branch: PHP_5_3)
>   /php-src/ext/curl  streams.c
> Â Log:
>
> Â Fixed bug #47477 (php_curl_stream_read() unnecessarily sleeps 15 secs under
> Â heavy load)
>
> Â # Patch by giuseppe bonacci
>
>
> ï?v“@ϵä
> ¥ûS‹ãhttp://cvs.php.net/viewvc.cgi/php-src/ext/curl/streams.c?r1=1.14.2.2.2.11.2.3&r2=1.14.2.2.2.11.2.4&diff_format=u
> Index: php-src/ext/curl/streams.c
> diff -u php-src/ext/curl/streams.c:1.14.2.2.2.11.2.3
> php-src/ext/curl/streams.c:1.14.2.2.2.11.2.4
> --- php-src/ext/curl/streams.c:1.14.2.2.2.11.2.3 Â Â Â Â Wed Dec 31 11:15:35 2008
> +++ php-src/ext/curl/streams.c  Mon Feb 23 15:58:19 2009
> @@ -16,7 +16,7 @@
> Â Â +----------------------------------------------------------------------+
> Â */
>
> -/* $Id: streams.c,v 1.14.2.2.2.11.2.3 2008/12/31 11:15:35 sebastian Exp $ */
> +/* $Id: streams.c,v 1.14.2.2.2.11.2.4 2009/02/23 15:58:19 iliaa Exp $ */
>
> Â /* This file implements cURL based wrappers.
> Â * NOTE: If you are implementing your own streams that are intended to
> @@ -169,7 +169,8 @@
> Â Â Â Â Â Â Â Â Â Â Â Â tv.tv_sec = 15; /* TODO: allow this to be configured from
> the script */
>
> Â Â Â Â Â Â Â Â Â Â Â Â /* wait for data */
> - Â Â Â Â Â Â Â Â Â Â Â switch (select(curlstream->maxfd + 1,
> &curlstream->readfds, &curlstream->writefds, &curlstream->excfds, &tv)) {
> + Â Â Â Â Â Â Â Â Â Â Â switch ((curlstream->maxfd < 0) ? 1 :
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â select(curlstream->maxfd + 1,
> &curlstream->readfds, &curlstream->writefds, &curlstream->excfds, &tv)) {
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â case -1:
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â /* error */
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return 0;
> @@ -182,7 +183,8 @@
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â curlstream->mcode =
> curl_multi_perform(curlstream->multi, &curlstream->pending);
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â } while (curlstream->mcode ==
> CURLM_CALL_MULTI_PERFORM);
> Â Â Â Â Â Â Â Â Â Â Â Â }
> - Â Â Â Â Â Â Â } while (curlstream->readbuffer.readpos >=
> curlstream->readbuffer.writepos && curlstream->pending > 0);
> + Â Â Â Â Â Â Â } while (curlstream->maxfd >= 0 &&
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â curlstream->readbuffer.readpos >=
> curlstream->readbuffer.writepos && curlstream->pending > 0);
>
> Â Â Â Â }
>
>
>
>
> --
> PHP CVS Mailing List (http://www.php.net/)
> To unsubscribe, visit: http://www.php.net/unsub.php
>
>
--
Pierre
http://blog.thepimp.net | http://www.libgd.org