X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ffserver.c;h=1d4c8dc5b98453f2cc158ac73e3077e804195efc;hb=b3b6665c605328174ef014ae42719d7ab462d0a2;hp=032ce227da26475b7adcebfb879cc390ddd873d8;hpb=4b7685b6c626a159e759a5167af11abef9c7802c;p=ffmpeg
diff --git a/ffserver.c b/ffserver.c
index 032ce227da2..1d4c8dc5b98 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -287,10 +287,14 @@ static int ffm_write_write_index(int fd, int64_t pos)
for(i=0;i<8;i++)
buf[i] = (pos >> (56 - i * 8)) & 0xff;
if (lseek(fd, 8, SEEK_SET) < 0)
- return AVERROR(EIO);
+ goto bail_eio;
if (write(fd, buf, 8) != 8)
- return AVERROR(EIO);
+ goto bail_eio;
+
return 8;
+
+bail_eio:
+ return AVERROR(EIO);
}
static void ffm_set_write_index(AVFormatContext *s, int64_t pos,
@@ -467,6 +471,7 @@ static void start_children(FFServerStream *feed)
av_free (pathname);
_exit(1);
}
+ av_free (pathname);
}
/* open a listening socket */
@@ -737,8 +742,10 @@ static void http_send_too_busy_reply(int fd)
"Content-type: text/html\r\n"
"\r\n"
"Too busy\r\n"
- "The server is too busy to serve your request at this time.
\r\n"
- "The number of current connections is %u, and this exceeds the limit of %u.
\r\n"
+ "The server is too busy to serve your request at "
+ "this time.
\r\n"
+ "The number of current connections is %u, and this "
+ "exceeds the limit of %u.
\r\n"
"\r\n",
nb_connections, config.nb_max_connections);
av_assert0(len < sizeof(buffer));
@@ -1482,9 +1489,11 @@ static int http_parse_request(HTTPContext *c)
"Content-type: text/html\r\n"
"\r\n"
"Too busy\r\n"
- "The server is too busy to serve your request at this time.
\r\n"
- "The bandwidth being served (including your stream) is %"PRIu64"kbit/sec, "
- "and this exceeds the limit of %"PRIu64"kbit/sec.
\r\n"
+ "The server is too busy to serve your request at "
+ "this time.
\r\n"
+ "The bandwidth being served (including your stream) "
+ "is %"PRIu64"kbit/s, and this exceeds the limit of "
+ "%"PRIu64"kbit/s.
\r\n"
"\r\n",
current_bandwidth, config.max_bandwidth);
q += strlen(q);
@@ -1781,7 +1790,7 @@ static inline void print_stream_params(AVIOContext *pb, FFServerStream *stream)
stream_no = stream->nb_streams;
avio_printf(pb, "| Stream | "
- "type | kbits/s | codec | "
+ "type | kbit/s | codec | "
"Parameters\n");
for (i = 0; i < stream_no; i++) {
@@ -1846,7 +1855,7 @@ static void compute_status(HTTPContext *c)
/* format status */
avio_printf(pb, "Available Streams\n");
avio_printf(pb, "\n");
- avio_printf(pb, "| Path | Served
Conns |
bytes | Format | Bit rate
kbits/s | Video
kbits/s |
Codec | Audio
kbits/s |
Codec | Feed\n");
+ avio_printf(pb, " |
|---|
| Path | Served
Conns |
bytes | Format | Bit rate
kbit/s | Video
kbit/s |
Codec | Audio
kbit/s |
Codec | Feed\n");
stream = config.first_stream;
while (stream) {
char sfilename[1024];
@@ -2001,7 +2010,7 @@ static void compute_status(HTTPContext *c)
avio_printf(pb, "\n");
avio_printf(pb, "| # | File | IP | Proto | State | Target "
- "bits/sec | Actual bits/sec | Bytes transferred\n");
+ "bit/s | Actual bit/s | Bytes transferred\n");
c1 = first_http_ctx;
i = 0;
while (c1) {
|
|---|
|
|---|
|
|---|