apply upstream patch to fix http-regression
This commit is contained in:
parent
63b2042054
commit
8a42157280
|
@ -0,0 +1,41 @@
|
||||||
|
Index: kioslave/http/http.cc
|
||||||
|
===================================================================
|
||||||
|
--- kioslave/http/http.cc (Revision 717341)
|
||||||
|
+++ kioslave/http/http.cc (Revision 726097)
|
||||||
|
@@ -3409,10 +3409,6 @@
|
||||||
|
|
||||||
|
} while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
|
||||||
|
|
||||||
|
- // Send the current response before processing starts or it
|
||||||
|
- // might never get sent...
|
||||||
|
- forwardHttpResponseHeader();
|
||||||
|
-
|
||||||
|
// Now process the HTTP/1.1 upgrade
|
||||||
|
QStringList::Iterator opt = upgradeOffers.begin();
|
||||||
|
for( ; opt != upgradeOffers.end(); ++opt) {
|
||||||
|
@@ -3818,6 +3814,10 @@
|
||||||
|
mimeType( m_strMimeType );
|
||||||
|
}
|
||||||
|
|
||||||
|
+ // Do not move send response header before any redirection as it seems
|
||||||
|
+ // to screw up some sites. See BR# 150904.
|
||||||
|
+ forwardHttpResponseHeader();
|
||||||
|
+
|
||||||
|
if (m_request.method == HTTP_HEAD)
|
||||||
|
return true;
|
||||||
|
|
||||||
|
@@ -3830,10 +3830,10 @@
|
||||||
|
// Check...
|
||||||
|
createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
|
||||||
|
if (!m_request.fcache)
|
||||||
|
- {
|
||||||
|
- m_request.bCachedWrite = false; // Error creating cache entry.
|
||||||
|
- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
|
||||||
|
- }
|
||||||
|
+ {
|
||||||
|
+ m_request.bCachedWrite = false; // Error creating cache entry.
|
||||||
|
+ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
|
||||||
|
+ }
|
||||||
|
m_request.expireDate = expireDate;
|
||||||
|
m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
|
||||||
|
}
|
|
@ -21,7 +21,7 @@
|
||||||
|
|
||||||
Summary: K Desktop Environment - Libraries
|
Summary: K Desktop Environment - Libraries
|
||||||
Version: 3.5.8
|
Version: 3.5.8
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs3
|
Name: kdelibs3
|
||||||
|
@ -71,6 +71,8 @@ Patch102: kdelibs-3.5.6-137675.patch
|
||||||
Patch103: kdelibs-3.5.0-101956.patch
|
Patch103: kdelibs-3.5.0-101956.patch
|
||||||
|
|
||||||
## upstream patches
|
## upstream patches
|
||||||
|
Patch200: kdelibs-3.5.8-http-regression.patch
|
||||||
|
|
||||||
|
|
||||||
%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
|
%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
|
||||||
Requires: qt >= %{qt_epoch}:%{qt_ver}
|
Requires: qt >= %{qt_epoch}:%{qt_ver}
|
||||||
|
@ -227,6 +229,7 @@ format for easy browsing
|
||||||
%patch102 -p0 -b .kde#137675
|
%patch102 -p0 -b .kde#137675
|
||||||
|
|
||||||
# upstream patches
|
# upstream patches
|
||||||
|
%patch200 -p0 -b .http-regression
|
||||||
|
|
||||||
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
|
||||||
|
|
||||||
|
@ -510,6 +513,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 17 2007 Than Ngo <than@redhat.com> 3.5.8-4
|
||||||
|
- apply upstream patch to fix http-regression
|
||||||
|
|
||||||
* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
|
* Mon Oct 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 6:3.5.8-3
|
||||||
- respin (for openexr-1.6.0)
|
- respin (for openexr-1.6.0)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue