Commit8a5ada3

committed

Merge pull requestAsyncHttpClient#540 from kelvl/content-type-body-charset-sync

Propagate charset from Content-Type into Request's bodyEncoding

2 parents8a7328c +d6b992a commit8a5ada3Copy full SHA for 8a5ada3

File tree

+22

-1

lines changed

src
- main/java/com/ning/http/client
  - RequestBuilderBase.java
- test/java/com/ning/http/client/async
  - RequestBuilderTest.java

+22

-1

lines changed

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -612,9 +612,22 @@ public T setConnectionPoolKeyStrategy(ConnectionPoolKeyStrategy connectionPoolKe`
`612`	`612`	`}`
`613`	`613`
`614`	`614`	`publicRequestbuild() {`
	`615`	`+try {`
	`616`	`+finalStringcontentType =request.headers.getFirstValue("Content-Type");`
	`617`	`+if (contentType !=null) {`
	`618`	`+finalStringcharset =AsyncHttpProviderUtils.parseCharset(contentType);`
	`619`	`+if (charset !=null) {`
	`620`	`+// ensure that if charset is provided with the Content-Type header,`
	`621`	`+// we propagate that down to the charset of the Request object`
	`622`	`+request.charset =charset;`
	`623`	`+ }`
	`624`	`+ }`
	`625`	`+ }catch (Throwablee) {`
	`626`	`+// NoOp -- we can't fix the Content-Type or charset from here`
	`627`	`+ }`
`615`	`628`	`if (request.length <0 &&request.streamData ==null) {`
`616`	`629`	`// can't concatenate content-length`
`617`		`-StringcontentLength =request.headers.getFirstValue("Content-Length");`
	`630`	`+finalStringcontentLength =request.headers.getFirstValue("Content-Length");`
`618`	`631`
`619`	`632`	`if (contentLength !=null) {`
`620`	`633`	`try {`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,4 +105,12 @@ public void testUserProvidedRequestMethod() {`
`105`	`105`	`assertEquals(req.getMethod(),"ABC");`
`106`	`106`	`assertEquals(req.getUrl(),"http://foo.com");`
`107`	`107`	`}`
	`108`	`+`
	`109`	`+@Test(groups = {"standalone","default_provider"})`
	`110`	`+publicvoidtestContentTypeCharsetToBodyEncoding() {`
	`111`	`+finalRequestreq =newRequestBuilder("GET").setHeader("Content-Type","application/json; charset=utf-8").build();`
	`112`	`+assertEquals(req.getBodyEncoding(),"utf-8");`
	`113`	`+finalRequestreq2 =newRequestBuilder("GET").setHeader("Content-Type","application/json; charset=\"utf-8\"").build();`
	`114`	`+assertEquals(req2.getBodyEncoding(),"utf-8");`
	`115`	`+ }`
`108`	`116`	`}`

Comments

(0)