richter 00/04/16 20:26:58
Modified: . Changes.pod Embperl.pm Embperl.pod EmbperlD.pod
EmbperlObject.pm Makefile.PL ep.h
Embperl Mail.pm Module.pm
emacs embperl.el
test/conf httpd.conf.src
Log:
- Added Patch from Randy Kobes that makes Embperl compile with
Apache 1.3.12 and Perl 5.6 on Win32.
Revision Changes Path
1.110 +2 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Changes.pod 2000/04/14 12:27:40 1.109
+++ Changes.pod 2000/04/17 03:26:56 1.110
@@ -31,6 +31,8 @@
Embperl defaults session handling. Idea form Barrie Slaymaker.
- Added EmbperlLogo.gif to the distribution, which contains
"Powered by Embperl".
+ - Added Patch from Randy Kobes that makes Embperl compile with
+ Apache 1.3.12 and Perl 5.6 on Win32.
=head1 1.3b2 (BETA) 11. Feb 2000
1.97 +0 -0 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- Embperl.pm 2000/04/14 12:27:40 1.96
+++ Embperl.pm 2000/04/17 03:26:56 1.97
@@ -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.96 2000/04/14 12:27:40 richter Exp $
+# $Id: Embperl.pm,v 1.97 2000/04/17 03:26:56 richter Exp $
#
###################################################################################
1.46 +29 -0 embperl/Embperl.pod
Index: Embperl.pod
===================================================================
RCS file: /home/cvs/embperl/Embperl.pod,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Embperl.pod 2000/04/13 21:36:52 1.45
+++ Embperl.pod 2000/04/17 03:26:56 1.46
@@ -2522,6 +2522,35 @@
The lastest developements are available from a CVS.
Look at L<"perldoc CVS.pod"|CVS/"INTRO"> for a detailed description.
+
+=head1 Syntaxmodes for various editors
+
+=head2 Emacs
+
+From: Erik Arneson [[EMAIL PROTECTED]]
+
+Here's the amount of documentation I've got right now.
+
+They need to get mmm.el from this URL:
+http://members.tripod.com/gchen2/xemacs/
+
+Then download my mmm-embperl.el from this one:
+http://inanna.starseed.com/~erik/mmm-embperl.el
+
+The documentation for using these is included in those two elisp files.
+
+=head2 VIM
+
+Vim Syntaxfile from Steve Willer could be found at
http://www.interlog.com/~willer/embperl.vim
+
+Vim Syntaxfile from Kee Hinckley could be found at
http://www.somewhere.com/software/
+
+=head2 Dreamweaver
+
+Dreamweaverextention which tell Dreamweaver not to touch Embperl code could
+be found at http://www.somewhere.com/software/
+
+
=head1 Author
G. Richter ([EMAIL PROTECTED])
1.19 +26 -0 embperl/EmbperlD.pod
Index: EmbperlD.pod
===================================================================
RCS file: /home/cvs/embperl/EmbperlD.pod,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- EmbperlD.pod 2000/04/13 21:36:52 1.18
+++ EmbperlD.pod 2000/04/17 03:26:56 1.19
@@ -2481,6 +2481,32 @@
Die aktuelle Entwicklerversion ist via CVS verf�gbar.
Weitere Informationen dazu stehen in L<"perldoc CVS.pod"|CVS/"INTRO">.
+=head1 Syntaxmodes f�r verschiedene Editoren
+
+=head2 Emacs
+
+Von: Erik Arneson [[EMAIL PROTECTED]]
+
+Man braucht mmm.el von
+http://members.tripod.com/gchen2/xemacs/
+
+Anschlie�end mu� man mein mmm-embperl.el downloaden von
+http://inanna.starseed.com/~erik/mmm-embperl.el
+
+Dokumentation ist in den Dateien enthalten.
+
+=head2 VIM
+
+Vim Syntaxfile von Steve Willer: http://www.interlog.com/~willer/embperl.vim
+
+Vim Syntaxfile von Kee Hinckley: http://www.somewhere.com/software/
+
+=head2 Dreamweaver
+
+Dreamweaverextention welche Dreamweaver veranlasst den Embperl code in Ruhe zu
lassen
+befindet sich unter http://www.somewhere.com/software/
+
+
=head1 Author
G. Richter ([EMAIL PROTECTED])
1.21 +0 -0 embperl/EmbperlObject.pm
Index: EmbperlObject.pm
===================================================================
RCS file: /home/cvs/embperl/EmbperlObject.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- EmbperlObject.pm 2000/04/14 12:27:41 1.20
+++ EmbperlObject.pm 2000/04/17 03:26:56 1.21
@@ -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.20 2000/04/14 12:27:41 richter Exp $
+# $Id: EmbperlObject.pm,v 1.21 2000/04/17 03:26:56 richter Exp $
#
###################################################################################
1.26 +13 -2 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.PL 2000/03/29 19:41:40 1.25
+++ Makefile.PL 2000/04/17 03:26:56 1.26
@@ -782,18 +782,29 @@
close FH ;
}
+$d .= ' -DPERL_IS_5_6 ' if $] >= 5.006;
if ($win32)
{ # Check for winsock2api
- if (open FH, "$inc_dir/ap_config.h")
+ if (open FH, "$inc_dir/../os/win32/os.h")
{
my @conf = <FH> ;
close FH ;
if (grep (/winsock2\.h/, @conf))
{
- $d .= ' -D_WINSOCK2API_ ' ;
+ $d .= ' -D_WINSOCK2API_ -D_MSWSOCK_ ' ;
+ }
+ elsif (open FH, "$inc_dir/ap_config.h")
+ {
+ @conf = <FH> ;
+ close FH ;
+
+ if (grep (/winsock2\.h/, @conf))
+ {
+ $d .= ' -D_WINSOCK2API_ ' ;
+ }
}
}
}
1.21 +125 -0 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ep.h 1999/11/02 08:32:47 1.20
+++ ep.h 2000/04/17 03:26:56 1.21
@@ -61,6 +61,68 @@
#undef FALSE
#endif
+#ifdef WIN32
+
+#ifdef uid_t
+#define apache_uid_t uid_t
+#undef uid_t
+#endif
+#define uid_t apache_uid_t
+
+#ifdef gid_t
+#define apache_gid_t gid_t
+#undef gid_t
+#endif
+#define gid_t apache_gid_t
+
+#ifdef mode_t
+#define apache_mode_t mode_t
+#undef mode_t
+#endif
+#define mode_t apache_mode_t
+
+#ifdef stat
+#define apache_stat stat
+#undef stat
+#endif
+
+#ifdef sleep
+#define apache_sleep sleep
+#undef sleep
+#endif
+
+#ifdef PERL_IS_5_6
+
+#ifdef opendir
+#define apache_opendir opendir
+#undef opendir
+#endif
+
+#ifdef readdir
+#define apache_readdir readdir
+#undef readdir
+#endif
+
+#ifdef closedir
+#define apache_closedir closedir
+#undef closedir
+#endif
+
+#ifdef crypt
+#define apache_crypt crypt
+#undef crypt
+#endif
+
+#ifdef errno
+#define apache_errno errno
+#undef errno
+#endif
+
+#endif /* endif PERL_IS_56 */
+
+#endif /* endif WIN32 */
+
+
#include <httpd.h>
#include <http_config.h>
#include <http_protocol.h>
@@ -79,6 +141,68 @@
#include "embperl.h"
#ifdef WIN32
+
+#undef uid_t
+#ifdef apache_uid_t
+#define uid_t apache_uid_t
+#undef apache_uid_t
+#endif
+
+#undef gid_t
+#ifdef apache_gid_t
+#define gid_t apache_gid_t
+#undef apache_gid_t
+#endif
+
+#undef mode_t
+#ifdef apache_mode_t
+#define gid_t apache_mode_t
+#undef apache_mode_t
+#endif
+
+#ifdef apache_stat
+#undef stat
+#define stat apache_stat
+#undef apache_stat
+#endif
+
+#ifdef apache_sleep
+#undef sleep
+#define sleep apache_sleep
+#undef apache_sleep
+#endif
+
+#ifdef PERL_IS_5_6
+
+#ifdef apache_opendir
+#undef opendir
+#define opendir apache_opendir
+#undef apache_opendir
+#endif
+
+#ifdef apache_readdir
+#undef readdir
+#define readdir apache_readdir
+#undef apache_readdir
+#endif
+
+#ifdef apache_closedir
+#undef closedir
+#define closedir apache_closedir
+#undef apache_closedir
+#endif
+
+#ifdef apache_crypt
+#undef crypt
+#define crypt apache_crypt
+#undef apache_crypt
+#endif
+
+#endif /* endif PERL_IS_5_6 */
+
+#endif /* endif WIN32 */
+
+#ifdef WIN32
#define PATH_MAX _MAX_DIR
#endif
@@ -399,3 +523,4 @@
/* ---- from epdbg.c ----- */
int SetupDebugger (/*i/o*/ register req * r) ;
+
1.20 +0 -0 embperl/Embperl/Mail.pm
Index: Mail.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Mail.pm,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Mail.pm 2000/04/14 12:27:42 1.19
+++ Mail.pm 2000/04/17 03:26:57 1.20
@@ -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.19 2000/04/14 12:27:42 richter Exp $
+# $Id: Mail.pm,v 1.20 2000/04/17 03:26:57 richter Exp $
#
###################################################################################
1.21 +0 -0 embperl/Embperl/Module.pm
Index: Module.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Module.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Module.pm 2000/04/14 12:27:43 1.20
+++ Module.pm 2000/04/17 03:26:57 1.21
@@ -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.20 2000/04/14 12:27:43 richter Exp $
+# $Id: Module.pm,v 1.21 2000/04/17 03:26:57 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.20 2000/04/14 12:27:43 richter Exp $
+# $Id: Module.pm,v 1.21 2000/04/17 03:26:57 richter Exp $
#
###################################################################################
1.89 +0 -0 embperl/emacs/embperl.el
Index: embperl.el
===================================================================
RCS file: /home/cvs/embperl/emacs/embperl.el,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- embperl.el 2000/04/14 12:27:43 1.88
+++ embperl.el 2000/04/17 03:26:58 1.89
@@ -19,9 +19,9 @@
;; Author : Erik Arneson ([EMAIL PROTECTED])
;; Created On : Wed Jul 22 17:16:39 PDT 1998
;; Last Modified By: Erik Arneson
-;; Last Modified On: $Date: 2000/04/14 12:27:43 $
+;; Last Modified On: $Date: 2000/04/17 03:26:58 $
;; Version : 1.00
-;; $Id: embperl.el,v 1.88 2000/04/14 12:27:43 richter Exp $
+;; $Id: embperl.el,v 1.89 2000/04/17 03:26:58 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.18 +11 -0 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- httpd.conf.src 1999/11/04 05:30:19 1.17
+++ httpd.conf.src 2000/04/17 03:26:58 1.18
@@ -265,6 +265,17 @@
Options ExecCGI
</Location>
+
+<Location /EmbperlObject>
+PerlSetEnv EMBPERL_OBJECT_BASE epobase.htm
+PerlSetEnv EMBPERL_FILESMATCH \"\\.htm.?|\\.epl\$\"
+SetHandler perl-script
+PerlHandler HTML::EmbperlObject
+Options ExecCGI
+</Location>
+
+
+
<Location /eg>
SetHandler perl-script
PerlHandler HTML::Embperl
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]