Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 46CAB11B7C for ; Fri, 2 May 2014 20:46:54 +0000 (UTC) Received: (qmail 20490 invoked by uid 500); 2 May 2014 20:46:52 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 20394 invoked by uid 500); 2 May 2014 20:46:52 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 20387 invoked by uid 99); 2 May 2014 20:46:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2014 20:46:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2014 20:46:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5D885238890B; Fri, 2 May 2014 20:46:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1592037 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy_fcgi.c Date: Fri, 02 May 2014 20:46:29 -0000 To: cvs@httpd.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140502204629.5D885238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: trawick Date: Fri May 2 20:46:28 2014 New Revision: 1592037 URL: http://svn.apache.org/r1592037 Log: mod_proxy_fcgi: Fix occasional high CPU when handling request bodies. Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1592037&r1=1592036&r2=1592037&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Fri May 2 20:46:28 2014 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.5.0 + *) mod_proxy_fcgi: Fix occasional high CPU when handling request bodies. + [Jeff Trawick] + *) mod_proxy_fcgi: Support iobuffersize parameter. [Jeff Trawick] *) mod_cache: Preserve non-cacheable headers forwarded from an origin 304 Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c?rev=1592037&r1=1592036&r2=1592037&view=diff ============================================================================== --- httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c (original) +++ httpd/httpd/trunk/modules/proxy/mod_proxy_fcgi.c Fri May 2 20:46:28 2014 @@ -90,26 +90,13 @@ static int proxy_fcgi_canon(request_rec static apr_status_t send_data(proxy_conn_rec *conn, struct iovec *vec, int nvec, - apr_size_t *len, - int blocking) + apr_size_t *len) { - apr_status_t rv = APR_SUCCESS, arv; + apr_status_t rv = APR_SUCCESS; apr_size_t written = 0, to_write = 0; int i, offset; - apr_interval_time_t old_timeout; apr_socket_t *s = conn->sock; - if (!blocking) { - arv = apr_socket_timeout_get(s, &old_timeout); - if (arv != APR_SUCCESS) { - return arv; - } - arv = apr_socket_timeout_set(s, 0); - if (arv != APR_SUCCESS) { - return arv; - } - } - for (i = 0; i < nvec; i++) { to_write += vec[i].iov_len; } @@ -118,7 +105,7 @@ static apr_status_t send_data(proxy_conn while (to_write) { apr_size_t n = 0; rv = apr_socket_sendv(s, vec + offset, nvec - offset, &n); - if ((rv != APR_SUCCESS) && !APR_STATUS_IS_EAGAIN(rv)) { + if (rv != APR_SUCCESS) { break; } if (n > 0) { @@ -141,12 +128,6 @@ static apr_status_t send_data(proxy_conn conn->worker->s->transferred += written; *len = written; - if (!blocking) { - arv = apr_socket_timeout_set(s, old_timeout); - if ((arv != APR_SUCCESS) && (rv == APR_SUCCESS)) { - return arv; - } - } return rv; } @@ -209,7 +190,7 @@ static apr_status_t send_begin_request(p vec[1].iov_base = (void *)abrb; vec[1].iov_len = sizeof(abrb); - return send_data(conn, vec, 2, &len, 1); + return send_data(conn, vec, 2, &len); } static apr_status_t send_environment(proxy_conn_rec *conn, request_rec *r, @@ -296,7 +277,7 @@ static apr_status_t send_environment(pro vec[1].iov_base = body; vec[1].iov_len = required_len; - rv = send_data(conn, vec, 2, &len, 1); + rv = send_data(conn, vec, 2, &len); apr_pool_clear(temp_pool); if (rv) { @@ -311,7 +292,7 @@ static apr_status_t send_environment(pro vec[0].iov_base = (void *)farray; vec[0].iov_len = sizeof(farray); - return send_data(conn, vec, 1, &len, 1); + return send_data(conn, vec, 1, &len); } enum { @@ -484,7 +465,7 @@ static apr_status_t dispatch(proxy_conn_ ++nvec; } - rv = send_data(conn, vec, nvec, &len, 0); + rv = send_data(conn, vec, nvec, &len); if (rv != APR_SUCCESS) { *err = "sending stdin"; break; @@ -505,7 +486,7 @@ static apr_status_t dispatch(proxy_conn_ vec[0].iov_base = (void *)farray; vec[0].iov_len = sizeof(farray); - rv = send_data(conn, vec, 1, &len, 1); + rv = send_data(conn, vec, 1, &len); if (rv != APR_SUCCESS) { *err = "sending empty stdin"; break;