third_party/sqlite/patches/0011-fts2-Disable-fts2_tokenizer-for-security-reasons.patch - Issue 901033002: Import SQLite 3.8.7.4.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/sqlite/patches/0011-fts2-Disable-fts2_tokenizer-for-security-reasons.patch

Issue 901033002: Import SQLite 3.8.7.4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Chromium changes to support SQLite 3.8.7.4. Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/sqlite/patches/0010-fts3-Disable-fts3_tokenizer-and-fts4.patch ('k') | third_party/sqlite/patches/0011-fts3-backport-ICU-tokenizer-iterate-by-UTF16.patch » ('j') | third_party/sqlite/src/src/os_unix.c » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/sqlite/patches/0011-fts2-Disable-fts2_tokenizer-for-security-reasons.patch

diff --git a/third_party/sqlite/patches/0017-fts2-Disable-fts2_tokenizer-for-security-reasons.patch b/third_party/sqlite/patches/0011-fts2-Disable-fts2_tokenizer-for-security-reasons.patch

similarity index 92%

rename from third_party/sqlite/patches/0017-fts2-Disable-fts2_tokenizer-for-security-reasons.patch

rename to third_party/sqlite/patches/0011-fts2-Disable-fts2_tokenizer-for-security-reasons.patch

index 28c71f1f9c2fc1828b6cc5645238412ce547b356..b30be1259278afdb6311586af0c5926380c0a555 100644

--- a/third_party/sqlite/patches/0017-fts2-Disable-fts2_tokenizer-for-security-reasons.patch

+++ b/third_party/sqlite/patches/0011-fts2-Disable-fts2_tokenizer-for-security-reasons.patch

@@ -1,7 +1,7 @@

-From ffc4e16279571911d59495335652905e06ac2b63 Mon Sep 17 00:00:00 2001

+From 971ef3e0fc917c25d7c0037de0c7a6df80068368 Mon Sep 17 00:00:00 2001

From: Scott Hess <shess@chromium.org>

Date: Mon, 22 Dec 2014 14:06:33 -0800

-Subject: [PATCH 17/23] [fts2] Disable fts2_tokenizer for security reasons.

+Subject: [PATCH 11/16] [fts2] Disable fts2_tokenizer for security reasons.

This was a leftover bit from merging the Gears SQLite into Chromium's version.

@@ -12,7 +12,7 @@ Original commit URL, which also shifted directory structure:

1 file changed, 18 insertions(+)

diff --git a/third_party/sqlite/src/ext/fts2/fts2.c b/third_party/sqlite/src/ext/fts2/fts2.c

-index 3d9728a..4945cd9 100644

+index dd75b4a..944f324 100644

--- a/third_party/sqlite/src/ext/fts2/fts2.c

+++ b/third_party/sqlite/src/ext/fts2/fts2.c

@@ -37,6 +37,20 @@