richter 01/06/20 07:16:18
Modified: . Tag: Embperl2c Embperl.pm epmain.c
Log:
Embperl 2 - fix ep1compat problem
Revision Changes Path
No revision
No revision
1.118.4.45 +4 -4 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.44
retrieving revision 1.118.4.45
diff -u -r1.118.4.44 -r1.118.4.45
--- Embperl.pm 2001/06/12 18:28:51 1.118.4.44
+++ Embperl.pm 2001/06/20 14:16:10 1.118.4.45
@@ -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.44 2001/06/12 18:28:51 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.45 2001/06/20 14:16:10 richter Exp $
#
###################################################################################
@@ -68,9 +68,9 @@
##ep2##
-$VERSION = '2.0b3_dev-8' ;
+$VERSION = '2.0b3_dev-9' ;
##/ep2##
-##ep1##$VERSION = '1.3.2';
+##ep1##$VERSION = '1.3.3';
# HTML::Embperl cannot be bootstrapped in nonlazy mode except
# under mod_perl, because its dependencies import symbols like ap_palloc
@@ -702,7 +702,7 @@
$$req{'cookie_expires'} = $ENV{EMBPERL_COOKIE_EXPIRES} if (exists
($ENV{EMBPERL_COOKIE_EXPIRES})) ;
##ep2##
- $$req{'ep1compat'} = $ENV{EMBPERL_EP1COMPAT} || 0 ;
+ $$req{'ep1compat'} = $ENV{EMBPERL_EP1COMPAT}?1:0 ;
$$req{'cache_key'} = $ENV{EMBPERL_CACHE_KEY} if (exists
($ENV{EMBPERL_CACHE_KEY})) ; ;
$$req{'cache_key_options'} = $ENV{EMBPERL_CACHE_KEY_OPTIONS} if (exists
($ENV{EMBPERL_CACHE_KEY_OPTIONS})) ; ;
$$req{'expired_func'} = $ENV{EMBPERL_EXPIRES_FUNC} if (exists
($ENV{EMBPERL_EXPIRES_FUNC})) ; ;
1.75.4.38 +2 -2 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.37
retrieving revision 1.75.4.38
diff -u -r1.75.4.37 -r1.75.4.38
--- epmain.c 2001/06/12 18:28:53 1.75.4.37
+++ epmain.c 2001/06/20 14:16:12 1.75.4.38
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.75.4.37 2001/06/12 18:28:53 richter Exp $
+# $Id: epmain.c,v 1.75.4.38 2001/06/20 14:16:12 richter Exp $
#
###################################################################################*/
@@ -1861,7 +1861,7 @@
#ifdef EP2
- if ( pConf->bEP1Compat )
+ if ( pConf->bEP1Compat && !pConf->sPackage )
{
strcat( cache_key, "-1" ); /* make sure Embperl 1.x compatible files get
another namespace */
cache_key_len += 2 ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
