external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2015-10-20 10:17:54 +08:00
commit 9eebb89432
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
trunk/src/app/srs_app_http_hooks.cpp
View file

@ -447,14 +447,14 @@ int SrsHttpHooks::do_post(SrsHttpClient* hc, std::string url, std::string req, i
// ensure the http status is ok. // ensure the http status is ok.
// https://github.com/simple-rtmp-server/srs/issues/158 // https://github.com/simple-rtmp-server/srs/issues/158
if (code != SRS_CONSTS_HTTP_OK) { if (code != SRS_CONSTS_HTTP_OK) {
ret = ERROR_HTTP_STATUS_INVLIAD; ret = ERROR_HTTP_STATUS_INVALID;
srs_error("invalid response status=%d. ret=%d", code, ret); srs_error("invalid response status=%d. ret=%d", code, ret);
return ret; return ret;
} }
// should never be empty. // should never be empty.
if (res.empty()) { if (res.empty()) {
ret = ERROR_HTTP_DATA_INVLIAD; ret = ERROR_HTTP_DATA_INVALID;
srs_error("invalid empty response. ret=%d", ret); srs_error("invalid empty response. ret=%d", ret);
return ret; return ret;
} }
@ -462,7 +462,7 @@ int SrsHttpHooks::do_post(SrsHttpClient* hc, std::string url, std::string req, i
// parse string res to json. // parse string res to json.
SrsJsonAny* info = SrsJsonAny::loads((char*)res.c_str()); SrsJsonAny* info = SrsJsonAny::loads((char*)res.c_str());
if (!info) { if (!info) {
ret = ERROR_HTTP_DATA_INVLIAD; ret = ERROR_HTTP_DATA_INVALID;
srs_error("invalid response %s. ret=%d", res.c_str(), ret); srs_error("invalid response %s. ret=%d", res.c_str(), ret);
return ret; return ret;
} }
@ -471,7 +471,7 @@ int SrsHttpHooks::do_post(SrsHttpClient* hc, std::string url, std::string req, i
// response error code in string. // response error code in string.
if (!info->is_object()) { if (!info->is_object()) {
if (res != SRS_HTTP_RESPONSE_OK) { if (res != SRS_HTTP_RESPONSE_OK) {
ret = ERROR_HTTP_DATA_INVLIAD; ret = ERROR_HTTP_DATA_INVALID;
srs_error("invalid response number %s. ret=%d", res.c_str(), ret); srs_error("invalid response number %s. ret=%d", res.c_str(), ret);
return ret; return ret;
} }

6
trunk/src/kernel/srs_kernel_error.hpp
View file

@ -108,7 +108,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/////////////////////////////////////////////////////// ///////////////////////////////////////////////////////
#define ERROR_RTMP_PLAIN_REQUIRED 2000 #define ERROR_RTMP_PLAIN_REQUIRED 2000
#define ERROR_RTMP_CHUNK_START 2001 #define ERROR_RTMP_CHUNK_START 2001
#define ERROR_RTMP_MSG_INVLIAD_SIZE 2002 #define ERROR_RTMP_MSG_INVALID_SIZE 2002
#define ERROR_RTMP_AMF0_DECODE 2003 #define ERROR_RTMP_AMF0_DECODE 2003
#define ERROR_RTMP_AMF0_INVALID 2004 #define ERROR_RTMP_AMF0_INVALID 2004
#define ERROR_RTMP_REQ_CONNECT 2005 #define ERROR_RTMP_REQ_CONNECT 2005
@ -175,7 +175,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define ERROR_HLS_AAC_FRAME_LENGTH 3005 #define ERROR_HLS_AAC_FRAME_LENGTH 3005
#define ERROR_HLS_AVC_SAMPLE_SIZE 3006 #define ERROR_HLS_AVC_SAMPLE_SIZE 3006
#define ERROR_HTTP_PARSE_URI 3007 #define ERROR_HTTP_PARSE_URI 3007
#define ERROR_HTTP_DATA_INVLIAD 3008 #define ERROR_HTTP_DATA_INVALID 3008
#define ERROR_HTTP_PARSE_HEADER 3009 #define ERROR_HTTP_PARSE_HEADER 3009
#define ERROR_HTTP_HANDLER_MATCH_URL 3010 #define ERROR_HTTP_HANDLER_MATCH_URL 3010
#define ERROR_HTTP_HANDLER_INVALID 3011 #define ERROR_HTTP_HANDLER_INVALID 3011
@ -243,7 +243,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define ERROR_HTTP_URL_NOT_CLEAN 4002 #define ERROR_HTTP_URL_NOT_CLEAN 4002
#define ERROR_HTTP_CONTENT_LENGTH 4003 #define ERROR_HTTP_CONTENT_LENGTH 4003
#define ERROR_HTTP_LIVE_STREAM_EXT 4004 #define ERROR_HTTP_LIVE_STREAM_EXT 4004
#define ERROR_HTTP_STATUS_INVLIAD 4005 #define ERROR_HTTP_STATUS_INVALID 4005
#define ERROR_KERNEL_AAC_STREAM_CLOSED 4006 #define ERROR_KERNEL_AAC_STREAM_CLOSED 4006
#define ERROR_AAC_DECODE_ERROR 4007 #define ERROR_AAC_DECODE_ERROR 4007
#define ERROR_KERNEL_MP3_STREAM_CLOSED 4008 #define ERROR_KERNEL_MP3_STREAM_CLOSED 4008