diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-15 09:34:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-15 09:34:27 +0200 |
| commit | 0a6ce255ab49094e90aa5c7c76c46e0dccd5708d (patch) | |
| tree | 75012f382b7366717939f22aec355e30adc138f0 /libavformat | |
| parent | c35d29a9c8240b81f8b7e089356b30bb26f034b9 (diff) | |
| parent | 708b32b6f72c58ec1bf5fed6a227b3e48b971a05 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
http: Check the auth string contents and not only the pointer
Conflicts:
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/http.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/http.c b/libavformat/http.c index 3d477366ae..7e8d60999b 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -609,7 +609,8 @@ static int http_connect(URLContext *h, const char *path, const char *local_path, * send Expect: 100-continue to get the 401 response including the * WWW-Authenticate header, or an 100 continue if no auth actually * is needed. */ - if (*auth && s->auth_state.auth_type == HTTP_AUTH_NONE && + if (auth && *auth && + s->auth_state.auth_type == HTTP_AUTH_NONE && s->http_code != 401) send_expect_100 = 1; } |