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

updates to phps CESU-8 support, per hoss 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@815525 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2009-09-15 22:20:31 +00:00
parent 566f02f0b2
commit 5d234337ba
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/java/org/apache/solr/request/PHPSerializedResponseWriter.java
View File

@ -35,12 +35,16 @@ import org.apache.solr.search.SolrIndexSearcher;
* http://www.hurring.com/scott/code/perl/serialize/
*
* <p>
* If the Writer passed will result in an output of CESU-8 (UTF=8 w/o support for large code points outside of the BMP), then
* the "CESU8" system property should be set by the user. If the "CESU8" property is not set, a guess is made based on
* other system properties. Currently Solr assumes that all Jetty servlet containers use CESU-8 instead of UTF-8 (verified
* to the current release of 6.1.20). Jetty is detected by checking the "jetty.home" system property.
* In order to support PHP Serialized strings with a proper byte count, This ResponseWriter
* must know if the Writers passed to it will result in an output of CESU-8 (UTF-8 w/o support
* for large code points outside of the BMP)
* <p>
* Currently Solr assumes that all Jetty servlet containers (detected using the "jetty.home"
* system property) use CESU-8 instead of UTF-8 (verified to the current release of 6.1.20).
* <p>
* In installations where Solr auto-detects incorrectly, the Solr Administrator should set the
* "solr.phps.cesu8" system property to either "true" or "false" accordingly.
*/
public class PHPSerializedResponseWriter implements QueryResponseWriter {
static String CONTENT_TYPE_PHP_UTF8="text/x-php-serialized;charset=UTF-8";
@ -48,7 +52,7 @@ public class PHPSerializedResponseWriter implements QueryResponseWriter {
// large characters outside the BMP).
boolean CESU8 = false;
public void init(NamedList n) {
String cesu8Setting = System.getProperty("CESU8");
String cesu8Setting = System.getProperty("solr.phps.cesu8");
if (cesu8Setting != null) {
CESU8="true".equals(cesu8Setting);
} else {