forked from pool/apache2-mod_perl
92 lines
4.0 KiB
Diff
92 lines
4.0 KiB
Diff
|
From modperl-cvs-return-5835-apmail-perl-modperl-cvs-archive=perl.apache.org@perl.apache.org Fri Jun 02 04:16:39 2006
|
||
|
|
Return-Path: <modperl-cvs-return-5835-apmail-perl-modperl-cvs-archive=perl.apache.org@perl.apache.org>
|
||
|
|
Delivered-To: apmail-perl-modperl-cvs-archive@www.apache.org
|
||
|
|
Received: (qmail 47261 invoked from network); 2 Jun 2006 04:16:39 -0000
|
||
|
|
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
|
||
|
|
by minotaur.apache.org with SMTP; 2 Jun 2006 04:16:39 -0000
|
||
|
|
Received: (qmail 98474 invoked by uid 500); 2 Jun 2006 04:16:39 -0000
|
||
|
|
Delivered-To: apmail-perl-modperl-cvs-archive@perl.apache.org
|
||
|
|
Received: (qmail 98456 invoked by uid 500); 2 Jun 2006 04:16:39 -0000
|
||
|
|
Mailing-List: contact modperl-cvs-help@perl.apache.org; run by ezmlm
|
||
|
|
Precedence: bulk
|
||
|
|
list-help: <mailto:modperl-cvs-help@perl.apache.org>
|
||
|
|
list-unsubscribe: <mailto:modperl-cvs-unsubscribe@perl.apache.org>
|
||
|
|
List-Post: <mailto:modperl-cvs@perl.apache.org>
|
||
|
|
Reply-To: dev@perl.apache.org
|
||
|
|
List-Id: <modperl-cvs.perl.apache.org>
|
||
|
|
Delivered-To: mailing list modperl-cvs@perl.apache.org
|
||
|
|
Received: (qmail 98445 invoked by uid 99); 2 Jun 2006 04:16:39 -0000
|
||
|
|
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
|
||
|
|
by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 21:16:39 -0700
|
||
|
|
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
|
||
|
|
tests=ALL_TRUSTED,NO_REAL_NAME
|
||
|
|
X-Spam-Check-By: apache.org
|
||
|
|
Received-SPF: pass (asf.osuosl.org: local policy)
|
||
|
|
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
|
||
|
|
by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Jun 2006 21:16:38 -0700
|
||
|
|
Received: by eris.apache.org (Postfix, from userid 65534)
|
||
|
|
id 1EB831A9842; Thu, 1 Jun 2006 21:16:18 -0700 (PDT)
|
||
|
|
Content-Type: text/plain; charset="utf-8"
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Transfer-Encoding: 7bit
|
||
|
|
Subject: svn commit: r411028 - in /perl/modperl/trunk/t: api/status.t
|
||
|
|
response/TestAPI/status.pm
|
||
|
|
Date: Fri, 02 Jun 2006 04:16:17 -0000
|
||
|
|
To: modperl-cvs@perl.apache.org
|
||
|
|
From: pgollucci@apache.org
|
||
|
|
X-Mailer: svnmailer-1.0.8
|
||
|
|
Message-Id: <20060602041618.1EB831A9842@eris.apache.org>
|
||
|
|
X-Virus-Checked: Checked by ClamAV on apache.org
|
||
|
|
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N
|
||
|
|
|
||
|
|
Author: pgollucci
|
||
|
|
Date: Thu Jun 1 21:16:17 2006
|
||
|
|
New Revision: 411028
|
||
|
|
|
||
|
|
URL: http://svn.apache.org/viewvc?rev=411028&view=rev
|
||
|
|
Log:
|
||
|
|
$r->status_line must be valid and match $r->status
|
||
|
|
or it is 'zapped' by httpd as of 2.2.1
|
||
|
|
|
||
|
|
|
||
|
|
Modified:
|
||
|
|
perl/modperl/trunk/t/api/status.t
|
||
|
|
perl/modperl/trunk/t/response/TestAPI/status.pm
|
||
|
|
|
||
|
|
Modified: perl/modperl/trunk/t/api/status.t
|
||
|
|
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/api/status.t?rev=411028&r1=411027&r2=411028&view=diff
|
||
|
|
==============================================================================
|
||
|
|
--- perl/modperl/trunk/t/api/status.t (original)
|
||
|
|
+++ perl/modperl/trunk/t/api/status.t Thu Jun 1 21:16:17 2006
|
||
|
|
@@ -29,6 +29,10 @@
|
||
|
|
# it also tries to set status (to a different value), but it
|
||
|
|
# should be ignored by Apache, since status_line is supposed to
|
||
|
|
# override status. the handler also sets a custom code message
|
||
|
|
+ # modules/http/http_filters.c r372958
|
||
|
|
+ # httpd 'zaps' the status_line if it doesn't match the status
|
||
|
|
+ # as of 2.2.1 (not released) so 2.2.2 (released)
|
||
|
|
+
|
||
|
|
my $code = 499; # not in HTTP/1.1
|
||
|
|
my $message = "FooBared";
|
||
|
|
my $res = GET "$location?$code=$message";
|
||
|
|
|
||
|
|
Modified: perl/modperl/trunk/t/response/TestAPI/status.pm
|
||
|
|
URL: http://svn.apache.org/viewvc/perl/modperl/trunk/t/response/TestAPI/status.pm?rev=411028&r1=411027&r2=411028&view=diff
|
||
|
|
==============================================================================
|
||
|
|
--- perl/modperl/trunk/t/response/TestAPI/status.pm (original)
|
||
|
|
+++ perl/modperl/trunk/t/response/TestAPI/status.pm Thu Jun 1 21:16:17 2006
|
||
|
|
@@ -20,7 +20,9 @@
|
||
|
|
my ($code, $string) = split /=/, $r->args || '';
|
||
|
|
|
||
|
|
if ($string) {
|
||
|
|
- $r->status(200); # status_line should override status
|
||
|
|
+ # status_line must be valid and match status
|
||
|
|
+ # or it is 'zapped' by httpd as of 2.2.1
|
||
|
|
+ $r->status($code);
|
||
|
|
$r->status_line("$code $string");
|
||
|
|
}
|
||
|
|
else {
|
||
|
|
|
||
|
|
|
||
|
|
|