comparison http.c @ 6153:2e07dcbab954 libavformat

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

6152:b9dee5077174

    int64_t off, filesize;
    char location[URL_SIZE];
    HTTPAuthState auth_state;
    int init;
    unsigned char headers[BUFFER_SIZE];
    int is_chunked;
} HTTPContext;

static int http_connect(URLContext *h, const char *path, const char *hoststr,
                        const char *auth, int *new_location);

    av_strlcpy(s->headers, headers, sizeof(s->headers));
}

void ff_http_set_chunked_transfer_encoding(URLContext *h, int is_chunked)
{
    ((HTTPContext*)h->priv_data)->is_chunked = is_chunked;
}

/* return non zero if error */
static int http_open_cnx(URLContext *h)
{

    if (!s) {
        return AVERROR(ENOMEM);
    }
    h->priv_data = s;
    s->filesize = -1;
    s->is_chunked = 1;
    s->off = 0;
    s->init = 0;
    s->hd = NULL;
    *s->headers = '\0';
    memset(&s->auth_state, 0, sizeof(s->auth_state));

             "%s"
             "%s"
             "\r\n",
             post ? "POST" : "GET",
             path,
             post && s->is_chunked ? "Transfer-Encoding: chunked\r\n" : "",
             headers,
             authstr ? authstr : "");

    av_freep(&authstr);
    if (url_write(s->hd, s->buffer, strlen(s->buffer)) < 0)

    s->buf_ptr = s->buffer;
    s->buf_end = s->buffer;
    s->line_count = 0;
    s->off = 0;
    s->filesize = -1;
    s->chunksize = -1;
    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
         * we've still to send the POST data, but the code calling this
         * function will check http_code after we return. */
        s->http_code = 200;
        return 0;
    }

    /* wait for header */
    for(;;) {
        if (http_get_line(s, line, sizeof(line)) < 0)
            return AVERROR(EIO);

    /* silently ignore zero-size data since chunk encoding that would
     * signal EOF */
    if (size > 0) {
        /* upload data using chunked encoding */
        if(s->is_chunked) {
            snprintf(temp, sizeof(temp), "%x\r\n", size);
            if ((ret = url_write(s->hd, temp, strlen(temp))) < 0)
                return ret;
        }

        if ((ret = url_write(s->hd, buf, size)) < 0)
            return ret;

        if (s->is_chunked && (ret = url_write(s->hd, crlf, sizeof(crlf) - 1)) < 0)
            return ret;
    }
    return size;
}

6153:2e07dcbab954

    int64_t off, filesize;
    char location[URL_SIZE];
    HTTPAuthState auth_state;
    int init;
    unsigned char headers[BUFFER_SIZE];
} HTTPContext;

static int http_connect(URLContext *h, const char *path, const char *hoststr,
                        const char *auth, int *new_location);

    av_strlcpy(s->headers, headers, sizeof(s->headers));
}

void ff_http_set_chunked_transfer_encoding(URLContext *h, int is_chunked)
{
    ((HTTPContext*)h->priv_data)->chunksize = is_chunked ? 0 : -1;
}

/* return non zero if error */
static int http_open_cnx(URLContext *h)
{

    if (!s) {
        return AVERROR(ENOMEM);
    }
    h->priv_data = s;
    s->filesize = -1;
    s->chunksize = 0; /* Default to chunked POSTs */
    s->off = 0;
    s->init = 0;
    s->hd = NULL;
    *s->headers = '\0';
    memset(&s->auth_state, 0, sizeof(s->auth_state));

             "%s"
             "%s"
             "\r\n",
             post ? "POST" : "GET",
             path,
             post && s->chunksize >= 0 ? "Transfer-Encoding: chunked\r\n" : "",
             headers,
             authstr ? authstr : "");

    av_freep(&authstr);
    if (url_write(s->hd, s->buffer, strlen(s->buffer)) < 0)

    s->buf_ptr = s->buffer;
    s->buf_end = s->buffer;
    s->line_count = 0;
    s->off = 0;
    s->filesize = -1;
    if (post) {
        /* 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
         * function will check http_code after we return. */
        s->http_code = 200;
        return 0;
    }
    s->chunksize = -1;

    /* wait for header */
    for(;;) {
        if (http_get_line(s, line, sizeof(line)) < 0)
            return AVERROR(EIO);

    /* silently ignore zero-size data since chunk encoding that would
     * signal EOF */
    if (size > 0) {
        /* upload data using chunked encoding */
            snprintf(temp, sizeof(temp), "%x\r\n", size);
            if ((ret = url_write(s->hd, temp, strlen(temp))) < 0)
                return ret;

        if ((ret = url_write(s->hd, buf, size)) < 0)
            return ret;

        if ((ret = url_write(s->hd, crlf, sizeof(crlf) - 1)) < 0)
            return ret;
    }
    return size;
}