richter 01/05/15 20:56:55
Modified: . Changes.pod Embperl.pm Embperl.pod EmbperlD.pod
epcmd.c
test/conf httpd.conf.src startup.pl startup_dso.pl
Log:
fixes for some path problems on win32
Revision Changes Path
1.165 +8 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- Changes.pod 2001/05/15 04:50:06 1.164
+++ Changes.pod 2001/05/16 03:56:54 1.165
@@ -40,6 +40,14 @@
- quote pathnames in Makefile to allow directories like "Program Files".
Spotted by Lukas Zapletal.
- Added epocgi.pl which allow use of EmbperlObject as CGI script.
+ - Added a dTHR to function CmdVar to make Embperl compile with threaded
+ Perl 5.005. Patch from Michael George III.
+ - EMBPERL_SESSION_ARGS can now accept pathes with spaces inside by quoteing
+ an argument e.g. PerlSetEnv EMBPERL_SESSION_ARGS "'Directory=/Session Files/'".
+ Spotted by Lukas Zapletal.
+ - Perl search path (@INC) in make test is set to abosulte paths to be independend
+ of directory changes that Apache might issue. Spotted by Randy Korbes.
+
=head1 1.3.1 (RELEASE) 13 Feb. 2001
1.152 +4 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -r1.151 -r1.152
--- Embperl.pm 2001/05/15 06:46:47 1.151
+++ Embperl.pm 2001/05/16 03:56:54 1.152
@@ -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.151 2001/05/15 06:46:47 richter Exp $
+# $Id: Embperl.pm,v 1.152 2001/05/16 03:56:54 richter Exp $
#
###################################################################################
@@ -358,6 +358,8 @@
# Setup Sessionhandling
#
+use Text::ParseWords ;
+
$SessionMgnt = 0 ;
if (defined ($ENV{EMBPERL_SESSION_CLASSES}))
{ # Apache::Session 1.xx
@@ -373,7 +375,7 @@
my @args ;
if (defined ($ENV{EMBPERL_SESSION_ARGS}))
{
- my @arglist = split /\s+/, $ENV{EMBPERL_SESSION_ARGS} ;
+ my @arglist = quotewords ('\s+', 0, $ENV{EMBPERL_SESSION_ARGS}) ;
foreach (@arglist)
{
/^(.*?)\s*=\s*(.*?)$/ ;
1.71 +2 -1 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- Embperl.pod 2001/05/10 19:08:06 1.70
+++ Embperl.pod 2001/05/16 03:56:54 1.71
@@ -1059,9 +1059,10 @@
=head2 EMBPERL_SESSION_ARGS
List of arguments for Apache::Session classes (see L<"Session handling">)
+Arguments that contains spaces can be quoted.
Example:
- PerlSetEnv EMBPERL_SESSION_ARGS "DataSource=dbi:mysql:session UserName=www
Password=secret"
+ PerlSetEnv EMBPERL_SESSION_ARGS "DataSource=dbi:mysql:session UserName=www
'Password=secret word'"
=head2 EMBPERL_SESSION_HANDLER_CLASS (1.3b3 and higher)
1.43 +4 -2 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- EmbperlD.pod 2001/05/10 19:08:08 1.42
+++ EmbperlD.pod 2001/05/16 03:56:54 1.43
@@ -981,9 +981,11 @@
=head2 EMBPERL_SESSION_ARGS
Liste von zus�tzlichen Parametern f�r I<Apache::Session> Klassen (Leerzeichen
getrennt)
-(siehe L<"Session Handling"|"Session Handling (ab 1.2b2)">). Beispiel:
+(siehe L<"Session Handling"|"Session Handling (ab 1.2b2)">).
+Argumente die Leerzeichnen enthalten, m�ssen in Anf�hrungszeichen geschriebene
werden.
+Beispiel:
- PerlSetEnv EMBPERL_SESSION_ARGS "DataSource=dbi:mysql:session UserName=www
Password=secret"
+ PerlSetEnv EMBPERL_SESSION_ARGS "DataSource=dbi:mysql:session UserName=www
'Password=secret word'"
=head2 EMBPERL_SESSION_HANDLER_CLASS (ab 1.3b3)
1.41 +2 -1 embperl/epcmd.c
Index: epcmd.c
===================================================================
RCS file: /home/cvs/embperl/epcmd.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- epcmd.c 2001/02/13 05:39:19 1.40
+++ epcmd.c 2001/05/16 03:56:54 1.41
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcmd.c,v 1.40 2001/02/13 05:39:19 richter Exp $
+# $Id: epcmd.c,v 1.41 2001/05/16 03:56:54 richter Exp $
#
###################################################################################*/
@@ -857,6 +857,7 @@
int nFilepos = (sArg - r -> Buf.pBuf) ;
SV * pSV ;
+ dTHR ;
EPENTRY (CmdVar) ;
1.39 +39 -35 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- httpd.conf.src 2001/05/15 10:41:39 1.38
+++ httpd.conf.src 2001/05/16 03:56:55 1.39
@@ -3,9 +3,9 @@
# Testconfig for HTML::Embperl make test
#
-ServerRoot $EPPATH/test
+ServerRoot \"$EPPATH/test\"
ServerName localhost
-DocumentRoot $EPPATH/test
+DocumentRoot \"$EPPATH/test\"
Port $EPPORT
EOD
@@ -44,8 +44,12 @@
SetEnv EMBPERL_DEBUG $EPDEBUG
SetEnv EMBPERL_VIRTLOG /embperl/log
-PerlSetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
-SetEnv EMBPERL_LOG $EPPATH/test/tmp/test.log
+PerlSetEnv EMBPERL_LOG \"$EPPATH/test/tmp/test.log\"
+SetEnv EMBPERL_LOG \"$EPPATH/test/tmp/test.log\"
+
+PerlSetEnv EMBPERL_SRC \"$EPPATH\"
+SetEnv EMBPERL_SRC \"$EPPATH\"
+
EOD
@@ -61,7 +65,7 @@
PerlSetEnv EMBPERL_SESSION_CLASS $EPSESSIONCLASS
SetEnv EMBPERL_SESSION_CLASS $EPSESSIONCLASS
-PerlSetEnv SESSION_FILE_DIRECTORY $EPPATH/test/tmp
+PerlSetEnv SESSION_FILE_DIRECTORY \"$EPPATH/test/tmp\"
PerlSetEnv SESSION_DBI_DATASOURCE $EPSESSIONDS
PerlSetEnv EMBPERL_MAILDEBUG 1
@@ -75,9 +79,9 @@
#PerlSetEnv EMBPERL_SESSION_CLASSES "MemoryStore NullLocker"
PerlSetEnv EMBPERL_SESSION_CLASSES "FileStore NullLocker"
-PerlSetEnv EMBPERL_SESSION_ARGS "Directory=$EPPATH/test/tmp"
+PerlSetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
SetEnv EMBPERL_SESSION_CLASSES "FileStore NullLocker"
-SetEnv EMBPERL_SESSION_ARGS "Directory=$EPPATH/test/tmp"
+SetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
EOD
}
elsif ($EPSESSIONVERSION && ($EPSESSIONVERSION > 1))
@@ -85,9 +89,9 @@
print OFH <<EOD ;
PerlSetEnv EMBPERL_SESSION_CLASSES "File Null"
-PerlSetEnv EMBPERL_SESSION_ARGS "Directory=$EPPATH/test/tmp"
+PerlSetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
SetEnv EMBPERL_SESSION_CLASSES "File Null"
-SetEnv EMBPERL_SESSION_ARGS "Directory=$EPPATH/test/tmp"
+SetEnv EMBPERL_SESSION_ARGS "'Directory=$EPPATH/test/tmp'"
EOD
}
@@ -97,7 +101,7 @@
SetEnv EMBPERL_ALLOW asc|\\.htm\$
-PerlScript $EPPATH/test/conf/$EPSTARTUP
+PerlScript \"$EPPATH/test/conf/$EPSTARTUP\"
<Location /embperl/log>
SetHandler perl-script
@@ -110,12 +114,12 @@
AddType text/html .htm
AddType text/html .xhtm
-Alias /embperl/sub/ $EPPATH/test/html/
-Alias /embperl/ $EPPATH/test/html/
-Alias /embperl2/ $EPPATH/test/html2/
-Alias /eg/ $EPPATH/eg/
-Alias /embperldbg/ $EPPATH/test/html/
-Alias /registrydbg/ $EPPATH/test/html/registry/
+Alias /embperl/sub/ \"$EPPATH/test/html/\"
+Alias /embperl/ \"$EPPATH/test/html/\"
+Alias /embperl2/ \"$EPPATH/test/html2/\"
+Alias /eg/ \"$EPPATH/eg/\"
+Alias /embperldbg/ \"$EPPATH/test/html/\"
+Alias /registrydbg/ \"$EPPATH/test/html/registry/\"
<Location /embperl/sub>
SetHandler perl-script
@@ -286,24 +290,24 @@
</Location>
-Alias /cgi-bin/ $EPPATH/test/html/
-Alias /cgi-bin-32/ $EPPATH/test/html/
-ScriptAlias /cgi/ $EPPATH/
+Alias /cgi-bin/ \"$EPPATH/test/html/\"
+Alias /cgi-bin-32/ \"$EPPATH/test/html/\"
+ScriptAlias /cgi/ \"$EPPATH/\"
<Location /cgi-bin>
Action text/html /cgi/embpcgi.test.pl
Options ExecCGI
+</Location>
+
+
+SetEnv CGIEMBPERL_OBJECT_BASE epobase.htm
+SetEnv CGIEMBPERL_OBJECT_FALLBACK epofallback.htm
+
+<Location /cgi-bin/EmbperlObject>
+Action text/html /cgi/epocgi.test.pl
+Options ExecCGI
</Location>
-
-SetEnv CGIEMBPERL_OBJECT_BASE epobase.htm
-SetEnv CGIEMBPERL_OBJECT_FALLBACK epofallback.htm
-
-
-<Location /cgi-bin/EmbperlObject>
-Action text/html /cgi/epocgi.test.pl
-Options ExecCGI
-</Location>
-
+
<Location /cgi-bin-32>
Action text/html /cgi/embpcgi.test.bat
@@ -339,8 +343,8 @@
<Location /embperl/EmbperlObject/base3>
PerlSetEnv EMBPERL_OBJECT_BASE epobase3.htm
-PerlSetEnv EMBPERL_OBJECT_STOPDIR $EPPATH/test/html/EmbperlObject
-PerlSetEnv EMBPERL_OBJECT_ADDPATH $EPPATH/test/html/EmbperlObject/lib
+PerlSetEnv EMBPERL_OBJECT_STOPDIR \"$EPPATH/test/html/EmbperlObject\"
+PerlSetEnv EMBPERL_OBJECT_ADDPATH \"$EPPATH/test/html/EmbperlObject/lib\"
PerlSetEnv EMBPERL_OBJECT_FALLBACK epofallback.htm
PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
@@ -350,8 +354,8 @@
<Location /embperl/EmbperlObject/base2>
PerlSetEnv EMBPERL_OBJECT_BASE epobase2.htm
-PerlSetEnv EMBPERL_OBJECT_STOPDIR $EPPATH/test/html/EmbperlObject
-PerlSetEnv EMBPERL_OBJECT_ADDPATH $EPPATH/test/html/EmbperlObject/lib
+PerlSetEnv EMBPERL_OBJECT_STOPDIR \"$EPPATH/test/html/EmbperlObject\"
+PerlSetEnv EMBPERL_OBJECT_ADDPATH \"$EPPATH/test/html/EmbperlObject/lib\"
PerlSetEnv EMBPERL_OBJECT_FALLBACK epofallback.htm
PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?\$|\\.epl\$\"
SetHandler perl-script
@@ -401,7 +405,7 @@
<IfModule apache_ssl.c>
SSLDisable
SSLCacheServerPort gcache_port
-SSLCacheServerPath $EPAPACHESRC/modules/ssl/gcache
+SSLCacheServerPath \"$EPAPACHESRC/modules/ssl/gcache\"
</IfModule>
@@ -440,7 +444,7 @@
<Location /embperl/asp>
SetHandler perl-script
PerlHandler Apache::ASP
-PerlSetVar Global $EPPATH/test/tmp
+PerlSetVar Global \"$EPPATH/test/tmp\"
PerlSetVar Debug 0
PerlSetVar CookiePath /
PerlSetVar NoState 1
1.14 +3 -2 embperl/test/conf/startup.pl
Index: startup.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- startup.pl 2001/03/27 12:27:51 1.13
+++ startup.pl 2001/05/16 03:56:55 1.14
@@ -10,13 +10,14 @@
eval " use Apache\:\:Session\:\:$EPSESSIONCLASS; " ;
}
- my $cwd = Cwd::fastcwd();
+ my $cwd = $ENV{EMBPERL_SRC} ;
my $i = 0 ;
foreach (@INC)
{
- $INC[$i] = "$cwd/$_" if (/^blib/) ;
+ $INC[$i] = "$cwd/$_" if (/^(\.\/)?blib/) ;
$i++ ;
}
+
} ;
1.10 +2 -2 embperl/test/conf/startup_dso.pl
Index: startup_dso.pl
===================================================================
RCS file: /home/cvs/embperl/test/conf/startup_dso.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- startup_dso.pl 2001/03/27 12:27:51 1.9
+++ startup_dso.pl 2001/05/16 03:56:55 1.10
@@ -10,11 +10,11 @@
eval " use Apache\:\:Session\:\:$EPSESSIONCLASS; " ;
}
- my $cwd = Cwd::fastcwd();
+ my $cwd = $ENV{EMBPERL_SRC} ;
my $i = 0 ;
foreach (@INC)
{
- $INC[$i] = "$cwd/$_" if (/^blib/) ;
+ $INC[$i] = "$cwd/$_" if (/^(\.\/)?blib/) ;
$i++ ;
}
} ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
