You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2016/12/22 18:43:46 UTC
svn commit: r1775693 - in /httpd/test/framework/trunk/t: apache/headers.t
apache/http_strict.t apache/limits.t conf/extra.conf.in
Author: covener
Date: Thu Dec 22 18:43:46 2016
New Revision: 1775693
URL: http://svn.apache.org/viewvc?rev=1775693&view=rev
Log:
activate new stuff for 2.2.32-dev
Modified:
httpd/test/framework/trunk/t/apache/headers.t
httpd/test/framework/trunk/t/apache/http_strict.t
httpd/test/framework/trunk/t/apache/limits.t
httpd/test/framework/trunk/t/conf/extra.conf.in
Modified: httpd/test/framework/trunk/t/apache/headers.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/headers.t?rev=1775693&r1=1775692&r2=1775693&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/headers.t (original)
+++ httpd/test/framework/trunk/t/apache/headers.t Thu Dec 22 18:43:46 2016
@@ -6,7 +6,17 @@ use Apache::TestUtil;
use Apache::TestRequest;
my %headers;
-if (have_min_apache_version("2.4.24")) {
+
+my $hasfix = 0;
+if (have_min_apache_version("2.4.0")) {
+ if (have_min_apache_version("2.4.24")) {
+ $hasfix = 1;
+ }
+}
+elsif (have_min_apache_version("2.2.32")) {
+ $hasfix = 1;
+}
+if ($hasfix) {
%headers = (
"Hello:World\r\n" => ["Hello", "World"],
"Hello: World\r\n" => ["Hello", "World"],
Modified: httpd/test/framework/trunk/t/apache/http_strict.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/http_strict.t?rev=1775693&r1=1775692&r2=1775693&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/http_strict.t (original)
+++ httpd/test/framework/trunk/t/apache/http_strict.t Thu Dec 22 18:43:46 2016
@@ -113,7 +113,7 @@ my @test_cases = (
plan tests => scalar(@test_cases),
# todo => [25, 26],
- need_min_apache_version('2.4.24');
+ need_min_apache_version('2.2.32');
foreach my $t (@test_cases) {
my $req = $t->[0];
Modified: httpd/test/framework/trunk/t/apache/limits.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/limits.t?rev=1775693&r1=1775692&r2=1775693&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/limits.t (original)
+++ httpd/test/framework/trunk/t/apache/limits.t Thu Dec 22 18:43:46 2016
@@ -47,7 +47,7 @@ my %xrcs = ('requestline-succeed' => 200
my $res;
-if (!have_min_apache_version("2.3.15")) {
+if (!have_min_apache_version("2.2.32")) {
$xrcs{"merged_fieldsize-fail"} = 200;
}
Modified: httpd/test/framework/trunk/t/conf/extra.conf.in
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/conf/extra.conf.in?rev=1775693&r1=1775692&r2=1775693&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/conf/extra.conf.in (original)
+++ httpd/test/framework/trunk/t/conf/extra.conf.in Thu Dec 22 18:43:46 2016
@@ -979,7 +979,7 @@ LimitRequestFields 32
# Strict HTTP mode test config
#
<IfDefine APACHE2>
- <IfVersion >= 2.4.24>
+ <IfVersion >= 2.2.23>
<VirtualHost _default_:http_strict>
DocumentRoot @SERVERROOT@/htdocs/
HttpProtocolOptions Strict Require1.0 RegisteredMethods