From 751323fac8ff7fa67daef246e86422531f6a5c01 Mon Sep 17 00:00:00 2001
From: winlin <winterserver@126.com>
Date: Mon, 4 Nov 2013 22:55:19 +0800
Subject: [PATCH] release v0.3, 11773 lines

---
 README.md                          |  4 ++++
 trunk/conf/srs.conf                | 38 +++++++++++++++++++++++++-----
 trunk/src/core/srs_core_client.cpp |  2 +-
 3 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 1222b0396..d1dace73f 100755
--- a/README.md
+++ b/README.md
@@ -35,17 +35,21 @@ url: rtmp://127.0.0.1:1935/live/livestream
 6. no multiple processes, single process only.<br/>
 
 ### Releases
+* 2013-11-04, [release v0.3](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.3), support vhost, refer, gop cache, listen multiple ports. 11773 lines.<br/>
 * 2013-10-25, [release v0.2](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.2), support flash publish, h264 codec, time jitter correct. 10125 lines.<br/>
 * 2013-10-23, [release v0.1](https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.1), support FMLE/FFMPEG publish, vp6 codec live streaming. 8287 lines.<br/>
 * 2013-10-17, created.<br/>
 
 ### Compare
+* srs v0.3: 11773 lines.<br/>
 * srs v0.2: 10125 lines.<br/>
 * srs v0.1: 8287 lines.<br/>
 * nginx-rtmp v1.0.4: 26786 lines <br/>
 * nginx v1.5.0: 139524 lines <br/>
 
 ### History
+* v0.3, 2013-11-04, v0.3 released. 11773 lines.
+* v0.3, 2013-11-04, support refer/play-refer/publish-refer.
 * v0.3, 2013-11-04, support vhosts specified config.
 * v0.3, 2013-11-02, support listen multiple ports.
 * v0.3, 2013-11-02, support config file in nginx-conf style.
diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf
index 36702d7c9..df5c00f38 100755
--- a/trunk/conf/srs.conf
+++ b/trunk/conf/srs.conf
@@ -1,12 +1,38 @@
 listen 1935 19350;
 vhost __defaultVhost__ {
-    enabled         on;
-    gop_cache       on;
-   #refer           github.com github.io;
-   #refer_publish   github.com github.io;
-    refer_play      github.com github.io .com;
 }
-vhost winlinvip.github.com {
+vhost removed.vhost.com {
+    # whether the vhost is enabled.
+    # if off, all request access denied.
+    # default: on
+    enabled         off;
+}
+vhost min.delay.com {
+    # whether cache the last gop.
+    # if on, cache the last gop and dispatch to client,
+    #   to enable fast startup for client, client play immediately.
+    # if off, send the latest media data to client,
+    #   client need to wait for the next Iframe to decode and show the video.
+    # set to off if requires min delay;
+    # set to on if requires client fast startup.
+    # default: on
     gop_cache       off;
 }
+vhost refer.anti_suck.com {
+    # the common refer for play and publish.
+    # if the page url of client not in the refer, access denied.
+    # if not specified this field, allow all.
+    # default: not specified.
+    refer           github.com github.io;
+    # refer for publish clients specified.
+    # the common refer is not overrided by this.
+    # if not specified this field, allow all.
+    # default: not specified.
+    refer_publish   github.com github.io;
+    # refer for play clients specified.
+    # the common refer is not overrided by this.
+    # if not specified this field, allow all.
+    # default: not specified.
+    refer_play      github.com github.io;
+}
 
diff --git a/trunk/src/core/srs_core_client.cpp b/trunk/src/core/srs_core_client.cpp
index 1c1118c25..1e79c27a0 100755
--- a/trunk/src/core/srs_core_client.cpp
+++ b/trunk/src/core/srs_core_client.cpp
@@ -215,7 +215,7 @@ int SrsClient::check_vhost()
 	}
 	
 	SrsConfDirective* conf = NULL;
-	if ((conf = vhost->get(RTMP_VHOST_ENABLED)) != NULL && conf->arg0() == "off") {
+	if ((conf = vhost->get(RTMP_VHOST_ENABLED)) != NULL && conf->arg0() != "on") {
 		ret = ERROR_RTMP_VHOST_NOT_FOUND;
 		srs_error("vhost %s disabled. ret=%d", req->vhost.c_str(), ret);
 		return ret;