Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

escape U+2028 in JSON responses 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@950125 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-06-01 15:47:03 +00:00
parent a9eb9c50a4
commit 8d8c162dc5
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
solr/CHANGES.txt
View File

@ -318,6 +318,9 @@ Bug Fixes
* SOLR-1928: TermsComponent didn't correctly break ties for non-text * SOLR-1928: TermsComponent didn't correctly break ties for non-text
fields sorted by count. (yonik) fields sorted by count. (yonik)
* SOLR-1936: The JSON response format needed to escape unicode code point
U+2028 - 'LINE SEPARATOR' (Robert Hofstra, yonik)
Other Changes Other Changes
---------------------- ----------------------

3
solr/src/java/org/apache/solr/response/JSONResponseWriter.java
View File

@ -613,7 +613,7 @@ class JSONWriter extends TextResponseWriter {
for (int i=0; i<val.length(); i++) { for (int i=0; i<val.length(); i++) {
char ch = val.charAt(i); char ch = val.charAt(i);
if ((ch > '#' && ch != '\\') || ch==' ') { // fast path if ((ch > '#' && ch != '\\' && ch != '\u2028') || ch==' ') { // fast path
writer.write(ch); writer.write(ch);
continue; continue;
} }
@ -628,6 +628,7 @@ class JSONWriter extends TextResponseWriter {
case '\t': writer.write('\\'); writer.write('t'); break; case '\t': writer.write('\\'); writer.write('t'); break;
case '\b': writer.write('\\'); writer.write('b'); break; case '\b': writer.write('\\'); writer.write('b'); break;
case '\f': writer.write('\\'); writer.write('f'); break; case '\f': writer.write('\\'); writer.write('f'); break;
case '\u2028': unicodeEscape(writer,ch); break;
// case '/': // case '/':
default: { default: {
if (ch <= 0x1F) { if (ch <= 0x1F) {