Author: richter
Date: Mon Feb 24 20:55:11 2014
New Revision: 1571436
URL: http://svn.apache.org/r1571436
Log:
Apache 2.4. support
Modified:
perl/embperl/trunk/Changes.pod
perl/embperl/trunk/Makefile.PL
perl/embperl/trunk/test.pl
perl/embperl/trunk/test/conf/httpd.conf.src
perl/embperl/trunk/test/conf/httpd.min.conf.src
Modified: perl/embperl/trunk/Changes.pod
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Changes.pod?rev=1571436&r1=1571435&r2=1571436&view=diff
==============================================================================
--- perl/embperl/trunk/Changes.pod (original)
+++ perl/embperl/trunk/Changes.pod Mon Feb 24 20:55:11 2014
@@ -19,6 +19,8 @@
- Changed the way exit passed through internaly, so it
works with Perl >= 5.18
- Adapted tests to Perl 5.18
+ - Adapted test httpd.conf to Apache 2.4. Embperl fully supports
+ Apache 2.4
- Fix output inside of Registry script for mod_perl 2.0.4+
- Fix problem with error output on stderr for Windows 64Bit
- removed support for XALAN XML parser. It was outdated
Modified: perl/embperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Makefile.PL?rev=1571436&r1=1571435&r2=1571436&view=diff
==============================================================================
--- perl/embperl/trunk/Makefile.PL (original)
+++ perl/embperl/trunk/Makefile.PL Mon Feb 24 20:55:11 2014
@@ -69,6 +69,22 @@ $EP2 = -f "epcmd2.c" ;
win32filetext => 'ApacheModuleCgi.dll or mod_cgi.so',
},
+ 'mod_authn_core.c' => { name => 'authn_core_module',
+ path =>
['$apache_src/modules/standard/mod_authn_core.so',
'$EPBINDIR/modules/mod_authn_core.so', '$apache_src/mod_authn_core.so'],
+ win32path =>
['$apache_src/modules/standard/apachemoduleauthncore.dll',
'$EPBINDIR/modules/apachemoduleauthncore.dll',
'$EPBINDIR/modules/mod_authn_core.so'],
+ file => ['mod_authn_core.so',
'apachemoduleauthn_core.dll'],
+ win32filetext => 'ApacheModuleAuthnCore.dll or
mod_authn_core.so',
+ optional => 1,
+ },
+
+ 'mod_authz_core.c' => { name => 'authz_core_module',
+ path =>
['$apache_src/modules/standard/mod_authz_core.so',
'$EPBINDIR/modules/mod_authz_core.so', '$apache_src/mod_authz_core.so'],
+ win32path =>
['$apache_src/modules/standard/apachemoduleauthzcore.dll',
'$EPBINDIR/modules/apachemoduleauthzcore.dll',
'$EPBINDIR/modules/mod_authz_core.so'],
+ file => ['mod_authz_core.so',
'apachemoduleauthz_core.dll'],
+ win32filetext => 'ApacheModuleAuthzCore.dll or
mod_authz_core.so',
+ optional => 1,
+ },
+
'mod_actions.c' => {
name => 'action_module',
name2 => 'actions_module',
@@ -930,7 +946,7 @@ if ($b && $apache)
$path = cnvpath ("$addmodpath/$modfile") ;
#print "path = $_ -> $path\n" ;
if (-f $path)
- { ## module fould
+ { ## module found
$EPMODPERL .= "\r\nLoadModule ".
($mp2cfg?($opt->{name2} || $opt->{name}):$opt->{name}) . " \"$path\"" ;
print " + Load dynamic module $mod\n ($path)\n" ;
$found = 1 ;
@@ -980,7 +996,7 @@ if ($b && $apache)
}
}
- if (!$found)
+ if (!$found && !$opt -> {optional})
{
my $w32msg = '' ;
$w32msg = "\nPlease enter full path including the drive
letter!! " if ($win32) ;
Modified: perl/embperl/trunk/test.pl
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test.pl?rev=1571436&r1=1571435&r2=1571436&view=diff
==============================================================================
--- perl/embperl/trunk/test.pl (original)
+++ perl/embperl/trunk/test.pl Mon Feb 24 20:55:11 2014
@@ -124,6 +124,12 @@
},
'notfound.htm' => {
'errors' => '1',
+ 'cgi' => 1,
+ 'condition' => '$EPAPACHEVERSION !~ /2\.4\./',
+ },
+ 'notfound.htm' => {
+ 'errors' => '1',
+ 'cgi' => 0,
},
'notallow.xhtm' => {
'errors' => '1',
@@ -937,7 +943,7 @@
'version' => 2,
'syntax' => 'RTF',
'offline' => 1,
- 'condition' => '$] < 5.018000',
+ 'condition' => '$] < 5.016000',
'param' => [
{ 'adressen_anrede' => 'Herr', 'adressen_name' =>
'Richter', 'adressen_vorname' => 'Gerald', anschreiben_typ => 'Dienstadresse',
adressen_dienststelle => 'adr dienst', adressen_dienstbezeichnung => 'DBEZ',
adressen_dienst_strasse => 'dstr 1', adressen_priv_strasse => 'pstr 1' },
{ 'adressen_anrede' => 'Herr', 'adressen_name' =>
'Richter2', 'adressen_vorname' => 'Gerald2', anschreiben_typ =>
'Dienstadresse', adressen_dienststelle => 'adr dienst 2',
adressen_dienstbezeichnung => 'DBEZ2' },
Modified: perl/embperl/trunk/test/conf/httpd.conf.src
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test/conf/httpd.conf.src?rev=1571436&r1=1571435&r2=1571436&view=diff
==============================================================================
--- perl/embperl/trunk/test/conf/httpd.conf.src (original)
+++ perl/embperl/trunk/test/conf/httpd.conf.src Mon Feb 24 20:55:11 2014
@@ -118,7 +118,16 @@ EOD
print OFH <<EOD ;
TypesConfig conf/null
-LockFile tmp/httpd.lock
+EOD
+
+if ($EPAPACHEVERSION !~ /2\.4\./)
+ {
+ print OFH "LockFile tmp/httpd.lock\n" ;
+
+ }
+
+print OFH <<EOD ;
+
# needs mod_log_config
Modified: perl/embperl/trunk/test/conf/httpd.min.conf.src
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/test/conf/httpd.min.conf.src?rev=1571436&r1=1571435&r2=1571436&view=diff
==============================================================================
--- perl/embperl/trunk/test/conf/httpd.min.conf.src (original)
+++ perl/embperl/trunk/test/conf/httpd.min.conf.src Mon Feb 24 20:55:11 2014
@@ -64,8 +64,14 @@ EOD
print OFH <<EOD ;
TypesConfig conf/null
-LockFile tmp/httpd.lock
+EOD
+
+if ($EPAPACHEVERSION !~ /2\.4\./)
+ {
+ print OFH "LockFile tmp/httpd.lock\n" ;
+ }
+print OFH <<EOD ;
PerlSetEnv EMBPERL_SRC \"$EPPATH\"
SetEnv EMBPERL_SRC \"$EPPATH\"
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
