Emit UTF-8 in object listing and multi-delete

Fixes s3cmd tests failures seen with Unicode object names.
pull/36/head
Andrew Gaul 2015-01-13 17:46:52 -08:00
rodzic 57687bd6d6
commit e3c49331ac
1 zmienionych plików z 5 dodań i 2 usunięć

Wyświetl plik

@ -19,6 +19,7 @@ package org.gaul.s3proxy;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PushbackInputStream;
import java.io.Writer;
import java.net.URLDecoder;
@ -614,7 +615,8 @@ final class S3ProxyHandler extends AbstractHandler {
return;
}
try (Writer writer = response.getWriter()) {
try (Writer writer = new OutputStreamWriter(response.getOutputStream(),
StandardCharsets.UTF_8)) {
response.setStatus(HttpServletResponse.SC_OK);
XMLStreamWriter xml = xmlOutputFactory.createXMLStreamWriter(
writer);
@ -759,7 +761,8 @@ final class S3ProxyHandler extends AbstractHandler {
HttpServletResponse response, String containerName)
throws IOException {
try (InputStream is = request.getInputStream();
Writer writer = response.getWriter()) {
Writer writer = new OutputStreamWriter(response.getOutputStream(),
StandardCharsets.UTF_8)) {
XMLStreamWriter xml = xmlOutputFactory.createXMLStreamWriter(
writer);
xml.writeStartDocument();