Commit 8c5ffe03 authored by Graham Leggett's avatar Graham Leggett
Browse files

mod_proxy: Move ap_proxy_string_read() out of the public API into 

mod_proxy_ftp.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209776 13f79535-47bb-0310-9956-ffa450edef68
parent 3b95144d

modules/proxy/mod_proxy.h

+0 −1
Changes for modules/proxy/mod_proxy.h: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -548,7 +548,6 @@ PROXY_DECLARE(int) ap_proxy_is_hostname(struct dirconn_entry *This, apr_pool_t * 
PROXY_DECLARE(int) ap_proxy_is_word(struct dirconn_entry *This, apr_pool_t *p);

PROXY_DECLARE(int) ap_proxy_checkproxyblock(request_rec *r, proxy_server_conf *conf, apr_sockaddr_t *uri_addr);

PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r);

PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb, char *buff, size_t bufflen, int *eos);

PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key);

/* DEPRECATED (will be replaced with ap_proxy_connect_backend */

PROXY_DECLARE(int) ap_proxy_connect_to_backend(apr_socket_t **, const char *, apr_sockaddr_t *, const char *, proxy_server_conf *, request_rec *);

modules/proxy/mod_proxy_ftp.c

+76 −2
Changes for modules/proxy/mod_proxy_ftp.c: 76 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -209,6 +209,80 @@ static int ftp_check_string(const char *x) 
    return 1;

}



/*

 * converts a series of buckets into a string

 * XXX: BillS says this function performs essentially the same function as

 * ap_rgetline() in protocol.c. Deprecate this function and use ap_rgetline()

 * instead? I think ftp_string_read() will not work properly on non ASCII

 * (EBCDIC) machines either.

 */

static apr_status_t ftp_string_read(conn_rec *c, apr_bucket_brigade *bb,

        char *buff, apr_size_t bufflen, int *eos)

{

    apr_bucket *e;

    apr_status_t rv;

    char *pos = buff;

    char *response;

    int found = 0;

    apr_size_t len;



    /* start with an empty string */

    buff[0] = 0;

    *eos = 0;



    /* loop through each brigade */

    while (!found) {

        /* get brigade from network one line at a time */

        if (APR_SUCCESS != (rv = ap_get_brigade(c->input_filters, bb,

                                                AP_MODE_GETLINE,

                                                APR_BLOCK_READ,

                                                0))) {

            return rv;

        }

        /* loop through each bucket */

        while (!found) {

            if (*eos || APR_BRIGADE_EMPTY(bb)) {

                /* The connection aborted or timed out */

                return APR_ECONNABORTED;

            }

            e = APR_BRIGADE_FIRST(bb);

            if (APR_BUCKET_IS_EOS(e)) {

                *eos = 1;

            }

            else {

                if (APR_SUCCESS != (rv = apr_bucket_read(e,

                                                         (const char **)&response,

                                                         &len,

                                                         APR_BLOCK_READ))) {

                    return rv;

                }

                /*

                 * is string LF terminated?

                 * XXX: This check can be made more efficient by simply checking

                 * if the last character in the 'response' buffer is an ASCII_LF.

                 * See ap_rgetline() for an example.

                 */

                if (memchr(response, APR_ASCII_LF, len)) {

                    found = 1;

                }

                /* concat strings until buff is full - then throw the data away */

                if (len > ((bufflen-1)-(pos-buff))) {

                    len = (bufflen-1)-(pos-buff);

                }

                if (len > 0) {

                    memcpy(pos, response, len);

                    pos += len;

                }

            }

            APR_BUCKET_REMOVE(e);

            apr_bucket_destroy(e);

        }

        *pos = '\0';

    }



    return APR_SUCCESS;

}



/*

 * Canonicalise ftp URLs.

 */
@@ -313,7 +387,7 @@ static int ftp_getrc_msg(conn_rec *ftp_ctrl, apr_bucket_brigade *bb, char *msgbu 
    apr_status_t rv;

    int eos;



    if (APR_SUCCESS != (rv = ap_proxy_string_read(ftp_ctrl, bb, response, sizeof(response), &eos))) {

    if (APR_SUCCESS != (rv = ftp_string_read(ftp_ctrl, bb, response, sizeof(response), &eos))) {

        return -1;

    }

/*
@@ -332,7 +406,7 @@ static int ftp_getrc_msg(conn_rec *ftp_ctrl, apr_bucket_brigade *bb, char *msgbu 
        memcpy(buff, response, 3);

        buff[3] = ' ';

        do {

            if (APR_SUCCESS != (rv = ap_proxy_string_read(ftp_ctrl, bb, response, sizeof(response), &eos))) {

            if (APR_SUCCESS != (rv = ftp_string_read(ftp_ctrl, bb, response, sizeof(response), &eos))) {

                return -1;

            }

            mb = apr_cpystrn(mb, response + (' ' == response[0] ? 1 : 4), me - mb);

modules/proxy/proxy_util.c

+0 −74
Changes for modules/proxy/proxy_util.c: 0 added lines, 74 removed lines.
Original line number Diff line number Diff line
@@ -951,80 +951,6 @@ PROXY_DECLARE(int) ap_proxy_pre_http_request(conn_rec *c, request_rec *r) 
    return OK;

}



/*

 * converts a series of buckets into a string

 * XXX: BillS says this function performs essentially the same function as

 * ap_rgetline() in protocol.c. Deprecate this function and use ap_rgetline()

 * instead? I think ap_proxy_string_read() will not work properly on non ASCII

 * (EBCDIC) machines either.

 */

PROXY_DECLARE(apr_status_t) ap_proxy_string_read(conn_rec *c, apr_bucket_brigade *bb,

                                                 char *buff, apr_size_t bufflen, int *eos)

{

    apr_bucket *e;

    apr_status_t rv;

    char *pos = buff;

    char *response;

    int found = 0;

    apr_size_t len;



    /* start with an empty string */

    buff[0] = 0;

    *eos = 0;



    /* loop through each brigade */

    while (!found) {

        /* get brigade from network one line at a time */

        if (APR_SUCCESS != (rv = ap_get_brigade(c->input_filters, bb,

                                                AP_MODE_GETLINE,

                                                APR_BLOCK_READ,

                                                0))) {

            return rv;

        }

        /* loop through each bucket */

        while (!found) {

            if (*eos || APR_BRIGADE_EMPTY(bb)) {

                /* The connection aborted or timed out */

                return APR_ECONNABORTED;

            }

            e = APR_BRIGADE_FIRST(bb);

            if (APR_BUCKET_IS_EOS(e)) {

                *eos = 1;

            }

            else {

                if (APR_SUCCESS != (rv = apr_bucket_read(e,

                                                         (const char **)&response,

                                                         &len,

                                                         APR_BLOCK_READ))) {

                    return rv;

                }

                /*

                 * is string LF terminated?

                 * XXX: This check can be made more efficient by simply checking

                 * if the last character in the 'response' buffer is an ASCII_LF.

                 * See ap_rgetline() for an example.

                 */

                if (memchr(response, APR_ASCII_LF, len)) {

                    found = 1;

                }

                /* concat strings until buff is full - then throw the data away */

                if (len > ((bufflen-1)-(pos-buff))) {

                    len = (bufflen-1)-(pos-buff);

                }

                if (len > 0) {

                    memcpy(pos, response, len);

                    pos += len;

                }

            }

            APR_BUCKET_REMOVE(e);

            apr_bucket_destroy(e);

        }

        *pos = '\0';

    }



    return APR_SUCCESS;

}



/* unmerge an element in the table */

PROXY_DECLARE(void) ap_proxy_table_unmerge(apr_pool_t *p, apr_table_t *t, char *key)

{