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 2003/01/22 09:23:36 UTC
cvs commit: embperl Changes.pod Embperl.pm Embperl.pod EmbperlD.pod README ep.h epio.c epmain.c epnames.h
richter 2003/01/22 00:23:36
Modified: . Tag: ep1 Changes.pod Embperl.pm Embperl.pod
EmbperlD.pod README ep.h epio.c epmain.c epnames.h
Log:
1.3.5
Revision Changes Path
No revision
No revision
1.188.2.1 +4 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.188
retrieving revision 1.188.2.1
diff -u -r1.188 -r1.188.2.1
--- Changes.pod 23 May 2002 03:38:44 -0000 1.188
+++ Changes.pod 22 Jan 2003 08:23:34 -0000 1.188.2.1
@@ -1,5 +1,9 @@
=pod
+=head1 1.3.5 (RELEASE) 23. Dec 2002
+
+ - Runs now with Perl 5.8.0. Thanks to Angus Lees who
+ backported the 5.8.0 patches from 2.0.
- Fixed Path search problem. Reported by Gavin Carr.
=head1 1.3.4 (RELEASE) 5. Dec 2001
1.177.2.1 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.177
retrieving revision 1.177.2.1
diff -u -r1.177 -r1.177.2.1
--- Embperl.pm 23 May 2002 03:36:15 -0000 1.177
+++ Embperl.pm 22 Jan 2003 08:23:34 -0000 1.177.2.1
@@ -64,7 +64,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '1.3.4';
+$VERSION = '1.3.5';
# HTML::Embperl cannot be bootstrapped in nonlazy mode except
# under mod_perl, because its dependencies import symbols like ap_palloc
1.79.2.1 +6 -2 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.79
retrieving revision 1.79.2.1
diff -u -r1.79 -r1.79.2.1
--- Embperl.pod 5 Dec 2001 07:32:54 -0000 1.79
+++ Embperl.pod 22 Jan 2003 08:23:34 -0000 1.79.2.1
@@ -2588,7 +2588,9 @@
=item perl5.7.2
-=item apache_1.3.0 - apache_1.3.22
+=item perl5.8.0
+
+=item apache_1.3.0 - apache_1.3.27
=item apache_ssl (Ben SSL)
@@ -2614,7 +2616,9 @@
=item perl5.6.1
-=item apache_1.3.0 - apache_1.3.22
+=item perl5.8.0
+
+=item apache_1.3.0 - apache_1.3.27
=back
1.51.2.1 +6 -2 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.51
retrieving revision 1.51.2.1
diff -u -r1.51 -r1.51.2.1
--- EmbperlD.pod 5 Dec 2001 07:32:54 -0000 1.51
+++ EmbperlD.pod 22 Jan 2003 08:23:34 -0000 1.51.2.1
@@ -2557,7 +2557,9 @@
=item perl 5.7.2
-=item apache_1.3.0 - apache_1.3.22
+=item perl5.8.0
+
+=item apache_1.3.0 - apache_1.3.27
=item apache_ssl (Ben SSL)
@@ -2584,7 +2586,9 @@
=item perl 5.6.1
-=item apache_1.3.0 - apache_1.3.22
+=item perl5.8.0
+
+=item apache_1.3.0 - apache_1.3.27
=back
1.31.2.1 +6 -4 embperl/README
Index: README
===================================================================
RCS file: /home/cvs/embperl/README,v
retrieving revision 1.31
retrieving revision 1.31.2.1
diff -u -r1.31 -r1.31.2.1
--- README 23 May 2002 03:36:15 -0000 1.31
+++ README 22 Jan 2003 08:23:35 -0000 1.31.2.1
@@ -2,7 +2,7 @@
HTML::Embperl - Building dynamic Websites with Perl
---------------------------------------------------
-Copyright (c) 1997-2001 Gerald Richter / ecos gmbh (www.ecos.de)
+Copyright (c) 1997-2002 Gerald Richter / ecos gmbh (www.ecos.de)
You may distribute under the terms of either the GNU General Public
License or the Artistic License, as specified in the Perl README file.
@@ -142,7 +142,8 @@
perl5.6.1
perl5.7.1
perl5.7.2
-apache_1.3.0 - apache_1.3.22
+perl5.8.0
+apache_1.3.0 - apache_1.3.27
apache + mod_ssl
apache_ssl (Ben SSL)
Stronghold 2.2
@@ -154,7 +155,8 @@
perl5.005_xx
perl5.6.0
perl5.6.1
-apache_1.3.0 - apache_1.3.22
+perl5.8.0
+apache_1.3.0 - apache_1.3.27
on Windows 95/98 with
1.40.2.1 +17 -7 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.40
retrieving revision 1.40.2.1
diff -u -r1.40 -r1.40.2.1
--- ep.h 2 Nov 2001 10:03:48 -0000 1.40
+++ ep.h 22 Jan 2003 08:23:35 -0000 1.40.2.1
@@ -21,7 +21,15 @@
#include <ctype.h>
#include <time.h>
-#if !defined(PERLIO_IS_STDIO)
+#ifndef PERL_VERSION
+#include <patchlevel.h>
+#ifndef PERL_VERSION
+#define PERL_VERSION PATCHLEVEL
+#define PERL_SUBVERSION SUBVERSION
+#endif
+#endif
+
+#if !defined(PERLIO_IS_STDIO) && PERL_VERSION < 8
#define PERLIO_IS_STDIO
#endif
@@ -96,12 +104,6 @@
#undef sleep
#endif
-#ifndef PERL_VERSION
-#include <patchlevel.h>
-#define PERL_VERSION PATCHLEVEL
-#define PERL_SUBVERSION SUBVERSION
-#endif
-
#if PERL_VERSION >= 6
#ifdef opendir
@@ -171,6 +173,14 @@
#define PATH_MAX 512
#endif
+
+#if PERL_VERSION >= 8
+#ifdef sv_undef
+#undef sv_undef
+#endif
+#define sv_undef ep_sv_undef
+extern SV ep_sv_undef ;
+#endif
/* ---- global variables ---- */
1.23.2.1 +57 -29 embperl/epio.c
Index: epio.c
===================================================================
RCS file: /home/cvs/embperl/epio.c,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- epio.c 17 Oct 2001 05:44:47 -0000 1.23
+++ epio.c 22 Jan 2003 08:23:35 -0000 1.23.2.1
@@ -57,6 +57,21 @@
#endif
+/* Some helper macros for tied handles, taken from mod_perl 2.0 :-) */
+/*
+ * bleedperl change #11639 switch tied handle magic
+ * from living in the gv to the GvIOp(gv), so we have to deal
+ * with both to support 5.6.x
+ */
+#if ((PERL_REVISION == 5) && (PERL_VERSION >= 7))
+# define TIEHANDLE_SV(handle) (SV*)GvIOp((SV*)handle)
+#else
+# define TIEHANDLE_SV(handle) (SV*)handle
+#endif
+
+#define HANDLE_GV(name) gv_fetchpv(name, TRUE, SVt_PVIO)
+
+
#ifdef APACHE
#define DefaultLog "/tmp/embperl.log"
@@ -346,17 +361,22 @@
return ok ;
#endif
- handle = gv_fetchpv("STDIN", TRUE, SVt_PVIO) ;
- if (handle && SvMAGICAL(handle) && (mg = mg_find((SV*)handle, 'q')) && mg->mg_obj)
- {
- r -> ifdobj = mg->mg_obj ;
- if (r -> bDebug)
- {
- char *package = HvNAME(SvSTASH((SV*)SvRV(mg->mg_obj)));
- lprintf (r, "[%d]Open TIED STDIN %s...\n", r -> nPid, package) ;
- }
- return ok ;
- }
+ handle = HANDLE_GV("STDIN") ;
+ if (handle)
+ {
+ SV *iohandle = TIEHANDLE_SV(handle) ;
+
+ if (iohandle && SvMAGICAL(iohandle) && (mg = mg_find((SV*)iohandle, 'q')) && mg->mg_obj)
+ {
+ r -> ifdobj = mg->mg_obj ;
+ if (r -> bDebug)
+ {
+ char *package = HvNAME(SvSTASH((SV*)SvRV(mg->mg_obj)));
+ lprintf (r, "[%d]Open TIED STDIN %s...\n", r -> nPid, package) ;
+ }
+ return ok ;
+ }
+ }
if (r -> ifd && r -> ifd != PerlIO_stdinF)
PerlIO_close (r -> ifd) ;
@@ -410,6 +430,7 @@
XPUSHs(r -> ifdobj);
PUTBACK;
perl_call_method ("CLOSE", G_VOID | G_EVAL) ;
+ SPAGAIN ;
FREETMPS;
LEAVE;
r -> ifdobj = NULL ;
@@ -465,7 +486,7 @@
n = 0 ;
if (num > 0)
{
- int n = POPi ;
+ STRLEN n = POPi ;
char * p ;
STRLEN l ;
if (n >= 0)
@@ -576,7 +597,7 @@
return rcFileOpenErr ;
}
- if ((long)nFileSize < 0)
+ if ((long)*nFileSize < 0)
return rcFileOpenErr ;
@@ -671,17 +692,22 @@
}
#endif
- handle = gv_fetchpv("STDOUT", TRUE, SVt_PVIO) ;
- if (handle && SvMAGICAL(handle) && (mg = mg_find((SV*)handle, 'q')) && mg->mg_obj)
- {
- r -> ofdobj = mg->mg_obj ;
- if (r -> bDebug)
- {
- char *package = HvNAME(SvSTASH((SV*)SvRV(mg->mg_obj)));
- lprintf (r, "[%d]Open TIED STDOUT %s for output...\n", r -> nPid, package) ;
- }
- return ok ;
- }
+ handle = HANDLE_GV("STDOUT") ;
+ if (handle)
+ {
+ SV *iohandle = TIEHANDLE_SV(handle) ;
+
+ if (iohandle && SvMAGICAL(iohandle) && (mg = mg_find((SV*)iohandle, 'q')) && mg->mg_obj)
+ {
+ r -> ofdobj = mg->mg_obj ;
+ if (r -> bDebug)
+ {
+ char *package = HvNAME(SvSTASH((SV*)SvRV(mg->mg_obj)));
+ lprintf (r, "[%d]Open TIED STDOUT %s for output...\n", r -> nPid, package) ;
+ }
+ return ok ;
+ }
+ }
r -> ofd = PerlIO_stdoutF ;
@@ -744,6 +770,7 @@
XPUSHs(r -> ifdobj);
PUTBACK;
perl_call_method ("CLOSE", G_VOID | G_EVAL) ;
+ SPAGAIN ;
FREETMPS;
LEAVE;
r -> ofdobj = NULL ;
@@ -825,7 +852,7 @@
/*in*/ const void * ptr, size_t size)
{
- int n = size ;
+ size_t n = size ;
if (n == 0 || r -> bDisableOutput)
return 0 ;
@@ -833,10 +860,10 @@
if (r -> pMemBuf)
{
char * p ;
- int s = r -> nMemBufSize ;
+ size_t s = r -> nMemBufSize ;
if (n >= r -> nMemBufSizeFree)
{
- int oldsize = s ;
+ size_t oldsize = s ;
if (s < n)
s = n + r -> nMemBufSize ;
@@ -875,6 +902,7 @@
XPUSHs(sv_2mortal(newSVpv((char *)ptr,size)));
PUTBACK;
perl_call_method ("PRINT", G_SCALAR) ;
+ SPAGAIN ;
FREETMPS;
LEAVE;
return size ;
@@ -895,7 +923,7 @@
return 0 ;
}
#endif
- if (n > 0)
+ if (n > 0 && r -> ofd)
{
n = PerlIO_write (r -> ofd, (void *)ptr, size) ;
1.118.2.1 +17 -1 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.118
retrieving revision 1.118.2.1
diff -u -r1.118 -r1.118.2.1
--- epmain.c 4 Dec 2001 20:09:20 -0000 1.118
+++ epmain.c 22 Jan 2003 08:23:35 -0000 1.118.2.1
@@ -64,6 +64,14 @@
filename + packagename,
value=>cache hash for file) */
+#if PERL_VERSION >= 8
+SV ep_sv_undef ; /* we need our own undef value, because when
+ storing a PL_sv_undef with Perl 5.8.0 in a hash
+ Perl takes it as a placeholder and pretents it
+ isn't there :-( */
+#endif
+
+
/* */
/* print error */
/* */
@@ -1429,6 +1437,14 @@
pCurrReq = r ;
r -> nIOType = _nIOType ;
+
+#if PERL_VERSION >= 8
+#if PERL_SUBVERSION >= 50 || PERL_VERSION >= 6
+ memcpy (&ep_sv_undef, &PL_sv_undef, sizeof(PL_sv_undef)) ;
+#else
+ memcpy (&ep_sv_undef, &sv_undef, sizeof(sv_undef)) ;
+#endif
+#endif
#ifdef APACHE
r -> pApacheReq = NULL ;
1.30.2.1 +3 -1 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.30
retrieving revision 1.30.2.1
diff -u -r1.30 -r1.30.2.1
--- epnames.h 4 Dec 2001 07:43:15 -0000 1.30
+++ epnames.h 22 Jan 2003 08:23:35 -0000 1.30.2.1
@@ -326,6 +326,8 @@
#define SvGETMAGIC(x) STMT_START { if (SvGMAGICAL(x)) mg_get(x); } STMT_END
#define SvGETMAGIC_P4(x) SvGETMAGIC(x)
+#define ep_sv_undef sv_undef
+
#endif /* PERL_VERSION > 5 */
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org