Merge branch 'master' of github.com:Red5/red5-server

Red5 · Aug 26, 2016 · 785c0b6 · 785c0b6
2 parents fbeb007 + 36a28c0
commit 785c0b6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 26 deletions.
diff --git a/src/main/server/conf/jee-container.xml b/src/main/server/conf/jee-container.xml
@@ -4,24 +4,24 @@
        xmlns:lang="http://www.springframework.org/schema/lang"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
-        
+
     <!-- War deployer -->
     <bean id="warDeployer" class="org.red5.server.tomcat.WarDeployer">
         <property name="checkInterval" value="${war.deploy.server.check.interval}"/>
-        <property name="webappFolder" value="${red5.root}/webapps"/>        
+        <property name="webappFolder" value="${red5.root}/webapps"/>
         <!-- Expand war files prior to startup of the remaining services -->
         <property name="expandWars" value="true" />
-    </bean>      
+    </bean>
 
-    <!-- 
+    <!--
     The tomcat connectors may be blocking or non-blocking. Select between either option via the protocol property.
         Blocking I/O:
             <property name="protocol" value="org.apache.coyote.http11.Http11Protocol" />
         Non-blocking I/O:
             <property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />  
-     -->                           
+     -->
 
-    <!-- Tomcat without SSL enabled -->   
+    <!-- Tomcat without SSL enabled -->
     <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader,warDeployer" lazy-init="true">
 
         <property name="webappFolder" value="${red5.root}/webapps" />
@@ -31,22 +31,22 @@
                 <bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
                     <property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
                     <property name="address" value="${http.host}:${http.port}" />
-                    <property name="redirectPort" value="${https.port}" />  
+                    <property name="redirectPort" value="${https.port}" />
                     <property name="connectionProperties">
                         <map>
-                            <entry key="maxKeepAliveRequests" value="-1"/>
+                            <entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
                             <entry key="keepAliveTimout" value="-1"/>
                         </map>
                     </property>
-                </bean>     
+                </bean>
             </list>
         </property>
 
         <property name="baseHost">
            <bean class="org.apache.catalina.core.StandardHost">
                <property name="name" value="${http.host}" />
-           </bean>     
-        </property>     
+           </bean>
+        </property>
 
         <property name="valves">
             <list>
@@ -63,7 +63,7 @@
     </bean>
 
     <!-- Tomcat with SSL enabled -->
-<!-- 
+<!--
     <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" lazy-init="true">
 
         <property name="webappFolder" value="${red5.root}/webapps" />
@@ -73,15 +73,15 @@
                 <bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
                     <property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
                     <property name="address" value="${http.host}:${http.port}" />
-                    <property name="redirectPort" value="${https.port}" />  
+                    <property name="redirectPort" value="${https.port}" />
                 </bean>
                 <bean name="httpsConnector" class="org.red5.server.tomcat.TomcatConnector">
                     <property name="secure" value="true" />
                     <property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
                     <property name="address" value="${http.host}:${https.port}" />
-                    <property name="redirectPort" value="${http.port}" />  
+                    <property name="redirectPort" value="${http.port}" />
                     <property name="connectionProperties">
-                        <map>           
+                        <map>
                             <entry key="port" value="${https.port}" />
                             <entry key="redirectPort" value="${http.port}" />
                             <entry key="SSLEnabled" value="true" />
@@ -91,23 +91,24 @@
                             <entry key="keystoreType" value="JKS" />
                             <entry key="truststoreFile" value="${rtmps.truststorefile}" />
                             <entry key="truststorePass" value="${rtmps.truststorepass}" />
-                            <entry key="clientAuth" value="false" />                             
+                            <entry key="clientAuth" value="false" />
                             <entry key="allowUnsafeLegacyRenegotiation" value="true" />                             
                             <entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
+                            <entry key="keepAliveTimout" value="-1"/>
                             <entry key="useExecutor" value="true"/>
                             <entry key="maxThreads" value="${http.max_threads}"/>
                             <entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
                             <entry key="processorCache" value="${http.processor_cache}"/>
                         </map>
-                    </property> 
-                </bean>             
+                    </property>
+                </bean>
             </list>
         </property>
-                        
+
         <property name="baseHost">
             <bean class="org.apache.catalina.core.StandardHost">
                 <property name="name" value="${http.host}" />
-            </bean>     
+            </bean>
         </property>
         
     </bean>

diff --git a/src/main/server/conf/red5-core.xml b/src/main/server/conf/red5-core.xml
@@ -194,15 +194,10 @@
         <property name="cipherSuites">
             <array>
                 <value>TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</value>
-                <value>TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384</value>
                 <value>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</value>
-                <value>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384</value>
-                <value>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</value>
                 <value>TLS_ECDHE_RSA_WITH_RC4_128_SHA</value>
                 <value>TLS_RSA_WITH_AES_128_CBC_SHA256</value>
                 <value>TLS_RSA_WITH_AES_128_CBC_SHA</value>
-                <value>TLS_RSA_WITH_AES_256_CBC_SHA256</value>
-                <value>TLS_RSA_WITH_AES_256_CBC_SHA</value>
                 <value>SSL_RSA_WITH_RC4_128_SHA</value>
             </array>
         </property>
@@ -241,4 +236,4 @@
         <property name="dumpTo" value="./webapps/dump/" />
     </bean>
 -->
-</beans>
+</beans>