diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 07:53:14 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 07:53:54 +0400 |
| commit | cd25412f598404e2af9e70038cfc01f344ba043b (patch) | |
| tree | ff89428dfb48b614dc61e087e92f69d106ae2666 /doc | |
| parent | 0d487654ea8515d916f5d3b9e208fe39d9723fc5 (diff) | |
| parent | 2572d07c1f0abd9e2bf3ed20dbe35c58f1dd6ac4 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
http: Allow setting a Content-Type for POST requests
Conflicts:
libavformat/http.c
See: c01d1d4ddf4d8240427341af1c077f6455243576
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/protocols.texi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/protocols.texi b/doc/protocols.texi index 5798f75a37..63ec75779c 100644 --- a/doc/protocols.texi +++ b/doc/protocols.texi @@ -225,6 +225,9 @@ value is -1. @item chunked_post If set to 1 use chunked Transfer-Encoding for posts, default is 1. +@item content_type +Set a specific content type for the POST messages. + @item headers Set custom HTTP headers, can override built in default headers. The value must be a string encoding the headers. @@ -235,9 +238,6 @@ Use persistent connections if set to 1, default is 0. @item post_data Set custom HTTP post data. -@item content_type -Force a content type. - @item user-agent @item user_agent Override the User-Agent header. If not specified the protocol will use a |