Merge pull request #37 from dtynn/json_msg

longshanksmo · longshanksmo · commit 8d2212aead1e · 2013-08-28T02:34:32.000-07:00
Json msg
diff --git a/qiniu/http.php b/qiniu/http.php
@@ -182,7 +182,8 @@ function Qiniu_Client_ret($resp) // => ($data, $error)
 		if ($resp->ContentLength !== 0) {
 			$data = json_decode($resp->Body, true);
 			if ($data === null) {
-				$err = new Qiniu_Error(0, json_last_error_msg());
+				$err_msg = function_exists('json_last_error_msg') ? json_last_error_msg() : "error with content:" . $resp->Body;
+				$err = new Qiniu_Error(0, $err_msg);
 				return array(null, $err);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,8 @@ function Qiniu_Client_ret($resp) // => ($data, $error)`
`182`	`182`	`if ($resp->ContentLength !== 0) {`
`183`	`183`	`$data = json_decode($resp->Body, true);`
`184`	`184`	`if ($data === null) {`
`185`		`- $err = new Qiniu_Error(0, json_last_error_msg());`
	`185`	`+ $err_msg = function_exists('json_last_error_msg') ? json_last_error_msg() : "error with content:" . $resp->Body;`
	`186`	`+ $err = new Qiniu_Error(0, $err_msg);`
`186`	`187`	`return array(null, $err);`
`187`	`188`	`}`
`188`	`189`	`}`