rev 10984 - in trunk/packages/qt4-x11/debian: . patches

Sune Vuorela pusling-guest at alioth.debian.org
Thu Jun 12 10:14:18 UTC 2008


Author: pusling-guest
Date: 2008-06-12 10:14:17 +0000 (Thu, 12 Jun 2008)
New Revision: 10984

Added:
   trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.cpp
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
Get patch from 4.4.2 to allow Https to be treated as https in -network.

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2008-06-12 09:54:19 UTC (rev 10983)
+++ trunk/packages/qt4-x11/debian/changelog	2008-06-12 10:14:17 UTC (rev 10984)
@@ -2,6 +2,7 @@
 
   * Get patch from 4.4.2 (yes!) to fix painting of scrollbars in webkit with
     some styles.
+  * Get patch from 4.4.2 to allow Https to be treated as https in -network.
 
  -- Sune Vuorela <debian at pusling.com>  Wed, 11 Jun 2008 23:22:22 +0200
 

Added: trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.cpp
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.cpp	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0002_https_lowercase.cpp	2008-06-12 10:14:17 UTC (rev 10984)
@@ -0,0 +1,35 @@
+Fetched from 4.4.2
+treat Https, HTtps, hTTps, ... as https as well
+
+Index: b/src/network/access/qnetworkaccesshttpbackend.cpp
+===================================================================
+--- a/src/network/access/qnetworkaccesshttpbackend.cpp
++++ b/src/network/access/qnetworkaccesshttpbackend.cpp
+@@ -64,7 +64,7 @@
+ static QByteArray makeCacheKey(const QUrl &url)
+ {
+     QUrl copy = url;
+-    bool isEncrypted = url.scheme() == QLatin1String("https");
++    bool isEncrypted = url.scheme().toLower() == QLatin1String("https");
+     copy.setPort(url.port(isEncrypted ? DefaultHttpsPort : DefaultHttpPort));
+     return "http-connection:" + copy.toEncoded(QUrl::RemovePassword | QUrl::RemovePath |
+                                                QUrl::RemoveQuery | QUrl::RemoveFragment);
+@@ -88,7 +88,8 @@
+     }
+ 
+     QUrl url = request.url();
+-    if (url.scheme() == QLatin1String("http") || url.scheme() == QLatin1String("https"))
++    QString scheme = url.scheme().lower();
++    if (scheme == QLatin1String("http") || scheme == QLatin1String("https"))
+         return new QNetworkAccessHttpBackend;
+ 
+     return 0;
+@@ -309,7 +310,7 @@
+ void QNetworkAccessHttpBackend::open()
+ {
+     QUrl url = request().url();
+-    bool encrypt = url.scheme() == QLatin1String("https");
++    bool encrypt = url.scheme().toLower() == QLatin1String("https");
+     setAttribute(QNetworkRequest::ConnectionEncryptedAttribute, encrypt);
+ 
+     // set the port number in the reply if it wasn't set

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2008-06-12 09:54:19 UTC (rev 10983)
+++ trunk/packages/qt4-x11/debian/patches/series	2008-06-12 10:14:17 UTC (rev 10984)
@@ -1,5 +1,6 @@
 # patches from upstream
 0001_webkit_backround_in_scrollbars_webkit-5b0ea6b840a6e25e97b886e1852c3fc6ef8e8d0d.diff
+0002_https_lowercase.cpp
 # qt-copy patches
 0167-fix-group-reading.diff
 0180-window-role.diff




More information about the pkg-kde-commits mailing list