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 D55739264 for ; Sun, 22 Jul 2012 12:00:45 +0000 (UTC) Received: (qmail 30412 invoked by uid 500); 22 Jul 2012 12:00:43 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 30256 invoked by uid 500); 22 Jul 2012 12:00:43 -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 30232 invoked by uid 99); 22 Jul 2012 12:00:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Jul 2012 12:00:42 +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; Sun, 22 Jul 2012 12:00:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B0A062388A9B; Sun, 22 Jul 2012 12:00:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1364271 - in /httpd/httpd/branches/2.4.x: ./ CHANGES server/util_script.c Date: Sun, 22 Jul 2012 12:00:22 -0000 To: cvs@httpd.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120722120022.B0A062388A9B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rjung Date: Sun Jul 22 12:00:22 2012 New Revision: 1364271 URL: http://svn.apache.org/viewvc?rev=1364271&view=rev Log: Log the value of Status header lines in script responses rather than than just the fixed header name of "Status". Backport of r1362538 from trunk. Submitted by: chrisd Reviewed by: rpluem, rjung Backported by: rjung Modified: httpd/httpd/branches/2.4.x/ (props changed) httpd/httpd/branches/2.4.x/CHANGES httpd/httpd/branches/2.4.x/server/util_script.c Propchange: httpd/httpd/branches/2.4.x/ ------------------------------------------------------------------------------ Merged /httpd/httpd/trunk:r1362538 Modified: httpd/httpd/branches/2.4.x/CHANGES URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1364271&r1=1364270&r2=1364271&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sun Jul 22 12:00:22 2012 @@ -8,6 +8,9 @@ Changes with Apache 2.4.3 possible XSS for a site where untrusted users can upload files to a location with MultiViews enabled. [Niels Heinen ] + *) core: Log value of Status header line in script responses rather + than the fixed header name. [Chris Darroch] + *) mpm_ssl: Fix handling of empty response from OCSP server. [Jim Meyering , Joe Orton] Modified: httpd/httpd/branches/2.4.x/server/util_script.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_script.c?rev=1364271&r1=1364270&r2=1364271&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/server/util_script.c (original) +++ httpd/httpd/branches/2.4.x/server/util_script.c Sun Jul 22 12:00:22 2012 @@ -592,11 +592,11 @@ AP_DECLARE(int) ap_scan_script_header_er if (!ap_is_HTTP_VALID_RESPONSE(cgi_status)) ap_log_rerror(SCRIPT_LOG_MARK, APLOG_ERR|APLOG_TOCLIENT, 0, r, "Invalid status line from script '%s': %s", - apr_filepath_name_get(r->filename), w); + apr_filepath_name_get(r->filename), l); else ap_log_rerror(SCRIPT_LOG_MARK, APLOG_TRACE1, 0, r, "Status line from script '%s': %s", - apr_filepath_name_get(r->filename), w); + apr_filepath_name_get(r->filename), l); r->status_line = apr_pstrdup(r->pool, l); } else if (!strcasecmp(w, "Location")) {