Use new suhosin_getenv() function in all places

Add protection against mbstring
Add detection of incompatible extensions that change POST handlers

1 files changed, 3 insertions, 3 deletions

diff --git a/log.c b/log.c
index cc297d2..2e3d7a1 100644
--- a/log.c
+++ b/log.c
@@ -118,12 +118,12 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...)
         }
         
         if (SUHOSIN_G(log_use_x_forwarded_for)) {
-                ip_address = sapi_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC);
+                ip_address = suhosin_getenv("HTTP_X_FORWARDED_FOR", 20 TSRMLS_CC);
                 if (ip_address == NULL) {
                         ip_address = "X-FORWARDED-FOR not set";
                 }
         } else {
-                ip_address = sapi_getenv("REMOTE_ADDR", 11 TSRMLS_CC);
+                ip_address = suhosin_getenv("REMOTE_ADDR", 11 TSRMLS_CC);
                 if (ip_address == NULL) {
                         ip_address = "REMOTE_ADDR not set";
                 }
@@ -154,7 +154,7 @@ PHP_SUHOSIN_API void suhosin_log(int loglevel, char *fmt, ...)
                 }
                 ap_php_snprintf(buf, sizeof(buf), "%s - %s (attacker '%s', file '%s', line %u)", alertstring, error, ip_address, fname, lineno);
         } else {
-                fname = sapi_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
+                fname = suhosin_getenv("SCRIPT_FILENAME", 15 TSRMLS_CC);
                 if (fname==NULL) {
                         fname = "unknown";
                 }