richter 2003/01/30 21:16:00
Modified: . Changes.pod Old.xs
test/cmp2 escape.htm
test/conf httpd.conf.src
test/html escape.htm
Log:
fixed setting when using print OUT
Revision Changes Path
1.197 +5 -3 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- Changes.pod 28 Jan 2003 07:21:26 -0000 1.196
+++ Changes.pod 31 Jan 2003 05:15:59 -0000 1.197
@@ -22,7 +22,7 @@
- Fix problem when session id is given to Embperl, but session management
was not setup
- Added 'same' validation to check if two fileds have the same input enterd
- - Fix memory leak. Patch from Joshua Chamas.
+ - Fixed memory leak. Patch from Joshua Chamas.
- Use MP_AP_PREFIX as source for APache 2. Patch from Paul Dyer.
- Fixed a initialisation bug which caused under special conditions a segfault
when compiling a select tag.
@@ -48,13 +48,15 @@
connection.
- Added EMBPERL_OUTPUT_MODE that allows to change to XML output, which cause
generated tags to contains a closing slash, so they are valid XML/XHTML.
- - Fix make test to ignore different idention of newer versions of
+ - Fixed make test to ignore different idention of newer versions of
libxslt.
- Added server_addr to the request param object.
- Keep spaces and newlines in <mail:send> tag.
- Embperl::Mail now encodes all header fields that contains characters between
128 and 255. Use headerencoding parameter to turn of or tell Embperl your
charset.
- - Fix mod_perl 2 detection when mod_perl is build with MP_INST_APACHE2.
+ - Fixed mod_perl 2 detection when mod_perl is build with MP_INST_APACHE2.
+ - Fixed problem with reseting $escmode, when using print OUT. Reported by
+ David Hull.
=head1 2.0b8 (BETA) 25. Juni 2002
1.3 +1 -1 embperl/Old.xs
Index: Old.xs
===================================================================
RCS file: /home/cvs/embperl/Old.xs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Old.xs 22 Oct 2002 05:29:04 -0000 1.2
+++ Old.xs 31 Jan 2003 05:15:59 -0000 1.3
@@ -97,7 +97,7 @@
Node_appendChild (DomTree_self (r -> Component.xCurrDomTree), r ->
Component.xCurrNode, r -> Component.nCurrRepeatLevel, ntypCDATA, 0, p, l, 0, 0, NULL)
;
else*/
r -> Component.xCurrNode = Node_insertAfter_CDATA (r->pApp, p, l, (r ->
Component.nCurrEscMode & 3)== 3?1 + (r -> Component.nCurrEscMode & 4):r ->
Component.nCurrEscMode, DomTree_self (r -> Component.xCurrDomTree), r ->
Component.xCurrNode, r -> Component.nCurrRepeatLevel) ;
- r -> Component.bEscModeSet = -1 ;
+ r -> Component.bEscModeSet = 0 ;
}
1.2 +22 -0 embperl/test/cmp2/escape.htm
Index: escape.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/escape.htm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- escape.htm 22 Oct 2002 05:45:13 -0000 1.1
+++ escape.htm 31 Jan 2003 05:16:00 -0000 1.2
@@ -194,6 +194,28 @@
^<a
href="7\?(!Table=interface%2Crouter&%24where=interface.router_id%3Drouter.id|%24where=interface.router_id%3Drouter.id&!Table=interface%2Crouter)">
+--> my
+
+ <b>hello
+<b>hello
+<br><br>reset<br>
+ <b>helloin++
+ <b>hello
+<b>hello
+<br><br>reset<br>
+ <b>hello
+<b>hello
+--> local
+
+ <b>hello
+<b>hello
+<br><br>reset<br>
+ <b>helloin++
+ <b>hello
+<b>hello
+<br><br>reset<br>
+ <b>hello
+<b>hello
<P>Ok.<P>
1.51 +2 -1 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- httpd.conf.src 7 Jan 2003 20:43:01 -0000 1.50
+++ httpd.conf.src 31 Jan 2003 05:16:00 -0000 1.51
@@ -43,6 +43,7 @@
##print OFH "LoadModule info_module
\"/usr/src/packages/apache_1.3.24_mp561_so/src/modules/standard/mod_info.so\"\n" ;
print OFH "PassEnv ACTION_PREFIX\n" ;
+##print OFH "PerlModule Apache2\n" ;
print OFH <<EOD ;
1.20 +37 -0 embperl/test/html/escape.htm
Index: escape.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/escape.htm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- escape.htm 22 Oct 2002 05:29:11 -0000 1.19
+++ escape.htm 31 Jan 2003 05:16:00 -0000 1.20
@@ -281,6 +281,43 @@
<input name="null">
#]
+
+--> my
+
+ [!
+ sub hellomy () {
+ my $escmode = 0;
+ print OUT "<b>hello</b><br>\n";
+ }
+ !]
+ [- hellomy(); -]
+ [- hellomy(); -]
+ <br><br>reset<br>
+ [+ "<b>helloin++</b><br>\n" +]
+ [- hellomy(); -]
+ [- hellomy(); -]
+ <br><br>reset<br>
+ [- hellomy(); hellomy(); -]
+
+--> local
+
+ [!
+ sub hello () {
+ local $escmode = 0;
+ print OUT "<b>hello</b><br>\n";
+ }
+ !]
+ [- hello(); -]
+ [- hello(); -]
+ <br><br>reset<br>
+ [+ "<b>helloin++</b><br>\n" +]
+ [- hello(); -]
+ [- hello(); -]
+ <br><br>reset<br>
+ [- hello(); hello(); -]
+
+
+
<P>Ok.<P>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
