mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532'
* commit '7bdd2ff6825951f7a6a6008303acfce7c2a63532': http: Use a constant for the supported header size Conflicts: libavformat/http.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
016cca4504
|
@ -658,7 +658,7 @@ static int http_connect(URLContext *h, const char *path, const char *local_path,
|
||||||
{
|
{
|
||||||
HTTPContext *s = h->priv_data;
|
HTTPContext *s = h->priv_data;
|
||||||
int post, err;
|
int post, err;
|
||||||
char headers[4096] = "";
|
char headers[HTTP_HEADERS_SIZE] = "";
|
||||||
char *authstr = NULL, *proxyauthstr = NULL;
|
char *authstr = NULL, *proxyauthstr = NULL;
|
||||||
int64_t off = s->off;
|
int64_t off = s->off;
|
||||||
int len = 0;
|
int len = 0;
|
||||||
|
|
|
@ -24,6 +24,8 @@
|
||||||
|
|
||||||
#include "url.h"
|
#include "url.h"
|
||||||
|
|
||||||
|
#define HTTP_HEADERS_SIZE 4096
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initialize the authentication state based on another HTTP URLContext.
|
* Initialize the authentication state based on another HTTP URLContext.
|
||||||
* This can be used to pre-initialize the authentication parameters if
|
* This can be used to pre-initialize the authentication parameters if
|
||||||
|
|
Loading…
Reference in New Issue