You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by do...@hyperreal.org on 1998/07/12 21:27:46 UTC
cvs commit: modperl/src/modules/perl mod_perl.c mod_perl.h
dougm 98/07/12 12:27:45
Modified: . Changes ToDo
Symbol Symbol.xs
src/modules/perl mod_perl.c mod_perl.h
Log:
add support to compile with -DPERL_OBJECT (win32 + 5.004_72+)
Revision Changes Path
1.65 +2 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /export/home/cvs/modperl/Changes,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- Changes 1998/07/08 18:07:46 1.64
+++ Changes 1998/07/12 19:27:42 1.65
@@ -8,6 +8,8 @@
=item 1.12_01-dev
+add support to compile with -DPERL_OBJECT (win32 + 5.004_72+)
+
add dir_merge support for directive handlers
$r->print/print will dereference \$scalar refs to strings so scripts
1.38 +6 -0 modperl/ToDo
Index: ToDo
===================================================================
RCS file: /export/home/cvs/modperl/ToDo,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ToDo 1998/07/08 23:00:40 1.37
+++ ToDo 1998/07/12 19:27:42 1.38
@@ -16,6 +16,12 @@
(well, close to it anyhow)
---------------------------------------------------------------------------
+- mod_perl_untaint($Apache::Server::CWD)
+
+- compat.h problem
+
+- mod_perl.pm + CPAN indexer
+
- /perl/perl-status?sig dumps core under hpux 10.20
[David-Michael.Lincke@unisg.ch]
1.3 +5 -6 modperl/Symbol/Symbol.xs
Index: Symbol.xs
===================================================================
RCS file: /export/home/cvs/modperl/Symbol/Symbol.xs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Symbol.xs 1998/04/26 00:32:17 1.2
+++ Symbol.xs 1998/07/12 19:27:43 1.3
@@ -1,13 +1,11 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
-#ifdef __cplusplus
-}
-#endif
+#ifdef PERL_OBJECT
+#define sv_name(svp) svp
+#define undef(ref)
+#else
static void undef(SV *ref)
{
GV *gv;
@@ -65,6 +63,7 @@
return RETVAL;
}
+#endif
MODULE = Apache::Symbol PACKAGE = Apache::Symbol
1.28 +4 -0 modperl/src/modules/perl/mod_perl.c
Index: mod_perl.c
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_perl.c 1998/07/08 18:07:49 1.27
+++ mod_perl.c 1998/07/12 19:27:44 1.28
@@ -78,6 +78,10 @@
static HV *stacked_handlers = Nullhv;
#endif
+#ifdef PERL_OBJECT
+CPerlObj *pPerl;
+#endif
+
static command_rec perl_cmds[] = {
#ifdef PERL_SECTIONS
{ "<Perl>", perl_section, NULL, OR_ALL, RAW_ARGS, "Perl code" },
1.31 +30 -0 modperl/src/modules/perl/mod_perl.h
Index: mod_perl.h
===================================================================
RCS file: /export/home/cvs/modperl/src/modules/perl/mod_perl.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mod_perl.h 1998/07/08 23:00:42 1.30
+++ mod_perl.h 1998/07/12 19:27:44 1.31
@@ -29,8 +29,32 @@
#include "EXTERN.h"
#include "perl.h"
+#ifdef PERL_OBJECT
+#define NO_XSLOCKS
+#endif
#include "XSUB.h"
+#ifdef PERL_OBJECT
+#include <perlhost.h>
+#include "win32iop.h"
+#include <fcntl.h>
+
+#define PerlInterpreter CPerlHost
+
+#define perl_alloc() perl->PerlCreate() ? perl : NULL
+
+#define perl_parse(host, xsi, argc, argv, env) \
+ host->PerlParse(xsi, argc, argv, env);
+
+#define perl_run(host) \
+ host->PerlRun()
+
+#define perl_destruct(host) \
+ host->PerlDestroy()
+
+#define perl_free(host)
+#endif
+
#ifndef MOD_PERL_VERSION
#define MOD_PERL_VERSION "TRUE"
#endif
@@ -56,6 +80,9 @@
#undef __attribute__
#ifndef _INCLUDE_APACHE_FIRST
+#ifdef __cplusplus
+extern "C" {
+#endif
#include "httpd.h"
#include "http_config.h"
#include "http_protocol.h"
@@ -65,6 +92,9 @@
#include "http_request.h"
#include "util_script.h"
#include "http_conf_globals.h"
+#ifdef __cplusplus
+}
+#endif
#endif
#ifndef dTHR