Merge branch 3.0release into develop

README.md

@@ -162,6 +162,7 @@ Please select according to languages:
 
 ### V3 changes
 
+* v3.0, 2019-04-05, Merge [#1339][bug #1339], Support HTTP-FLV params. 3.0.46
 * v3.0, 2018-11-11, Merge [#1261][bug #1261], Support `_definst_` for Wowza. 3.0.44
 * v3.0, 2018-08-26, SRS [console](https://github.com/ossrs/srs-ngb) support both [Chinese](http://ossrs.net:1985/console/ng_index.html) and [English](http://ossrs.net:1985/console/en_index.html).
 * v3.0, 2018-08-25, Fix [#1093][bug #1093], Support HLS encryption. 3.0.42
@@ -213,6 +214,9 @@ Please select according to languages:
 
 ### V2 changes
 
+* v2.0, 2019-04-06, For [#1304][bug #1304], Default HSTRS to on. 2.0.264
+* <strong>v2.0, 2019-04-05, [2.0 release6(2.0.263)][r2.0r6] released. 86994 lines.</strong>
+* v2.0, 2019-04-05, Merge [#1312][bug #1312], Fix GCC7 build error, this statement may fall through. 2.0.263
 * v2.0, 2019-04-05, Merge [#1339][bug #1339], Support HTTP-FLV params. 2.0.262
 * v2.0, 2018-12-01, Merge [#1274][bug #1274], Upgrade to FFMPEG 4.1 and X264 157. 2.0.261
 * v2.0, 2018-11-11, Merge [#1261][bug #1261], Support `_definst_` for Wowza. 2.0.260
@@ -1448,6 +1452,8 @@ Winlin
 [bug #1261]: https://github.com/ossrs/srs/issues/1261
 [bug #1274]: https://github.com/ossrs/srs/pull/1274
 [bug #1339]: https://github.com/ossrs/srs/pull/1339
+[bug #1312]: https://github.com/ossrs/srs/pull/1312
+[bug #1304]: https://github.com/ossrs/srs/pull/1304
 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
 
 [bug #735]: https://github.com/ossrs/srs/issues/735
@@ -1470,6 +1476,7 @@ Winlin
 
 [exo #828]: https://github.com/google/ExoPlayer/pull/828
 
+[r2.0r6]: https://github.com/ossrs/srs/releases/tag/v2.0-r6
 [r2.0r5]: https://github.com/ossrs/srs/releases/tag/v2.0-r5
 [r2.0r4]: https://github.com/ossrs/srs/releases/tag/v2.0-r4
 [r2.0r3]: https://github.com/ossrs/srs/releases/tag/v2.0-r3

trunk/3rdparty/patches/7.http.parser.patch

@@ -0,0 +1,12 @@
+--- Makefile	2019-04-05 19:43:32.000000000 +0800
++++ ../http-parser-2.1-patch/Makefile	2019-04-05 19:50:26.000000000 +0800
+@@ -7,7 +7,8 @@ CPPFLAGS_DEBUG += $(CPPFLAGS_DEBUG_EXTRA
+ CPPFLAGS_FAST = $(CPPFLAGS) -DHTTP_PARSER_STRICT=0
+ CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
+ 
+-CFLAGS += -Wall -Wextra -Werror
++# patch by winlin
++CFLAGS += -Wall -Wextra
+ CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
+ CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
+ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC

trunk/src/app/srs_app_config.cpp

@@ -4083,8 +4083,6 @@ string SrsConfig::get_work_dir() {
     }
     
     return conf->arg0();
-    
-    return conf->arg0();
 }
 
 bool SrsConfig::get_asprocess()

trunk/src/core/srs_core.hpp

@@ -27,7 +27,7 @@
 // current release version
 #define VERSION_MAJOR       3
 #define VERSION_MINOR       0
-#define VERSION_REVISION   45
+#define VERSION_REVISION   46
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>

trunk/src/protocol/srs_rtmp_stack.hpp

@@ -41,21 +41,15 @@
 #include <srs_core_performance.hpp>
 #include <srs_kernel_flv.hpp>
 
-class ISrsProtocolReadWriter;
 class SrsFastStream;
-class SrsPacket;
 class SrsBuffer;
-class SrsAmf0Object;
 class SrsAmf0Any;
 class SrsMessageHeader;
-class SrsCommonMessage;
 class SrsChunkStream;
 class SrsSharedPtrMessage;
-class IMergeReadHandler;
 
 class SrsProtocol;
 class ISrsProtocolReadWriter;
-class SrsCommonMessage;
 class SrsCreateStreamPacket;
 class SrsFMLEStartPacket;
 class SrsPublishPacket;