rpms/kdelibs/devel kdelibs-4.2.0-ssl_proxy.patch, NONE, 1.1 kdelibs.spec, 1.430, 1.431

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12121

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.0-ssl_proxy.patch 
Log Message:
* Thu Feb 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-9
- ssl/proxy patch (kde#179934)


kdelibs-4.2.0-ssl_proxy.patch:

--- NEW FILE kdelibs-4.2.0-ssl_proxy.patch ---
--- trunk/KDE/kdelibs/kio/kio/tcpslavebase.cpp	2009/01/14 00:07:11	910707
+++ trunk/KDE/kdelibs/kio/kio/tcpslavebase.cpp	2009/01/14 00:07:20	910708
@@ -177,8 +177,6 @@
         success = d->socket.waitForBytesWritten(0);
     }
 
-    d->socket.flush();  //this is supposed to get the data on the wire faster
-
     if (d->socket.state() != KTcpSocket::ConnectedState || !success) {
         kDebug(7027) << "Write failed, will return -1! Socket error is"
                      << d->socket.error() << ", Socket state is" << d->socket.state()
@@ -198,10 +196,12 @@
         return -1;
     }
 
-    if (d->isBlocking && !d->socket.bytesAvailable()) {
-        d->socket.waitForReadyRead(-1);
-    } else {
-        d->socket.waitForReadyRead(0);
+    if (!d->socket.bytesAvailable()) {
+        if (d->isBlocking) {
+            d->socket.waitForReadyRead(-1);
+        } else {
+            d->socket.waitForReadyRead(0);
+        }
     }
 
     return d->socket.read(data, len);


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- kdelibs.spec	31 Jan 2009 19:10:50 -0000	1.430
+++ kdelibs.spec	5 Feb 2009 14:37:06 -0000	1.431
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.0
-Release: 8%{?dist}
+Release: 9%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -87,6 +87,8 @@
 Patch111: kdelibs-4.2.1-kde#918403.patch
 Patch112: kdelibs-4.2.1-kde#918654.patch
 Patch113: kdelibs-4.2.0-kded-kdirwatch.patch
+# http://bugs.kde.org/179934
+Patch114: kdelibs-4.2.0-ssl_proxy.patch
 
 BuildRequires: qt4-devel >= 4.4.0
 # qt4%{_?_isa} isn't provided yet -- Rex
@@ -220,6 +222,7 @@
 %patch111 -p0 -b .kde#918403
 %patch112 -p0 -b .kde#918654
 %patch113 -p4 -b .kde#182472
+%patch114 -p3 -b .kde#179934
 
 
 %build
@@ -386,6 +389,9 @@
 
 
 %changelog
+* Thu Feb 05 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-9
+- ssl/proxy patch (kde#179934)
+
 * Sat Jan 31 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.0-8
 - unowned dirs (#483315,#483318)