aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Holljes <klaxa1337@googlemail.com>2015-06-04 01:20:28 +0200
committerNicolas George <george@nsup.org>2015-06-06 09:24:43 +0200
commit8cfaa76a5e77a8cf9768a5315646647610ff49c7 (patch)
tree884ed0f1861236d3ed547fa2ae4eb959e68e59ce
parentbbcee92b6d59adca054351c6e9e56bcb77ebda11 (diff)
downloadffmpeg-8cfaa76a5e77a8cf9768a5315646647610ff49c7.tar.gz
lavf/http: Rudimentary error handling for HTTP requests received from clients.
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
-rw-r--r--libavformat/http.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/libavformat/http.c b/libavformat/http.c
index e51f524560..a5b3e2942d 100644
--- a/libavformat/http.c
+++ b/libavformat/http.c
@@ -299,6 +299,23 @@ int ff_http_averror(int status_code, int default_averror)
return default_averror;
}
+static void handle_http_errors(URLContext *h, int error)
+{
+ static const char bad_request[] = "HTTP/1.1 400 Bad Request\r\nContent-Type: text/plain\r\n\r\n400 Bad Request\r\n";
+ static const char internal_server_error[] = "HTTP/1.1 500 Internal server error\r\nContent-Type: text/plain\r\n\r\n500 Internal server error\r\n";
+ HTTPContext *s = h->priv_data;
+ if (h->is_connected) {
+ switch(error) {
+ case AVERROR_HTTP_BAD_REQUEST:
+ ffurl_write(s->hd, bad_request, strlen(bad_request));
+ break;
+ default:
+ av_log(h, AV_LOG_ERROR, "Unhandled HTTP error.\n");
+ ffurl_write(s->hd, internal_server_error, strlen(internal_server_error));
+ }
+ }
+}
+
static int http_listen(URLContext *h, const char *uri, int flags,
AVDictionary **options) {
HTTPContext *s = h->priv_data;
@@ -325,6 +342,7 @@ static int http_listen(URLContext *h, const char *uri, int flags,
return 0;
fail:
+ handle_http_errors(h, ret);
av_dict_free(&s->chained_options);
return ret;
}