Re: [patch] SSL bug

Done.  Thanks Jim!

On Mon, 23 May 2005, Jim wrote:

> This patch corrects a bug in the Read_Partial code used for handling SSL
> connections. I have previously described it in more detail.
> 
>    http://sourceforge.net/mailarchive/forum.php?thread_id=5425639&forum_id=2688
> 
> Unless anyone sees a problem with the patch, I would appreciate if
> someone with sufficient access could commit these changes. Same goes for
> the previous two patches that I just submitted. All of the patches were
> made against 3.2.0b6.
> 
> Thanks.
> 
> Jim
> 
> --- htnet/orig_SSLConnection.cc	2005-05-22 22:40:34.780406291 -0600
> +++ htnet/SSLConnection.cc	2005-05-22 22:39:22.603791916 -0600
> @@ -131,18 +131,20 @@ int SSLConnection::Read_Partial(char *bu
>       {
>         errno = 0;
> 
> -      if (timeout_value > 0) {
> -          FD_SET_T fds;
> -          FD_ZERO(&fds);
> -          FD_SET(sock, &fds);
> -
> -          timeval tv;
> -          tv.tv_sec = timeout_value;
> -          tv.tv_usec = 0;
> -
> -          int selected = select(sock+1, &fds, 0, 0, &tv);
> -          if (selected <= 0)
> -              need_io_stop++;
> +      if (!SSL_pending(ssl)) {
> +        if (timeout_value > 0) {
> +            FD_SET_T fds;
> +            FD_ZERO(&fds);
> +            FD_SET(sock, &fds);
> +
> +            timeval tv;
> +            tv.tv_sec = timeout_value;
> +            tv.tv_usec = 0;
> +
> +            int selected = select(sock+1, &fds, 0, 0, &tv);
> +            if (selected <= 0)
> +                need_io_stop++;
> +        }
>         }
> 
>         if (!need_io_stop)
> 
> 
> -------------------------------------------------------
> This SF.Net email is sponsored by Oracle Space Sweepstakes
> Want to be the first software developer in space?
> Enter now for the Oracle Space Sweepstakes!
> http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
> _______________________________________________
> ht://Dig Developer mailing list:
> [email protected]
> List information (subscribe/unsubscribe, etc.)
> https://lists.sourceforge.net/lists/listinfo/htdig-dev
> 

-- 
Neal Richter
Knowledgebase Developer
RightNow Technologies, Inc.
Customer Service for Every Web Site
Office: 406-522-1485




-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
ht://Dig Developer mailing list:
[email protected]
List information (subscribe/unsubscribe, etc.)
https://lists.sourceforge.net/lists/listinfo/htdig-dev