Attachment 886893 Details for Bug 1072952 – cups-str4386.patch

[patch] cups-str4386.patch

cups-str4386.patch (text/plain), 1.32 KB, created by Tim Waugh on 2014-04-16 13:08:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Waugh

Created: 2014-04-16 13:08:05 UTC

Size: 1.32 KB

patch

obsolete

>diff -up cups-1.7.2/cups/request.c.str4386 cups-1.7.2/cups/request.c
>--- cups-1.7.2/cups/request.c.str4386	2014-03-26 21:06:04.000000000 +0000
>+++ cups-1.7.2/cups/request.c	2014-04-16 14:02:20.039876149 +0100
>@@ -749,9 +749,8 @@ cupsSendRequest(http_t     *http,	/* I -
>     got_status     = 0;
> 
>     while ((state = ippWrite(http, request)) != IPP_STATE_DATA)
>-      if (state == IPP_STATE_ERROR)
>-	break;
>-      else if (httpCheck(http))
>+    {
>+      if (httpCheck(http))
>       {
>         got_status = 1;
> 
>@@ -759,15 +758,24 @@ cupsSendRequest(http_t     *http,	/* I -
> 	if (status >= HTTP_STATUS_MULTIPLE_CHOICES)
> 	  break;
>       }
>+      else if (state == IPP_STATE_ERROR)
>+	break;
>+    }
> 
>     if (state == IPP_STATE_ERROR)
>     {
>-      DEBUG_puts("1cupsSendRequest: Unable to send IPP request.");
>+      /* We weren't able to send the IPP request. But did we already
>+       * get an HTTP error status? */
>+      if (!(got_status && status >= HTTP_STATUS_MULTIPLE_CHOICES))
>+      {
>+	/* No, something else went wrong. */
>+	DEBUG_puts("1cupsSendRequest: Unable to send IPP request.");
> 
>-      http->status = HTTP_STATUS_ERROR;
>-      http->state  = HTTP_STATE_WAITING;
>+	http->status = HTTP_STATUS_ERROR;
>+	http->state  = HTTP_STATE_WAITING;
> 
>-      return (HTTP_STATUS_ERROR);
>+	return (HTTP_STATUS_ERROR);
>+      }
>     }
> 
>    /*

Actions: View | Diff

Attachments on bug 1072952: 870955 | 870956 | 870957 | 870958 | 870959 | 870960 | 870978 | 871944 | 871946 | 871948 | 886893