diff options
| -rw-r--r-- | config/xenforo.rules | 2 | ||||
| -rw-r--r-- | doc/source/changelog.rst | 2 | ||||
| -rw-r--r-- | doc/source/cookies.rst | 2 | ||||
| -rw-r--r-- | doc/source/debug.rst | 2 | ||||
| -rw-r--r-- | doc/source/features.rst | 2 | ||||
| -rw-r--r-- | src/sp_session.c | 2 | ||||
| -rw-r--r-- | src/sp_var_parser.c | 2 | ||||
| -rw-r--r-- | src/tests/broken_configuration/broken_conf_line_no_closing.phpt | 2 | ||||
| -rw-r--r-- | src/tests/unserialize/unserialize_wrong_call.phpt | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/config/xenforo.rules b/config/xenforo.rules index 9f29e1d..3ac8d96 100644 --- a/config/xenforo.rules +++ b/config/xenforo.rules | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # This is a sample configuration for Snuffleupagus to accomodate Xenforo v2.2.12 on PHP 8.1 | 1 | # This is a sample configuration for Snuffleupagus to accommodate Xenforo v2.2.12 on PHP 8.1 |
| 2 | # We keep the default configuration values commented out where they have been shown to be harmful | 2 | # We keep the default configuration values commented out where they have been shown to be harmful |
| 3 | 3 | ||
| 4 | # Global configuration variables | 4 | # Global configuration variables |
diff --git a/doc/source/changelog.rst b/doc/source/changelog.rst index 7d70498..d8724d0 100644 --- a/doc/source/changelog.rst +++ b/doc/source/changelog.rst | |||
| @@ -47,7 +47,7 @@ Breaking Changes | |||
| 47 | Bug fixes | 47 | Bug fixes |
| 48 | ^^^^^^^^^ | 48 | ^^^^^^^^^ |
| 49 | * Make it actually possible to configure sloppy comparison on latests PHP7 | 49 | * Make it actually possible to configure sloppy comparison on latests PHP7 |
| 50 | * Allow file:// prefix in include() wich readonly_exec mode | 50 | * Allow file:// prefix in include() with readonly_exec mode |
| 51 | * Fix a possible crash when exporting function list | 51 | * Fix a possible crash when exporting function list |
| 52 | * Fix a minor memory leak when parsing cookie-related configuration | 52 | * Fix a minor memory leak when parsing cookie-related configuration |
| 53 | 53 | ||
diff --git a/doc/source/cookies.rst b/doc/source/cookies.rst index 7d6ef24..2c71abd 100644 --- a/doc/source/cookies.rst +++ b/doc/source/cookies.rst | |||
| @@ -37,7 +37,7 @@ It can either be set to ``strict`` or ``lax``: | |||
| 37 | - The ``lax`` attribute prevents cookies from being sent cross-domain for | 37 | - The ``lax`` attribute prevents cookies from being sent cross-domain for |
| 38 | "dangerous" methods, like ``POST``, ``PUT`` or ``DELETE``. | 38 | "dangerous" methods, like ``POST``, ``PUT`` or ``DELETE``. |
| 39 | 39 | ||
| 40 | - The ``strict`` one prevents any cookies from beind sent cross-domain. | 40 | - The ``strict`` one prevents any cookies from being sent cross-domain. |
| 41 | 41 | ||
| 42 | :: | 42 | :: |
| 43 | 43 | ||
diff --git a/doc/source/debug.rst b/doc/source/debug.rst index b2a1f28..9ab4c29 100644 --- a/doc/source/debug.rst +++ b/doc/source/debug.rst | |||
| @@ -11,7 +11,7 @@ Debugging crashes | |||
| 11 | 11 | ||
| 12 | .. _testsuite_fail: | 12 | .. _testsuite_fail: |
| 13 | 13 | ||
| 14 | The testsuite is failling | 14 | The testsuite is failing |
| 15 | ------------------------- | 15 | ------------------------- |
| 16 | 16 | ||
| 17 | We're using `php qa <https://qa.php.net/>`__ tests format for our testsuite, | 17 | We're using `php qa <https://qa.php.net/>`__ tests format for our testsuite, |
diff --git a/doc/source/features.rst b/doc/source/features.rst index e9c3704..d7f6f7f 100644 --- a/doc/source/features.rst +++ b/doc/source/features.rst | |||
| @@ -302,7 +302,7 @@ to restrict execution to users on the LAN for example. There are a *lot* | |||
| 302 | of different filters, so make sure to read the :ref:`corresponding documentation <virtual-patching-config>`. | 302 | of different filters, so make sure to read the :ref:`corresponding documentation <virtual-patching-config>`. |
| 303 | 303 | ||
| 304 | Furthermore, running the `following script <https://github.com/nbs-system/snuffleupagus/blob/master/scripts/generate_rules.php>`_ will generate an hash and line-based whitelist | 304 | Furthermore, running the `following script <https://github.com/nbs-system/snuffleupagus/blob/master/scripts/generate_rules.php>`_ will generate an hash and line-based whitelist |
| 305 | of dangerous functions, droping them everywhere else: | 305 | of dangerous functions, dropping them everywhere else: |
| 306 | 306 | ||
| 307 | 307 | ||
| 308 | .. literalinclude:: ../../scripts/generate_rules.php | 308 | .. literalinclude:: ../../scripts/generate_rules.php |
diff --git a/src/sp_session.c b/src/sp_session.c index c97101c..228e581 100644 --- a/src/sp_session.c +++ b/src/sp_session.c | |||
| @@ -108,7 +108,7 @@ static void sp_hook_session_module(void) { | |||
| 108 | 108 | ||
| 109 | static PHP_INI_MH(sp_OnUpdateSaveHandler) { | 109 | static PHP_INI_MH(sp_OnUpdateSaveHandler) { |
| 110 | #if PHP_VERSION_ID < 70100 | 110 | #if PHP_VERSION_ID < 70100 |
| 111 | /* PHP7.0 doesn't handle well recusively set session handlers */ | 111 | /* PHP7.0 doesn't handle well recursively set session handlers */ |
| 112 | if (stage == PHP_INI_STAGE_RUNTIME && | 112 | if (stage == PHP_INI_STAGE_RUNTIME && |
| 113 | SESSION_G(session_status) == php_session_none && s_original_mod && | 113 | SESSION_G(session_status) == php_session_none && s_original_mod && |
| 114 | zend_string_equals_literal(new_value, "user") == 0 && | 114 | zend_string_equals_literal(new_value, "user") == 0 && |
diff --git a/src/sp_var_parser.c b/src/sp_var_parser.c index c7562f3..e674505 100644 --- a/src/sp_var_parser.c +++ b/src/sp_var_parser.c | |||
| @@ -59,7 +59,7 @@ static int create_var(sp_tree *tree, const char *restrict value, | |||
| 59 | var_node->next = NULL; | 59 | var_node->next = NULL; |
| 60 | var_node->idx = NULL; | 60 | var_node->idx = NULL; |
| 61 | var_node->type = _type; | 61 | var_node->type = _type; |
| 62 | /* We consider `$` as part of the variable name, to tell them appart from | 62 | /* We consider `$` as part of the variable name, to tell them apart from |
| 63 | * php's constant | 63 | * php's constant |
| 64 | */ | 64 | */ |
| 65 | if (value && value[0] == VARIABLE_TOKEN && _type == CONSTANT) { | 65 | if (value && value[0] == VARIABLE_TOKEN && _type == CONSTANT) { |
diff --git a/src/tests/broken_configuration/broken_conf_line_no_closing.phpt b/src/tests/broken_configuration/broken_conf_line_no_closing.phpt index 8b06dc5..c0fbc03 100644 --- a/src/tests/broken_configuration/broken_conf_line_no_closing.phpt +++ b/src/tests/broken_configuration/broken_conf_line_no_closing.phpt | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | --TEST-- | 1 | --TEST-- |
| 2 | Configuration line without closing parenthese | 2 | Configuration line without closing parentheses |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> | 4 | <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> |
| 5 | --INI-- | 5 | --INI-- |
diff --git a/src/tests/unserialize/unserialize_wrong_call.phpt b/src/tests/unserialize/unserialize_wrong_call.phpt index afa42f6..70d91a5 100644 --- a/src/tests/unserialize/unserialize_wrong_call.phpt +++ b/src/tests/unserialize/unserialize_wrong_call.phpt | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | --TEST-- | 1 | --TEST-- |
| 2 | Unserialize ok, but called with the wrong numeber of aguments | 2 | Unserialize ok, but called with the wrong number of arguments |
| 3 | --SKIPIF-- | 3 | --SKIPIF-- |
| 4 | <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> | 4 | <?php if (!extension_loaded("snuffleupagus")) print "skip"; ?> |
| 5 | <?php if (PHP_VERSION_ID >= 80000) print "skip"; ?> | 5 | <?php if (PHP_VERSION_ID >= 80000) print "skip"; ?> |
