richter 01/04/25 07:37:15
Modified: . Tag: Embperl2c Embperl.pm Makefile.PL epapinit.c
epmain.c test.pl
test/cmp Tag: Embperl2c epobase.htm
Log:
Embperl 2 - fix bug with ApacheInit and when mod_perl is loaded as DSO
Revision Changes Path
No revision
No revision
1.118.4.31 +7 -1 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.30
retrieving revision 1.118.4.31
diff -u -r1.118.4.30 -r1.118.4.31
--- Embperl.pm 2001/04/25 09:24:59 1.118.4.30
+++ Embperl.pm 2001/04/25 14:37:09 1.118.4.31
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.30 2001/04/25 09:24:59 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.31 2001/04/25 14:37:09 richter Exp $
#
###################################################################################
@@ -567,6 +567,12 @@
my $path = $$pathref ;
my $pathndx = $$pathndxref ;
+
+ if ($filename eq '')
+ {
+ logerror (rcNotFound, '<no filename>');
+ return &NOT_FOUND ;
+ }
if (-d $filename)
{
1.31.4.11 +7 -7 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.10
retrieving revision 1.31.4.11
diff -u -r1.31.4.10 -r1.31.4.11
--- Makefile.PL 2001/04/25 12:11:01 1.31.4.10
+++ Makefile.PL 2001/04/25 14:37:09 1.31.4.11
@@ -489,13 +489,13 @@
if ($win32)
{
$i = "-I. -I$inc_dir -I$apache_src/regex -I$apache_src/os/win32" ;
- if (!-e "$apache_src/CoreR/ApacheCore.lib")
+ if (!-e "$apache_src/CoreD/ApacheCore.lib")
{
- $o = " $apache_src/CoreD/ApacheCore.lib" ;
+ $o = " $apache_src/CoreR/ApacheCore.lib" ;
}
else
{
- $o = " $apache_src/CoreR/ApacheCore.lib" ;
+ $o = " $apache_src/CoreD/ApacheCore.lib" ;
}
}
else
@@ -584,12 +584,12 @@
}
else
{
- $EPHTTPD = "$apache_src/ApacheR/Apache.exe" ;
- $EPHTTPDDLL = "$apache_src/CoreR" ;
+ $EPHTTPD = "$apache_src/ApacheD/Apache.exe" ;
+ $EPHTTPDDLL = "$apache_src/CoreD" ;
if (!-e $EPHTTPD)
{
- $EPHTTPD = "$apache_src/ApacheD/Apache.exe" ;
- $EPHTTPDDLL = "$apache_src/CoreD" ;
+ $EPHTTPD = "$apache_src/ApacheR/Apache.exe" ;
+ $EPHTTPDDLL = "$apache_src/CoreR" ;
}
#$EPMODPERL="LoadModule perl_module $mpdll" ;
$EPUSER = 'www' ; # dummy value
1.1.2.3 +20 -2 embperl/Attic/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epapinit.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- epapinit.c 2001/04/25 12:11:04 1.1.2.2
+++ epapinit.c 2001/04/25 14:37:10 1.1.2.3
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epapinit.c,v 1.1.2.2 2001/04/25 12:11:04 richter Exp $
+# $Id: epapinit.c,v 1.1.2.3 2001/04/25 14:37:10 richter Exp $
#
###################################################################################*/
@@ -18,14 +18,32 @@
#include "ep.h"
+static void embperl_ApacheInitCleanup (void * p)
+ {
+ /* make sure embperl module is removed before mod_perl */
+ ap_remove_module (&embperl_module) ;
+ }
+
+
static void embperl_ApacheInit (server_rec *s, pool *p)
{
+ pool * subpool = ap_make_sub_pool(p);
+
+ ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup,
embperl_ApacheInitCleanup);
ap_add_version_component ("Embperl/"VERSION) ;
}
+
+
+static const command_rec embperl_cmds[] =
+{
+ {NULL}
+};
+
+
module MODULE_VAR_EXPORT embperl_module = {
STANDARD_MODULE_STUFF,
embperl_ApacheInit, /* initializer */
@@ -33,7 +51,7 @@
NULL, /* dir merger --- default is to override */
NULL, /* server config */
NULL, /* merge server configs */
- NULL, /* command table */
+ embperl_cmds, /* command table */
NULL, /* handlers */
NULL, /* filename translation */
NULL, /* check_user_id */
1.75.4.32 +2 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.31
retrieving revision 1.75.4.32
diff -u -r1.75.4.31 -r1.75.4.32
--- epmain.c 2001/04/25 12:11:06 1.75.4.31
+++ epmain.c 2001/04/25 14:37:10 1.75.4.32
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.75.4.31 2001/04/25 12:11:06 richter Exp $
+# $Id: epmain.c,v 1.75.4.32 2001/04/25 14:37:10 richter Exp $
#
###################################################################################*/
@@ -1364,7 +1364,7 @@
r -> pApacheReq = NULL ;
if (_nIOType == epIOMod_Perl)
{
- ap_add_module (&embperl_module) ;
+ ap_add_module (&embperl_module) ;
}
#endif
r -> bReqRunning = 0 ;
1.70.4.45 +2 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.44
retrieving revision 1.70.4.45
diff -u -r1.70.4.44 -r1.70.4.45
--- test.pl 2001/04/10 08:03:44 1.70.4.44
+++ test.pl 2001/04/25 14:37:11 1.70.4.45
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.44 2001/04/10 08:03:44 richter Exp $
+# $Id: test.pl,v 1.70.4.45 2001/04/25 14:37:11 richter Exp $
#
###################################################################################
@@ -507,6 +507,7 @@
'EmbperlObject/epobase.htm' => {
'offline' => 0,
'cgi' => 0,
+ 'errors' => 1,
},
'SSI/ssibasic.htm' => {
'version' => 2,
No revision
No revision
1.1.2.2 +8 -13 embperl/test/cmp/epobase.htm
Index: epobase.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/epobase.htm,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- epobase.htm 2001/03/27 14:25:00 1.1.2.1
+++ epobase.htm 2001/04/25 14:37:14 1.1.2.2
@@ -1,15 +1,10 @@
- <html>
- <head>
- <title>Example</title>
- </head>
- <body>
- <h1>head from foo</h1>
+<HTML><HEAD><TITLE>Embperl Error</TITLE></HEAD><BODY bgcolor="#FFFFFF">
+<H1>Internal Server Error</H1>
+The server encountered an internal error or misconfiguration and was unable to
complete your request.<P>
+^Please contact the server administrator\,.*?and inform them of the time the error
occurred\, and anything you might have done that may have caused the error
+^\[.*?\]ERR\: 32\: Line 1\: Warning in Perl code\: Use of uninitialized value
+^\[.*?\]ERR\: 30\: Line 1\: Not found <no filename><p>
+^ HTML\:\:Embperl.*?<P>
+</BODY></HTML>
-
- <hr> Footer <hr>
-
-
-
-</body>
- </html>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
