separate configuration for maxReadBufferSize, bump version to 1.2.18

Author: nateroe

pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.red5</groupId>
         <artifactId>red5-parent</artifactId>
-        <version>1.2.17</version>
+        <version>1.2.18</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>red5-server</artifactId>

src/main/java/org/red5/server/net/rtmp/RTMPMinaTransport.java

@@ -83,6 +83,8 @@ public class RTMPMinaTransport implements RTMPMinaTransportMXBean {
 
     protected int receiveBufferSize = 65536;
 
+    protected int maxReadBufferSize = 65536;
+
     // maximum idle time 1m
     private int idleTime = 60;
 
@@ -157,9 +159,8 @@ public void start() throws Exception {
         sessionConf.setReuseAddress(true);
         sessionConf.setTcpNoDelay(tcpNoDelay);
         sessionConf.setSendBufferSize(sendBufferSize);
-        // 
         sessionConf.setReceiveBufferSize(receiveBufferSize);
-        sessionConf.setMaxReadBufferSize(receiveBufferSize);
+        sessionConf.setMaxReadBufferSize(maxReadBufferSize);
         // sets the interval (seconds) between each throughput calculation, the default value is 3 seconds
         sessionConf.setThroughputCalculationInterval(thoughputCalcInterval);
         // set the idle time (seconds)

src/main/server/conf/red5-core.xml

@@ -84,6 +84,7 @@
         <property name="ioThreads" value="${rtmp.io_threads}" />
         <property name="sendBufferSize" value="${rtmp.send_buffer_size}" />
         <property name="receiveBufferSize" value="${rtmp.receive_buffer_size}" />
+        <property name="maxReadBufferSize" value="${rtmp.max_read_buffer_size}" />
         <property name="trafficClass" value="${rtmp.traffic_class}" />
         <property name="backlog" value="${rtmp.backlog}" />
         <property name="tcpNoDelay" value="${rtmp.tcp_nodelay}" />

src/main/server/conf/red5.properties

@@ -19,6 +19,7 @@ rtmp.port=1935
 rtmp.io_threads=8
 rtmp.send_buffer_size=65536
 rtmp.receive_buffer_size=65536
+rtmp.max_read_buffer_size=65536
 rtmp.ping_interval=1000
 rtmp.max_inactivity=60000
 rtmp.max_handshake_time=5000