[arch-commits] CVS update of extra/kde/kdelibs (PKGBUILD post-3.5.8.patch)

Tobias Powalowski tpowa at archlinux.org
Thu Oct 18 08:48:29 UTC 2007


    Date: Thursday, October 18, 2007 @ 04:48:29
  Author: tpowa
    Path: /home/cvs-extra/extra/kde/kdelibs

Modified: PKGBUILD (1.89 -> 1.90) post-3.5.8.patch (1.1 -> 1.2)

'upgpkg: added http kio patch posted on ml'


------------------+
 PKGBUILD         |    6 +++---
 post-3.5.8.patch |   39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 3 deletions(-)


Index: extra/kde/kdelibs/PKGBUILD
diff -u extra/kde/kdelibs/PKGBUILD:1.89 extra/kde/kdelibs/PKGBUILD:1.90
--- extra/kde/kdelibs/PKGBUILD:1.89	Mon Oct 15 08:18:16 2007
+++ extra/kde/kdelibs/PKGBUILD	Thu Oct 18 04:48:29 2007
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD,v 1.89 2007/10/15 12:18:16 tpowa Exp $
+# $Id: PKGBUILD,v 1.90 2007/10/18 08:48:29 tpowa Exp $
 # Contributor: Roman Kreisel <roman.kreisel at epost.de>
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=kdelibs
 pkgver=3.5.8
 kdever=3.5.8
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Core Libraries"
 arch=(i686 x86_64)
 url="http://www.kde.org"
@@ -96,4 +96,4 @@
          'e94aef45b5a59fe58c7cc085ab1dd3ae'
          '42d288e71fa0a886bc8882c198a27f2e'
          'd888793ff50dafb970f503e3ab6851b6'
-         'fc9e7395316a85547988bf506234327e')
+         '2f4717394f4206eb418e7d1da8a9f58e')
Index: extra/kde/kdelibs/post-3.5.8.patch
diff -u extra/kde/kdelibs/post-3.5.8.patch:1.1 extra/kde/kdelibs/post-3.5.8.patch:1.2
--- extra/kde/kdelibs/post-3.5.8.patch:1.1	Mon Oct 15 08:18:16 2007
+++ extra/kde/kdelibs/post-3.5.8.patch	Thu Oct 18 04:48:29 2007
@@ -55,3 +55,42 @@
              if( ok )
                  return time;
              }
+--- branches/KDE/3.5/kdelibs/kioslave/http/http.cc	2007/09/26 17:08:43	717341
++++ branches/KDE/3.5/kdelibs/kioslave/http/http.cc	2007/10/17 04:11:51	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;
+      }




More information about the arch-commits mailing list