Squash: Merge SRS 4.0

trunk/conf/full.conf

@@ -946,31 +946,6 @@ vhost refer.anti_suck.com {
     }
 }
 
-# vhost for bwt(bandwidth check)
-# generally, the bandcheck vhost must be: bandcheck.srs.com,
-# or need to modify the vhost of client.
-vhost bandcheck.srs.com {
-    enabled         on;
-    chunk_size      65000;
-    # bandwidth check config.
-    bandcheck {
-        # whether support bandwidth check,
-        # default: off.
-        enabled         on;
-        # the key for server to valid,
-        # if invalid key, server disconnect and abort the bandwidth check.
-        key             "35c9b402c12a7246868752e2878f7e0e";
-        # the interval in seconds for bandwidth check,
-        # server do not allow new test request.
-        # default: 30
-        interval        30;
-        # the max available check bandwidth in kbps.
-        # to avoid attack of bandwidth check.
-        # default: 1000
-        limit_kbps      4000;
-    }
-}
-
 # the security to allow or deny clients.
 vhost security.srs.com {
     # security for host to allow or deny clients.