richter 02/03/01 11:59:24
Modified: . Tag: Embperl2c epapinit.c test.pl
driver Tag: Embperl2c epxalan.cpp
test/conf Tag: Embperl2c httpd.conf.src
Log:
Revision Changes Path
No revision
No revision
1.1.2.23 +3 -1 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -r1.1.2.22 -r1.1.2.23
--- epapinit.c 27 Feb 2002 08:19:41 -0000 1.1.2.22
+++ epapinit.c 1 Mar 2002 19:59:23 -0000 1.1.2.23
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epapinit.c,v 1.1.2.22 2002/02/27 08:19:41 richter Exp $
+# $Id: epapinit.c,v 1.1.2.23 2002/03/01 19:59:23 richter Exp $
#
###################################################################################*/
@@ -120,8 +120,10 @@
void embperl_ApacheAddModule ()
{
+ fprintf (stderr, "embperl_ApacheAddModule\n") ;
if (!ap_find_linked_module(__FILE__ /*'epapinit.c'*/))
{
+ fprintf (stderr, "ap_add_module\n") ;
ap_add_module (&embperl_module) ;
}
}
1.70.4.120 +16 -2 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.119
retrieving revision 1.70.4.120
diff -u -r1.70.4.119 -r1.70.4.120
--- test.pl 1 Mar 2002 08:24:36 -0000 1.70.4.119
+++ test.pl 1 Mar 2002 19:59:23 -0000 1.70.4.120
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.119 2002/03/01 08:24:36 richter Exp $
+# $Id: test.pl,v 1.70.4.120 2002/03/01 19:59:23 richter Exp $
#
###################################################################################
@@ -966,7 +966,7 @@
END
{
print "\nTest terminated with fatal error\n" if ($fatal) ;
- system "kill `cat $tmppath/httpd.pid` 2> /dev/null" if ($EPHTTPD ne '' &&
!$opt_nokill && !$EPWIN32) ;
+ system "kill `cat $tmppath/httpd.pid 2> /dev/null` > /dev/null 2>&1" if
($EPHTTPD ne '' && !$opt_nokill && !$EPWIN32) ;
$? = $fatal || $err ;
}
@@ -2320,6 +2320,7 @@
#### Start httpd
print "\n\nStarting httpd... " ;
unlink "$tmppath/httpd.pid" ;
+ unlink $httpderr ;
chmod 0666, $logfile ;
$XX = $opt_multchild && !($opt_gdb || $opt_ddd)?'':'-X' ;
@@ -2359,6 +2360,7 @@
my $tries = ($opt_gdb || $opt_ddd)?20:10 ;
$httpdpid = 0 ;
+ my $herr = 0 ;
while ($tries-- > 0)
{
if (open FH, "$tmppath/httpd.pid")
@@ -2368,8 +2370,20 @@
close FH ;
last ;
}
+ if ($herr || open (HERR, $httpderr))
+ {
+ seek HERR, 0, 1 ;
+ print "\n" if (!$herr) ;
+ $herr = 1 ;
+ while (<HERR>)
+ {
+ print ;
+ }
+ }
+
sleep (1) ;
}
+ close HERR if ($herr) ;
die "Cannot open $tmppath/httpd.pid" if (!$httpdpid) ;
No revision
No revision
1.1.2.18 +26 -4 embperl/driver/Attic/epxalan.cpp
Index: epxalan.cpp
===================================================================
RCS file: /home/cvs/embperl/driver/Attic/epxalan.cpp,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- epxalan.cpp 25 Feb 2002 14:57:47 -0000 1.1.2.17
+++ epxalan.cpp 1 Mar 2002 19:59:23 -0000 1.1.2.18
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epxalan.cpp,v 1.1.2.17 2002/02/25 14:57:47 richter Exp $
+# $Id: epxalan.cpp,v 1.1.2.18 2002/03/01 19:59:23 richter Exp $
#
###################################################################################*/
@@ -162,6 +162,7 @@
/*in*/ IV nParamIndex,
/*i/o*/ SV * pKey)
{
+ epTHX_
int rc ;
if ((rc = Cache_AppendKey (r, pProviderParam, "stylesheet", pParam,
nParamIndex, pKey)) != ok)
@@ -209,6 +210,7 @@
/*in*/ bool bUseCache)
{
+ epTHX_
int rc ;
char * p ;
STRLEN len ;
@@ -401,6 +403,7 @@
/*in*/ IV nParamIndex,
/*i/o*/ SV * pKey)
{
+ epTHX_
int rc ;
if ((rc = Cache_AppendKey (r, pProviderParam, "source", pParam, nParamIndex,
pKey)) != ok)
@@ -448,6 +451,7 @@
/*in*/ bool bUseCache)
{
+ epTHX_
int rc ;
char * p ;
STRLEN len ;
@@ -580,6 +584,7 @@
/*in*/ SV * pSource)
{
+ epTHX_
int rc ;
HE * pEntry ;
HV * pParam ;
@@ -601,7 +606,7 @@
- sStylesheet = GetHashValueStr (pReqParameter, "xsltstylesheet", NULL) ;
+ sStylesheet = GetHashValueStr (aTHX_ pReqParameter, "xsltstylesheet", NULL) ;
if (!sStylesheet)
{
strncpy (r -> errdat1, "XSLT", sizeof (r -> errdat1)) ;
@@ -820,6 +825,7 @@
/*in*/ IV nParamIndex,
/*i/o*/ SV * pKey)
{
+ epTHX_
int rc ;
if ((rc = Cache_AppendKey (r, pProviderParam, "source", pParam, nParamIndex,
pKey)) != ok)
@@ -866,6 +872,7 @@
/*in*/ tProvider * pProvider,
/*in*/ HV * pParam)
{
+ epTHX_
int rc ;
HV * pParamHV ;
@@ -892,13 +899,22 @@
/* output callback */
/* */
/* ------------------------------------------------------------------------ */
+
+struct iowrite
+ {
+ tProviderXalan * pProvider ;
+ tReq * pReq ;
+ } ;
static long unsigned int ProviderXalan_iowrite (const char *buffer,
long unsigned int len,
void *context)
{
- sv_catpvn (((tProviderXalan *)context) -> pOutputSV, (char *)buffer, len) ;
+ tReq * r = ((struct iowrite *)context) -> pReq ;
+ epTHX_
+
+ sv_catpvn (((struct iowrite *)context) -> pProvider -> pOutputSV, (char
*)buffer, len) ;
return len ;
}
@@ -940,6 +956,7 @@
/*in*/ bool bUseCache)
{
+ epTHX_
int rc ;
XalanParsedSource * parsedXML ;
XalanCompiledStylesheet * pCompiledXSL ;
@@ -949,6 +966,7 @@
SV * pValue ;
IV l ;
STRLEN len ;
+ struct iowrite iowrite ;
tCacheItem * pSrcCache = Cache_GetDependency(r, pProvider -> pCache, 0) ;
tCacheItem * pXSLCache = Cache_GetDependency(r, pProvider -> pCache, 1) ;
@@ -979,8 +997,11 @@
}
}
+ iowrite.pProvider = (tProviderXalan *)pProvider ;
+ iowrite.pReq = r ;
+
// Do the transform.
- int theResult = theXalanTransformer -> transform(*parsedXML, pCompiledXSL,
pProvider, ProviderXalan_iowrite, NULL);
+ int theResult = theXalanTransformer -> transform(*parsedXML, pCompiledXSL,
&iowrite, ProviderXalan_iowrite, NULL);
if(theResult != 0)
{
@@ -1025,6 +1046,7 @@
/*in*/ tCacheItem * pItem)
{
+ epTHX_
tProviderXalan * pProvider = ((tProviderXalan *)pItem -> pProvider) ;
if (pProvider -> pOutputSV)
No revision
No revision
1.24.4.44 +2 -2 embperl/test/conf/httpd.conf.src
Index: httpd.conf.src
===================================================================
RCS file: /home/cvs/embperl/test/conf/httpd.conf.src,v
retrieving revision 1.24.4.43
retrieving revision 1.24.4.44
diff -u -r1.24.4.43 -r1.24.4.44
--- httpd.conf.src 27 Feb 2002 15:42:51 -0000 1.24.4.43
+++ httpd.conf.src 1 Mar 2002 19:59:23 -0000 1.24.4.44
@@ -129,7 +129,7 @@
#PerlModule Embperl
-#Embperl_UseEnv on
+Embperl_UseEnv on
<Location /embperl/log>
@@ -461,7 +461,7 @@
<Location /embperl/SSI/>
-PerlSetEnv EMBPERL_SYNTAX SSI
+EMBPERL_SYNTAX SSI
</Location>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
