- Prevent infinite loop in cupsDoIORequest when processing HTTP errors (bug
#518065, bug #519663, STR #3311).
This commit is contained in:
parent
28e7feb030
commit
422acd29f6
14
cups-str3311.patch
Normal file
14
cups-str3311.patch
Normal file
@ -0,0 +1,14 @@
|
||||
diff -up cups-1.4rc1/cups/request.c.str3311 cups-1.4rc1/cups/request.c
|
||||
--- cups-1.4rc1/cups/request.c.str3311 2009-08-27 13:16:17.965400634 +0100
|
||||
+++ cups-1.4rc1/cups/request.c 2009-08-27 13:16:18.247275208 +0100
|
||||
@@ -266,7 +266,9 @@ cupsDoIORequest(http_t *http, /* I -
|
||||
|
||||
DEBUG_printf(("2cupsDoIORequest: status=%d", status));
|
||||
|
||||
- if (status == HTTP_FORBIDDEN || status >= HTTP_SERVER_ERROR)
|
||||
+ if (status >= HTTP_BAD_REQUEST &&
|
||||
+ status != HTTP_UNAUTHORIZED &&
|
||||
+ status != HTTP_UPGRADE_REQUIRED)
|
||||
{
|
||||
httpFlush(http);
|
||||
_cupsSetHTTPError(status);
|
@ -70,6 +70,7 @@ Patch42: cups-str3287.patch
|
||||
Patch43: cups-str3292.patch
|
||||
Patch44: cups-str3293.patch
|
||||
Patch45: cups-str3308.patch
|
||||
Patch46: cups-str3311.patch
|
||||
Patch100: cups-lspp.patch
|
||||
Epoch: 1
|
||||
Url: http://www.cups.org/
|
||||
@ -240,6 +241,7 @@ module.
|
||||
%patch43 -p1 -b .str3292
|
||||
%patch44 -p1 -b .str3293
|
||||
%patch45 -p1 -b .str3308
|
||||
%patch46 -p1 -b .str3311
|
||||
|
||||
%if %lspp
|
||||
%patch100 -p1 -b .lspp
|
||||
@ -535,6 +537,8 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%changelog
|
||||
* Wed Aug 26 2009 Tim Waugh <twaugh@redhat.com> 1:1.4-0.rc1.18
|
||||
- Prevent infinite loop in cupsDoIORequest when processing HTTP
|
||||
errors (bug #518065, bug #519663, STR #3311).
|
||||
- Fixed document-format-supported attribute when
|
||||
application/octet-stream is enabled (bug #516507, STR #3308, patch
|
||||
from Jiri Popelka).
|
||||
|
Loading…
Reference in New Issue
Block a user