summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2013-06-08 22:17:11 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2013-06-08 22:17:11 +0000
commit9329fb6e29227f49df139703f239ccf36cb99638 (patch)
treefd3e71a6d33bc11cd2a195b4e1f35cb97f806127 /kde-base/kdelibs
parentAdd uclibc support, bug #431560 (diff)
downloadgentoo-2-9329fb6e29227f49df139703f239ccf36cb99638.tar.gz
gentoo-2-9329fb6e29227f49df139703f239ccf36cb99638.tar.bz2
gentoo-2-9329fb6e29227f49df139703f239ccf36cb99638.zip
Restore missing patch, bug 472694
(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Diffstat (limited to 'kde-base/kdelibs')
-rw-r--r--kde-base/kdelibs/ChangeLog6
-rw-r--r--kde-base/kdelibs/files/kdelibs-4.10.2-security-url-dont-show-password.patch32
2 files changed, 37 insertions, 1 deletions
diff --git a/kde-base/kdelibs/ChangeLog b/kde-base/kdelibs/ChangeLog
index 52bcaf3b70dd..0ce8148d512d 100644
--- a/kde-base/kdelibs/ChangeLog
+++ b/kde-base/kdelibs/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kdelibs
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.932 2013/06/08 17:33:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdelibs/ChangeLog,v 1.933 2013/06/08 22:17:11 dilfridge Exp $
+
+ 08 Jun 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ +files/kdelibs-4.10.2-security-url-dont-show-password.patch:
+ Restore missing patch, bug 472694
08 Jun 2013; Agostino Sarubbo <ago@gentoo.org>
-files/kdelibs-4.10.2-security-url-dont-show-password.patch,
diff --git a/kde-base/kdelibs/files/kdelibs-4.10.2-security-url-dont-show-password.patch b/kde-base/kdelibs/files/kdelibs-4.10.2-security-url-dont-show-password.patch
new file mode 100644
index 000000000000..3d98a47ae8b6
--- /dev/null
+++ b/kde-base/kdelibs/files/kdelibs-4.10.2-security-url-dont-show-password.patch
@@ -0,0 +1,32 @@
+commit 65d736dab592bced4410ccfa4699de89f78c96ca
+Author: Grégory Oestreicher <greg@kamago.net>
+Date: Wed May 8 23:16:00 2013 +0200
+
+ Don't show passwords contained in HTTP URLs in error messages
+ BUG: 319428
+
+diff --git a/kioslave/http/http.cpp b/kioslave/http/http.cpp
+index 2d139a9..129fc7b 100644
+--- a/kioslave/http/http.cpp
++++ b/kioslave/http/http.cpp
+@@ -3056,7 +3056,7 @@ try_again:
+ ; // Ignore error
+ } else {
+ if (!sendErrorPageNotification()) {
+- error(ERR_INTERNAL_SERVER, m_request.url.url());
++ error(ERR_INTERNAL_SERVER, m_request.url.prettyUrl());
+ return false;
+ }
+ }
+@@ -3072,9 +3072,9 @@ try_again:
+ // Tell that we will only get an error page here.
+ if (!sendErrorPageNotification()) {
+ if (m_request.responseCode == 403)
+- error(ERR_ACCESS_DENIED, m_request.url.url());
++ error(ERR_ACCESS_DENIED, m_request.url.prettyUrl());
+ else
+- error(ERR_DOES_NOT_EXIST, m_request.url.url());
++ error(ERR_DOES_NOT_EXIST, m_request.url.prettyUrl());
+ return false;
+ }
+ } else if (m_request.responseCode >= 301 && m_request.responseCode<= 303) {