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
Hello community, here is the log from the commit of package apache2-mod_perl checked in at Tue Jul 4 13:18:24 CEST 2006. -------- --- apache2-mod_perl/apache2-mod_perl.changes 2006-01-30 13:33:15.000000000 +0100 +++ apache2-mod_perl/apache2-mod_perl.changes 2006-07-04 13:02:42.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 4 12:41:08 CEST 2006 - poeml@suse.de + +- add mod_perl-r411028-t_api_status.patch and + mod_perl-t_content_length-r412063.patch, which both fix test + cases to work with httpd trunk +- remove SOL_IPV6-test.c and mod_perl-1.99_09-ipv6.dif, which have + not been needed for long enough now +- enable more apache modules in testing (deflate, proxy, + proxy_http) + +------------------------------------------------------------------- Old: ---- SOL_IPV6-test.c mod_perl-1.99_09-ipv6.dif New: ---- mod_perl-r411028-t_api_status.patch mod_perl-t_content_length-r412063.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_perl.spec ++++++ --- /var/tmp/diff_new_pack.JDMMcV/_old 2006-07-04 13:17:47.000000000 +0200 +++ /var/tmp/diff_new_pack.JDMMcV/_new 2006-07-04 13:17:47.000000000 +0200 @@ -5,13 +5,13 @@ # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # -# Please submit bugfixes or comments via http://bugs.opensuse.org +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild Name: apache2-mod_perl -BuildRequires: apache2-devel db-devel pcre-devel perl-Compress-Zlib perl-Tie-IxHash perl-libwww-perl sudo +BuildRequires: apache2-devel db-devel ed pcre-devel perl-BSD-Resource perl-Compress-Zlib perl-Tie-IxHash perl-libwww-perl sudo %define apxs /usr/sbin/apxs2 %define apache apache2 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) @@ -31,13 +31,14 @@ Conflicts: mod_perl Autoreqprov: on Version: 2.0.2 -Release: 2 +Release: 14 Source0: mod_perl-%{version}.tar.bz2 #%define apache_test_version 1_99_15 # cvs -d :pserver:anoncvs@cvs.apache.org:/home/cvspublic up -r MODPERL_%{apache_test_version} #Source1: Apache-Test-%{apache_test_version}.tar.bz2 -Source10: SOL_IPV6-test.c -Patch: mod_perl-1.99_09-ipv6.dif +# patches for tests to run with httpd trunk +Patch1: mod_perl-r411028-t_api_status.patch +Patch2: mod_perl-t_content_length-r412063.patch URL: http://perl.apache.org/ Icon: mod_perl.xpm BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -78,10 +79,8 @@ %prep #%setup -q -n modperl-2.0 -a 1 %setup -q -n mod_perl-%{version} -gcc -o SOL_IPV6-test %{S:10} -if ! ./SOL_IPV6-test; then -: #patch -p1 -fi +%patch1 -p3 +%patch2 -p1 %build perl Makefile.PL MP_APXS=`which %{apxs}` MP_CCOPTS="$(%{apxs} -q CFLAGS)" @@ -106,6 +105,14 @@ # # 1.99_12_20040302 fix for t/hooks/cleanup.t and t/hooks/cleanup2.t # [Tue Mar 02 18:38:41 2004] [error] [client 127.0.0.1] can't open /usr/src/packages/BUILD/modperl-2.0/t/htdocs/hooks/cleanup2: Permission denied at /usr/src/packages/BUILD/modperl-2.0/Apache-Test/lib/Apache/TestUtil.pm line 82. +# +# enable more apache modules +# we can't simply use a2enmod, since we are not root. +cat >> t/conf/extra.conf.in <<-EOF + LoadModule deflate_module /usr/%_lib/apache2-prefork/mod_deflate.so + LoadModule proxy_module /usr/%_lib/apache2-prefork/mod_proxy.so + LoadModule proxy_http_module /usr/%_lib/apache2-prefork/mod_proxy_http.so +EOF mkdir -p t/htdocs/hooks chmod 2770 t/htdocs/hooks # @@ -251,6 +258,14 @@ fi %changelog -n apache2-mod_perl +* Tue Jul 04 2006 - poeml@suse.de +- add mod_perl-r411028-t_api_status.patch and + mod_perl-t_content_length-r412063.patch, which both fix test + cases to work with httpd trunk +- remove SOL_IPV6-test.c and mod_perl-1.99_09-ipv6.dif, which have + not been needed for long enough now +- enable more apache modules in testing (deflate, proxy, + proxy_http) * Mon Jan 30 2006 - poeml@suse.de - removed libapr-util1-devel from BuildRequires (apache2-devel does require it) ++++++ mod_perl-r411028-t_api_status.patch ++++++ 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&am... ============================================================================== --- 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... ============================================================================== --- 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 { ++++++ mod_perl-t_content_length-r412063.patch ++++++ diff -uNr mod_perl-2.0.2.orig/t/apache/content_length_header.t mod_perl-2.0.2/t/apache/content_length_header.t --- mod_perl-2.0.2.orig/t/apache/content_length_header.t 2005-10-21 02:04:31.000000000 +0200 +++ mod_perl-2.0.2/t/apache/content_length_header.t 2006-07-04 12:32:00.000000000 +0200 @@ -45,7 +45,7 @@ my $cl = 0; my $head_cl = undef; - + ok t_cmp $res->code, 200, "$method $uri code"; ok t_cmp ($res->header('Content-Length'), $method eq 'GET' ? $cl : $head_cl, @@ -65,8 +65,26 @@ my $res = $method->($uri); my $cl = 0; - my $head_cl = undef; - + my $head_cl; + + ## 2.2.1, 2.0.56, 2.0.57 were not released + ## but we use the versions the changes went into + ## to protect against wierd SVN checkout building. + ## XXX: I'm starting to think this test is more + ## trouble then its worth. + if (have_min_apache_version("2.2.1")) { + $head_cl = 25; + } + elsif (have_min_apache_version("2.2.0")) { + # $head_cl = undef; # avoid warnings + } + elsif (have_min_apache_version("2.0.56")) { + $head_cl = 25; + } + else { + # $head_cl = undef; # avoid warnings + } + ok t_cmp $res->code, 200, "$method $uri code"; ok t_cmp ($res->header('Content-Length'), $method eq 'GET' ? $cl : $head_cl, ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org