Author: torsten
Date: Sun Mar 20 20:08:44 2011
New Revision: 1083556
URL: http://svn.apache.org/viewvc?rev=1083556&view=rev
Log:
Merged revisions 1083541 via svnmerge from
https://svn.eu.apache.org/repos/asf/perl/modperl/trunk
........
r1083541 | torsten | 2011-03-20 20:15:20 +0100 (Sun, 20 Mar 2011) | 5 lines
Bugfix: Apache2::ServerUtil::get_server{description,banner,version} cannot
be declared as perl constants or they won't reflect added version components
if Apache2::ServerUtil is loaded before the PostConfig phase. Now, they
are ordinary perl functions.
........
Modified:
perl/modperl/branches/threading/ (props changed)
perl/modperl/branches/threading/Changes
perl/modperl/branches/threading/t/response/TestAPI/server_const.pm
perl/modperl/branches/threading/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
perl/modperl/branches/threading/xs/maps/apache2_functions.map
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 20 20:08:44 2011
@@ -1 +1 @@
-/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122,1076733
+/perl/modperl/trunk:594682-672484,672819-681118,693357,700369,732889-736218,751909-752425,757553-774171,807116,807332-807649,907778-932879,933373-933563,935519,936643,940287,957309-983073,985740,987933-1023553,1029211-1052232,1062311-1062448,1066644-1074122,1076733,1083541
Propchange: perl/modperl/branches/threading/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Mar 20 20:08:44 2011
@@ -1 +1 @@
-/perl/modperl/trunk:1-712967,712969-1076790
+/perl/modperl/trunk:1-712967,712969-1083541
Modified: perl/modperl/branches/threading/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/Changes?rev=1083556&r1=1083555&r2=1083556&view=diff
==============================================================================
--- perl/modperl/branches/threading/Changes (original)
+++ perl/modperl/branches/threading/Changes Sun Mar 20 20:08:44 2011
@@ -31,6 +31,11 @@ Expose modperl_interp_t via ModPerl::Int
=item 2.0.6-dev
+Bugfix: Apache2::ServerUtil::get_server{description,banner,version} cannot
+be declared as perl constants or they won't reflect added version components
+if Apache2::ServerUtil is loaded before the PostConfig phase. Now, they
+are ordinary perl functions. [Torsten Foertsch]
+
Check for the right ExtUtils::Embed version during build [Torsten Foertsch]
Take a lesson from rt.cpan.org #66085 and pass LD_LIBRARY_PATH if mod_env
Modified: perl/modperl/branches/threading/t/response/TestAPI/server_const.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/t/response/TestAPI/server_const.pm?rev=1083556&r1=1083555&r2=1083556&view=diff
==============================================================================
--- perl/modperl/branches/threading/t/response/TestAPI/server_const.pm
(original)
+++ perl/modperl/branches/threading/t/response/TestAPI/server_const.pm Sun Mar
20 20:08:44 2011
@@ -25,7 +25,7 @@ sub handler {
my $r = shift;
- plan $r, tests => 5;
+ plan $r, tests => 6;
# test Apache2::ServerUtil constant subroutines
@@ -37,20 +37,22 @@ sub handler {
$built,
'Apache2::ServerUtil::get_server_built()');
- ok t_cmp(Apache2::ServerUtil::get_server_description,
- $version,
+ my $server_descr = Apache2::ServerUtil::get_server_description;
+ ok t_cmp($server_descr, qr/^\Q$version\E/,
'Apache2::ServerUtil::get_server_description()');
- my $server_version = Apache2::ServerUtil::get_server_version;
- ok t_cmp($version,
- qr/^$server_version/,
- 'Apache2::ServerUtil::get_server_version()');
+ # added via $s->add_version_component in t/conf/modperl_extra.pl
+ ok t_cmp($server_descr, qr!\bworld domination series/2\.0\b!,
+ 'Apache2::ServerUtil::get_server_description() -- component');
- my $server_banner = Apache2::ServerUtil::get_server_banner;
- ok t_cmp($version,
- qr/^$server_banner/,
+ # assuming ServerTokens Full (default) the banner equals description
+ ok t_cmp(Apache2::ServerUtil::get_server_banner, $server_descr,
'Apache2::ServerUtil::get_server_banner()');
+ # version is just an alias for banner
+ ok t_cmp(Apache2::ServerUtil::get_server_version, $server_descr,
+ 'Apache2::ServerUtil::get_server_version()');
+
Apache2::Const::OK;
}
Modified:
perl/modperl/branches/threading/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/Apache2/ServerUtil/Apache2__ServerUtil.h?rev=1083556&r1=1083555&r2=1083556&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
(original)
+++ perl/modperl/branches/threading/xs/Apache2/ServerUtil/Apache2__ServerUtil.h
Sun Mar 20 20:08:44 2011
@@ -185,6 +185,13 @@ void mpxs_Apache2__ServerRec_add_config(
}
}
+#define mpxs_Apache2__ServerRec_get_server_banner \
+ ap_get_server_banner()
+#define mpxs_Apache2__ServerRec_get_server_description \
+ ap_get_server_description()
+#define mpxs_Apache2__ServerRec_get_server_version \
+ ap_get_server_version()
+
static void mpxs_Apache2__ServerUtil_BOOT(pTHX)
{
newCONSTSUB(PL_defstash, "Apache2::ServerUtil::server_root",
@@ -192,15 +199,6 @@ static void mpxs_Apache2__ServerUtil_BOO
newCONSTSUB(PL_defstash, "Apache2::ServerUtil::get_server_built",
newSVpv(ap_get_server_built(), 0));
-
- newCONSTSUB(PL_defstash, "Apache2::ServerUtil::get_server_version",
- newSVpv(ap_get_server_version(), 0));
-
- newCONSTSUB(PL_defstash, "Apache2::ServerUtil::get_server_banner",
- newSVpv(ap_get_server_banner(), 0));
-
- newCONSTSUB(PL_defstash, "Apache2::ServerUtil::get_server_description",
- newSVpv(ap_get_server_description(), 0));
}
/*
Modified: perl/modperl/branches/threading/xs/maps/apache2_functions.map
URL:
http://svn.apache.org/viewvc/perl/modperl/branches/threading/xs/maps/apache2_functions.map?rev=1083556&r1=1083555&r2=1083556&view=diff
==============================================================================
--- perl/modperl/branches/threading/xs/maps/apache2_functions.map (original)
+++ perl/modperl/branches/threading/xs/maps/apache2_functions.map Sun Mar 20
20:08:44 2011
@@ -165,6 +165,9 @@ MODULE=Apache2::ServerUtil PACKAGE=Apa
MODULE=Apache2::ServerUtil PACKAGE=Apache2::ServerUtil
ap_exists_config_define
ap_server_root_relative | | p, fname=""
+ ap_get_server_banner
+ ap_get_server_description
+ ap_get_server_version
MODULE=Apache2::ServerUtil PACKAGE=guess
ap_error_log2stderr
@@ -175,9 +178,6 @@ MODULE=Apache2::ServerUtil PACKAGE=gue
#however it is not exported on win32
!ap_get_local_host
~ap_get_server_built
-~ap_get_server_version
-~ap_get_server_banner
-~ap_get_server_description
~ap_server_root
