/net-print/cups/files/cups-2.0.2-poll-CPU-loop-STR-4605.patch

https://gitlab.com/rindeal/gentoo-cvs-history-archive · Patch · 48 lines · 40 code · 8 blank · 0 comment · 0 complexity · 72ffd1bb47c2d4274fc95726410d425a MD5 · raw file 

    

  1. http://cups.org/str.php?L4605+P-1+S-2+C0+I0+E0+Q100%25
    2. 

  2. https://bugs.gentoo.org/show_bug.cgi?id=549732
    3. 

  3. 

  4. commit bb00c43fccb5aa2dec8e03bd9783e1ee267266a7
    5. 

  5. Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
    6. 

  6. Date:   Wed May 6 18:01:04 2015 +0000
    7. 

  7. 

  8.     The scheduler could get caught in a busy loop (STR #4605)
    9. 

  9.     
    10. 

  10.     
    11. 

  11.     
    12. 

  12.     git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12613 a1ca3aef-8c08-0410-bb20-df032aa958be
    13. 

  13. 

  14. diff --git a/scheduler/client.c b/scheduler/client.c
    15. 

  15. index c5a9960..50464a5 100644
    16. 

  16. --- a/scheduler/client.c
    17. 

  17. +++ b/scheduler/client.c
    18. 

  18. @@ -585,6 +585,17 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
    19. 

  19.      * connection and we need to shut it down...
    20. 

  20.      */
    21. 

  21.  
    22. 

  22. +    if (!httpGetReady(con->http) && recv(httpGetFd(con->http), buf, 1, MSG_PEEK) < 1)
    23. 

  23. +    {
    24. 

  24. +     /*
    25. 

  25. +      * Connection closed...
    26. 

  26. +      */
    27. 

  27. +
    28. 

  28. +      cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on EOF.");
    29. 

  29. +      cupsdCloseClient(con);
    30. 

  30. +      return;
    31. 

  31. +    }
    32. 

  32. +
    33. 

  33.      cupsdLogClient(con, CUPSD_LOG_DEBUG, "Closing on unexpected HTTP read state %s.",
    34. 

  34.  		   httpStateString(httpGetState(con->http)));
    35. 

  35.      cupsdCloseClient(con);
    36. 

  36. @@ -1979,12 +1990,6 @@ cupsdReadClient(cupsd_client_t *con)	/* I - Client to read from */
    37. 

  37.  
    38. 

  38.  	if (httpGetState(con->http) == HTTP_STATE_POST_SEND)
    39. 

  39.  	{
    40. 

  40. -	 /*
    41. 

  41. -	  * Don't listen for activity until we decide to do something with this...
    42. 

  42. -	  */
    43. 

  43. -
    44. 

  44. -          cupsdAddSelect(httpGetFd(con->http), NULL, NULL, con);
    45. 

  45. -
    46. 

  46.  	  if (con->file >= 0)
    47. 

  47.  	  {
    48. 

  48.  	    fstat(con->file, &filestats);
    49.