winlin

Merge branch '2.0release' into develop

@@ -1294,7 +1294,7 @@ SrsRequest* SrsHttpMessage::to_request(string vhost) @@ -1294,7 +1294,7 @@ SrsRequest* SrsHttpMessage::to_request(string vhost)
1294 SrsRequest* req = new SrsRequest(); 1294 SrsRequest* req = new SrsRequest();
1295 1295
1296 req->app = _uri->get_path(); 1296 req->app = _uri->get_path();
1297 - ssize_t pos = string::npos; 1297 + size_t pos = string::npos;
1298 if ((pos = req->app.rfind("/")) != string::npos) { 1298 if ((pos = req->app.rfind("/")) != string::npos) {
1299 req->stream = req->app.substr(pos + 1); 1299 req->stream = req->app.substr(pos + 1);
1300 req->app = req->app.substr(0, pos); 1300 req->app = req->app.substr(0, pos);