summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--execute.c4
-rw-r--r--log.c4
-rw-r--r--session.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/execute.c b/execute.c
index 9bcd29c..560d8f5 100644
--- a/execute.c
+++ b/execute.c
@@ -150,7 +150,7 @@ static int suhosin_check_filename(char *s, int len TSRMLS_DC)
150 return SUHOSIN_CODE_TYPE_MANYDOTS; 150 return SUHOSIN_CODE_TYPE_MANYDOTS;
151 } 151 }
152 152
153SDEBUG("xxx %08x %08x",SUHOSIN_G(include_whitelist),SUHOSIN_G(include_blacklist)); 153SDEBUG("xxx %p %p",SUHOSIN_G(include_whitelist),SUHOSIN_G(include_blacklist));
154 /* no black or whitelist then disallow all */ 154 /* no black or whitelist then disallow all */
155 if (SUHOSIN_G(include_whitelist)==NULL && SUHOSIN_G(include_blacklist)==NULL) { 155 if (SUHOSIN_G(include_whitelist)==NULL && SUHOSIN_G(include_blacklist)==NULL) {
156 /* disallow all URLs */ 156 /* disallow all URLs */
@@ -519,7 +519,7 @@ static void suhosin_execute_ex(zend_op_array *op_array, int zo, long dummy TSRML
519 } else { 519 } else {
520 if (suhosin_zend_extension_entry.resource_number != -1) { 520 if (suhosin_zend_extension_entry.resource_number != -1) {
521 suhosin_flags = (unsigned long *) &op_array->reserved[suhosin_zend_extension_entry.resource_number]; 521 suhosin_flags = (unsigned long *) &op_array->reserved[suhosin_zend_extension_entry.resource_number];
522 SDEBUG("suhosin flags: %08x", *suhosin_flags); 522 SDEBUG("suhosin flags: %08lx", *suhosin_flags);
523 523
524 if (*suhosin_flags & SUHOSIN_FLAG_CREATED_BY_EVAL) { 524 if (*suhosin_flags & SUHOSIN_FLAG_CREATED_BY_EVAL) {
525 SUHOSIN_G(in_code_type) = SUHOSIN_EVAL; 525 SUHOSIN_G(in_code_type) = SUHOSIN_EVAL;
diff --git a/log.c b/log.c
index 3edc119..6f4a3eb 100644
--- a/log.c
+++ b/log.c
@@ -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) {
@@ -278,7 +278,7 @@ log_file:
278 278
279log_sapi: 279log_sapi:
280 /* SAPI Logging activated? */ 280 /* SAPI Logging activated? */
281 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)); 281 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));
282 if (((SUHOSIN_G(log_sapi)|S_INTERNAL) & loglevel)!=0) { 282 if (((SUHOSIN_G(log_sapi)|S_INTERNAL) & loglevel)!=0) {
283#if PHP_VERSION_ID < 50400 283#if PHP_VERSION_ID < 50400
284 sapi_module.log_message(buf); 284 sapi_module.log_message(buf);
diff --git a/session.c b/session.c
index 924469b..a3261c9 100644
--- a/session.c
+++ b/session.c
@@ -1020,7 +1020,7 @@ static PHP_INI_MH(suhosin_OnUpdateSaveHandler)
1020 int r; 1020 int r;
1021 char *tmp; 1021 char *tmp;
1022 1022
1023 if ((ps_mod_user) && (SUHOSIN_G(s_original_mod) == ps_mod_user) && (strcmp(new_value, "user") == NULL)) { 1023 if ((ps_mod_user) && (SUHOSIN_G(s_original_mod) == ps_mod_user) && (strcmp(new_value, "user") == 0)) {
1024 return SUCCESS; 1024 return SUCCESS;
1025 } 1025 }
1026 1026