Skip to content

Commit 785c0b6

Browse files
mondainmondain
committed
Merge branch 'master' of github.com:Red5/red5-server
2 parents fbeb007 + 36a28c0 commit 785c0b6

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

‎src/main/server/conf/jee-container.xml‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@
44
xmlns:lang="http://www.springframework.org/schema/lang"
55
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
66
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
7-
7+
88
<!-- War deployer -->
99
<bean id="warDeployer" class="org.red5.server.tomcat.WarDeployer">
1010
<property name="checkInterval" value="${war.deploy.server.check.interval}"/>
11-
<property name="webappFolder" value="${red5.root}/webapps"/>
11+
<property name="webappFolder" value="${red5.root}/webapps"/>
1212
<!-- Expand war files prior to startup of the remaining services -->
1313
<property name="expandWars" value="true" />
14-
</bean>
14+
</bean>
1515

16-
<!--
16+
<!--
1717
The tomcat connectors may be blocking or non-blocking. Select between either option via the protocol property.
1818
Blocking I/O:
1919
<property name="protocol" value="org.apache.coyote.http11.Http11Protocol" />
2020
Non-blocking I/O:
2121
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
22-
-->
22+
-->
2323

24-
<!-- Tomcat without SSL enabled -->
24+
<!-- Tomcat without SSL enabled -->
2525
<bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader,warDeployer" lazy-init="true">
2626

2727
<property name="webappFolder" value="${red5.root}/webapps" />
@@ -31,22 +31,22 @@
3131
<bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
3232
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
3333
<property name="address" value="${http.host}:${http.port}" />
34-
<property name="redirectPort" value="${https.port}" />
34+
<property name="redirectPort" value="${https.port}" />
3535
<property name="connectionProperties">
3636
<map>
37-
<entry key="maxKeepAliveRequests" value="-1"/>
37+
<entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
3838
<entry key="keepAliveTimout" value="-1"/>
3939
</map>
4040
</property>
41-
</bean>
41+
</bean>
4242
</list>
4343
</property>
4444

4545
<property name="baseHost">
4646
<bean class="org.apache.catalina.core.StandardHost">
4747
<property name="name" value="${http.host}" />
48-
</bean>
49-
</property>
48+
</bean>
49+
</property>
5050

5151
<property name="valves">
5252
<list>
@@ -63,7 +63,7 @@
6363
</bean>
6464

6565
<!-- Tomcat with SSL enabled -->
66-
<!--
66+
<!--
6767
<bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" lazy-init="true">
6868
6969
<property name="webappFolder" value="${red5.root}/webapps" />
@@ -73,15 +73,15 @@
7373
<bean name="httpConnector" class="org.red5.server.tomcat.TomcatConnector">
7474
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
7575
<property name="address" value="${http.host}:${http.port}" />
76-
<property name="redirectPort" value="${https.port}" />
76+
<property name="redirectPort" value="${https.port}" />
7777
</bean>
7878
<bean name="httpsConnector" class="org.red5.server.tomcat.TomcatConnector">
7979
<property name="secure" value="true" />
8080
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
8181
<property name="address" value="${http.host}:${https.port}" />
82-
<property name="redirectPort" value="${http.port}" />
82+
<property name="redirectPort" value="${http.port}" />
8383
<property name="connectionProperties">
84-
<map>
84+
<map>
8585
<entry key="port" value="${https.port}" />
8686
<entry key="redirectPort" value="${http.port}" />
8787
<entry key="SSLEnabled" value="true" />
@@ -91,23 +91,24 @@
9191
<entry key="keystoreType" value="JKS" />
9292
<entry key="truststoreFile" value="${rtmps.truststorefile}" />
9393
<entry key="truststorePass" value="${rtmps.truststorepass}" />
94-
<entry key="clientAuth" value="false" />
94+
<entry key="clientAuth" value="false" />
9595
<entry key="allowUnsafeLegacyRenegotiation" value="true" />
9696
<entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
97+
<entry key="keepAliveTimout" value="-1"/>
9798
<entry key="useExecutor" value="true"/>
9899
<entry key="maxThreads" value="${http.max_threads}"/>
99100
<entry key="acceptorThreadCount" value="${http.acceptor_thread_count}"/>
100101
<entry key="processorCache" value="${http.processor_cache}"/>
101102
</map>
102-
</property>
103-
</bean>
103+
</property>
104+
</bean>
104105
</list>
105106
</property>
106-
107+
107108
<property name="baseHost">
108109
<bean class="org.apache.catalina.core.StandardHost">
109110
<property name="name" value="${http.host}" />
110-
</bean>
111+
</bean>
111112
</property>
112113
113114
</bean>

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,10 @@
194194
<property name="cipherSuites">
195195
<array>
196196
<value>TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256</value>
197-
<value>TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384</value>
198197
<value>TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA</value>
199-
<value>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384</value>
200-
<value>TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA</value>
201198
<value>TLS_ECDHE_RSA_WITH_RC4_128_SHA</value>
202199
<value>TLS_RSA_WITH_AES_128_CBC_SHA256</value>
203200
<value>TLS_RSA_WITH_AES_128_CBC_SHA</value>
204-
<value>TLS_RSA_WITH_AES_256_CBC_SHA256</value>
205-
<value>TLS_RSA_WITH_AES_256_CBC_SHA</value>
206201
<value>SSL_RSA_WITH_RC4_128_SHA</value>
207202
</array>
208203
</property>
@@ -241,4 +236,4 @@
241236
<property name="dumpTo" value="./webapps/dump/" />
242237
</bean>
243238
-->
244-
</beans>
239+
</beans>

0 commit comments

Comments
 (0)