richter at locus
Mar 13, 2000, 10:15 PM
Post #1 of 1
(886 views)
Permalink
|
|
cvs commit: embperl/test/html include.htm
|
|
richter 00/03/13 21:15:51
Modified: . Changes.pod Embperl.pm EmbperlObject.pm TODO epio.c
Embperl Mail.pm Module.pm
emacs embperl.el
test/cmp include.htm
test/html include.htm
Log:
- The outputfile parameter now also works when running under
mod_perl. Spotted by Ilia Lobsanov.
Revision Changes Path
1.104 +3 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- Changes.pod 2000/03/12 13:11:29 1.103
+++ Changes.pod 2000/03/14 05:15:48 1.104
@@ -10,6 +10,9 @@
Patch from Francis J. Lacoste.
- Changed test so it accpects charset in Content-Type header from
Apache 1.3.12
+ - The outputfile parameter now also works when running under
+ mod_perl. Spotted by Ilia Lobsanov.
+
=head1 1.3b2 (BETA) 11. Feb 2000
1.86 +0 -0 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- Embperl.pm 2000/03/13 07:27:08 1.85
+++ Embperl.pm 2000/03/14 05:15:48 1.86
@@ -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.85 2000/03/13 07:27:08 richter Exp $
+# $Id: Embperl.pm,v 1.86 2000/03/14 05:15:48 richter Exp $
#
###################################################################################
1.10 +0 -0 embperl/EmbperlObject.pm
Index: EmbperlObject.pm
===================================================================
RCS file: /home/cvs/embperl/EmbperlObject.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- EmbperlObject.pm 2000/03/13 07:27:08 1.9
+++ EmbperlObject.pm 2000/03/14 05:15:49 1.10
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlObject.pm,v 1.9 2000/03/13 07:27:08 richter Exp $
+# $Id: EmbperlObject.pm,v 1.10 2000/03/14 05:15:49 richter Exp $
#
###################################################################################
1.86 +5 -0 embperl/TODO
Index: TODO
===================================================================
RCS file: /home/cvs/embperl/TODO,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- TODO 2000/03/12 13:11:30 1.85
+++ TODO 2000/03/14 05:15:49 1.86
@@ -88,6 +88,11 @@
- contrib from Ken Hinckley 2.12.99
- perl 5.6 [Matthias Ulrichs 06.3.2000]
+
+- var cleanup of in imported subs [Lai Yiu Fai 14.3.00]
+
+- using outputfile inside a outputfile crashs
+
Docs
----
- [- -] [+ +] etc all turns into _perl_code_ in html [S Page 13.9.99]
1.15 +12 -12 embperl/epio.c
Index: epio.c
===================================================================
RCS file: /home/cvs/embperl/epio.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- epio.c 1999/09/17 04:25:06 1.14
+++ epio.c 2000/03/14 05:15:49 1.15
@@ -550,14 +550,6 @@
r -> pFreeBuf = NULL ;
r -> pLastFreeBuf = NULL ;
-#if defined (APACHE)
- if (r -> pApacheReq)
- {
- if (r -> bDebug)
- lprintf (r, "[%d]Using APACHE for output...\n", r -> nPid) ;
- return ok ;
- }
-#endif
if (r -> ofd && r -> ofd != PerlIO_stdoutF)
@@ -577,6 +569,14 @@
}
*/
+#if defined (APACHE)
+ if (r -> pApacheReq)
+ {
+ if (r -> bDebug)
+ lprintf (r, "[%d]Using APACHE for output...\n", r -> nPid) ;
+ return ok ;
+ }
+#endif
r -> ofd = PerlIO_stdoutF ;
if (r -> bDebug)
@@ -624,10 +624,10 @@
buffree (r) ;
-#if defined (APACHE)
+/* #if defined (APACHE)
if (r -> pApacheReq)
return ok ;
-#endif
+ #endif */
if (r -> ofd && r -> ofd != PerlIO_stdoutF)
PerlIO_close (r -> ofd) ;
@@ -746,7 +746,7 @@
return bufwrite (r, ptr, n) ;
#if defined (APACHE)
- if (r -> pApacheReq)
+ if (r -> pApacheReq && r -> ofd == NULL)
{
if (n > 0)
{
@@ -790,7 +790,7 @@
}
#if defined (APACHE)
- if (r -> pApacheReq)
+ if (r -> pApacheReq && r -> ofd == NULL)
{
rputc (c, r -> pApacheReq) ;
if (r -> bDebug & dbgFlushOutput)
1.9 +0 -0 embperl/Embperl/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Mail.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Mail.pm 2000/03/13 07:27:08 1.8
+++ Mail.pm 2000/03/14 05:15:49 1.9
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Mail.pm,v 1.8 2000/03/13 07:27:08 richter Exp $
+# $Id: Mail.pm,v 1.9 2000/03/14 05:15:49 richter Exp $
#
###################################################################################
1.10 +0 -0 embperl/Embperl/Module.pm
Index: Module.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Module.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Module.pm 2000/03/13 07:27:08 1.9
+++ Module.pm 2000/03/14 05:15:50 1.10
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Module.pm,v 1.9 2000/03/13 07:27:08 richter Exp $
+# $Id: Module.pm,v 1.10 2000/03/14 05:15:50 richter Exp $
#
###################################################################################
@@ -25,7 +25,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Module.pm,v 1.9 2000/03/13 07:27:08 richter Exp $
+# $Id: Module.pm,v 1.10 2000/03/14 05:15:50 richter Exp $
#
###################################################################################
1.78 +0 -0 embperl/emacs/embperl.el
Index: embperl.el
===================================================================
RCS file: /home/cvs/embperl/emacs/embperl.el,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- embperl.el 2000/03/13 07:27:09 1.77
+++ embperl.el 2000/03/14 05:15:50 1.78
@@ -19,9 +19,9 @@
;; Author : Erik Arneson (erik [at] mind)
;; Created On : Wed Jul 22 17:16:39 PDT 1998
;; Last Modified By: Erik Arneson
-;; Last Modified On: $Date: 2000/03/13 07:27:09 $
+;; Last Modified On: $Date: 2000/03/14 05:15:50 $
;; Version : 1.00
-;; $Id: embperl.el,v 1.77 2000/03/13 07:27:09 richter Exp $
+;; $Id: embperl.el,v 1.78 2000/03/14 05:15:50 richter Exp $
;;
;; Please note that this software is very beta and rather broken. I
;; don't know how useful it will be, although I definitely plan on
1.6 +16 -14 embperl/test/cmp/include.htm
Index: include.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/include.htm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- include.htm 1999/10/05 06:02:09 1.5
+++ include.htm 2000/03/14 05:15:51 1.6
@@ -9,31 +9,31 @@
<H1> 1.) Include from memory</H1>
-<P>Here is some text</P>
+<P>Here is some text</P>
<H1> 2.) Include from memory with some Embperl code</H1>
-<table><tr><td>a1</td><td>b2</td><td>c3</td></tr></table></P>
+<table><tr><td>a1</td><td>b2</td><td>c3</td></tr></table></P>
<H1> 3.) Include from memory with passing of variables</H1>
-<P>Transfer some vars Some Var !</P>
+<P>Transfer some vars Some Var !</P>
<H1> 4.) Change the variable, but not the code</H1>
-<P>Transfer some vars Do it again !</P>
+<P>Transfer some vars Do it again !</P>
<H1> 5.) Use \@param to pass parameters</H1>
-<P>Use @param to transfer some data (1 2 3 4) !</P>
+<P>Use @param to transfer some data (1 2 3 4) !</P>
<H1> 6.) Use \@param to pass parameters and return it</H1>
<H3> $p[0] is vara and $p[1] is varb<H3>
-<P>Got data in @param (vara varb) !</P><P>Change data in @param to (newA newB) !</P>
+<P>Got data in @param (vara varb) !</P><P>Change data in @param to (newA newB) !</P>
<H3> $p[0] is now newA and $p[1] is now newB <H3>
<H1> 7.) Presetup \%fdat and \@ffld</H1>
-<P><table><tr><td>fdat</td><td>text</td></tr><tr><td>test</td><td>value</td></tr></table></P>
+<P><table><tr><td>fdat</td><td>text</td></tr><tr><td>test</td><td>value</td></tr></table></P>
<H1> 8.) Inculde a file</H1>
@@ -82,7 +82,7 @@
<P>Ok.<P>
-
+
<H1> 9.) Inculde a file and return output in a scalar</H1>
@@ -132,8 +132,8 @@
$e = 2 <BR>
<P>Ok.<P>
-
+
</H3>
@@ -168,7 +168,7 @@
p0 m1
p1 main
End include
-
+
</td>
</tr>
@@ -200,7 +200,7 @@
p0 m2
p1 main
End include
-
+
</td>
</tr>
@@ -232,7 +232,7 @@
p0 m3
p1 main
End include
-
+
</td>
</tr>
</table>
@@ -246,8 +246,10 @@
Here is param[3] -> dddd<br>
Here is param[4] -> 555<br>
-
+
+<H1> 12.) Inculde a file and write outputfile</H1>
+
<H1> 12.) Done :-)</H1>
<br>
@@ -259,4 +261,4 @@
</body>
</html>
-
+
1.5 +7 -0 embperl/test/html/include.htm
Index: include.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/include.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- include.htm 1999/10/05 06:03:44 1.4
+++ include.htm 2000/03/14 05:15:51 1.5
@@ -132,6 +132,13 @@
[- Execute ('incparam.htm', 0, 'B', 'three', 'dddd', '555') -]
+<H1> 12.) Inculde a file and write outputfile</H1>
+
+[.# - Execute ({inputfile => 'inc.htm',
+ outputfile => "../tmp/incout.htm",
+ }) ;
+- #]
+
<H1> 12.) Done :-)</H1>
<br>
|
