Merge branch 'master' of https://github.com/xia-chu/ZLMediaKit into dev

src/Http/HttpSession.cpp

@@ -38,6 +38,12 @@ void HttpSession::Handle_Req_HEAD(ssize_t &content_len){
     sendResponse(200, true);
 }
     
+void HttpSession::Handle_Req_OPTIONS(ssize_t &content_len)
+{
+    //暂时对OPTINS进行200 OK回复
+    sendResponse(200, true);
+}
+
 ssize_t HttpSession::onRecvHeader(const char *header,size_t len) {
     typedef void (HttpSession::*HttpCMDHandle)(ssize_t &);
     static unordered_map<string, HttpCMDHandle> s_func_map;
@@ -45,6 +51,7 @@ ssize_t HttpSession::onRecvHeader(const char *header,size_t len) {
         s_func_map.emplace("GET",&HttpSession::Handle_Req_GET);
         s_func_map.emplace("POST",&HttpSession::Handle_Req_POST);
         s_func_map.emplace("HEAD",&HttpSession::Handle_Req_HEAD);
+        s_func_map.emplace("OPTIONS",&HttpSession::Handle_Req_OPTIONS);
     }, nullptr);
 
     _parser.Parse(header);

src/Http/HttpSession.h

@@ -105,6 +105,7 @@ private:
     void Handle_Req_GET_l(ssize_t &content_len, bool sendBody);
     void Handle_Req_POST(ssize_t &content_len);
     void Handle_Req_HEAD(ssize_t &content_len);
+    void Handle_Req_OPTIONS(ssize_t &content_len);
 
     bool checkLiveStream(const string &schema, const string  &url_suffix, const function<void(const MediaSource::Ptr &src)> &cb);