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/06/09 20:03:24 UTC
cvs commit: embperl Changes.pod MANIFEST epapfilter.c epinit.c epmain.c eppriv.h mod_embperl.c test.pl
richter 2003/06/09 11:03:24
Modified: . Changes.pod MANIFEST epapfilter.c epinit.c epmain.c
eppriv.h mod_embperl.c test.pl
Log:
corrected initialization of ap_filter_rec
Revision Changes Path
1.210 +3 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- Changes.pod 8 Jun 2003 13:14:26 -0000 1.209
+++ Changes.pod 9 Jun 2003 18:03:20 -0000 1.210
@@ -80,6 +80,9 @@
- fixed memory allocation problem that had occured when mod_perl was
staticly linked into Apache.
- removed old Embperl 1 test files from distribution
+ - corrected initialization of ap_filter_rec structure to random
+ segfaults when using the subreq parameter.
+
=head1 2.0b8 (BETA) 25. Juni 2002
1.81 +2 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- MANIFEST 8 Jun 2003 13:14:26 -0000 1.80
+++ MANIFEST 9 Jun 2003 18:03:20 -0000 1.81
@@ -228,6 +228,8 @@
test/cmp/errdoc.htm
test/cmp/errdoc2.htm
test/cmp/error.htm
+test/cmp/errormismatch.htm
+test/cmp/errormismatchcmd.htm
test/cmp/errpage.htm
test/cmp/escape.htm
test/cmp/escraw.htm
1.3 +2 -1 embperl/epapfilter.c
Index: epapfilter.c
===================================================================
RCS file: /home/cvs/embperl/epapfilter.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epapfilter.c 22 Oct 2002 05:29:04 -0000 1.2
+++ epapfilter.c 9 Jun 2003 18:03:21 -0000 1.3
@@ -289,6 +289,7 @@
ctx.pReq = r ;
ctx.pData = NULL ;
+ memset (&frec, 0, sizeof(frec)) ;
frec.name = "Embperl_ProviderApOutFilter" ;
frec.filter_func.out_func = &ProviderApOutFilter_Callback ;
frec.next = NULL ;
1.10 +35 -35 embperl/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/epinit.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- epinit.c 8 Jun 2003 13:14:26 -0000 1.9
+++ epinit.c 9 Jun 2003 18:03:21 -0000 1.10
@@ -270,9 +270,9 @@
*ppThread = pThread ;
return ok ;
}
-
-
-
+
+
+
/*---------------------------------------------------------------------------
* embperl_GetThread
*/
@@ -307,36 +307,36 @@
return pThread ;
}
-/*---------------------------------------------------------------------------
-* embperl_EndPass1
-*/
-/*!
-*
-* \_en
-* Call when configuration pass 1 of apache is done.
-* \endif
-*
-* \_de
-* Wird aufgerufen wenn Pass 1 des Einlesens der Konfiguration beendet ist.
-* \endif
-*
-* ------------------------------------------------------------------------ */
-
-
-
-int embperl_EndPass1 (void)
-
-
- {
- dTHX ;
- tThreadData * pThread = embperl_GetThread (aTHX) ;
-
- hv_clear (pThread -> pApplications) ;
-
- return ok ;
- }
-
-
+/*---------------------------------------------------------------------------
+* embperl_EndPass1
+*/
+/*!
+*
+* \_en
+* Call when configuration pass 1 of apache is done.
+* \endif
+*
+* \_de
+* Wird aufgerufen wenn Pass 1 des Einlesens der Konfiguration beendet ist.
+* \endif
+*
+* ------------------------------------------------------------------------ */
+
+
+
+int embperl_EndPass1 (void)
+
+
+ {
+ dTHX ;
+ tThreadData * pThread = embperl_GetThread (aTHX) ;
+
+ hv_clear (pThread -> pApplications) ;
+
+ return ok ;
+ }
+
+
/*---------------------------------------------------------------------------
* embperl_CreateSessionObject
*/
@@ -597,7 +597,7 @@
if (sAppName)
pApp = (tApp * )GetHashValuePtr (NULL, pThread -> pApplications, sAppName, NULL) ;
-
+
if (!pApp)
{
int rc ;
1.125 +2 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- epmain.c 8 Jun 2003 13:14:26 -0000 1.124
+++ epmain.c 9 Jun 2003 18:03:21 -0000 1.125
@@ -462,7 +462,7 @@
STRLEN ldummy ;
tAppConfig * pCfg = &r -> pApp -> Config ;
epTHX ;
-
+
if (r -> nSessionMgnt)
{
dSP; /* initialize stack pointer */
1.7 +3 -3 embperl/eppriv.h
Index: eppriv.h
===================================================================
RCS file: /home/cvs/embperl/eppriv.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- eppriv.h 8 Jun 2003 13:14:27 -0000 1.6
+++ eppriv.h 9 Jun 2003 18:03:21 -0000 1.7
@@ -259,5 +259,5 @@
void Embperl__Component__Config_destroy(pTHX_ tComponentConfig * p) ;
void Embperl__Component__Param_destroy(pTHX_ tComponentParam * p) ;
void Embperl__Component_destroy(pTHX_ tComponent *p) ;
-
-int embperl_EndPass1 (void) ;
+
+int embperl_EndPass1 (void) ;
1.12 +13 -13 embperl/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/mod_embperl.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mod_embperl.c 8 Jun 2003 13:14:27 -0000 1.11
+++ mod_embperl.c 9 Jun 2003 18:03:21 -0000 1.12
@@ -341,21 +341,21 @@
{
if (bApDebug)
ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: ApacheInitCleanup: mod_perl.c dynamicly loaded -> remove mod_embperl.c [%d/%d]\n", getpid(), gettid()) ;
- embperl_EndPass1 () ;
+ embperl_EndPass1 () ;
ap_remove_module (&embperl_module) ;
}
else
{
if (bApDebug)
ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: ApacheInitCleanup: mod_perl.c not dynamic loaded [%d/%d]\n", getpid(), gettid()) ;
- embperl_EndPass1 () ;
+ embperl_EndPass1 () ;
}
}
else
{
if (bApDebug)
ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: ApacheInitCleanup: mod_perl.c not found [%d/%d]\n", getpid(), gettid()) ;
- embperl_DEndPass1 () ;
+ embperl_EndPass1 () ;
}
#ifdef APACHE2
@@ -407,17 +407,17 @@
static void *embperl_create_dir_config(apr_pool_t * p, char *d)
{
- char buf [20] ;
+ char buf [20] ;
tApacheDirConfig *cfg = (tApacheDirConfig *) ap_pcalloc(p, sizeof(tApacheDirConfig));
embperl_DefaultReqConfig (&cfg -> ReqConfig) ;
embperl_DefaultAppConfig (&cfg -> AppConfig) ;
embperl_DefaultComponentConfig (&cfg -> ComponentConfig) ;
cfg -> bUseEnv = -1 ;
- sprintf(buf, "%x", cfg) ;
- /*if (d)
- cfg -> AppConfig.sAppName = ap_pstrcat (p, d?d:"", ":", buf, NULL) ;
- */
+ sprintf(buf, "%x", cfg) ;
+ /*if (d)
+ cfg -> AppConfig.sAppName = ap_pstrcat (p, d?d:"", ":", buf, NULL) ;
+ */
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()) ;
@@ -542,8 +542,8 @@
if (bApDebug)
ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: merge_dir/server_config %s + %s\n", mrg -> AppConfig.sAppName, add -> AppConfig.sAppName) ;
- if (add -> AppConfig.sAppName)
- mrg -> AppConfig.sAppName = add -> AppConfig.sAppName ;
+ if (add -> AppConfig.sAppName)
+ mrg -> AppConfig.sAppName = add -> AppConfig.sAppName ;
#include "epcfg.h"
@@ -698,9 +698,9 @@
{
char *n = pDirCfg?pDirCfg -> AppConfig.sAppName:"Embperl" ;
- if (bApDebug)
- ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: get_appname %s[%d/%d]\n", n?n:"", getpid(), gettid()) ;
- return n ;
+ if (bApDebug)
+ ap_log_error (APLOG_MARK, APLOG_WARNING | APLOG_NOERRNO, APLOG_STATUSCODE NULL, "EmbperlDebug: get_appname %s[%d/%d]\n", n?n:"", getpid(), gettid()) ;
+ return n ;
}
1.129 +6 -6 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- test.pl 8 Jun 2003 13:14:27 -0000 1.128
+++ test.pl 9 Jun 2003 18:03:22 -0000 1.129
@@ -1005,7 +1005,7 @@
$opt_offline $opt_ep1 $opt_cgi $opt_modperl $opt_execute $opt_nokill $opt_loop
$opt_multchild $opt_memcheck $opt_exitonmem $opt_exitonsv $opt_config $opt_nostart $opt_uniquefn
$opt_quite $opt_qq $opt_ignoreerror $opt_tests $opt_blib $opt_help $opt_dbgbreak $opt_finderr
- $opt_ddd $opt_gdb $opt_ab $opt_abpre $opt_abverbose $opt_start $opt_startinter $opt_kill $opt_showcookie $opt_cache
+ $opt_ddd $opt_gdb $opt_ab $opt_abpre $opt_abverbose $opt_start $opt_startinter $opt_kill $opt_showcookie $opt_cache
$opt_cfgdebug) ;
{
@@ -1102,7 +1102,7 @@
$ret = GetOptions ("offline|o", "ep1|1", "cgi|c", "cache|a", "modperl|httpd|h", "execute|e", "nokill|r", "loop|l:i",
"multchild|m", "memcheck|v", "exitonmem|g", "exitonsv", "config|f=s", "nostart|x", "uniquefn|u",
"quite|q", "qq", "ignoreerror|i", "tests|t", "blib|b", "help", "dbgbreak", "finderr",
- "ddd", "gdb", "ab:s", "abverbose", "abpre", "start", "startinter", "kill", "showcookie",
+ "ddd", "gdb", "ab:s", "abverbose", "abpre", "start", "startinter", "kill", "showcookie",
"cfgdebug") ;
$opt_help = 1 if ($ret == 0) ;
@@ -1175,7 +1175,7 @@
print "--start start apache only\n" ;
print "--startinter start apache only for interactive session\n" ;
print "--kill kill apache only\n" ;
- print "--showcookie shows sent and received cookies\n" ;
+ print "--showcookie shows sent and received cookies\n" ;
print "--cfgdebug shows processing of configuration directives\n" ;
print "\n\n" ;
print "path\t$EPPATH\n" ;
@@ -1297,7 +1297,7 @@
my ($f1, $f2, $errin) = @_ ;
my $line = 0 ;
my $err = 0 ;
- local $^W = 0 ;
+ local $^W = 0 ;
open F1, $f1 || die "***Cannot open $f1" ;
binmode (F1, ":encoding(iso-8859-1)") if ($] >= 5.008000) ;
@@ -1580,7 +1580,7 @@
!($_ =~ /Warning/) &&
!($_ =~ /mod_ssl\:/) &&
!($_ =~ /SES\:/) &&
- !($_ =~ /gcache started/) &&
+ !($_ =~ /gcache started/) &&
!($_ =~ /EmbperlDebug: /) &&
$_ ne 'Use of uninitialized value.')
{
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org