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 2004/11/06 14:33:07 UTC
cvs commit: embperl/test/conf httpd.conf.src
richter 2004/11/06 05:33:07
Modified: . INSTALL.pod mod_embperl.c
test/conf httpd.conf.src
Log:
Correct module load order for test with static mod_perl, but other dynamic modules
Revision Changes Path
1.28 +6 -0 embperl/INSTALL.pod
Index: INSTALL.pod
===================================================================
RCS file: /home/cvs/embperl/INSTALL.pod,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- INSTALL.pod 20 Jul 2004 08:25:21 -0000 1.27
+++ INSTALL.pod 6 Nov 2004 13:33:07 -0000 1.28
@@ -340,6 +340,12 @@
and install this version too. When Embperl is loaded it detects if runs in-
or outside of Apache and loads the correct library.
+=head2 Win32: Apache 2.0
+
+Embperl currently does not support Apache 2.0 on Windows (on UNIX is does).
+This is due to the fact the Embperl is not fully thread safe yet.
+Makeing Embperl thread safe and support for Apache 2.0 on Windows, is
+currently under development.
=head2 How to continue
1.27 +8 -5 embperl/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/mod_embperl.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mod_embperl.c 4 Oct 2004 05:31:02 -0000 1.26
+++ mod_embperl.c 6 Nov 2004 13:33:07 -0000 1.27
@@ -583,7 +583,7 @@
*/
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: create_dir_config %s[%d/%d]\n", cfg -> AppConfig.sAppName?cfg -> AppConfig.sAppName:"", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: create_dir_config %s (0x%x) [%d/%d]\n", cfg -> AppConfig.sAppName?cfg -> AppConfig.sAppName:"", cfg, getpid(), gettid()) ;
return cfg;
}
@@ -607,7 +607,7 @@
cfg -> bUseEnv = -1 ;
if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: create_server_config [%d/%d]\n", getpid(), gettid()) ;
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: create_server_config (0x%x) [%d/%d]\n", cfg, getpid(), gettid()) ;
return cfg;
@@ -697,7 +697,7 @@
{ \
dTHXCond \
SvREFCNT_inc((SV *)mrg -> STRUCT.NAME) ; \
- }
+ }
/*---------------------------------------------------------------------------
* embperl_merge_dir_config
@@ -709,7 +709,7 @@
return addv ;
{
- tApacheDirConfig *mrg = (tApacheDirConfig *)ap_palloc (p, sizeof(tApacheDirConfig));
+ tApacheDirConfig *mrg ; /*= (tApacheDirConfig *)ap_palloc (p, sizeof(tApacheDirConfig)); */
tApacheDirConfig *base = (tApacheDirConfig *)basev;
tApacheDirConfig *add = (tApacheDirConfig *)addv;
apr_pool_t * subpool ;
@@ -724,6 +724,9 @@
subpool = ap_make_sub_pool(p);
#endif
mrg = (tApacheDirConfig *)ap_palloc (subpool, sizeof(tApacheDirConfig));
+
+ if (bApDebug)
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: merge_dir/server_config base=0x%x add=0x%x mrg=0x%x\n", basev, addv, mrg) ;
#ifdef APACHE2
apr_pool_cleanup_register(subpool, mrg, embperl_ApacheConfigCleanup, embperl_ApacheConfigCleanup);
1.53 +6 -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.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- httpd.conf.src 27 Feb 2003 07:05:33 -0000 1.52
+++ httpd.conf.src 6 Nov 2004 13:33:07 -0000 1.53
@@ -36,6 +36,11 @@
print OFH "Listen ", $EPPORT + 4, "\n" ;
print OFH "Listen ", $EPPORT + 5, "\n" ;
+if ($EPMODPERL && ($EPMODPERL !~ /perl_module/) && !$MP2)
+ {
+ print OFH "PerlModule Embperl\n" ;
+ }
+
print OFH "$EPMODPERL\n" ;
##print OFH "PerlModule Apache2\n" ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org