summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-net__socket__socks5_client_socket.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-05-20 20:47:17 +0000
committerRene Ladan <rene@FreeBSD.org>2014-05-20 20:47:17 +0000
commitc62329ccbd97e5190ad152e9428810f0e5c1d943 (patch)
tree2dd8ccc48e698b7993db731cd111168b9f3e16d7 /www/chromium/files/patch-net__socket__socks5_client_socket.cc
parentDocument new vulnerabilities in www/chromium < 35.0.1916.114 (diff)
Update to 35.0.1916.114
Changes include: - More developer control over touch input - New JavaScript features - Unprefixed Shadow DOM - A number of new apps/extension APIs - Lots of under the hood changes for stability and performance MFH: 2014Q2 Security: http://vuxml.org/freebsd/64f3872b-e05d-11e3-9dd4-00262d5ed8ee.html
Diffstat (limited to 'www/chromium/files/patch-net__socket__socks5_client_socket.cc')
-rw-r--r--www/chromium/files/patch-net__socket__socks5_client_socket.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/www/chromium/files/patch-net__socket__socks5_client_socket.cc b/www/chromium/files/patch-net__socket__socks5_client_socket.cc
index 53f0b1fbc6e0..1bd34406dbb6 100644
--- a/www/chromium/files/patch-net__socket__socks5_client_socket.cc
+++ b/www/chromium/files/patch-net__socket__socks5_client_socket.cc
@@ -1,5 +1,5 @@
---- ./net/socket/socks5_client_socket.cc.orig 2014-04-24 22:35:52.000000000 +0200
-+++ ./net/socket/socks5_client_socket.cc 2014-04-24 23:23:46.000000000 +0200
+--- ./net/socket/socks5_client_socket.cc.orig 2014-04-30 22:43:08.000000000 +0200
++++ ./net/socket/socks5_client_socket.cc 2014-05-04 14:38:48.000000000 +0200
@@ -4,6 +4,10 @@
#include "net/socket/socks5_client_socket.h"
@@ -9,5 +9,5 @@
+#endif
+
#include "base/basictypes.h"
+ #include "base/callback_helpers.h"
#include "base/compiler_specific.h"
- #include "base/debug/trace_event.h"