Merge branch 'master' into 0.9.37

19 files changed, 26 insertions, 19 deletions

diff --git a/execute.c b/execute.c
index fb91284..aa37fb9 100644
--- a/execute.c
+++ b/execute.c
@@ -299,12 +299,12 @@ static zend_bool suhosin_zend_open(const char *filename, zend_file_handle *fh)
                         break;                  
 
                     case SUHOSIN_CODE_TYPE_BLACKURL:
-                        suhosin_log(S_INCLUDE, "Include filename ('%s') is an URL that is forbidden by the blacklist", filename);
+                        suhosin_log(S_INCLUDE, "Include filename ('%s') is a URL that is forbidden by the blacklist", filename);
                         suhosin_bailout(TSRMLS_C);
                         break;
                         
                     case SUHOSIN_CODE_TYPE_BADURL:
-                        suhosin_log(S_INCLUDE, "Include filename ('%s') is an URL that is not allowed", filename);
+                        suhosin_log(S_INCLUDE, "Include filename ('%s') is a URL that is not allowed", filename);
                         suhosin_bailout(TSRMLS_C);
                         break;
 
@@ -607,12 +607,12 @@ not_evaled_code:
                         break;                  
 
             case SUHOSIN_CODE_TYPE_BLACKURL:
-                        suhosin_log(S_INCLUDE|S_GETCALLER, "Include filename ('%s') is an URL that is forbidden by the blacklist", op_array->filename);
+                        suhosin_log(S_INCLUDE|S_GETCALLER, "Include filename ('%s') is a URL that is forbidden by the blacklist", op_array->filename);
                         suhosin_bailout(TSRMLS_C);
                         break;
                         
             case SUHOSIN_CODE_TYPE_BADURL:
-                        suhosin_log(S_INCLUDE|S_GETCALLER, "Include filename ('%s') is an URL that is not allowed", op_array->filename);
+                        suhosin_log(S_INCLUDE|S_GETCALLER, "Include filename ('%s') is a URL that is not allowed", op_array->filename);
                     suhosin_bailout(TSRMLS_C);
                         break;
 
diff --git a/suhosin.c b/suhosin.c
index b186fbb..8ce279d 100644
--- a/suhosin.c
+++ b/suhosin.c
@@ -211,7 +211,7 @@ static void suhosin_shutdown(zend_extension *extension)
 
 static int suhosin_startup_wrapper(zend_extension *ext)
 {
-        int res;
+        int res = SUCCESS;
         zend_extension *ex = &suhosin_zend_extension_entry;
         char *new_info;
         int new_info_length;
@@ -244,7 +244,9 @@ static int suhosin_startup_wrapper(zend_extension *ext)
             ze->op_array_dtor = stealth_op_array_dtor;
     /*}*/
         
-        res = old_startup(ext);
+        if (old_startup != NULL) {
+                res = old_startup(ext);
+        }
 
 /*    ex->name = NULL; 
     ex->author = NULL;
diff --git a/suhosin.ini b/suhosin.ini
index f844b9e..e739dff 100644
--- a/suhosin.ini
+++ b/suhosin.ini
@@ -338,7 +338,12 @@
 ; specify the beginning of allowed URLs. (f.e.: php://stdin) If no whitelist is
 ; specified, then the blacklist is evaluated.
 ; 
-; Note: This setting deactivates suhosin.executor.include.blacklist.
+; Notes:
+; 
+; * This setting deactivates suhosin.executor.include.blacklist.
+; * If both suhosin.executor.include.whitelist and
+; suhosin.executor.include.blacklist are unset or empty, all URLs will be
+; blocked. This is the default.
 ; 
 ;suhosin.executor.include.whitelist = 
 ;
diff --git a/tests/executor/function_whilelist_absmax.phpt b/tests/executor/function_whiletist_absmax.phpt
index f240e69..f240e69 100644
--- a/tests/executor/function_whilelist_absmax.phpt
+++ b/tests/executor/function_whiletist_absmax.phpt
diff --git a/tests/executor/function_whilelist.phpt b/tests/executor/function_whitelist.phpt
index 9017ab4..9017ab4 100644
--- a/tests/executor/function_whilelist.phpt
+++ b/tests/executor/function_whitelist.phpt
diff --git a/tests/executor/function_whilelist_call_user_func.phpt b/tests/executor/function_whitelist_call_user_func.phpt
index a54010f..a54010f 100644
--- a/tests/executor/function_whilelist_call_user_func.phpt
+++ b/tests/executor/function_whitelist_call_user_func.phpt
diff --git a/tests/executor/function_whilelist_maxabs.phpt b/tests/executor/function_whitelist_maxabs.phpt
index 88a356e..88a356e 100644
--- a/tests/executor/function_whilelist_maxabs.phpt
+++ b/tests/executor/function_whitelist_maxabs.phpt
diff --git a/tests/include/include_constant.phpt b/tests/include/include_constant.phpt
index 180aa69..9fdb5ac 100644
--- a/tests/include/include_constant.phpt
+++ b/tests/include/include_constant.phpt
@@ -14,4 +14,4 @@ suhosin.executor.include.blacklist=
     include "http://127.0.0.1/";
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)
+ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)
diff --git a/tests/include/include_once_constant.phpt b/tests/include/include_once_constant.phpt
index 3faac33..66823cd 100644
--- a/tests/include/include_once_constant.phpt
+++ b/tests/include/include_once_constant.phpt
@@ -14,4 +14,4 @@ suhosin.executor.include.blacklist=
     include_once "http://127.0.0.1/";
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)
+ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)
diff --git a/tests/include/include_once_tmpvar.phpt b/tests/include/include_once_tmpvar.phpt
index 1f94c5a..4206893 100644
--- a/tests/include/include_once_tmpvar.phpt
+++ b/tests/include/include_once_tmpvar.phpt
@@ -16,4 +16,4 @@ suhosin.executor.include.blacklist=
     include_once $var.$app;
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/?') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)
+ALERT - Include filename ('http://127.0.0.1/?') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)
diff --git a/tests/include/include_once_var.phpt b/tests/include/include_once_var.phpt
index bf38377..3ba3ff7 100644
--- a/tests/include/include_once_var.phpt
+++ b/tests/include/include_once_var.phpt
@@ -15,4 +15,4 @@ suhosin.executor.include.blacklist=
     include_once $var;
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)
+ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)
diff --git a/tests/include/include_tmpvar.phpt b/tests/include/include_tmpvar.phpt
index 8ad26d7..31d2f0f 100644
--- a/tests/include/include_tmpvar.phpt
+++ b/tests/include/include_tmpvar.phpt
@@ -16,4 +16,4 @@ suhosin.executor.include.blacklist=
     include $var.$app;
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/?') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)
+ALERT - Include filename ('http://127.0.0.1/?') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)
diff --git a/tests/include/include_var.phpt b/tests/include/include_var.phpt
index 7431240..598c093 100644
--- a/tests/include/include_var.phpt
+++ b/tests/include/include_var.phpt
@@ -15,4 +15,4 @@ suhosin.executor.include.blacklist=
     include $var;
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)
+ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)
diff --git a/tests/include/require_constant.phpt b/tests/include/require_constant.phpt
index 6ee79fb..358d69d 100644
--- a/tests/include/require_constant.phpt
+++ b/tests/include/require_constant.phpt
@@ -14,4 +14,4 @@ suhosin.executor.include.blacklist=
     require "http://127.0.0.1/";
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)
+ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)
diff --git a/tests/include/require_once_constant.phpt b/tests/include/require_once_constant.phpt
index 43c69c8..699720a 100644
--- a/tests/include/require_once_constant.phpt
+++ b/tests/include/require_once_constant.phpt
@@ -14,4 +14,4 @@ suhosin.executor.include.blacklist=
     require_once "http://127.0.0.1/";
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)
+ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)
diff --git a/tests/include/require_once_tmpvar.phpt b/tests/include/require_once_tmpvar.phpt
index 2be24b2..956b563 100644
--- a/tests/include/require_once_tmpvar.phpt
+++ b/tests/include/require_once_tmpvar.phpt
@@ -16,4 +16,4 @@ suhosin.executor.include.blacklist=
     require_once $var.$app;
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/?') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)
+ALERT - Include filename ('http://127.0.0.1/?') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)
diff --git a/tests/include/require_once_var.phpt b/tests/include/require_once_var.phpt
index b3857f5..7a2e813 100644
--- a/tests/include/require_once_var.phpt
+++ b/tests/include/require_once_var.phpt
@@ -15,4 +15,4 @@ suhosin.executor.include.blacklist=
     require_once $var;
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)
+ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)
diff --git a/tests/include/require_tmpvar.phpt b/tests/include/require_tmpvar.phpt
index d411067..e0b504f 100644
--- a/tests/include/require_tmpvar.phpt
+++ b/tests/include/require_tmpvar.phpt
@@ -16,4 +16,4 @@ suhosin.executor.include.blacklist=
     require $var.$app;
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/?') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)
+ALERT - Include filename ('http://127.0.0.1/?') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)
diff --git a/tests/include/require_var.phpt b/tests/include/require_var.phpt
index 20468d4..3ff9745 100644
--- a/tests/include/require_var.phpt
+++ b/tests/include/require_var.phpt
@@ -15,4 +15,4 @@ suhosin.executor.include.blacklist=
     require $var;
 ?>
 --EXPECTF--
-ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)
+ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)