On Wed, 3 Nov 2021 at 03:44, Edward J. Sabol <edwardjsa...@gmail.com> wrote:
> On Oct 26, 2021, at 3:28 AM, Steve Hay <steve.m....@googlemail.com> wrote:
> > Do you get the same behaviour with Apache-Test-1.42, or are these new
> problems in 1.43-rc1?
>
> Yes, I get the same behavior with 1.42. At a minimum, I need to
>
> ln -s /path/to/my/apache/modules
>
> inside the Apache-Test-1.43-rc1 directory and create a t/conf/
> httpd.conf.in file (as suggested by the README) with a bunch of
> LoadModule commands in it to get the httpd server to start up in any kind
> of useful state.
>
> The resulting "make test" output still skips the tests of mod_cgi,
> mod_perl, etc., even though I explicitly load them in t/conf/httpd.conf.in.
> I think I've tracked down the reason for this to Apache::TestConfig's
> modules hash doesn't include all of the modules that are actually loaded. I
> haven't been able to figure out why though. I suspect it's parsing the
> wrong httpd.conf file. If I hack Apache::Test's need_module to always
> return 1, all tests pass, so these modules are loaded. This seems to be a
> long-standing problem for some (but not most) people, as evidenced by this
> thread from 2006:
>
> https://www.mail-archive.com/test-dev@perl.apache.org/msg00321.html
>
> > If the problems are not new then I'm inclined to leave them for now
> (assuming I can get some +1s from voters on releasing this) and look at
> addressing them for the next release. The purpose of this release was
> really just to update Apache-Test in mod_perl to the current version before
> making a long-overdue release of that.
>
> Do you have a link that shows the changes from 1.42 to 1.43-rc1? Or just
> send me the diffs? That's probably a better way for me to evaluate the
> changes.
>
>
Let's come back to the existing problems you've raised for the next
release, otherwise this will hold up the mod_perl release.
I've attached a diff of the changes from 1.42 to 1.43-rc1.
diff -ruN Apache-Test-1.42/Changes Apache-Test-1.43-rc1/Changes
--- Apache-Test-1.42/Changes 2019-08-28 08:12:07.000000000 +0100
+++ Apache-Test-1.43-rc1/Changes 2021-10-15 09:13:30.000000000 +0100
@@ -6,6 +6,19 @@
=over 3
+=item 1.43-rc1
+
+Our implementation of "which" should not search
+for a program in the elements of PATH when program
+already contains a path. [rjung]
+
+Fix hash generation when the openssl command
+was overwritten with the environment variable
+"APACHE_TEST_OPENSSL_CMD". [rjung]
+
+Add new config option limitrequestline needed
+when the local directory paths are long. [rjung]
+
=item 1.42 Aug 28 2019
Fix loading apache_test_config.pm for recent perls in which '.' is
diff -ruN Apache-Test-1.42/META.json Apache-Test-1.43-rc1/META.json
--- Apache-Test-1.42/META.json 2019-08-28 08:12:08.000000000 +0100
+++ Apache-Test-1.43-rc1/META.json 2021-10-15 09:13:30.000000000 +0100
@@ -39,6 +39,6 @@
}
},
"release_status" : "stable",
- "version" : "1.42",
+ "version" : "1.43-rc1",
"x_serialization_backend" : "JSON::PP version 4.02"
}
diff -ruN Apache-Test-1.42/META.yml Apache-Test-1.43-rc1/META.yml
--- Apache-Test-1.42/META.yml 2019-08-28 08:12:08.000000000 +0100
+++ Apache-Test-1.43-rc1/META.yml 2021-10-15 09:13:30.000000000 +0100
@@ -21,5 +21,5 @@
Cwd: '2.06'
File::Spec: '0.8'
Win32::Process: '0'
-version: '1.42'
+version: 1.43-rc1
x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff -ruN Apache-Test-1.42/lib/Apache/Test.pm
Apache-Test-1.43-rc1/lib/Apache/Test.pm
--- Apache-Test-1.42/lib/Apache/Test.pm 2019-08-28 08:12:08.000000000 +0100
+++ Apache-Test-1.43-rc1/lib/Apache/Test.pm 2021-10-15 09:13:30.000000000
+0100
@@ -37,7 +37,7 @@
use vars qw(@ISA @EXPORT %EXPORT_TAGS $VERSION %SubTests @SkipReasons);
-$VERSION = '1.42';
+$VERSION = '1.43';
my @need = qw(need_lwp need_http11 need_cgi need_access need_auth
need_module need_apache need_min_apache_version
need_min_apache_fix
diff -ruN Apache-Test-1.42/lib/Apache/TestCommon.pm
Apache-Test-1.43-rc1/lib/Apache/TestCommon.pm
--- Apache-Test-1.42/lib/Apache/TestCommon.pm 2019-08-28 08:12:08.000000000
+0100
+++ Apache-Test-1.43-rc1/lib/Apache/TestCommon.pm 2021-10-15
09:13:30.000000000 +0100
@@ -53,7 +53,7 @@
$received += length $chunk;
});
- ok t_cmp($length, $received, 'bytes in body');
+ ok t_cmp($received, $length, 'bytes in body');
}
}
}
diff -ruN Apache-Test-1.42/lib/Apache/TestConfig.pm
Apache-Test-1.43-rc1/lib/Apache/TestConfig.pm
--- Apache-Test-1.42/lib/Apache/TestConfig.pm 2019-08-28 08:12:08.000000000
+0100
+++ Apache-Test-1.43-rc1/lib/Apache/TestConfig.pm 2021-10-15
09:13:30.000000000 +0100
@@ -59,38 +59,39 @@
use vars qw(%Usage);
%Usage = (
- top_dir => 'top-level directory (default is $PWD)',
- t_dir => 'the t/ test directory (default is $top_dir/t)',
- t_conf => 'the conf/ test directory (default is $t_dir/conf)',
- t_logs => 'the logs/ test directory (default is $t_dir/logs)',
- t_state => 'the state/ test directory (default is $t_dir/state)',
- t_pid_file => 'location of the pid file (default is
$t_logs/httpd.pid)',
- t_conf_file => 'test httpd.conf file (default is $t_conf/httpd.conf)',
- src_dir => 'source directory to look for mod_foos.so',
- serverroot => 'ServerRoot (default is $t_dir)',
- documentroot => 'DocumentRoot (default is $ServerRoot/htdocs',
- port => 'Port [port_number|select] (default ' . DEFAULT_PORT .
')',
- servername => 'ServerName (default is localhost)',
- user => 'User to run test server as (default is $USER)',
- group => 'Group to run test server as (default is $GROUP)',
- bindir => 'Apache bin/ dir (default is apxs -q BINDIR)',
- sbindir => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
- httpd => 'server to use for testing (default is $bindir/httpd)',
- target => 'name of server binary (default is apxs -q TARGET)',
- apxs => 'location of apxs (default is from
Apache2::BuildConfig)',
- startup_timeout => 'seconds to wait for the server to start (default is
60)',
- httpd_conf => 'inherit config from this file (default is apxs
derived)',
- httpd_conf_extra=> 'inherit additional config from this file',
- minclients => 'minimum number of concurrent clients (default is 1)',
- maxclients => 'maximum number of concurrent clients (default is
minclients+1)',
- threadsperchild => 'number of threads per child when using threaded MPMs
(default is 10)',
- perlpod => 'location of perl pod documents (for testing downloads)',
- proxyssl_url => 'url for testing ProxyPass / https (default is
localhost)',
- sslca => 'location of SSL CA (default is $t_conf/ssl/ca)',
- sslcaorg => 'SSL CA organization to use for tests (default is asf)',
- sslproto => 'SSL/TLS protocol version(s) to test',
- libmodperl => 'path to mod_perl\'s .so (full or relative to
LIBEXECDIR)',
- defines => 'values to add as -D defines (for example, "VAR1 VAR2")',
+ top_dir => 'top-level directory (default is $PWD)',
+ t_dir => 'the t/ test directory (default is $top_dir/t)',
+ t_conf => 'the conf/ test directory (default is $t_dir/conf)',
+ t_logs => 'the logs/ test directory (default is $t_dir/logs)',
+ t_state => 'the state/ test directory (default is $t_dir/state)',
+ t_pid_file => 'location of the pid file (default is
$t_logs/httpd.pid)',
+ t_conf_file => 'test httpd.conf file (default is $t_conf/httpd.conf)',
+ src_dir => 'source directory to look for mod_foos.so',
+ serverroot => 'ServerRoot (default is $t_dir)',
+ documentroot => 'DocumentRoot (default is $ServerRoot/htdocs',
+ port => 'Port [port_number|select] (default ' . DEFAULT_PORT .
')',
+ servername => 'ServerName (default is localhost)',
+ user => 'User to run test server as (default is $USER)',
+ group => 'Group to run test server as (default is $GROUP)',
+ bindir => 'Apache bin/ dir (default is apxs -q BINDIR)',
+ sbindir => 'Apache sbin/ dir (default is apxs -q SBINDIR)',
+ httpd => 'server to use for testing (default is $bindir/httpd)',
+ target => 'name of server binary (default is apxs -q TARGET)',
+ apxs => 'location of apxs (default is from
Apache2::BuildConfig)',
+ startup_timeout => 'seconds to wait for the server to start (default is
60)',
+ httpd_conf => 'inherit config from this file (default is apxs
derived)',
+ httpd_conf_extra => 'inherit additional config from this file',
+ minclients => 'minimum number of concurrent clients (default is 1)',
+ maxclients => 'maximum number of concurrent clients (default is
minclients+1)',
+ threadsperchild => 'number of threads per child when using threaded MPMs
(default is 10)',
+ limitrequestline => 'global LimitRequestLine setting (default is 128)',
+ perlpod => 'location of perl pod documents (for testing
downloads)',
+ proxyssl_url => 'url for testing ProxyPass / https (default is
localhost)',
+ sslca => 'location of SSL CA (default is $t_conf/ssl/ca)',
+ sslcaorg => 'SSL CA organization to use for tests (default is asf)',
+ sslproto => 'SSL/TLS protocol version(s) to test',
+ libmodperl => 'path to mod_perl\'s .so (full or relative to
LIBEXECDIR)',
+ defines => 'values to add as -D defines (for example, "VAR1
VAR2")',
(map { $_ . '_module_name', "$_ module name"} qw(cgi ssl thread access auth
php)),
);
@@ -368,6 +369,9 @@
$vars->{maxclientsthreadedmpm} = $vars->{maxsparethreadedmpm} +
$vars->{threadsperchild};
}
+ $vars->{limitrequestline} ||= 128;
+ $vars->{limitrequestlinex2} = 2 * $vars->{limitrequestline};
+
$vars->{proxy} ||= 'off';
$vars->{proxyssl_url} ||= '';
$vars->{defines} ||= '';
@@ -1778,6 +1782,11 @@
return undef unless $program;
+ # No need to search PATH components
+ # if $program already contains a path
+ return $program if !OSX and !WINFU and
+ $program =~ /\// and -f $program and -x $program;
+
my @dirs = File::Spec->path();
require Config;
diff -ruN Apache-Test-1.42/lib/Apache/TestSSLCA.pm
Apache-Test-1.43-rc1/lib/Apache/TestSSLCA.pm
--- Apache-Test-1.42/lib/Apache/TestSSLCA.pm 2019-08-28 08:12:08.000000000
+0100
+++ Apache-Test-1.43-rc1/lib/Apache/TestSSLCA.pm 2021-10-15
09:13:30.000000000 +0100
@@ -423,7 +423,7 @@
for my $file ($dh->read) {
next unless $file =~ /\.cr[tl]$/;
- chomp(my $hash = `openssl $type -noout -hash < $file`);
+ chomp(my $hash = `$openssl $type -noout -hash < $file`);
next unless $hash;
my $symlink = "$hash.r$n";
$n++;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@perl.apache.org
For additional commands, e-mail: dev-h...@perl.apache.org
