6 files changed, 10 insertions, 8 deletions

diff --git a/execute.c b/execute.c
index d8b0be4..e3cd0b3 100644
--- a/execute.c
+++ b/execute.c
@@ -377,7 +377,7 @@ static int suhosin_detect_codetype(zend_op_array *op_array TSRMLS_DC)
 
 /* {{{ void suhosin_execute_ex(zend_op_array *op_array TSRMLS_DC)
  *    This function provides a hook for execution */
-#if PHP_VERSION_ID > 50500
+#if PHP_VERSION_ID >= 50500
 static void suhosin_execute_ex(zend_execute_data *execute_data TSRMLS_DC)
 {
         zend_op_array *op_array = execute_data->op_array;
@@ -674,7 +674,7 @@ int ih_preg_replace(IH_HANDLER_PARAMS)
              **limit, **zcount;
 
          if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ZZZ|ZZ", &regex, &replace, &subject, &limit, &zcount) == FAILURE) {
-                return(0);
+                return (1);
          }
                 
         if (Z_TYPE_PP(regex) == IS_ARRAY) {
@@ -1529,8 +1529,9 @@ static int ih_rand(IH_HANDLER_PARAMS)
 static int ih_getrandmax(IH_HANDLER_PARAMS)
 {
         if (zend_parse_parameters_none() == FAILURE) {
-                return(0);
+                return (1);
         }
+
         RETVAL_LONG(PHP_MT_RAND_MAX);
         return (1);
 }
diff --git a/session.c b/session.c
index dc78b5f..10c1652 100644
--- a/session.c
+++ b/session.c
@@ -339,7 +339,7 @@ void suhosin_hook_session(TSRMLS_D)
 
     /* increase session identifier entropy */
     if (SESSION_G(entropy_length) == 0 || SESSION_G(entropy_file) == NULL) {
-        
+#ifndef PHP_WIN32
         /* ensure that /dev/urandom exists */
         int fd = VCWD_OPEN("/dev/urandom", O_RDONLY);
         if (fd >= 0) {
@@ -347,6 +347,7 @@ void suhosin_hook_session(TSRMLS_D)
             SESSION_G(entropy_length) = 16;
             SESSION_G(entropy_file) = pestrdup("/dev/urandom", 1);
         }
+#endif
     }
 }
 
diff --git a/tests/filter/input_filter_request_array_index_blacklist.phpt b/tests/filter/input_filter_request_array_index_blacklist.phpt
index ead85c5..d85c2e9 100644
--- a/tests/filter/input_filter_request_array_index_blacklist.phpt
+++ b/tests/filter/input_filter_request_array_index_blacklist.phpt
@@ -10,7 +10,7 @@ suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
 auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.array_index_blacklist="=ABC%{}\\$;"
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1[aaa]=1;var2[bbB]=1;var3[ccc][ccC]=1
 --GET--
diff --git a/tests/filter/input_filter_request_array_index_whitelist.phpt b/tests/filter/input_filter_request_array_index_whitelist.phpt
index a091574..131ad42 100644
--- a/tests/filter/input_filter_request_array_index_whitelist.phpt
+++ b/tests/filter/input_filter_request_array_index_whitelist.phpt
@@ -10,7 +10,7 @@ suhosin.log.file.name={PWD}/suhosintest.$$.log.tmp
 auto_append_file={PWD}/suhosintest.$$.log.tmp
 suhosin.request.array_index_whitelist=abcdefghijklmnopqrstuvwxyz
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 var1[aaa]=1;var2[bbB]=1;var3[ccc][ccC]=1
 --GET--
diff --git a/tests/filter/post_fileupload_array_index_blacklist.phpt b/tests/filter/post_fileupload_array_index_blacklist.phpt
index 7e19014..2bf0a57 100644
--- a/tests/filter/post_fileupload_array_index_blacklist.phpt
+++ b/tests/filter/post_fileupload_array_index_blacklist.phpt
@@ -11,7 +11,7 @@ auto_append_file={PWD}/suhosintest.$$.log.tmp
 file_uploads=1
 suhosin.request.array_index_blacklist=ABC
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --POST_RAW--
diff --git a/tests/filter/post_fileupload_array_index_whitelist.phpt b/tests/filter/post_fileupload_array_index_whitelist.phpt
index b910c44..f76aeb3 100644
--- a/tests/filter/post_fileupload_array_index_whitelist.phpt
+++ b/tests/filter/post_fileupload_array_index_whitelist.phpt
@@ -11,7 +11,7 @@ auto_append_file={PWD}/suhosintest.$$.log.tmp
 file_uploads=1
 suhosin.request.array_index_whitelist=abcdefghijklmnopqrstuvwxyz
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('../skipif.inc'); ?>
 --COOKIE--
 --GET--
 --POST_RAW--