[SCM] libav/experimental: http: Log a warning when receiving an error code

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:11:26 UTC 2013


The following commit has been merged in the experimental branch:
commit db979afed26fa8526b027a1137b247ae0bda2423
Author: Martin Storsjö <martin at martin.st>
Date:   Fri Jul 16 14:15:37 2010 +0000

    http: Log a warning when receiving an error code
    
    Originally committed as revision 24266 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/http.c b/libavformat/http.c
index 2b503a1..eae780c 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -210,7 +210,7 @@ static int process_line(URLContext *h, char *line, int line_count,
                         int *new_location)
 {
     HTTPContext *s = h->priv_data;
-    char *tag, *p;
+    char *tag, *p, *end;
 
     /* end of header */
     if (line[0] == '\0')
@@ -222,14 +222,18 @@ static int process_line(URLContext *h, char *line, int line_count,
             p++;
         while (isspace(*p))
             p++;
-        s->http_code = strtol(p, NULL, 10);
+        s->http_code = strtol(p, &end, 10);
 
         dprintf(NULL, "http_code=%d\n", s->http_code);
 
         /* error codes are 4xx and 5xx, but regard 401 as a success, so we
          * don't abort until all headers have been parsed. */
-        if (s->http_code >= 400 && s->http_code < 600 && s->http_code != 401)
+        if (s->http_code >= 400 && s->http_code < 600 && s->http_code != 401) {
+            end += strspn(end, SPACE_CHARS);
+            av_log(NULL, AV_LOG_WARNING, "HTTP error %d %s\n",
+                   s->http_code, end);
             return -1;
+        }
     } else {
         while (*p != '\0' && *p != ':')
             p++;

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list