[PHPLIB-DEV] cvs commit From: kir (phplib-dev <email protected>)
Date: 12/21/99

From: kir
Date: Tue Dec 21 14:41:31 1999
Modified files:
      php-lib/CHANGES
      php-lib/php/page.inc

Log message:

 Avoid reentrance to page_open/page_close.

Index: php-lib/CHANGES
diff -u php-lib/CHANGES:1.154 php-lib/CHANGES:1.155
--- php-lib/CHANGES:1.154 Thu Dec 16 13:07:14 1999
+++ php-lib/CHANGES Tue Dec 21 14:40:59 1999
@@ -1,4 +1,8 @@
-$Id: CHANGES,v 1.154 1999/12/16 12:07:14 kir Exp $
+$Id: CHANGES,v 1.155 1999/12/21 13:40:59 kir Exp $
+
+21-Dec-1999 kir
+ - Added code to page.inc to avoid re-entrance to page_open/page_close
+ functions.
 
 16-Dec-1999 kir
   - Changed num_rows() function in db_oracle.inc. Now it works for all?
Index: php-lib/php/page.inc
diff -u php-lib/php/page.inc:1.8 php-lib/php/page.inc:1.9
--- php-lib/php/page.inc:1.8 Wed Oct 27 15:17:35 1999
+++ php-lib/php/page.inc Tue Dec 21 14:40:59 1999
@@ -5,13 +5,18 @@
  * Copyright (c) 1998,1999 NetUSE GmbH
  * Boris Erdmann, Kristian Koehntopp
  *
- * $Id: page.inc,v 1.8 1999/10/27 13:17:35 kk Exp $
+ * $Id: page.inc,v 1.9 1999/12/21 13:40:59 kir Exp $
  *
  */
 
 function page_open($feature) {
   global $_PHPLIB;
 
+ if (!empty($_PHPLIB["page_opened"]))
+ return;
+
+ $_PHPLIB["page_opened"] = 1;
+
   # enable sess and all dependent features.
   if (isset($feature["sess"])) {
     global $sess;
@@ -60,8 +65,12 @@
 }
 
 function page_close() {
- global $sess, $user;
+ global $sess, $user, $_PHPLIB;
 
+ if (!empty($_PHPLIB["page_closed"]))
+ return;
+ $_PHPLIB["page_closed"] = 1;
+
   if (isset($sess)) {
     $sess->freeze();
     if (isset($user)) {

-
PHPLIB Developers Mailing List. Send messages to <phplib-dev <email protected>>.
To unsubscribe, send "unsubscribe" to <phplib-dev-request <email protected>> in
the body, not the subject, of your message.