Commit 4daf1950 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

grammatical parameter change... "readed" -> "read" 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@111830 13f79535-47bb-0310-9956-ffa450edef68
parent 42b79f62

modules/proxy/mod_proxy.c

+2 −2
Original line number Diff line number Diff line
@@ -1726,7 +1726,7 @@ static int proxy_status_hook(request_rec *r, int flags) 
            ap_rprintf(r, "<td>%d</td><td>", (int)(worker->s->elected));

            ap_rputs(apr_strfsize(worker->s->transfered, fbuf), r);

            ap_rputs("</td><td>", r);

            ap_rputs(apr_strfsize(worker->s->readed, fbuf), r);

            ap_rputs(apr_strfsize(worker->s->read, fbuf), r);

            ap_rputs("</td>\n", r);



            /* TODO: Add the rest of dynamic worker data */
@@ -1748,7 +1748,7 @@ static int proxy_status_hook(request_rec *r, int flags) 
             "<tr><th>F</th><td>Load Balancer Factor in %</td></tr>\n"

             "<tr><th>Acc</th><td>Number of requests</td></tr>\n"

             "<tr><th>Wr</th><td>Number of bytes transfered</td></tr>\n"

             "<tr><th>Rd</th><td>Number of bytes readed</td></tr>\n"

             "<tr><th>Rd</th><td>Number of bytes read</td></tr>\n"

             "</table>", r);



    return OK;

modules/proxy/mod_proxy.h

+1 −1
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ typedef struct { 
    int             lbstatus;   /* Current lbstatus */

    int             lbfactor;   /* dynamic lbfactor */

    apr_off_t       transfered; /* Number of bytes transfered to remote */

    apr_off_t       readed;     /* Number of bytes readed from remote */

    apr_off_t       read;       /* Number of bytes read from remote */

    apr_size_t      elected;    /* Number of times the worker was elected */

    char            route[PROXY_WORKER_MAX_ROUTE_SIZ+1];

    char            redirect[PROXY_WORKER_MAX_ROUTE_SIZ+1];

modules/proxy/proxy_ajp.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r, 


    apr_brigade_length(output_brigade, 0, &bb_len);

    if (bb_len != -1)

        conn->worker->s->readed += bb_len;

        conn->worker->s->read += bb_len;



    if (!isok)

        apr_brigade_destroy(output_brigade);

modules/proxy/proxy_http.c

+2 −2
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, 
                                 "Error reading from remote server");

        }

        /* XXX: Is this a real headers length send from remote? */

        backend->worker->s->readed += len;

        backend->worker->s->read += len;



       /* Is it an HTTP/1 response?

        * This is buggy if we ever see an HTTP/1.10
@@ -1057,7 +1057,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r, 
                    mode = APR_NONBLOCK_READ;

                    

                    apr_brigade_length(bb, 0, &readbytes);

                    backend->worker->s->readed += readbytes;

                    backend->worker->s->read += readbytes;

#if DEBUGGING

                    {

                    ap_log_error(APLOG_MARK, APLOG_DEBUG, 0,