fix segfault when autoglobals are not properly setup

diff --git a/phpdbg_prompt.c b/phpdbg_prompt.c
index f4f4a03581ca3536b85fb556e39feb2a55923673..24f69d7a61ed18f842cca6b51ff30f599032c3b8 100644 (file)
--- a/phpdbg_prompt.c
+++ b/phpdbg_prompt.c
@@ -350,7 +350,12 @@ static PHPDBG_COMMAND(run) /* {{{ */
         if (!EG(active_symbol_table)) {
             zend_rebuild_symbol_table(TSRMLS_C);
         }
-
+        
+        zend_try {
+               /* last chance ... */
+               zend_activate_auto_globals(TSRMLS_C);
+        } zend_end_try();
+               
                zend_try {
                        zend_execute(
                            EG(active_op_array) TSRMLS_CC);

diff --git a/test.php b/test.php
index 02c58b50da63362e0f286d311a54887b51b9e625..d11310bb9a645632343efd4a2bce8e8774bb3753 100644 (file)
--- a/test.php
+++ b/test.php
@@ -1,5 +1,6 @@
 <?php
-include 'web-bootstrap.php'; 
+if (isset($include))
+       include (sprintf("%s/web-bootstrap.php", dirname(__FILE__))); 
 
 class phpdbg {
     public function isGreat($greeting = null) {
@@ -32,4 +33,6 @@ test();
 
 echo "it works!\n";
 
+if (isset($dump))
+       var_dump($_SERVER);
 ?>