aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrakuco <rakuco@FreeBSD.org>2013-05-12 03:09:07 +0800
committerrakuco <rakuco@FreeBSD.org>2013-05-12 03:09:07 +0800
commit257f43de0344e7037fe62e4f5ac7a9cc363dafef (patch)
tree914eca424268002e7901fdd25423ffaf16b429c1
parent3f74f6c34fab9b02ca21d178aa446534de401b9a (diff)
downloadfreebsd-ports-gnome-257f43de0344e7037fe62e4f5ac7a9cc363dafef.tar.gz
freebsd-ports-gnome-257f43de0344e7037fe62e4f5ac7a9cc363dafef.tar.zst
freebsd-ports-gnome-257f43de0344e7037fe62e4f5ac7a9cc363dafef.zip
Add upstream patch to prevent passwords from being shown in HTTP URLs in error messages.
-rw-r--r--x11/kdelibs4/Makefile2
-rw-r--r--x11/kdelibs4/files/patch-kioslave__http__http.cpp32
2 files changed, 33 insertions, 1 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 0b11fe18df34..1233521b1d3d 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kdelibs4/files/patch-kioslave__http__http.cpp b/x11/kdelibs4/files/patch-kioslave__http__http.cpp
new file mode 100644
index 000000000000..60842593ffbc
--- /dev/null
+++ b/x11/kdelibs4/files/patch-kioslave__http__http.cpp
@@ -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
+--- ./kioslave/http/http.cpp
++++ ./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) {