diff options
| author | Thomas Watson | 2009-07-28 19:27:43 +0000 |
|---|---|---|
| committer | Thomas Watson | 2009-07-28 19:27:43 +0000 |
| commit | b1919ec072e18d6fe2f7fc3c1f19942735249c07 (patch) | |
| tree | 6fa5ba4f704a81e56287fce3f85a5c55989a865b | |
| parent | 023d353a54c530a86bbb1dea8f610a2c5cf2934a (diff) | |
| download | rt.equinox.bundles-R35x_v20090728.tar.gz rt.equinox.bundles-R35x_v20090728.tar.xz rt.equinox.bundles-R35x_v20090728.zip | |
Bug 277783 Http service should not use 8859_1 alias on S60R35x_v20090728
3 files changed, 5 insertions, 5 deletions
diff --git a/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF index 32cece2a3..7ea11ec8d 100644 --- a/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.http/META-INF/MANIFEST.MF @@ -1,6 +1,6 @@ Bundle-ManifestVersion: 2 Bundle-Vendor: %bundleVendor -Bundle-Version: 1.0.300.qualifier +Bundle-Version: 1.0.301.qualifier Bundle-Activator: org.eclipse.equinox.http.Activator Bundle-Copyright: %bundleCopyright Bundle-SymbolicName: org.eclipse.equinox.http diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/StaticDataReader.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/StaticDataReader.java index fec2ebf0a..760079fdc 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/StaticDataReader.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/StaticDataReader.java @@ -95,7 +95,7 @@ public class StaticDataReader { if (in != null) { try { - BufferedReader rdr = new BufferedReader(new InputStreamReader(in, "8859_1")); //$NON-NLS-1$ + BufferedReader rdr = new BufferedReader(new InputStreamReader(in, "ISO-8859-1")); //$NON-NLS-1$ while (true) { String line = rdr.readLine(); if (line == null) /* EOF */ @@ -134,7 +134,7 @@ public class StaticDataReader { if (in != null) { try { - BufferedReader rdr = new BufferedReader(new InputStreamReader(in, "8859_1")); //$NON-NLS-1$ + BufferedReader rdr = new BufferedReader(new InputStreamReader(in, "ISO-8859-1")); //$NON-NLS-1$ while (true) { String line = rdr.readLine(); if (line == null) /* EOF */ diff --git a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/URI.java b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/URI.java index 8eec1e9b1..b52dff3ba 100644 --- a/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/URI.java +++ b/bundles/org.eclipse.equinox.http/src/org/eclipse/equinox/http/URI.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 1999, 2006 IBM Corporation and others. + * Copyright (c) 1999, 2009 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -118,7 +118,7 @@ public class URI { } try { - return new String(input, offset, length, "8859_1"); //$NON-NLS-1$ + return new String(input, offset, length, "ISO-8859-1"); //$NON-NLS-1$ } catch (UnsupportedEncodingException e) { /* in the unlikely event 8859_1 is not present */ return new String(input, offset, length); |