3 files changed, 16 insertions, 6 deletions

diff --git a/Changelog b/Changelog
index 8717eaf..4ff0a3f 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,7 @@
       by suhosin.server.encode and suhosin.server.strip
     - Fixed crash bug with PHP 5.3.x and session module (due to changed session globals struct)
     - Added ! protection to PHP session serializer
+    - *Changed* simulation mode now also affects (dis)allowed functions
 
 2009-08-15 - 0.9.29
 
diff --git a/execute.c b/execute.c
index aaa672b..aea108a 100644
--- a/execute.c
+++ b/execute.c
@@ -1577,7 +1577,7 @@ static void suhosin_execute_internal(zend_execute_data *execute_data_ptr, int re
 #ifdef ZEND_ENGINE_2  
         return_value = (*(temp_variable *)((char *) execute_data_ptr->Ts + execute_data_ptr->opline->result.u.var)).var.ptr;
 #else
-    return_value = execute_data_ptr->Ts[execute_data_ptr->opline->result.u.var].var.ptr;
+        return_value = execute_data_ptr->Ts[execute_data_ptr->opline->result.u.var].var.ptr;
 #endif
         ht = execute_data_ptr->opline->extended_value;
 
@@ -1588,12 +1588,16 @@ static void suhosin_execute_internal(zend_execute_data *execute_data_ptr, int re
                 if (SUHOSIN_G(eval_whitelist) != NULL) {
                         if (!zend_hash_exists(SUHOSIN_G(eval_whitelist), lcname, function_name_strlen+1)) {
                                 suhosin_log(S_EXECUTOR, "function outside of eval whitelist called: %s()", lcname);
-                                goto execute_internal_bailout;
+                                if (!SUHOSIN_G(simulation)) {
+                                        goto execute_internal_bailout;
+                                }
                         }
                 } else if (SUHOSIN_G(eval_blacklist) != NULL) {
                         if (zend_hash_exists(SUHOSIN_G(eval_blacklist), lcname, function_name_strlen+1)) {
                                 suhosin_log(S_EXECUTOR, "function within eval blacklist called: %s()", lcname);
-                                goto execute_internal_bailout;
+                                if (!SUHOSIN_G(simulation)) {
+                                        goto execute_internal_bailout;
+                                }
                         }
                 }
         }
@@ -1601,12 +1605,16 @@ static void suhosin_execute_internal(zend_execute_data *execute_data_ptr, int re
         if (SUHOSIN_G(func_whitelist) != NULL) {
                 if (!zend_hash_exists(SUHOSIN_G(func_whitelist), lcname, function_name_strlen+1)) {
                         suhosin_log(S_EXECUTOR, "function outside of whitelist called: %s()", lcname);
-                        goto execute_internal_bailout;
+                        if (!SUHOSIN_G(simulation)) {
+                                goto execute_internal_bailout;
+                        }
                 }
         } else if (SUHOSIN_G(func_blacklist) != NULL) {
                 if (zend_hash_exists(SUHOSIN_G(func_blacklist), lcname, function_name_strlen+1)) {
                         suhosin_log(S_EXECUTOR, "function within blacklist called: %s()", lcname);
-                        goto execute_internal_bailout;
+                        if (!SUHOSIN_G(simulation)) {
+                                goto execute_internal_bailout;
+                        }
                 }
         }
         
diff --git a/suhosin.ini b/suhosin.ini
index 9696e7b..2420501 100644
--- a/suhosin.ini
+++ b/suhosin.ini
@@ -134,7 +134,8 @@ extension = suhosin.so
 ; If you fear that Suhosin breaks your application, you can activate Suhosin's
 ; simulation mode with this flag. When Suhosin runs in simulation mode,
 ; violations are logged as usual, but nothing is blocked or removed from the
-; request. (Transparent Encryptions are NOT deactivated in simulation mode.)
+; request. (Transparent features are NOT deactivated in simulation mode.)
+; (since v0.9.30 affects (dis)allowed functions)
 ;suhosin.simulation = Off
 
 ; APC 3.0.12(p1/p2) uses reserved resources without requesting a resource slot