Merge commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:37:01 +0000 (00:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Oct 2013 22:37:01 +0000 (00:37 +0200)
* commit '71549a857b13edf4c4f95037de6ed5bb4c4bd4af':
  http: Support auth method detection for POST

Conflicts:
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/http.c
libavformat/version.h

@@@ -608,12 -473,12 +621,15 @@@ static int http_connect(URLContext *h, 
      if (!has_header(s->headers, "\r\nAccept: "))
          len += av_strlcpy(headers + len, "Accept: */*\r\n",
                            sizeof(headers) - len);
 -    if (!has_header(s->headers, "\r\nRange: ") && !post)
 +    // Note: we send this on purpose even when s->off is 0 when we're probing,
 +    // since it allows us to detect more reliably if a (non-conforming)
 +    // server supports seeking by analysing the reply headers.
 +    if (!has_header(s->headers, "\r\nRange: ") && !post && (s->off > 0 || s->seekable == -1))
          len += av_strlcatf(headers + len, sizeof(headers) - len,
                             "Range: bytes=%"PRId64"-\r\n", s->off);
+     if (send_expect_100 && !has_header(s->headers, "\r\nExpect: "))
+         len += av_strlcatf(headers + len, sizeof(headers) - len,
+                            "Expect: 100-continue\r\n");
  
      if (!has_header(s->headers, "\r\nConnection: ")) {
          if (s->multiple_requests) {
@@@ -30,8 -30,8 +30,8 @@@
  #include "libavutil/avutil.h"
  
  #define LIBAVFORMAT_VERSION_MAJOR 55
 -#define LIBAVFORMAT_VERSION_MINOR  6
 -#define LIBAVFORMAT_VERSION_MICRO  2
 +#define LIBAVFORMAT_VERSION_MINOR 19
- #define LIBAVFORMAT_VERSION_MICRO 101
++#define LIBAVFORMAT_VERSION_MICRO 102
  
  #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
                                                 LIBAVFORMAT_VERSION_MINOR, \