rpms/cups/F-11 cups-str3231.patch,NONE,1.1 cups.spec,1.480,1.481
Tim Waugh
twaugh at fedoraproject.org
Wed Jul 1 11:28:21 UTC 2009
- Previous message (by thread): rpms/soundmodem/F-10 .cvsignore, 1.3, 1.4 soundmodem.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message (by thread): rpms/cups/devel cups-filter-debug.patch, NONE, 1.1 cups-str3231.patch, NONE, 1.1 cups.spec, 1.479, 1.480
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: twaugh
Update of /cvs/pkgs/rpms/cups/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31701
Modified Files:
cups.spec
Added Files:
cups-str3231.patch
Log Message:
* Wed Jul 1 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.6
- Fixed lpadmin for remote 1.3.x servers (bug #506977, STR #3231).
cups-str3231.patch:
--- NEW FILE cups-str3231.patch ---
diff -up cups-1.4rc1/cups/request.c.str3231 cups-1.4rc1/cups/request.c
--- cups-1.4rc1/cups/request.c.str3231 2009-06-29 10:07:23.568486428 +0100
+++ cups-1.4rc1/cups/request.c 2009-06-29 10:07:44.867219805 +0100
@@ -266,9 +266,9 @@ cupsDoIORequest(http_t *http, /* I -
DEBUG_printf(("2cupsDoIORequest: status=%d", status));
- if (status == HTTP_FORBIDDEN || status == HTTP_ERROR ||
- status >= HTTP_SERVER_ERROR)
+ if (status == HTTP_FORBIDDEN || status >= HTTP_SERVER_ERROR)
{
+ httpFlush(http);
_cupsSetHTTPError(status);
break;
}
diff -up cups-1.4rc1/cups/http.c.length cups-1.4rc1/cups/http.c
--- cups-1.4rc1/cups/http.c.length 2009-07-01 12:00:16.591298309 +0100
+++ cups-1.4rc1/cups/http.c 2009-07-01 12:00:43.494298468 +0100
@@ -3143,6 +3145,8 @@ http_upgrade(http_t *http) /* I - Conne
DEBUG_printf(("7http_upgrade(%p)", http));
+ httpFlush(http);
+
/*
* Copy the HTTP data to a local variable so we can do the OPTIONS
* request without interfering with the existing request data...
@@ -3170,8 +3174,6 @@ http_upgrade(http_t *http) /* I - Conne
while (httpUpdate(http) == HTTP_CONTINUE);
}
- httpFlush(http);
-
/*
* Restore the HTTP request data...
*/
Index: cups.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cups/F-11/cups.spec,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -p -r1.480 -r1.481
--- cups.spec 23 Jun 2009 17:12:38 -0000 1.480
+++ cups.spec 1 Jul 2009 11:28:21 -0000 1.481
@@ -7,7 +7,7 @@
Summary: Common Unix Printing System
Name: cups
Version: 1.4
-Release: 0.%{pre}.5%{?dist}
+Release: 0.%{pre}.6%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source: ftp://ftp.easysw.com/pub/cups/test//cups-%{version}%{?pre}%{?svn}-source.tar.bz2
@@ -46,7 +46,8 @@ Patch22: cups-build.patch
Patch23: cups-res_init.patch
Patch24: cups-str3229.patch
Patch25: cups-filter-debug.patch
-Patch26: cups-avahi.patch
+Patch26: cups-str3231.patch
+Patch27: cups-avahi.patch
Patch100: cups-lspp.patch
Epoch: 1
Url: http://www.cups.org/
@@ -188,7 +189,8 @@ module.
%patch23 -p1 -b .res_init
%patch24 -p1 -b .str3229
%patch25 -p1 -b .filter-debug
-#%patch26 -p1 -b .avahi
+%patch26 -p1 -b .str3231
+#%patch27 -p1 -b .avahi
%if %lspp
%patch100 -p1 -b .lspp
@@ -472,6 +474,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/php/modules/*.so
%changelog
+* Wed Jul 1 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.6
+- Fixed lpadmin for remote 1.3.x servers (bug #506977, STR #3231).
+
* Tue Jun 23 2009 Tim Waugh <twaugh at redhat.com> 1:1.4-0.rc1.5
- Added more debugging output when constructing filter chain.
- Previous message (by thread): rpms/soundmodem/F-10 .cvsignore, 1.3, 1.4 soundmodem.spec, 1.4, 1.5 sources, 1.3, 1.4
- Next message (by thread): rpms/cups/devel cups-filter-debug.patch, NONE, 1.1 cups-str3231.patch, NONE, 1.1 cups.spec, 1.479, 1.480
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list