generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

HTTP: Get rid of the is_chunked variable, use the chunksize variable instead

Browse Source 
Originally committed as revision 23682 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Martin Storsjö 2010-06-21 19:01:32 +00:00
parent a6a9158973
commit 077026ccf3
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavformat/http.c
View File

@ -48,7 +48,6 @@ typedef struct {
HTTPAuthState auth_state; HTTPAuthState auth_state;
int init; int init;
unsigned char headers[BUFFER_SIZE]; unsigned char headers[BUFFER_SIZE];
int is_chunked;
} HTTPContext; } HTTPContext;
static int http_connect(URLContext *h, const char *path, const char *hoststr, static int http_connect(URLContext *h, const char *path, const char *hoststr,
@ -67,7 +66,7 @@ void ff_http_set_headers(URLContext *h, const char *headers)
void ff_http_set_chunked_transfer_encoding(URLContext *h, int is_chunked) void ff_http_set_chunked_transfer_encoding(URLContext *h, int is_chunked)
{ {
((HTTPContext*)h->priv_data)->is_chunked = is_chunked; ((HTTPContext*)h->priv_data)->chunksize = is_chunked ? 0 : -1;
} }
/* return non zero if error */ /* return non zero if error */
@ -152,7 +151,7 @@ static int http_open(URLContext *h, const char *uri, int flags)
} }
h->priv_data = s; h->priv_data = s;
s->filesize = -1; s->filesize = -1;
s->is_chunked = 1; s->chunksize = 0; /* Default to chunked POSTs */
s->off = 0; s->off = 0;
s->init = 0; s->init = 0;
s->hd = NULL; s->hd = NULL;
@ -316,7 +315,7 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr,
"\r\n", "\r\n",
post ? "POST" : "GET", post ? "POST" : "GET",
path, path,
post && s->is_chunked ? "Transfer-Encoding: chunked\r\n" : "", post && s->chunksize >= 0 ? "Transfer-Encoding: chunked\r\n" : "",
headers, headers,
authstr ? authstr : ""); authstr ? authstr : "");
@ -330,16 +329,14 @@ static int http_connect(URLContext *h, const char *path, const char *hoststr,
s->line_count = 0; s->line_count = 0;
s->off = 0; s->off = 0;
s->filesize = -1; s->filesize = -1;
s->chunksize = -1;
if (post) { if (post) {
/* always use chunked encoding for upload data */
s->chunksize = 0;
/* Pretend that it did work. We didn't read any header yet, since /* Pretend that it did work. We didn't read any header yet, since
* we've still to send the POST data, but the code calling this * we've still to send the POST data, but the code calling this
* function will check http_code after we return. */ * function will check http_code after we return. */
s->http_code = 200; s->http_code = 200;
return 0; return 0;
} }
s->chunksize = -1;
/* wait for header */ /* wait for header */
for(;;) { for(;;) {
@ -442,16 +439,14 @@ static int http_write(URLContext *h, const uint8_t *buf, int size)
* signal EOF */ * signal EOF */
if (size > 0) { if (size > 0) {
/* upload data using chunked encoding */ /* upload data using chunked encoding */
if(s->is_chunked) {
snprintf(temp, sizeof(temp), "%x\r\n", size); snprintf(temp, sizeof(temp), "%x\r\n", size);
if ((ret = url_write(s->hd, temp, strlen(temp))) < 0) if ((ret = url_write(s->hd, temp, strlen(temp))) < 0)
return ret; return ret;
}
if ((ret = url_write(s->hd, buf, size)) < 0) if ((ret = url_write(s->hd, buf, size)) < 0)
return ret; return ret;
if (s->is_chunked && (ret = url_write(s->hd, crlf, sizeof(crlf) - 1)) < 0) if ((ret = url_write(s->hd, crlf, sizeof(crlf) - 1)) < 0)
return ret; return ret;
} }
return size; return size;