lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
authorStephan Holljes <klaxa1337@googlemail.com>
Thu, 4 Jun 2015 22:27:07 +0000 (00:27 +0200)
committerNicolas George <george@nsup.org>
Sat, 6 Jun 2015 07:24:50 +0000 (09:24 +0200)
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
libavformat/http.c

index 1bf9166..2db2dea 100644 (file)
@@ -563,6 +563,7 @@ static int process_line(URLContext *h, char *line, int line_count,
                         int *new_location)
 {
     HTTPContext *s = h->priv_data;
+    const char *auto_method =  h->flags & AVIO_FLAG_READ ? "POST" : "GET";
     char *tag, *p, *end, *method, *resource, *version;
     int ret;
 
@@ -587,6 +588,14 @@ static int process_line(URLContext *h, char *line, int line_count,
                            s->method, method);
                     return ff_http_averror(400, AVERROR(EIO));
                 }
+            } else {
+                // use autodetected HTTP method to expect
+                av_log(h, AV_LOG_TRACE, "Autodetected %s HTTP method\n", auto_method);
+                if (av_strcasecmp(auto_method, method)) {
+                    av_log(h, AV_LOG_ERROR, "Received and autodetected HTTP method did not match "
+                           "(%s autodetected %s received)\n", auto_method, method);
+                    return ff_http_averror(400, AVERROR(EIO));
+                }
             }
 
             // HTTP resource