diff options
| author | cretin45 <cretin45@gmail.com> | 2014-10-01 14:11:37 -0700 |
|---|---|---|
| committer | cretin45 <cretin45@gmail.com> | 2014-10-01 14:11:37 -0700 |
| commit | addbc79bdab181f0e045d996f25cbb7dd0814c81 (patch) | |
| tree | d38e403f517804a33f61fe97989f182111a60273 | |
| parent | b1023ce3bb6cae6e0f8899046c1f84e25005746c (diff) | |
| parent | 5530bb8f466edbbe3f527cbc2c3b5ec30098f598 (diff) | |
| download | AndroidAsync-cm-11.0-XNPH05Q-tomato-9828f8e9cc.tar.gz AndroidAsync-cm-11.0-XNPH05Q-tomato-9828f8e9cc.tar.bz2 AndroidAsync-cm-11.0-XNPH05Q-tomato-9828f8e9cc.zip | |
Merge branch 'koush' into cm-11.0cm-11.0-XNPH05Q-tomato-9828f8e9cccm-11.0-XNPH05Q-bacon-5229c4ef56staging/cm-12.0-cafstable/cm-11.0-XNG3Cstable/cm-11.0-XNG2Sstable/cm-11.0-XNF9Xstable/cm-11.0-XNF8Ystable/cm-11.0shipping/cm-11.0cm-11.0
| -rw-r--r-- | AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java | 2 | ||||
| -rw-r--r-- | AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java index 7bceceb..1c9cbc6 100644 --- a/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java +++ b/AndroidAsync/src/com/koushikdutta/async/http/body/UrlEncodedFormBody.java @@ -59,7 +59,7 @@ public class UrlEncodedFormBody implements AsyncHttpRequestBody<Multimap> { public static final String CONTENT_TYPE = "application/x-www-form-urlencoded"; @Override public String getContentType() { - return CONTENT_TYPE + "; charset=utf8"; + return CONTENT_TYPE + "; charset=utf-8"; } @Override diff --git a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java index bd7211b..9faa365 100644 --- a/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java +++ b/AndroidAsync/src/com/koushikdutta/async/http/server/AsyncHttpServerResponseImpl.java @@ -206,13 +206,13 @@ public class AsyncHttpServerResponseImpl implements AsyncHttpServerResponse { responseCode(200); String contentType = mRawHeaders.get("Content-Type"); if (contentType == null) - contentType = "text/html; charset=utf8"; + contentType = "text/html; charset=utf-8"; send(contentType, string); } @Override public void send(JSONObject json) { - send("application/json; charset=utf8", json.toString()); + send("application/json; charset=utf-8", json.toString()); } @Override |