Commit e9e2a37b authored by Joe Orton's avatar Joe Orton
Browse files

* modules/proxy/mod_proxy_http.c (stream_reqbody_cl): Fix format 

string error.
(ap_proxy_http_request): Restore default case in rb_method switch to
fix gcc warnings.


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

modules/proxy/mod_proxy_http.c

+4 −1
Changes for modules/proxy/mod_proxy_http.c: 4 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static apr_status_t stream_reqbody_cl(apr_pool_t *p, 
    

    if (bytes_streamed != cl_val) {

        ap_log_error(APLOG_MARK, APLOG_ERR, 0, r->server,

                     "proxy: client %s given Content-Length did not match",

                     "proxy: client %s given Content-Length did not match"

                     " number of body bytes read", r->connection->remote_ip);

        return APR_EOF;

    }
@@ -955,6 +955,9 @@ skip_body: 
                                              || (old_te_val != NULL)

                                              || (bytes_read > 0));

        break;

    default:

        ap_assert(1 != 1);

        break;

    }

    if (status != APR_SUCCESS) {

        ap_log_error(APLOG_MARK, APLOG_ERR, status, r->server,