rev 7581 - in trunk/packages/kdelibs/debian: . patches

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-10-20 01:10:44 +0000 (Sat, 20 Oct 2007)
New Revision: 7581

Added:
   trunk/packages/kdelibs/debian/patches/50_handle_timestamps.diff
   trunk/packages/kdelibs/debian/patches/51_fix_http_regression.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
Patches post release for kdelibs


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2007-10-20 00:41:54 UTC (rev 7580)
+++ trunk/packages/kdelibs/debian/changelog	2007-10-20 01:10:44 UTC (rev 7581)
@@ -2,9 +2,15 @@
 
    +++ Changes by Sune Vuorela:
 
-   * make it possible to dlopen .so files (Closes: #444284) 
+   * Make it possible to dlopen .so files (Closes: #444284)
+   
+   +++ Changes by Ana Beatriz Guerrero Lopez:
+   
+   * Patch 50_handle_timestamps to handle properly X timestamps  that are so 
+     high that they cannot be represented properly as signed long, only unsigned.
+   * Patch 51_fix_http_regression fixing regression in the KIO HTTP slave.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 18 Oct 2007 18:24:38 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Sat, 20 Oct 2007 02:55:44 +0200
 
 kdelibs (4:3.5.8.dfsg.1-1) unstable; urgency=low
 

Added: trunk/packages/kdelibs/debian/patches/50_handle_timestamps.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/50_handle_timestamps.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/50_handle_timestamps.diff	2007-10-20 01:10:44 UTC (rev 7581)
@@ -0,0 +1,42 @@
+--- kdelibs/kdecore/kstartupinfo.cpp	2007/08/16 12:57:23	700792
++++ kdelibs/kdecore/kstartupinfo.cpp	2007/10/12 12:13:00	724472
+@@ -545,7 +545,7 @@
+ 
+ void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id )
+     {
+-    long activate = true;
++    bool activate = true;
+     kapp->setStartupId( startup_id );
+     if( window != NULL )
+         {
+@@ -937,7 +937,7 @@
+ #ifdef Q_WS_X11
+     extern Time qt_x_user_time;
+ #else
+-    long qt_x_user_time = 0;
++    unsigned long qt_x_user_time = 0;
+ #endif
+     QCString id = QString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
+         .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
+@@ -1078,7 +1078,9 @@
+     if( pos >= 0 )
+         {
+         bool ok;
+-        long time = d->id.mid( pos + 5 ).toLong( &ok );
++        unsigned long time = d->id.mid( pos + 5 ).toULong( &ok );
++        if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
++            time = d->id.mid( pos + 5 ).toLong( &ok );
+         if( ok )
+             return time;
+         }
+@@ -1093,7 +1095,9 @@
+         if( pos2 >= 0 )
+             {
+             bool ok;
+-            long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
++            unsigned long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toULong( &ok );
++            if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
++                time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
+             if( ok )
+                 return time;
+             }

Added: trunk/packages/kdelibs/debian/patches/51_fix_http_regression.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/51_fix_http_regression.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/51_fix_http_regression.diff	2007-10-20 01:10:44 UTC (rev 7581)
@@ -0,0 +1,39 @@
+--- kdelibs/kioslave/http/http.cc	2007/09/26 17:08:43	717341
++++ 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;
+      }