https for suhosin.filter.action + unittests

4 files changed, 50 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index c69827d..98472a1 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 2015-xx-xx - 0.9.38-dev
-        - removed code compatibility for PHP <5.4 (lots of code + ifdefs)
+    - removed code compatibility for PHP <5.4 (lots of code + ifdefs)
+    - allow https location for suhosin.filter.action
 
 2014-12-12 - 0.9.37.1
     - Changed version string to 0.9.37.1 (without -dev)
diff --git a/execute.c b/execute.c
index 7f646fe..bc7dc59 100644
--- a/execute.c
+++ b/execute.c
@@ -423,7 +423,8 @@ static void suhosin_execute_ex(zend_op_array *op_array, int zo, long dummy TSRML
                 
                         if (*action) {
                         
-                                if (strncmp("http://", action, sizeof("http://")-1)==0) {
+                                if (strncasecmp("http://", action, sizeof("http://")-1)==0
+                                || strncasecmp("https://", action, sizeof("https://")-1)==0) {
                                         sapi_header_line ctr = {0};
                                 
                                         if (code == -1) {
diff --git a/tests/filter/filter_action_302.phpt b/tests/filter/filter_action_302.phpt
new file mode 100644
index 0000000..e7bd49b
--- /dev/null
+++ b/tests/filter/filter_action_302.phpt
@@ -0,0 +1,22 @@
+--TEST--
+suhosin filter action: 302 redirect
+--INI--
+suhosin.log.syslog=0
+suhosin.log.sapi=0
+suhosin.log.stdout=0
+suhosin.log.script=0
+suhosin.request.disallow_nul=1
+suhosin.filter.action=302,http://example.com/
+--SKIPIF--
+<?php include('../skipifcli.inc'); ?>
+--CGI--
+--COOKIE--
+x=%00
+--FILE--
+<?php
+echo 'this is wrong!';
+?>
+--EXPECTHEADERS--
+Status: 302 Moved Temporarily
+Location: http://example.com/
+--EXPECTF--
diff --git a/tests/filter/filter_action_php.phpt b/tests/filter/filter_action_php.phpt
new file mode 100644
index 0000000..0ea50d6
--- /dev/null
+++ b/tests/filter/filter_action_php.phpt
@@ -0,0 +1,24 @@
+--TEST--
+suhosin filter action: fallback PHP file
+--FOO--
+<?php die("FALLBACK\n"); ?>
+--INI--
+suhosin.log.syslog=0
+suhosin.log.sapi=0
+suhosin.log.stdout=0
+suhosin.log.script=0
+suhosin.request.disallow_nul=1
+suhosin.filter.action=404,filter_action_php.phpt
+--SKIPIF--
+<?php include('../skipifcli.inc'); ?>
+--COOKIE--
+x=%00
+--FILE--
+<?php
+echo 'this is wrong!';
+?>
+--EXPECTF--
+%s
+%s
+%s
+FALLBACK
\ No newline at end of file