summaryrefslogtreecommitdiff
path: root/php_suhosin.h
diff options
context:
space:
mode:
authorBen Fuhrmannek2014-10-14 10:09:51 +0200
committerBen Fuhrmannek2014-10-14 10:09:51 +0200
commit82e8d0eb03fb3bd88062e99065f990b26fb9fc8b (patch)
tree1df0307a474e42e031b5a7aafcf7bfe762de4b4a /php_suhosin.h
parentc8724cde260e6c8bab4aefffffa1aa46f92a57ee (diff)
parentff4edc6ecf463211c6527879d6b23f991fd5b73b (diff)
Merge branch 'buf2' (closes #52 and #54)
Conflicts: tests/filter/suhosin_upload_disallow_binary_utf8.phpt tests/filter/suhosin_upload_disallow_binary_utf8fail.phpt tests/filter/suhosin_upload_remove_binary_utf8.phpt tests/filter/suhosin_upload_remove_binary_utf8fail.phpt
Diffstat (limited to 'php_suhosin.h')
-rw-r--r--php_suhosin.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/php_suhosin.h b/php_suhosin.h
index df7c877..b81043a 100644
--- a/php_suhosin.h
+++ b/php_suhosin.h
@@ -277,6 +277,7 @@ ZEND_BEGIN_MODULE_GLOBALS(suhosin)
277 zend_bool log_phpscript_is_safe; 277 zend_bool log_phpscript_is_safe;
278 long log_file; 278 long log_file;
279 char *log_filename; 279 char *log_filename;
280 zend_bool log_file_time;
280 281
281/* header handler */ 282/* header handler */
282 zend_bool allow_multiheader; 283 zend_bool allow_multiheader;