diff options
| author | Ben Fuhrmannek | 2014-08-19 16:53:08 +0200 |
|---|---|---|
| committer | Ben Fuhrmannek | 2014-08-19 16:53:08 +0200 |
| commit | 9d00bb4b438d5cb21ea8fc038892ddf8563a9c26 (patch) | |
| tree | 4f82de0452b3fd3f15430dd613cf18a407cb7968 /log.c | |
| parent | 4dfbd136ed93c916909ad9c701a8be9226298d9e (diff) | |
| parent | b074d630123a28cbca3babc756cbec6dede996f7 (diff) | |
Merge branch 'cleanup'
Diffstat (limited to 'log.c')
| -rw-r--r-- | log.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -122,7 +122,7 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...) | |||
| 122 | /* remove the S_GETCALLER flag */ | 122 | /* remove the S_GETCALLER flag */ |
| 123 | loglevel = loglevel & ~S_GETCALLER; | 123 | loglevel = loglevel & ~S_GETCALLER; |
| 124 | 124 | ||
| 125 | SDEBUG("(suhosin_log) loglevel: %d log_syslog: %u - log_sapi: %u - log_script: %u", loglevel, SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script)); | 125 | SDEBUG("(suhosin_log) loglevel: %d log_syslog: %ld - log_sapi: %ld - log_script: %ld", loglevel, SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script)); |
| 126 | 126 | ||
| 127 | /* dump core if wanted */ | 127 | /* dump core if wanted */ |
| 128 | if (SUHOSIN_G(coredump) && loglevel == S_MEMORY) { | 128 | if (SUHOSIN_G(coredump) && loglevel == S_MEMORY) { |
| @@ -281,7 +281,7 @@ log_file: | |||
| 281 | 281 | ||
| 282 | log_sapi: | 282 | log_sapi: |
| 283 | /* SAPI Logging activated? */ | 283 | /* SAPI Logging activated? */ |
| 284 | SDEBUG("(suhosin_log) log_syslog: %u - log_sapi: %u - log_script: %u - log_phpscript: %u", SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script), SUHOSIN_G(log_phpscript)); | 284 | SDEBUG("(suhosin_log) log_syslog: %ld - log_sapi: %ld - log_script: %ld - log_phpscript: %ld", SUHOSIN_G(log_syslog), SUHOSIN_G(log_sapi), SUHOSIN_G(log_script), SUHOSIN_G(log_phpscript)); |
| 285 | if (((SUHOSIN_G(log_sapi)|S_INTERNAL) & loglevel)!=0) { | 285 | if (((SUHOSIN_G(log_sapi)|S_INTERNAL) & loglevel)!=0) { |
| 286 | #if PHP_VERSION_ID < 50400 | 286 | #if PHP_VERSION_ID < 50400 |
| 287 | sapi_module.log_message(buf); | 287 | sapi_module.log_message(buf); |
