diff --git a/README.md b/README.md index 6e0ea2492..c5e745369 100755 --- a/README.md +++ b/README.md @@ -164,7 +164,7 @@ Please select according to languages: - [x] Support valgrind and latest ARM by patching ST, read [ST#1](https://github.com/ossrs/state-threads/issues/1) and [ST#2](https://github.com/ossrs/state-threads/issues/2). - [x] Support tracable and session-based log([CN][v1_CN_SrsLog], [EN][v1_EN_SrsLog]). - [x] High concurrency and performance([CN][v1_CN_Performance], [EN][v1_EN_Performance]), 6000+ connections(500kbps), 900Mbps, CPU 90.2%, 41MB. -- [ ] Enhanced complex error code with description and stack, read [#913][bug #913]. +- [x] Enhanced complex error code with description and stack, read [#913][bug #913]. - [ ] Enhanced forwarding with vhost and variables. - [ ] Support source cleanup for idle streams. - [ ] Support origin cluster, please read [#464][bug #464], [RTMP 302][bug #92]. @@ -176,6 +176,7 @@ Please select according to languages: ### V3 changes +* v3.0, 2018-01-01, Fix [#913][bug #913], support complex error. 3.0.26 * v3.0, 2017-06-04, Fix [#299][bug #299], support experimental MPEG-DASH. 3.0.25 * v3.0, 2017-05-30, Fix [#821][bug #821], support MP4 file parser. 3.0.24 * v3.0, 2017-05-30, Fix [#904][bug #904], replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 @@ -208,6 +209,7 @@ Please select according to languages: ### V2 changes +* v2.0, 2018-01-01, Merge [#1033][bug #1033], allow user to add some specific flags. 2.0.244 * v2.0, 2017-06-10, [2.0 release2(2.0.243)][r2.0r2] released. 86670 lines. * v2.0, 2017-05-29, Merge [#899][bug #899] to fix [#893][bug #893], ts PES ext length. 2.0.243 * v2.0, 2017-05-01, Fix [#865][bug #865], shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 @@ -1400,6 +1402,7 @@ Winlin [bug #865]: https://github.com/ossrs/srs/issues/865 [bug #893]: https://github.com/ossrs/srs/issues/893 [bug #899]: https://github.com/ossrs/srs/issues/899 +[bug #1033]: https://github.com/ossrs/srs/issues/1033 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [bug #735]: https://github.com/ossrs/srs/issues/735 diff --git a/trunk/configure b/trunk/configure index ac20e046c..9db90bf35 100755 --- a/trunk/configure +++ b/trunk/configure @@ -100,7 +100,7 @@ SrsGprof=""; SrsGprofLink=""; if [ $SRS_GPROF = YES ]; then SrsGprof=" -pg -lc_p # performance of gperf SrsGperf=""; SrsGperfLink=""; if [ $SRS_GPERF = YES ]; then SrsGperfLink=" -lpthread"; fi # the cxx flag generated. -CXXFLAGS="${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}" +CXXFLAGS="${CXXFLAGS} ${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}" if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"; fi # Start to generate the Makefile. cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index f81fae0ce..ac4c2df31 100644 --- 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 25 +#define VERSION_REVISION 26 // generated by configure, only macros. #include