updated documentation + new ini entries

1 files changed, 55 insertions, 6 deletions

diff --git a/suhosin.ini b/suhosin.ini
index 9d0bc23..3ae8ff5 100644
--- a/suhosin.ini
+++ b/suhosin.ini
@@ -1,3 +1,6 @@
+
+;extension=suhosin.so
+
 ; =====================
 ; Logging Configuration
 ; =====================
@@ -12,9 +15,6 @@
 ; what this configuration says, because a corrupted heap could mean that the
 ; other logging options will malfunction during the logging process.
 ; 
-; Keep in mind that using the constants is only supported when the Suhosin-Patch
-; is used.
-; 
 ; +------------+-----------+----------------------------------------------------+
 ; | Constant   |   Value   | Description                                        |
 ; +============+===========+====================================================+
@@ -47,6 +47,9 @@
 ; | S_ALL      | 511       | Combines all classes                               |
 ; +------------+-----------+----------------------------------------------------+
 ; 
+; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
+; the numeric value, e.g. `suhosin.log.syslog=511`.
+; 
 ;suhosin.log.syslog = S_ALL & ~S_SQL
 ;
 
@@ -102,6 +105,9 @@
 ; | LOG_LOCAL7   | 31    |
 ; +--------------+-------+
 ; 
+; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
+; the numeric value.
+; 
 ;suhosin.log.syslog.facility = LOG_USER
 ;
 
@@ -135,6 +141,9 @@
 ; |LOG_ERR     | 7     |
 ; +------------+-------+
 ; 
+; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
+; the numeric value.
+; 
 ;suhosin.log.syslog.priority = LOG_ALERT
 ;
 
@@ -146,6 +155,9 @@
 ; Defines what classes of security alerts are logged through the SAPI error log.
 ; For a list of available classes see table 1.
 ; 
+; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
+; the numeric value.
+; 
 ;suhosin.log.sapi = S_ALL & ~S_SQL
 ;
 
@@ -157,6 +169,9 @@
 ; Defines what classes of security alerts are logged through STDOUT. For a list
 ; of available classes see table 1.
 ; 
+; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
+; the numeric value.
+; 
 ;suhosin.log.stdout = S_ALL & ~S_SQL
 ;
 
@@ -168,6 +183,9 @@
 ; Defines what classes of security alerts are logged to a separate Suhosin log
 ; file set by suhosin.log.file.name.
 ; 
+; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
+; the numeric value.
+; 
 ;suhosin.log.file = S_ALL
 ;
 
@@ -191,6 +209,9 @@
 ; S_MEMORY class. It cannot be logged by a script, because S_MEMORY is triggered
 ; by buffer overflows etc... which means the process is in an unstable state.
 ; 
+; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
+; the numeric value.
+; 
 ;suhosin.log.script = 0
 ;
 
@@ -220,6 +241,9 @@
 ; S_MEMORY is triggered by buffer overflows etc... which means the process is in
 ; an unstable state.
 ; 
+; Using constant names is only supported with the Suhosin-Patch. If in doubt, use
+; the numeric value.
+; 
 ;suhosin.log.phpscript = S_ALL
 ;
 
@@ -269,14 +293,16 @@
 ; suhosin.executor.max_depth
 ; --------------------------
 ; * Type: Integer
-; * Default: 0
+; * Default: 750
 ; 
 ; Defines the maximum stack depth allowed by the executor before it stops the
 ; script. Without this function an endless recursion in a PHP script could crash
 ; the PHP executor or trigger the configured memory_limit. A value of '0'
 ; disables this feature.
 ; 
-;suhosin.executor.max_depth = 0
+; (Before 0.9.37, the default value was 0.)
+; 
+;suhosin.executor.max_depth = 750
 ;
 
 ; suhosin.executor.include.max_traversal
@@ -570,7 +596,7 @@
 ; 
 ; 
 ; This class of features is experimental and still in development. As of Suhosin
-; version 0.9.36 only preliminary MySQL support was added.
+; version 0.9.36 only preliminary MySQL and Mysqli support was added.
 ; 
 ;suhosin.memory_limit = 0
 ;
@@ -588,6 +614,18 @@
 ;suhosin.sql.bailout_on_error = Off
 ;
 
+; suhosin.sql.user_match
+; ----------------------
+; * Type: String
+; * Default:
+; 
+; (introduced in 0.9.37) The SQL username must match this wildcard pattern or the
+; connect function will fail and return FALSE. Example: `suhosin.sql.user_match =
+; public_*`
+; 
+;suhosin.sql.user_match = 
+;
+
 ; suhosin.sql.user_prefix
 ; -----------------------
 ; * Type: String
@@ -1282,6 +1320,17 @@
 ;suhosin.upload.remove_binary = Off
 ;
 
+; suhosin.upload.allow_utf8
+; -------------------------
+; * Type: Boolean
+; * Default: Off
+; 
+; This option allows UTF-8 along with ASCII when using
+; `suhosin.upload.disallow_binary` or `suhosin.upload.remove_binary`.
+; 
+;suhosin.upload.allow_utf8 = Off
+;
+
 ; suhosin.upload.verification_script
 ; ----------------------------------
 ; * Type: String