Merge branch 'master' into 0.9.37

author: Ben Fuhrmannek 2014-12-03 13:52:57 +0100
committer: Ben Fuhrmannek 2014-12-03 13:52:57 +0100
commit: f08ccc6821dc6d56cf204f04eb988efe6c18c0d2 (patch)
tree: 1f50dfe7cfabff09f7b0acd478dc47467c26240a /tests/include
parent: 5a0d9ff59f2a222259e430076f83ae62421d684e (diff)
parent: 7ea20b91eaa4d977991ef81bf1000758c9d3b6c6 (diff)
12 files changed, 12 insertions, 12 deletions
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)
author	Ben Fuhrmannek	2014-12-03 13:52:57 +0100
committer	Ben Fuhrmannek	2014-12-03 13:52:57 +0100
commit	f08ccc6821dc6d56cf204f04eb988efe6c18c0d2 (patch)
tree	1f50dfe7cfabff09f7b0acd478dc47467c26240a /tests/include
parent	5a0d9ff59f2a222259e430076f83ae62421d684e (diff)
parent	7ea20b91eaa4d977991ef81bf1000758c9d3b6c6 (diff)

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=
14	include "http://127.0.0.1/";	14	include "http://127.0.0.1/";
15	?>	15	?>
16	--EXPECTF--	16	--EXPECTF--
17	ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)	17	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=
14	include_once "http://127.0.0.1/";	14	include_once "http://127.0.0.1/";
15	?>	15	?>
16	--EXPECTF--	16	--EXPECTF--
17	ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)	17	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=
16	include_once $var.$app;	16	include_once $var.$app;
17	?>	17	?>
18	--EXPECTF--	18	--EXPECTF--
19	ALERT - Include filename ('http://127.0.0.1/?') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)	19	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=
15	include_once $var;	15	include_once $var;
16	?>	16	?>
17	--EXPECTF--	17	--EXPECTF--
18	ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)	18	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=
16	include $var.$app;	16	include $var.$app;
17	?>	17	?>
18	--EXPECTF--	18	--EXPECTF--
19	ALERT - Include filename ('http://127.0.0.1/?') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)	19	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=
15	include $var;	15	include $var;
16	?>	16	?>
17	--EXPECTF--	17	--EXPECTF--
18	ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)	18	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=
14	require "http://127.0.0.1/";	14	require "http://127.0.0.1/";
15	?>	15	?>
16	--EXPECTF--	16	--EXPECTF--
17	ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)	17	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=
14	require_once "http://127.0.0.1/";	14	require_once "http://127.0.0.1/";
15	?>	15	?>
16	--EXPECTF--	16	--EXPECTF--
17	ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 2)	17	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=
16	require_once $var.$app;	16	require_once $var.$app;
17	?>	17	?>
18	--EXPECTF--	18	--EXPECTF--
19	ALERT - Include filename ('http://127.0.0.1/?') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)	19	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=
15	require_once $var;	15	require_once $var;
16	?>	16	?>
17	--EXPECTF--	17	--EXPECTF--
18	ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)	18	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=
16	require $var.$app;	16	require $var.$app;
17	?>	17	?>
18	--EXPECTF--	18	--EXPECTF--
19	ALERT - Include filename ('http://127.0.0.1/?') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 4)	19	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=
15	require $var;	15	require $var;
16	?>	16	?>
17	--EXPECTF--	17	--EXPECTF--
18	ALERT - Include filename ('http://127.0.0.1/') is an URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)	18	ALERT - Include filename ('http://127.0.0.1/') is a URL that is not allowed (attacker 'REMOTE_ADDR not set', file '%s', line 3)