richter 02/03/20 22:48:10
Modified: . Tag: Embperl2c Embperl.pm epapinit.c
Log:
-
Revision Changes Path
No revision
No revision
1.118.4.102 +1 -1 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.101
retrieving revision 1.118.4.102
diff -u -r1.118.4.101 -r1.118.4.102
--- Embperl.pm 21 Mar 2002 06:04:05 -0000 1.118.4.101
+++ Embperl.pm 21 Mar 2002 06:48:09 -0000 1.118.4.102
@@ -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.118.4.101 2002/03/21 06:04:05 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.102 2002/03/21 06:48:09 richter Exp $
#
###################################################################################
@@ -46,7 +46,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.0b7' ;
+$VERSION = '2.0b8_dev-1' ;
$modperl = $ENV{MOD_PERL} ;
1.1.2.31 +13 -9 embperl/epapinit.c
Index: epapinit.c
===================================================================
RCS file: /home/cvs/embperl/epapinit.c,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- epapinit.c 12 Mar 2002 05:12:30 -0000 1.1.2.30
+++ epapinit.c 21 Mar 2002 06:48:09 -0000 1.1.2.31
@@ -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.30 2002/03/12 05:12:30 richter Exp $
+# $Id: epapinit.c,v 1.1.2.31 2002/03/21 06:48:09 richter Exp $
#
###################################################################################*/
@@ -238,20 +238,24 @@
static void *embperl_merge_dir_config (pool *p, void *basev, void *addv)
{
- tApacheDirConfig *mrg = (tApacheDirConfig *)ap_palloc (p,
sizeof(tApacheDirConfig));
- tApacheDirConfig *base = (tApacheDirConfig *)basev;
- tApacheDirConfig *add = (tApacheDirConfig *)addv;
+ if (!basev)
+ return addv ;
+
+ {
+ tApacheDirConfig *mrg = (tApacheDirConfig *)ap_palloc (p,
sizeof(tApacheDirConfig));
+ tApacheDirConfig *base = (tApacheDirConfig *)basev;
+ tApacheDirConfig *add = (tApacheDirConfig *)addv;
- memcpy (mrg, base, sizeof (*mrg)) ;
+ memcpy (mrg, base, sizeof (*mrg)) ;
#include "epcfg.h"
- if (add -> bUseEnv >= 0)
- base -> bUseEnv = add -> bUseEnv ;
+ if (add -> bUseEnv >= 0)
+ base -> bUseEnv = add -> bUseEnv ;
- return mrg ;
+ return mrg ;
+ }
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
