external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge SRS2

Browse source
This commit is contained in:
winlin 2017-05-01 16:44:14 +08:00
commit f97260be1d
8 changed files with 119 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/src/app/srs_app_http_conn.hpp
View file

@ -60,7 +60,7 @@ class SrsHttpStaticServer;
*/
class SrsHttpConn : public SrsConnection
{
private:
protected:
SrsHttpParser* parser;
ISrsHttpServeMux* http_mux;
SrsHttpCorsMux* cors;
@ -101,6 +101,13 @@ class SrsResponseOnlyHttpConn : public SrsHttpConn
public:
SrsResponseOnlyHttpConn(IConnectionManager* cm, st_netfd_t fd, ISrsHttpServeMux* m, std::string cip);
virtual ~SrsResponseOnlyHttpConn();
public:
// Directly read a HTTP request message.
// It's exported for HTTP stream, such as HTTP FLV, only need to write to client when
// serving it, but we need to start a thread to read message to detect whether FD is closed.
// @see https://github.com/ossrs/srs/issues/636#issuecomment-298208427
// @remark Should only used in HTTP-FLV streaming connection.
virtual int pop_message(ISrsHttpMessage** preq);
public:
virtual int on_got_http_message(ISrsHttpMessage* msg);
};