diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-06-06 12:34:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-06 12:34:05 +0200 |
| commit | 7897ed0d3cb918e05ee0fa7b02095de09bb41087 (patch) | |
| tree | 83d585969039e4ede59275b3abb694975291d64f /doc | |
| parent | c5a08956a3b11d9adf82dc1a97f6fa599803d8fd (diff) | |
| parent | 44d19212008ee48255f96d82df899e3413a982c2 (diff) | |
| download | ffmpeg-7897ed0d3cb918e05ee0fa7b02095de09bb41087.tar.gz | |
Merge remote-tracking branch 'cigaes/master'
* cigaes/master:
lavf/http: Add simple autodetection for client HTTP method, based on AVIO_FLAG_READ.
lavf/http: Indent else-clause.
lavf/http: Properly process HTTP header on listen.
lavf/http: Rudimentary error handling for HTTP requests received from clients.
lavf/http: Process HTTP header before sending response.
lavf/http: Document method option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/protocols.texi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index f822d81223..453dbcf6bf 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -278,6 +278,16 @@ Set initial byte offset. @item end_offset Try to limit the request to bytes preceding this offset. +@item method +When used as a client option it sets the HTTP method for the request. + +When used as a server option it sets the HTTP method that is going to be +expected from the client(s). +If the expected and the received HTTP method do not match the client will +be given a Bad Request response. +When unset the HTTP method is not checked for now. This will be replaced by +autodetection in the future. + @item listen If set to 1 enables experimental HTTP server. This can be used to send data when used as an output option, or read data from a client with HTTP POST when used as |