richter 2004/03/14 12:17:42
Modified: . Embperl.xs eppublic.h mod_embperl.c
test/cmp upload.htm
test/html upload.htm
Log:
make upload test run of different perl version
Revision Changes Path
1.54 +7 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Embperl.xs 16 Jan 2004 08:24:26 -0000 1.53
+++ Embperl.xs 14 Mar 2004 20:17:41 -0000 1.54
@@ -38,6 +38,13 @@
OUTPUT:
RETVAL
+int
+embperl_ApInitDone()
+CODE:
+ RETVAL = embperl_ApInitDone () ;
+OUTPUT:
+ RETVAL
+
#ifdef APACHEXXX
1.4 +7 -1 embperl/eppublic.h
Index: eppublic.h
===================================================================
RCS file: /home/cvs/embperl/eppublic.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eppublic.h 23 Jan 2004 06:50:55 -0000 1.3
+++ eppublic.h 14 Mar 2004 20:17:41 -0000 1.4
@@ -20,6 +20,12 @@
SV * pPerlParam,
server_rec * ap_s) ;
+#ifdef APACHE
+int embperl_ApInitDone (void) ;
+#else
+#define embperl_ApInitDone 1 ;
+#endif
+
int embperl_InitRequest ( pTHX_
SV * pApacheReqSV,
SV * pPerlParam,
1.15 +13 -1 embperl/mod_embperl.c
Index: mod_embperl.c
===================================================================
RCS file: /home/cvs/embperl/mod_embperl.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mod_embperl.c 23 Jan 2004 06:50:55 -0000 1.14
+++ mod_embperl.c 14 Mar 2004 20:17:41 -0000 1.15
@@ -47,6 +47,7 @@
/* debugging by default off, enable with httpd -D EMBPERL_APDEBUG */
static int bApDebug = 0 ;
+static int bApInit = 0 ;
/* --- declare config datastructure --- */
@@ -193,6 +194,15 @@
#endif
+/*---------------------------------------------------------------------------
+* embperl_ApInitDone
+*/
+
+int embperl_ApInitDone (void)
+ {
+ return 0 ; //bInitDone ;
+ }
+
/*---------------------------------------------------------------------------
* embperl_ApacheAddModule
@@ -293,6 +303,7 @@
#ifdef APACHE2
ap_add_version_component (p, "Embperl/"VERSION) ;
+ bApInit = 1 ;
return APR_SUCCESS ;
#else
ap_register_cleanup(subpool, NULL, embperl_ApacheInitCleanup,
embperl_ApacheInitCleanup);
@@ -302,6 +313,7 @@
{
ap_log_error (APLOG_MARK, APLOG_ERR | APLOG_NOERRNO, APLOG_STATUSCODE NULL,
"Initialization of Embperl failed (#%d)\n", rc) ;
}
+ bApInit = 1 ;
#endif
}
1.14 +2 -2 embperl/test/cmp/upload.htm
Index: upload.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/upload.htm,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- upload.htm 14 Feb 2004 14:49:54 -0000 1.13
+++ upload.htm 14 Mar 2004 20:17:41 -0000 1.14
@@ -13,8 +13,8 @@
^cgiok
filehandle: Fh
Info: $VAR1 = {
- 'Content-Type' => 'test/plain',
- 'Content-Disposition' => 'form-data; name="upload";
filename="12upload-filename"'
+ 'Content-Disposition' => 'form-data; name="upload";
filename="12upload-filename"',
+ 'Content-Type' => 'test/plain'
};
^\$VAR2 = bless\( \\\*\{\'Fh::fh.*?upload-filename\'\}, \'Fh\' \)\;
1.13 +1 -1 embperl/test/html/upload.htm
Index: upload.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/upload.htm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- upload.htm 14 Feb 2004 14:49:54 -0000 1.12
+++ upload.htm 14 Mar 2004 20:17:42 -0000 1.13
@@ -14,7 +14,7 @@
CGI-Version: [+ $CGI::VERSION +]
cgiok [+ $cgiok +]
filehandle: [+ ref $fdat{upload} +]
-Info: [+ Dumper ($fdat{-upload}, $fdat{upload}) +]
+Info: [+ do { local $Data::Dumper::Sortkeys = 1 ; Dumper
($fdat{-upload}, $fdat{upload}) } +]
[-
$no = 1 ;
while ($size = read($fdat{upload}, $buffer, 2048))
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
