diff -Nru /tmp/gtAGd43PBS/kdelibs-3.5.8/debian/changelog /tmp/nSvdMGv9dR/kdelibs-3.5.8/debian/changelog --- /tmp/gtAGd43PBS/kdelibs-3.5.8/debian/changelog 2007-10-17 21:47:07.000000000 +0100 +++ /tmp/nSvdMGv9dR/kdelibs-3.5.8/debian/changelog 2007-10-17 21:47:12.000000000 +0100 @@ -1,3 +1,9 @@ +kdelibs (4:3.5.8-0ubuntu3) gutsy-proposed; urgency=low + + * Update kubuntu_93_https_fix.diff closes LP: #153500 + + -- Jonathan Riddell Wed, 17 Oct 2007 21:40:16 +0100 + kdelibs (4:3.5.8-0ubuntu2) gutsy; urgency=low * Add kubuntu_93_https_fix.diff closes LP: #152449 diff -Nru /tmp/gtAGd43PBS/kdelibs-3.5.8/debian/patches/kubuntu_93_https_fix.diff /tmp/nSvdMGv9dR/kdelibs-3.5.8/debian/patches/kubuntu_93_https_fix.diff --- /tmp/gtAGd43PBS/kdelibs-3.5.8/debian/patches/kubuntu_93_https_fix.diff 2007-10-17 21:47:07.000000000 +0100 +++ /tmp/nSvdMGv9dR/kdelibs-3.5.8/debian/patches/kubuntu_93_https_fix.diff 2007-10-17 21:47:12.000000000 +0100 @@ -1,13 +1,24 @@ -diff -Nur kdelibs-3.5.8/kioslave/http/http.cc kdelibs-3.5.8.new/kioslave/http/http.cc ---- kdelibs-3.5.8/kioslave/http/http.cc 2007-10-16 16:21:55.000000000 +0100 -+++ kdelibs-3.5.8.new/kioslave/http/http.cc 2007-10-16 16:25:49.000000000 +0100 -@@ -3411,7 +3411,7 @@ +--- 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 @@ - // Send the current response before processing starts or it - // might never get sent... -- forwardHttpResponseHeader(); -+ //forwardHttpResponseHeader(); + } 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; +