Author: torsten
Date: Sat Jun 28 02:45:31 2008
New Revision: 672484
URL: http://svn.apache.org/viewvc?rev=672484&view=rev
Log:
change "XSLoader::load(@_)" to "goto &XSLoader::load" in {APR,Apache2}::XSLoader
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/APR/XSLoader.pm
perl/modperl/trunk/lib/Apache2/XSLoader.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=672484&r1=672483&r2=672484&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sat Jun 28 02:45:31 2008
@@ -12,6 +12,9 @@
=item 2.0.5-dev
+Fix a problem that could make APR::XSLoader and Apache2::XSLoader
+load the wrong shared library. [Torsten Foertsch]
+
Fix compilation when using a non-threaded APR.
[Gozer, Philip M. Gollucci]
Modified: perl/modperl/trunk/lib/APR/XSLoader.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/lib/APR/XSLoader.pm?rev=672484&r1=672483&r2=672484&view=diff
==============================================================================
--- perl/modperl/trunk/lib/APR/XSLoader.pm (original)
+++ perl/modperl/trunk/lib/APR/XSLoader.pm Sat Jun 28 02:45:31 2008
@@ -28,7 +28,9 @@
sub load {
return unless BOOTSTRAP;
- XSLoader::load(@_);
+ # do not change the next line and do not insert anything below it in this
+ # function. XSLoader::load depends on it.
+ goto &XSLoader::load;
}
1;
Modified: perl/modperl/trunk/lib/Apache2/XSLoader.pm
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/lib/Apache2/XSLoader.pm?rev=672484&r1=672483&r2=672484&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/XSLoader.pm (original)
+++ perl/modperl/trunk/lib/Apache2/XSLoader.pm Sat Jun 28 02:45:31 2008
@@ -28,7 +28,9 @@
sub load {
return unless BOOTSTRAP;
- XSLoader::load(@_);
+ # do not change the next line and do not insert anything below it in this
+ # function. XSLoader::load depends on it.
+ goto &XSLoader::load;
}
1;
