4 files changed, 21 insertions, 0 deletions

diff --git a/execute.c b/execute.c
index 1ec38cd..a521c4a 100644
--- a/execute.c
+++ b/execute.c
@@ -364,6 +364,15 @@ static void suhosin_execute_ex(zend_op_array *op_array, int zo, long dummy TSRML
         zend_uint orig_code_type;
         unsigned long *suhosin_flags = NULL;
         
+        /* log variable dropping statistics */
+        if (SUHOSIN_G(att_request_variables)-SUHOSIN_G(cur_request_variables) > 0) {
+                suhosin_log(S_VARS, "dropped %u request variables - (%u in GET, %u in POST, %u in COOKIE)",
+                SUHOSIN_G(att_request_variables)-SUHOSIN_G(cur_request_variables),
+                SUHOSIN_G(att_get_vars)-SUHOSIN_G(cur_get_vars),
+                SUHOSIN_G(att_post_vars)-SUHOSIN_G(cur_post_vars),
+                SUHOSIN_G(att_cookie_vars)-SUHOSIN_G(cur_cookie_vars));
+        }
+        
         if (SUHOSIN_G(abort_request) && !SUHOSIN_G(simulation) && SUHOSIN_G(filter_action)) {
         
                 char *action = SUHOSIN_G(filter_action);
diff --git a/ifilter.c b/ifilter.c
index c23b304..85ad1ed 100644
--- a/ifilter.c
+++ b/ifilter.c
@@ -326,16 +326,19 @@ unsigned int suhosin_input_filter(int arg, char *var, char **val, unsigned int v
         /* Drop this variable if the limit was reached */
         switch (arg) {
             case PARSE_GET:
+                        SUHOSIN_G(att_get_vars)++;
                         if (SUHOSIN_G(no_more_get_variables)) {
                                 return 0;
                         }
                         break;
             case PARSE_POST:
+                        SUHOSIN_G(att_post_vars)++;
                         if (SUHOSIN_G(no_more_post_variables)) {
                                 return 0;
                         }
                         break;
             case PARSE_COOKIE:
+                        SUHOSIN_G(att_cookie_vars)++;
                         if (SUHOSIN_G(no_more_cookie_variables)) {
                                 return 0;
                         }
@@ -346,6 +349,7 @@ unsigned int suhosin_input_filter(int arg, char *var, char **val, unsigned int v
                         }
                         return 1;
         }
+    SUHOSIN_G(att_request_variables)++;
         
         /* Drop this variable if the limit is now reached */
         switch (arg) {
diff --git a/php_suhosin.h b/php_suhosin.h
index c3491d0..e689b9c 100644
--- a/php_suhosin.h
+++ b/php_suhosin.h
@@ -102,6 +102,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)
 /*      request variables */
         long  max_request_variables;
         long  cur_request_variables;
+        long  att_request_variables;
         long  max_varname_length;
         long  max_totalname_length;
         long  max_value_length;
@@ -112,6 +113,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)
 /*      cookie variables */
         long  max_cookie_vars;
         long  cur_cookie_vars;
+        long  att_cookie_vars;
         long  max_cookie_name_length;
         long  max_cookie_totalname_length;
         long  max_cookie_value_length;
@@ -122,6 +124,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)
 /*      get variables */
         long  max_get_vars;
         long  cur_get_vars;
+        long  att_get_vars;
         long  max_get_name_length;
         long  max_get_totalname_length;
         long  max_get_value_length;
@@ -132,6 +135,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)
 /*      post variables */
         long  max_post_vars;
         long  cur_post_vars;
+        long  att_post_vars;
         long  max_post_name_length;
         long  max_post_totalname_length;
         long  max_post_value_length;
diff --git a/suhosin.c b/suhosin.c
index 01f987c..8570081 100644
--- a/suhosin.c
+++ b/suhosin.c
@@ -1156,6 +1156,10 @@ PHP_RSHUTDOWN_FUNCTION(suhosin)
         SUHOSIN_G(cur_cookie_vars) = 0;
         SUHOSIN_G(cur_get_vars) = 0;
         SUHOSIN_G(cur_post_vars) = 0;
+        SUHOSIN_G(att_request_variables) = 0;
+        SUHOSIN_G(att_cookie_vars) = 0;
+        SUHOSIN_G(att_get_vars) = 0;
+        SUHOSIN_G(att_post_vars) = 0;
         SUHOSIN_G(num_uploads) = 0;
 
         SUHOSIN_G(no_more_variables) = 0;