You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2002/06/25 07:59:18 UTC
cvs commit: embperl/test/cmp2 errdoc2.htm error.htm
richter 2002/06/24 22:59:18
Modified: . Tag: Embperl2c MANIFEST README.v2 mod_embperl.c
test.pl
eg/web Tag: Embperl2c epwebapp.pl
test/cmp Tag: Embperl2c error.htm taint.htm
test/cmp2 Tag: Embperl2c errdoc2.htm error.htm
Log:
web site & test fixes
Revision Changes Path
No revision
No revision
1.50.4.53 +0 -1 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.52
retrieving revision 1.50.4.53
diff -u -r1.50.4.52 -r1.50.4.53
--- MANIFEST 24 Jun 2002 19:58:28 -0000 1.50.4.52
+++ MANIFEST 25 Jun 2002 05:59:17 -0000 1.50.4.53
@@ -353,7 +353,6 @@
test/cmp2/unclosed.htm
test/cmp2/varerr.htm
test/cmp2/varerr.htm56
-test/conf/config.pl
test/conf/httpd.conf.src
test/conf/httpd.stop.conf.src
test/conf/null
1.1.4.32 +9 -1 embperl/Attic/README.v2
Index: README.v2
===================================================================
RCS file: /home/cvs/embperl/Attic/README.v2,v
retrieving revision 1.1.4.31
retrieving revision 1.1.4.32
diff -u -r1.1.4.31 -r1.1.4.32
--- README.v2 13 Jun 2002 17:40:38 -0000 1.1.4.31
+++ README.v2 25 Jun 2002 05:59:17 -0000 1.1.4.32
@@ -199,6 +199,14 @@
- EMBPERL_INPUT_FUNC and EMBPERL_OUTPUT_FUNC are not supported anymore
You can the same result and much more by writing custom provider.
+- Embperl doesn't change the current working directory anymore to the
+ directory of the source file. This is done for performance reasons
+ and because it won't reliable work with threads under mod_perl 2.0.
+ You can use $req -> component -> cwd to get the directotry of the
+ sourcefile (where $req is Embperl request object, which is the first
+ paramter passed to the page i.e. $_[0])
+
+
The following things are not fully tested/working yet:
------------------------------------------------------
1.1.2.3 +5 -5 embperl/Attic/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/Attic/mod_embperl.c,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- mod_embperl.c 13 Jun 2002 17:40:38 -0000 1.1.2.2
+++ mod_embperl.c 25 Jun 2002 05:59:17 -0000 1.1.2.3
@@ -237,13 +237,13 @@
if (!ap_find_linked_module("mod_embperl.c"))
{
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "Embperl: About to add embperl.c as dynamic module [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "Embperl: About to add mod_embperl.c as dynamic module [%d/%d]\n", getpid(), gettid()) ;
ap_add_module (&embperl_module) ;
}
else
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "Embperl: embperl.c already added as dynamic module [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "Embperl: mod_embperl.c already added as dynamic module [%d/%d]\n", getpid(), gettid()) ;
#endif
}
@@ -338,7 +338,7 @@
if (m -> dynamic_load_handle)
{
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "Embperl: ApacheInitCleanup: mod_perl.c dynamicly loaded -> remove embperl.c [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "Embperl: ApacheInitCleanup: mod_perl.c dynamicly loaded -> remove mod_embperl.c [%d/%d]\n", getpid(), gettid()) ;
ap_remove_module (&embperl_module) ;
}
else
@@ -534,7 +534,7 @@
#include "epcfg.h"
if (add -> bUseEnv >= 0)
- base -> bUseEnv = add -> bUseEnv ;
+ mrg -> bUseEnv = add -> bUseEnv ;
return mrg ;
}
1.70.4.140 +3 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.139
retrieving revision 1.70.4.140
diff -u -r1.70.4.139 -r1.70.4.140
--- test.pl 24 Jun 2002 19:22:29 -0000 1.70.4.139
+++ test.pl 25 Jun 2002 05:59:17 -0000 1.70.4.140
@@ -303,11 +303,13 @@
'includeerr2.htm' => {
'errors' => 4,
'version' => 1,
+ 'condition' => '$] >= 5.006001',
},
'includeerr2.htm' => {
'errors' => 5,
'version' => 2,
'repeat' => 2,
+ 'condition' => '$] >= 5.006001',
},
'includeerrbt.htm' => {
'errors' => 3,
No revision
No revision
1.1.2.13 +2 -2 embperl/eg/web/Attic/epwebapp.pl
Index: epwebapp.pl
===================================================================
RCS file: /home/cvs/embperl/eg/web/Attic/epwebapp.pl,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- epwebapp.pl 24 Jun 2002 19:58:28 -0000 1.1.2.12
+++ epwebapp.pl 25 Jun 2002 05:59:17 -0000 1.1.2.13
@@ -53,7 +53,7 @@
}
elsif (!$m -> {file} && !exists $m -> {path})
{
- $m -> {path} = $root . $config -> {baseuri} . $m -> {relurl} ;
+ $m -> {path} = $root . $config -> {basepath} . $m -> {relurl} ;
$m -> {path} .= 'index.htm' if ($m -> {path} =~ m#/$#) ;
}
elsif (ref $m -> {file})
@@ -152,7 +152,7 @@
}
# nothing found, so return a general error page
- return "$r->{config}{root}$r->{config}{baseuri}notfound.htm" ;
+ return "$r->{config}{root}$r->{config}{basepath}notfound.htm" ;
}
No revision
No revision
1.5.6.2 +1 -1 embperl/test/cmp/error.htm
Index: error.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/error.htm,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -u -r1.5.6.1 -r1.5.6.2
--- error.htm 31 Oct 2001 14:53:31 -0000 1.5.6.1
+++ error.htm 25 Jun 2002 05:59:17 -0000 1.5.6.2
@@ -7,7 +7,7 @@
^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
^\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
-^^\[.*?\]ERR\: 32\: Warning in Perl code\: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at .*? line \d*\.
+^^\[.*?\]ERR\: 32\: Warning in Perl code\: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word
^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
^\[.*?\]ERR\: 24\: Error in Perl code\: syntax error at .*? line \d*\, at EOF
^\[.*?\]ERR\: 24\: Error in Perl code\: Can.*?
1.2.6.4 +2 -2 embperl/test/cmp/taint.htm
Index: taint.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/taint.htm,v
retrieving revision 1.2.6.3
retrieving revision 1.2.6.4
diff -u -r1.2.6.3 -r1.2.6.4
--- taint.htm 25 Feb 2002 11:20:29 -0000 1.2.6.3
+++ taint.htm 25 Jun 2002 05:59:17 -0000 1.2.6.4
@@ -2,9 +2,9 @@
<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\: 24\: Error in Perl code\: Insecure \$ENV\{PATH\} while running with \-T switch
+^\[.*?\]ERR\: 24\: Error in Perl code\: Insecure \$ENV\{PATH\} while running
^-\[.*?\]ERR\: 32\: Warning in Perl code\: Use of uninitialized value
-^ Embperl .*?<P>
+^ Embperl
</BODY></HTML>
No revision
No revision
1.1.2.6 +1 -1 embperl/test/cmp2/Attic/errdoc2.htm
Index: errdoc2.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/errdoc2.htm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- errdoc2.htm 27 May 2002 17:53:14 -0000 1.1.2.5
+++ errdoc2.htm 25 Jun 2002 05:59:18 -0000 1.1.2.6
@@ -14,7 +14,7 @@
^There are 4 errormessages:
<table border=1>
-^- <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at
+^- <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word
^- <tr><td>\[\d+\]ERR: 32: Warning in Perl code: Bareword found where operator expected at
^-
1.1.2.8 +1 -1 embperl/test/cmp2/Attic/error.htm
Index: error.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/error.htm,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- error.htm 23 Jan 2002 15:09:01 -0000 1.1.2.7
+++ error.htm 25 Jun 2002 05:59:18 -0000 1.1.2.8
@@ -2,7 +2,7 @@
<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: Warning in Perl code: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word at .*?error.htm line
+^^\[.*?\]ERR: 32: Warning in Perl code: Unquoted string "qqqqqqqqqqqqqq" may clash with future reserved word
^-\[.*?\]ERR: 32: Warning in Perl code: Use of uninitialized value at .*?error.htm line \d+.<p>
^^\[.*?\]ERR: 32: Warning in Perl code: Bareword found where operator expected at .*?error.htm line \d+, near "\$error is"<p>
^^\[.*?\]ERR: 32: Warning in Perl code: \(Missing operator before is\?\)<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org