Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23

ossrs · May 29, 2017 · 54411e0 · 54411e0
1 parent 6993ac2
commit 54411e0
Show file tree

Hide file tree

Showing 6 changed files with 1,427 additions and 572 deletions.
diff --git a/README.md b/README.md
@@ -189,6 +189,7 @@ Please select your language:
 
 ### V3 changes
 
+* v3.0, 2017-05-30, Fix [#904][bug #904], replace NXJSON(LGPL) with json-parser(BSD). 3.0.23
 * v3.0, 2017-04-16, Fix [#547][bug #547], support HLS audio in TS. 3.0.22
 * v3.0, 2017-03-26, Fix [#820][bug #820], extract service for modules. 3.0.21
 * v3.0, 2017-03-02, Fix [#786][bug #786], simply don't reuse object. 3.0.20
@@ -1417,6 +1418,7 @@ Winlin
 [bug #786]: https://github.com/ossrs/srs/issues/786
 [bug #820]: https://github.com/ossrs/srs/issues/820
 [bug #547]: https://github.com/ossrs/srs/issues/547
+[bug #904]: https://github.com/ossrs/srs/issues/904
 [bug #xxxxxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxxxxx
 
 [exo #828]: https://github.com/google/ExoPlayer/pull/828

diff --git a/trunk/research/api-server/server.py b/trunk/research/api-server/server.py
@@ -117,7 +117,7 @@ def POST(self):
         except Exception, ex:
             code = Error.system_parse_json
             trace("parse the request to json failed, req=%s, ex=%s, code=%s"%(req, ex, code))
-            return str(code)
+            return json.dumps({"code": int(code), "data": None})
 
         action = json_req["action"]
         if action == "on_connect":
@@ -128,7 +128,7 @@ def POST(self):
             trace("invalid request action: %s"%(json_req["action"]))
             code = Error.request_invalid_action
 
-        return str(code)
+        return json.dumps({"code": int(code), "data": None})
 
     def OPTIONS(self, *args, **kwargs):
         enable_crossdomain()
@@ -204,7 +204,7 @@ def POST(self):
         except Exception, ex:
             code = Error.system_parse_json
             trace("parse the request to json failed, req=%s, ex=%s, code=%s"%(req, ex, code))
-            return str(code)
+            return json.dumps({"code": int(code), "data": None})
 
         action = json_req["action"]
         if action == "on_publish":
@@ -215,7 +215,7 @@ def POST(self):
             trace("invalid request action: %s"%(json_req["action"]))
             code = Error.request_invalid_action
 
-        return str(code)
+        return json.dumps({"code": int(code), "data": None})
 
     def OPTIONS(self, *args, **kwargs):
         enable_crossdomain()
@@ -284,7 +284,7 @@ def POST(self):
         except Exception, ex:
             code = Error.system_parse_json
             trace("parse the request to json failed, req=%s, ex=%s, code=%s"%(req, ex, code))
-            return str(code)
+            return json.dumps({"code": int(code), "data": None})
 
         action = json_req["action"]
         if action == "on_dvr":
@@ -293,7 +293,7 @@ def POST(self):
             trace("invalid request action: %s"%(json_req["action"]))
             code = Error.request_invalid_action
 
-        return str(code)
+        return json.dumps({"code": int(code), "data": None})
 
     def OPTIONS(self, *args, **kwargs):
         enable_crossdomain()
@@ -405,7 +405,7 @@ def POST(self):
         except Exception, ex:
             code = Error.system_parse_json
             trace("parse the request to json failed, req=%s, ex=%s, code=%s"%(req, ex, code))
-            return str(code)
+            return json.dumps({"code": int(code), "data": None})
 
         action = json_req["action"]
         if action == "on_hls":
@@ -414,7 +414,7 @@ def POST(self):
             trace("invalid request action: %s"%(json_req["action"]))
             code = Error.request_invalid_action
 
-        return str(code)
+        return json.dumps({"code": int(code), "data": None})
 
     def OPTIONS(self, *args, **kwargs):
         enable_crossdomain()
@@ -481,7 +481,7 @@ def POST(self):
         except Exception, ex:
             code = Error.system_parse_json
             trace("parse the request to json failed, req=%s, ex=%s, code=%s"%(req, ex, code))
-            return str(code)
+            return json.dumps({"code": int(code), "data": None})
 
         action = json_req["action"]
         if action == "on_play":
@@ -492,7 +492,7 @@ def POST(self):
             trace("invalid request action: %s"%(json_req["action"]))
             code = Error.request_invalid_action
 
-        return str(code)
+        return json.dumps({"code": int(code), "data": None})
 
     def OPTIONS(self, *args, **kwargs):
         enable_crossdomain()
@@ -803,7 +803,7 @@ def POST(self):
         except Exception, ex:
             code = Error.system_parse_json
             trace("parse the request to json failed, req=%s, ex=%s, code=%s"%(req, ex, code))
-            return str(code)
+            return json.dumps({"code": int(code), "data": None})
 
         action = json_req["action"]
         if action == "on_publish":
@@ -814,7 +814,7 @@ def POST(self):
             trace("invalid request action: %s"%(json_req["action"]))
             code = Error.request_invalid_action
 
-        return str(code)
+        return json.dumps({"code": int(code), "data": None})
 
     def OPTIONS(self, *args, **kwargs):
         enable_crossdomain()

diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp
@@ -466,7 +466,7 @@ int SrsHttpHooks::do_post(SrsHttpClient* hc, std::string url, std::string req, i
     }
 
     // parse string res to json.
-    SrsJsonAny* info = SrsJsonAny::loads((char*)res.c_str());
+    SrsJsonAny* info = SrsJsonAny::loads(res);
     if (!info) {
         ret = ERROR_HTTP_DATA_INVALID;
         srs_error("invalid response %s. ret=%d", res.c_str(), ret);

diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
@@ -27,7 +27,7 @@
 // current release version
 #define VERSION_MAJOR       3
 #define VERSION_MINOR       0
-#define VERSION_REVISION    22
+#define VERSION_REVISION    23
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>