diff options
Diffstat (limited to '185.patch')
| -rw-r--r-- | 185.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/185.patch b/185.patch new file mode 100644 index 0000000..55bf200 --- /dev/null +++ b/185.patch @@ -0,0 +1,58 @@ +From 221b40a82ee5a683e066d10e0e5a6a132661b999 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 29 Jun 2018 08:20:19 +0200 +Subject: [PATCH 1/2] relax test to pass with 7.3 + +--- + src/tests/harden_rand_noargs.phpt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/tests/harden_rand_noargs.phpt b/src/tests/harden_rand_noargs.phpt +index 643a453..fdf8124 100644 +--- a/src/tests/harden_rand_noargs.phpt ++++ b/src/tests/harden_rand_noargs.phpt +@@ -46,13 +46,13 @@ Warning: rand() expects exactly 2 parameters, 3 given in %s/tests/harden_rand_no + + Warning: mt_rand() expects exactly 2 parameters, 3 given in %s/tests/harden_rand_noargs.php on line %d + +-Warning: rand() expects parameter 1 to be integer, string given in %s/tests/harden_rand_noargs.php on line %d ++Warning: rand() expects parameter 1 to be in%s, string given in %s/tests/harden_rand_noargs.php on line %d + +-Warning: mt_rand() expects parameter 1 to be integer, string given in %s/tests/harden_rand_noargs.php on line %d ++Warning: mt_rand() expects parameter 1 to be in%s, string given in %s/tests/harden_rand_noargs.php on line %d + +-Warning: rand() expects parameter 2 to be integer, string given in %s/tests/harden_rand_noargs.php on line %d ++Warning: rand() expects parameter 2 to be in%s, string given in %s/tests/harden_rand_noargs.php on line %d + +-Warning: mt_rand() expects parameter 2 to be integer, string given in %s/tests/harden_rand_noargs.php on line %d ++Warning: mt_rand() expects parameter 2 to be in%s, string given in %s/tests/harden_rand_noargs.php on line %d + + Warning: rand() expects exactly 2 parameters, 3 given in %s/tests/harden_rand_noargs.php on line %d + + +From 5c1c20eec0588cd5425987df01a0ac2acd1b24aa Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Fri, 29 Jun 2018 08:21:17 +0200 +Subject: [PATCH 2/2] skip test with 7.3 as samesite is broken + add TODO + +--- + src/sp_cookie_encryption.c | 5 +++-- + src/tests/samesite_cookies.phpt | 5 ++++- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/tests/samesite_cookies.phpt b/src/tests/samesite_cookies.phpt +index d010963..3247432 100644 +--- a/src/tests/samesite_cookies.phpt ++++ b/src/tests/samesite_cookies.phpt +@@ -1,7 +1,10 @@ + --TEST-- + Cookie samesite + --SKIPIF-- +-<?php if (!extension_loaded("snuffleupagus")) die "skip"; ?> ++<?php ++if (!extension_loaded("snuffleupagus")) die("skip"); ++if (PHP_VERSION_ID >= 70300) die("skip BROKEN with 7.3"); ++?> + --INI-- + sp.configuration_file={PWD}/config/config_samesite_cookies.ini + --COOKIE-- |